[Java] Add static choice setter to generated codecs.

Author: mjpt777

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

@@ -1165,29 +1165,7 @@ private CharSequence generateChoiceDecoders(final List<Token> tokens)
                 final String choiceBitIndex = encoding.constValue().toString();
                 final String byteOrderStr = byteOrderString(encoding);
                 final PrimitiveType primitiveType = encoding.primitiveType();
-                final String argType;
-
-                switch (primitiveType)
-                {
-                    case UINT8:
-                        argType = "byte";
-                        break;
-
-                    case UINT16:
-                        argType = "short";
-                        break;
-
-                    case UINT32:
-                        argType = "int";
-                        break;
-
-                    case UINT64:
-                        argType = "long";
-                        break;
-
-                    default:
-                        throw new IllegalStateException("Invalid type: " + primitiveType);
-                }
+                final String argType = bitsetArgType(primitiveType);
 
                 return String.format(
                     "\n" +
@@ -1217,20 +1195,49 @@ private CharSequence generateChoiceEncoders(final String bitSetClassName, final
                 final Encoding encoding = token.encoding();
                 final String choiceBitIndex = encoding.constValue().toString();
                 final String byteOrderStr = byteOrderString(encoding);
+                final PrimitiveType primitiveType = encoding.primitiveType();
+                final String argType = bitsetArgType(primitiveType);
 
                 return String.format(
                     "\n" +
-                    "    public %s %s(final boolean value)\n" +
+                    "    public %1$s %2$s(final boolean value)\n" +
                     "    {\n" +
-                    "%s\n" +
+                    "%3$s\n" +
                     "        return this;\n" +
+                    "    }\n\n" +
+                    "    public static %4$s %2$s(final %4$s bits, final boolean value)\n" +
+                    "    {\n" +
+                    "%5$s" +
                     "    }\n",
                     bitSetClassName,
                     choiceName,
-                    generateChoicePut(encoding.primitiveType(), choiceBitIndex, byteOrderStr));
+                    generateChoicePut(encoding.primitiveType(), choiceBitIndex, byteOrderStr),
+                    argType,
+                    generateStaticChoicePut(encoding.primitiveType(), choiceBitIndex));
             });
     }
 
+    private String bitsetArgType(final PrimitiveType primitiveType)
+    {
+        switch (primitiveType)
+        {
+            case UINT8:
+                return "byte";
+
+            case UINT16:
+                return "short";
+
+            case UINT32:
+                return "int";
+
+            case UINT64:
+                return "long";
+
+            default:
+                throw new IllegalStateException("Invalid type: " + primitiveType);
+        }
+    }
+
     private CharSequence generateEnumValues(final List<Token> tokens)
     {
         final StringBuilder sb = new StringBuilder();
@@ -2590,8 +2597,7 @@ private String generateStaticChoiceGet(final PrimitiveType type, final String bi
         throw new IllegalArgumentException("primitive type not supported: " + type);
     }
 
-    private String generateChoicePut(
-        final PrimitiveType type, final String bitIdx, final String byteOrder)
+    private String generateChoicePut(final PrimitiveType type, final String bitIdx, final String byteOrder)
     {
         switch (type)
         {
@@ -2623,6 +2629,30 @@ private String generateChoicePut(
         throw new IllegalArgumentException("primitive type not supported: " + type);
     }
 
+    private String generateStaticChoicePut(final PrimitiveType type, final String bitIdx)
+    {
+        switch (type)
+        {
+            case UINT8:
+                return
+                    "        return (byte)(value ? bits | (1 << " + bitIdx + ") : bits & ~(1 << " + bitIdx + "));\n";
+
+            case UINT16:
+                return
+                    "        return (short)(value ? bits | (1 << " + bitIdx + ") : bits & ~(1 << " + bitIdx + "));\n";
+
+            case UINT32:
+                return
+                    "        return value ? bits | (1 << " + bitIdx + ") : bits & ~(1 << " + bitIdx + ");\n";
+
+            case UINT64:
+                return
+                    "        return value ? bits | (1L << " + bitIdx + ") : bits & ~(1L << " + bitIdx + ");\n";
+        }
+
+        throw new IllegalArgumentException("primitive type not supported: " + type);
+    }
+
     private CharSequence generateEncoderDisplay(final String decoderName, final String baseIndent)
     {
         final String indent = baseIndent + INDENT;