Class model and builder generation reworked (#7256)

Class model and builder generator rework Signed-off-by: David Kral <[email protected]>
helidon-io · Aug 16, 2023 · 66ca33e · 66ca33e
1 parent 97735c1
commit 66ca33e
Show file tree

Hide file tree

Showing 85 changed files with 7,177 additions and 2,945 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -505,6 +505,11 @@
                 <artifactId>helidon-common-processor-helidon-copyright</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.helidon.common.processor</groupId>
+                <artifactId>helidon-common-processor-class-model</artifactId>
+                <version>${helidon.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.helidon.common.testing</groupId>
                 <artifactId>helidon-common-testing-junit5</artifactId>

diff --git a/builder/processor/pom.xml b/builder/processor/pom.xml
@@ -50,6 +50,10 @@
             <artifactId>hamcrest-all</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.common.processor</groupId>
+            <artifactId>helidon-common-processor-class-model</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/builder/processor/src/main/java/io/helidon/builder/processor/BlueprintProcessor.java b/builder/processor/src/main/java/io/helidon/builder/processor/BlueprintProcessor.java
diff --git a/builder/processor/src/main/java/io/helidon/builder/processor/CustomMethods.java b/builder/processor/src/main/java/io/helidon/builder/processor/CustomMethods.java
@@ -32,6 +32,7 @@
 import static io.helidon.builder.processor.Types.FACTORY_METHOD_TYPE;
 import static io.helidon.builder.processor.Types.PROTOTYPE_CUSTOM_METHOD_TYPE;
 import static io.helidon.builder.processor.Types.VOID_TYPE;
+import static io.helidon.common.processor.classmodel.ClassModel.TYPE_TOKEN;
 
 record CustomMethods(List<CustomMethod> factoryMethods,
                      List<CustomMethod> builderMethods,
@@ -101,7 +102,10 @@ private static GeneratedMethod prototypeMethod(Errors.Collector errors,
         // return CustomMethodsType.methodName(this, param1, param2)
         String generatedCall =
                 VOID_TYPE.equals(customMethod.returnType) ? "" : "return "
-                        + customMethodsType.genericTypeName().fqName() + "."
+                        + TYPE_TOKEN
+                        + customMethodsType.genericTypeName().fqName()
+                        + TYPE_TOKEN
+                        + "."
                         + customMethod.name()
                         + "("
                         + String.join(", ", argumentNames)
@@ -146,12 +150,15 @@ private static GeneratedMethod builderMethod(Errors.Collector errors,
                                      .toList());
 
         // return CustomMethodsType.methodName(this, param1, param2)
-        String generatedCall = customMethodsType.genericTypeName().fqName() + "."
+        String generatedCall = TYPE_TOKEN
+                + customMethodsType.genericTypeName().fqName()
+                + TYPE_TOKEN
+                + "."
                 + customMethod.name()
                 + "("
                 + String.join(", ", argumentNames)
                 + ");"
-                + "  return self()";
+                + "\nreturn self()";
 
         return new GeneratedMethod(
                 new Method(typeInformation.prototypeBuilder(),
@@ -192,7 +199,10 @@ private static GeneratedMethod factoryMethod(Errors.Collector errors,
         // if returns: return CustomMethodsType.methodName(param1, param2)
         String generatedCall =
                 VOID_TYPE.equals(customMethod.returnType) ? "" : "return "
-                        + customMethodsType.genericTypeName().fqName() + "."
+                        + TYPE_TOKEN
+                        + customMethodsType.genericTypeName().fqName()
+                        + TYPE_TOKEN
+                        + "."
                         + customMethod.name()
                         + "("
                         + customMethod.arguments().stream().map(Argument::name).collect(Collectors.joining(", "))