More warnings removal (3.0-proofing)

cowtowncoder · cowtowncoder · commit 388b7dc6782c · 2023-12-05T19:30:00.000-08:00
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -6,6 +6,8 @@ Project: jackson-databind
 
 2.17.0 (not yet released)
 
+#4160: Deprecate `DefaultTyping.EVERYTHING` in `2.x` and remove in `3.0`
+ (contributed by Joo-Hyuk K)
 #4194: Add `JsonNodeFeature.FAIL_ON_NAN_TO_BIG_DECIMAL_COERCION` option to
   fail on attempting to coerce `NaN` into `BigDecimal`
  (contributed by Joo-Hyuk K)
diff --git a/src/main/java/com/fasterxml/jackson/databind/JsonMappingException.java b/src/main/java/com/fasterxml/jackson/databind/JsonMappingException.java
@@ -236,7 +236,7 @@ public JsonMappingException(Closeable processor, String msg) {
             // 17-Aug-2015, tatu: Use of token location makes some sense from databinding,
             //   since actual parsing (current) location is typically only needed for low-level
             //   parsing exceptions.
-            _location = ((JsonParser) processor).getTokenLocation();
+            _location = ((JsonParser) processor).currentTokenLocation();
         }
     }
 
@@ -250,7 +250,7 @@ public JsonMappingException(Closeable processor, String msg, Throwable problem)
         if (problem instanceof JacksonException) {
             _location = ((JacksonException) problem).getLocation();
         } else if (processor instanceof JsonParser) {
-            _location = ((JsonParser) processor).getTokenLocation();
+            _location = ((JsonParser) processor).currentTokenLocation();
         }
     }
 
diff --git a/src/main/java/com/fasterxml/jackson/databind/MappingIterator.java b/src/main/java/com/fasterxml/jackson/databind/MappingIterator.java
@@ -376,7 +376,7 @@ public FormatSchema getParserSchema() {
      * @since 2.2.1
      */
     public JsonLocation getCurrentLocation() {
-        return _parser.getCurrentLocation();
+        return _parser.currentLocation();
     }
 
     /*
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/AbstractDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/AbstractDeserializer.java
@@ -331,7 +331,7 @@ protected Object _deserializeFromObjectId(JsonParser p, DeserializationContext c
         Object pojo = roid.resolve();
         if (pojo == null) { // not yet; should wait...
             throw new UnresolvedForwardReference(p,
-                    "Could not resolve Object Id ["+id+"] -- unresolved forward-reference?", p.getCurrentLocation(), roid);
+                    "Could not resolve Object Id ["+id+"] -- unresolved forward-reference?", p.currentLocation(), roid);
         }
         return pojo;
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializer.java
@@ -233,7 +233,7 @@ protected final Object _deserializeOther(JsonParser p, DeserializationContext ct
     public Object deserialize(JsonParser p, DeserializationContext ctxt, Object bean) throws IOException
     {
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        p.setCurrentValue(bean);
+        p.assignCurrentValue(bean);
         if (_injectables != null) {
             injectValues(ctxt, bean);
         }
@@ -299,7 +299,7 @@ private final Object vanillaDeserialize(JsonParser p,
         if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)) {
             // [databind#631]: Assign current value, to be accessible by custom serializers
             // [databind#4184]: but only if we have at least one property
-            p.setCurrentValue(bean);
+            p.assignCurrentValue(bean);
             String propName = p.currentName();
             do {
                 p.nextToken();
@@ -362,7 +362,7 @@ public Object deserializeFromObject(JsonParser p, DeserializationContext ctxt) t
         }
         final Object bean = _valueInstantiator.createUsingDefault(ctxt);
         // [databind#631]: Assign current value, to be accessible by custom deserializers
-        p.setCurrentValue(bean);
+        p.assignCurrentValue(bean);
         if (p.canReadObjectId()) {
             Object id = p.getObjectId();
             if (id != null) {
@@ -451,7 +451,7 @@ protected Object _deserializeUsingPropertyBased(final JsonParser p, final Deseri
                                 _creatorReturnedNullException());
                     }
                     // [databind#631]: Assign current value, to be accessible by custom serializers
-                    p.setCurrentValue(bean);
+                    p.assignCurrentValue(bean);
 
                     //  polymorphic?
                     if (bean.getClass() != _beanType.getRawClass()) {
@@ -713,7 +713,7 @@ protected Object deserializeWithUnwrapped(JsonParser p, DeserializationContext c
         final Object bean = _valueInstantiator.createUsingDefault(ctxt);
 
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        p.setCurrentValue(bean);
+        p.assignCurrentValue(bean);
 
         if (_injectables != null) {
             injectValues(ctxt, bean);
@@ -860,7 +860,7 @@ protected Object deserializeUsingPropertyBasedWithUnwrapped(JsonParser p, Deseri
                         bean = wrapInstantiationProblem(e, ctxt);
                     }
                     // [databind#631]: Assign current value, to be accessible by custom serializers
-                    p.setCurrentValue(bean);
+                    p.assignCurrentValue(bean);
                     // if so, need to copy all remaining tokens into buffer
                     while (t == JsonToken.FIELD_NAME) {
                         // NOTE: do NOT skip name as it needs to be copied; `copyCurrentStructure` does that
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java b/src/main/java/com/fasterxml/jackson/databind/deser/BeanDeserializerBase.java
@@ -1472,7 +1472,7 @@ protected Object deserializeFromObjectId(JsonParser p, DeserializationContext ct
         if (pojo == null) { // not yet; should wait...
             throw new UnresolvedForwardReference(p,
                     "Could not resolve Object Id ["+id+"] (for "+_beanType+").",
-                    p.getCurrentLocation(), roid);
+                    p.currentLocation(), roid);
         }
         return pojo;
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/impl/BeanAsArrayDeserializer.java
@@ -109,7 +109,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt)
         }
         final Object bean = _valueInstantiator.createUsingDefault(ctxt);
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        p.setCurrentValue(bean);
+        p.assignCurrentValue(bean);
 
         final SettableBeanProperty[] props = _orderedProperties;
         int i = 0;
@@ -152,7 +152,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt, Object bean
         throws IOException
     {
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        p.setCurrentValue(bean);
+        p.assignCurrentValue(bean);
 
         if (!p.isExpectedStartArrayToken()) {
             return _deserializeFromNonArray(p, ctxt);
@@ -227,7 +227,7 @@ protected Object _deserializeNonVanilla(JsonParser p, DeserializationContext ctx
         }
         final Object bean = _valueInstantiator.createUsingDefault(ctxt);
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        p.setCurrentValue(bean);
+        p.assignCurrentValue(bean);
         if (_injectables != null) {
             injectValues(ctxt, bean);
         }
@@ -330,7 +330,7 @@ protected final Object _deserializeUsingPropertyBased(final JsonParser p, final
                         continue; // never gets here
                     }
                     // [databind#631]: Assign current value, to be accessible by custom serializers
-                    p.setCurrentValue(bean);
+                    p.assignCurrentValue(bean);
 
                     //  polymorphic?
                     if (bean.getClass() != _beanType.getRawClass()) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/CollectionDeserializer.java
@@ -338,7 +338,7 @@ protected Collection<Object> _deserializeFromArray(JsonParser p, Deserialization
         throws IOException
     {
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        p.setCurrentValue(result);
+        p.assignCurrentValue(result);
 
         JsonDeserializer<Object> valueDes = _valueDeserializer;
         // Let's offline handling of values with Object Ids (simplifies code here)
@@ -433,7 +433,7 @@ protected Collection<Object> _deserializeWithObjectId(JsonParser p, Deserializat
             return handleNonArray(p, ctxt, result);
         }
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        p.setCurrentValue(result);
+        p.assignCurrentValue(result);
 
         final JsonDeserializer<Object> valueDes = _valueDeserializer;
         final TypeDeserializer typeDeser = _valueTypeDeserializer;
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/EnumMapDeserializer.java
@@ -267,7 +267,7 @@ public EnumMap<?,?> deserialize(JsonParser p, DeserializationContext ctxt,
         throws IOException
     {
         // [databind#631]: Assign current value, to be accessible by custom deserializers
-        p.setCurrentValue(result);
+        p.assignCurrentValue(result);
 
         final JsonDeserializer<Object> valueDes = _valueDeserializer;
         final TypeDeserializer typeDeser = _valueTypeDeserializer;
diff --git a/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java b/src/main/java/com/fasterxml/jackson/databind/deser/std/MapDeserializer.java
@@ -467,7 +467,7 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt,
         throws IOException
     {
         // [databind#631]: Assign current value, to be accessible by custom deserializers
-        p.setCurrentValue(result);
+        p.assignCurrentValue(result);
 
         // Ok: must point to START_OBJECT or FIELD_NAME
         JsonToken t = p.currentToken();
diff --git a/src/main/java/com/fasterxml/jackson/databind/exc/IgnoredPropertyException.java b/src/main/java/com/fasterxml/jackson/databind/exc/IgnoredPropertyException.java
@@ -62,7 +62,7 @@ public static IgnoredPropertyException from(JsonParser p,
         String msg = String.format("Ignored field \"%s\" (class %s) encountered; mapper configured not to allow this",
                 propertyName, ref.getName());
         IgnoredPropertyException e = new IgnoredPropertyException(p, msg,
-                p.getCurrentLocation(), ref, propertyName, propertyIds);
+                p.currentLocation(), ref, propertyName, propertyIds);
         // but let's also ensure path includes this last (missing) segment
         e.prependPath(fromObjectOrClass, propertyName);
         return e;
diff --git a/src/main/java/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.java b/src/main/java/com/fasterxml/jackson/databind/exc/UnrecognizedPropertyException.java
@@ -58,7 +58,7 @@ public static UnrecognizedPropertyException from(JsonParser p,
         String msg = String.format("Unrecognized field \"%s\" (class %s), not marked as ignorable",
                 propertyName, ref.getName());
         UnrecognizedPropertyException e = new UnrecognizedPropertyException(p, msg,
-                p.getCurrentLocation(), ref, propertyName, propertyIds);
+                p.currentLocation(), ref, propertyName, propertyIds);
         // but let's also ensure path includes this last (missing) segment
         e.prependPath(fromObjectOrClass, propertyName);
         return e;
diff --git a/src/main/java/com/fasterxml/jackson/databind/node/TreeTraversingParser.java b/src/main/java/com/fasterxml/jackson/databind/node/TreeTraversingParser.java
@@ -176,15 +176,23 @@ public JsonStreamContext getParsingContext() {
     }
 
     @Override
-    public JsonLocation getTokenLocation() {
+    public JsonLocation currentLocation() {
         return JsonLocation.NA;
     }
 
     @Override
-    public JsonLocation getCurrentLocation() {
+    public JsonLocation currentTokenLocation() {
         return JsonLocation.NA;
     }
 
+    @Deprecated // since 2.17
+    @Override
+    public JsonLocation getTokenLocation() { return currentTokenLocation(); }
+
+    @Deprecated // since 2.17
+    @Override
+    public JsonLocation getCurrentLocation() { return currentLocation(); }
+    
     /*
     /**********************************************************
     /* Public API, access to textual content
diff --git a/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java b/src/main/java/com/fasterxml/jackson/databind/util/TokenBuffer.java
@@ -299,7 +299,7 @@ public JsonParser asParser(JsonParser src)
     {
         Parser p = new Parser(_first, src.getCodec(), _hasNativeTypeIds, _hasNativeObjectIds,
                 _parentContext, src.streamReadConstraints());
-        p.setLocation(src.getTokenLocation());
+        p.setLocation(src.currentTokenLocation());
         return p;
     }
 
@@ -1692,13 +1692,21 @@ public String nextFieldName() throws IOException
         public JsonStreamContext getParsingContext() { return _parsingContext; }
 
         @Override
-        public JsonLocation getTokenLocation() { return getCurrentLocation(); }
-
-        @Override
-        public JsonLocation getCurrentLocation() {
+        public JsonLocation currentLocation() {
             return (_location == null) ? JsonLocation.NA : _location;
         }
 
+        @Override
+        public JsonLocation currentTokenLocation() { return currentLocation(); }
+
+        @Deprecated // since 2.17
+        @Override
+        public JsonLocation getTokenLocation() { return currentTokenLocation(); }
+
+        @Deprecated // since 2.17
+        @Override
+        public JsonLocation getCurrentLocation() { return currentLocation(); }
+
         @Override
         public String currentName() {
             // 25-Jun-2015, tatu: as per [databind#838], needs to be same as ParserBase
@@ -1709,9 +1717,6 @@ public String currentName() {
             return _parsingContext.getCurrentName();
         }
 
-        @Override // since 2.12 delegate to the new method
-        public String getCurrentName() { return currentName(); }
-
         @Override
         public void overrideCurrentName(String name)
         {
@@ -1729,6 +1734,10 @@ public void overrideCurrentName(String name)
             }
         }
 
+        @Deprecated // since 2.17
+        @Override
+        public String getCurrentName() { return currentName(); }
+
         /*
         /**********************************************************
         /* Public API, access to token information, text

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public JsonMappingException(Closeable processor, String msg) {`
`236`	`236`	`// 17-Aug-2015, tatu: Use of token location makes some sense from databinding,`
`237`	`237`	`// since actual parsing (current) location is typically only needed for low-level`
`238`	`238`	`// parsing exceptions.`
`239`		`- _location = ((JsonParser) processor).getTokenLocation();`
	`239`	`+ _location = ((JsonParser) processor).currentTokenLocation();`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`
`@@ -250,7 +250,7 @@ public JsonMappingException(Closeable processor, String msg, Throwable problem)`
`250`	`250`	`if (problem instanceof JacksonException) {`
`251`	`251`	`_location = ((JacksonException) problem).getLocation();`
`252`	`252`	`} else if (processor instanceof JsonParser) {`
`253`		`- _location = ((JsonParser) processor).getTokenLocation();`
	`253`	`+ _location = ((JsonParser) processor).currentTokenLocation();`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ public FormatSchema getParserSchema() {`
`376`	`376`	`* @since 2.2.1`
`377`	`377`	`*/`
`378`	`378`	`public JsonLocation getCurrentLocation() {`
`379`		`- return _parser.getCurrentLocation();`
	`379`	`+ return _parser.currentLocation();`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -331,7 +331,7 @@ protected Object _deserializeFromObjectId(JsonParser p, DeserializationContext c`
`331`	`331`	`Object pojo = roid.resolve();`
`332`	`332`	`if (pojo == null) { // not yet; should wait...`
`333`	`333`	`throw new UnresolvedForwardReference(p,`
`334`		`- "Could not resolve Object Id ["+id+"] -- unresolved forward-reference?", p.getCurrentLocation(), roid);`
	`334`	`+ "Could not resolve Object Id ["+id+"] -- unresolved forward-reference?", p.currentLocation(), roid);`
`335`	`335`	`}`
`336`	`336`	`return pojo;`
`337`	`337`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1472,7 +1472,7 @@ protected Object deserializeFromObjectId(JsonParser p, DeserializationContext ct`
`1472`	`1472`	`if (pojo == null) { // not yet; should wait...`
`1473`	`1473`	`throw new UnresolvedForwardReference(p,`
`1474`	`1474`	`"Could not resolve Object Id ["+id+"] (for "+_beanType+").",`
`1475`		`- p.getCurrentLocation(), roid);`
	`1475`	`+ p.currentLocation(), roid);`
`1476`	`1476`	`}`
`1477`	`1477`	`return pojo;`
`1478`	`1478`	`}`
Original file line number	Diff line number	Diff line change
`@@ -267,7 +267,7 @@ public EnumMap<?,?> deserialize(JsonParser p, DeserializationContext ctxt,`
`267`	`267`	`throws IOException`
`268`	`268`	`{`
`269`	`269`	`// [databind#631]: Assign current value, to be accessible by custom deserializers`
`270`		`- p.setCurrentValue(result);`
	`270`	`+ p.assignCurrentValue(result);`
`271`	`271`
`272`	`272`	`final JsonDeserializer<Object> valueDes = _valueDeserializer;`
`273`	`273`	`final TypeDeserializer typeDeser = _valueTypeDeserializer;`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ public Map<Object,Object> deserialize(JsonParser p, DeserializationContext ctxt,`
`467`	`467`	`throws IOException`
`468`	`468`	`{`
`469`	`469`	`// [databind#631]: Assign current value, to be accessible by custom deserializers`
`470`		`- p.setCurrentValue(result);`
	`470`	`+ p.assignCurrentValue(result);`
`471`	`471`
`472`	`472`	`// Ok: must point to START_OBJECT or FIELD_NAME`
`473`	`473`	`JsonToken t = p.currentToken();`