Add plugin zip as an archive, fix lombok in compile (#2)

* Add pack as an artifact.

* Move lombok to compileOnly.

* Use the gradle-all distribute b/c IntelliJ wants to.

* Add protobuf-java dependencies.

* Remove lombok from runtime libraries as it was mostly unused.

It was also futzing with my IntelliJ setup, although admittedly
that was b/c I'd turned off annotation processors b/c the don't
work in Gradle with JDK11.

* Remove gson dependency.

* Use approval files instead of assertions against the AST.

* Use json snapshots instead of binary.

* Add tests for the spring side.

* Format as two space indent.

* Convert ServiceGenerator to javapoet.

Java Poet's DSL is slightly too "Googly" for my personal paste, e.g.
builder all the things, but it's better than raw string interpolation,
and more much widely used/maintained than my own version of the same
thing.

* Move context munging to a helper method.

* Convert Undertow RpcGenerator to javapoet.

* Convert Spring RpcGenerator to javapoet.

* Remove Buffer/Indent that are used with JavaPoet.

* Remove unused package-info.javas.

* Move getServiceInterface to BaseGenerator.

* Remove writeService methods.

* Add a BaseServerGenerator.

* Move Types out of the undertow package.

* Minor cleanup.

* Remove unused Strings class.

* Change TypeMapper.get to return a ClassName.

* Revert "Remove gson dependency."

This reverts commit f3a56c8.

* Have runtime/undertow pull in the plugin so it can codegen output.

This will be used soon/next-commit to do actual "standup the server
and make a few calls" tests.

Author: stephenh

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Sat Sep 08 13:15:19 CDT 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

plugin/build.gradle

@@ -16,8 +16,8 @@ group 'com.flit'
 
 sourceCompatibility = 1.8
 
-if (!(project.hasProperty("release") && project.properties['release'] == "true")) {
-    project.version += ".snapshot." + project.scm.tstamp
+configurations {
+    zip
 }
 
 shadowJar {
@@ -39,17 +39,18 @@ dependencies {
     compile 'commons-io:commons-io:2.5'
     compile 'com.google.protobuf:protobuf-java:3.5.1'
     compile 'com.google.protobuf:protobuf-java-util:3.5.1'
+    compile 'com.squareup:javapoet:1.11.1'
 
     compileOnly('org.projectlombok:lombok:+')
 
     testCompile 'com.github.javaparser:javaparser-core:3.6.9'
     testCompile 'junit:junit:4.12'
+    testCompile 'com.approvaltests:approvaltests:2.0.0'
 }
 
-shadowJar.dependsOn build
+shadowJar.dependsOn compileJava
 
 task pack(type: Zip) {
-
     archiveName = "flit-plugin.zip"
     destinationDir = file("${buildDir}/package")
 
@@ -62,4 +63,9 @@ task pack(type: Zip) {
     }
 }
 
-pack.dependsOn shadowJar
+pack.dependsOn shadowJar
+
+artifacts {
+  zip pack
+}
+

plugin/src/main/java/com/flit/protoc/Main.java

@@ -8,17 +8,9 @@
  */
 public class Main {
 
-    public static void main(String[] args) throws Exception {
-
-        Plugin plugin = new Plugin(
-            PluginProtos.CodeGeneratorRequest
-                .newBuilder()
-                .mergeFrom(System.in)
-                .build()
-        );
-
-        plugin.process().writeTo(System.out);
-    }
-
+  public static void main(String[] args) throws Exception {
+    Plugin plugin = new Plugin(PluginProtos.CodeGeneratorRequest.newBuilder().mergeFrom(System.in).build());
+    plugin.process().writeTo(System.out);
+  }
 
 }

plugin/src/main/java/com/flit/protoc/Parameter.java

@@ -9,32 +9,30 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-@Getter
-@ToString
-public class Parameter {
+@Getter @ToString public class Parameter {
 
-    public static final String PARAM_TARGET = "target";
-    public static final String PARAM_CLIENT = "client";
-    public static final String PARAM_TYPE = "type";
-    public static final String PARAM_CONTEXT = "context";
+  public static final String PARAM_TARGET = "target";
+  public static final String PARAM_CLIENT = "client";
+  public static final String PARAM_TYPE = "type";
+  public static final String PARAM_CONTEXT = "context";
 
-    private String key;
-    private String value;
+  private String key;
+  private String value;
 
-    public Parameter(String[] strings) {
-        this.key = strings[0];
-        this.value = strings[1];
-    }
-
-    public static Map<String, Parameter> of(String value) {
-        if (value == null || (value = value.trim()).isEmpty()) {
-            throw new GeneratorException("Empty value passed to parameter builder");
-        }
+  public Parameter(String[] strings) {
+    this.key = strings[0];
+    this.value = strings[1];
+  }
 
-        return Arrays.stream(value.split(","))
-            .map(p -> p.split("=", 2))
-            .filter(s -> s.length == 2 && !s[0].trim().isEmpty() && !s[1].trim().isEmpty())
-            .map(Parameter::new)
-            .collect(Collectors.toMap(Parameter::getKey, Function.identity()));
+  public static Map<String, Parameter> of(String value) {
+    if (value == null || (value = value.trim()).isEmpty()) {
+      throw new GeneratorException("Empty value passed to parameter builder");
     }
+
+    return Arrays.stream(value.split(","))
+      .map(p -> p.split("=", 2))
+      .filter(s -> s.length == 2 && !s[0].trim().isEmpty() && !s[1].trim().isEmpty())
+      .map(Parameter::new)
+      .collect(Collectors.toMap(Parameter::getKey, Function.identity()));
+  }
 }

plugin/src/main/java/com/flit/protoc/Plugin.java

@@ -4,7 +4,8 @@
 import com.flit.protoc.gen.GeneratorException;
 import com.flit.protoc.gen.server.spring.SpringGenerator;
 import com.flit.protoc.gen.server.undertow.UndertowGenerator;
-import com.google.protobuf.compiler.PluginProtos;
+import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest;
+import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse;
 
 import java.util.Map;
 
@@ -13,60 +14,47 @@
 
 public class Plugin {
 
-    private final PluginProtos.CodeGeneratorRequest request;
+  private final CodeGeneratorRequest request;
 
-    public Plugin(PluginProtos.CodeGeneratorRequest request) {
-        this.request = request;
-    }
-
-    public PluginProtos.CodeGeneratorResponse process() {
-        if (!request.hasParameter()) {
-            return PluginProtos.CodeGeneratorResponse
-                .newBuilder()
-                .setError("Usage: --flit_out=target=server,type=[spring|undertow]:<PATH>")
-                .build();
-        }
-
-        Map<String, Parameter> params = Parameter.of(request.getParameter());
+  public Plugin(CodeGeneratorRequest request) {
+    this.request = request;
+  }
 
-        try {
-            PluginProtos.CodeGeneratorResponse.Builder builder = PluginProtos.CodeGeneratorResponse.newBuilder();
-
-            resolveGenerator(params).generate(request, params).forEach(builder::addFile);
-
-            return builder.build();
-        } catch (GeneratorException e) {
-            return PluginProtos.CodeGeneratorResponse
-                .newBuilder()
-                .setError(e.getMessage())
-                .build();
-        }
+  public CodeGeneratorResponse process() {
+    if (!request.hasParameter()) {
+      return CodeGeneratorResponse.newBuilder().setError("Usage: --flit_out=target=server,type=[spring|undertow]:<PATH>").build();
     }
 
-    private Generator resolveGenerator(Map<String, Parameter> params) {
-
-        if (!params.containsKey(PARAM_TARGET)) {
-            throw new GeneratorException("No argument specified for target");
-        }
-
-        if (!params.containsKey(PARAM_TYPE)) {
-            throw new GeneratorException("No argument specified for type");
-        }
+    Map<String, Parameter> params = Parameter.of(request.getParameter());
+    try {
+      CodeGeneratorResponse.Builder builder = CodeGeneratorResponse.newBuilder();
+      resolveGenerator(params).generate(request, params).forEach(builder::addFile);
+      return builder.build();
+    } catch (GeneratorException e) {
+      return CodeGeneratorResponse.newBuilder().setError(e.getMessage()).build();
+    }
+  }
 
-        switch (params.get(PARAM_TARGET).getValue()) {
-            case "server":
-                switch (params.get(PARAM_TYPE).getValue()) {
-                    case "boot":
-                    case "spring":
-                        return new SpringGenerator();
-                    case "undertow":
-                        return new UndertowGenerator();
-                    default:
-                        throw new GeneratorException("Unknown server type: " + params.get(PARAM_TYPE).getValue());
-                }
-            default:
-                throw new GeneratorException("Unknown target type: " + params.get(PARAM_TARGET).getValue());
+  private Generator resolveGenerator(Map<String, Parameter> params) {
+    if (!params.containsKey(PARAM_TARGET)) {
+      throw new GeneratorException("No argument specified for target");
+    }
+    if (!params.containsKey(PARAM_TYPE)) {
+      throw new GeneratorException("No argument specified for type");
+    }
+    switch (params.get(PARAM_TARGET).getValue()) {
+      case "server":
+        switch (params.get(PARAM_TYPE).getValue()) {
+          case "boot":
+          case "spring":
+            return new SpringGenerator();
+          case "undertow":
+            return new UndertowGenerator();
+          default:
+            throw new GeneratorException("Unknown server type: " + params.get(PARAM_TYPE).getValue());
         }
-
+      default:
+        throw new GeneratorException("Unknown target type: " + params.get(PARAM_TARGET).getValue());
     }
+  }
 }

plugin/src/main/java/com/flit/protoc/gen/Buffer.java

@@ -1,7 +1,8 @@
 package com.flit.protoc.gen;
 
 import com.flit.protoc.Parameter;
-import com.google.protobuf.compiler.PluginProtos;
+import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest;
+import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse;
 
 import java.util.List;
 import java.util.Map;
@@ -11,14 +12,14 @@
  */
 public interface Generator {
 
-    /**
-     * This is the main entry point to code generation: the implementation is decided in the {@link com.flit.protoc.Plugin}
-     * class from the given parameters.
-     *
-     * @param request   The inbound protoc request
-     * @param params    The plugin parameters
-     *
-     * @return  The list of files to be added to the output.
-     */
-    List<PluginProtos.CodeGeneratorResponse.File> generate(PluginProtos.CodeGeneratorRequest request, Map<String, Parameter> params);
+  /**
+   * This is the main entry point to code generation: the implementation is decided in the {@link com.flit.protoc.Plugin}
+   * class from the given parameters.
+   *
+   * @param request   The inbound protoc request
+   * @param params    The plugin parameters
+   *
+   * @return The list of files to be added to the output.
+   */
+  List<CodeGeneratorResponse.File> generate(CodeGeneratorRequest request, Map<String, Parameter> params);
 }

plugin/src/main/java/com/flit/protoc/gen/Generator.java

@@ -1,7 +1,7 @@
 package com.flit.protoc.gen;
 
 public class GeneratorException extends RuntimeException {
-    public GeneratorException(String message) {
-        super(message);
-    }
+  public GeneratorException(String message) {
+    super(message);
+  }
 }