[Java] Add schema id and version to fixed flyweights. Issue aeron-io#593.

Author: mjpt777

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

@@ -1089,7 +1089,7 @@ private void generateCompositeFlyweightHeader(
  {
  out.append(generateFileHeader(ir.applicableNamespace(), fqBuffer));
  out.append(generateDeclaration(typeName, implementsString, token));
- out.append(generateCompositeFlyweightCode(typeName, token.encodedLength(), buffer));
+ out.append(generateFixedFlyweightCode(typeName, token.encodedLength(), buffer));
  }
 
  private void generateEnum(final List<Token> tokens) throws IOException
@@ -2173,40 +2173,15 @@ private static CharSequence generateByteLiteralList(final byte[] bytes)
  return values;
  }
 
- private static CharSequence generateFixedFlyweightCode(
+ private CharSequence generateFixedFlyweightCode(
  final String className, final int size, final String bufferImplementation)
  {
- return String.format(
- " public static final int ENCODED_LENGTH = %2$d;\n" +
- " private %3$s buffer;\n" +
- " private int offset;\n\n" +
- " public %1$s wrap(final %3$s buffer, final int offset)\n" +
- " {\n" +
- " this.buffer = buffer;\n" +
- " this.offset = offset;\n\n" +
- " return this;\n" +
- " }\n\n" +
- " public %3$s buffer()\n" +
- " {\n" +
- " return buffer;\n" +
- " }\n\n" +
- " public int offset()\n" +
- " {\n" +
- " return offset;\n" +
- " }\n\n" +
- " public int encodedLength()\n" +
- " {\n" +
- " return ENCODED_LENGTH;\n" +
- " }\n",
- className,
- size,
- bufferImplementation);
- }
+ final String schemaIdType = javaTypeName(ir.headerStructure().schemaIdType());
+ final String schemaVersionType = javaTypeName(ir.headerStructure().schemaVersionType());
 
- private CharSequence generateCompositeFlyweightCode(
- final String className, final int size, final String bufferImplementation)
- {
  return String.format(
+ " public static final %5$s SCHEMA_ID = %6$s;\n" +
+ " public static final %7$s SCHEMA_VERSION = %8$s;\n" +
  " public static final int ENCODED_LENGTH = %2$d;\n" +
  " public static final java.nio.ByteOrder BYTE_ORDER = java.nio.ByteOrder.%4$s;\n\n" +
  " private int offset;\n" +
@@ -2228,11 +2203,23 @@ private CharSequence generateCompositeFlyweightCode(
  " public int encodedLength()\n" +
  " {\n" +
  " return ENCODED_LENGTH;\n" +
+ " }\n\n" +
+ " public %5$s sbeSchemaId()\n" +
+ " {\n" +
+ " return SCHEMA_ID;\n" +
+ " }\n\n" +
+ " public %7$s sbeSchemaVersion()\n" +
+ " {\n" +
+ " return SCHEMA_VERSION;\n" +
  " }\n",
  className,
  size,
  bufferImplementation,
- ir.byteOrder());
+ ir.byteOrder(),
+ schemaIdType,
+ generateLiteral(ir.headerStructure().schemaIdType(), Integer.toString(ir.id())),
+ schemaVersionType,
+ generateLiteral(ir.headerStructure().schemaVersionType(), Integer.toString(ir.version())));
  }
 
  private CharSequence generateDecoderFlyweightCode(final String className, final Token token)

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

@@ -9,6 +9,8 @@
 @SuppressWarnings("all")
 public class MessageHeaderDecoder
 {
+ public static final int SCHEMA_ID = 1;
+ public static final int SCHEMA_VERSION = 0;
  public static final int ENCODED_LENGTH = 8;
  public static final java.nio.ByteOrder BYTE_ORDER = java.nio.ByteOrder.LITTLE_ENDIAN;
 
@@ -38,6 +40,16 @@ public int encodedLength()
  return ENCODED_LENGTH;
  }
 
+ public int sbeSchemaId()
+ {
+ return SCHEMA_ID;
+ }
+
+ public int sbeSchemaVersion()
+ {
+ return SCHEMA_VERSION;
+ }
+
  public static int blockLengthEncodingOffset()
  {
  return 0;

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

@@ -9,6 +9,8 @@
 @SuppressWarnings("all")
 public class MessageHeaderEncoder
 {
+ public static final int SCHEMA_ID = 1;
+ public static final int SCHEMA_VERSION = 0;
  public static final int ENCODED_LENGTH = 8;
  public static final java.nio.ByteOrder BYTE_ORDER = java.nio.ByteOrder.LITTLE_ENDIAN;
 
@@ -38,6 +40,16 @@ public int encodedLength()
  return ENCODED_LENGTH;
  }
 
+ public int sbeSchemaId()
+ {
+ return SCHEMA_ID;
+ }
+
+ public int sbeSchemaVersion()
+ {
+ return SCHEMA_VERSION;
+ }
+
  public static int blockLengthEncodingOffset()
  {
  return 0;

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

@@ -6,6 +6,8 @@
 @SuppressWarnings("all")
 public class VarDataEncodingDecoder
 {
+ public static final int SCHEMA_ID = 1;
+ public static final int SCHEMA_VERSION = 0;
  public static final int ENCODED_LENGTH = -1;
  public static final java.nio.ByteOrder BYTE_ORDER = java.nio.ByteOrder.LITTLE_ENDIAN;
 
@@ -35,6 +37,16 @@ public int encodedLength()
  return ENCODED_LENGTH;
  }
 
+ public int sbeSchemaId()
+ {
+ return SCHEMA_ID;
+ }
+
+ public int sbeSchemaVersion()
+ {
+ return SCHEMA_VERSION;
+ }
+
  public static int lengthEncodingOffset()
  {
  return 0;

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

@@ -6,6 +6,8 @@
 @SuppressWarnings("all")
 public class VarDataEncodingEncoder
 {
+ public static final int SCHEMA_ID = 1;
+ public static final int SCHEMA_VERSION = 0;
  public static final int ENCODED_LENGTH = -1;
  public static final java.nio.ByteOrder BYTE_ORDER = java.nio.ByteOrder.LITTLE_ENDIAN;
 
@@ -35,6 +37,16 @@ public int encodedLength()
  return ENCODED_LENGTH;
  }
 
+ public int sbeSchemaId()
+ {
+ return SCHEMA_ID;
+ }
+
+ public int sbeSchemaVersion()
+ {
+ return SCHEMA_VERSION;
+ }
+
  public static int lengthEncodingOffset()
  {
  return 0;