From 66929239f5e318b415b03455fb4192640a6798c9 Mon Sep 17 00:00:00 2001 From: joshinii Date: Tue, 28 Jul 2026 18:30:54 -0700 Subject: [PATCH 1/2] Wrap the BufferedReader in try-with-resources so it is closed even if parse() throws. StringReader.close() is currently a no-op, but this is to keep the method consistent with the rest of the codebase. Fixes #1996 --- .../aether/internal/test/util/DependencyGraphParser.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java index b4c060fb2..492bf3bf6 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java +++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java @@ -131,10 +131,9 @@ public DependencyGraphParser() { * Parse the given graph definition. */ public DependencyNode parseLiteral(String dependencyGraph) throws IOException { - BufferedReader reader = new BufferedReader(new StringReader(dependencyGraph)); - DependencyNode node = parse(reader); - reader.close(); - return node; + try (BufferedReader reader = new BufferedReader(new StringReader(dependencyGraph))) { + return parse(reader); + } } /** From 34428516f65e52087023e17edd9831042646b40e Mon Sep 17 00:00:00 2001 From: joshinii Date: Tue, 28 Jul 2026 19:03:23 -0700 Subject: [PATCH 2/2] Also use try-with-resources in parse(URL) for consistency Reviewer follow-up: this method wraps a real InputStreamReader and was still using the old try-finally-catch pattern with a swallowed IOException. --- .../internal/test/util/DependencyGraphParser.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java index 492bf3bf6..96e95e751 100644 --- a/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java +++ b/maven-resolver-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java @@ -172,19 +172,9 @@ public List parseMultiResource(String resource) throws IOExcepti * Parse the graph definition read from the given URL. */ public DependencyNode parse(URL resource) throws IOException { - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8)); + try (BufferedReader reader = + new BufferedReader(new InputStreamReader(resource.openStream(), StandardCharsets.UTF_8))) { return parse(reader); - } finally { - try { - if (reader != null) { - reader.close(); - reader = null; - } - } catch (final IOException e) { - // Suppressed due to an exception already thrown in the try block. - } } }