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
The following commit(s) were added to refs/heads/master by this push:
new 899c786 Use final.
899c786 is described below
commit 899c786357e15420b822fc821826ee84e1ded78f
Author: Gary Gregory <gardgreg...@gmail.com>
AuthorDate: Fri Nov 20 22:02:19 2020 -0500
Use final.
---
src/main/java/org/apache/bcel/util/ClassPath.java | 10 +++++-----
src/test/java/org/apache/bcel/PLSETestCase.java | 2 +-
.../java/org/apache/bcel/classfile/JDKClassDumpTestCase.java | 2 +-
.../bcel/generic/GeneratingAnnotatedClassesTestCase.java | 4 ++--
.../java/org/apache/bcel/generic/JdkGenericDumpTestCase.java | 10 +++++-----
.../java/org/apache/bcel/util/ModularRuntimeImageTestCase.java | 8 ++++----
.../org/apache/bcel/verifier/AbstractVerifierTestCase.java | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/main/java/org/apache/bcel/util/ClassPath.java
b/src/main/java/org/apache/bcel/util/ClassPath.java
index 101f21b..2af6bf4 100644
--- a/src/main/java/org/apache/bcel/util/ClassPath.java
+++ b/src/main/java/org/apache/bcel/util/ClassPath.java
@@ -365,7 +365,7 @@ public class ClassPath implements Closeable {
public void close() throws IOException {
if (modules != null) {
// don't use a for each loop to avoid creating an iterator for
the GC to collect.
- for (JrtModule module : modules) {
+ for (final JrtModule module : modules) {
module.close();
}
}
@@ -377,7 +377,7 @@ public class ClassPath implements Closeable {
@Override
ClassFile getClassFile(final String name, final String suffix) throws
IOException {
// don't use a for each loop to avoid creating an iterator for the
GC to collect.
- for (JrtModule module : modules) {
+ for (final JrtModule module : modules) {
final ClassFile classFile = module.getClassFile(name, suffix);
if (classFile != null) {
return classFile;
@@ -389,7 +389,7 @@ public class ClassPath implements Closeable {
@Override
URL getResource(final String name) {
// don't use a for each loop to avoid creating an iterator for the
GC to collect.
- for (JrtModule module : modules) {
+ for (final JrtModule module : modules) {
final URL url = module.getResource(name);
if (url != null) {
return url;
@@ -401,7 +401,7 @@ public class ClassPath implements Closeable {
@Override
InputStream getResourceAsStream(final String name) {
// don't use a for each loop to avoid creating an iterator for the
GC to collect.
- for (JrtModule module : modules) {
+ for (final JrtModule module : modules) {
final InputStream inputStream =
module.getResourceAsStream(name);
if (inputStream != null) {
return inputStream;
@@ -452,7 +452,7 @@ public class ClassPath implements Closeable {
if (modulesDir.exists()) {
final String[] modules = modulesDir.list(MODULES_FILTER);
if (modules != null) {
- for (String module : modules) {
+ for (final String module : modules) {
list.add(modulesDir.getPath() + File.separatorChar +
module);
}
}
diff --git a/src/test/java/org/apache/bcel/PLSETestCase.java
b/src/test/java/org/apache/bcel/PLSETestCase.java
index 967bfac..edc16d7 100644
--- a/src/test/java/org/apache/bcel/PLSETestCase.java
+++ b/src/test/java/org/apache/bcel/PLSETestCase.java
@@ -125,7 +125,7 @@ public class PLSETestCase extends AbstractTestCase
// load a class with a wide variety of byte codes - including
tableswitch and lookupswitch
final JavaClass clazz =
getTestClass(PACKAGE_BASE_NAME+".data.ConstantPoolX");
for (final Method m: clazz.getMethods()) {
- String signature = m.getSignature();
+ final String signature = m.getSignature();
Utility.methodTypeToSignature(Utility.methodSignatureReturnType(signature),
Utility.methodSignatureArgumentTypes(signature)); // discard
result
final Code code = m.getCode();
diff --git a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
index a2eb7ec..3e64922 100644
--- a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
@@ -80,7 +80,7 @@ public class JDKClassDumpTestCase {
int i = 0;
for (final int out : baos.toByteArray()) {
final int in = src.read();
- int j = i;
+ final int j = i;
assertEquals(in, out & 0xFF, () -> (name + ": Mismatch at " +
j));
i++;
}
diff --git
a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
index ac455e8..ca44de1 100644
---
a/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
+++
b/src/test/java/org/apache/bcel/generic/GeneratingAnnotatedClassesTestCase.java
@@ -163,7 +163,7 @@ public class GeneratingAnnotatedClassesTestCase extends
AbstractTestCase
final MethodGen mainMethod2 = new MethodGen(mainMethod1,
cg2.getClassName(),
cg2.getConstantPool());
assertEquals(1, mainMethod2.getAnnotationEntries().length, "Wrong
number of annotations of the 'MethodGen'");
- AnnotationEntryGen fruit =
createFruitAnnotation(cg2.getConstantPool(), "Pear");
+ final AnnotationEntryGen fruit =
createFruitAnnotation(cg2.getConstantPool(), "Pear");
mainMethod2.addAnnotationEntry(fruit);
cg2.removeMethod(mainMethod1);
cg2.addMethod(mainMethod2.getMethod());
@@ -299,7 +299,7 @@ public class GeneratingAnnotatedClassesTestCase extends
AbstractTestCase
{
final AnnotationEntry[] annos=
parameterAnnotation.getAnnotationEntries();
final int expectedLength =
expectedNumberOfParmeterAnnotations[i++];
- int j = i;
+ final int j = i;
assertEquals(expectedLength, annos.length, () -> methodName + "
parameter " + j);
if(expectedLength!=0)
{
diff --git a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
index f7a1654..3390fc4 100644
--- a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
@@ -209,12 +209,12 @@ public class JdkGenericDumpTestCase {
}
}
- private File[] listJdkJars(String javaHome) throws Exception {
+ private File[] listJdkJars(final String javaHome) throws Exception {
final File javaLib = new File(javaHome, "lib");
return javaLib.listFiles(file -> file.getName().endsWith(".jar"));
}
- private File[] listJdkModules(String javaHome) throws Exception {
+ private File[] listJdkModules(final String javaHome) throws Exception {
final File javaLib = new File(javaHome, "jmods");
return javaLib.listFiles(file -> file.getName().endsWith(".jmod"));
}
@@ -242,7 +242,7 @@ public class JdkGenericDumpTestCase {
@ParameterizedTest
@MethodSource("findJavaHomes")
- public void testJdkJars(String javaHome) throws Exception {
+ public void testJdkJars(final String javaHome) throws Exception {
final File[] jars = listJdkJars(javaHome);
if (jars != null) {
for (final File file : jars) {
@@ -253,7 +253,7 @@ public class JdkGenericDumpTestCase {
@ParameterizedTest
@MethodSource("findJavaHomes")
- public void testJdkModules(String javaHome) throws Exception {
+ public void testJdkModules(final String javaHome) throws Exception {
final File[] jmods = listJdkModules(javaHome);
if (jmods != null) {
for (final File file : jmods) {
@@ -264,7 +264,7 @@ public class JdkGenericDumpTestCase {
@ParameterizedTest
@MethodSource("findJavaHomes")
- public void testJreModules(String javaHome) throws Exception {
+ public void testJreModules(final String javaHome) throws Exception {
assumeTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9));
try (final ModularRuntimeImage mri = new
ModularRuntimeImage(javaHome)) {
final List<Path> modules = mri.modules();
diff --git
a/src/test/java/org/apache/bcel/util/ModularRuntimeImageTestCase.java
b/src/test/java/org/apache/bcel/util/ModularRuntimeImageTestCase.java
index d8a5a33..c76d89c 100644
--- a/src/test/java/org/apache/bcel/util/ModularRuntimeImageTestCase.java
+++ b/src/test/java/org/apache/bcel/util/ModularRuntimeImageTestCase.java
@@ -44,7 +44,7 @@ public class ModularRuntimeImageTestCase {
@ParameterizedTest
@MethodSource("org.apache.bcel.generic.JdkGenericDumpTestCase#findJavaHomes")
- public void testListJreModules(ModularRuntimeImage modularRuntimeImage)
throws IOException {
+ public void testListJreModules(final ModularRuntimeImage
modularRuntimeImage) throws IOException {
final List<Path> listEntries =
modularRuntimeImage.list(ModularRuntimeImage.MODULES_PATH);
assertFalse(listEntries.isEmpty());
assertTrue(listEntries.toString().indexOf("/java.base") > -1);
@@ -52,7 +52,7 @@ public class ModularRuntimeImageTestCase {
@ParameterizedTest
@MethodSource("org.apache.bcel.generic.JdkGenericDumpTestCase#findJavaHomes")
- public void testListJreModule(ModularRuntimeImage modularRuntimeImage)
throws IOException {
+ public void testListJreModule(final ModularRuntimeImage
modularRuntimeImage) throws IOException {
final List<Path> listEntries =
modularRuntimeImage.list(ModularRuntimeImage.MODULES_PATH + "/java.base");
assertFalse(listEntries.isEmpty());
assertTrue(listEntries.toString().indexOf("/java.base") > -1);
@@ -60,7 +60,7 @@ public class ModularRuntimeImageTestCase {
@ParameterizedTest
@MethodSource("org.apache.bcel.generic.JdkGenericDumpTestCase#findJavaHomes")
- public void testListJreModulePackageDir(ModularRuntimeImage
modularRuntimeImage) throws IOException {
+ public void testListJreModulePackageDir(final ModularRuntimeImage
modularRuntimeImage) throws IOException {
final List<Path> listEntries = modularRuntimeImage
.list(ModularRuntimeImage.MODULES_PATH +
"/java.base/java/lang");
assertFalse(listEntries.isEmpty());
@@ -69,7 +69,7 @@ public class ModularRuntimeImageTestCase {
@ParameterizedTest
@MethodSource("org.apache.bcel.generic.JdkGenericDumpTestCase#findJavaHomes")
- public void testListJrePackages(ModularRuntimeImage modularRuntimeImage)
throws IOException {
+ public void testListJrePackages(final ModularRuntimeImage
modularRuntimeImage) throws IOException {
final List<Path> listEntries =
modularRuntimeImage.list(ModularRuntimeImage.PACKAGES_PATH);
assertFalse(listEntries.isEmpty());
assertTrue(listEntries.toString().indexOf("java.lang") > -1);
diff --git
a/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
b/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
index 30400d5..3f2ba5d 100644
--- a/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
+++ b/src/test/java/org/apache/bcel/verifier/AbstractVerifierTestCase.java
@@ -59,7 +59,7 @@ public abstract class AbstractVerifierTestCase {
*/
public boolean doAllPasses(final String classname) throws
ClassNotFoundException {
final JavaClass jc = Repository.lookupClass(classname);
- int nbMethods = jc.getMethods().length;
+ final int nbMethods = jc.getMethods().length;
final Verifier verifier = VerifierFactory.getVerifier(classname);
VerificationResult result = verifier.doPass1();
