Implemented and used FtgoJSONSchema2PojoPlugin, which supports multiple sources

Author: cer

Diff for: buildSrc/build.gradle

@@ -8,4 +8,6 @@ dependencies {
     compile 'mysql:mysql-connector-java:5.1.39'
     compile 'com.amazonaws:aws-java-sdk-dynamodb:1.11.158'
     compile 'commons-lang:commons-lang:2.6'
+
+    compile 'org.jsonschema2pojo:jsonschema2pojo-core:1.0.1'
 }

Diff for: buildSrc/src/main/groovy/FtgoJSONSchema2PojoPlugin.groovy

@@ -0,0 +1,32 @@
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+class FtgoJSONSchema2PojoPlugin implements Plugin<Project> {
+
+    @Override
+    void apply(Project project) {
+        def jsonSchemaSources = project.container(JSONSchemaSource)
+        project.extensions.add('ftgoJsonSchema2Pojo', jsonSchemaSources)
+
+        jsonSchemaSources.all {
+            def source = delegate as JSONSchemaSource
+
+            source.codeGen = project.task("ftgoJSONSchemaToPojoCodeGen${source.name.capitalize()}",
+                    type: FtgoJSONSchemaToPojoCodeGen,
+                    group: 'build',
+                    description: "Code generator") as FtgoJSONSchemaToPojoCodeGen
+
+
+            source.codeGen.targetDirectory = new File(project.buildDir, "generated-js2p-code-${source.name}")
+
+
+            project.afterEvaluate {
+                project.sourceSets[source.sourceSet].java.srcDirs += [source.codeGen.targetDirectory]
+                project.tasks.compileJava.dependsOn(source.codeGen)
+            }
+
+
+        }
+    }
+
+}

Diff for: buildSrc/src/main/groovy/FtgoJSONSchemaToPojoCodeGen.groovy

@@ -0,0 +1,57 @@
+import org.gradle.api.DefaultTask
+import org.gradle.api.file.FileCollection
+import org.gradle.api.tasks.TaskAction
+import org.jsonschema2pojo.GenerationConfig
+import org.jsonschema2pojo.Jsonschema2Pojo
+import org.jsonschema2pojo.DefaultGenerationConfig
+
+class FtgoJSONSchemaToPojoCodeGen  extends DefaultTask {
+
+    FileCollection source
+    String targetPackage;
+    boolean includeAdditionalProperties;
+    boolean generateBuilders
+    boolean useLongIntegers
+    File targetDirectory
+
+    @TaskAction
+    def generate() {
+        GenerationConfig configuration = new DefaultGenerationConfig() {
+
+            @Override
+            Iterator<URL> getSource() {
+                FtgoJSONSchemaToPojoCodeGen.this.source.collect { it.toURL()}.iterator()
+            }
+
+            @Override
+            String getTargetPackage() {
+                FtgoJSONSchemaToPojoCodeGen.this.targetPackage
+            }
+
+            @Override
+            boolean isIncludeAdditionalProperties() {
+                FtgoJSONSchemaToPojoCodeGen.this.includeAdditionalProperties
+            }
+
+            @Override
+            boolean isGenerateBuilders() {
+                FtgoJSONSchemaToPojoCodeGen.this.generateBuilders
+            }
+
+            @Override
+            boolean isUseLongIntegers() {
+                FtgoJSONSchemaToPojoCodeGen.this.useLongIntegers
+            }
+
+            @Override
+            File getTargetDirectory() {
+                return FtgoJSONSchemaToPojoCodeGen.this.targetDirectory
+            }
+        }
+
+
+        Jsonschema2Pojo.generate(configuration)
+    }
+
+
+}

Diff for: buildSrc/src/main/groovy/JSONSchemaSource.groovy

@@ -0,0 +1,44 @@
+import groovy.transform.ToString
+import org.gradle.api.file.FileCollection
+
+@ToString(includes = 'name', includePackage = false)
+class JSONSchemaSource {
+
+    final String name
+
+    def JSONSchemaSource(String name) {
+        this.name = name
+    }
+
+    FtgoJSONSchemaToPojoCodeGen codeGen
+
+    String sourceSet = "main"
+
+    void setSource(FileCollection source) {
+        this.codeGen.source = source
+    }
+
+    void setTargetPackage(String targetPackage) {
+        this.codeGen.targetPackage = targetPackage
+    }
+
+    void setIncludeAdditionalProperties(boolean includeAdditionalProperties) {
+        this.codeGen.includeAdditionalProperties = includeAdditionalProperties
+    }
+
+    void setGenerateBuilders(boolean generateBuilders) {
+        this.codeGen.generateBuilders = generateBuilders
+    }
+
+    void setUseLongIntegers(boolean useLongIntegers) {
+        this.codeGen.useLongIntegers = useLongIntegers
+    }
+
+    File getTargetDirectory() {
+        return this.codeGen.targetDirectory
+    }
+
+    void setSourceSet(String sourceSet) {
+        this.sourceSet = sourceSet
+    }
+}

Diff for: ftgo-accounting-service-api/src/main/resources/messages/AuthorizeCommand.json

@@ -0,0 +1,22 @@
+{
+  "type": "object",
+  "properties": {
+    "consumerId": {
+      "type": "integer",
+      "format": "int64"
+    },
+    "orderId": {
+      "type": "integer",
+      "format": "int64"
+    },
+    "orderTotal": {
+      "type": "string"
+    }
+  },
+  "required": [
+    "consumerId",
+    "orderId",
+    "orderTotal"
+  ],
+  "javaInterfaces": ["io.eventuate.tram.commands.common.Command"]
+}

Diff for: ftgo-accounting-service-api/src/main/java/net/chrisrichardson/ftgo/accountservice/api/AuthorizeCommand.java renamed to ftgo-accounting-service/src/main/java/net/chrisrichardson/ftgo/accountservice/api/AuthorizeCommand.java

@@ -7,7 +7,6 @@ public class AuthorizeCommand implements Command {
   private long consumerId;
   private Long orderId;
   private Money orderTotal;
-  private Money amount;
 
   private AuthorizeCommand() {
   }
@@ -18,14 +17,6 @@ public AuthorizeCommand(long consumerId, Long orderId, Money orderTotal) {
     this.orderTotal = orderTotal;
   }
 
-  public Money getAmount() {
-    return amount;
-  }
-
-  public void setAmount(Money amount) {
-    this.amount = amount;
-  }
-
   public long getConsumerId() {
     return consumerId;
   }

Diff for: ftgo-order-service/build.gradle

@@ -33,7 +33,7 @@ apply plugin: 'com.google.protobuf'
 apply plugin: IntegrationTestsPlugin
 apply plugin: ComponentTestsPlugin
 
-apply plugin: 'jsonschema2pojo'
+apply plugin: FtgoJSONSchema2PojoPlugin
 
 
 dependencyManagement {
@@ -179,19 +179,22 @@ dependencies {
 
 }
 
-jsonSchema2Pojo {
-    source = files("../ftgo-consumer-service-api/src/main/resources/ValidateOrderByConsumer.json")
-    targetPackage = "net.chrisrichardson.ftgo.consumerservice.api"
-    includeAdditionalProperties = false
-    generateBuilders = true
-    useLongIntegers = true
+ftgoJsonSchema2Pojo {
+
+    ftgoConsumerService {
+        source = files("../ftgo-consumer-service-api/src/main/resources/ValidateOrderByConsumer.json")
+        targetPackage = "net.chrisrichardson.ftgo.consumerservice.api"
+        includeAdditionalProperties = false
+        generateBuilders = true
+        useLongIntegers = true
+    }
+    ftgoAccountingService {
+        source = files("../ftgo-accounting-service-api/src/main/resources/messages")
+        targetPackage = "net.chrisrichardson.ftgo.accountservice.api"
+        includeAdditionalProperties = false
+        generateBuilders = true
+        useLongIntegers = true
+    }
 
 }
 
-sourceSets {
-    test {
-        java {
-            srcDirs += [ jsonSchema2Pojo.targetDirectory ]
-        }
-    }
-}

Diff for: ftgo-order-service/src/main/java/net/chrisrichardson/ftgo/orderservice/sagas/createorder/CreateOrderSagaState.java

@@ -102,7 +102,7 @@ ValidateOrderByConsumer makeValidateOrderByConsumerCommand() {
   }
 
   AuthorizeCommand makeAuthorizeCommand() {
-    return new AuthorizeCommand(getOrderDetails().getConsumerId(), getOrderId(), getOrderDetails().getOrderTotal());
+    return new AuthorizeCommand().withConsumerId(getOrderDetails().getConsumerId()).withOrderId(getOrderId()).withOrderTotal(getOrderDetails().getOrderTotal().asString());
   }
 
   ApproveOrderCommand makeApproveOrderCommand() {

Diff for: ftgo-order-service/src/test/java/net/chrisrichardson/ftgo/orderservice/sagas/createorder/CreateOrderSagaTest.java

@@ -51,7 +51,7 @@ public void shouldCreateOrder() {
     andGiven().
         successReply().
     expect().
-      command(new AuthorizeCommand(CONSUMER_ID, ORDER_ID, CHICKEN_VINDALOO_ORDER_TOTAL)).
+      command(new AuthorizeCommand().withConsumerId(CONSUMER_ID).withOrderId(ORDER_ID).withOrderTotal(CHICKEN_VINDALOO_ORDER_TOTAL.asString())).
       to(AccountingServiceChannels.accountingServiceChannel).
     andGiven().
         successReply().
@@ -102,7 +102,7 @@ public void shouldRejectDueToFailedAuthorizxation() {
     andGiven().
       successReply().
     expect().
-      command(new AuthorizeCommand(CONSUMER_ID, ORDER_ID, CHICKEN_VINDALOO_ORDER_TOTAL)).
+      command(new AuthorizeCommand().withConsumerId(CONSUMER_ID).withOrderId(ORDER_ID).withOrderTotal(CHICKEN_VINDALOO_ORDER_TOTAL.asString())).
       to(AccountingServiceChannels.accountingServiceChannel).
     andGiven().
       failureReply().