#141 Removing builder specifics from CodeGenerator

core/src/main/java/org/javahelpers/simple/builders/core/enums/AccessModifier.java

@@ -41,6 +41,9 @@ public enum AccessModifier {
   /** Public access - accessible from anywhere */
   PUBLIC("public"),
 
+  /** Protected access - accessible from the same package and subclasses */
+  PROTECTED("protected"),
+
   /** Package-private access (default) - accessible only within the same package */
   PACKAGE_PRIVATE(""),
 

example/target/generated-sources/annotations/org/javahelpers/simple/builders/example/BookDtoBuilder.java

@@ -10,8 +10,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.javahelpers.simple.builders.core.util.BuilderToStringStyle;
 import org.javahelpers.simple.builders.core.util.TrackedValue;
@@ -116,52 +114,20 @@ public BookDtoBuilder() {
   public BookDtoBuilder(BookDto instance) {
     this.author = initialValue(instance.getAuthor());
     this.available = initialValue(instance.isAvailable());
-    if (this.available.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'available' is marked as non-null but source object has null value");
-    }
     this.category = initialValue(instance.getCategory());
-    if (this.category.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'category' is marked as non-null but source object has null value");
-    }
     this.discount = initialValue(instance.getDiscount());
-    if (this.discount.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'discount' is marked as non-null but source object has null value");
-    }
     this.edition = initialValue(instance.getEdition());
-    if (this.edition.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'edition' is marked as non-null but source object has null value");
-    }
     this.exactPrice = initialValue(instance.getExactPrice());
     this.genres = initialValue(instance.getGenres());
     this.isbn = initialValue(instance.getIsbn());
     this.lastUpdated = initialValue(instance.getLastUpdated());
     this.metadata = initialValue(instance.getMetadata());
     this.pages = initialValue(instance.getPages());
-    if (this.pages.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'pages' is marked as non-null but source object has null value");
-    }
     this.price = initialValue(instance.getPrice());
-    if (this.price.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'price' is marked as non-null but source object has null value");
-    }
     this.publishDate = initialValue(instance.getPublishDate());
     this.publisher = initialValue(instance.getPublisher());
     this.rating = initialValue(instance.getRating());
-    if (this.rating.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'rating' is marked as non-null but source object has null value");
-    }
     this.salesCount = initialValue(instance.getSalesCount());
-    if (this.salesCount.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'salesCount' is marked as non-null but source object has null value");
-    }
     this.subtitle = initialValue(instance.getSubtitle());
     this.tags = initialValue(instance.getTags());
     this.title = initialValue(instance.getTitle());

example/target/generated-sources/annotations/org/javahelpers/simple/builders/example/JacksonIntegrationDtoBuilder.java

@@ -50,10 +50,6 @@ public JacksonIntegrationDtoBuilder() {
   public JacksonIntegrationDtoBuilder(JacksonIntegrationDto instance) {
     this.name = initialValue(instance.name());
     this.age = initialValue(instance.age());
-    if (this.age.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'age' is marked as non-null but source object has null value");
-    }
   }
 
   /**

example/target/generated-sources/annotations/org/javahelpers/simple/builders/example/ProductRecordBuilder.java

@@ -51,10 +51,6 @@ public ProductRecordBuilder() {
   public ProductRecordBuilder(ProductRecord instance) {
     this.name = initialValue(instance.name());
     this.price = initialValue(instance.price());
-    if (this.price.value() == null) {
-      throw new IllegalArgumentException(
-          "Cannot initialize builder from instance: field 'price' is marked as non-null but source object has null value");
-    }
     this.category = initialValue(instance.category());
   }
 

example/target/generated-sources/annotations/org/javahelpers/simple/builders/example/SimpleBuildersJacksonModule.java

@@ -5,11 +5,11 @@
 
 public class SimpleBuildersJacksonModule extends SimpleModule {
 
-  @JsonDeserialize(builder = JacksonIntegrationDtoBuilder.class)
-  private interface JacksonIntegrationDtoMixin {
-  }
-
   public SimpleBuildersJacksonModule() {
     setMixInAnnotation(JacksonIntegrationDto.class, JacksonIntegrationDtoMixin.class);
   }
+
+  @JsonDeserialize(builder = JacksonIntegrationDtoBuilder.class)
+  private interface JacksonIntegrationDtoMixin {
+  }
 }

processor/src/main/java/org/javahelpers/simple/builders/processor/BuilderProcessor.java

@@ -47,6 +47,7 @@
 import org.javahelpers.simple.builders.processor.generators.integration.JacksonModuleGenerator;
 import org.javahelpers.simple.builders.processor.model.core.BuilderConfiguration;
 import org.javahelpers.simple.builders.processor.model.core.BuilderDefinitionDto;
+import org.javahelpers.simple.builders.processor.model.core.GenerationTargetClassDto;
 import org.javahelpers.simple.builders.processor.processing.BuilderConfigurationReader;
 import org.javahelpers.simple.builders.processor.processing.CompilerArgumentsEnum;
 import org.javahelpers.simple.builders.processor.processing.CompilerArgumentsReader;
@@ -107,9 +108,18 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
 
     // Generate Jackson Module if processing is over and feature is enabled
     if (roundEnv.processingOver()) {
-      var modules = jacksonModuleGenerator.getModuleDefinitions();
-      for (var module : modules) {
-        codeGenerator.generateJacksonModule(module);
+      List<GenerationTargetClassDto> moduleClassDefs =
+          jacksonModuleGenerator.getModuleDefinitions();
+      for (GenerationTargetClassDto moduleClassDef : moduleClassDefs) {
+        String packageName = moduleClassDef.getTypeName().getPackageName();
+        context.info("Generating Jackson Module in package '%s'", packageName);
+        try {
+          codeGenerator.generateClass(moduleClassDef);
+        } catch (BuilderException e) {
+          context.warning(
+              "simple-builders: Error generating Jackson module for package %s: %s",
+              packageName, e.getMessage());
+        }
       }
       // Reset indentation after Jackson module generation as well
       context.resetIndentation();
@@ -199,7 +209,7 @@ private void process(Element annotatedElement, BuilderConfiguration config)
       throws BuilderException {
     context.initConfigurationForProcessingTarget(config);
     BuilderDefinitionDto builderDef = extractFromElement(annotatedElement, context);
-    codeGenerator.generateBuilder(builderDef);
+    codeGenerator.generateClass(builderDef);
 
     // Collect info for Jackson Module if enabled
     jacksonModuleGenerator.addEntry(builderDef, annotatedElement);
@@ -209,7 +219,7 @@ private void process(Element annotatedElement, BuilderConfiguration config)
     context.debugEndOperation(
         "Generated builder with %d fields and %d methods for %s",
         builderDef.getAllFieldsForBuilder().size(),
-        builderDef.getCoreMethods().size(),
+        builderDef.getMethods().size(),
         builderDef.getBuilderTypeName().getClassName());
   }
 

processor/src/main/java/org/javahelpers/simple/builders/processor/analysis/JavaLangMapper.java

@@ -93,6 +93,7 @@ public static Modifier mapAccessModifier(AccessModifier accessModifier) {
     }
     return switch (accessModifier) {
       case PUBLIC, DEFAULT -> Modifier.PUBLIC;
+      case PROTECTED -> Modifier.PROTECTED;
       case PRIVATE -> Modifier.PRIVATE;
       case PACKAGE_PRIVATE -> null; // Package-private has no explicit modifier
     };