Merge pull request aeron-io#350 from benalexau/interface-hierarchy

Optionally generate Java interface hierarchy.

Author: mjpt777

build.gradle

@@ -326,6 +326,7 @@ project(':sbe-samples') {
  systemProperties(
  'sbe.output.dir': 'build/generated',
  'sbe.target.language': 'Java',
+ 'sbe.java.generate.interfaces': 'false',
  'sbe.validation.stop.on.error': 'true',
  'sbe.validation.xsd': validationXsdPath)
  args = ['src/main/resources/example-schema.xml', 'src/main/resources/example-extension-schema.xml']

sbe-tool/src/main/java/uk/co/real_logic/sbe/SbeTool.java

@@ -49,6 +49,7 @@
  * <li><code>sbe.validation.suppress.output</code>: Should the parser suppress output during validation? Defaults to false.</li>
  * <li><code>sbe.generate.stubs</code>: Generate stubs or not. Defaults to true.</li>
  * <li><code>sbe.generate.ir</code>: Generate IR or not. Defaults to false.</li>
+ * <li><code>sbe.java.generate.interfaces</code>: Generate interface hierarchy or not. Defaults to false.</li>
  * <li><code>sbe.target.language</code>: Target language for code generation, defaults to Java.</li>
  * <li><code>sbe.output.dir</code>: Target directory for code generation, defaults to current directory.</li>
  * </ul>
@@ -115,6 +116,15 @@ public class SbeTool
  */
  public static final String JAVA_GROUP_ORDER_ANNOTATION = "sbe.java.generate.group-order.annotation";
 
+ /**
+ * Boolean system property to turn on or off generation of the interface hierarchy. Defaults to false.
+ */
+ public static final String JAVA_GENERATE_INTERFACES = "sbe.java.generate.interfaces";
+
+ /**
+ * Package in which the generated Java interfaces will be placed.
+ */
+ public static final String JAVA_INTERFACE_PACKAGE = "org.agrona.sbe";
  /**
  * Default class to use as the buffer mutable implementation in generated code.
  */

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/TargetCodeGenerator.java

@@ -22,6 +22,7 @@
 import uk.co.real_logic.sbe.ir.Ir;
 
 import java.io.IOException;
+import org.agrona.generation.OutputManager;
 
 import static uk.co.real_logic.sbe.SbeTool.*;
 
@@ -34,12 +35,21 @@ public enum TargetCodeGenerator
  {
  public CodeGenerator newInstance(final Ir ir, final String outputDir) throws IOException
  {
+ final OutputManager interfaceOutputManager;
+ if (Boolean.getBoolean(JAVA_GENERATE_INTERFACES))
+ {
+ interfaceOutputManager = new PackageOutputManager(outputDir, JAVA_INTERFACE_PACKAGE);
+ }
+ else
+ {
+ interfaceOutputManager = null;
+ }
  return new JavaGenerator(
  ir,
  System.getProperty(JAVA_ENCODING_BUFFER_TYPE, JAVA_DEFAULT_ENCODING_BUFFER_TYPE),
  System.getProperty(JAVA_DECODING_BUFFER_TYPE, JAVA_DEFAULT_DECODING_BUFFER_TYPE),
  Boolean.getBoolean(JAVA_GROUP_ORDER_ANNOTATION),
- new PackageOutputManager(outputDir, ir.applicableNamespace()));
+ new PackageOutputManager(outputDir, ir.applicableNamespace()), interfaceOutputManager);
  }
  },
 

sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java

@@ -6,7 +6,7 @@
 
 @javax.annotation.Generated(value = {"uk.co.real_logic.sbe.ir.generated.FrameCodecDecoder"})
 @SuppressWarnings("all")
-public class FrameCodecDecoder implements MessageDecoder
+public class FrameCodecDecoder
 {
  public static final int BLOCK_LENGTH = 12;
  public static final int TEMPLATE_ID = 1;

sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/FrameCodecDecoder.java

@@ -6,7 +6,7 @@
 
 @javax.annotation.Generated(value = {"uk.co.real_logic.sbe.ir.generated.FrameCodecEncoder"})
 @SuppressWarnings("all")
-public class FrameCodecEncoder implements MessageEncoder
+public class FrameCodecEncoder
 {
  public static final int BLOCK_LENGTH = 12;
  public static final int TEMPLATE_ID = 1;

sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/FrameCodecEncoder.java

@@ -6,7 +6,7 @@
 
 @javax.annotation.Generated(value = {"uk.co.real_logic.sbe.ir.generated.TokenCodecDecoder"})
 @SuppressWarnings("all")
-public class TokenCodecDecoder implements MessageDecoder
+public class TokenCodecDecoder
 {
  public static final int BLOCK_LENGTH = 24;
  public static final int TEMPLATE_ID = 2;

sbe-tool/src/main/java/uk/co/real_logic/sbe/ir/generated/MessageDecoder.java

@@ -6,7 +6,7 @@
 
 @javax.annotation.Generated(value = {"uk.co.real_logic.sbe.ir.generated.TokenCodecEncoder"})
 @SuppressWarnings("all")
-public class TokenCodecEncoder implements MessageEncoder
+public class TokenCodecEncoder
 {
  public static final int BLOCK_LENGTH = 24;
  public static final int TEMPLATE_ID = 2;