[Java] Added support for var data in repeating groups in Java generated codecs.

Author: mjpt777

build.gradle

@@ -295,7 +295,7 @@ project(':sbe-samples') {
  }
 
  task runJavaExamples {
- dependsOn 'runExampleUsingGeneratedStub', 'runExampleUsingGeneratedStubExtension', 'runOtfExample'
+ dependsOn 'runExampleUsingGeneratedStub', 'runExampleUsingGeneratedStubExtension'
  }
 
  task sourcesJar(type: Jar) {

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStub.java

@@ -136,9 +136,9 @@ public static int encode(final CarEncoder car, final UnsafeBuffer directBuffer,
  .putManufacturerCode(MANUFACTURER_CODE, srcOffset);
 
  car.fuelFiguresCount(3)
- .next().speed(30).mpg(35.9f)
- .next().speed(55).mpg(49.0f)
- .next().speed(75).mpg(40.0f);
+ .next().speed(30).mpg(35.9f).usageDescription("Urban Cycle")
+ .next().speed(55).mpg(49.0f).usageDescription("Combined Cycle")
+ .next().speed(75).mpg(40.0f).usageDescription("Highway Cycle");
 
  final CarEncoder.PerformanceFiguresEncoder perfFigures = car.performanceFiguresCount(2);
  perfFigures.next()
@@ -218,6 +218,7 @@ public static void decode(
  {
  sb.append("\ncar.fuelFigures.speed=").append(fuelFigures.speed());
  sb.append("\ncar.fuelFigures.mpg=").append(fuelFigures.mpg());
+ sb.append("\ncar.fuelFigures.usageDescription=").append(fuelFigures.usageDescription());
  }
 
  for (final CarDecoder.PerformanceFiguresDecoder performanceFigures : car.performanceFigures())

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStubExtension.java

@@ -141,9 +141,9 @@ public static int encode(final baseline.CarEncoder car, final UnsafeBuffer direc
  .putManufacturerCode(MANUFACTURER_CODE, srcOffset);
 
  car.fuelFiguresCount(3)
- .next().speed(30).mpg(35.9f)
- .next().speed(55).mpg(49.0f)
- .next().speed(75).mpg(40.0f);
+ .next().speed(30).mpg(35.9f).usageDescription("Urban Cycle")
+ .next().speed(55).mpg(49.0f).usageDescription("Combined Cycle")
+ .next().speed(75).mpg(40.0f).usageDescription("Highway Cycle");
 
  final baseline.CarEncoder.PerformanceFiguresEncoder perfFigures = car.performanceFiguresCount(2);
  perfFigures.next()
@@ -226,6 +226,7 @@ public static void decode(
  {
  sb.append("\ncar.fuelFigures.speed=").append(fuelFigures.speed());
  sb.append("\ncar.fuelFigures.mpg=").append(fuelFigures.mpg());
+ sb.append("\ncar.fuelFigures.usageDescription=").append(fuelFigures.usageDescription());
  }
 
  for (final extension.CarDecoder.PerformanceFiguresDecoder performanceFigures : car.performanceFigures())

sbe-samples/src/main/resources/example-extension-schema.xml

@@ -64,6 +64,7 @@
  <group name="fuelFigures" id="10" dimensionType="groupSizeEncoding">
  <field name="speed" id="11" type="uint16"/>
  <field name="mpg" id="12" type="float"/>
+ <data name="usageDescription" id="200" type="varDataEncoding"/>
  </group>
  <group name="performanceFigures" id="13" dimensionType="groupSizeEncoding">
  <field name="octaneRating" id="14" type="Ron"/>

sbe-samples/src/main/resources/example-schema.xml

@@ -62,6 +62,7 @@
  <group name="fuelFigures" id="10" dimensionType="groupSizeEncoding">
  <field name="speed" id="11" type="uint16"/>
  <field name="mpg" id="12" type="float"/>
+ <data name="usageDescription" id="200" type="varDataEncoding"/>
  </group>
  <group name="performanceFigures" id="13" dimensionType="groupSizeEncoding">
  <field name="octaneRating" id="14" type="Ron"/>

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

@@ -187,7 +187,7 @@ private void generateEncoder(
  generateEncoderGroups(sb, className, groups, 0, indent);
  out.append(sb);
 
- out.append(generateVarDataEncoders(className, varData, indent));
+ out.append(generateDataEncoders(className, varData, indent));
  out.append("}\n");
  }
  }
@@ -215,6 +215,7 @@ private void generateDecoder(
  out.append(sb);
 
  out.append(generateDataDecoders(dataFields, BASE_INDENT));
+
  out.append("}\n");
  }
  }
@@ -246,6 +247,10 @@ private int generateDecoderGroups(
  index = generateDecoderGroups(sb, parentMessageClassName, tokens, index, indent + INDENT);
  }
 
+ final List<Token> dataFields = new ArrayList<>();
+ collectDataFields(tokens, index, dataFields);
+ sb.append(generateDataDecoders(dataFields, indent + INDENT));
+
  sb.append(indent).append(" }\n");
  }
  }
@@ -281,6 +286,10 @@ private int generateEncoderGroups(
  index = generateEncoderGroups(sb, parentMessageClassName, tokens, index, indent + INDENT);
  }
 
+ final List<Token> dataFields = new ArrayList<>();
+ collectDataFields(tokens, index, dataFields);
+ sb.append(generateDataEncoders(groupClassName, dataFields, indent + INDENT));
+
  sb.append(indent).append(" }\n");
  }
  }
@@ -619,7 +628,7 @@ private CharSequence generateDataDecoders(final List<Token> tokens, final String
  indent + " public int %sLength()\n" +
  indent + " {\n" +
  indent + "%s" +
- indent + " final int limit = limit();\n" +
+ indent + " final int limit = parentMessage.limit();\n" +
  indent + " return CodecUtil.%sGet(buffer, limit%s);\n" +
  indent + " }\n",
  toLowerFirstChar(propertyName),
@@ -635,7 +644,7 @@ private CharSequence generateDataDecoders(final List<Token> tokens, final String
  return sb;
  }
 
- private CharSequence generateVarDataEncoders(final String className, final List<Token> tokens, final String indent)
+ private CharSequence generateDataEncoders(final String className, final List<Token> tokens, final String indent)
  {
  final StringBuilder sb = new StringBuilder();
 
@@ -709,11 +718,11 @@ private void generateDataDecodeMethods(
  "\n" +
  indent + " public String %1$s()\n" +
  indent + " {\n" +
- indent + "%2$s" +
+   "%2$s" +
  indent + " final int sizeOfLengthField = %3$d;\n" +
- indent + " final int limit = limit();\n" +
+ indent + " final int limit = parentMessage.limit();\n" +
  indent + " final int dataLength = CodecUtil.%4$sGet(buffer, limit%5$s);\n" +
- indent + " limit(limit + sizeOfLengthField + dataLength);\n" +
+ indent + " parentMessage.limit(limit + sizeOfLengthField + dataLength);\n" +
  indent + " final byte[] tmp = new byte[dataLength];\n" +
  indent + " buffer.getBytes(limit + sizeOfLengthField, tmp, 0, dataLength);\n\n" +
  indent + " final String value;\n" +
@@ -728,7 +737,7 @@ private void generateDataDecodeMethods(
  indent + " return value;\n" +
  indent + " }\n",
  toLowerFirstChar(propertyName),
- generateStringNotPresentCondition(token.version(), BASE_INDENT),
+ generateStringNotPresentCondition(token.version(), indent),
  sizeOfLengthField,
  lengthTypePrefix,
  byteOrderStr,
@@ -782,8 +791,8 @@ private void generateDataEncodeMethods(
  indent + " }\n\n" +
  indent + " final int length = bytes.length;\n" +
  indent + " final int sizeOfLengthField = %3$d;\n" +
- indent + " final int limit = limit();\n" +
- indent + " limit(limit + sizeOfLengthField + length);\n" +
+ indent + " final int limit = parentMessage.limit();\n" +
+ indent + " parentMessage.limit(limit + sizeOfLengthField + length);\n" +
  indent + " CodecUtil.%4$sPut(buffer, limit, (%5$s)length%6$s);\n" +
  indent + " buffer.putBytes(limit + sizeOfLengthField, bytes, 0, length);\n\n" +
  indent + " return this;\n" +
@@ -810,20 +819,21 @@ private void generateDataTypedDecoder(
  {
  sb.append(String.format(
  "\n" +
- indent + " public int get%s(final %s dst, final int dstOffset, final int length)\n" +
+ indent + " public int get%s(\n" +
+ indent + " final %s dst, final int dstOffset, final int length)\n" +
  indent + " {\n" +
- indent + "%s" +
+   "%s" +
  indent + " final int sizeOfLengthField = %d;\n" +
- indent + " final int limit = limit();\n" +
+ indent + " final int limit = parentMessage.limit();\n" +
  indent + " final int dataLength = CodecUtil.%sGet(buffer, limit%s);\n" +
  indent + " final int bytesCopied = Math.min(length, dataLength);\n" +
- indent + " limit(limit + sizeOfLengthField + dataLength);\n" +
+ indent + " parentMessage.limit(limit + sizeOfLengthField + dataLength);\n" +
  indent + " buffer.getBytes(limit + sizeOfLengthField, dst, dstOffset, bytesCopied);\n\n" +
  indent + " return bytesCopied;\n" +
  indent + " }\n",
  propertyName,
  exchangeType,
- generateArrayFieldNotPresentCondition(token.version(), BASE_INDENT),
+ generateArrayFieldNotPresentCondition(token.version(), indent),
  sizeOfLengthField,
  lengthTypePrefix,
  byteOrderStr
@@ -842,11 +852,12 @@ private void generateDataTypedEncoder(
  {
  sb.append(String.format(
  "\n" +
- indent + " public int put%s(final %s src, final int srcOffset, final int length)\n" +
+ indent + " public int put%s(\n" +
+ indent + " final %s src, final int srcOffset, final int length)\n" +
  indent + " {\n" +
  indent + " final int sizeOfLengthField = %d;\n" +
- indent + " final int limit = limit();\n" +
- indent + " limit(limit + sizeOfLengthField + length);\n" +
+ indent + " final int limit = parentMessage.limit();\n" +
+ indent + " parentMessage.limit(limit + sizeOfLengthField + length);\n" +
  indent + " CodecUtil.%sPut(buffer, limit, (%s)length%s);\n" +
  indent + " buffer.putBytes(limit + sizeOfLengthField, src, srcOffset, length);\n\n" +
  indent + " return length;\n" +