Use try-with resource.
@SuppressWarnings and comment
diff --git a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
index 3ff834b..2c891e2 100644
--- a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
@@ -46,7 +46,7 @@
for (final int out : baos.toByteArray()) {
final int in = src.read();
final int j = i;
- assertEquals(in, out & 0xFF, () -> (name + ": Mismatch at " + j));
+ assertEquals(in, out & 0xFF, () -> name + ": Mismatch at " + j);
i++;
}
}
@@ -62,10 +62,9 @@
final String name = e.getName();
if (name.endsWith(".class")) {
// System.out.println("parsing " + name);
- try (InputStream in = jar.getInputStream(e)) {
- final ClassParser parser = new ClassParser(in, name);
- final JavaClass jc = parser.parse();
- compare(jc, jar.getInputStream(e), name);
+ try (InputStream inputStream1 = jar.getInputStream(e);
+ InputStream inputStream2 = jar.getInputStream(e);) {
+ compare(new ClassParser(inputStream1, name).parse(), inputStream2, name);
}
}
}
diff --git a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
index 17a24a1..7287d47 100644
--- a/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
+++ b/src/test/java/org/apache/bcel/generic/JdkGenericDumpTestCase.java
@@ -76,6 +76,7 @@
private final PathMatcher matcher;
+ @SuppressWarnings("resource") // FileSystems.getDefault() returns a singleton
ClassParserFilesVisitor(final String pattern) {
matcher = FileSystems.getDefault().getPathMatcher("glob:" + pattern);
}
@@ -85,8 +86,7 @@
if (name != null && matcher.matches(name)) {
try (final InputStream inputStream = Files.newInputStream(path)) {
final ClassParser classParser = new ClassParser(inputStream, name.toAbsolutePath().toString());
- final JavaClass javaClass = classParser.parse();
- assertNotNull(javaClass);
+ assertNotNull(classParser.parse());
}
}
diff --git a/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java b/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
index 5177065..e256a1d 100644
--- a/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
+++ b/src/test/java/org/apache/bcel/util/ClassPathRepositoryTestCase.java
@@ -39,7 +39,9 @@
public void testClassPath() throws IOException {
try (final ClassPath classPath = new ClassPath("")) {
final ClassPathRepository repository = new ClassPathRepository(classPath);
- assertEquals(classPath, repository.getClassPath());
+ try (final ClassPath repoCp = repository.getClassPath()) {
+ assertEquals(classPath, repoCp);
+ }
}
}
