More warnings removal

FasterXML · May 16, 2024 · 0c7a329 · 0c7a329
1 parent 3bbb531
commit 0c7a329
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 66 deletions.
diff --git a/src/test/java/com/fasterxml/jackson/core/read/ArrayParsingTest.java b/src/test/java/com/fasterxml/jackson/core/read/ArrayParsingTest.java
@@ -123,56 +123,52 @@ private void _testMissingValueByEnablingFeature(boolean useStream) throws Except
         JsonFactory f = JsonFactory.builder()
                 .enable(JsonReadFeature.ALLOW_MISSING_VALUES)
                 .build();
-        JsonParser jp = useStream ? createParserUsingStream(f, DOC, "UTF-8")
-   			          : createParserUsingReader(f, DOC);
-
-        assertToken(JsonToken.START_ARRAY, jp.nextToken());
-        assertToken(JsonToken.VALUE_STRING, jp.nextToken());
-        assertEquals("a", jp.getValueAsString());
-
-        assertToken(JsonToken.VALUE_NULL, jp.nextToken());
-        assertToken(JsonToken.VALUE_NULL, jp.nextToken());
-        assertToken(JsonToken.VALUE_NULL, jp.nextToken());
-        assertToken(JsonToken.VALUE_STRING, jp.nextToken());
-        assertToken(JsonToken.VALUE_NULL, jp.nextToken());
-        assertToken(JsonToken.END_ARRAY, jp.nextToken());
-        assertNull(jp.nextToken());
-
-        jp.close();
+        try (JsonParser jp = useStream ? createParserUsingStream(f, DOC, "UTF-8")
+                : createParserUsingReader(f, DOC)) {
+            assertToken(JsonToken.START_ARRAY, jp.nextToken());
+            assertToken(JsonToken.VALUE_STRING, jp.nextToken());
+            assertEquals("a", jp.getValueAsString());
+
+            assertToken(JsonToken.VALUE_NULL, jp.nextToken());
+            assertToken(JsonToken.VALUE_NULL, jp.nextToken());
+            assertToken(JsonToken.VALUE_NULL, jp.nextToken());
+            assertToken(JsonToken.VALUE_STRING, jp.nextToken());
+            assertToken(JsonToken.VALUE_NULL, jp.nextToken());
+            assertToken(JsonToken.END_ARRAY, jp.nextToken());
+            assertNull(jp.nextToken());
+        }
 
         // And another take
         DOC = "[,] ";
-        jp = useStream ? createParserUsingStream(f, DOC, "UTF-8")
-                : createParserUsingReader(f, DOC);
 
-        assertToken(JsonToken.START_ARRAY, jp.nextToken());
-        assertToken(JsonToken.VALUE_NULL, jp.nextToken());
-        assertToken(JsonToken.VALUE_NULL, jp.nextToken());
-        assertToken(JsonToken.END_ARRAY, jp.nextToken());
-        assertNull(jp.nextToken());
-
-        jp.close();
+        try (JsonParser jp = useStream ? createParserUsingStream(f, DOC, "UTF-8")
+                : createParserUsingReader(f, DOC)) {
+            assertToken(JsonToken.START_ARRAY, jp.nextToken());
+            assertToken(JsonToken.VALUE_NULL, jp.nextToken());
+            assertToken(JsonToken.VALUE_NULL, jp.nextToken());
+            assertToken(JsonToken.END_ARRAY, jp.nextToken());
+            assertNull(jp.nextToken());
+        }
     }
 
     private void _testMissingValueNotEnablingFeature(boolean useStream) throws Exception {
-    	final String DOC = "[ \"a\",,\"abc\"] ";
-
-    	JsonFactory f = new JsonFactory();
-
-        JsonParser jp = useStream ? createParserUsingStream(f, DOC, "UTF-8")
-   			          : createParserUsingReader(f, DOC);
-
-        assertToken(JsonToken.START_ARRAY, jp.nextToken());
-        assertToken(JsonToken.VALUE_STRING, jp.nextToken());
-        assertEquals("a", jp.getValueAsString());
-        try {
-	        assertToken(JsonToken.VALUE_STRING, jp.nextToken());
-	        fail("Expecting exception here");
+        final String DOC = "[ \"a\",,\"abc\"] ";
+
+        JsonFactory f = new JsonFactory();
+
+        try (JsonParser jp = useStream ? createParserUsingStream(f, DOC, "UTF-8")
+                : createParserUsingReader(f, DOC)) {
+            assertToken(JsonToken.START_ARRAY, jp.nextToken());
+            assertToken(JsonToken.VALUE_STRING, jp.nextToken());
+            assertEquals("a", jp.getValueAsString());
+            try {
+                assertToken(JsonToken.VALUE_STRING, jp.nextToken());
+                fail("Expecting exception here");
+            }
+            catch(JsonParseException ex) {
+                verifyException(ex, "expected a valid value", "expected a value");
+            }
         }
-        catch(JsonParseException ex){
-        	verifyException(ex, "expected a valid value", "expected a value");
-        }
-        jp.close();
     }
 
     private void _testNotMissingValueByEnablingFeature(boolean useStream) throws Exception {
@@ -181,16 +177,14 @@ private void _testNotMissingValueByEnablingFeature(boolean useStream) throws Exc
         JsonFactory f = JsonFactory.builder()
                 .enable(JsonReadFeature.ALLOW_MISSING_VALUES)
                 .build();
-        JsonParser jp = useStream ? createParserUsingStream(f, DOC, "UTF-8")
-   			          : createParserUsingReader(f, DOC);
-
-        assertToken(JsonToken.START_ARRAY, jp.nextToken());
-        assertToken(JsonToken.VALUE_STRING, jp.nextToken());
-        assertEquals("a", jp.getValueAsString());
-
-        assertToken(JsonToken.VALUE_STRING, jp.nextToken());
-        assertToken(JsonToken.END_ARRAY, jp.nextToken());
-
-        jp.close();
+        try (JsonParser jp = useStream ? createParserUsingStream(f, DOC, "UTF-8")
+                : createParserUsingReader(f, DOC)) {
+            assertToken(JsonToken.START_ARRAY, jp.nextToken());
+            assertToken(JsonToken.VALUE_STRING, jp.nextToken());
+            assertEquals("a", jp.getValueAsString());
+
+            assertToken(JsonToken.VALUE_STRING, jp.nextToken());
+            assertToken(JsonToken.END_ARRAY, jp.nextToken());
+        }
     }
 }
diff --git a/src/test/java/com/fasterxml/jackson/core/util/ByteArrayBuilderTest.java b/src/test/java/com/fasterxml/jackson/core/util/ByteArrayBuilderTest.java
@@ -47,23 +47,24 @@ void bufferRecyclerReuse() throws Exception
                 // need to link with some pool
                 .withPool(JsonRecyclerPools.newBoundedPool(3));
 
-        ByteArrayBuilder bab = new ByteArrayBuilder(br, 20);
-        assertSame(br, bab.bufferRecycler());
+        try (ByteArrayBuilder bab = new ByteArrayBuilder(br, 20)) {
+            assertSame(br, bab.bufferRecycler());
 
-        JsonGenerator g = f.createGenerator(bab);
-        IOContext ioCtxt = ((GeneratorBase) g).ioContext();
-        assertSame(br, ioCtxt.bufferRecycler());
-        assertTrue(ioCtxt.bufferRecycler().isLinkedWithPool());
+            try (JsonGenerator g = f.createGenerator(bab)) {
+                IOContext ioCtxt = ((GeneratorBase) g).ioContext();
+                assertSame(br, ioCtxt.bufferRecycler());
+                assertTrue(ioCtxt.bufferRecycler().isLinkedWithPool());
 
-        g.writeStartArray();
-        g.writeEndArray();
-        g.close();
+                g.writeStartArray();
+                g.writeEndArray();
+            }
 
-        // Generator.close() should NOT release buffer recycler
-        assertTrue(br.isLinkedWithPool());
+            // Generator.close() should NOT release buffer recycler
+            assertTrue(br.isLinkedWithPool());
 
-        byte[] result = bab.getClearAndRelease();
-        assertEquals("[]", new String(result, StandardCharsets.UTF_8));
+            byte[] result = bab.getClearAndRelease();
+            assertEquals("[]", new String(result, StandardCharsets.UTF_8));
+        }
         // Nor accessing contents
         assertTrue(br.isLinkedWithPool());