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 2022/08/13 18:24:09 UTC
[commons-bcel] branch master updated: Use try-with resource.
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 a7027eb3 Use try-with resource.
a7027eb3 is described below
commit a7027eb3ddc3c6ff36fded5ff8259c93833d4f3d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Aug 13 14:24:05 2022 -0400
Use try-with resource.
@SuppressWarnings and comment
---
.../java/org/apache/bcel/classfile/JDKClassDumpTestCase.java | 9 ++++-----
.../java/org/apache/bcel/generic/JdkGenericDumpTestCase.java | 4 ++--
.../java/org/apache/bcel/util/ClassPathRepositoryTestCase.java | 4 +++-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java b/src/test/java/org/apache/bcel/classfile/JDKClassDumpTestCase.java
index 3ff834b3..2c891e28 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 @@ public class JDKClassDumpTestCase {
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 @@ public class JDKClassDumpTestCase {
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 17a24a1c..7287d471 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 @@ public class JdkGenericDumpTestCase {
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 @@ public class JdkGenericDumpTestCase {
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 51770652..e256a1da 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 class ClassPathRepositoryTestCase {
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);
+ }
}
}