Skip to content

Commit 43c6e79

Browse files
mjpt777mjpt777
committed
[Java] Remove unused throws clauses and tidy up warnings.
1 parent 4b64c6f commit 43c6e79

File tree

18 files changed

+82
-93
lines changed

18 files changed

+82
-93
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private static void encodeTestMessage(final ByteBuffer byteBuffer)
114114
byteBuffer.position(encodedLength);
115115
}
116116

117-
private static Ir decodeIr(final ByteBuffer buffer) throws IOException
117+
private static Ir decodeIr(final ByteBuffer buffer)
118118
{
119119
try (IrDecoder irDecoder = new IrDecoder(buffer))
120120
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public static PrimitiveType get(final String name)
152152

153153
/**
154154
* Used to hold a reference to the values array without having it defensively copied
155-
* on every call to {@link PrimitiveType#values()}.
155+
* on every call to {@link Enum} values().
156156
*/
157157
static class Singleton
158158
{

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@
2828
*/
2929
public class CppUtil
3030
{
31-
private static Map<PrimitiveType, String> typeNameByPrimitiveTypeMap = new EnumMap<>(PrimitiveType.class);
31+
private static final Map<PrimitiveType, String> PRIMITIVE_TYPE_STRING_ENUM_MAP = new EnumMap<>(PrimitiveType.class);
3232

3333
static
3434
{
35-
typeNameByPrimitiveTypeMap.put(PrimitiveType.CHAR, "char");
36-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT8, "std::int8_t");
37-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT16, "std::int16_t");
38-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT32, "std::int32_t");
39-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT64, "std::int64_t");
40-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT8, "std::uint8_t");
41-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT16, "std::uint16_t");
42-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT32, "std::uint32_t");
43-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT64, "std::uint64_t");
44-
typeNameByPrimitiveTypeMap.put(PrimitiveType.FLOAT, "float");
45-
typeNameByPrimitiveTypeMap.put(PrimitiveType.DOUBLE, "double");
35+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.CHAR, "char");
36+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT8, "std::int8_t");
37+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT16, "std::int16_t");
38+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT32, "std::int32_t");
39+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT64, "std::int64_t");
40+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT8, "std::uint8_t");
41+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT16, "std::uint16_t");
42+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT32, "std::uint32_t");
43+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT64, "std::uint64_t");
44+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.FLOAT, "float");
45+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.DOUBLE, "double");
4646
}
4747

4848
/**
@@ -53,7 +53,7 @@ public class CppUtil
5353
*/
5454
public static String cppTypeName(final PrimitiveType primitiveType)
5555
{
56-
return typeNameByPrimitiveTypeMap.get(primitiveType);
56+
return PRIMITIVE_TYPE_STRING_ENUM_MAP.get(primitiveType);
5757
}
5858

5959
/**

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ public class NamespaceOutputManager implements OutputManager
3737
*
3838
* @param baseDirName for the generated source code.
3939
* @param namespaceName for the generated source code relative to the baseDirName.
40-
* @throws IOException if an error occurs during output
4140
*/
4241
public NamespaceOutputManager(final String baseDirName, final String namespaceName)
43-
throws IOException
4442
{
4543
Verify.notNull(baseDirName, "baseDirName");
4644
Verify.notNull(namespaceName, "applicableNamespace");

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
import uk.co.real_logic.sbe.generation.TargetCodeGenerator;
2020
import uk.co.real_logic.sbe.ir.Ir;
2121

22-
import java.io.IOException;
23-
2422
public class CSharp implements TargetCodeGenerator
2523
{
26-
public CodeGenerator newInstance(final Ir ir, final String outputDir) throws IOException
24+
public CodeGenerator newInstance(final Ir ir, final String outputDir)
2725
{
2826
return new CSharpGenerator(ir, new CSharpNamespaceOutputManager(outputDir, ir.applicableNamespace()));
2927
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,24 @@
2626
*/
2727
public class CSharpUtil
2828
{
29-
private static Map<PrimitiveType, String> typeNameByPrimitiveTypeMap = new EnumMap<>(PrimitiveType.class);
29+
private static final Map<PrimitiveType, String> PRIMITIVE_TYPE_STRING_ENUM_MAP = new EnumMap<>(PrimitiveType.class);
3030

31-
/**
31+
/*
3232
* http://msdn.microsoft.com/en-us/library/ms228360(v=vs.90).aspx
3333
*/
3434
static
3535
{
36-
typeNameByPrimitiveTypeMap.put(PrimitiveType.CHAR, "byte");
37-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT8, "sbyte");
38-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT16, "short");
39-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT32, "int");
40-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT64, "long");
41-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT8, "byte");
42-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT16, "ushort");
43-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT32, "uint");
44-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT64, "ulong");
45-
typeNameByPrimitiveTypeMap.put(PrimitiveType.FLOAT, "float");
46-
typeNameByPrimitiveTypeMap.put(PrimitiveType.DOUBLE, "double");
36+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.CHAR, "byte");
37+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT8, "sbyte");
38+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT16, "short");
39+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT32, "int");
40+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT64, "long");
41+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT8, "byte");
42+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT16, "ushort");
43+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT32, "uint");
44+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT64, "ulong");
45+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.FLOAT, "float");
46+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.DOUBLE, "double");
4747
}
4848

4949
/**
@@ -54,7 +54,7 @@ public class CSharpUtil
5454
*/
5555
public static String cSharpTypeName(final PrimitiveType primitiveType)
5656
{
57-
return typeNameByPrimitiveTypeMap.get(primitiveType);
57+
return PRIMITIVE_TYPE_STRING_ENUM_MAP.get(primitiveType);
5858
}
5959

6060
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,6 @@ private int generateEncodeDecode(
748748
if (isExtensible && !extensionStarted)
749749
{
750750
generateExtensionCheck(decode, varName);
751-
extensionStarted = true;
752751
}
753752
// Close out this group and unwind
754753
generateEncodeDecodeClose(encode, decode, rangeCheck, init);

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

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,21 @@
2828
*/
2929
public class GolangUtil
3030
{
31-
private static Map<PrimitiveType, String> typeNameByPrimitiveTypeMap = new EnumMap<>(PrimitiveType.class);
31+
private static final Map<PrimitiveType, String> PRIMITIVE_TYPE_STRING_ENUM_MAP = new EnumMap<>(PrimitiveType.class);
3232

3333
static
3434
{
35-
typeNameByPrimitiveTypeMap.put(PrimitiveType.CHAR, "byte");
36-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT8, "int8");
37-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT16, "int16");
38-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT32, "int32");
39-
typeNameByPrimitiveTypeMap.put(PrimitiveType.INT64, "int64");
40-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT8, "uint8");
41-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT16, "uint16");
42-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT32, "uint32");
43-
typeNameByPrimitiveTypeMap.put(PrimitiveType.UINT64, "uint64");
44-
typeNameByPrimitiveTypeMap.put(PrimitiveType.FLOAT, "float32");
45-
typeNameByPrimitiveTypeMap.put(PrimitiveType.DOUBLE, "float64");
35+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.CHAR, "byte");
36+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT8, "int8");
37+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT16, "int16");
38+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT32, "int32");
39+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.INT64, "int64");
40+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT8, "uint8");
41+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT16, "uint16");
42+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT32, "uint32");
43+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.UINT64, "uint64");
44+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.FLOAT, "float32");
45+
PRIMITIVE_TYPE_STRING_ENUM_MAP.put(PrimitiveType.DOUBLE, "float64");
4646
}
4747

4848
/**
@@ -53,24 +53,25 @@ public class GolangUtil
5353
*/
5454
public static String golangTypeName(final PrimitiveType primitiveType)
5555
{
56-
return typeNameByPrimitiveTypeMap.get(primitiveType);
56+
return PRIMITIVE_TYPE_STRING_ENUM_MAP.get(primitiveType);
5757
}
5858

59-
private static Map<PrimitiveType, String> marshalTypeByPrimitiveTypeMap = new EnumMap<>(PrimitiveType.class);
59+
private static final Map<PrimitiveType, String> MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP =
60+
new EnumMap<>(PrimitiveType.class);
6061

6162
static
6263
{
63-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.CHAR, "Bytes");
64-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.INT8, "Int8");
65-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.INT16, "Int16");
66-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.INT32, "Int32");
67-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.INT64, "Int64");
68-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.UINT8, "Uint8");
69-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.UINT16, "Uint16");
70-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.UINT32, "Uint32");
71-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.UINT64, "Uint64");
72-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.FLOAT, "Float32");
73-
marshalTypeByPrimitiveTypeMap.put(PrimitiveType.DOUBLE, "Float64");
64+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.CHAR, "Bytes");
65+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.INT8, "Int8");
66+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.INT16, "Int16");
67+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.INT32, "Int32");
68+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.INT64, "Int64");
69+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.UINT8, "Uint8");
70+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.UINT16, "Uint16");
71+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.UINT32, "Uint32");
72+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.UINT64, "Uint64");
73+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.FLOAT, "Float32");
74+
MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.put(PrimitiveType.DOUBLE, "Float64");
7475
}
7576

7677
/**
@@ -81,7 +82,7 @@ public static String golangTypeName(final PrimitiveType primitiveType)
8182
*/
8283
public static String golangMarshalType(final PrimitiveType primitiveType)
8384
{
84-
return marshalTypeByPrimitiveTypeMap.get(primitiveType);
85+
return MARSHAL_TYPE_BY_PRIMITIVE_TYPE_MAP.get(primitiveType);
8586
}
8687

8788
/**

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@
44
import uk.co.real_logic.sbe.generation.TargetCodeGenerator;
55
import uk.co.real_logic.sbe.ir.Ir;
66

7-
import java.io.IOException;
8-
97
/**
108
* This class is present largely to enable the dynamic-loading style pattern
119
* of specifying a TargetCodeGenerator Java class name rather than the language
1210
* name.
1311
*/
1412
public class Rust implements TargetCodeGenerator
1513
{
16-
public CodeGenerator newInstance(final Ir ir, final String outputDir) throws IOException
14+
public CodeGenerator newInstance(final Ir ir, final String outputDir)
1715
{
1816
return defaultRustGenerator(ir, outputDir);
1917
}
2018

21-
public static CodeGenerator defaultRustGenerator(final Ir ir, final String outputDir) throws IOException
19+
public static CodeGenerator defaultRustGenerator(final Ir ir, final String outputDir)
2220
{
2321
return new RustGenerator(ir, new RustFlatFileOutputManager(outputDir, ir.applicableNamespace()));
2422
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,19 +197,19 @@ private enum ReservedKeyword
197197
Pure, Ref, Return, Self, Sizeof, Static, Struct, Super, Trait, True,
198198
Type, Typeof, Unsafe, Unsized, Use, Virtual, Where, While, Yield;
199199

200-
private static Set<String> lowerCaseNames = new HashSet<>();
200+
private static final Set<String> LOWER_CASE_NAMES = new HashSet<>();
201201

202202
static
203203
{
204204
Arrays.stream(ReservedKeyword.values())
205205
.map(java.lang.Enum::name)
206206
.map(String::toLowerCase)
207-
.forEach(lowerCaseNames::add);
207+
.forEach(LOWER_CASE_NAMES::add);
208208
}
209209

210210
private static boolean anyMatch(final String v)
211211
{
212-
return lowerCaseNames.contains(v.toLowerCase());
212+
return LOWER_CASE_NAMES.contains(v.toLowerCase());
213213
}
214214
}
215215
}

0 commit comments

Comments
 (0)