[Java] Fix formatting inconsistencies and checkstyle rule violation.

Author: mjpt777

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

@@ -181,8 +181,7 @@ private void generateGroupClassHeader(
  indent + INDENT + "private int _offset;\n\n",
  formatClassName(groupName),
  dimensionsClassName,
- parentMessageClassName
- ));
+ parentMessageClassName));
 
  sb.append(String.format(
  indent + INDENT + "public void WrapForDecode(%s parentMessage, DirectBuffer buffer, int actingVersion)\n" +
@@ -196,8 +195,7 @@ private void generateGroupClassHeader(
  indent + INDENT + INDENT + "_index = -1;\n" +
  indent + INDENT + INDENT + "_parentMessage.Limit = parentMessage.Limit + SbeHeaderSize;\n" +
  indent + INDENT + "}\n\n",
- parentMessageClassName
- ));
+ parentMessageClassName));
 
  final int blockLength = tokens.get(index).encodedLength();
  final String typeForBlockLength = cSharpTypeName(tokens.get(index + 2).encoding().primitiveType());
@@ -219,21 +217,19 @@ private void generateGroupClassHeader(
  parentMessageClassName,
  typeForBlockLength,
  blockLength,
- typeForNumInGroup
- ));
+ typeForNumInGroup));
 
  sb.append(String.format(
- indent + INDENT + "public const int SbeBlockLength = %d;\n" +
- indent + INDENT + "public const int SbeHeaderSize = %d;\n",
- blockLength,
- dimensionHeaderLength
- ));
+ indent + INDENT + "public const int SbeBlockLength = %d;\n" +
+ indent + INDENT + "public const int SbeHeaderSize = %d;\n",
+ blockLength,
+ dimensionHeaderLength));
 
- sb.append(String.format(
+ 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"
- ));
+ );
 
  sb.append(String.format(
  indent + INDENT + "public %sGroup Next()\n" +
@@ -247,8 +243,7 @@ private void generateGroupClassHeader(
  indent + INDENT + INDENT + "++_index;\n\n" +
  indent + INDENT + INDENT + "return this;\n" +
  indent + INDENT + "}\n",
- formatClassName(groupName)
- ));
+ formatClassName(groupName)));
  }
 
  private CharSequence generateGroupProperty(final String groupName, final Token token, final String indent)
@@ -262,15 +257,13 @@ private CharSequence generateGroupProperty(final String groupName, final Token t
  indent + "private readonly %sGroup _%s = new %sGroup();\n",
  className,
  toLowerFirstChar(groupName),
- className
- ));
+ className));
 
  sb.append(String.format(
  "\n" +
  indent + "public const long %sId = %d;\n",
  toUpperFirstChar(groupName),
- token.id()
- ));
+ token.id()));
 
  generateSinceActingDeprecated(sb, indent, toUpperFirstChar(groupName), token);
 
@@ -286,8 +279,7 @@ private CharSequence generateGroupProperty(final String groupName, final Token t
  indent + "}\n",
  className,
  toUpperFirstChar(groupName),
- toLowerFirstChar(groupName)
- ));
+ toLowerFirstChar(groupName)));
 
  sb.append(String.format(
  "\n" +
@@ -298,8 +290,7 @@ private CharSequence generateGroupProperty(final String groupName, final Token t
  indent + "}\n",
  className,
  toUpperFirstChar(groupName),
- toLowerFirstChar(groupName)
- ));
+ toLowerFirstChar(groupName)));
 
  return sb;
  }
@@ -332,11 +323,10 @@ private CharSequence generateVarData(
  final String byteOrderStr = generateByteOrder(byteOrder, lengthEncoding.primitiveType().size());
 
  sb.append(String.format(
- "\n" +
- indent + "public const int %sHeaderSize = %d;\n",
- propertyName,
- sizeOfLengthField
- ));
+ "\n" +
+ indent + "public const int %sHeaderSize = %d;\n",
+ propertyName,
+ sizeOfLengthField));
 
  sb.append(String.format(
  "\n" +
@@ -435,7 +425,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
  }
 
  private CharSequence generateCompositePropertyElements(
-  final String containingClassName, final List<Token> tokens, final String indent)
+ final String containingClassName, final List<Token> tokens, final String indent)
  {
  final StringBuilder sb = new StringBuilder();
 
@@ -696,8 +686,7 @@ private CharSequence generateSingleValueProperty(
  generateFieldNotPresentCondition(token.version(), token.encoding(), indent),
  typePrefix,
  offset,
- byteOrderStr
- ));
+ byteOrderStr));
 
  return sb;
  }
@@ -739,8 +728,7 @@ private CharSequence generateArrayFieldNotPresentCondition(
 
  return String.format(
  indent + INDENT + INDENT + "if (actingVersion < %d) return 0;\n\n",
- sinceVersion
- );
+ sinceVersion);
  }
 
  private CharSequence generateTypeFieldNotPresentCondition(
@@ -754,8 +742,7 @@ private CharSequence generateTypeFieldNotPresentCondition(
 
  return String.format(
  indent + INDENT + INDENT + "if (actingVersion < %d) return null;\n\n",
- sinceVersion
- );
+ sinceVersion);
  }
 
  private CharSequence generateArrayProperty(
@@ -778,8 +765,7 @@ private CharSequence generateArrayProperty(
  "\n" +
  indent + "public const int %sLength = %d;\n\n",
  propName,
- fieldLength
- ));
+ fieldLength));
 
  sb.append(String.format(
  indent + "public %1$s Get%2$s(int index)\n" +
@@ -859,6 +845,7 @@ private CharSequence generateArrayProperty(
  fieldLength,
  offset));
  }
+
  return sb;
  }
 
@@ -872,8 +859,7 @@ private void generateCharacterEncodingMethod(
  "\n" +
  indent + "public const string %sCharacterEncoding = \"%s\";\n\n",
  formatPropertyName(propertyName),
- encoding
- ));
+ encoding));
  }
 
  private CharSequence generateConstPropertyMethods(
@@ -890,8 +876,7 @@ private CharSequence generateConstPropertyMethods(
  indent + INDENT + "public %1$s %2$s { get { return %3$s; } }\n",
  cSharpTypeName(token.encoding().primitiveType()),
  toUpperFirstChar(propertyName),
- generateLiteral(token.encoding().primitiveType(), token.encoding().constValue().toString())
- );
+ generateLiteral(token.encoding().primitiveType(), token.encoding().constValue().toString()));
  }
 
  final StringBuilder sb = new StringBuilder();
@@ -905,15 +890,13 @@ private CharSequence generateConstPropertyMethods(
  "\n" +
  indent + INDENT + "private static readonly byte[] _%1$sValue = { %2$s };\n",
  propertyName,
- values
- ));
+ values));
 
  sb.append(String.format(
  "\n" +
  indent + INDENT + "public const int %1$sLength = %2$d;\n",
  toUpperFirstChar(propertyName),
- constantValue.length
- ));
+ constantValue.length));
 
  sb.append(String.format(
  indent + INDENT + "public %1$s %2$s(int index)\n" +
@@ -922,8 +905,7 @@ private CharSequence generateConstPropertyMethods(
  indent + INDENT + "}\n\n",
  javaTypeName,
  toUpperFirstChar(propertyName),
- propertyName
- ));
+ propertyName));
 
  sb.append(String.format(
  indent + INDENT + "public int Get%1$s(byte[] dst, int offset, int length)\n" +
@@ -934,8 +916,7 @@ private CharSequence generateConstPropertyMethods(
  indent + INDENT + "}\n",
  toUpperFirstChar(propertyName),
  constantValue.length,
- propertyName
- ));
+ propertyName));
 
  return sb;
  }
@@ -969,8 +950,7 @@ private CharSequence generateFixedFlyweightCode(final int size)
  INDENT + INDENT + INDENT + "_buffer = buffer;\n" +
  INDENT + INDENT + "}\n\n" +
  INDENT + INDENT + "public const int Size = %d;\n",
- size
- );
+ size);
  }
 
  private CharSequence generateMessageFlyweightCode(final String className, final Token token, final String indent)
@@ -1092,8 +1072,8 @@ private void generateFieldIdMethod(final StringBuilder sb, final Token token, fi
  "\n" +
  indent + "public const int %sId = %d;\n",
  CSharpUtil.formatPropertyName(token.name()),
- token.id()
- ));
+ token.id()));
+
  generateSinceActingDeprecated(sb, indent, CSharpUtil.formatPropertyName(token.name()), token);
  }
 
@@ -1119,8 +1099,7 @@ private void generateFieldMetaAttributeMethod(final StringBuilder sb, final Toke
  toUpperFirstChar(token.name()),
  epoch,
  timeUnit,
- semanticType
- ));
+ semanticType));
  }
 
  private CharSequence generateEnumFieldNotPresentCondition(
@@ -1136,8 +1115,7 @@ private CharSequence generateEnumFieldNotPresentCondition(
  return String.format(
  indent + INDENT + INDENT + "if (_actingVersion < %d) return %s.NULL_VALUE;\n\n",
  sinceVersion,
- enumName
- );
+ enumName);
  }
 
  private CharSequence generateEnumProperty(final String propertyName, final Token token, final String indent)
@@ -1172,8 +1150,7 @@ private CharSequence generateEnumProperty(final String propertyName, final Token
  typePrefix,
  offset,
  byteOrderStr,
- enumUnderlyingType
- ));
+ enumUnderlyingType));
 
  return sb;
  }
@@ -1210,8 +1187,7 @@ private Object generateBitSetProperty(final String propertyName, final Token tok
  typePrefix,
  offset,
  byteOrderStr,
- typeName
- ));
+ typeName));
 
  return sb;
  }
@@ -1227,8 +1203,7 @@ private Object generateCompositeProperty(final String propertyName, final Token
  indent + INDENT + "private readonly %1$s _%2$s = new %3$s();\n",
  compositeName,
  toLowerFirstChar(propertyName),
- compositeName
- ));
+ compositeName));
 
  sb.append(String.format(
  "\n" +
@@ -1245,8 +1220,7 @@ private Object generateCompositeProperty(final String propertyName, final Token
  toUpperFirstChar(propertyName),
  generateTypeFieldNotPresentCondition(token.version(), indent),
  toLowerFirstChar(propertyName),
- offset
- ));
+ offset));
 
  return sb;
  }
@@ -1268,6 +1242,7 @@ private void generateSinceActingDeprecated(
  token.version(),
  token.deprecated()));
  }
+
  private String generateByteOrder(final ByteOrder byteOrder, final int primitiveTypeSize)
  {
  if (primitiveTypeSize == 1)