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 6c84bd37fa12580ceae63105dcc248cbf3518e14
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Dec 29 10:32:00 2024 -0500
Add Checkstyle RedundantModifier
---
src/conf/checkstyle/checkstyle.xml | 8 ++++----
src/examples/JasminVisitor.java | 2 +-
src/examples/Mini/MiniC.java | 2 +-
src/examples/Package.java | 6 +++---
src/main/java/org/apache/bcel/classfile/Utility.java | 4 ++--
.../apache/bcel/util/AbstractClassPathRepository.java | 6 +++---
src/main/java/org/apache/bcel/util/ClassPath.java | 6 +++---
.../apache/bcel/verifier/statics/Pass2Verifier.java | 2 +-
.../bcel/verifier/structurals/ControlFlowGraph.java | 3 +--
.../apache/bcel/verifier/structurals/Subroutines.java | 3 ++-
src/test/java/org/apache/bcel/OssFuzzTestCase.java | 2 +-
.../classfile/ConstantPoolModuleToStringTestCase.java | 4 ++--
.../apache/bcel/classfile/ConstantPoolTestCase.java | 4 ++--
.../bcel/classfile/InvalidMethodSigantureTestCase.java | 2 +-
.../apache/bcel/generic/JdkGenericDumpTestCase.java | 4 ++--
.../apache/bcel/util/ClassPathRepositoryTestCase.java | 18 +++++++++---------
.../java/org/apache/bcel/util/ClassPathTestCase.java | 2 +-
.../bcel/util/LruCacheClassPathRepositoryTestCase.java | 6 +++---
.../apache/bcel/verifier/JiraBcel369TestFixture.java | 3 +--
19 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/src/conf/checkstyle/checkstyle.xml
b/src/conf/checkstyle/checkstyle.xml
index 769a0a17..5aa62d58 100644
--- a/src/conf/checkstyle/checkstyle.xml
+++ b/src/conf/checkstyle/checkstyle.xml
@@ -55,7 +55,7 @@ limitations under the License.
<property name="option" value="text" />
</module>
<module name="EqualsHashCode" />
- <module name="ExplicitInitializationCheck" />
+ <module name="ExplicitInitialization" />
<module name="FallThrough">
<property name="reliefPattern" value="\$FALL-THROUGH\$" />
</module>
@@ -73,13 +73,13 @@ limitations under the License.
<module name="ModifierOrder" />
<module name="MultipleVariableDeclarations" />
<module name="NeedBraces" />
- <!--module name="SuperClone"/-->
- <module name="SuperFinalize" />
- <!--module name="ExplicitInitialization"/-->
<module name="RedundantImport" />
+ <module name="RedundantModifier" />
<module name="SimplifyBooleanExpression" />
<module name="SimplifyBooleanReturn" />
<module name="StringLiteralEquality" />
+ <!-- <module name="SuperClone" /> -->
+ <module name="SuperFinalize" />
<module name="SuppressionCommentFilter" />
<module name="SuppressWithNearbyCommentFilter">
<property name="commentFormat" value="CHECKSTYLE IGNORE (\w+)" />
diff --git a/src/examples/JasminVisitor.java b/src/examples/JasminVisitor.java
index 6cc495da..beb99af7 100644
--- a/src/examples/JasminVisitor.java
+++ b/src/examples/JasminVisitor.java
@@ -85,7 +85,7 @@ public class JasminVisitor extends
org.apache.bcel.classfile.EmptyVisitor {
}
final String name = path + className + ".j";
- try (final FileOutputStream out = new FileOutputStream(name)) {
+ try (FileOutputStream out = new FileOutputStream(name)) {
new JasminVisitor(javaClass, out).disassemble();
System.out.println("File dumped to: " + name);
}
diff --git a/src/examples/Mini/MiniC.java b/src/examples/Mini/MiniC.java
index ed56f6d6..899f4da7 100644
--- a/src/examples/Mini/MiniC.java
+++ b/src/examples/Mini/MiniC.java
@@ -157,7 +157,7 @@ public class MiniC {
clazz.dump(baseName + JavaClass.EXTENSION);
} else {
System.out.println("Pass 5: Generating Java code...");
- try (final PrintWriter out = new PrintWriter(baseName
+ ".java", StandardCharsets.UTF_8.name())) {
+ try (PrintWriter out = new PrintWriter(baseName +
".java", StandardCharsets.UTF_8.name())) {
program.code(out, baseName);
}
diff --git a/src/examples/Package.java b/src/examples/Package.java
index debc8c75..63988ee0 100644
--- a/src/examples/Package.java
+++ b/src/examples/Package.java
@@ -181,7 +181,7 @@ public class Package {
clName = clName.substring(0, clName.length() -
JavaClass.EXTENSION.length());
}
clName = Utility.packageToPath(clName);
- try (final InputStream inputStream =
classPath.getInputStream(clName)) {
+ try (InputStream inputStream = classPath.getInputStream(clName)) {
clazz = new ClassParser(inputStream, clName).parse();
}
// here we create the root set of classes to process
@@ -202,7 +202,7 @@ public class Package {
final String name = dependents.firstKey();
final String from = dependents.remove(name);
if (allClasses.get(name) == null) {
- try (final InputStream inputStream =
classPath.getInputStream(name)) {
+ try (InputStream inputStream = classPath.getInputStream(name))
{
clazz = new ClassParser(inputStream, name).parse();
addDependents(clazz);
} catch (final IOException e) {
@@ -217,7 +217,7 @@ public class Package {
}
// create the jar
- try (final JarOutputStream jarFile = new JarOutputStream(new
FileOutputStream(defaultJar))) {
+ try (JarOutputStream jarFile = new JarOutputStream(new
FileOutputStream(defaultJar))) {
jarFile.setLevel(5); // use compression
int written = 0;
for (final Entry<String, JavaClass> entry : allClasses.entrySet())
{ // add entries for every class
diff --git a/src/main/java/org/apache/bcel/classfile/Utility.java
b/src/main/java/org/apache/bcel/classfile/Utility.java
index 756d68dc..f4ba8e85 100644
--- a/src/main/java/org/apache/bcel/classfile/Utility.java
+++ b/src/main/java/org/apache/bcel/classfile/Utility.java
@@ -53,7 +53,7 @@ public abstract class Utility {
*/
private static final class JavaReader extends FilterReader {
- public JavaReader(final Reader in) {
+ JavaReader(final Reader in) {
super(in);
}
@@ -93,7 +93,7 @@ public abstract class Utility {
*/
private static final class JavaWriter extends FilterWriter {
- public JavaWriter(final Writer out) {
+ JavaWriter(final Writer out) {
super(out);
}
diff --git
a/src/main/java/org/apache/bcel/util/AbstractClassPathRepository.java
b/src/main/java/org/apache/bcel/util/AbstractClassPathRepository.java
index 83efe874..98c3ab0f 100644
--- a/src/main/java/org/apache/bcel/util/AbstractClassPathRepository.java
+++ b/src/main/java/org/apache/bcel/util/AbstractClassPathRepository.java
@@ -47,7 +47,7 @@ abstract class AbstractClassPathRepository implements
Repository {
public abstract void clear();
@Override
- public abstract JavaClass findClass(final String className);
+ public abstract JavaClass findClass(String className);
@Override
public ClassPath getClassPath() {
@@ -124,8 +124,8 @@ abstract class AbstractClassPathRepository implements
Repository {
}
@Override
- public abstract void removeClass(final JavaClass javaClass);
+ public abstract void removeClass(JavaClass javaClass);
@Override
- public abstract void storeClass(final JavaClass javaClass);
+ public abstract void storeClass(JavaClass javaClass);
}
diff --git a/src/main/java/org/apache/bcel/util/ClassPath.java
b/src/main/java/org/apache/bcel/util/ClassPath.java
index e2b8fa60..4020002e 100644
--- a/src/main/java/org/apache/bcel/util/ClassPath.java
+++ b/src/main/java/org/apache/bcel/util/ClassPath.java
@@ -133,7 +133,7 @@ public class ClassPath implements Closeable {
}
}
- protected abstract String toEntryName(final String name, final String
suffix);
+ protected abstract String toEntryName(String name, String suffix);
@Override
public String toString() {
@@ -274,7 +274,7 @@ public class ClassPath implements Closeable {
private final Path modulePath;
- public JrtModule(final Path modulePath) {
+ JrtModule(final Path modulePath) {
this.modulePath = Objects.requireNonNull(modulePath, "modulePath");
}
@@ -358,7 +358,7 @@ public class ClassPath implements Closeable {
private final ModularRuntimeImage modularRuntimeImage;
private final JrtModule[] modules;
- public JrtModules(final String path) throws IOException {
+ JrtModules(final String path) throws IOException {
this.modularRuntimeImage = new ModularRuntimeImage();
this.modules =
modularRuntimeImage.list(path).stream().map(JrtModule::new).toArray(JrtModule[]::new);
}
diff --git a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
index a0519352..c60c3991 100644
--- a/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
+++ b/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
@@ -1125,7 +1125,7 @@ public final class Pass2Verifier extends PassVerifier
implements Constants {
private final ConstantPool cp;
/** Constructs an InnerClassDetector working on the JavaClass _jc. */
- public InnerClassDetector(final JavaClass javaClass) {
+ InnerClassDetector(final JavaClass javaClass) {
this.jc = javaClass;
this.cp = jc.getConstantPool();
new DescendingVisitor(jc, this).visit();
diff --git
a/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
b/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
index c208fe07..2a8a42a1 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
@@ -80,11 +80,10 @@ public class ControlFlowGraph {
* Creates an InstructionHandleImpl object from an InstructionHandle.
Creation of one per InstructionHandle suffices.
* Don't create more.
*/
- public InstructionContextImpl(final InstructionHandle inst) {
+ InstructionContextImpl(final InstructionHandle inst) {
if (inst == null) {
throw new AssertionViolatedException("Cannot instantiate
InstructionContextImpl from NULL.");
}
-
instruction = inst;
inFrames = new HashMap<>();
outFrames = new HashMap<>();
diff --git
a/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
b/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
index 3e1089a3..1766d65f 100644
--- a/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
+++ b/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
@@ -97,7 +97,8 @@ public class Subroutines {
/**
* The default constructor.
*/
- public SubroutineImpl() {
+ SubroutineImpl() {
+ // empty
}
/**
diff --git a/src/test/java/org/apache/bcel/OssFuzzTestCase.java
b/src/test/java/org/apache/bcel/OssFuzzTestCase.java
index 05c365ae..6f089b4f 100644
--- a/src/test/java/org/apache/bcel/OssFuzzTestCase.java
+++ b/src/test/java/org/apache/bcel/OssFuzzTestCase.java
@@ -80,7 +80,7 @@ public class OssFuzzTestCase {
private void testOssFuzzReproducer(final String issue) throws Exception {
// Class names here use non-".class" suffix so that Maven plugins like
surefire do not try to read the file and fail the build.
final File reproducerFile = new
File("target/test-classes/ossfuzz/issue" + issue + "/Test.classx");
- try (final FileInputStream reproducerInputStream = new
FileInputStream(reproducerFile)) {
+ try (FileInputStream reproducerInputStream = new
FileInputStream(reproducerFile)) {
final ClassParser cp = new ClassParser(reproducerInputStream,
"Test");
assertThrows(ClassFormatException.class, () -> cp.parse());
}
diff --git
a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTestCase.java
b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTestCase.java
index 65deb370..b4eca7f1 100644
---
a/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTestCase.java
+++
b/src/test/java/org/apache/bcel/classfile/ConstantPoolModuleToStringTestCase.java
@@ -49,7 +49,7 @@ public class ConstantPoolModuleToStringTestCase {
private final ConstantPool pool;
private int count;
- public ToStringVisitor(final ConstantPool pool) {
+ ToStringVisitor(final ConstantPool pool) {
this.pool = pool;
}
@@ -499,7 +499,7 @@ public class ConstantPoolModuleToStringTestCase {
"src/test/resources/jpms/java19-ea/commons-io/module-info.class"})
// @formatter:on
public void test(final String first) throws Exception {
- try (final InputStream inputStream =
Files.newInputStream(Paths.get(first))) {
+ try (InputStream inputStream = Files.newInputStream(Paths.get(first)))
{
test(inputStream);
}
}
diff --git a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
index 8862fe1b..dd070f49 100644
--- a/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/ConstantPoolTestCase.java
@@ -52,7 +52,7 @@ public class ConstantPoolTestCase extends AbstractTestCase {
@Test
public void testClassWithDoubleConstantPoolItem() throws
ClassNotFoundException, IOException {
- try (final ClassPath cp = new
ClassPath("target/test-classes/org/apache/bcel/classfile")) {
+ try (ClassPath cp = new
ClassPath("target/test-classes/org/apache/bcel/classfile")) {
final ClassWithDoubleConstantPoolItem
classWithDoubleConstantPoolItem = new ClassWithDoubleConstantPoolItem();
final JavaClass c = new
ClassPathRepository(cp).loadClass(classWithDoubleConstantPoolItem.getClass());
final Field[] fields = c.getFields();
@@ -78,7 +78,7 @@ public class ConstantPoolTestCase extends AbstractTestCase {
@Test
public void testClassWithLongConstantPoolItem() throws
ClassNotFoundException, IOException {
- try (final ClassPath cp = new
ClassPath("target/test-classes/org/apache/bcel/classfile")) {
+ try (ClassPath cp = new
ClassPath("target/test-classes/org/apache/bcel/classfile")) {
final ClassWithLongConstantPoolItem classWithLongConstantPoolItem
= new ClassWithLongConstantPoolItem();
final JavaClass c = new
ClassPathRepository(cp).loadClass(classWithLongConstantPoolItem.getClass());
final Field[] fields = c.getFields();
diff --git
a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
index 7f635578..5fc29a66 100644
---
a/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
+++
b/src/test/java/org/apache/bcel/classfile/InvalidMethodSigantureTestCase.java
@@ -75,7 +75,7 @@ public class InvalidMethodSigantureTestCase {
@Test
//@Disabled("TODO?")
public void testMethodWithParens() throws Exception {
- try (final InputStream inputStream =
Files.newInputStream(Paths.get(SRC_TEST_RESOURCES_KOTLIN, CLASS_NAME +
".class"))) {
+ try (InputStream inputStream =
Files.newInputStream(Paths.get(SRC_TEST_RESOURCES_KOTLIN, CLASS_NAME +
".class"))) {
final ClassParser classParser = new ClassParser(inputStream,
CLASS_NAME);
final JavaClass javaClass = classParser.parse();
final TestVisitor visitor = new TestVisitor();
diff --git a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
index 51ee2617..8842e9c7 100644
--- a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
@@ -88,7 +88,7 @@ public class JdkGenericDumpTestCase {
private void find(final Path path) throws IOException {
final Path name = path.getFileName();
if (name != null && matcher.matches(name)) {
- try (final InputStream inputStream =
Files.newInputStream(path)) {
+ try (InputStream inputStream = Files.newInputStream(path)) {
final ClassParser classParser = new
ClassParser(inputStream, name.toAbsolutePath().toString());
assertNotNull(classParser.parse());
}
@@ -188,7 +188,7 @@ public class JdkGenericDumpTestCase {
@MethodSource("org.apache.bcel.generic.JavaHome#streamJavaHome")
public void testJreModules(final JavaHome javaHome) throws Exception {
assumeTrue(SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9));
- try (final ModularRuntimeImage mri =
javaHome.getModularRuntimeImage()) {
+ try (ModularRuntimeImage mri = javaHome.getModularRuntimeImage()) {
for (final Path path : mri.modules()) {
Files.walkFileTree(path, new
ClassParserFilesVisitor("*.class"));
}
diff --git
a/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
b/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
index 450be080..0e3ab02a 100644
--- a/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
+++ b/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
@@ -39,9 +39,9 @@ public class ClassPathRepositoryTestCase {
@Test
public void testClassPath() throws IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
final ClassPathRepository repository = new
ClassPathRepository(classPath);
- try (final ClassPath repoCp = repository.getClassPath()) {
+ try (ClassPath repoCp = repository.getClassPath()) {
assertEquals(classPath, repoCp);
}
}
@@ -49,14 +49,14 @@ public class ClassPathRepositoryTestCase {
@Test
public void testClassPathRepository() throws ClassNotFoundException,
IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
verifyCaching(new ClassPathRepository(classPath));
}
}
@Test
public void testClassWithoutPackage() throws IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
final ClassPathRepository repository = new
ClassPathRepository(classPath);
assertThrows(ClassNotFoundException.class, () ->
repository.loadClass("ClassXYZ"));
}
@@ -64,7 +64,7 @@ public class ClassPathRepositoryTestCase {
@Test
public void testEmptyInput() throws IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
final ClassPathRepository repository = new
ClassPathRepository(classPath);
assertThrows(IllegalArgumentException.class, () ->
repository.loadClass(""));
}
@@ -72,21 +72,21 @@ public class ClassPathRepositoryTestCase {
@Test
public void testLruCacheClassPathRepository() throws
ClassNotFoundException, IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
verifyCaching(new LruCacheClassPathRepository(classPath, 10));
}
}
@Test
public void testMemorySensitiveClassPathRepository() throws
ClassNotFoundException, IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
verifyCaching(new MemorySensitiveClassPathRepository(classPath));
}
}
@Test
public void testNoClassNotFound() throws IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
final ClassPathRepository repository = new
ClassPathRepository(classPath);
assertThrows(ClassNotFoundException.class, () ->
repository.loadClass("no.such.Class"));
}
@@ -94,7 +94,7 @@ public class ClassPathRepositoryTestCase {
@Test
public void testNullInput() throws IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
final ClassPathRepository repository = new
ClassPathRepository(classPath);
assertThrows(IllegalArgumentException.class, () ->
repository.loadClass((String) null));
}
diff --git a/src/test/java/org/apache/bcel/util/ClassPathTestCase.java
b/src/test/java/org/apache/bcel/util/ClassPathTestCase.java
index bcca2236..7fb1d0b9 100644
--- a/src/test/java/org/apache/bcel/util/ClassPathTestCase.java
+++ b/src/test/java/org/apache/bcel/util/ClassPathTestCase.java
@@ -41,7 +41,7 @@ public class ClassPathTestCase extends AbstractTestCase {
@Test
public void testGetResourceAsStream() throws IOException {
- try (final InputStream inputStream =
ClassPath.SYSTEM_CLASS_PATH.getResourceAsStream("java/lang/String.class")) {
+ try (InputStream inputStream =
ClassPath.SYSTEM_CLASS_PATH.getResourceAsStream("java/lang/String.class")) {
assertNotNull(inputStream);
}
}
diff --git
a/src/test/java/org/apache/bcel/util/LruCacheClassPathRepositoryTestCase.java
b/src/test/java/org/apache/bcel/util/LruCacheClassPathRepositoryTestCase.java
index f6fa6728..f02d496a 100644
---
a/src/test/java/org/apache/bcel/util/LruCacheClassPathRepositoryTestCase.java
+++
b/src/test/java/org/apache/bcel/util/LruCacheClassPathRepositoryTestCase.java
@@ -35,7 +35,7 @@ public class LruCacheClassPathRepositoryTestCase {
@Test
public void testCacheEviction() throws ClassNotFoundException, IOException
{
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
final LruCacheClassPathRepository repository = new
LruCacheClassPathRepository(classPath, 2);
final JavaClass class1 = repository.loadClass("java.lang.String");
assertNotNull(class1);
@@ -52,7 +52,7 @@ public class LruCacheClassPathRepositoryTestCase {
@Test
public void testLeastRecentlyUsedEviction() throws ClassNotFoundException,
IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
final LruCacheClassPathRepository repository = new
LruCacheClassPathRepository(classPath, 2);
final JavaClass class1 = repository.loadClass("java.lang.String");
assertNotNull(class1);
@@ -70,7 +70,7 @@ public class LruCacheClassPathRepositoryTestCase {
@Test
public void testZeroCacheSize() throws IOException {
- try (final ClassPath classPath = new ClassPath("")) {
+ try (ClassPath classPath = new ClassPath("")) {
assertThrows(IllegalArgumentException.class, () -> new
LruCacheClassPathRepository(classPath, 0));
}
}
diff --git a/src/test/java/org/apache/bcel/verifier/JiraBcel369TestFixture.java
b/src/test/java/org/apache/bcel/verifier/JiraBcel369TestFixture.java
index 3f163236..3c2fdbb5 100644
--- a/src/test/java/org/apache/bcel/verifier/JiraBcel369TestFixture.java
+++ b/src/test/java/org/apache/bcel/verifier/JiraBcel369TestFixture.java
@@ -16,12 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.bcel.verifier;
final class JiraBcel369TestFixture {
- public JiraBcel369TestFixture(int i) {
+ JiraBcel369TestFixture(int i) {
try {
i++;
} finally {
