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 d1bfd30b34c7bf0c3ca75c70c86a189709934957
Author: Gary David Gregory (Code signing key) <ggreg...@apache.org>
AuthorDate: Sun Nov 20 14:38:47 2022 -0500
Use final
Trim trailing whitespace
---
.../apache/bcel/generic/InstructionFactory.java | 2 +-
src/main/java/org/apache/bcel/util/ClassPath.java | 5 +++--
.../java/org/apache/bcel/HelloWorldCreator.java | 22 +++++++++++-----------
.../bcel/classfile/JDKClassDumpTestCase.java | 2 +-
.../org/apache/bcel/util/BCELifierTestCase.java | 10 +++++-----
.../org/apache/bcel/verifier/VerifierTestCase.java | 6 +++---
.../bcel/verifier/VerifyJavaHomesTestCase.java | 2 +-
.../bcel/verifier/VerifyJavaUtilTestCase.java | 6 +++---
8 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/src/main/java/org/apache/bcel/generic/InstructionFactory.java
b/src/main/java/org/apache/bcel/generic/InstructionFactory.java
index 69e25d5d..2a8f940c 100644
--- a/src/main/java/org/apache/bcel/generic/InstructionFactory.java
+++ b/src/main/java/org/apache/bcel/generic/InstructionFactory.java
@@ -704,7 +704,7 @@ public class InstructionFactory implements
InstructionConstants {
final InstructionList il = new InstructionList();
il.append(createGetStatic("java.lang.System", "out",
Type.getType("Ljava/io/PrintStream;")));
il.append(new PUSH(cp, s));
- MethodObject methodObject = new MethodObject("java.io.PrintStream",
"println", Type.VOID, new Type[] { Type.getType("Ljava/lang/String;") });
+ final MethodObject methodObject = new
MethodObject("java.io.PrintStream", "println", Type.VOID, new Type[] {
Type.getType("Ljava/lang/String;") });
il.append(createInvoke(methodObject, Const.INVOKEVIRTUAL));
return il;
}
diff --git a/src/main/java/org/apache/bcel/util/ClassPath.java
b/src/main/java/org/apache/bcel/util/ClassPath.java
index 7f665ccb..dd3ff90a 100644
--- a/src/main/java/org/apache/bcel/util/ClassPath.java
+++ b/src/main/java/org/apache/bcel/util/ClassPath.java
@@ -580,7 +580,7 @@ public class ClassPath implements Closeable {
}
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (this == obj) {
return true;
}
@@ -590,7 +590,7 @@ public class ClassPath implements Closeable {
if (getClass() != obj.getClass()) {
return false;
}
- ClassPath other = (ClassPath) obj;
+ final ClassPath other = (ClassPath) obj;
return Objects.equals(classPathString, other.classPathString);
}
@@ -697,6 +697,7 @@ public class ClassPath implements Closeable {
try {
final java.lang.ClassLoader classLoader =
getClass().getClassLoader();
@SuppressWarnings("resource") // closed by caller
+ final
InputStream inputStream = classLoader == null ? null :
classLoader.getResourceAsStream(name + suffix);
if (inputStream != null) {
return inputStream;
diff --git a/src/test/java/org/apache/bcel/HelloWorldCreator.java
b/src/test/java/org/apache/bcel/HelloWorldCreator.java
index 53642e4a..777c8bd3 100644
--- a/src/test/java/org/apache/bcel/HelloWorldCreator.java
+++ b/src/test/java/org/apache/bcel/HelloWorldCreator.java
@@ -33,18 +33,18 @@ import java.nio.file.Paths;
public class HelloWorldCreator {
private static final String ORG_APACHE_BCEL_HELLO_WORLD =
"org.apache.bcel.HelloWorld";
- public static void main(String[] args) throws Exception {
- org.apache.bcel.HelloWorldCreator creator = new
org.apache.bcel.HelloWorldCreator();
- Path path =
Paths.get("target/test-classes/org/apache/bcel/HelloWorld.class");
+ public static void main(final String[] args) throws Exception {
+ final org.apache.bcel.HelloWorldCreator creator = new
org.apache.bcel.HelloWorldCreator();
+ final Path path =
Paths.get("target/test-classes/org/apache/bcel/HelloWorld.class");
Files.deleteIfExists(path);
try (OutputStream out = Files.newOutputStream(path)) {
creator.create(out);
}
}
- private InstructionFactory factory;
- private ConstantPoolGen cp;
+ private final InstructionFactory factory;
+ private final ConstantPoolGen cp;
- private ClassGen cg;
+ private final ClassGen cg;
public HelloWorldCreator() {
cg = new ClassGen(ORG_APACHE_BCEL_HELLO_WORLD, "java.lang.Object",
"HelloWorld.java", Const.ACC_PUBLIC | Const.ACC_SUPER, new String[] {});
@@ -55,15 +55,15 @@ public class HelloWorldCreator {
factory = new InstructionFactory(cg, cp);
}
- public void create(OutputStream out) throws IOException {
+ public void create(final OutputStream out) throws IOException {
createConstructor();
createMainMethod();
cg.getJavaClass().dump(out);
}
private void createConstructor() {
- InstructionList il = new InstructionList();
- MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID,
Type.NO_ARGS, new String[] {}, "<init>", ORG_APACHE_BCEL_HELLO_WORLD, il, cp);
+ final InstructionList il = new InstructionList();
+ final MethodGen method = new MethodGen(Const.ACC_PUBLIC, Type.VOID,
Type.NO_ARGS, new String[] {}, "<init>", ORG_APACHE_BCEL_HELLO_WORLD, il, cp);
il.append(InstructionFactory.createLoad(Type.OBJECT, 0));
il.append(factory.createInvoke("java.lang.Object", "<init>",
Type.VOID, Type.NO_ARGS, Const.INVOKESPECIAL));
@@ -75,8 +75,8 @@ public class HelloWorldCreator {
}
private void createMainMethod() {
- InstructionList il = factory.createPrintln("Hello World!");
- MethodGen method = new MethodGen(Const.ACC_PUBLIC | Const.ACC_STATIC,
Type.VOID, new Type[] { new ArrayType(Type.STRING, 1) }, new String[] { "arg0"
}, "main",
+ final InstructionList il = factory.createPrintln("Hello World!");
+ final MethodGen method = new MethodGen(Const.ACC_PUBLIC |
Const.ACC_STATIC, Type.VOID, new Type[] { new ArrayType(Type.STRING, 1) }, new
String[] { "arg0" }, "main",
ORG_APACHE_BCEL_HELLO_WORLD, il, cp);
il.append(InstructionFactory.createReturn(Type.VOID));
diff --git a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
index b17cef0a..c2409612 100644
--- a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
@@ -77,7 +77,7 @@ public class JDKClassDumpTestCase {
public void testPerformance(final Path path) throws Exception {
assertDoesNotThrow(() -> testJar(path));
}
-
+
@Test
public void testPerformanceJmod() throws Exception {
JavaHome.streamModulePath().forEach(path -> assertDoesNotThrow(() ->
testJar(path)));
diff --git a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
index 3779e481..ccdb169b 100644
--- a/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
+++ b/src/test/java/org/apache/bcel/util/BCELifierTestCase.java
@@ -61,7 +61,7 @@ public class BCELifierTestCase extends AbstractTestCase {
while ((len = is.read(buff)) != -1) {
sb.append(new String(buff, 0, len));
}
- String output = sb.toString();
+ final String output = sb.toString();
assertEquals(0, proc.waitFor(), output);
return output;
}
@@ -75,7 +75,7 @@ public class BCELifierTestCase extends AbstractTestCase {
// Get javap of the input class
final String initial = exec(null, "javap", "-cp", CLASSPATH, "-p",
"-c", javaClass.getClassName());
- String outFileName = javaClass.getSourceFilePath().replace(".java",
"Creator.java");
+ final String outFileName =
javaClass.getSourceFilePath().replace(".java", "Creator.java");
final File outfile = new File(workDir, outFileName);
Files.createDirectories(outfile.getParentFile().toPath());
final String javaAgent = getJavaAgent();
@@ -83,7 +83,7 @@ public class BCELifierTestCase extends AbstractTestCase {
if (javaAgent == null) {
creatorSourceContents = exec(workDir, "java", "-cp", CLASSPATH,
"org.apache.bcel.util.BCELifier", javaClass.getClassName());
} else {
- String runtimeExecJavaAgent = javaAgent.replace("jacoco.exec",
"jacoco_" + infile.getName() + ".exec");
+ final String runtimeExecJavaAgent =
javaAgent.replace("jacoco.exec", "jacoco_" + infile.getName() + ".exec");
creatorSourceContents = exec(workDir, "java",
runtimeExecJavaAgent, "-cp", CLASSPATH, "org.apache.bcel.util.BCELifier",
javaClass.getClassName());
}
Files.write(outfile.toPath(),
creatorSourceContents.getBytes(StandardCharsets.UTF_8));
@@ -91,7 +91,7 @@ public class BCELifierTestCase extends AbstractTestCase {
if (javaAgent == null) {
assertEquals("", exec(workDir, "java", "-cp", CLASSPATH,
javaClass.getClassName() + "Creator"));
} else {
- String runtimeExecJavaAgent = javaAgent.replace("jacoco.exec",
"jacoco_" + Utility.pathToPackage(outFileName) + ".exec");
+ final String runtimeExecJavaAgent =
javaAgent.replace("jacoco.exec", "jacoco_" + Utility.pathToPackage(outFileName)
+ ".exec");
assertEquals("", exec(workDir, "java", runtimeExecJavaAgent,
"-cp", CLASSPATH, javaClass.getClassName() + "Creator"));
}
final String output = exec(workDir, "javap", "-p", "-c",
infile.getName());
@@ -106,7 +106,7 @@ public class BCELifierTestCase extends AbstractTestCase {
if (javaAgent == null) {
assertEquals("Hello World!" + EOL, exec(workDir, "java", "-cp",
CLASSPATH, "org.apache.bcel.HelloWorld"));
} else {
- String runtimeExecJavaAgent = javaAgent.replace("jacoco.exec",
"jacoco_org.apache.bcel.HelloWorld.exec");
+ final String runtimeExecJavaAgent =
javaAgent.replace("jacoco.exec", "jacoco_org.apache.bcel.HelloWorld.exec");
assertEquals("Hello World!" + EOL, exec(workDir, "java",
runtimeExecJavaAgent, "-cp", CLASSPATH, "org.apache.bcel.HelloWorld"));
}
}
diff --git a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
index 133878db..739d0a11 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifierTestCase.java
@@ -110,17 +110,17 @@ public class VerifierTestCase {
public void testArrayUtils() throws ClassNotFoundException {
testNestHostWithJavaVersion("org.apache.commons.lang.ArrayUtils");
}
-
+
@Test
public void testCollection() throws ClassNotFoundException {
testDefaultMethodValidation("java.util.Collection");
}
-
+
@Test
public void testCommonsLang1() throws IOException, URISyntaxException,
ClassNotFoundException {
testJarFile(getJarFile(org.apache.commons.lang.StringUtils.class),
"ArrayUtils", "SerializationUtils");
}
-
+
@Test
public void testDefinitionImpl() throws ClassNotFoundException {
testNestHostWithJavaVersion("com.ibm.wsdl.DefinitionImpl");
diff --git
a/src/test/java/org/apache/bcel/verifier/VerifyJavaHomesTestCase.java
b/src/test/java/org/apache/bcel/verifier/VerifyJavaHomesTestCase.java
index 5f12b679..4f12f0d6 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifyJavaHomesTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifyJavaHomesTestCase.java
@@ -32,7 +32,7 @@ public class VerifyJavaHomesTestCase extends
AbstractVerifierTestCase {
/**
* Eventually runs out of memory? Super now calls VerifierFactory.clear();
- *
+ *
* @param name
* @throws ClassNotFoundException
*/
diff --git a/src/test/java/org/apache/bcel/verifier/VerifyJavaUtilTestCase.java
b/src/test/java/org/apache/bcel/verifier/VerifyJavaUtilTestCase.java
index 74d35b61..0a178eef 100644
--- a/src/test/java/org/apache/bcel/verifier/VerifyJavaUtilTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/VerifyJavaUtilTestCase.java
@@ -29,15 +29,15 @@ public class VerifyJavaUtilTestCase extends
AbstractVerifierTestCase {
public void testHashMap() throws ClassNotFoundException {
assertTrue(doAllPasses("java.util.HashMap"));
}
-
+
@Test
public void testLinkedHashMap() throws ClassNotFoundException {
assertTrue(doAllPasses("java.util.LinkedHashMap"));
}
-
+
@Test
public void testTreeMap() throws ClassNotFoundException {
assertTrue(doAllPasses("java.util.TreeMap"));
}
-
+
}
