[Java] Tidy up warnings and formatting.

Author: mjpt777

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

@@ -43,7 +43,6 @@ public class CppGenerator implements CodeGenerator
     private final OutputManager outputManager;
 
     public CppGenerator(final Ir ir, final OutputManager outputManager)
-        throws IOException
     {
         Verify.notNull(ir, "ir");
         Verify.notNull(outputManager, "outputManager");

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

@@ -44,7 +44,6 @@ public class CSharpGenerator implements CodeGenerator
     private final OutputManager outputManager;
 
     public CSharpGenerator(final Ir ir, final OutputManager outputManager)
-        throws IOException
     {
         Verify.notNull(ir, "ir");
         Verify.notNull(outputManager, "outputManager");
@@ -112,7 +111,7 @@ public void generate() throws IOException
 
                 final List<Token> varData = new ArrayList<>();
                 collectVarData(messageBody, offset, varData);
-                out.append(generateVarData(className, varData, BASE_INDENT + INDENT));
+                out.append(generateVarData(varData, BASE_INDENT + INDENT));
 
                 out.append(INDENT + "}\n");
                 out.append("}\n");
@@ -150,7 +149,7 @@ private void generateGroups(
 
             final List<Token> varData = new ArrayList<>();
             i = collectVarData(tokens, i, varData);
-            sb.append(generateVarData(parentMessageClassName, varData, indent + INDENT + INDENT));
+            sb.append(generateVarData(varData, indent + INDENT + INDENT));
 
             sb.append(indent).append(INDENT + "}\n");
         }
@@ -228,8 +227,7 @@ private void generateGroupClassHeader(
         sb.append(
             indent + INDENT + "public int ActingBlockLength { get { return _blockLength; } }\n\n" +
             indent + INDENT + "public int Count { get { return _count; } }\n\n" +
-            indent + INDENT + "public bool HasNext { get { return (_index + 1) < _count; } }\n\n"
-        );
+            indent + INDENT + "public bool HasNext { get { return (_index + 1) < _count; } }\n\n");
 
         sb.append(String.format(
             indent + INDENT + "public %sGroup Next()\n" +
@@ -304,10 +302,7 @@ private CharSequence generateGroupProperty(final String groupName, final Token t
         return sb;
     }
 
-    private CharSequence generateVarData(
-            final String className,
-            final List<Token> tokens,
-            final String indent)
+    private CharSequence generateVarData(final List<Token> tokens, final String indent)
     {
         final StringBuilder sb = new StringBuilder();
 
@@ -333,7 +328,7 @@ private CharSequence generateVarData(
 
                 sb.append(String.format(
                     "\n" +
-                        indent + "public const int %sHeaderSize = %d;\n",
+                    indent + "public const int %sHeaderSize = %d;\n",
                     propertyName,
                     sizeOfLengthField));
 
@@ -355,8 +350,7 @@ private CharSequence generateVarData(
                     generateArrayFieldNotPresentCondition(token.version(), indent),
                     sizeOfLengthField,
                     lengthTypePrefix,
-                    byteOrderStr
-                ));
+                    byteOrderStr));
 
                 sb.append(String.format(
                     indent + "public int Set%1$s(byte[] src, int srcOffset, int length)\n" +
@@ -372,8 +366,7 @@ private CharSequence generateVarData(
                     sizeOfLengthField,
                     lengthTypePrefix,
                     lengthCSharpType,
-                    byteOrderStr
-                ));
+                    byteOrderStr));
             }
         }
 
@@ -425,16 +418,14 @@ private void generateComposite(final List<Token> tokens) throws IOException
             out.append(generateFileHeader(ir.applicableNamespace()));
             out.append(generateClassDeclaration(compositeName));
             out.append(generateFixedFlyweightCode(tokens.get(0).encodedLength()));
-            out.append(generateCompositePropertyElements(
-                compositeName, tokens.subList(1, tokens.size() - 1), BASE_INDENT));
+            out.append(generateCompositePropertyElements(tokens.subList(1, tokens.size() - 1), BASE_INDENT));
 
             out.append(INDENT + "}\n");
             out.append("}\n");
         }
     }
 
-    private CharSequence generateCompositePropertyElements(
-        final String containingClassName, final List<Token> tokens, final String indent)
+    private CharSequence generateCompositePropertyElements(final List<Token> tokens, final String indent)
     {
         final StringBuilder sb = new StringBuilder();
 
@@ -519,7 +510,7 @@ private CharSequence generateFileHeader(final String packageName)
             sb.setLength(sb.length() - 1);
         }
 
-        // Remove '_' but upcase between them
+        // Remove '_' but uppercase between them
         tokens = sb.toString().split("-");
         sb.setLength(0);
 
@@ -544,8 +535,7 @@ private CharSequence generateClassDeclaration(final String className)
         return String.format(
             INDENT + "public sealed partial class %s\n" +
             INDENT + "{\n",
-            className
-        );
+            className);
     }
 
     private void generateMetaAttributeEnum() throws IOException
@@ -562,8 +552,7 @@ private void generateMetaAttributeEnum() throws IOException
                 INDENT + INDENT + "SemanticType,\n" +
                 INDENT + INDENT + "Presence\n" +
                 INDENT + "}\n" +
-                "}\n"
-            );
+                "}\n");
         }
     }
 
@@ -585,25 +574,7 @@ private CharSequence generateEnumDeclaration(
         return result;
     }
 
-    private CharSequence generatePrimitivePropertyEncodings(final List<Token> tokens, final String indent)
-    {
-        final StringBuilder sb = new StringBuilder();
-
-        for (final Token token : tokens)
-        {
-            if (token.signal() == Signal.ENCODING)
-            {
-                sb.append(generatePrimitiveProperty(token.name(), token, indent));
-            }
-        }
-
-        return sb;
-    }
-
-    private CharSequence generatePrimitiveProperty(
-        final String propertyName,
-        final Token token,
-        final String indent)
+    private CharSequence generatePrimitiveProperty(final String propertyName, final Token token, final String indent)
     {
         final StringBuilder sb = new StringBuilder();
 

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

@@ -45,7 +45,6 @@ public class GolangGenerator implements CodeGenerator
     private TreeSet<String> imports;
 
     public GolangGenerator(final Ir ir, final OutputManager outputManager)
-        throws IOException
     {
         Verify.notNull(ir, "ir");
         Verify.notNull(outputManager, "outputManager");
@@ -89,7 +88,7 @@ public void generateTypeStubs() throws IOException
         }
     }
 
-    // MesssageHeader is special but the standard allows it to be
+    // MessageHeader is special but the standard allows it to be
     // pretty arbitrary after the first four fields.
     // All we need is the imports, type declaration, and encode/decode
     public void generateMessageHeaderStub() throws IOException
@@ -165,14 +164,13 @@ public void generate() throws IOException
                 final List<Token> varData = new ArrayList<>();
                 collectVarData(messageBody, i, varData);
 
-                generateFields(sb, typeName, fields, "");
+                generateFields(sb, typeName, fields);
                 generateGroups(sb, groups, typeName);
                 generateGroupProperties(sb, groups, typeName);
-                generateVarData(sb, typeName, varData, "");
+                generateVarData(sb, typeName, varData);
 
                 out.append(generateFileHeader(ir.namespaces()));
                 out.append(sb);
-
             }
         }
     }
@@ -202,6 +200,7 @@ private String generateDecodeOffset(final int gap, final String indent)
             this.imports.add("io/ioutil");
             return String.format("%1$s\tio.CopyN(ioutil.Discard, _r, %2$d)\n", indent, gap);
         }
+
         return "";
     }
 
@@ -482,7 +481,6 @@ private void generateRangeCheckPrimitive(
                 "\t\t}\n" +
                 "\t}\n",
                 varName));
-
         }
 
         // Fields that are an [n]byte may have a characterEncoding which
@@ -740,7 +738,7 @@ private int generateEncodeDecode(
                                 tokens.subList(i + 5, tokens.size() - 1),
                                 false, true));
 
-                    // Group gap blocklength handling
+                    // Group gap block length handling
                     encode.append(generateEncodeOffset(gap, "\t")).append("\t}\n");
                     decode.append(generateDecodeOffset(gap, "\t")).append("\t}\n");
 
@@ -791,6 +789,7 @@ private int generateEncodeDecode(
         // Close out the methods and append
         generateEncodeDecodeClose(encode, decode, rangeCheck, init);
         sb.append(encode).append(decode).append(rangeCheck).append(init).append(nested);
+
         return currentOffset;
     }
 
@@ -886,7 +885,6 @@ private void generateChoiceEncodeDecode(
             token.encodedLength() * 8,
             varName));
 
-        // Decode
         generateDecodeHeader(sb, varName, choiceName, false, false);
 
         sb.append(String.format(
@@ -937,7 +935,7 @@ private void generateDecodeHeader(
         final String blockLengthType = golangTypeName(ir.headerStructure().blockLengthType());
 
         // Messages, groups, and vardata are extensible so need to know
-        // working blocklength.
+        // working block length.
         // Messages mandate only 16 bits, otherwise let's be generous and
         // support the platform.
         if (isExtensible)
@@ -1273,7 +1271,6 @@ private int generateGroupEncodeDecode(
         return gap;
     }
 
-
     // Recursively traverse groups to create the group properties
     private void generateGroupProperties(
         final StringBuilder sb,
@@ -1320,23 +1317,22 @@ private void generateGroups(final StringBuilder sb, final List<Token> tokens, fi
 
             final List<Token> fields = new ArrayList<>();
             i = collectFields(tokens, i, fields);
-            generateFields(sb, groupName, fields, prefix);
+            generateFields(sb, groupName, fields);
 
             final List<Token> groups = new ArrayList<>();
             i = collectGroups(tokens, i, groups);
             generateGroups(sb, groups, groupName);
 
             final List<Token> varData = new ArrayList<>();
             i = collectVarData(tokens, i, varData);
-            generateVarData(sb, formatTypeName(groupName), varData, prefix);
+            generateVarData(sb, formatTypeName(groupName), varData);
         }
     }
 
     private void generateVarData(
         final StringBuilder sb,
         final String typeName,
-        final List<Token> tokens,
-        final String prefix)
+        final List<Token> tokens)
     {
         for (int i = 0, size = tokens.size(); i < size;)
         {
@@ -1351,7 +1347,7 @@ private void generateVarData(
             final Token lengthToken = tokens.get(i + 2);
             final int lengthOfLengthField = lengthToken.encodedLength();
 
-            generateFieldMetaAttributeMethod(sb, typeName, token, prefix);
+            generateFieldMetaAttributeMethod(sb, typeName, token);
 
             generateVarDataDescriptors(
                 sb, token, typeName, propertyName, characterEncoding, lengthOfLengthField);
@@ -1598,6 +1594,7 @@ private void generateChoiceDecls(
                 .append(generateLiteral(token.encoding().primitiveType(), token.encoding().constValue().toString()));
             comma = ", ";
         }
+
         sb.append("}\n");
     }
 
@@ -1624,6 +1621,7 @@ private StringBuilder generateFileHeader(
         }
 
         sb.append(")\n\n");
+
         return sb;
     }
 
@@ -1784,7 +1782,6 @@ private void generateTypeBody(
         sb.append(nested);
     }
 
-
     private void generateCompositePropertyElements(
         final StringBuilder sb,
         final String containingTypeName,
@@ -1818,6 +1815,7 @@ private void generateCompositePropertyElements(
                 default:
                     break;
             }
+
             i += tokens.get(i).componentTokenCount();
         }
     }
@@ -2076,7 +2074,7 @@ private void generateMessageCode(
     }
 
     // Used for groups which need to know the schema's definition
-    // of blocklength and version to check for extensions
+    // of block length and version to check for extensions
     private void generateExtensibilityMethods(
         final StringBuilder sb,
         final String typeName,
@@ -2099,8 +2097,7 @@ private void generateExtensibilityMethods(
     private void generateFields(
         final StringBuilder sb,
         final String containingTypeName,
-        final List<Token> tokens,
-        final String prefix)
+        final List<Token> tokens)
     {
         for (int i = 0, size = tokens.size(); i < size; i++)
         {
@@ -2112,7 +2109,7 @@ private void generateFields(
 
                 generateId(sb, containingTypeName, propertyName, signalToken);
                 generateSinceActingDeprecated(sb, containingTypeName, propertyName, signalToken);
-                generateFieldMetaAttributeMethod(sb, containingTypeName, signalToken, prefix);
+                generateFieldMetaAttributeMethod(sb, containingTypeName, signalToken);
 
                 switch (encodingToken.signal())
                 {
@@ -2140,8 +2137,7 @@ private void generateFields(
     private static void generateFieldMetaAttributeMethod(
         final StringBuilder sb,
         final String containingTypeName,
-        final Token token,
-        final String prefix)
+        final Token token)
     {
         final Encoding encoding = token.encoding();
         final String epoch = encoding.epoch() == null ? "" : encoding.epoch();

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

@@ -137,8 +137,8 @@ private static Optional<FieldsRepresentationSummary> generateFieldsRepresentatio
         }
 
         final int numBytes = components.fields.stream()
-            .filter(t -> !t.isConstantEncoding())
-            .filter(t -> t.signal() == ENCODING || t.signal() == BEGIN_ENUM || t.signal() == BEGIN_SET)
+            .filter((t) -> !t.isConstantEncoding())
+            .filter((t) -> t.signal() == ENCODING || t.signal() == BEGIN_ENUM || t.signal() == BEGIN_SET)
             .mapToInt(Token::encodedLength)
             .sum();
 
@@ -274,8 +274,7 @@ private static String generateFixedFieldCoder(
         final String messageTypeName,
         final OutputManager outputManager,
         final String topType,
-        final Optional<FieldsRepresentationSummary>
-            fieldsRepresentationOptional,
+        final Optional<FieldsRepresentationSummary> fieldsRepresentationOptional,
         final RustCodecType codecType) throws IOException
     {
         if (!fieldsRepresentationOptional.isPresent())
@@ -735,7 +734,6 @@ private static List<GroupTreeNode> buildGroupTrees(
         final String parentTypeName,
         final List<Token> groupsTokens,
         final Optional<GroupTreeNode> parent)
-
     {
         final int size = groupsTokens.size();
         final List<GroupTreeNode> groups = new ArrayList<>();