From 769a4c4a42654f5bb459b5b5acb2e505d492d66b Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Wed, 29 Nov 2023 20:08:34 -0800
Subject: [PATCH] Warnings cleanup

---
 .../jackson/dataformat/csv/CsvSchema.java     |  8 +++----
 .../javaprop/dos/DeepNestParserTest.java      | 23 +++++++------------
 .../jackson/dataformat/toml/ParserTest.java   |  1 -
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvSchema.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvSchema.java
index 2f49df0a..b959f52b 100644
--- a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvSchema.java
+++ b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvSchema.java
@@ -910,7 +910,7 @@ public CsvSchema(Column[] columns, int features,
         if (_columns.length == 0) {
             _columnsByName = Collections.emptyMap();
         } else {
-            _columnsByName = new LinkedHashMap<String,Column>(4 + _columns.length);
+            _columnsByName = new LinkedHashMap<>(4 + _columns.length);
             for (Column c : _columns) {
                 _columnsByName.put(c.getName(), c);
             }
@@ -959,7 +959,7 @@ protected CsvSchema(CsvSchema base, Column[] columns)
         if (_columns.length == 0) {
             _columnsByName = Collections.emptyMap();
         } else {
-            _columnsByName = new LinkedHashMap<String,Column>(4 + _columns.length);
+            _columnsByName = new LinkedHashMap<>(4 + _columns.length);
             for (Column c : _columns) {
                 _columnsByName.put(c.getName(), c);
             }
@@ -1267,7 +1267,7 @@ public CsvSchema withAnyPropertyName(String name) {
      */
     public CsvSchema sortedBy(String... columnNames)
     {
-        LinkedHashMap<String,Column> map = new LinkedHashMap<String,Column>();
+        LinkedHashMap<String,Column> map = new LinkedHashMap<>();
         for (String colName : columnNames) {
             Column col = _columnsByName.get(colName);
             if (col != null) {
@@ -1287,7 +1287,7 @@ public CsvSchema sortedBy(String... columnNames)
      * @since 2.4
      */
     public CsvSchema sortedBy(Comparator<String> cmp) {
-        TreeMap<String,Column> map = new TreeMap<String,Column>(cmp);
+        TreeMap<String,Column> map = new TreeMap<>(cmp);
         for (Column col : _columns) {
             map.put(col.getName(), col);
         }
diff --git a/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/dos/DeepNestParserTest.java b/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/dos/DeepNestParserTest.java
index 6cd5ded7..7b63d5dc 100644
--- a/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/dos/DeepNestParserTest.java
+++ b/properties/src/test/java/com/fasterxml/jackson/dataformat/javaprop/dos/DeepNestParserTest.java
@@ -1,26 +1,22 @@
 package com.fasterxml.jackson.dataformat.javaprop.dos;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.StreamReadConstraints;
 import com.fasterxml.jackson.core.exc.StreamConstraintsException;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
+
 import com.fasterxml.jackson.dataformat.javaprop.JavaPropsFactory;
 import com.fasterxml.jackson.dataformat.javaprop.ModuleTestBase;
 
-import java.io.IOException;
-
 public class DeepNestParserTest extends ModuleTestBase {
 
-    public void testDeeplyNestedData() throws IOException {
+    public void testDeeplyNestedData() throws Exception {
         final int depth = 1500;
         final String doc = genDeeplyNestedData(depth);
         final ObjectMapper mapper = newPropertiesMapper();
-        try (JsonParser jp = mapper.createParser(doc)) {
-            JsonToken jt;
-            while ((jt = jp.nextToken()) != null) {
-
-            }
+        try (JsonParser p = mapper.createParser(doc)) {
+            while (p.nextToken() != null) { }
             fail("expected StreamConstraintsException");
         } catch (StreamConstraintsException e) {
             String exceptionPrefix = String.format("Document nesting depth (%d) exceeds the maximum allowed",
@@ -30,18 +26,15 @@ public void testDeeplyNestedData() throws IOException {
         }
     }
 
-    public void testDeeplyNestedDataWithUnconstrainedMapper() throws IOException {
+    public void testDeeplyNestedDataWithUnconstrainedMapper() throws Exception {
         final int depth = 1500;
         final String doc = genDeeplyNestedData(depth);
         final JavaPropsFactory factory = JavaPropsFactory.builder()
                 .streamReadConstraints(StreamReadConstraints.builder().maxNestingDepth(Integer.MAX_VALUE).build())
                 .build();
         final ObjectMapper mapper = propertiesMapperBuilder(factory).build();
-        try (JsonParser jp = mapper.createParser(doc)) {
-            JsonToken jt;
-            while ((jt = jp.nextToken()) != null) {
-
-            }
+        try (JsonParser p = mapper.createParser(doc)) {
+            while (p.nextToken() != null) { }
         }
     }
 
diff --git a/toml/src/test/java/com/fasterxml/jackson/dataformat/toml/ParserTest.java b/toml/src/test/java/com/fasterxml/jackson/dataformat/toml/ParserTest.java
index 6cc9e2ca..be40136c 100644
--- a/toml/src/test/java/com/fasterxml/jackson/dataformat/toml/ParserTest.java
+++ b/toml/src/test/java/com/fasterxml/jackson/dataformat/toml/ParserTest.java
@@ -22,7 +22,6 @@
 import java.time.OffsetDateTime;
 import java.util.Arrays;
 
-@SuppressWarnings("OctalInteger")
 public class ParserTest extends TomlMapperTestBase {
     private static final ObjectMapper TOML_MAPPER = newTomlMapper();
     private static final ObjectMapper jsonMapper = JsonMapper.builder()