Skip to content

Commit bf648c0

Browse files
mjpt777mjpt777
committed
[Java] Warnings clean up.
1 parent d76eb90 commit bf648c0

File tree

1 file changed

+26
-40
lines changed

1 file changed

+26
-40
lines changed

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

Lines changed: 26 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -185,17 +185,14 @@ public void generate() throws IOException
185185
final List<Token> varData = new ArrayList<>();
186186
collectVarData(messageBody, i, varData);
187187

188-
generateDecoder(BASE_INDENT, fields, groups, varData, msgToken);
189-
generateEncoder(BASE_INDENT, fields, groups, varData, msgToken);
188+
generateDecoder(fields, groups, varData, msgToken);
189+
generateEncoder(fields, groups, varData, msgToken);
190190
}
191191
}
192192

193193
private void generateEncoder(
194-
final String indent,
195-
final List<Token> fields,
196-
final List<Token> groups,
197-
final List<Token> varData,
198-
final Token msgToken) throws IOException
194+
final List<Token> fields, final List<Token> groups, final List<Token> varData, final Token msgToken)
195+
throws IOException
199196
{
200197
final String className = formatClassName(encoderName(msgToken.name()));
201198
final String implementsString = implementsInterface(MESSAGE_ENCODER_FLYWEIGHT);
@@ -204,29 +201,26 @@ private void generateEncoder(
204201
{
205202
out.append(generateMainHeader(ir.applicableNamespace()));
206203

207-
generateAnnotations(indent, className, groups, out, 0, this::encoderName);
204+
generateAnnotations(BASE_INDENT, className, groups, out, 0, this::encoderName);
208205
out.append(generateDeclaration(className, implementsString, msgToken));
209206
out.append(generateEncoderFlyweightCode(className, msgToken));
210207

211208
final StringBuilder sb = new StringBuilder();
212-
generateEncoderFields(sb, className, fields, indent);
213-
generateEncoderGroups(sb, className, groups, indent, false);
214-
generateEncoderVarData(sb, className, varData, indent);
209+
generateEncoderFields(sb, className, fields, BASE_INDENT);
210+
generateEncoderGroups(sb, className, groups, BASE_INDENT, false);
211+
generateEncoderVarData(sb, className, varData, BASE_INDENT);
215212

216213
out.append(sb);
217214

218-
out.append(generateEncoderDisplay(formatClassName(decoderName(msgToken.name())), indent));
215+
out.append(generateEncoderDisplay(formatClassName(decoderName(msgToken.name()))));
219216

220217
out.append("}\n");
221218
}
222219
}
223220

224221
private void generateDecoder(
225-
final String indent,
226-
final List<Token> fields,
227-
final List<Token> groups,
228-
final List<Token> varData,
229-
final Token msgToken) throws IOException
222+
final List<Token> fields, final List<Token> groups, final List<Token> varData, final Token msgToken)
223+
throws IOException
230224
{
231225
final String className = formatClassName(decoderName(msgToken.name()));
232226
final String implementsString = implementsInterface(MESSAGE_DECODER_FLYWEIGHT);
@@ -235,17 +229,17 @@ private void generateDecoder(
235229
{
236230
out.append(generateMainHeader(ir.applicableNamespace()));
237231

238-
generateAnnotations(indent, className, groups, out, 0, this::decoderName);
232+
generateAnnotations(BASE_INDENT, className, groups, out, 0, this::decoderName);
239233
out.append(generateDeclaration(className, implementsString, msgToken));
240234
out.append(generateDecoderFlyweightCode(className, msgToken));
241235

242236
final StringBuilder sb = new StringBuilder();
243-
generateDecoderFields(sb, fields, indent);
244-
generateDecoderGroups(sb, className, groups, indent, false);
245-
generateDecoderVarData(sb, varData, indent);
237+
generateDecoderFields(sb, fields, BASE_INDENT);
238+
generateDecoderGroups(sb, className, groups, BASE_INDENT, false);
239+
generateDecoderVarData(sb, varData, BASE_INDENT);
246240
out.append(sb);
247241

248-
out.append(generateDecoderDisplay(msgToken.name(), fields, groups, varData, indent));
242+
out.append(generateDecoderDisplay(msgToken.name(), fields, groups, varData));
249243

250244
out.append("}\n");
251245
}
@@ -1280,7 +1274,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
12801274
i += encodingToken.componentTokenCount();
12811275
}
12821276

1283-
out.append(generateCompositeDecoderDisplay(tokens, BASE_INDENT));
1277+
out.append(generateCompositeDecoderDisplay(tokens));
12841278

12851279
out.append("}\n");
12861280
}
@@ -1326,7 +1320,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
13261320
i += encodingToken.componentTokenCount();
13271321
}
13281322

1329-
out.append(generateCompositeEncoderDisplay(decoderName, BASE_INDENT));
1323+
out.append(generateCompositeEncoderDisplay(decoderName));
13301324
out.append("}\n");
13311325
}
13321326
}
@@ -3033,11 +3027,7 @@ private String generateStaticChoiceGet(final PrimitiveType type, final String bi
30333027
switch (type)
30343028
{
30353029
case UINT8:
3036-
return "0 != (value & (1 << " + bitIndex + "))";
3037-
30383030
case UINT16:
3039-
return "0 != (value & (1 << " + bitIndex + "))";
3040-
30413031
case UINT32:
30423032
return "0 != (value & (1 << " + bitIndex + "))";
30433033

@@ -3104,9 +3094,9 @@ private String generateStaticChoicePut(final PrimitiveType type, final String bi
31043094
throw new IllegalArgumentException("primitive type not supported: " + type);
31053095
}
31063096

3107-
private CharSequence generateEncoderDisplay(final String decoderName, final String baseIndent)
3097+
private CharSequence generateEncoderDisplay(final String decoderName)
31083098
{
3109-
final String indent = baseIndent + INDENT;
3099+
final String indent = INDENT;
31103100
final StringBuilder sb = new StringBuilder();
31113101

31123102
sb.append('\n');
@@ -3123,9 +3113,9 @@ private CharSequence generateEncoderDisplay(final String decoderName, final Stri
31233113
return sb.toString();
31243114
}
31253115

3126-
private CharSequence generateCompositeEncoderDisplay(final String decoderName, final String baseIndent)
3116+
private CharSequence generateCompositeEncoderDisplay(final String decoderName)
31273117
{
3128-
final String indent = baseIndent + INDENT;
3118+
final String indent = INDENT;
31293119
final StringBuilder sb = new StringBuilder();
31303120
appendToString(sb, indent);
31313121
sb.append('\n');
@@ -3140,9 +3130,9 @@ private CharSequence generateCompositeEncoderDisplay(final String decoderName, f
31403130
return sb.toString();
31413131
}
31423132

3143-
private CharSequence generateCompositeDecoderDisplay(final List<Token> tokens, final String baseIndent)
3133+
private CharSequence generateCompositeDecoderDisplay(final List<Token> tokens)
31443134
{
3145-
final String indent = baseIndent + INDENT;
3135+
final String indent = INDENT;
31463136
final StringBuilder sb = new StringBuilder();
31473137

31483138
appendToString(sb, indent);
@@ -3212,13 +3202,9 @@ private CharSequence generateChoiceDisplay(final List<Token> tokens)
32123202
}
32133203

32143204
private CharSequence generateDecoderDisplay(
3215-
final String name,
3216-
final List<Token> tokens,
3217-
final List<Token> groups,
3218-
final List<Token> varData,
3219-
final String baseIndent)
3205+
final String name, final List<Token> tokens, final List<Token> groups, final List<Token> varData)
32203206
{
3221-
final String indent = baseIndent + INDENT;
3207+
final String indent = INDENT;
32223208
final StringBuilder sb = new StringBuilder();
32233209

32243210
sb.append('\n');

0 commit comments

Comments
 (0)