Skip to content

Commit 2ce6bdc

Browse files
mjpt777mjpt777
committed
[Java] Fix formatting inconsistencies and checkstyle rule violation.
1 parent 28362fa commit 2ce6bdc

File tree

1 file changed

+40
-65
lines changed

1 file changed

+40
-65
lines changed

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

Lines changed: 40 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,7 @@ private void generateGroupClassHeader(
181181
indent + INDENT + "private int _offset;\n\n",
182182
formatClassName(groupName),
183183
dimensionsClassName,
184-
parentMessageClassName
185-
));
184+
parentMessageClassName));
186185

187186
sb.append(String.format(
188187
indent + INDENT + "public void WrapForDecode(%s parentMessage, DirectBuffer buffer, int actingVersion)\n" +
@@ -196,8 +195,7 @@ private void generateGroupClassHeader(
196195
indent + INDENT + INDENT + "_index = -1;\n" +
197196
indent + INDENT + INDENT + "_parentMessage.Limit = parentMessage.Limit + SbeHeaderSize;\n" +
198197
indent + INDENT + "}\n\n",
199-
parentMessageClassName
200-
));
198+
parentMessageClassName));
201199

202200
final int blockLength = tokens.get(index).encodedLength();
203201
final String typeForBlockLength = cSharpTypeName(tokens.get(index + 2).encoding().primitiveType());
@@ -219,21 +217,19 @@ private void generateGroupClassHeader(
219217
parentMessageClassName,
220218
typeForBlockLength,
221219
blockLength,
222-
typeForNumInGroup
223-
));
220+
typeForNumInGroup));
224221

225222
sb.append(String.format(
226-
indent + INDENT + "public const int SbeBlockLength = %d;\n" +
227-
indent + INDENT + "public const int SbeHeaderSize = %d;\n",
228-
blockLength,
229-
dimensionHeaderLength
230-
));
223+
indent + INDENT + "public const int SbeBlockLength = %d;\n" +
224+
indent + INDENT + "public const int SbeHeaderSize = %d;\n",
225+
blockLength,
226+
dimensionHeaderLength));
231227

232-
sb.append(String.format(
228+
sb.append(
233229
indent + INDENT + "public int ActingBlockLength { get { return _blockLength; } }\n\n" +
234230
indent + INDENT + "public int Count { get { return _count; } }\n\n" +
235231
indent + INDENT + "public bool HasNext { get { return (_index + 1) < _count; } }\n\n"
236-
));
232+
);
237233

238234
sb.append(String.format(
239235
indent + INDENT + "public %sGroup Next()\n" +
@@ -247,8 +243,7 @@ private void generateGroupClassHeader(
247243
indent + INDENT + INDENT + "++_index;\n\n" +
248244
indent + INDENT + INDENT + "return this;\n" +
249245
indent + INDENT + "}\n",
250-
formatClassName(groupName)
251-
));
246+
formatClassName(groupName)));
252247
}
253248

254249
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
262257
indent + "private readonly %sGroup _%s = new %sGroup();\n",
263258
className,
264259
toLowerFirstChar(groupName),
265-
className
266-
));
260+
className));
267261

268262
sb.append(String.format(
269263
"\n" +
270264
indent + "public const long %sId = %d;\n",
271265
toUpperFirstChar(groupName),
272-
token.id()
273-
));
266+
token.id()));
274267

275268
generateSinceActingDeprecated(sb, indent, toUpperFirstChar(groupName), token);
276269

@@ -286,8 +279,7 @@ private CharSequence generateGroupProperty(final String groupName, final Token t
286279
indent + "}\n",
287280
className,
288281
toUpperFirstChar(groupName),
289-
toLowerFirstChar(groupName)
290-
));
282+
toLowerFirstChar(groupName)));
291283

292284
sb.append(String.format(
293285
"\n" +
@@ -298,8 +290,7 @@ private CharSequence generateGroupProperty(final String groupName, final Token t
298290
indent + "}\n",
299291
className,
300292
toUpperFirstChar(groupName),
301-
toLowerFirstChar(groupName)
302-
));
293+
toLowerFirstChar(groupName)));
303294

304295
return sb;
305296
}
@@ -332,11 +323,10 @@ private CharSequence generateVarData(
332323
final String byteOrderStr = generateByteOrder(byteOrder, lengthEncoding.primitiveType().size());
333324

334325
sb.append(String.format(
335-
"\n" +
336-
indent + "public const int %sHeaderSize = %d;\n",
337-
propertyName,
338-
sizeOfLengthField
339-
));
326+
"\n" +
327+
indent + "public const int %sHeaderSize = %d;\n",
328+
propertyName,
329+
sizeOfLengthField));
340330

341331
sb.append(String.format(
342332
"\n" +
@@ -435,7 +425,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
435425
}
436426

437427
private CharSequence generateCompositePropertyElements(
438-
final String containingClassName, final List<Token> tokens, final String indent)
428+
final String containingClassName, final List<Token> tokens, final String indent)
439429
{
440430
final StringBuilder sb = new StringBuilder();
441431

@@ -696,8 +686,7 @@ private CharSequence generateSingleValueProperty(
696686
generateFieldNotPresentCondition(token.version(), token.encoding(), indent),
697687
typePrefix,
698688
offset,
699-
byteOrderStr
700-
));
689+
byteOrderStr));
701690

702691
return sb;
703692
}
@@ -739,8 +728,7 @@ private CharSequence generateArrayFieldNotPresentCondition(
739728

740729
return String.format(
741730
indent + INDENT + INDENT + "if (actingVersion < %d) return 0;\n\n",
742-
sinceVersion
743-
);
731+
sinceVersion);
744732
}
745733

746734
private CharSequence generateTypeFieldNotPresentCondition(
@@ -754,8 +742,7 @@ private CharSequence generateTypeFieldNotPresentCondition(
754742

755743
return String.format(
756744
indent + INDENT + INDENT + "if (actingVersion < %d) return null;\n\n",
757-
sinceVersion
758-
);
745+
sinceVersion);
759746
}
760747

761748
private CharSequence generateArrayProperty(
@@ -778,8 +765,7 @@ private CharSequence generateArrayProperty(
778765
"\n" +
779766
indent + "public const int %sLength = %d;\n\n",
780767
propName,
781-
fieldLength
782-
));
768+
fieldLength));
783769

784770
sb.append(String.format(
785771
indent + "public %1$s Get%2$s(int index)\n" +
@@ -859,6 +845,7 @@ private CharSequence generateArrayProperty(
859845
fieldLength,
860846
offset));
861847
}
848+
862849
return sb;
863850
}
864851

@@ -872,8 +859,7 @@ private void generateCharacterEncodingMethod(
872859
"\n" +
873860
indent + "public const string %sCharacterEncoding = \"%s\";\n\n",
874861
formatPropertyName(propertyName),
875-
encoding
876-
));
862+
encoding));
877863
}
878864

879865
private CharSequence generateConstPropertyMethods(
@@ -890,8 +876,7 @@ private CharSequence generateConstPropertyMethods(
890876
indent + INDENT + "public %1$s %2$s { get { return %3$s; } }\n",
891877
cSharpTypeName(token.encoding().primitiveType()),
892878
toUpperFirstChar(propertyName),
893-
generateLiteral(token.encoding().primitiveType(), token.encoding().constValue().toString())
894-
);
879+
generateLiteral(token.encoding().primitiveType(), token.encoding().constValue().toString()));
895880
}
896881

897882
final StringBuilder sb = new StringBuilder();
@@ -905,15 +890,13 @@ private CharSequence generateConstPropertyMethods(
905890
"\n" +
906891
indent + INDENT + "private static readonly byte[] _%1$sValue = { %2$s };\n",
907892
propertyName,
908-
values
909-
));
893+
values));
910894

911895
sb.append(String.format(
912896
"\n" +
913897
indent + INDENT + "public const int %1$sLength = %2$d;\n",
914898
toUpperFirstChar(propertyName),
915-
constantValue.length
916-
));
899+
constantValue.length));
917900

918901
sb.append(String.format(
919902
indent + INDENT + "public %1$s %2$s(int index)\n" +
@@ -922,8 +905,7 @@ private CharSequence generateConstPropertyMethods(
922905
indent + INDENT + "}\n\n",
923906
javaTypeName,
924907
toUpperFirstChar(propertyName),
925-
propertyName
926-
));
908+
propertyName));
927909

928910
sb.append(String.format(
929911
indent + INDENT + "public int Get%1$s(byte[] dst, int offset, int length)\n" +
@@ -934,8 +916,7 @@ private CharSequence generateConstPropertyMethods(
934916
indent + INDENT + "}\n",
935917
toUpperFirstChar(propertyName),
936918
constantValue.length,
937-
propertyName
938-
));
919+
propertyName));
939920

940921
return sb;
941922
}
@@ -969,8 +950,7 @@ private CharSequence generateFixedFlyweightCode(final int size)
969950
INDENT + INDENT + INDENT + "_buffer = buffer;\n" +
970951
INDENT + INDENT + "}\n\n" +
971952
INDENT + INDENT + "public const int Size = %d;\n",
972-
size
973-
);
953+
size);
974954
}
975955

976956
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
10921072
"\n" +
10931073
indent + "public const int %sId = %d;\n",
10941074
CSharpUtil.formatPropertyName(token.name()),
1095-
token.id()
1096-
));
1075+
token.id()));
1076+
10971077
generateSinceActingDeprecated(sb, indent, CSharpUtil.formatPropertyName(token.name()), token);
10981078
}
10991079

@@ -1119,8 +1099,7 @@ private void generateFieldMetaAttributeMethod(final StringBuilder sb, final Toke
11191099
toUpperFirstChar(token.name()),
11201100
epoch,
11211101
timeUnit,
1122-
semanticType
1123-
));
1102+
semanticType));
11241103
}
11251104

11261105
private CharSequence generateEnumFieldNotPresentCondition(
@@ -1136,8 +1115,7 @@ private CharSequence generateEnumFieldNotPresentCondition(
11361115
return String.format(
11371116
indent + INDENT + INDENT + "if (_actingVersion < %d) return %s.NULL_VALUE;\n\n",
11381117
sinceVersion,
1139-
enumName
1140-
);
1118+
enumName);
11411119
}
11421120

11431121
private CharSequence generateEnumProperty(final String propertyName, final Token token, final String indent)
@@ -1172,8 +1150,7 @@ private CharSequence generateEnumProperty(final String propertyName, final Token
11721150
typePrefix,
11731151
offset,
11741152
byteOrderStr,
1175-
enumUnderlyingType
1176-
));
1153+
enumUnderlyingType));
11771154

11781155
return sb;
11791156
}
@@ -1210,8 +1187,7 @@ private Object generateBitSetProperty(final String propertyName, final Token tok
12101187
typePrefix,
12111188
offset,
12121189
byteOrderStr,
1213-
typeName
1214-
));
1190+
typeName));
12151191

12161192
return sb;
12171193
}
@@ -1227,8 +1203,7 @@ private Object generateCompositeProperty(final String propertyName, final Token
12271203
indent + INDENT + "private readonly %1$s _%2$s = new %3$s();\n",
12281204
compositeName,
12291205
toLowerFirstChar(propertyName),
1230-
compositeName
1231-
));
1206+
compositeName));
12321207

12331208
sb.append(String.format(
12341209
"\n" +
@@ -1245,8 +1220,7 @@ private Object generateCompositeProperty(final String propertyName, final Token
12451220
toUpperFirstChar(propertyName),
12461221
generateTypeFieldNotPresentCondition(token.version(), indent),
12471222
toLowerFirstChar(propertyName),
1248-
offset
1249-
));
1223+
offset));
12501224

12511225
return sb;
12521226
}
@@ -1268,6 +1242,7 @@ private void generateSinceActingDeprecated(
12681242
token.version(),
12691243
token.deprecated()));
12701244
}
1245+
12711246
private String generateByteOrder(final ByteOrder byteOrder, final int primitiveTypeSize)
12721247
{
12731248
if (primitiveTypeSize == 1)

0 commit comments

Comments
 (0)