[Java] Make CodeGenerator a FunctionalInterface.

Author: mjpt777

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

@@ -20,26 +20,13 @@
 /**
  * Abstraction for code generators to implement.
  */
+@FunctionalInterface
 public interface CodeGenerator
 {
- /**
- * Class name to be used for visitor pattern that accesses the message headerStructure.
- */
- String MESSAGE_HEADER_ENCODER_TYPE = "MessageHeaderEncoder";
-
- String MESSAGE_HEADER_DECODER_TYPE = "MessageHeaderDecoder";
-
  /**
  * Generate the complete set of types and messages for a schema.
  *
  * @throws IOException if an error is encountered when writing the output.
  */
  void generate() throws IOException;
-
- /**
- * Generate the composites for dealing with the message header.
- *
- * @throws IOException if an error is encountered when writing the output.
- */
- void generateMessageHeaderStub() throws IOException;
 }

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

@@ -61,7 +61,9 @@ public CGenerator(final Ir ir, final OutputManager outputManager)
  }
 
  /**
- * {@inheritDoc}
+ * Generate the composites for dealing with the message header.
+ *
+ * @throws IOException if an error is encountered when writing the output.
  */
  public void generateMessageHeaderStub() throws IOException
  {

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

@@ -70,7 +70,9 @@ public CppGenerator(final Ir ir, final boolean shouldDecodeUnknownEnumValues, fi
  }
 
  /**
- * {@inheritDoc}
+ * Generate the composites for dealing with the message header.
+ *
+ * @throws IOException if an error is encountered when writing the output.
  */
  public void generateMessageHeaderStub() throws IOException
  {

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

@@ -66,7 +66,9 @@ public CSharpGenerator(final Ir ir, final OutputManager outputManager)
  }
 
  /**
- * {@inheritDoc}
+ * Generate the composites for dealing with the message header.
+ *
+ * @throws IOException if an error is encountered when writing the output.
  */
  public void generateMessageHeaderStub() throws IOException
  {

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

@@ -112,9 +112,11 @@ public void generateTypeStubs() throws IOException
 
  // MessageHeader is special but the standard allows it to be
  // pretty arbitrary after the first four fields.
- // All we need is the imports, type declaration, and encode/decode
+ // All we need is the imports, type declaration, and encode/decode.
  /**
- * {@inheritDoc}
+ * Generate the composites for dealing with the message header.
+ *
+ * @throws IOException if an error is encountered when writing the output.
  */
  public void generateMessageHeaderStub() throws IOException
  {

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

@@ -42,6 +42,9 @@
 @SuppressWarnings("MethodLength")
 public class JavaGenerator implements CodeGenerator
 {
+ static final String MESSAGE_HEADER_ENCODER_TYPE = "MessageHeaderEncoder";
+ static final String MESSAGE_HEADER_DECODER_TYPE = "MessageHeaderDecoder";
+
  enum CodecType
  {
  DECODER,
@@ -101,7 +104,9 @@ public JavaGenerator(
  }
 
  /**
- * {@inheritDoc}
+ * Generate the composites for dealing with the message header.
+ *
+ * @throws IOException if an error is encountered when writing the output.
  */
  public void generateMessageHeaderStub() throws IOException
  {

sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/JavaGeneratorTest.java

@@ -38,8 +38,7 @@
 import static org.hamcrest.Matchers.*;
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
-import static uk.co.real_logic.sbe.generation.CodeGenerator.MESSAGE_HEADER_DECODER_TYPE;
-import static uk.co.real_logic.sbe.generation.java.JavaGenerator.MESSAGE_HEADER_ENCODER_TYPE;
+import static uk.co.real_logic.sbe.generation.java.JavaGenerator.MESSAGE_HEADER_DECODER_TYPE;
 import static uk.co.real_logic.sbe.generation.java.ReflectionUtil.*;
 import static uk.co.real_logic.sbe.xml.XmlSchemaParser.parse;
 
@@ -75,7 +74,7 @@ public void shouldGenerateMessageHeaderStub() throws Exception
  final int templateIdOffset = 2;
  final short templateId = (short)7;
  final int blockLength = 32;
- final String fqClassName = ir.applicableNamespace() + "." + MESSAGE_HEADER_ENCODER_TYPE;
+ final String fqClassName = ir.applicableNamespace() + "." + JavaGenerator.MESSAGE_HEADER_ENCODER_TYPE;
 
  when(mockBuffer.getShort(bufferOffset + templateIdOffset, BYTE_ORDER)).thenReturn(templateId);