Use Jstachio for code templating

avaje-record-builder-core/pom.xml

@@ -15,6 +15,7 @@
 
   <properties>
     <avaje.prisms.version>1.31</avaje.prisms.version>
+    <io.jstach.version>1.3.6</io.jstach.version>
   </properties>
 
   <dependencies>
@@ -25,6 +26,20 @@
       <optional>true</optional>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+        <groupId>io.jstach</groupId>
+        <artifactId>jstachio-annotation</artifactId>
+        <version>${io.jstach.version}</version>
+        <optional>true</optional>
+        <scope>provided</scope>
+    </dependency>
+    <dependency>
+        <groupId>io.jstach</groupId>
+        <artifactId>jstachio-apt</artifactId>
+        <version>${io.jstach.version}</version>
+        <optional>true</optional>
+        <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>org.jspecify</groupId>
       <artifactId>jspecify</artifactId>

avaje-record-builder-core/src/main/java/io/avaje/recordbuilder/internal/ClassBodyBuilder.java

@@ -1,6 +1,5 @@
 package io.avaje.recordbuilder.internal;
 
-import static io.avaje.recordbuilder.internal.Templates.classTemplate;
 import static java.util.stream.Collectors.joining;
 
 import java.text.MessageFormat;
@@ -10,6 +9,8 @@
 import javax.lang.model.element.RecordComponentElement;
 import javax.lang.model.element.TypeElement;
 
+import io.avaje.recordbuilder.internal.Templates.ClassTemplate;
+
 public class ClassBodyBuilder {
 
   private ClassBodyBuilder() {}
@@ -51,7 +52,7 @@ static String createClassStart(
         builderFrom(components).transform(s -> numberOfComponents > 5 ? "\n        " + s : s);
     final String build =
         build(components).transform(s -> numberOfComponents > 6 ? "\n        " + s : s);
-    return classTemplate(
+    return ClassTemplate.classTemplate(
         packageName,
         imports,
         shortName,

avaje-record-builder-core/src/main/java/io/avaje/recordbuilder/internal/RecordModel.java

@@ -98,13 +98,22 @@ String fields() {
       var index = mainType.lastIndexOf(".");
       var isNested = index != -1;
       if (isNested) {
-        typename = new StringBuilder(typename).insert(index + 1, "@Nullable ").toString();
+        typename =
+            new StringBuilder(typename)
+                .insert(
+                    index + 1,
+                    APContext.typeElement(NullablePrism.PRISM_TYPE) != null ? "@Nullable " : "")
+                .toString();
       }
 
       builder.append(
           "  private %s%s %s%s;\n"
               .formatted(
-                  isNested || Utils.isNullableType(uType.mainType()) ? "" : "@Nullable ",
+                  isNested
+                          || APContext.typeElement(NullablePrism.PRISM_TYPE) == null
+                          || Utils.isNullableType(uType.mainType())
+                      ? ""
+                      : "@Nullable ",
                   typename,
                   element.getSimpleName(),
                   defaultVal));

avaje-record-builder-core/src/main/java/io/avaje/recordbuilder/internal/RecordProcessor.java

@@ -5,10 +5,6 @@
 import static io.avaje.recordbuilder.internal.APContext.getModuleInfoReader;
 import static io.avaje.recordbuilder.internal.APContext.logError;
 import static io.avaje.recordbuilder.internal.APContext.typeElement;
-import static io.avaje.recordbuilder.internal.Templates.methodAdd;
-import static io.avaje.recordbuilder.internal.Templates.methodGetter;
-import static io.avaje.recordbuilder.internal.Templates.methodPut;
-import static io.avaje.recordbuilder.internal.Templates.methodSetter;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toMap;
 
@@ -30,6 +26,10 @@
 
 import io.avaje.prism.GenerateAPContext;
 import io.avaje.prism.GenerateUtils;
+import io.avaje.recordbuilder.internal.Templates.MethodAdd;
+import io.avaje.recordbuilder.internal.Templates.MethodGetter;
+import io.avaje.recordbuilder.internal.Templates.MethodPut;
+import io.avaje.recordbuilder.internal.Templates.MethodSetter;
 
 @GenerateUtils
 @GenerateAPContext
@@ -119,8 +119,7 @@ private void readElement(TypeElement type, BuilderPrism prism) {
               .map(Object::toString)
               .collect(joining(", "))
               .transform(s -> s.isEmpty() ? s : "<" + s + ">");
-      writer.append(
-          ClassBodyBuilder.createClassStart(type, typeParams, isImported, packageName));
+      writer.append(ClassBodyBuilder.createClassStart(type, typeParams, isImported, packageName));
 
       methods(writer, typeParams, shortName, components, prism);
     } catch (final IOException e) {
@@ -138,17 +137,19 @@ private void methods(
 
     for (final var element : components) {
       final var type = UType.parse(element.asType());
-      writer.append(methodSetter(element.getSimpleName(), type.shortType(), shortName, typeParams));
+      writer.append(
+          MethodSetter.methodSetter(
+              element.getSimpleName(), type.shortType(), shortName, typeParams));
       if (getters) {
-        writer.append(methodGetter(element.getSimpleName(), type, shortName));
+        writer.append(MethodGetter.methodGetter(element.getSimpleName(), type, shortName));
       }
 
       if (APContext.isAssignable(type.mainType(), "java.util.Collection")) {
 
         String param0ShortType = type.param0().shortType();
         Name simpleName = element.getSimpleName();
         writer.append(
-            methodAdd(
+            MethodAdd.methodAdd(
                 simpleName.toString(), type.shortType(), shortName, param0ShortType, typeParams));
       }
 
@@ -158,13 +159,8 @@ private void methods(
         String param1ShortType = type.param1().shortType();
         Name simpleName = element.getSimpleName();
         writer.append(
-            methodPut(
-                simpleName.toString(),
-                type.shortType().transform(ProcessorUtils::trimAnnotations),
-                shortName,
-                param0ShortType,
-                param1ShortType,
-                typeParams));
+            MethodPut.methodPut(
+                simpleName.toString(), shortName, param0ShortType, param1ShortType, typeParams));
       }
     }
     writer.append("}");