[Java] Clean up constant enum IR generation.

Author: mjpt777

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

@@ -47,8 +47,8 @@ public enum Presence
  CONSTANT
  }
 
+ private Presence presence;
  private final PrimitiveType primitiveType;
- private final Presence presence;
  private final ByteOrder byteOrder;
  private final PrimitiveValue minValue;
  private final PrimitiveValue maxValue;
@@ -61,8 +61,8 @@ public enum Presence
 
  public Encoding()
  {
- primitiveType = null;
  presence = Presence.REQUIRED;
+ primitiveType = null;
  byteOrder = ByteOrder.LITTLE_ENDIAN;
  minValue = null;
  maxValue = null;
@@ -75,8 +75,8 @@ public Encoding()
  }
 
  public Encoding(
- final PrimitiveType primitiveType,
  final Presence presence,
+ final PrimitiveType primitiveType,
  final ByteOrder byteOrder,
  final PrimitiveValue minValue,
  final PrimitiveValue maxValue,
@@ -173,6 +173,16 @@ public Presence presence()
  return presence;
  }
 
+ /**
+ * Set the {@link Presence} for this encoding.
+ *
+ * @param presence the {@link Presence} for this encoding.
+ */
+ public void presence(final Presence presence)
+ {
+ this.presence = presence;
+ }
+
  /**
  * The most applicable null value for the encoded type.
  *
@@ -263,8 +273,8 @@ public String toString()
  {
  return
  "Encoding{" +
- "primitiveType=" + primitiveType +
- ", presence=" + presence +
+ "presence=" + presence +
+ ", primitiveType=" + primitiveType +
  ", byteOrder=" + byteOrder +
  ", minValue=" + minValue +
  ", maxValue=" + maxValue +
@@ -363,8 +373,7 @@ public Builder semanticType(final String semanticType)
  public Encoding build()
  {
  return new Encoding(
- primitiveType,
- presence,
+ presence, primitiveType,
  byteOrder,
  minValue,
  maxValue,

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

@@ -109,13 +109,18 @@ private void compressConstantEnums(final List<Token> tokens)
  nextToken = iter.next();
  if (Signal.END_ENUM == nextToken.signal())
  {
+ nextToken.encoding().presence(Encoding.Presence.CONSTANT);
  break;
  }
 
  if (!valueRef.endsWith(nextToken.name()))
  {
  iter.remove();
  }
+ else
+ {
+ nextToken.encoding().presence(Encoding.Presence.CONSTANT);
+ }
  }
  }
  }

sbe-tool/src/test/resources/code-generation-schema.xml

@@ -56,7 +56,7 @@
  <field name="vehicleCode" id="6" type="VehicleCode"/>
  <field name="extras" id="5" type="OptionalExtras"/>
  <field name="engine" id="7" type="Engine"/>
- <field name="commonModel" id="8" type="Model" presence="constant" valueRef="Model.C"/>
+ <field name="discountedModel" id="8" type="Model" presence="constant" valueRef="Model.C"/>
  <group name="fuelFigures" id="9" dimensionType="groupSizeEncoding">
  <field name="speed" id="10" type="uint16"/>
  <field name="mpg" id="11" type="float"/>