Supporting Generics, Reviewing and improving tests

.github/workflows/maven.yml

@@ -21,6 +21,7 @@ jobs:
     permissions:
       contents: read
       pull-requests: write
+      checks: write
 
     steps:
     - uses: actions/checkout@v4
@@ -31,7 +32,7 @@ jobs:
         distribution: 'temurin'
         cache: maven
     - name: Build with Maven
-      run: mvn -B verify --file pom.xml
+      run: mvn -B verify -Pmetrics --file pom.xml
 
     - name: Upload JaCoCo HTML report (processor)
       if: always()
@@ -49,13 +50,25 @@ jobs:
         path: processor/target/site/jacoco/jacoco.xml
         if-no-files-found: warn
 
-    - name: Upload coverage to Codecov
+    - name: Upload test results to Codecov (processor)
+      if: always()
+      uses: codecov/test-results-action@v1
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: |
+          processor/target/surefire-reports/*.xml
+          processor/target/failsafe-reports/*.xml
+        if-no-files-found: warn
+        fail_ci_if_error: true
+        verbose: false
+
+    - name: Upload coverage to Codecov (processor)
       if: always()
       uses: codecov/codecov-action@v5
       with:
         fail_ci_if_error: true
         files: processor/target/site/jacoco/jacoco.xml
         flags: processor
         name: codecov-upload
-        verbose: true
+        verbose: false
         token: ${{ secrets.CODECOV_TOKEN }}

processor/pom.xml

@@ -191,48 +191,7 @@
       </plugin>
 
       <!-- JaCoCo Code Coverage (processor module only) -->
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>${plugin.jacoco.version}</version>
-        <executions>
-          <execution>
-            <id>prepare-agent</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>report</id>
-            <phase>verify</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-            <configuration>
-              <excludes>
-                <!-- Exclude mapper utilities from coverage -->
-                <exclude>**/*Mapper*.class</exclude>
-                <!-- Exclude DTOs package from coverage -->
-                <exclude>**/processor/dtos/**</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-        <configuration>
-          <!-- Only cover main sources of this module -->
-          <dataFile>${project.build.directory}/jacoco.exec</dataFile>
-          <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
-          <reports>
-            <report>html</report>
-            <report>xml</report>
-            <report>csv</report>
-          </reports>
-          <excludes>
-            <!-- exclude any generated sources or test utilities if they ever get packaged under main -->
-            <exclude>**/generated/**</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
+      <!-- moved to 'coverage' profile -->
     </plugins>
   </build>
 
@@ -308,6 +267,55 @@
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>metrics</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>${plugin.jacoco.version}</version>
+            <executions>
+              <execution>
+                <id>prepare-agent</id>
+                <goals>
+                  <goal>prepare-agent</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>report</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>report</goal>
+                </goals>
+                <configuration>
+                  <excludes>
+                    <!-- Exclude mapper utilities from coverage -->
+                    <exclude>**/*Mapper*.class</exclude>
+                    <!-- Exclude DTOs package from coverage -->
+                    <exclude>**/processor/dtos/**</exclude>
+                  </excludes>
+                </configuration>
+              </execution>
+            </executions>
+            <configuration>
+              <!-- Only cover main sources of this module -->
+              <dataFile>${project.build.directory}/jacoco.exec</dataFile>
+              <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
+              <reports>
+                <report>html</report>
+                <report>xml</report>
+                <report>csv</report>
+              </reports>
+              <excludes>
+                <!-- exclude any generated sources or test utilities if they ever get packaged under main -->
+                <exclude>**/generated/**</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 
 </project>

processor/src/main/java/org/javahelpers/simple/builders/processor/dtos/BuilderDefinitionDto.java

@@ -25,6 +25,7 @@
 package org.javahelpers.simple.builders.processor.dtos;
 
 import java.util.LinkedList;
+import java.util.List;
 
 /** BuilderDefinitionDto holds all information for generating a builder. */
 public class BuilderDefinitionDto {
@@ -34,17 +35,20 @@ public class BuilderDefinitionDto {
   /** Type of builder. Containing package and name of DTO. */
   private TypeName builderTypeName;
 
+  /** Generic parameters declared on the target DTO (e.g., <T extends Number, U>). */
+  private final List<GenericParameterDto> generics = new LinkedList<>();
+
   /**
    * List of all methods of target DTO which are supported by builder and not targeting a specific
    * DTO field.
    */
-  private final LinkedList<MethodDto> methodsForBuilder = new LinkedList<>();
+  private final List<MethodDto> methodsForBuilder = new LinkedList<>();
 
   /**
    * List of all fields of target DTO which are supported by builder. A field could be supported by
    * several functions in builder.
    */
-  private final LinkedList<FieldDto> setterFieldsForBuilder = new LinkedList<>();
+  private final List<FieldDto> setterFieldsForBuilder = new LinkedList<>();
 
   /**
    * Getting type of builder.
@@ -99,7 +103,7 @@ public void addMethod(MethodDto member) {
    * @return list of methods with type {@code
    *     org.javahelpers.simple.builders.internal.dtos.MethodDto}
    */
-  public LinkedList<MethodDto> getMethodsForBuilder() {
+  public List<MethodDto> getMethodsForBuilder() {
     return methodsForBuilder;
   }
 
@@ -117,7 +121,17 @@ public void addField(FieldDto field) {
    *
    * @return list of fields with type {@code org.javahelpers.simple.builders.internal.dtos.FieldDto}
    */
-  public LinkedList<FieldDto> getSetterFieldsForBuilder() {
+  public List<FieldDto> getSetterFieldsForBuilder() {
     return setterFieldsForBuilder;
   }
+
+  /** Adds a generic parameter definition. */
+  public void addGeneric(GenericParameterDto generic) {
+    generics.add(generic);
+  }
+
+  /** Returns the list of generic parameters of the target DTO, in declared order. */
+  public List<GenericParameterDto> getGenerics() {
+    return generics;
+  }
 }

processor/src/main/java/org/javahelpers/simple/builders/processor/dtos/FieldDto.java

@@ -41,6 +41,12 @@ public class FieldDto {
   /** List of all methods in builder, which change the field. */
   private final List<MethodDto> fieldSetterMethodsList = new ArrayList<>();
 
+  /** Optional Javadoc of the field extracted from setter or constructor. */
+  private String javaDoc;
+
+  /** Method-level generics declared on the setter, to be reused in builder methods. */
+  private final List<GenericParameterDto> fieldGenerics = new ArrayList<>();
+
   /**
    * Getting name of field.
    *
@@ -95,4 +101,35 @@ public List<MethodDto> getMethods() {
   public void addMethod(MethodDto methodDto) {
     this.fieldSetterMethodsList.add(methodDto);
   }
+
+  /**
+   * Getting extracted Javadoc.
+   *
+   * @return Javadoc text or null if none present
+   */
+  public String getJavaDoc() {
+    return javaDoc;
+  }
+
+  /**
+   * Setting extracted Javadoc.
+   *
+   * @param javaDoc Javadoc text
+   */
+  public void setJavaDoc(String javaDoc) {
+    this.javaDoc = javaDoc;
+  }
+
+  /** Returns generics declared on the setter (field-specific). */
+  public List<GenericParameterDto> getFieldGenerics() {
+    return fieldGenerics;
+  }
+
+  /** Replaces generics list with the provided entries. */
+  public void setFieldGenerics(List<GenericParameterDto> generics) {
+    this.fieldGenerics.clear();
+    if (generics != null) {
+      this.fieldGenerics.addAll(generics);
+    }
+  }
 }

processor/src/main/java/org/javahelpers/simple/builders/processor/dtos/GenericParameterDto.java

@@ -0,0 +1,57 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2025 Andreas Igel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package org.javahelpers.simple.builders.processor.dtos;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/** Represents a generic type parameter (e.g., T extends Number & Comparable<T>). */
+public class GenericParameterDto {
+  /** The name of the generic parameter (e.g., "T"). */
+  private String name;
+
+  /** Optional upper bounds in declared order (empty if unbounded). */
+  private final List<TypeName> upperBounds = new LinkedList<>();
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  /** Add an upper bound. */
+  public void addUpperBound(TypeName bound) {
+    if (bound != null) {
+      upperBounds.add(bound);
+    }
+  }
+
+  /** Returns all upper bounds (possibly empty). */
+  public List<TypeName> getUpperBounds() {
+    return upperBounds;
+  }
+}

processor/src/main/java/org/javahelpers/simple/builders/processor/dtos/MethodDto.java

@@ -27,6 +27,7 @@
 import static org.javahelpers.simple.builders.processor.dtos.MethodTypes.PROXY;
 
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Optional;
 import javax.lang.model.element.Modifier;
 import org.apache.commons.lang3.StringUtils;
@@ -51,6 +52,9 @@ public class MethodDto {
   /** Definition of inner implementation for method. */
   private final MethodCodeDto methodCodeDto = new MethodCodeDto();
 
+  /** Method-level type parameters (e.g., <T extends Serializable>). */
+  private final List<GenericParameterDto> methodGenerics = new LinkedList<>();
+
   /**
    * Getting type of method for source code generation. Defaults to {@code
    * org.javahelpers.simple.builders.internal.dtos.MethodTypes.PROXY}.
@@ -159,6 +163,19 @@ public LinkedList<MethodParameterDto> getParameters() {
     return parameters;
   }
 
+  /** Replaces method-level generic parameter list with the provided entries. */
+  public void setMethodGenerics(List<GenericParameterDto> generics) {
+    this.methodGenerics.clear();
+    if (generics != null) {
+      this.methodGenerics.addAll(generics);
+    }
+  }
+
+  /** Returns declared method-level generic parameters. */
+  public List<GenericParameterDto> getMethodGenerics() {
+    return methodGenerics;
+  }
+
   /**
    * Getting the access modifier for method. Optional for usage in stream-notation.
    *

processor/src/main/java/org/javahelpers/simple/builders/processor/dtos/TypeNameVariable.java

@@ -0,0 +1,35 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2025 Andreas Igel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.javahelpers.simple.builders.processor.dtos;
+
+/** Represents a type variable usage like T, K, V in a generic signature. */
+public class TypeNameVariable extends TypeName {
+  /**
+   * Creates a TypeName representing a type variable (no package). The variable name is stored as
+   * className for simplicity across the existing TypeName API.
+   */
+  public TypeNameVariable(String variableName) {
+    super("", variableName);
+  }
+}