You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/04/25 19:22:41 UTC
[commons-bcel] branch master updated (5aca8616 -> 7fa02c59)
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/commons-bcel.git
from 5aca8616 Bump kotlin-stdlib from 1.8.10 to 1.8.20 #217
new 430d90de Organize imports
new e3969b8e Sort members
new b3f0a1a0 Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-bcel.git
new 7fa02c59 Use final, use abbreviated array, use lambdas, remove trailing whitespace
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/bcel/classfile/AnnotationEntry.java | 2 +-
src/main/java/org/apache/bcel/classfile/Code.java | 28 +++----
.../java/org/apache/bcel/classfile/JavaClass.java | 4 +-
.../org/apache/bcel/classfile/StackMapType.java | 18 ++--
src/main/java/org/apache/bcel/generic/SWITCH.java | 2 +-
.../structurals/InstConstraintVisitor.java | 2 +-
.../java/org/apache/bcel/AnnotationEntryTest.java | 12 +--
.../bcel/classfile/ConstantPoolTestCase.java | 1 +
.../classfile/InvalidMethodSigantureTestCase.java | 7 +-
.../apache/bcel/classfile/SignatureTestCase.java | 12 +--
.../org/apache/bcel/classfile/UtilityTestCase.java | 83 ++++++++++---------
.../org/apache/bcel/generic/BinaryOpCreator.java | 12 +--
.../bcel/generic/InstructionFactoryTestCase.java | 15 ++--
.../org/apache/bcel/util/BCELifierTestCase.java | 16 ++--
.../apache/bcel/verifier/VerifierMainTestCase.java | 24 +++---
.../org/apache/bcel/verifier/VerifierTestCase.java | 30 +++----
.../verifier/input/FieldVerifierChildClass.java | 24 +++---
.../input/StaticFieldVerifierChildClass.java | 26 +++---
.../org/apache/bcel/verifier/tests/JvmOpCodes.java | 96 +++++++++++-----------
19 files changed, 208 insertions(+), 206 deletions(-)
[commons-bcel] 03/04: Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-bcel.git
Posted by gg...@apache.org.
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 b3f0a1a051a896ed3d6f3dd9a76d172786aba8c8
Merge: e3969b8e 5aca8616
Author: Gary David Gregory (Code signing key) <gg...@apache.org>
AuthorDate: Tue Apr 25 14:07:05 2023 -0400
Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-bcel.git
pom.xml | 2 +-
src/changes/changes.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
[commons-bcel] 02/04: Sort members
Posted by gg...@apache.org.
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 e3969b8e561197b959689be11b0761c5c59fe3ee
Author: Gary David Gregory (Code signing key) <gg...@apache.org>
AuthorDate: Tue Apr 25 13:54:58 2023 -0400
Sort members
---
src/main/java/org/apache/bcel/classfile/Code.java | 28 +++----
.../org/apache/bcel/classfile/StackMapType.java | 18 ++---
.../classfile/InvalidMethodSigantureTestCase.java | 6 +-
.../org/apache/bcel/classfile/UtilityTestCase.java | 80 +++++++++----------
.../org/apache/bcel/util/BCELifierTestCase.java | 16 ++--
.../org/apache/bcel/verifier/VerifierTestCase.java | 30 ++++----
.../verifier/input/FieldVerifierChildClass.java | 24 +++---
.../input/StaticFieldVerifierChildClass.java | 26 +++----
.../org/apache/bcel/verifier/tests/JvmOpCodes.java | 90 +++++++++++-----------
9 files changed, 159 insertions(+), 159 deletions(-)
diff --git a/src/main/java/org/apache/bcel/classfile/Code.java b/src/main/java/org/apache/bcel/classfile/Code.java
index 4d2dea39..72964af1 100644
--- a/src/main/java/org/apache/bcel/classfile/Code.java
+++ b/src/main/java/org/apache/bcel/classfile/Code.java
@@ -247,20 +247,6 @@ public final class Code extends Attribute {
return null;
}
- /**
- * Finds the attribute of {@link StackMap} instance.
- * @return StackMap of Code, if it has one, else null.
- * @since 6.8.0
- */
- public StackMap getStackMap() {
- for (final Attribute attribute : attributes) {
- if (attribute instanceof StackMap) {
- return (StackMap) attribute;
- }
- }
- return null;
- }
-
/**
* @return LocalVariableTable of Code, if it has one
*/
@@ -287,6 +273,20 @@ public final class Code extends Attribute {
return maxStack;
}
+ /**
+ * Finds the attribute of {@link StackMap} instance.
+ * @return StackMap of Code, if it has one, else null.
+ * @since 6.8.0
+ */
+ public StackMap getStackMap() {
+ for (final Attribute attribute : attributes) {
+ if (attribute instanceof StackMap) {
+ return (StackMap) attribute;
+ }
+ }
+ return null;
+ }
+
/**
* @param attributes the attributes to set for this Code
*/
diff --git a/src/main/java/org/apache/bcel/classfile/StackMapType.java b/src/main/java/org/apache/bcel/classfile/StackMapType.java
index 3f3fc50c..b6bdcf51 100644
--- a/src/main/java/org/apache/bcel/classfile/StackMapType.java
+++ b/src/main/java/org/apache/bcel/classfile/StackMapType.java
@@ -105,6 +105,15 @@ public final class StackMapType implements Node, Cloneable {
}
}
+ /**
+ * Gets the class name of this StackMapType from the constant pool at index position.
+ * @return the fully qualified name of the class for this StackMapType.
+ * @since 6.8.0
+ */
+ public String getClassName() {
+ return constantPool.constantToString(index, Const.CONSTANT_Class);
+ }
+
/**
* @return Constant pool used by this object.
*/
@@ -144,15 +153,6 @@ public final class StackMapType implements Node, Cloneable {
return "";
}
- /**
- * Gets the class name of this StackMapType from the constant pool at index position.
- * @return the fully qualified name of the class for this StackMapType.
- * @since 6.8.0
- */
- public String getClassName() {
- return constantPool.constantToString(index, Const.CONSTANT_Class);
- }
-
/**
* @param constantPool Constant pool to be used for this object.
*/
diff --git a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
index f61b56fb..2a4696c3 100644
--- a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
@@ -50,15 +50,15 @@ final class test$method name with () in it$1 extends kotlin.jvm.internal.Lambda
*/
public class InvalidMethodSigantureTestCase {
- private static final String CLASS_NAME = "test$method name with () in it$1";
- private static final String SRC_TEST_RESOURCES_KOTLIN = "src/test/resources/kotlin/";
-
class TestVisitor extends org.apache.bcel.classfile.EmptyVisitor {
@Override
public void visitField(final Field field) {
field.getType();
}
}
+ private static final String CLASS_NAME = "test$method name with () in it$1";
+
+ private static final String SRC_TEST_RESOURCES_KOTLIN = "src/test/resources/kotlin/";
@Test
public void testLoadClass() throws Exception {
diff --git a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
index 128b9282..fb1b8785 100644
--- a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
@@ -41,6 +41,46 @@ public class UtilityTestCase {
assertEquals(0, Utility.clearBit(Integer.MIN_VALUE, 31), "100...00 set bit 31 to 0 -> 000..00");
}
+ @Test
+ public void testCodeToString() throws Exception {
+ class CodeToString {
+ int[][] a = new int[0][0];
+
+ CodeToString() {
+ if (a instanceof int[][]) {
+ System.out.print(Arrays.asList(a).size());
+ }
+ }
+ }
+ final JavaClass javaClass = Repository.lookupClass(CodeToString.class);
+ assertNotNull(javaClass);
+ for (final Method method : javaClass.getMethods()) {
+ assertEquals("<init>", method.getName());
+ final String code = method.getCode().toString(false);
+ assertTrue(code.contains("0: aload_0"), code);
+ assertTrue(code.contains("1: aload_1"), code);
+ assertTrue(code.contains("2: putfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.this$0 Lorg/apache/bcel/classfile/UtilityTestCase;"), code);
+ assertTrue(code.contains("5: aload_0"), code);
+ assertTrue(code.contains("6: invokespecial\tjava.lang.Object.<init> ()V"), code);
+ assertTrue(code.contains("9: aload_0"), code);
+ assertTrue(code.contains("10: iconst_0"), code);
+ assertTrue(code.contains("11: iconst_0"), code);
+ assertTrue(code.contains("12: multianewarray\t<[[I>\t2"), code);
+ assertTrue(code.contains("16: putfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.a [[I"), code);
+ assertTrue(code.contains("19: aload_0"), code);
+ assertTrue(code.contains("20: getfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.a [[I"), code);
+ assertTrue(code.contains("23: instanceof\t<[[I>"), code);
+ assertTrue(code.contains("26: ifeq\t\t#47"), code);
+ assertTrue(code.contains("29: getstatic\t\tjava.lang.System.out Ljava/io/PrintStream;"), code);
+ assertTrue(code.contains("32: aload_0"), code);
+ assertTrue(code.contains("33: getfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.a [[I"), code);
+ assertTrue(code.contains("36: invokestatic\tjava.util.Arrays.asList ([Ljava/lang/Object;)Ljava/util/List;"), code);
+ assertTrue(code.contains("39: invokeinterface\tjava.util.List.size ()I1\t0"), code);
+ assertTrue(code.contains("44: invokevirtual\tjava.io.PrintStream.print (I)V"), code);
+ assertTrue(code.contains("47: return"), code);
+ }
+ }
+
@Test
public void testConvertString() {
assertEquals("\\n", Utility.convertString("\n"));
@@ -132,44 +172,4 @@ public class UtilityTestCase {
assertEquals("<K extends Object, V extends Object> extends Object",
Utility.signatureToString("<K:Ljava/lang/Object;V:Ljava/lang/Object;>Ljava/lang/Object;"), "class signature");
}
-
- @Test
- public void testCodeToString() throws Exception {
- class CodeToString {
- int[][] a = new int[0][0];
-
- CodeToString() {
- if (a instanceof int[][]) {
- System.out.print(Arrays.asList(a).size());
- }
- }
- }
- final JavaClass javaClass = Repository.lookupClass(CodeToString.class);
- assertNotNull(javaClass);
- for (final Method method : javaClass.getMethods()) {
- assertEquals("<init>", method.getName());
- final String code = method.getCode().toString(false);
- assertTrue(code.contains("0: aload_0"), code);
- assertTrue(code.contains("1: aload_1"), code);
- assertTrue(code.contains("2: putfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.this$0 Lorg/apache/bcel/classfile/UtilityTestCase;"), code);
- assertTrue(code.contains("5: aload_0"), code);
- assertTrue(code.contains("6: invokespecial\tjava.lang.Object.<init> ()V"), code);
- assertTrue(code.contains("9: aload_0"), code);
- assertTrue(code.contains("10: iconst_0"), code);
- assertTrue(code.contains("11: iconst_0"), code);
- assertTrue(code.contains("12: multianewarray\t<[[I>\t2"), code);
- assertTrue(code.contains("16: putfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.a [[I"), code);
- assertTrue(code.contains("19: aload_0"), code);
- assertTrue(code.contains("20: getfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.a [[I"), code);
- assertTrue(code.contains("23: instanceof\t<[[I>"), code);
- assertTrue(code.contains("26: ifeq\t\t#47"), code);
- assertTrue(code.contains("29: getstatic\t\tjava.lang.System.out Ljava/io/PrintStream;"), code);
- assertTrue(code.contains("32: aload_0"), code);
- assertTrue(code.contains("33: getfield\t\torg.apache.bcel.classfile.UtilityTestCase$1CodeToString.a [[I"), code);
- assertTrue(code.contains("36: invokestatic\tjava.util.Arrays.asList ([Ljava/lang/Object;)Ljava/util/List;"), code);
- assertTrue(code.contains("39: invokeinterface\tjava.util.List.size ()I1\t0"), code);
- assertTrue(code.contains("44: invokevirtual\tjava.io.PrintStream.print (I)V"), code);
- assertTrue(code.contains("47: return"), code);
- }
- }
}
diff --git a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
index a856c2cd..da0d1e29 100644
--- a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
@@ -208,6 +208,14 @@ public class BCELifierTestCase extends AbstractTestCase {
}
}
+ @ParameterizedTest
+ @ValueSource(strings = { "StackMapExample", "StackMapExample2" })
+ public void testStackMap(final String className) throws Exception {
+ testJavapCompare(className);
+ final File workDir = new File("target");
+ assertEquals("Hello World" + EOL, exec(workDir, "java", "-cp", CLASSPATH, className, "Hello"));
+ }
+
@Test
public void testStart() throws Exception {
final OutputStream os = new ByteArrayOutputStream();
@@ -216,12 +224,4 @@ public class BCELifierTestCase extends AbstractTestCase {
final BCELifier bcelifier = new BCELifier(javaClass, os);
bcelifier.start();
}
-
- @ParameterizedTest
- @ValueSource(strings = { "StackMapExample", "StackMapExample2" })
- public void testStackMap(final String className) throws Exception {
- testJavapCompare(className);
- final File workDir = new File("target");
- assertEquals("Hello World" + EOL, exec(workDir, "java", "-cp", CLASSPATH, className, "Hello"));
- }
}
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
index b17105a0..951c0c8a 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
@@ -111,16 +111,6 @@ public class VerifierTestCase {
VerifierFactory.clear();
}
- @Test
- public void testPackagePrivateField() throws ClassNotFoundException {
- testDefaultMethodValidation(FieldVerifierChildClass.class.getName());
- }
-
- @Test
- public void testPackagePrivateStaticField() throws ClassNotFoundException {
- testDefaultMethodValidation(StaticFieldVerifierChildClass.class.getName());
- }
-
@Test
public void testArrayUtils() throws ClassNotFoundException {
testNestHostWithJavaVersion("org.apache.commons.lang.ArrayUtils");
@@ -142,9 +132,8 @@ public class VerifierTestCase {
}
@Test
- @DisabledForJreRange(min = JRE.JAVA_9)
- public void testObjectInputStreamJDK8() {
- assertThrowsExactly(UnsupportedOperationException.class, () -> testNestHostWithJavaVersion("java.io.ObjectInputStream"));
+ public void testJvmOpCodes() throws ClassNotFoundException {
+ testDefaultMethodValidation("org.apache.bcel.verifier.tests.JvmOpCodes");
}
@Test
@@ -154,8 +143,19 @@ public class VerifierTestCase {
}
@Test
- public void testJvmOpCodes() throws ClassNotFoundException {
- testDefaultMethodValidation("org.apache.bcel.verifier.tests.JvmOpCodes");
+ @DisabledForJreRange(min = JRE.JAVA_9)
+ public void testObjectInputStreamJDK8() {
+ assertThrowsExactly(UnsupportedOperationException.class, () -> testNestHostWithJavaVersion("java.io.ObjectInputStream"));
+ }
+
+ @Test
+ public void testPackagePrivateField() throws ClassNotFoundException {
+ testDefaultMethodValidation(FieldVerifierChildClass.class.getName());
+ }
+
+ @Test
+ public void testPackagePrivateStaticField() throws ClassNotFoundException {
+ testDefaultMethodValidation(StaticFieldVerifierChildClass.class.getName());
}
@Test
diff --git a/src/test/java/org/apache/bcel/verifier/input/FieldVerifierChildClass.java b/src/test/java/org/apache/bcel/verifier/input/FieldVerifierChildClass.java
index 99c020ce..390fd54f 100644
--- a/src/test/java/org/apache/bcel/verifier/input/FieldVerifierChildClass.java
+++ b/src/test/java/org/apache/bcel/verifier/input/FieldVerifierChildClass.java
@@ -23,27 +23,27 @@ public class FieldVerifierChildClass extends FieldVerifierSuperClass {
super(c.publicField, c.getPrivateField(), c.protectedField, c.packagePrivateField);
}
- public int getPublicField() {
- return publicField;
- }
-
- public void setPublicField(final int publicField) {
- this.publicField = publicField;
+ public int getPackagePrivateField() {
+ return packagePrivateField;
}
public int getProtectedField() {
return protectedField;
}
- public void setProtectedField(final int protectedField) {
- this.protectedField = protectedField;
- }
-
- public int getPackagePrivateField() {
- return packagePrivateField;
+ public int getPublicField() {
+ return publicField;
}
public void setPackagePrivateField(final int packagePrivateField) {
this.packagePrivateField = packagePrivateField;
}
+
+ public void setProtectedField(final int protectedField) {
+ this.protectedField = protectedField;
+ }
+
+ public void setPublicField(final int publicField) {
+ this.publicField = publicField;
+ }
}
diff --git a/src/test/java/org/apache/bcel/verifier/input/StaticFieldVerifierChildClass.java b/src/test/java/org/apache/bcel/verifier/input/StaticFieldVerifierChildClass.java
index 6c804f08..075fdd03 100644
--- a/src/test/java/org/apache/bcel/verifier/input/StaticFieldVerifierChildClass.java
+++ b/src/test/java/org/apache/bcel/verifier/input/StaticFieldVerifierChildClass.java
@@ -19,32 +19,32 @@ package org.apache.bcel.verifier.input;
public class StaticFieldVerifierChildClass extends StaticFieldVerifierSuperClass {
- @SuppressWarnings("static-access")
- public StaticFieldVerifierChildClass(final StaticFieldVerifierChildClass c) {
- super(c.publicField, c.getPrivateField(), c.protectedField, c.packagePrivateField);
+ public static int getPackagePrivateField() {
+ return packagePrivateField;
}
- public static int getPublicField() {
- return publicField;
+ public static int getProtectedField() {
+ return protectedField;
}
- public static void setPublicField(final int publicField) {
- StaticFieldVerifierChildClass.publicField = publicField;
+ public static int getPublicField() {
+ return publicField;
}
- public static int getProtectedField() {
- return protectedField;
+ public static void setPackagePrivateField(final int packagePrivateField) {
+ StaticFieldVerifierChildClass.packagePrivateField = packagePrivateField;
}
public static void setProtectedField(final int protectedField) {
StaticFieldVerifierChildClass.protectedField = protectedField;
}
- public static int getPackagePrivateField() {
- return packagePrivateField;
+ public static void setPublicField(final int publicField) {
+ StaticFieldVerifierChildClass.publicField = publicField;
}
- public static void setPackagePrivateField(final int packagePrivateField) {
- StaticFieldVerifierChildClass.packagePrivateField = packagePrivateField;
+ @SuppressWarnings("static-access")
+ public StaticFieldVerifierChildClass(final StaticFieldVerifierChildClass c) {
+ super(c.publicField, c.getPrivateField(), c.protectedField, c.packagePrivateField);
}
}
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 0653796a..b5c661fe 100644
--- a/src/test/java/org/apache/bcel/verifier/tests/JvmOpCodes.java
+++ b/src/test/java/org/apache/bcel/verifier/tests/JvmOpCodes.java
@@ -44,11 +44,17 @@ public class JvmOpCodes {
long l1, l2;
/**
- * Tests {@link DUP2_X1}.
+ * Tests {@link DNEG}.
*/
- void dup2x1(String[] s) {
- s[0] += "s"; // Form 1
- l2 = l1 = 1; // Form 2
+ double dneg(double a) {
+ return -a;
+ }
+
+ /**
+ * Tests {@link DREM}.
+ */
+ double drem(double a, double b) {
+ return a % b;
}
/**
@@ -58,6 +64,14 @@ public class JvmOpCodes {
return a = a + 1;
}
+ /**
+ * Tests {@link DUP2_X1}.
+ */
+ void dup2x1(String[] s) {
+ s[0] += "s"; // Form 1
+ l2 = l1 = 1; // Form 2
+ }
+
/**
* Tests {@link DUP2_X2}.
*/
@@ -73,31 +87,31 @@ public class JvmOpCodes {
}
/**
- * Tests {@link LNEG}.
+ * Tests {@link FADD}.
*/
- long lneg(long a) {
- return -a;
+ float fadd(float a, float b) {
+ return a + b;
}
/**
- * Tests {@link LOR}.
+ * Tests {@link FNEG}.
*/
- long lor(long a, long b) {
- return a | b;
+ float fneg(float a) {
+ return -a;
}
/**
- * Tests {@link LAND}.
+ * Tests {@link FREM}.
*/
- long land(long a, long b) {
- return a & b;
+ float frem(float a, float b) {
+ return a % b;
}
/**
- * Tests {@link LUSHR}.
+ * Tests {@link FSUB}.
*/
- long lushr(long a, long b) {
- return a >>> b;
+ float fsub(float a, float b) {
+ return a - b;
}
/**
@@ -108,52 +122,38 @@ public class JvmOpCodes {
}
/**
- * Tests {@link LSHL}.
- */
- long lshl(long a, long b) {
- return a << b;
- }
-
- /**
- * Tests {@link FSUB}.
- */
- float fsub(float a, float b) {
- return a - b;
- }
-
- /**
- * Tests {@link FADD}.
+ * Tests {@link LAND}.
*/
- float fadd(float a, float b) {
- return a + b;
+ long land(long a, long b) {
+ return a & b;
}
/**
- * Tests {@link FREM}.
+ * Tests {@link LNEG}.
*/
- float frem(float a, float b) {
- return a % b;
+ long lneg(long a) {
+ return -a;
}
/**
- * Tests {@link FNEG}.
+ * Tests {@link LOR}.
*/
- float fneg(float a) {
- return -a;
+ long lor(long a, long b) {
+ return a | b;
}
/**
- * Tests {@link DREM}.
+ * Tests {@link LSHL}.
*/
- double drem(double a, double b) {
- return a % b;
+ long lshl(long a, long b) {
+ return a << b;
}
/**
- * Tests {@link DNEG}.
+ * Tests {@link LUSHR}.
*/
- double dneg(double a) {
- return -a;
+ long lushr(long a, long b) {
+ return a >>> b;
}
/**
[commons-bcel] 04/04: Use final, use abbreviated array, use lambdas, remove trailing whitespace
Posted by gg...@apache.org.
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) <gg...@apache.org>
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;
}
[commons-bcel] 01/04: Organize imports
Posted by gg...@apache.org.
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 430d90de1bc512a5d9c42ca957f6edf7662ad817
Author: Gary David Gregory (Code signing key) <gg...@apache.org>
AuthorDate: Tue Apr 25 13:47:47 2023 -0400
Organize imports
---
.../java/org/apache/bcel/AnnotationEntryTest.java | 12 ++++++------
.../apache/bcel/classfile/ConstantPoolTestCase.java | 1 +
.../classfile/InvalidMethodSigantureTestCase.java | 1 -
.../org/apache/bcel/classfile/SignatureTestCase.java | 12 ++++++------
.../org/apache/bcel/classfile/UtilityTestCase.java | 3 ++-
.../org/apache/bcel/generic/BinaryOpCreator.java | 12 ++++++------
.../bcel/generic/InstructionFactoryTestCase.java | 13 +++++++------
.../apache/bcel/verifier/VerifierMainTestCase.java | 20 ++++++++++----------
8 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/src/test/java/org/apache/bcel/AnnotationEntryTest.java b/src/test/java/org/apache/bcel/AnnotationEntryTest.java
index 7a3b7808..77238583 100644
--- a/src/test/java/org/apache/bcel/AnnotationEntryTest.java
+++ b/src/test/java/org/apache/bcel/AnnotationEntryTest.java
@@ -17,17 +17,17 @@
package org.apache.bcel;
-import org.apache.bcel.classfile.AnnotationEntry;
-import org.apache.bcel.classfile.ElementValuePair;
-import org.apache.bcel.classfile.SimpleElementValue;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
import java.io.IOException;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.bcel.classfile.AnnotationEntry;
+import org.apache.bcel.classfile.ElementValuePair;
+import org.apache.bcel.classfile.SimpleElementValue;
+import org.junit.jupiter.api.Test;
/**
* Tests {@link AnnotationEntry}.
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
index 0f0e3658..73c6becc 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.IOException;
+
import org.apache.bcel.AbstractTestCase;
import org.apache.bcel.Const;
import org.apache.bcel.generic.ConstantPoolGen;
diff --git a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
index e5ff65fd..f61b56fb 100644
--- a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
@@ -26,7 +26,6 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
diff --git a/src/test/java/org/apache/bcel/classfile/SignatureTestCase.java b/src/test/java/org/apache/bcel/classfile/SignatureTestCase.java
index 9726e506..eb3d5e4f 100644
--- a/src/test/java/org/apache/bcel/classfile/SignatureTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/SignatureTestCase.java
@@ -16,17 +16,17 @@
*/
package org.apache.bcel.classfile;
-import org.apache.bcel.AbstractTestCase;
-import org.apache.bcel.Repository;
-import org.apache.bcel.generic.Type;
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
import java.io.DataInput;
import java.util.Map;
import java.util.Optional;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+import org.apache.bcel.AbstractTestCase;
+import org.apache.bcel.Repository;
+import org.apache.bcel.generic.Type;
+import org.junit.jupiter.api.Test;
/**
* Tests signatures, including primitives, generics, and bad signatures for exceptions.
diff --git a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
index 0829e749..128b9282 100644
--- a/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/UtilityTestCase.java
@@ -22,10 +22,11 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.util.Arrays;
+
import org.apache.bcel.Const;
import org.apache.bcel.Repository;
import org.junit.jupiter.api.Test;
-import java.util.Arrays;
public class UtilityTestCase {
diff --git a/src/test/java/org/apache/bcel/generic/BinaryOpCreator.java b/src/test/java/org/apache/bcel/generic/BinaryOpCreator.java
index 6450445b..9a96851c 100644
--- a/src/test/java/org/apache/bcel/generic/BinaryOpCreator.java
+++ b/src/test/java/org/apache/bcel/generic/BinaryOpCreator.java
@@ -16,18 +16,18 @@
*/
package org.apache.bcel.generic;
-import org.apache.bcel.Const;
-import org.apache.bcel.classfile.StackMap;
-import org.apache.bcel.classfile.StackMapEntry;
-import org.apache.bcel.classfile.StackMapType;
-import org.apache.commons.lang.ArrayUtils;
-
import java.io.IOException;
import java.io.OutputStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import org.apache.bcel.Const;
+import org.apache.bcel.classfile.StackMap;
+import org.apache.bcel.classfile.StackMapEntry;
+import org.apache.bcel.classfile.StackMapType;
+import org.apache.commons.lang.ArrayUtils;
+
public class BinaryOpCreator {
private static final String ORG_APACHE_BCEL_GENERIC_BINARY_OP = "org.apache.bcel.generic.BinaryOp";
diff --git a/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java b/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java
index 3ade614e..19cc8d90 100644
--- a/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/InstructionFactoryTestCase.java
@@ -16,11 +16,6 @@
*/
package org.apache.bcel.generic;
-import org.apache.bcel.AbstractTestCase;
-import org.apache.bcel.Const;
-import org.apache.bcel.Repository;
-import org.junit.jupiter.api.Test;
-
import static org.apache.bcel.generic.InstructionFactory.createArrayLoad;
import static org.apache.bcel.generic.InstructionFactory.createArrayStore;
import static org.apache.bcel.generic.InstructionFactory.createBinaryOperation;
@@ -29,7 +24,13 @@ import static org.apache.bcel.generic.InstructionFactory.createLoad;
import static org.apache.bcel.generic.InstructionFactory.createNull;
import static org.apache.bcel.generic.InstructionFactory.createReturn;
import static org.apache.bcel.generic.InstructionFactory.createStore;
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrowsExactly;
+
+import org.apache.bcel.AbstractTestCase;
+import org.apache.bcel.Const;
+import org.apache.bcel.Repository;
+import org.junit.jupiter.api.Test;
public class InstructionFactoryTestCase extends AbstractTestCase {
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java b/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java
index a1ea219e..ce7f6eb8 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierMainTestCase.java
@@ -17,6 +17,16 @@
package org.apache.bcel.verifier;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.BufferedInputStream;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.bcel.AbstractTestCase;
import org.apache.bcel.classfile.ClassParser;
import org.apache.bcel.classfile.JavaClass;
@@ -29,16 +39,6 @@ import org.apache.commons.lang3.StringUtils;
import org.eclipse.jdt.internal.compiler.batch.Main;
import org.junit.jupiter.api.Test;
-import java.io.BufferedInputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
public class VerifierMainTestCase extends AbstractTestCase {
@Test