Add @SuppressWarnings("resource") in test as narrowly as possible

garydgregory · garydgregory · commit 236b0f4f84f1 · 2022-10-26T10:12:58.000-04:00
diff --git a/src/test/java/org/apache/commons/csv/CSVParserTest.java b/src/test/java/org/apache/commons/csv/CSVParserTest.java
@@ -905,8 +905,10 @@ public void testHeadersWithNullColumnName() throws IOException {
             final Iterator<CSVRecord> records = parser.iterator();
             final CSVRecord record = records.next();
             // Expect the null header to be missing
-            assertEquals(Arrays.asList("header1", "header3"), record.getParser().getHeaderNames());
-            assertEquals(2, record.getParser().getHeaderMap().size());
+            @SuppressWarnings("resource")
+            final CSVParser recordParser = record.getParser();
+            assertEquals(Arrays.asList("header1", "header3"), recordParser.getHeaderNames());
+            assertEquals(2, recordParser.getHeaderMap().size());
         }
     }
 
@@ -1132,7 +1134,8 @@ public void testParse() throws Exception {
         final CSVFormat format = CSVFormat.DEFAULT.withHeader("A", "B", "C", "D");
         final Charset charset = StandardCharsets.UTF_8;
 
-        try (final CSVParser parser = CSVParser.parse(new InputStreamReader(url.openStream(), charset), format)) {
+        try (@SuppressWarnings("resource") // CSVParser closes the input resource
+        final CSVParser parser = CSVParser.parse(new InputStreamReader(url.openStream(), charset), format)) {
             parseFully(parser);
         }
         try (final CSVParser parser = CSVParser.parse(new String(Files.readAllBytes(Paths.get(url.toURI())), charset), format)) {
@@ -1141,7 +1144,8 @@ public void testParse() throws Exception {
         try (final CSVParser parser = CSVParser.parse(new File(url.toURI()), charset, format)) {
             parseFully(parser);
         }
-        try (final CSVParser parser = CSVParser.parse(url.openStream(), charset, format)) {
+        try (@SuppressWarnings("resource") // CSVParser closes the input resource
+        final CSVParser parser = CSVParser.parse(url.openStream(), charset, format)) {
             parseFully(parser);
         }
         try (final CSVParser parser = CSVParser.parse(Paths.get(url.toURI()), charset, format)) {
@@ -1313,7 +1317,9 @@ public void testRepeatedHeadersAreReturnedInCSVRecordHeaderNames() throws IOExce
         try (final CSVParser parser = CSVFormat.DEFAULT.withFirstRecordAsHeader().withTrim().parse(in)) {
             final Iterator<CSVRecord> records = parser.iterator();
             final CSVRecord record = records.next();
-            assertEquals(Arrays.asList("header1", "header2", "header1"), record.getParser().getHeaderNames());
+            @SuppressWarnings("resource")
+            final CSVParser recordParser = record.getParser();
+            assertEquals(Arrays.asList("header1", "header2", "header1"), recordParser.getHeaderNames());
         }}
 
     @Test
