inject the buffer name property into the Java code generator

Author: RichardWarburton

main/java/uk/co/real_logic/sbe/SbeTool.java

@@ -99,6 +99,11 @@ public class SbeTool
  */
  public static final String TARGET_NAMESPACE = "sbe.target.namespace";
 
+ /**
+ * Specifies the name of the Java buffer to wrap
+ */
+ public static final String JAVA_BUFFER = "sbe.java.buffer";
+
  /**
  * Main entry point for the SBE Tool.
  *
@@ -123,7 +128,7 @@ public static void main(final String[] args) throws Exception
  {
  validateAgainstSchema(fileName, xsdFilename);
  }
-
+ 
  ir = new IrGenerator().generate(parseSchema(fileName), System.getProperty(TARGET_NAMESPACE));
  }
  else if (fileName.endsWith(".sbeir"))

main/java/uk/co/real_logic/sbe/generation/TargetCodeGenerator.java

@@ -15,15 +15,17 @@
  */
 package uk.co.real_logic.sbe.generation;
 
+import uk.co.real_logic.sbe.SbeTool;
+import uk.co.real_logic.sbe.codec.java.DirectBuffer;
 import uk.co.real_logic.sbe.generation.cpp98.Cpp98Generator;
+import uk.co.real_logic.sbe.generation.cpp98.NamespaceOutputManager;
 import uk.co.real_logic.sbe.generation.csharp.CSharpGenerator;
 import uk.co.real_logic.sbe.generation.csharp.CSharpNamespaceOutputManager;
-import uk.co.real_logic.sbe.generation.cpp98.NamespaceOutputManager;
 import uk.co.real_logic.sbe.generation.java.JavaGenerator;
 import uk.co.real_logic.sbe.generation.java.JavaMockPojoGenerator;
 import uk.co.real_logic.sbe.generation.java.PackageOutputManager;
-import uk.co.real_logic.sbe.generation.python.PythonGenerator;
 import uk.co.real_logic.sbe.generation.python.ModuleOutputManager;
+import uk.co.real_logic.sbe.generation.python.PythonGenerator;
 import uk.co.real_logic.sbe.ir.Ir;
 
 import java.io.IOException;
@@ -47,7 +49,9 @@ public CodeGenerator newInstance(final Ir ir, final String outputDir)
  public CodeGenerator newInstance(final Ir ir, final String outputDir)
  throws IOException
  {
- return new JavaGenerator(ir, new PackageOutputManager(outputDir, ir.applicableNamespace()));
+ return new JavaGenerator(ir,
+ System.getProperty(SbeTool.JAVA_BUFFER, DirectBuffer.class.getName()),
+ new PackageOutputManager(outputDir, ir.applicableNamespace()));
  }
  },
 

main/java/uk/co/real_logic/sbe/generation/java/JavaGenerator.java

@@ -38,7 +38,7 @@ public class JavaGenerator implements CodeGenerator
  private final Ir ir;
  private final OutputManager outputManager;
 
- public JavaGenerator(final Ir ir, final OutputManager outputManager)
+ public JavaGenerator(final Ir ir, final String bufferImplementation, final OutputManager outputManager)
  throws IOException
  {
  Verify.notNull(ir, "ir");

test/java/uk/co/real_logic/sbe/generation/java/JavaGeneratorTest.java

@@ -39,6 +39,8 @@
 
 public class JavaGeneratorTest
 {
+ private static final String DEFAULT_BUFFER_IMPLEMENTATION = DirectBuffer.class.getName();
+
  private static final ByteOrder BYTE_ORDER = ByteOrder.nativeOrder();
  private final StringWriterOutputManager outputManager = new StringWriterOutputManager();
  private final DirectBuffer mockBuffer = mock(DirectBuffer.class);
@@ -69,7 +71,7 @@ public void shouldGenerateMessageHeaderStub() throws Exception
 
  when(Short.valueOf(mockBuffer.getShort(bufferOffset + templateIdOffset, BYTE_ORDER))).thenReturn(templateId);
 
- final JavaGenerator javaGenerator = new JavaGenerator(ir, outputManager);
+ final JavaGenerator javaGenerator = new JavaGenerator(ir, DEFAULT_BUFFER_IMPLEMENTATION, outputManager);
  javaGenerator.generateMessageHeaderStub();
 
  final Class<?> clazz = CompilerUtil.compileInMemory(fqClassName, outputManager.getSources());
@@ -93,7 +95,7 @@ public void shouldGenerateUint8EnumStub() throws Exception
  final String className = "BooleanType";
  final String fqClassName = ir.applicableNamespace() + "." + className;
 
- final JavaGenerator javaGenerator = new JavaGenerator(ir, outputManager);
+ final JavaGenerator javaGenerator = new JavaGenerator(ir, DEFAULT_BUFFER_IMPLEMENTATION, outputManager);
  javaGenerator.generateTypeStubs();
 
  final Class<?> clazz = CompilerUtil.compileInMemory(fqClassName, outputManager.getSources());
@@ -110,7 +112,7 @@ public void shouldGenerateCharEnumStub() throws Exception
  final String className = "Model";
  final String fqClassName = ir.applicableNamespace() + "." + className;
 
- final JavaGenerator javaGenerator = new JavaGenerator(ir, outputManager);
+ final JavaGenerator javaGenerator = new JavaGenerator(ir, DEFAULT_BUFFER_IMPLEMENTATION, outputManager);
  javaGenerator.generateTypeStubs();
 
  final Class<?> clazz = CompilerUtil.compileInMemory(fqClassName, outputManager.getSources());
@@ -132,7 +134,7 @@ public void shouldGenerateChoiceSetStub() throws Exception
 
  when(Byte.valueOf(mockBuffer.getByte(bufferOffset))).thenReturn(bitset);
 
- final JavaGenerator javaGenerator = new JavaGenerator(ir, outputManager);
+ final JavaGenerator javaGenerator = new JavaGenerator(ir, DEFAULT_BUFFER_IMPLEMENTATION, outputManager);
  javaGenerator.generateTypeStubs();
 
  final Class<?> clazz = CompilerUtil.compileInMemory(fqClassName, outputManager.getSources());
@@ -164,7 +166,7 @@ public void shouldGenerateCompositeStub() throws Exception
  when(Short.valueOf(mockBuffer.getShort(capacityFieldOffset, BYTE_ORDER)))
  .thenReturn(Short.valueOf((short)expectedEngineCapacity));
 
- final JavaGenerator javaGenerator = new JavaGenerator(ir, outputManager);
+ final JavaGenerator javaGenerator = new JavaGenerator(ir, DEFAULT_BUFFER_IMPLEMENTATION, outputManager);
  javaGenerator.generateTypeStubs();
 
  final Class<?> clazz = CompilerUtil.compileInMemory(fqClassName, outputManager.getSources());
@@ -197,7 +199,7 @@ public void shouldGenerateBasicMessage() throws Exception
  final String className = "Car";
  final String fqClassName = ir.applicableNamespace() + "." + className;
 
- final JavaGenerator javaGenerator = new JavaGenerator(ir, outputManager);
+ final JavaGenerator javaGenerator = new JavaGenerator(ir, DEFAULT_BUFFER_IMPLEMENTATION, outputManager);
  javaGenerator.generate();
 
  final Class<?> clazz = CompilerUtil.compileInMemory(fqClassName, outputManager.getSources());
@@ -216,4 +218,4 @@ public void shouldGenerateBasicMessage() throws Exception
  final Integer count = (Integer)groupFlyweight.getClass().getDeclaredMethod("count").invoke(groupFlyweight);
  assertThat(count, is(Integer.valueOf(0)));
  }
-}
+}