Skip to content

Commit 08a6015

Browse files
mjpt777mjpt777
committed
[Java] Style cleanup.
1 parent 5dd77ad commit 08a6015

File tree

4 files changed

+69
-88
lines changed

4 files changed

+69
-88
lines changed

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

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -361,8 +361,7 @@ private void generateGroupDecoderClassHeader(
361361
indent + " parentMessage.limit(parentMessage.limit() + HEADER_SIZE);\n" +
362362
indent + " }\n\n",
363363
parentMessageClassName,
364-
readOnlyBuffer
365-
));
364+
readOnlyBuffer));
366365

367366
final int blockLength = tokens.get(index).encodedLength();
368367

@@ -400,8 +399,7 @@ private void generateGroupDecoderClassHeader(
400399
indent + " {\n" +
401400
indent + " return (index + 1) < count;\n" +
402401
indent + " }\n\n",
403-
formatClassName(groupName)
404-
));
402+
formatClassName(groupName)));
405403

406404
sb.append(String.format(
407405
indent + " public %s next()\n" +
@@ -415,8 +413,7 @@ private void generateGroupDecoderClassHeader(
415413
indent + " ++index;\n\n" +
416414
indent + " return this;\n" +
417415
indent + " }\n",
418-
formatClassName(groupName)
419-
));
416+
formatClassName(groupName)));
420417
}
421418

422419
private void generateGroupEncoderClassHeader(
@@ -463,8 +460,7 @@ private void generateGroupEncoderClassHeader(
463460
numInGroupToken.encoding().applicableMaxValue().longValue(),
464461
javaTypeForBlockLength,
465462
blockLength,
466-
javaTypeForNumInGroup
467-
));
463+
javaTypeForNumInGroup));
468464

469465
sb.append(indent).append(" public static int sbeHeaderSize()\n")
470466
.append(indent).append(" {\n")
@@ -476,8 +472,7 @@ private void generateGroupEncoderClassHeader(
476472
indent + " {\n" +
477473
indent + " return %d;\n" +
478474
indent + " }\n\n",
479-
blockLength
480-
));
475+
blockLength));
481476

482477
sb.append(String.format(
483478
indent + " public %s next()\n" +
@@ -491,8 +486,7 @@ private void generateGroupEncoderClassHeader(
491486
indent + " ++index;\n\n" +
492487
indent + " return this;\n" +
493488
indent + " }\n",
494-
formatClassName(encoderName(groupName))
495-
));
489+
formatClassName(encoderName(groupName))));
496490
}
497491

498492
private static String primitiveTypeName(final Token token)
@@ -526,8 +520,7 @@ private void generateGroupDecoderClassDeclaration(
526520
dimensionHeaderSize,
527521
decoderName(dimensionsClassName),
528522
parentMessageClassName,
529-
readOnlyBuffer
530-
));
523+
readOnlyBuffer));
531524
}
532525

533526
private void generateGroupEncoderClassDeclaration(
@@ -555,8 +548,7 @@ private void generateGroupEncoderClassDeclaration(
555548
dimensionHeaderSize,
556549
dimensionsClassName,
557550
parentMessageClassName,
558-
mutableBuffer
559-
));
551+
mutableBuffer));
560552
}
561553

562554
private static CharSequence generateGroupDecoderProperty(final String groupName, final Token token, final String indent)
@@ -570,8 +562,7 @@ private static CharSequence generateGroupDecoderProperty(final String groupName,
570562
indent + " private final %s %s = new %s();\n",
571563
className,
572564
propertyName,
573-
className
574-
));
565+
className));
575566

576567
sb.append(String.format(
577568
"\n" +
@@ -580,8 +571,7 @@ private static CharSequence generateGroupDecoderProperty(final String groupName,
580571
indent + " return %d;\n" +
581572
indent + " }\n",
582573
formatPropertyName(groupName),
583-
token.id()
584-
));
574+
token.id()));
585575

586576
sb.append(String.format(
587577
"\n" +
@@ -591,8 +581,7 @@ private static CharSequence generateGroupDecoderProperty(final String groupName,
591581
indent + " return %2$s;\n" +
592582
indent + " }\n",
593583
className,
594-
propertyName
595-
));
584+
propertyName));
596585

597586
return sb;
598587
}
@@ -608,8 +597,7 @@ private CharSequence generateGroupEncoderProperty(final String groupName, final
608597
indent + " private final %s %s = new %s();\n",
609598
className,
610599
propertyName,
611-
className
612-
));
600+
className));
613601

614602
sb.append(String.format(
615603
"\n" +
@@ -618,8 +606,7 @@ private CharSequence generateGroupEncoderProperty(final String groupName, final
618606
indent + " return %d;\n" +
619607
indent + " }\n",
620608
formatPropertyName(groupName),
621-
token.id()
622-
));
609+
token.id()));
623610

624611
sb.append(String.format(
625612
"\n" +
@@ -629,8 +616,7 @@ private CharSequence generateGroupEncoderProperty(final String groupName, final
629616
indent + " return %2$s;\n" +
630617
indent + " }\n",
631618
className,
632-
propertyName
633-
));
619+
propertyName));
634620

635621
return sb;
636622
}
@@ -666,8 +652,7 @@ private CharSequence generateDecoderVarData(final List<Token> tokens, final Stri
666652
indent + " return %d;\n" +
667653
indent + " }\n",
668654
toLowerFirstChar(propertyName),
669-
sizeOfLengthField
670-
));
655+
sizeOfLengthField));
671656

672657
sb.append(String.format(
673658
"\n" +
@@ -679,8 +664,7 @@ private CharSequence generateDecoderVarData(final List<Token> tokens, final Stri
679664
indent + " }\n",
680665
toLowerFirstChar(propertyName),
681666
generateArrayFieldNotPresentCondition(token.version(), indent),
682-
generateGet(lengthType, "limit", byteOrderStr)
683-
));
667+
generateGet(lengthType, "limit", byteOrderStr)));
684668

685669
generateDataDecodeMethods(
686670
sb, token, propertyName, sizeOfLengthField, lengthType, byteOrderStr, characterEncoding, indent);
@@ -722,8 +706,7 @@ private CharSequence generateEncoderVarData(final String className, final List<T
722706
indent + " return %d;\n" +
723707
indent + " }\n",
724708
toLowerFirstChar(propertyName),
725-
sizeOfLengthField
726-
));
709+
sizeOfLengthField));
727710

728711
generateDataEncodeMethods(
729712
sb,
@@ -798,8 +781,7 @@ private void generateDataDecodeMethods(
798781
generateStringNotPresentCondition(token.version(), indent),
799782
sizeOfLengthField,
800783
generateGet(lengthType, "limit", byteOrderStr),
801-
characterEncoding
802-
));
784+
characterEncoding));
803785
}
804786

805787
private void generateDataEncodeMethods(
@@ -1136,8 +1118,7 @@ private CharSequence generateChoiceEncoders(final String bitSetClassName, final
11361118
" }\n",
11371119
bitSetClassName,
11381120
choiceName,
1139-
generateChoicePut(encoding.primitiveType(), "offset", choiceBitIndex, byteOrderStr)
1140-
);
1121+
generateChoicePut(encoding.primitiveType(), "offset", choiceBitIndex, byteOrderStr));
11411122
});
11421123
}
11431124

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public enum Separators
4343

4444
public final char symbol;
4545

46-
Separators(char symbol)
46+
Separators(final char symbol)
4747
{
4848
this.symbol = symbol;
4949
}
@@ -55,7 +55,7 @@ public enum Separators
5555
* @param indent the current generated code indentation
5656
* @param generatedBuilder the name of the generated StringBuilder to which separator should be added
5757
*/
58-
public void appendToGeneratedBuilder(StringBuilder builder, String indent, String generatedBuilder)
58+
public void appendToGeneratedBuilder(final StringBuilder builder, final String indent, final String generatedBuilder)
5959
{
6060
append(builder, indent, generatedBuilder + ".append('" + symbol + "');");
6161
}

‎sbe-tool/src/test/java/uk/co/real_logic/sbe/EncodedCarTestBase.java‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
public class EncodedCarTestBase
1111
{
12-
protected static final MessageHeaderEncoder MESSAGE_HEADER = new MessageHeaderEncoder();
13-
protected static final CarEncoder CAR = new CarEncoder();
12+
protected static final MessageHeaderEncoder MESSAGE_HEADER = new MessageHeaderEncoder();
13+
protected static final CarEncoder CAR = new CarEncoder();
1414

1515
private static byte[] vehicleCode;
1616
private static byte[] manufacturerCode;
@@ -39,57 +39,57 @@ protected static void encodeTestMessage(final ByteBuffer buffer)
3939

4040
int bufferOffset = 0;
4141
MESSAGE_HEADER
42-
.wrap(directBuffer, bufferOffset)
43-
.blockLength(CAR.sbeBlockLength())
44-
.templateId(CAR.sbeTemplateId())
45-
.schemaId(CAR.sbeSchemaId())
46-
.version(CAR.sbeSchemaVersion());
42+
.wrap(directBuffer, bufferOffset)
43+
.blockLength(CAR.sbeBlockLength())
44+
.templateId(CAR.sbeTemplateId())
45+
.schemaId(CAR.sbeSchemaId())
46+
.version(CAR.sbeSchemaVersion());
4747

4848
bufferOffset += MESSAGE_HEADER.encodedLength();
4949

5050
final int srcOffset = 0;
5151

5252
CAR.wrap(directBuffer, bufferOffset)
53-
.serialNumber(1234)
54-
.modelYear(2013)
55-
.available(BooleanType.T)
56-
.code(Model.A)
57-
.putVehicleCode(vehicleCode, srcOffset);
53+
.serialNumber(1234)
54+
.modelYear(2013)
55+
.available(BooleanType.T)
56+
.code(Model.A)
57+
.putVehicleCode(vehicleCode, srcOffset);
5858

5959
for (int i = 0, size = CarEncoder.someNumbersLength(); i < size; i++)
6060
{
6161
CAR.someNumbers(i, i);
6262
}
6363

6464
CAR.extras()
65-
.clear()
66-
.cruiseControl(true)
67-
.sportsPack(true)
68-
.sunRoof(false);
65+
.clear()
66+
.cruiseControl(true)
67+
.sportsPack(true)
68+
.sunRoof(false);
6969

7070
CAR.engine()
71-
.capacity(2000)
72-
.numCylinders((short)4)
73-
.putManufacturerCode(manufacturerCode, srcOffset);
71+
.capacity(2000)
72+
.numCylinders((short)4)
73+
.putManufacturerCode(manufacturerCode, srcOffset);
7474

7575
CAR.fuelFiguresCount(3)
76-
.next().speed(30).mpg(35.9f)
77-
.next().speed(55).mpg(49.0f)
78-
.next().speed(75).mpg(40.0f);
76+
.next().speed(30).mpg(35.9f)
77+
.next().speed(55).mpg(49.0f)
78+
.next().speed(75).mpg(40.0f);
7979

8080
final CarEncoder.PerformanceFiguresEncoder perfFigures = CAR.performanceFiguresCount(2);
8181
perfFigures.next()
82-
.octaneRating((short)95)
83-
.accelerationCount(3)
84-
.next().mph(30).seconds(4.0f)
85-
.next().mph(60).seconds(7.5f)
86-
.next().mph(100).seconds(12.2f);
82+
.octaneRating((short)95)
83+
.accelerationCount(3)
84+
.next().mph(30).seconds(4.0f)
85+
.next().mph(60).seconds(7.5f)
86+
.next().mph(100).seconds(12.2f);
8787
perfFigures.next()
88-
.octaneRating((short)99)
89-
.accelerationCount(3)
90-
.next().mph(30).seconds(3.8f)
91-
.next().mph(60).seconds(7.1f)
92-
.next().mph(100).seconds(11.8f);
88+
.octaneRating((short)99)
89+
.accelerationCount(3)
90+
.next().mph(30).seconds(3.8f)
91+
.next().mph(60).seconds(7.1f)
92+
.next().mph(100).seconds(11.8f);
9393

9494
CAR.make(new String(make));
9595
CAR.putModel(model, srcOffset, model.length);

‎sbe-tool/src/test/java/uk/co/real_logic/sbe/generation/java/ToStringTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ public void exampleMessagePrinted() throws Exception
1919

2020
final String result = CAR.toString();
2121
assertEquals(
22-
"[Car]" +
23-
"(sbeTemplateId=1|sbeSchemaId=1|sbeSchemaVersion=0|sbeBlockLength=45):" +
24-
"serialNumber=1234|modelYear=2013|available=T|code=A|" +
25-
"someNumbers=[0,1,2,3,4]|" +
26-
"vehicleCode=abcdef|" +
27-
"extras={sportsPack,cruiseControl}|" +
28-
"engine=(capacity=2000|numCylinders=4|manufacturerCode=123|)|" +
29-
"fuelFigures=[" +
30-
"(speed=30|mpg=35.9|)," +
31-
"(speed=55|mpg=49.0|)," +
32-
"(speed=75|mpg=40.0|)]|" +
33-
"performanceFigures=[" +
34-
"(octaneRating=95|acceleration=[(mph=30|seconds=4.0|),(mph=60|seconds=7.5|),(mph=100|seconds=12.2|)]|)," +
35-
"(octaneRating=99|acceleration=[(mph=30|seconds=3.8|),(mph=60|seconds=7.1|),(mph=100|seconds=11.8|)]|)]|" +
36-
"make=Honda|model=Civic VTi|activationCode=|",
37-
result);
22+
"[Car]" +
23+
"(sbeTemplateId=1|sbeSchemaId=1|sbeSchemaVersion=0|sbeBlockLength=45):" +
24+
"serialNumber=1234|modelYear=2013|available=T|code=A|" +
25+
"someNumbers=[0,1,2,3,4]|" +
26+
"vehicleCode=abcdef|" +
27+
"extras={sportsPack,cruiseControl}|" +
28+
"engine=(capacity=2000|numCylinders=4|manufacturerCode=123|)|" +
29+
"fuelFigures=[" +
30+
"(speed=30|mpg=35.9|)," +
31+
"(speed=55|mpg=49.0|)," +
32+
"(speed=75|mpg=40.0|)]|" +
33+
"performanceFigures=[" +
34+
"(octaneRating=95|acceleration=[(mph=30|seconds=4.0|),(mph=60|seconds=7.5|),(mph=100|seconds=12.2|)]|)," +
35+
"(octaneRating=99|acceleration=[(mph=30|seconds=3.8|),(mph=60|seconds=7.1|),(mph=100|seconds=11.8|)]|)]|" +
36+
"make=Honda|model=Civic VTi|activationCode=|",
37+
result);
3838
}
3939
}

0 commit comments

Comments
 (0)