Merge remote-tracking branch 'origin/master'

Author: mjpt777

build.gradle

@@ -128,7 +128,7 @@ subprojects {
     dependencies {
         checkstyle 'com.puppycrawl.tools:checkstyle:8.25'
 
-        compile 'org.agrona:agrona:1.0.9'
+        compile 'org.agrona:agrona:1.0.10'
 
         testCompile 'org.hamcrest:hamcrest:2.1'
         testCompile 'org.mockito:mockito-core:3.1.0'

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

@@ -1477,16 +1477,14 @@ private CharSequence generateEnumLookupMethod(final List<Token> tokens, final St
             sb.append("            case ").append(constStr).append(": return ").append(name).append(";\n");
         }
 
+        final String nullValue = tokens.get(0).encoding().applicableNullValue().toString();
+        sb.append("            case ").append(nullValue).append(": return NULL_VAL").append(";\n");
+
         final String handleUnknownLogic = shouldDecodeUnknownEnumValues ?
             INDENT + INDENT + "return SBE_UNKNOWN;\n" :
             INDENT + INDENT + "throw new IllegalArgumentException(\"Unknown value: \" + value);\n";
 
-        final String nullValue = tokens.get(0).encoding().applicableNullValue().toString();
         sb.append("        }\n\n")
-            .append("        if (").append(generateLiteral(primitiveType, nullValue)).append(" == value)\n")
-            .append("        {\n")
-            .append("            return NULL_VAL;\n")
-            .append("        }\n\n")
             .append(handleUnknownLogic)
             .append("    }\n");
 

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

@@ -33,11 +33,7 @@ public static ByteOrderCodec get(final short value)
         {
             case 0: return SBE_LITTLE_ENDIAN;
             case 1: return SBE_BIG_ENDIAN;
-        }
-
-        if ((short)255 == value)
-        {
-            return NULL_VAL;
+            case 255: return NULL_VAL;
         }
 
         throw new IllegalArgumentException("Unknown value: " + value);

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

@@ -592,13 +592,13 @@ public StringBuilder appendTo(final StringBuilder builder)
         builder.append(schemaVersion());
         builder.append('|');
         builder.append("packageName=");
-        builder.append('\'' + packageName() + '\'');
+        builder.append('\'').append(packageName()).append('\'');
         builder.append('|');
         builder.append("namespaceName=");
-        builder.append('\'' + namespaceName() + '\'');
+        builder.append('\'').append(namespaceName()).append('\'');
         builder.append('|');
         builder.append("semanticVersion=");
-        builder.append('\'' + semanticVersion() + '\'');
+        builder.append('\'').append(semanticVersion()).append('\'');
 
         limit(originalLimit);
 

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

@@ -36,11 +36,7 @@ public static PresenceCodec get(final short value)
             case 0: return SBE_REQUIRED;
             case 1: return SBE_OPTIONAL;
             case 2: return SBE_CONSTANT;
-        }
-
-        if ((short)255 == value)
-        {
-            return NULL_VAL;
+            case 255: return NULL_VAL;
         }
 
         throw new IllegalArgumentException("Unknown value: " + value);

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

@@ -63,11 +63,7 @@ public static PrimitiveTypeCodec get(final short value)
             case 9: return UINT64;
             case 10: return FLOAT;
             case 11: return DOUBLE;
-        }
-
-        if ((short)255 == value)
-        {
-            return NULL_VAL;
+            case 255: return NULL_VAL;
         }
 
         throw new IllegalArgumentException("Unknown value: " + value);

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

@@ -78,11 +78,7 @@ public static SignalCodec get(final short value)
             case 15: return BEGIN_VAR_DATA;
             case 16: return END_VAR_DATA;
             case 17: return ENCODING;
-        }
-
-        if ((short)255 == value)
-        {
-            return NULL_VAL;
+            case 255: return NULL_VAL;
         }
 
         throw new IllegalArgumentException("Unknown value: " + value);

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

@@ -1731,37 +1731,37 @@ public StringBuilder appendTo(final StringBuilder builder)
         builder.append(deprecated());
         builder.append('|');
         builder.append("name=");
-        builder.append('\'' + name() + '\'');
+        builder.append('\'').append(name()).append('\'');
         builder.append('|');
         builder.append("constValue=");
-        builder.append('\'' + constValue() + '\'');
+        builder.append('\'').append(constValue()).append('\'');
         builder.append('|');
         builder.append("minValue=");
-        builder.append('\'' + minValue() + '\'');
+        builder.append('\'').append(minValue()).append('\'');
         builder.append('|');
         builder.append("maxValue=");
-        builder.append('\'' + maxValue() + '\'');
+        builder.append('\'').append(maxValue()).append('\'');
         builder.append('|');
         builder.append("nullValue=");
-        builder.append('\'' + nullValue() + '\'');
+        builder.append('\'').append(nullValue()).append('\'');
         builder.append('|');
         builder.append("characterEncoding=");
-        builder.append('\'' + characterEncoding() + '\'');
+        builder.append('\'').append(characterEncoding()).append('\'');
         builder.append('|');
         builder.append("epoch=");
-        builder.append('\'' + epoch() + '\'');
+        builder.append('\'').append(epoch()).append('\'');
         builder.append('|');
         builder.append("timeUnit=");
-        builder.append('\'' + timeUnit() + '\'');
+        builder.append('\'').append(timeUnit()).append('\'');
         builder.append('|');
         builder.append("semanticType=");
-        builder.append('\'' + semanticType() + '\'');
+        builder.append('\'').append(semanticType()).append('\'');
         builder.append('|');
         builder.append("description=");
-        builder.append('\'' + description() + '\'');
+        builder.append('\'').append(description()).append('\'');
         builder.append('|');
         builder.append("referencedName=");
-        builder.append('\'' + referencedName() + '\'');
+        builder.append('\'').append(referencedName()).append('\'');
 
         limit(originalLimit);