diff --git a/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/ModernizerMojo.java b/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/ModernizerMojo.java index eedaf9c..8b06af0 100644 --- a/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/ModernizerMojo.java +++ b/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/ModernizerMojo.java @@ -401,8 +401,7 @@ private long recurseFiles(Path path) throws IOException { count += recurseFiles(path.resolve(child)); } } else if (path.toString().endsWith(".class")) { - InputStream is = Files.newInputStream(path); - try { + try (InputStream is = Files.newInputStream(path)) { Collection occurrences = modernizer.check(is); for (ViolationOccurrence occurrence : occurrences) { @@ -421,8 +420,6 @@ private long recurseFiles(Path path) throws IOException { outputEntries.add(new OutputEntry(name, occurrence)); ++count; } - } finally { - Utils.closeQuietly(is); } } return count; diff --git a/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/SuppressGeneratedAnnotationDetector.java b/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/SuppressGeneratedAnnotationDetector.java index 8cca077..01acf79 100644 --- a/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/SuppressGeneratedAnnotationDetector.java +++ b/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/SuppressGeneratedAnnotationDetector.java @@ -80,12 +80,8 @@ private void detectInternal(Path path) throws IOException { detectInternal(path.resolve(child)); } } else if (path.toString().endsWith(".class")) { - InputStream inputStream = null; - try { - inputStream = Files.newInputStream(path); + try (InputStream inputStream = Files.newInputStream(path)) { detectInternal(new ClassReader(inputStream)); - } finally { - Utils.closeQuietly(inputStream); } } } diff --git a/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/SuppressModernizerAnnotationDetector.java b/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/SuppressModernizerAnnotationDetector.java index 093db1f..a1474c9 100644 --- a/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/SuppressModernizerAnnotationDetector.java +++ b/modernizer-maven-plugin/src/main/java/org/gaul/modernizer_maven_plugin/SuppressModernizerAnnotationDetector.java @@ -93,12 +93,8 @@ private void detectInternal(Path path) throws IOException { detectInternal(path.resolve(child)); } } else if (path.toString().endsWith(".class")) { - InputStream inputStream = null; - try { - inputStream = Files.newInputStream(path); + try (InputStream inputStream = Files.newInputStream(path)) { detectInternal(new ClassReader(inputStream)); - } finally { - Utils.closeQuietly(inputStream); } } } diff --git a/modernizer-maven-plugin/src/test/java/org/gaul/modernizer_maven_plugin/ModernizerTest.java b/modernizer-maven-plugin/src/test/java/org/gaul/modernizer_maven_plugin/ModernizerTest.java index 6a9b163..bc87b55 100644 --- a/modernizer-maven-plugin/src/test/java/org/gaul/modernizer_maven_plugin/ModernizerTest.java +++ b/modernizer-maven-plugin/src/test/java/org/gaul/modernizer_maven_plugin/ModernizerTest.java @@ -127,24 +127,18 @@ public final class ModernizerTest { @Before public void setUp() throws Exception { - InputStream is = Modernizer.class.getResourceAsStream( - "/modernizer.xml"); - try { + try (InputStream is = Modernizer.class.getResourceAsStream( + "/modernizer.xml")) { violations = Modernizer.parseFromXml(is); - } finally { - Utils.closeQuietly(is); } } @Test public void readsOldJavaVersionFormat() throws Exception { - InputStream is = Modernizer.class.getResourceAsStream( - "/modernizer-old-versions.xml"); - try { + try (InputStream is = Modernizer.class.getResourceAsStream( + "/modernizer-old-versions.xml")) { Map old = Modernizer.parseFromXml(is); assertThat(old).hasSize(1); - } finally { - Utils.closeQuietly(is); } }