[Java]: Make time unit a string in the IR to be interpreted by layer 7 applications.

Author: mjpt777

main/java/uk/co/real_logic/sbe/ir/Encoding.java

@@ -20,7 +20,6 @@
 import uk.co.real_logic.sbe.util.Verify;
 
 import java.nio.ByteOrder;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Optional encoding settings that can be associated with {@link Token}s.
@@ -51,7 +50,7 @@ public static enum Presence
  private final PrimitiveValue constVal;
  private final String characterEncoding;
  private final String epoch;
- private final TimeUnit timeUnit;
+ private final String timeUnit;
  private final String semanticType;
 
  public Encoding()
@@ -78,7 +77,7 @@ public Encoding(final PrimitiveType primitiveType,
  final PrimitiveValue constVal,
  final String characterEncoding,
  final String epoch,
- final TimeUnit timeUnit,
+ final String timeUnit,
  final String semanticType)
  {
  Verify.notNull(presence, "presence");
@@ -234,11 +233,11 @@ public String epoch()
  }
 
  /**
- * The {@link TimeUnit} of the timestamp.
+ * The time unit of the timestamp.
  *
- * @return the {@link TimeUnit} of the timestamp.
+ * @return the time unit of the timestamp.
  */
- public TimeUnit timeUnit()
+ public String timeUnit()
  {
  return timeUnit;
  }
@@ -284,7 +283,7 @@ public static class Builder
  private PrimitiveValue constVal = null;
  private String characterEncoding = "";
  private String epoch = null;
- private TimeUnit timeUnit = null;
+ private String timeUnit = null;
  private String semanticType = null;
 
  public Builder primitiveType(final PrimitiveType primitiveType)
@@ -341,7 +340,7 @@ public Builder epoch(final String epoch)
  return this;
  }
 
- public Builder timeUnit(final TimeUnit timeUnit)
+ public Builder timeUnit(final String timeUnit)
  {
  this.timeUnit = timeUnit;
  return this;

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

@@ -44,7 +44,7 @@ public class Field
  private int computedOffset; // used to hold the calculated offset of this field from top level <message> or <group>
  private int computedBlockLength; // used to hold the calculated block length of this group
  private final String epoch; // optional, epoch from which a timestamps start, defaults to "unix"
- private final TimeUnit timeUnit; // optional, defaults to TimeUnit.NANOSECOND.
+ private final String timeUnit;  // optional, defaults to "nanosecond".
 
  public Field(final String name,
  final String description,
@@ -58,7 +58,7 @@ public Field(final String name,
  final boolean variableLength,
  final int sinceVersion,
  final String epoch,
- final TimeUnit timeUnit)
+ final String timeUnit)
  {
  this.name = name;
  this.description = description;
@@ -176,7 +176,7 @@ public String epoch()
  return epoch;
  }
 
- public TimeUnit timeUnit()
+ public String timeUnit()
  {
  return timeUnit;
  }
@@ -217,7 +217,7 @@ public static class Builder
  private boolean variableLength;
  private int sinceVersion = 0;
  private String epoch;
- private TimeUnit timeUnit;
+ private String timeUnit;
 
  public Builder name(final String name)
  {
@@ -291,7 +291,7 @@ public Builder epoch(final String epoch)
  return this;
  }
 
- public Builder timeUnit(final TimeUnit timeUnit)
+ public Builder timeUnit(final String timeUnit)
  {
  this.timeUnit = timeUnit;
  return this;

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

@@ -293,14 +293,13 @@ private void add(final EncodedDataType type, final int offset, final Field field
  final Encoding.Builder encodingBuilder = new Encoding.Builder()
  .primitiveType(type.primitiveType())
  .byteOrder(byteOrder)
+ .semanticType(semanticTypeOf(type, field))
  .characterEncoding(type.characterEncoding());
 
- encodingBuilder.semanticType(semanticTypeOf(type, field));
-
  if (null != field)
  {
  encodingBuilder.epoch(field.epoch());
- encodingBuilder.timeUnit(field.timeUnit() != null ? field.timeUnit().jucTimeUnit() : null);
+ encodingBuilder.timeUnit(field.timeUnit());
  }
 
  final Token.Builder tokenBuilder = new Token.Builder()

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

@@ -248,7 +248,7 @@ private Field parseField(final NodeList nodeList, final int nodeIndex)
  .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(TimeUnit.get(getAttributeValue(nodeList.item(nodeIndex), "timeUnit", "nanosecond")))
+ .timeUnit(getAttributeValue(nodeList.item(nodeIndex), "timeUnit", "nanosecond"))
  .type(fieldType)
  .build();