Skip to content

Commit 99ff10f

Browse files
zeeshanasgharzeeshanasghar
committed
squid:S2325 private methods that don't access instance data should be static
1 parent 32623fa commit 99ff10f

File tree

7 files changed

+45
-39
lines changed

7 files changed

+45
-39
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private static CharSequence readEncodingAsString(
198198
return sb;
199199
}
200200

201-
private long readEncodingAsLong(
201+
private static long readEncodingAsLong(
202202
final DirectBuffer buffer, final int bufferIndex, final Token typeToken, final int actingVersion)
203203
{
204204
final PrimitiveValue constOrNotPresentValue = constOrNotPresentValue(typeToken, actingVersion);

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

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ private void generateGroups(final StringBuilder sb, final List<Token> tokens, fi
187187
}
188188
}
189189

190-
private void generateGroupClassHeader(
190+
private static void generateGroupClassHeader(
191191
final StringBuilder sb, final String groupName, final List<Token> tokens, final int index, final String indent)
192192
{
193193
final String dimensionsClassName = formatClassName(tokens.get(index + 1).name());
@@ -317,7 +317,7 @@ dimensionHeaderLength, blockLength, formatClassName(groupName)
317317
));
318318
}
319319

320-
private CharSequence generateGroupProperty(
320+
private static CharSequence generateGroupProperty(
321321
final String groupName, final Token token, final String cppTypeForNumInGroup, final String indent)
322322
{
323323
final StringBuilder sb = new StringBuilder();
@@ -615,7 +615,7 @@ private void generateComposite(final List<Token> tokens) throws IOException
615615
}
616616
}
617617

618-
private CharSequence generateChoiceNotPresentCondition(final int sinceVersion, final String indent)
618+
private static CharSequence generateChoiceNotPresentCondition(final int sinceVersion, final String indent)
619619
{
620620
if (0 == sinceVersion)
621621
{
@@ -707,7 +707,7 @@ private CharSequence generateEnumValues(final List<Token> tokens, final Token en
707707
return sb;
708708
}
709709

710-
private CharSequence generateEnumLookupMethod(final List<Token> tokens, final Token encodingToken)
710+
private static CharSequence generateEnumLookupMethod(final List<Token> tokens, final Token encodingToken)
711711
{
712712
final String enumName = formatClassName(encodingToken.name());
713713
final StringBuilder sb = new StringBuilder();
@@ -759,7 +759,7 @@ private CharSequence generateFieldNotPresentCondition(final int sinceVersion, fi
759759
);
760760
}
761761

762-
private CharSequence generateArrayFieldNotPresentCondition(final int sinceVersion, final String indent)
762+
private static CharSequence generateArrayFieldNotPresentCondition(final int sinceVersion, final String indent)
763763
{
764764
if (0 == sinceVersion)
765765
{
@@ -775,7 +775,7 @@ private CharSequence generateArrayFieldNotPresentCondition(final int sinceVersio
775775
);
776776
}
777777

778-
private CharSequence generateStringNotPresentCondition(final int sinceVersion, final String indent)
778+
private static CharSequence generateStringNotPresentCondition(final int sinceVersion, final String indent)
779779
{
780780
if (0 == sinceVersion)
781781
{
@@ -791,7 +791,7 @@ private CharSequence generateStringNotPresentCondition(final int sinceVersion, f
791791
);
792792
}
793793

794-
private CharSequence generateTypeFieldNotPresentCondition(final int sinceVersion, final String indent)
794+
private static CharSequence generateTypeFieldNotPresentCondition(final int sinceVersion, final String indent)
795795
{
796796
if (0 == sinceVersion)
797797
{
@@ -807,7 +807,10 @@ private CharSequence generateTypeFieldNotPresentCondition(final int sinceVersion
807807
);
808808
}
809809

810-
private CharSequence generateFileHeader(final String namespaceName, final String className, final List<String> typesToInclude)
810+
private static CharSequence generateFileHeader(
811+
final String namespaceName,
812+
final String className,
813+
final List<String> typesToInclude)
811814
{
812815
final StringBuilder sb = new StringBuilder();
813816

@@ -859,7 +862,7 @@ private CharSequence generateFileHeader(final String namespaceName, final String
859862
return sb;
860863
}
861864

862-
private CharSequence generateClassDeclaration(final String className)
865+
private static CharSequence generateClassDeclaration(final String className)
863866
{
864867
return String.format(
865868
"class %s\n" +
@@ -868,7 +871,7 @@ private CharSequence generateClassDeclaration(final String className)
868871
);
869872
}
870873

871-
private CharSequence generateEnumDeclaration(final String name)
874+
private static CharSequence generateEnumDeclaration(final String name)
872875
{
873876
return "class " + name + "\n{\npublic:\n\n";
874877
}
@@ -1227,7 +1230,7 @@ private CharSequence generateConstPropertyMethods(final String propertyName, fin
12271230
return sb;
12281231
}
12291232

1230-
private CharSequence generateFixedFlyweightCode(final String className, final int size)
1233+
private static CharSequence generateFixedFlyweightCode(final String className, final int size)
12311234
{
12321235
return String.format(
12331236
"private:\n" +
@@ -1290,7 +1293,7 @@ private CharSequence generateFixedFlyweightCode(final String className, final in
12901293
);
12911294
}
12921295

1293-
private CharSequence generateConstructorsAndOperators(final String className)
1296+
private static CharSequence generateConstructorsAndOperators(final String className)
12941297
{
12951298
return String.format(
12961299
" %1$s(void) : m_buffer(nullptr), m_bufferLength(0), m_offset(0) {}\n\n" +
@@ -1497,7 +1500,7 @@ private CharSequence generateFields(final String containingClassName, final List
14971500
return sb;
14981501
}
14991502

1500-
private void generateFieldMetaAttributeMethod(final StringBuilder sb, final Token token, final String indent)
1503+
private static void generateFieldMetaAttributeMethod(final StringBuilder sb, final Token token, final String indent)
15011504
{
15021505
final Encoding encoding = token.encoding();
15031506
final String epoch = encoding.epoch() == null ? "" : encoding.epoch();
@@ -1523,7 +1526,10 @@ private void generateFieldMetaAttributeMethod(final StringBuilder sb, final Toke
15231526
));
15241527
}
15251528

1526-
private CharSequence generateEnumFieldNotPresentCondition(final int sinceVersion, final String enumName, final String indent)
1529+
private static CharSequence generateEnumFieldNotPresentCondition(
1530+
final int sinceVersion,
1531+
final String enumName,
1532+
final String indent)
15271533
{
15281534
if (0 == sinceVersion)
15291535
{
@@ -1605,7 +1611,7 @@ private CharSequence generateEnumProperty(
16051611
return sb;
16061612
}
16071613

1608-
private Object generateBitsetProperty(final String propertyName, final Token token, final String indent)
1614+
private static Object generateBitsetProperty(final String propertyName, final Token token, final String indent)
16091615
{
16101616
final StringBuilder sb = new StringBuilder();
16111617

@@ -1636,7 +1642,7 @@ private Object generateBitsetProperty(final String propertyName, final Token tok
16361642
return sb;
16371643
}
16381644

1639-
private Object generateCompositeProperty(final String propertyName, final Token token, final String indent)
1645+
private static Object generateCompositeProperty(final String propertyName, final Token token, final String indent)
16401646
{
16411647
final String compositeName = formatClassName(token.name());
16421648
final int offset = token.offset();

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public JavaGenerator(
7070
this.shouldGenerateGroupOrderAnnotation = shouldGenerateGroupOrderAnnotation;
7171
}
7272

73-
private String validateBufferImplementation(
73+
private static String validateBufferImplementation(
7474
final String fullyQualifiedBufferImplementation, final Class<?> bufferClass)
7575
{
7676
Verify.notNull(fullyQualifiedBufferImplementation, "fullyQualifiedBufferImplementation");
@@ -460,7 +460,7 @@ private void generateGroupEncoderClassHeader(
460460
));
461461
}
462462

463-
private String primitiveTypeName(final Token token)
463+
private static String primitiveTypeName(final Token token)
464464
{
465465
return javaTypeName(token.encoding().primitiveType());
466466
}
@@ -524,7 +524,7 @@ private void generateEncoderClassDeclaration(
524524
));
525525
}
526526

527-
private CharSequence generateGroupDecoderProperty(final String groupName, final Token token, final String indent)
527+
private static CharSequence generateGroupDecoderProperty(final String groupName, final Token token, final String indent)
528528
{
529529
final StringBuilder sb = new StringBuilder();
530530
final String className = formatClassName(groupName);
@@ -1159,7 +1159,7 @@ private CharSequence generateEnumLookupMethod(final List<Token> tokens, final St
11591159
return sb;
11601160
}
11611161

1162-
private CharSequence generateFileHeader(final String className, final String packageName, final String fqBuffer)
1162+
private static CharSequence generateFileHeader(final String className, final String packageName, final String fqBuffer)
11631163
{
11641164
return String.format(
11651165
"/* Generated SBE (Simple Binary Encoding) message codec */\n" +
@@ -1173,7 +1173,7 @@ private CharSequence generateFileHeader(final String className, final String pac
11731173
);
11741174
}
11751175

1176-
private CharSequence generateEnumFileHeader(final String className, final String packageName)
1176+
private static CharSequence generateEnumFileHeader(final String className, final String packageName)
11771177
{
11781178
return String.format(
11791179
"/* Generated SBE (Simple Binary Encoding) message codec */\n" +
@@ -1236,7 +1236,7 @@ else if (tokens.get(index).signal() == Signal.END_GROUP)
12361236
}
12371237
}
12381238

1239-
private CharSequence generateClassDeclaration(final String className)
1239+
private static CharSequence generateClassDeclaration(final String className)
12401240
{
12411241
return String.format(
12421242
"@SuppressWarnings(\"all\")\n" +
@@ -1266,7 +1266,7 @@ private void generateMetaAttributeEnum() throws IOException
12661266
}
12671267
}
12681268

1269-
private CharSequence generateEnumDeclaration(final String name)
1269+
private static CharSequence generateEnumDeclaration(final String name)
12701270
{
12711271
return "public enum " + name + "\n{\n";
12721272
}
@@ -1429,7 +1429,7 @@ private CharSequence generateFieldNotPresentCondition(final int sinceVersion, fi
14291429
);
14301430
}
14311431

1432-
private CharSequence generateArrayFieldNotPresentCondition(final int sinceVersion, final String indent)
1432+
private static CharSequence generateArrayFieldNotPresentCondition(final int sinceVersion, final String indent)
14331433
{
14341434
if (0 == sinceVersion)
14351435
{
@@ -1445,7 +1445,7 @@ private CharSequence generateArrayFieldNotPresentCondition(final int sinceVersio
14451445
);
14461446
}
14471447

1448-
private CharSequence generateStringNotPresentCondition(final int sinceVersion, final String indent)
1448+
private static CharSequence generateStringNotPresentCondition(final int sinceVersion, final String indent)
14491449
{
14501450
if (0 == sinceVersion)
14511451
{
@@ -1461,7 +1461,7 @@ private CharSequence generateStringNotPresentCondition(final int sinceVersion, f
14611461
);
14621462
}
14631463

1464-
private CharSequence generateTypeFieldNotPresentCondition(final int sinceVersion, final String indent)
1464+
private static CharSequence generateTypeFieldNotPresentCondition(final int sinceVersion, final String indent)
14651465
{
14661466
if (0 == sinceVersion)
14671467
{
@@ -1538,7 +1538,7 @@ private CharSequence generatePrimitiveArrayPropertyDecode(final String propertyN
15381538
return sb;
15391539
}
15401540

1541-
private void generateArrayLengthMethod(
1541+
private static void generateArrayLengthMethod(
15421542
final String propertyName, final String indent, final int fieldLength, final StringBuilder sb)
15431543
{
15441544
sb.append(String.format(
@@ -1615,12 +1615,12 @@ private CharSequence generatePrimitiveArrayPropertyEncode(
16151615
return sb;
16161616
}
16171617

1618-
private int sizeOfPrimitive(final Encoding encoding)
1618+
private static int sizeOfPrimitive(final Encoding encoding)
16191619
{
16201620
return encoding.primitiveType().size();
16211621
}
16221622

1623-
private void generateCharacterEncodingMethod(
1623+
private static void generateCharacterEncodingMethod(
16241624
final StringBuilder sb, final String propertyName, final String encoding, final String indent)
16251625
{
16261626
sb.append(String.format(
@@ -1691,7 +1691,7 @@ private CharSequence generateConstPropertyMethods(final String propertyName, fin
16911691
return sb;
16921692
}
16931693

1694-
private CharSequence generateByteLiteralList(final byte[] bytes)
1694+
private static CharSequence generateByteLiteralList(final byte[] bytes)
16951695
{
16961696
final StringBuilder values = new StringBuilder();
16971697
for (final byte b : bytes)
@@ -1707,7 +1707,7 @@ private CharSequence generateByteLiteralList(final byte[] bytes)
17071707
return values;
17081708
}
17091709

1710-
private CharSequence generateFixedFlyweightCode(
1710+
private static CharSequence generateFixedFlyweightCode(
17111711
final String className, final int size, final boolean callsSuper, final String bufferImplementation)
17121712
{
17131713
final String body = callsSuper ?
@@ -1915,7 +1915,7 @@ private CharSequence generateDecoderFields(final List<Token> tokens, final Strin
19151915
return sb;
19161916
}
19171917

1918-
private void eachField(final List<Token> tokens, final BiConsumer<Token, Token> consumer)
1918+
private static void eachField(final List<Token> tokens, final BiConsumer<Token, Token> consumer)
19191919
{
19201920
for (int i = 0, size = tokens.size(); i < size;)
19211921
{
@@ -1933,7 +1933,7 @@ private void eachField(final List<Token> tokens, final BiConsumer<Token, Token>
19331933
}
19341934
}
19351935

1936-
private void generateFieldIdMethod(final StringBuilder sb, final Token token, final String indent)
1936+
private static void generateFieldIdMethod(final StringBuilder sb, final Token token, final String indent)
19371937
{
19381938
sb.append(String.format(
19391939
"\n" +
@@ -1946,7 +1946,7 @@ private void generateFieldIdMethod(final StringBuilder sb, final Token token, fi
19461946
));
19471947
}
19481948

1949-
private void generateFieldMetaAttributeMethod(final StringBuilder sb, final Token token, final String indent)
1949+
private static void generateFieldMetaAttributeMethod(final StringBuilder sb, final Token token, final String indent)
19501950
{
19511951
final Encoding encoding = token.encoding();
19521952
final String epoch = encoding.epoch() == null ? "" : encoding.epoch();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ private int captureHeader(final List<Token> tokens, int index)
128128
return index;
129129
}
130130

131-
private int captureMessage(final List<Token> tokens, int index, final Ir ir)
131+
private static int captureMessage(final List<Token> tokens, int index, final Ir ir)
132132
{
133133
final List<Token> messageTokens = new ArrayList<>();
134134

‎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
@@ -127,7 +127,7 @@ public void onVarData(
127127
}
128128
}
129129

130-
private boolean isLastGroup(final int groupIndex, final int numInGroup)
130+
private static boolean isLastGroup(final int groupIndex, final int numInGroup)
131131
{
132132
return groupIndex == numInGroup - 1;
133133
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ private void add(final EncodedDataType type, final int offset, final Field field
412412
tokenList.add(token);
413413
}
414414

415-
private String semanticTypeOf(final Type type, final Field field)
415+
private static String semanticTypeOf(final Type type, final Field field)
416416
{
417417
final String typeSemanticType = null != type ? type.semanticType() : null;
418418
if (typeSemanticType != null)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ else if (field.type() != null)
382382
return blockLength;
383383
}
384384

385-
private void validateBlockLength(final Node node, final long specifiedBlockLength, final long computedBlockLength)
385+
private static void validateBlockLength(final Node node, final long specifiedBlockLength, final long computedBlockLength)
386386
{
387387
if (0 != specifiedBlockLength && computedBlockLength > specifiedBlockLength)
388388
{

0 commit comments

Comments
 (0)