Added Builder to Java generated code

Author: pwall567

CHANGELOG.md

@@ -2,6 +2,16 @@
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [0.81] - 2022-06-30
+### Changed
+- `pom.xml`: bumped dependency version
+
+## [0.80] - 2022-06-30
+### Changed
+- `pom.xml`: switched to `log-front` 5.0, dropped `logback`
+- `pom.xml`: bumped dependency version
+- templates: added `Builder` classes to Java output
+
 ## [0.79] - 2022-06-16
 ### Changed
 - `CodeGenerator`: fixed additional bug in validation in derived types

CONFIG.md

@@ -71,6 +71,9 @@ The default target language is Kotlin; to change this, the `targetLanguage` prop
 ```
 The values allowed are `kotlin`, `java` or `typescript`.
 
+**New in version 0.80:** Java output now includes `Builder` classes, to aid with creation of classes with long
+constructor parameter lists.
+
 
 ## `packageName`
 

pom.xml

@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>net.pwall.json</groupId>
   <artifactId>json-kotlin-schema-codegen</artifactId>
-  <version>0.79</version>
+  <version>0.81</version>
   <name>JSON Schema Code Generation</name>
   <description>Code generation from JSON Schema to Kotlin or Java</description>
   <packaging>jar</packaging>
@@ -61,7 +61,7 @@
     <dependency>
       <groupId>net.pwall.json</groupId>
       <artifactId>json-kotlin-schema</artifactId>
-      <version>0.35</version>
+      <version>0.36</version>
     </dependency>
     <dependency>
       <groupId>net.pwall.json</groupId>
@@ -91,12 +91,12 @@
     <dependency>
       <groupId>net.pwall.yaml</groupId>
       <artifactId>yaml-simple</artifactId>
-      <version>1.12</version>
+      <version>1.13</version>
     </dependency>
     <dependency>
       <groupId>net.pwall.log</groupId>
       <artifactId>log-front</artifactId>
-      <version>4.0</version>
+      <version>5.0</version>
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
@@ -113,12 +113,6 @@
       <artifactId>kotlin-test-junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>ch.qos.logback</groupId>
-      <artifactId>logback-classic</artifactId>
-      <version>1.2.11</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

src/main/kotlin/net/pwall/json/schema/codegen/CodeGenerator.kt

@@ -66,8 +66,8 @@ import net.pwall.json.schema.validation.PatternValidator
 import net.pwall.json.schema.validation.StringValidator
 import net.pwall.json.schema.validation.TypeValidator
 import net.pwall.json.schema.validation.UniqueItemsValidator
+import net.pwall.log.Log.getLogger
 import net.pwall.log.Logger
-import net.pwall.log.LoggerFactory
 import net.pwall.mustache.Template
 import net.pwall.mustache.parser.Parser as MustacheParser
 import net.pwall.util.Strings
@@ -97,7 +97,7 @@ class CodeGenerator(
     /** An optional marker interface to add to each generated class */
     var markerInterface: ClassId? = null,
     /** A [Logger] object for the output of logging messages */
-    val log: Logger = LoggerFactory.getDefaultLogger(CodeGenerator::class.qualifiedName)
+    val log: Logger = getLogger(CodeGenerator::class.qualifiedName)
 ) {
 
     enum class NestedClassNameOption {

src/main/resources/java/builder.mustache

@@ -0,0 +1,18 @@
+    public static class Builder {
+
+{{#properties}}        private {{>type}} {{&javaName}};
+{{/properties}}
+
+{{#properties}}        public Builder with{{&capitalisedName}}({{>type}} {{&javaName}}) {
+            this.{{&javaName}} = {{&javaName}};
+            return this;
+        }
+
+{{/properties}}
+        public {{&className}} build() {
+            return new {{&className}}(
+{{#properties}}                    {{&javaName}}{{^last}},{{/last}}
+{{/properties}}            );
+        }
+
+    }

src/main/resources/java/class.mustache

@@ -19,6 +19,7 @@
 {{/baseProperty}}{{/properties}}    }
 
 {{/numberOfProperties}}{{>getters}}{{>equals}}
-{{>hashcode}}{{#nestedClasses}}
+{{>hashcode}}
+{{>builder}}{{#nestedClasses}}
 {{#constraints}}{{#indent.increment}}{{>nested_class}}{{/indent.increment}}{{/constraints}}{{/nestedClasses}}
 }{{/constraints}}

src/test/kotlin/net/pwall/json/schema/codegen/CodeGeneratorAnyTest.kt

@@ -103,6 +103,23 @@ public class TestGenerateAny {
         return aaa.hashCode();
     }
 
+    public static class Builder {
+
+        private Object aaa;
+
+        public Builder withAaa(Object aaa) {
+            this.aaa = aaa;
+            return this;
+        }
+
+        public TestGenerateAny build() {
+            return new TestGenerateAny(
+                    aaa
+            );
+        }
+
+    }
+
 }
 """
 

src/test/kotlin/net/pwall/json/schema/codegen/CodeGeneratorArrayItemTest.kt

@@ -183,6 +183,37 @@ public class TestArrayItems {
         return hash ^ (ccc != null ? ccc.hashCode() : 0);
     }
 
+    public static class Builder {
+
+        private List<Integer> aaa;
+        private List<String> bbb;
+        private List<List<String>> ccc;
+
+        public Builder withAaa(List<Integer> aaa) {
+            this.aaa = aaa;
+            return this;
+        }
+
+        public Builder withBbb(List<String> bbb) {
+            this.bbb = bbb;
+            return this;
+        }
+
+        public Builder withCcc(List<List<String>> ccc) {
+            this.ccc = ccc;
+            return this;
+        }
+
+        public TestArrayItems build() {
+            return new TestArrayItems(
+                    aaa,
+                    bbb,
+                    ccc
+            );
+        }
+
+    }
+
 }
 """
 

src/test/kotlin/net/pwall/json/schema/codegen/CodeGeneratorArrayTest.kt

@@ -152,6 +152,30 @@ public class TestArray {
         return hash ^ bbb.hashCode();
     }
 
+    public static class Builder {
+
+        private List<Person> aaa;
+        private Set<String> bbb;
+
+        public Builder withAaa(List<Person> aaa) {
+            this.aaa = aaa;
+            return this;
+        }
+
+        public Builder withBbb(Set<String> bbb) {
+            this.bbb = bbb;
+            return this;
+        }
+
+        public TestArray build() {
+            return new TestArray(
+                    aaa,
+                    bbb
+            );
+        }
+
+    }
+
     public static class Person {
 
         private final UUID id;

src/test/kotlin/net/pwall/json/schema/codegen/CodeGeneratorBaseAndDerivedClassTest.kt

@@ -192,6 +192,23 @@ public class TestBase {
         return aaa.hashCode();
     }
 
+    public static class Builder {
+
+        private String aaa;
+
+        public Builder withAaa(String aaa) {
+            this.aaa = aaa;
+            return this;
+        }
+
+        public TestBase build() {
+            return new TestBase(
+                    aaa
+            );
+        }
+
+    }
+
 }
 """
 
@@ -237,6 +254,30 @@ public class TestBaseDerived extends TestBase {
         return hash ^ bbb.hashCode();
     }
 
+    public static class Builder {
+
+        private String aaa;
+        private String bbb;
+
+        public Builder withAaa(String aaa) {
+            this.aaa = aaa;
+            return this;
+        }
+
+        public Builder withBbb(String bbb) {
+            this.bbb = bbb;
+            return this;
+        }
+
+        public TestBaseDerived build() {
+            return new TestBaseDerived(
+                    aaa,
+                    bbb
+            );
+        }
+
+    }
+
 }
 """
 

src/test/kotlin/net/pwall/json/schema/codegen/CodeGeneratorBaseAndEmptyDerivedClassTest.kt

@@ -157,6 +157,23 @@ public class TestBase {
         return aaa.hashCode();
     }
 
+    public static class Builder {
+
+        private String aaa;
+
+        public Builder withAaa(String aaa) {
+            this.aaa = aaa;
+            return this;
+        }
+
+        public TestBase build() {
+            return new TestBase(
+                    aaa
+            );
+        }
+
+    }
+
 }
 """
 
@@ -190,6 +207,23 @@ public class TestBaseEmptyDerived extends TestBase {
         return super.hashCode();
     }
 
+    public static class Builder {
+
+        private String aaa;
+
+        public Builder withAaa(String aaa) {
+            this.aaa = aaa;
+            return this;
+        }
+
+        public TestBaseEmptyDerived build() {
+            return new TestBaseEmptyDerived(
+                    aaa
+            );
+        }
+
+    }
+
 }
 """
 

src/test/kotlin/net/pwall/json/schema/codegen/CodeGeneratorClassNameTest.kt

@@ -87,6 +87,23 @@ public class Supplied {
         return id.hashCode();
     }
 
+    public static class Builder {
+
+        private String id;
+
+        public Builder withId(String id) {
+            this.id = id;
+            return this;
+        }
+
+        public Supplied build() {
+            return new Supplied(
+                    id
+            );
+        }
+
+    }
+
 }
 """
 

src/test/kotlin/net/pwall/json/schema/codegen/CodeGeneratorCommentTest.kt

@@ -91,6 +91,15 @@ public class TestEmpty {
         return 0;
     }
 
+    public static class Builder {
+
+        public TestEmpty build() {
+            return new TestEmpty(
+            );
+        }
+
+    }
+
 }
 """