[Java]: Added <propertyName>MetaAttribute() method to Java code gen for supporting access to the likes of semanticType, epoch, and timeUnit from layer 7.

Author: mjpt777

examples/resources/TestExtensionSchema.xml

@@ -68,7 +68,7 @@
  <field name="seconds" id="16" type="float"/>
  </group>
  </group>
- <data name="make" id="17" type="varDataEncoding"/>
+ <data name="make" id="17" type="varDataEncoding" semanticType="Make"/>
  <data name="model" id="18" type="varDataEncoding"/>
  </message>
 </messageSchema>

examples/resources/TestSchema.xml

@@ -67,7 +67,7 @@
  <field name="seconds" id="16" type="float"/>
  </group>
  </group>
- <data name="make" id="17" type="varDataEncoding"/>
+ <data name="make" id="17" type="varDataEncoding" semanticType="Make"/>
  <data name="model" id="18" type="varDataEncoding"/>
  </message>
 </messageSchema>

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

@@ -354,6 +354,7 @@ private CharSequence generateVarData(final List<Token> tokens)
 
  final String characterEncoding = tokens.get(i + 3).encoding().characterEncoding();
  generateCharacterEncodingMethod(sb, token.name(), characterEncoding);
+ generateFieldMetaAttributeMethod(sb, token, BASE_INDENT);
 
  final String propertyName = toUpperFirstChar(token.name());
  final Token lengthToken = tokens.get(i + 2);
@@ -365,6 +366,7 @@ private CharSequence generateVarData(final List<Token> tokens)
  final String byteOrderStr = lengthEncoding.primitiveType().size() == 1 ? "" : ", java.nio.ByteOrder." + byteOrder;
 
  sb.append(String.format(
+ "\n" +
  " public int get%s(final byte[] dst, final int dstOffset, final int length)\n" +
  " {\n" +
  "%s" +
@@ -376,7 +378,7 @@ private CharSequence generateVarData(final List<Token> tokens)
  " position(position + sizeOfLengthField + dataLength);\n" +
  " CodecUtil.int8sGet(buffer, position + sizeOfLengthField, dst, dstOffset, bytesCopied);\n\n" +
  " return bytesCopied;\n" +
- " }\n\n",
+ " }\n",
  propertyName,
  generateArrayFieldNotPresentCondition(token.version(), BASE_INDENT),
  sizeOfLengthField,
@@ -385,6 +387,7 @@ private CharSequence generateVarData(final List<Token> tokens)
  ));
 
  sb.append(String.format(
+ "\n" +
  " public int put%s(final byte[] src, final int srcOffset, final int length)\n" +
  " {\n" +
  " final int sizeOfLengthField = %d;\n" +
@@ -607,7 +610,13 @@ private CharSequence generateClassDeclaration(final String className)
  {
  return String.format(
  "public class %s\n" +
- "{\n",
+ "{\n" +
+ " public enum MetaAttribute\n" +
+ " {\n" +
+ " EPOCH,\n" +
+ " TIME_UNIT,\n" +
+ " SEMANTIC_TYPE\n" +
+ " }\n\n",
  className
  );
  }
@@ -925,7 +934,7 @@ private void generateCharacterEncodingMethod(final StringBuilder sb, final Strin
  " public static String %sCharacterEncoding()\n" +
  " {\n" +
  " return \"%s\";\n" +
- " }\n\n",
+ " }\n",
  formatPropertyName(propertyName),
  encoding
  ));
@@ -1124,6 +1133,7 @@ private CharSequence generateFields(final String containingClassName, final List
  final String propertyName = formatPropertyName(signalToken.name());
 
  generateFieldIdMethod(sb, signalToken, indent);
+ generateFieldMetaAttributeMethod(sb, signalToken, indent);
 
  switch (encodingToken.signal())
  {
@@ -1162,6 +1172,32 @@ private void generateFieldIdMethod(final StringBuilder sb, final Token token, fi
  ));
  }
 
+ private void generateFieldMetaAttributeMethod(final StringBuilder sb, final Token token, final String indent)
+ {
+ final Encoding encoding = token.encoding();
+ final String epoch = encoding.epoch() == null ? "" : encoding.epoch();
+ final String timeUnit = encoding.timeUnit() == null ? "" : encoding.timeUnit();
+ final String semanticType = encoding.semanticType() == null ? "" : encoding.semanticType();
+
+ sb.append(String.format(
+ "\n" +
+ indent + " public static String %sMetaAttribute(final MetaAttribute metaAttribute)\n" +
+ indent + " {\n" +
+ indent + " switch (metaAttribute)\n" +
+ indent + " {\n" +
+ indent + " case EPOCH: return \"%s\";\n" +
+ indent + " case TIME_UNIT: return \"%s\";\n" +
+ indent + " case SEMANTIC_TYPE: return \"%s\";\n" +
+ indent + " }\n\n" +
+ indent + " return \"\";\n" +
+ indent + " }\n",
+ token.name(),
+ epoch,
+ timeUnit,
+ semanticType
+ ));
+ }
+
  private CharSequence generateEnumProperty(final String containingClassName,
  final String propertyName,
  final Token token,

main/java/uk/co/real_logic/sbe/xml/IrGenerator.java

@@ -100,6 +100,8 @@ private void addFieldSignal(final Field field, final Signal signal)
  .schemaId(field.id())
  .version(field.sinceVersion())
  .encoding(new Encoding.Builder()
+ .epoch(field.epoch())
+ .timeUnit(field.timeUnit())
  .semanticType(semanticTypeOf(null, field)).build())
  .build();
 

main/java/uk/co/real_logic/sbe/xml/Message.java

@@ -283,6 +283,8 @@ else if (!(fieldType instanceof CompositeType))
  .semanticType(getAttributeValueOrNull(nodeList.item(nodeIndex), "semanticType"))
  .presence(Presence.get(getAttributeValue(nodeList.item(nodeIndex), "presence", "required")))
  .sinceVersion(Integer.parseInt(getAttributeValue(nodeList.item(nodeIndex), "sinceVersion", "0")))
+ .epoch(getAttributeValue(nodeList.item(nodeIndex), "epoch", "unix"))
+ .timeUnit(getAttributeValue(nodeList.item(nodeIndex), "timeUnit", "nanosecond"))
  .type(fieldType)
  .variableLength(true)
  .build();