Merge pull request #354 from benalexau/remove-structure

Remove Structure from interface hierachy.

Author: mjpt777

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

@@ -45,15 +45,12 @@ public class JavaGenerator implements CodeGenerator
     private static final String INDENT = "    ";
     private static final String GEN_COMPOSITE_DECODER_FLYWEIGHT = "CompositeDecoderFlyweight";
     private static final String GEN_COMPOSITE_ENCODER_FLYWEIGHT = "CompositeEncoderFlyweight";
-    private static final String GEN_COMPOSITE_STRUCTURE = "CompositeStructure";
     private static final String GEN_DECODER_FLYWEIGHT = "DecoderFlyweight";
     private static final String GEN_ENCODER_FLYWEIGHT = "EncoderFlyweight";
     private static final String GEN_FLYWEIGHT = "Flyweight";
     private static final String GEN_MESSAGE_DECODER_FLYWEIGHT = "MessageDecoderFlyweight";
     private static final String GEN_MESSAGE_ENCODER_FLYWEIGHT = "MessageEncoderFlyweight";
     private static final String GEN_MESSAGE_FLYWEIGHT = "MessageFlyweight";
-    private static final String GEN_MESSAGE_STRUCTURE = "MessageStructure";
-    private static final String GEN_STRUCTURE = "Structure";
 
     private final Ir ir;
     private final OutputManager outputManager;
@@ -124,11 +121,6 @@ private String decoderName(final String className)
         return className + "Decoder";
     }
 
-    private String structureName(final String className)
-    {
-        return className + "Structure";
-    }
-
     private void copyInterface(String simpleInterfaceName) throws IOException
     {
         final String resource = String.format("/java/interfaces/%s.java", simpleInterfaceName);
@@ -152,15 +144,12 @@ public void generateInterfaces() throws IOException
         {
             copyInterface(GEN_COMPOSITE_DECODER_FLYWEIGHT);
             copyInterface(GEN_COMPOSITE_ENCODER_FLYWEIGHT);
-            copyInterface(GEN_COMPOSITE_STRUCTURE);
             copyInterface(GEN_DECODER_FLYWEIGHT);
             copyInterface(GEN_ENCODER_FLYWEIGHT);
             copyInterface(GEN_FLYWEIGHT);
             copyInterface(GEN_MESSAGE_DECODER_FLYWEIGHT);
             copyInterface(GEN_MESSAGE_ENCODER_FLYWEIGHT);
             copyInterface(GEN_MESSAGE_FLYWEIGHT);
-            copyInterface(GEN_MESSAGE_STRUCTURE);
-            copyInterface(GEN_STRUCTURE);
         }
     }
 
@@ -171,7 +160,7 @@ private String implementsInterface(final String tokenName, final String interfac
             return "";
         }
 
-        return String.format(" implements %s<%s>", interfaceName, formatClassName(structureName(tokenName)));
+        return String.format(" implements %s", interfaceName);
     }
 
     public void generateMessageHeaderStub() throws IOException
@@ -194,22 +183,6 @@ public void generateMessageHeaderStub() throws IOException
         }
     }
 
-    private void generateMessageStructure(final Token msgToken) throws IOException
-    {
-        if (!generateInterfaces)
-        {
-            return;
-        }
-
-        final String structName = formatClassName(structureName(msgToken.name()));
-        try (final Writer out = outputManager.createOutput(structName))
-        {
-            out.append(generateStructureFileHeader(structName, ir.applicableNamespace(), GEN_MESSAGE_STRUCTURE));
-            out.append(generateDeclaration("class", structName, " implements " + GEN_MESSAGE_STRUCTURE));
-            out.append("}\n");
-        }
-    }
-
     public void generateTypeStubs() throws IOException
     {
         generateMetaAttributeEnum();
@@ -254,7 +227,6 @@ public void generate() throws IOException
             final List<Token> varData = new ArrayList<>();
             collectVarData(messageBody, i, varData);
 
-            generateMessageStructure(msgToken);
             generateDecoder(BASE_INDENT, fields, groups, varData, msgToken);
             generateEncoder(BASE_INDENT, fields, groups, varData, msgToken);
         }
@@ -1061,17 +1033,6 @@ private void generateComposite(final List<Token> tokens) throws IOException
         final String decoderName = decoderName(compositeName);
         final String encoderName = encoderName(compositeName);
 
-        if (generateInterfaces)
-        {
-            final String structureName = structureName(compositeName);
-            try (final Writer out = outputManager.createOutput(structureName))
-            {
-                out.append(generateStructureFileHeader(structureName, ir.applicableNamespace(), GEN_COMPOSITE_STRUCTURE));
-                out.append(generateDeclaration("class", structureName, " implements " + GEN_COMPOSITE_STRUCTURE));
-                out.append("}\n");
-            }
-        }
-
         try (final Writer out = outputManager.createOutput(decoderName))
         {
             final String implementsString = implementsInterface(token.name(), GEN_COMPOSITE_DECODER_FLYWEIGHT);
@@ -1366,22 +1327,6 @@ private static CharSequence generateEnumFileHeader(final String className, final
         );
     }
 
-    private static CharSequence generateStructureFileHeader(final String className, final String packageName,
-        String structureInterface)
-    {
-        return String.format(
-            "/* Generated SBE (Simple Binary Encoding) message codec */\n" +
-            "package %s;\n\n" +
-            "import %s.%s;\n\n" +
-            "@javax.annotation.Generated(value = {\"%s.%s\"})\n",
-            packageName,
-            JAVA_INTERFACE_PACKAGE,
-            structureInterface,
-            packageName,
-            className
-        );
-    }
-
     private void generateAnnotations(
         final String indent,
         final String className,

sbe-tool/src/main/resources/java/interfaces/CompositeDecoderFlyweight.java

@@ -20,7 +20,7 @@
 /**
  * A <code>sbe:composite</code> decoder flyweight.
  */
-public interface CompositeDecoderFlyweight<T extends CompositeStructure> extends DecoderFlyweight<T>
+public interface CompositeDecoderFlyweight extends DecoderFlyweight
 {
-    CompositeDecoderFlyweight<T> wrap(DirectBuffer buffer, int offset);
+    CompositeDecoderFlyweight wrap(DirectBuffer buffer, int offset);
 }

sbe-tool/src/main/resources/java/interfaces/CompositeEncoderFlyweight.java

@@ -18,6 +18,6 @@
 /**
  * A <code>sbe:composite</code> encoder flyweight.
  */
-public interface CompositeEncoderFlyweight<T extends CompositeStructure> extends EncoderFlyweight<T>
+public interface CompositeEncoderFlyweight extends EncoderFlyweight
 {
 }

sbe-tool/src/main/resources/java/interfaces/CompositeStructure.java

@@ -18,6 +18,6 @@
 /**
  * A decoder flyweight.
  */
-public interface DecoderFlyweight<T extends Structure> extends Flyweight<T>
+public interface DecoderFlyweight extends Flyweight
 {
 }

sbe-tool/src/main/resources/java/interfaces/DecoderFlyweight.java

@@ -20,7 +20,7 @@
 /**
  * An encoder flyweight.
  */
-public interface EncoderFlyweight<T extends Structure> extends Flyweight<T>
+public interface EncoderFlyweight extends Flyweight
 {
-    EncoderFlyweight<T> wrap(MutableDirectBuffer buffer, int offset);
+    EncoderFlyweight wrap(MutableDirectBuffer buffer, int offset);
 }

sbe-tool/src/main/resources/java/interfaces/EncoderFlyweight.java

@@ -18,7 +18,7 @@
 /**
  * An SBE flyweight.
  */
-public interface Flyweight<T extends Structure>
+public interface Flyweight
 {
     int encodedLength();
 }

sbe-tool/src/main/resources/java/interfaces/Flyweight.java

@@ -20,7 +20,7 @@
 /**
  * An <code>sbe:message</code> decoder flyweight.
  */
-public interface MessageDecoderFlyweight<T extends MessageStructure> extends MessageFlyweight<T>, DecoderFlyweight<T>
+public interface MessageDecoderFlyweight extends MessageFlyweight, DecoderFlyweight
 {
-    MessageDecoderFlyweight<T> wrap(DirectBuffer buffer, int offset, int actingBlockLength, int actingVersion);
+    MessageDecoderFlyweight wrap(DirectBuffer buffer, int offset, int actingBlockLength, int actingVersion);
 }

sbe-tool/src/main/resources/java/interfaces/MessageDecoderFlyweight.java

@@ -18,6 +18,6 @@
 /**
  * An <code>sbe:message</code> encoder flyweight.
  */
-public interface MessageEncoderFlyweight<T extends MessageStructure> extends MessageFlyweight<T>, EncoderFlyweight<T>
+public interface MessageEncoderFlyweight extends MessageFlyweight, EncoderFlyweight
 {
 }

sbe-tool/src/main/resources/java/interfaces/MessageEncoderFlyweight.java

@@ -18,7 +18,7 @@
 /**
  * Methods common to both <code>sbe:message</code> encoder and decoder flyweights.
  */
-public interface MessageFlyweight<T extends MessageStructure> extends Flyweight<T>
+public interface MessageFlyweight extends Flyweight
 {
     int sbeBlockLength();