This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
commit 7fa02c59e21b3fe0372b1be40983ab98a1e32d6d Author: Gary David Gregory (Code signing key) <[email protected]> AuthorDate: Tue Apr 25 15:22:36 2023 -0400 Use final, use abbreviated array, use lambdas, remove trailing whitespace --- .../org/apache/bcel/classfile/AnnotationEntry.java | 2 +- .../java/org/apache/bcel/classfile/JavaClass.java | 4 +-- src/main/java/org/apache/bcel/generic/SWITCH.java | 2 +- .../structurals/InstConstraintVisitor.java | 2 +- .../bcel/generic/InstructionFactoryTestCase.java | 2 +- .../apache/bcel/verifier/VerifierMainTestCase.java | 4 +-- .../org/apache/bcel/verifier/tests/JvmOpCodes.java | 30 +++++++++++----------- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java b/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java index 94633304..b3c2bb22 100644 --- a/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java +++ b/src/main/java/org/apache/bcel/classfile/AnnotationEntry.java @@ -63,7 +63,7 @@ public class AnnotationEntry implements Node { private final boolean isRuntimeVisible; - private List<ElementValuePair> elementValuePairs; + private final List<ElementValuePair> elementValuePairs; public AnnotationEntry(final int typeIndex, final ConstantPool constantPool, final boolean isRuntimeVisible) { this.typeIndex = typeIndex; diff --git a/src/main/java/org/apache/bcel/classfile/JavaClass.java b/src/main/java/org/apache/bcel/classfile/JavaClass.java index 71e8e580..37373f08 100644 --- a/src/main/java/org/apache/bcel/classfile/JavaClass.java +++ b/src/main/java/org/apache/bcel/classfile/JavaClass.java @@ -422,9 +422,9 @@ public class JavaClass extends AccessFlags implements Cloneable, Node, Comparabl return f; } } - JavaClass[] implementedInterfaces = getInterfaces(); + final JavaClass[] implementedInterfaces = getInterfaces(); if (implementedInterfaces != null) { - for (JavaClass implementedInterface : implementedInterfaces) { + for (final JavaClass implementedInterface : implementedInterfaces) { final Field f = implementedInterface.findField(fieldName, fieldType); if (f != null) { return f; diff --git a/src/main/java/org/apache/bcel/generic/SWITCH.java b/src/main/java/org/apache/bcel/generic/SWITCH.java index e2560373..583611e5 100644 --- a/src/main/java/org/apache/bcel/generic/SWITCH.java +++ b/src/main/java/org/apache/bcel/generic/SWITCH.java @@ -90,7 +90,7 @@ public final class SWITCH implements CompoundInstruction { * @param maxGap maximum gap that may between case branches */ public SWITCH(final int[] match, final InstructionHandle[] targets, final InstructionHandle target, final int maxGap) { - int[] matchClone = match.clone(); + final int[] matchClone = match.clone(); final InstructionHandle[] targetsClone = targets.clone(); final int matchLength = match.length; if (matchLength < 2) { diff --git a/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java b/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java index ec6d6743..9be313c7 100644 --- a/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java +++ b/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java @@ -930,7 +930,7 @@ public class InstConstraintVisitor extends EmptyVisitor { } if (t instanceof ReferenceType) { if (value instanceof ReferenceType) { - ReferenceType rValue = (ReferenceType) value; + final ReferenceType rValue = (ReferenceType) value; referenceTypeIsInitialized(o, rValue); // TODO: This can possibly only be checked using Staerk-et-al's "set-of-object types", not // using "wider cast object types" created during verification. diff --git a/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java b/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java index 19cc8d90..84782d67 100644 --- a/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java +++ b/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java @@ -47,7 +47,7 @@ public class InstructionFactoryTestCase extends AbstractTestCase { assertEquals(InstructionConst.AALOAD, createArrayLoad(Type.OBJECT)); assertEquals(InstructionConst.AALOAD, createArrayLoad(Type.getType("[I"))); } - + @Test public void testArrayStore() throws Exception { assertEquals(InstructionConst.BASTORE, createArrayStore(Type.BOOLEAN)); diff --git a/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java index ce7f6eb8..f1b4b4ff 100644 --- a/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java +++ b/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java @@ -43,7 +43,7 @@ public class VerifierMainTestCase extends AbstractTestCase { @Test public void testSWAP() throws Exception { - final String[] argv = new String[] { "src/test/java/org/apache/bcel/data/SWAP.java", "-g", "-source", "1.4", "-target", "1.4", "-d", "target/test-classes" }; + final String[] argv = { "src/test/java/org/apache/bcel/data/SWAP.java", "-g", "-source", "1.4", "-target", "1.4", "-d", "target/test-classes" }; new Main(new PrintWriter(System.out), new PrintWriter(System.err), false/*systemExit*/, null/*options*/, null/*progress*/).compile(argv); final String javaAgent = getJavaAgent(); final List<String> args = new ArrayList<>(); @@ -77,7 +77,7 @@ public class VerifierMainTestCase extends AbstractTestCase { swapInstructionsList.add(obj); super.visitSWAP(obj); } - }; + }; try (InputStream in = Files.newInputStream(Paths.get("target/test-classes/org/apache/bcel/data/SWAP.class"))) { final ClassParser classParser = new ClassParser(in, "SWAP.class"); final JavaClass javaClass = classParser.parse(); diff --git a/src/test/java/org/apache/bcel/verifier/tests/JvmOpCodes.java b/src/test/java/org/apache/bcel/verifier/tests/JvmOpCodes.java index b5c661fe..b9b94e2f 100644 --- a/src/test/java/org/apache/bcel/verifier/tests/JvmOpCodes.java +++ b/src/test/java/org/apache/bcel/verifier/tests/JvmOpCodes.java @@ -46,14 +46,14 @@ public class JvmOpCodes { /** * Tests {@link DNEG}. */ - double dneg(double a) { + double dneg(final double a) { return -a; } /** * Tests {@link DREM}. */ - double drem(double a, double b) { + double drem(final double a, final double b) { return a % b; } @@ -67,7 +67,7 @@ public class JvmOpCodes { /** * Tests {@link DUP2_X1}. */ - void dup2x1(String[] s) { + void dup2x1(final String[] s) { s[0] += "s"; // Form 1 l2 = l1 = 1; // Form 2 } @@ -75,84 +75,84 @@ public class JvmOpCodes { /** * Tests {@link DUP2_X2}. */ - long dup2x2(long[] array, int i, long l) { + long dup2x2(final long[] array, final int i, final long l) { return array[i] = l; } /** * Tests {@link DUP_X2}. */ - int dupx2(int[] array, int i, int l) { + int dupx2(final int[] array, final int i, final int l) { return array[i] = l; } /** * Tests {@link FADD}. */ - float fadd(float a, float b) { + float fadd(final float a, final float b) { return a + b; } /** * Tests {@link FNEG}. */ - float fneg(float a) { + float fneg(final float a) { return -a; } /** * Tests {@link FREM}. */ - float frem(float a, float b) { + float frem(final float a, final float b) { return a % b; } /** * Tests {@link FSUB}. */ - float fsub(float a, float b) { + float fsub(final float a, final float b) { return a - b; } /** * Tests {@link IUSHR}. */ - int iushr(int a, int b) { + int iushr(final int a, final int b) { return a >>> b; } /** * Tests {@link LAND}. */ - long land(long a, long b) { + long land(final long a, final long b) { return a & b; } /** * Tests {@link LNEG}. */ - long lneg(long a) { + long lneg(final long a) { return -a; } /** * Tests {@link LOR}. */ - long lor(long a, long b) { + long lor(final long a, final long b) { return a | b; } /** * Tests {@link LSHL}. */ - long lshl(long a, long b) { + long lshl(final long a, final long b) { return a << b; } /** * Tests {@link LUSHR}. */ - long lushr(long a, long b) { + long lushr(final long a, final long b) { return a >>> b; }
