Use LinkedHashMap to keep enum values in order so lookup table can be jump table.

Author: mjpt777

main/java/uk/co/real_logic/sbe/ir/generated/ByteOrderCodec.java

@@ -5,8 +5,8 @@
 
 public enum ByteOrderCodec
 {
- SBE_BIG_ENDIAN((short)1),
  SBE_LITTLE_ENDIAN((short)0),
+ SBE_BIG_ENDIAN((short)1),
  NULL_VAL((short)255);
 
  private final short value;
@@ -25,8 +25,8 @@ public static ByteOrderCodec get(final short value)
  {
  switch (value)
  {
- case 1: return SBE_BIG_ENDIAN;
  case 0: return SBE_LITTLE_ENDIAN;
+ case 1: return SBE_BIG_ENDIAN;
  case 255: return NULL_VAL;
  }
 

main/java/uk/co/real_logic/sbe/ir/generated/PresenceCodec.java

@@ -5,9 +5,9 @@
 
 public enum PresenceCodec
 {
- CONSTANT((short)2),
  REQUIRED((short)0),
  OPTIONAL((short)1),
+ CONSTANT((short)2),
  NULL_VAL((short)255);
 
  private final short value;
@@ -26,9 +26,9 @@ public static PresenceCodec get(final short value)
  {
  switch (value)
  {
- case 2: return CONSTANT;
  case 0: return REQUIRED;
  case 1: return OPTIONAL;
+ case 2: return CONSTANT;
  case 255: return NULL_VAL;
  }
 

main/java/uk/co/real_logic/sbe/ir/generated/PrimitiveTypeCodec.java

@@ -5,18 +5,18 @@
 
 public enum PrimitiveTypeCodec
 {
- INT32((short)4),
- INT8((short)2),
+ NONE((short)0),
  CHAR((short)1),
- DOUBLE((short)11),
- FLOAT((short)10),
- UINT32((short)8),
- UINT8((short)6),
+ INT8((short)2),
+ INT16((short)3),
+ INT32((short)4),
  INT64((short)5),
- UINT64((short)9),
- NONE((short)0),
+ UINT8((short)6),
  UINT16((short)7),
- INT16((short)3),
+ UINT32((short)8),
+ UINT64((short)9),
+ FLOAT((short)10),
+ DOUBLE((short)11),
  NULL_VAL((short)255);
 
  private final short value;
@@ -35,18 +35,18 @@ public static PrimitiveTypeCodec get(final short value)
  {
  switch (value)
  {
- case 4: return INT32;
- case 2: return INT8;
+ case 0: return NONE;
  case 1: return CHAR;
- case 11: return DOUBLE;
- case 10: return FLOAT;
- case 8: return UINT32;
- case 6: return UINT8;
+ case 2: return INT8;
+ case 3: return INT16;
+ case 4: return INT32;
  case 5: return INT64;
- case 9: return UINT64;
- case 0: return NONE;
+ case 6: return UINT8;
  case 7: return UINT16;
- case 3: return INT16;
+ case 8: return UINT32;
+ case 9: return UINT64;
+ case 10: return FLOAT;
+ case 11: return DOUBLE;
  case 255: return NULL_VAL;
  }
 

main/java/uk/co/real_logic/sbe/ir/generated/SignalCodec.java

@@ -5,23 +5,23 @@
 
 public enum SignalCodec
 {
- END_SET((short)14),
- BEGIN_VAR_DATA((short)15),
+ BEGIN_MESSAGE((short)1),
  END_MESSAGE((short)2),
+ BEGIN_COMPOSITE((short)3),
+ END_COMPOSITE((short)4),
  BEGIN_FIELD((short)5),
  END_FIELD((short)6),
- END_COMPOSITE((short)4),
- ENCODING((short)17),
- VALID_VALUE((short)10),
- END_GROUP((short)8),
- BEGIN_COMPOSITE((short)3),
- END_VAR_DATA((short)16),
  BEGIN_GROUP((short)7),
+ END_GROUP((short)8),
  BEGIN_ENUM((short)9),
- CHOICE((short)13),
+ VALID_VALUE((short)10),
  END_ENUM((short)11),
  BEGIN_SET((short)12),
- BEGIN_MESSAGE((short)1),
+ CHOICE((short)13),
+ END_SET((short)14),
+ BEGIN_VAR_DATA((short)15),
+ END_VAR_DATA((short)16),
+ ENCODING((short)17),
  NULL_VAL((short)255);
 
  private final short value;
@@ -40,23 +40,23 @@ public static SignalCodec get(final short value)
  {
  switch (value)
  {
- case 14: return END_SET;
- case 15: return BEGIN_VAR_DATA;
+ case 1: return BEGIN_MESSAGE;
  case 2: return END_MESSAGE;
+ case 3: return BEGIN_COMPOSITE;
+ case 4: return END_COMPOSITE;
  case 5: return BEGIN_FIELD;
  case 6: return END_FIELD;
- case 4: return END_COMPOSITE;
- case 17: return ENCODING;
- case 10: return VALID_VALUE;
- case 8: return END_GROUP;
- case 3: return BEGIN_COMPOSITE;
- case 16: return END_VAR_DATA;
  case 7: return BEGIN_GROUP;
+ case 8: return END_GROUP;
  case 9: return BEGIN_ENUM;
- case 13: return CHOICE;
+ case 10: return VALID_VALUE;
  case 11: return END_ENUM;
  case 12: return BEGIN_SET;
- case 1: return BEGIN_MESSAGE;
+ case 13: return CHOICE;
+ case 14: return END_SET;
+ case 15: return BEGIN_VAR_DATA;
+ case 16: return END_VAR_DATA;
+ case 17: return ENCODING;
  case 255: return NULL_VAL;
  }
 

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

@@ -26,7 +26,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 import java.util.Collection;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 import static uk.co.real_logic.sbe.xml.XmlSchemaParser.handleError;
@@ -42,8 +42,8 @@ public class EnumType extends Type
 {
  private final PrimitiveType encodingType;
  private final PrimitiveValue nullValue;
- private final Map<PrimitiveValue, ValidValue> validValueByPrimitiveValueMap = new HashMap<>();
- private final Map<String, ValidValue> validValueByNameMap = new HashMap<>();
+ private final Map<PrimitiveValue, ValidValue> validValueByPrimitiveValueMap = new LinkedHashMap<>();
+ private final Map<String, ValidValue> validValueByNameMap = new LinkedHashMap<>();
 
  /**
  * Construct a new enumType from XML Schema.