Warnings clean up

FasterXML · Feb 10, 2024 · 85ed0e2 · 85ed0e2
1 parent 25f512b
commit 85ed0e2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/...notation-support/src/test/java/com/fasterxml/jackson/jr/annotationsupport/ASTestBase.java b/...notation-support/src/test/java/com/fasterxml/jackson/jr/annotationsupport/ASTestBase.java
@@ -2,9 +2,6 @@
 
 import java.util.Arrays;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
 import com.fasterxml.jackson.jr.ob.JSON;
 
 import junit.framework.TestCase;

diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/JSONObjectException.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/JSONObjectException.java
@@ -160,14 +160,14 @@ public JSONObjectException(String msg, JsonLocation loc, Throwable rootCause) {
     }
 
     public static JSONObjectException from(JsonParser p, String msg) {
-        return new JSONObjectException(msg, ((p == null) ? null : p.getTokenLocation()));
+        return new JSONObjectException(msg, ((p == null) ? null : p.currentTokenLocation()));
     }
 
     public static JSONObjectException from(JsonParser p, String msg, Object... args) {
         if (args.length > 0) {
             msg = String.format(msg, args);
         }
-        return new JSONObjectException(msg, ((p == null) ? null : p.getTokenLocation()));
+        return new JSONObjectException(msg, ((p == null) ? null : p.currentTokenLocation()));
     }
 
     public static JSONObjectException from(JsonParser p, Throwable problem,
@@ -176,7 +176,7 @@ public static JSONObjectException from(JsonParser p, Throwable problem,
         if (args.length > 0) {
             msg = String.format(msg, args);
         }
-        return new JSONObjectException(msg, ((p == null) ? null : p.getTokenLocation()), problem);
+        return new JSONObjectException(msg, ((p == null) ? null : p.currentTokenLocation()), problem);
     }
 
     /**

diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/ValueIterator.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/ValueIterator.java
@@ -366,9 +366,19 @@ public JsonParser getParser() {
      *</code>
      * 
      * @return Location of the input stream of the underlying parser
+     *
+     * @since 2.17
      */
+    public JsonLocation currentLocation() {
+        return _parser.currentLocation();
+    }
+
+    /**
+     * @deprecated Since 2.17 use {@link #currentLocation()} instead
+     */
+    @Deprecated
     public JsonLocation getCurrentLocation() {
-        return _parser.getCurrentLocation();
+        return currentLocation();
     }
 
     /*

diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/api/ValueReader.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/api/ValueReader.java
@@ -99,7 +99,7 @@ public static String _tokenDesc(JsonParser p, JsonToken t) throws IOException {
         }
         switch (t) {
         case FIELD_NAME:
-            return "JSON Field name '"+p.getCurrentName()+"'";
+            return "JSON Field name '"+p.currentName()+"'";
         case START_ARRAY:
             return "JSON Array";
         case START_OBJECT:

diff --git a/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/AnyReader.java b/jr-objects/src/main/java/com/fasterxml/jackson/jr/ob/impl/AnyReader.java
@@ -95,7 +95,7 @@ public Map<String, Object> readFromObject(JSONReader r, JsonParser p, MapBuilder
             return b.emptyMap();
         }
         // and another for singletons...
-        String key = fromKey(p.getCurrentName());
+        String key = fromKey(p.currentName());
         Object value = read(r, p);
 
         if (p.nextValue() == JsonToken.END_OBJECT) {
@@ -106,7 +106,7 @@ public Map<String, Object> readFromObject(JSONReader r, JsonParser p, MapBuilder
         try {
             b = b.start().put(key, value);
             do {
-                b = b.put(fromKey(p.getCurrentName()), read(r, p));
+                b = b.put(fromKey(p.currentName()), read(r, p));
             } while (p.nextValue() != JsonToken.END_OBJECT);
         } catch (IllegalArgumentException e) {
             throw JSONObjectException.from(p, e.getMessage());

diff --git a/jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/ReadSequencesTest.java b/jr-objects/src/test/java/com/fasterxml/jackson/jr/ob/ReadSequencesTest.java
@@ -26,7 +26,7 @@ public void testAnySequence() throws Exception
         // First, managed
         ValueIterator<Object> it = JSON.std.anySequenceFrom(INPUT);
         assertNotNull(it.getParser());
-        assertNotNull(it.getCurrentLocation());
+        assertNotNull(it.currentLocation());
 
         _verifyAnySequence(it);
         it.close();