Skip to content

Commit d996bfb

Browse files
committed
[Java] Warnings tidy up.
1 parent 3751ab6 commit d996bfb

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ public static void decode(
208208
sb.append("\ncar.engine.booster.horsePower=").append(engine.booster().horsePower());
209209

210210
sb.append("\ncar.engine.fuel=").append(
211-
new String(buffer, 0, engine.getFuel(buffer, 0, buffer.length), "ASCII"));
211+
new String(buffer, 0, engine.getFuel(buffer, 0, buffer.length), StandardCharsets.US_ASCII));
212212

213213
for (final CarDecoder.FuelFiguresDecoder fuelFigures : car.fuelFigures())
214214
{

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStubExtension.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.io.UnsupportedEncodingException;
2525
import java.nio.ByteBuffer;
2626
import java.nio.channels.FileChannel;
27+
import java.nio.charset.StandardCharsets;
2728
import java.nio.file.Paths;
2829

2930
import static extension.CarEncoder.cupHolderCountNullValue;
@@ -211,7 +212,7 @@ public static void decode(
211212
sb.append("\ncar.engine.booster.horsePower=").append(engine.booster().horsePower());
212213

213214
sb.append("\ncar.engine.fuel=").append(
214-
new String(buffer, 0, engine.getFuel(buffer, 0, buffer.length), "ASCII"));
215+
new String(buffer, 0, engine.getFuel(buffer, 0, buffer.length), StandardCharsets.US_ASCII));
215216

216217
final String cupHolderCount =
217218
car.cupHolderCount() == cupHolderCountNullValue() ? "null" : car.cupHolderCount() + "";

sbe-tool/src/main/java/uk/co/real_logic/sbe/PrimitiveValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ public String toString()
417417
*/
418418
public boolean equals(final Object value)
419419
{
420-
if (null != value && value instanceof PrimitiveValue)
420+
if (value instanceof PrimitiveValue)
421421
{
422422
final PrimitiveValue rhs = (PrimitiveValue)value;
423423

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,14 +1254,12 @@ private String generateByteOrder(final ByteOrder byteOrder, final int primitiveT
12541254
return "";
12551255
}
12561256

1257-
switch (byteOrder.toString())
1257+
if ("BIG_ENDIAN".equals(byteOrder.toString()))
12581258
{
1259-
case "BIG_ENDIAN":
1260-
return "BigEndian";
1261-
1262-
default:
1263-
return "LittleEndian";
1259+
return "BigEndian";
12641260
}
1261+
1262+
return "LittleEndian";
12651263
}
12661264

12671265
private String generateLiteral(final PrimitiveType type, final String value)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ private int generateEncodeDecode(
686686
encode.append(generateEncodeOffset(gap, ""));
687687
decode.append(generateDecodeOffset(gap, ""));
688688
currentOffset += signalToken.encodedLength() + gap;
689-
final String primitive = Character.toString(varName) + "." + propertyName;
689+
final String primitive = varName + "." + propertyName;
690690

691691
// Encode of a constant is a nullop and we want to
692692
// initialize constant values.
@@ -1044,7 +1044,7 @@ private int generateFieldEncodeDecode(
10441044
gap = encodingToken.offset() - currentOffset;
10451045
encode.append(generateEncodeOffset(gap, ""));
10461046
decode.append(generateDecodeOffset(gap, ""));
1047-
final String primitive = Character.toString(varName) + "." + propertyName;
1047+
final String primitive = varName + "." + propertyName;
10481048

10491049
// Encode of a constant is a nullop and we want to
10501050
// initialize constant values.

sbe-tool/src/main/java/uk/co/real_logic/sbe/json/JsonTokenListener.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public void onBitSet(
120120
final long bitPosition = tokens.get(i).encoding().constValue().longValue();
121121
final boolean flag = (encodedValue & (1L << bitPosition)) != 0;
122122

123-
output.append(Boolean.toString(flag));
123+
output.append(flag);
124124

125125
if (i < (toIndex - 1))
126126
{

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/IrGenerator.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import uk.co.real_logic.sbe.ir.Signal;
2222
import uk.co.real_logic.sbe.ir.Token;
2323

24-
import java.io.UnsupportedEncodingException;
24+
import java.nio.charset.StandardCharsets;
2525
import java.util.ArrayList;
2626
import java.util.List;
2727

@@ -128,14 +128,7 @@ private void addFieldSignal(final Field field, final Signal signal)
128128
{
129129
final String valueRef = field.valueRef();
130130
final byte[] bytes;
131-
try
132-
{
133-
bytes = valueRef.getBytes("UTF-8");
134-
}
135-
catch (final UnsupportedEncodingException ex)
136-
{
137-
throw new RuntimeException(ex);
138-
}
131+
bytes = valueRef.getBytes(StandardCharsets.UTF_8);
139132

140133
encodingBuilder.constValue(new PrimitiveValue(bytes, "UTF-8", valueRef.length()));
141134
encodingBuilder.primitiveType(PrimitiveType.CHAR);

0 commit comments

Comments
 (0)