Moar warnings removal (3.0-proofing)

cowtowncoder · cowtowncoder · commit 992c0fa8294b · 2023-12-05T20:04:04.000-08:00
diff --git a/src/main/java/com/fasterxml/jackson/databind/node/TreeTraversingParser.java b/src/main/java/com/fasterxml/jackson/databind/node/TreeTraversingParser.java
@@ -152,14 +152,19 @@ public boolean isClosed() {
     /**********************************************************
      */
 
-    @Override public String getCurrentName() {
+    @Override
+    public String currentName() {
         NodeCursor crsr = _nodeCursor;
         if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
             crsr = crsr.getParent();
         }
         return (crsr == null) ? null : crsr.getCurrentName();
     }
 
+    @Deprecated // since 2.17
+    @Override
+    public String getCurrentName() { return currentName(); }
+
     @Override public void overrideCurrentName(String name) {
         NodeCursor crsr = _nodeCursor;
         if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializer.java
@@ -172,7 +172,7 @@ public final void serialize(Object bean, JsonGenerator gen, SerializerProvider p
         throws IOException
     {
         if (_objectIdWriter != null) {
-            gen.setCurrentValue(bean); // [databind#631]
+            gen.assignCurrentValue(bean); // [databind#631]
             _serializeWithObjectId(bean, gen, provider, true);
             return;
         }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.java
@@ -151,7 +151,7 @@ public void serializeWithType(Object bean, JsonGenerator gen,
         }
         WritableTypeId typeIdDef = _typeIdDef(typeSer, bean, JsonToken.START_ARRAY);
         typeSer.writeTypePrefix(gen, typeIdDef);
-        gen.setCurrentValue(bean);
+        gen.assignCurrentValue(bean);
         serializeAsArray(bean, gen, provider);
         typeSer.writeTypeSuffix(gen, typeIdDef);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java
@@ -85,7 +85,7 @@ public void serializeWithType(List<String> value, JsonGenerator g, SerializerPro
     {
         WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
                 typeSer.typeId(value, JsonToken.START_ARRAY));
-        g.setCurrentValue(value);
+        g.assignCurrentValue(value);
         serializeContents(value, g, provider, value.size());
         typeSer.writeTypeSuffix(g, typeIdDef);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.java
@@ -345,7 +345,7 @@ public void serializeWithType(Map.Entry<?, ?> value, JsonGenerator g,
             SerializerProvider provider, TypeSerializer typeSer) throws IOException
     {
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        g.setCurrentValue(value);
+        g.assignCurrentValue(value);
         WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
                 typeSer.typeId(value, JsonToken.START_OBJECT));
         serializeDynamic(value, g, provider);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java
@@ -88,7 +88,7 @@ public void serializeWithType(Collection<String> value, JsonGenerator g,
     {
         WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
                 typeSer.typeId(value, JsonToken.START_ARRAY));
-        g.setCurrentValue(value);
+        g.assignCurrentValue(value);
         serializeContents(value, g, provider);
         typeSer.writeTypeSuffix(g, typeIdDef);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.java
@@ -127,7 +127,7 @@ protected BeanSerializerBase asArraySerializer() {
     @Override
     public final void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) throws IOException
     {
-        gen.setCurrentValue(bean); // [databind#631]
+        gen.assignCurrentValue(bean); // [databind#631]
         if (_objectIdWriter != null) {
             _serializeWithObjectId(bean, gen, provider, false);
             return;
@@ -147,7 +147,7 @@ public void serializeWithType(Object bean, JsonGenerator gen, SerializerProvider
             provider.reportBadDefinition(handledType(),
                     "Unwrapped property requires use of type information: cannot serialize without disabling `SerializationFeature.FAIL_ON_UNWRAPPED_TYPE_IDENTIFIERS`");
         }
-        gen.setCurrentValue(bean); // [databind#631]
+        gen.assignCurrentValue(bean); // [databind#631]
         if (_objectIdWriter != null) {
             _serializeWithObjectId(bean, gen, provider, typeSer);
             return;
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.java
@@ -134,7 +134,7 @@ public final void serializeWithType(T value, JsonGenerator g, SerializerProvider
         WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
                 typeSer.typeId(value, JsonToken.START_ARRAY));
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        g.setCurrentValue(value);
+        g.assignCurrentValue(value);
         serializeContents(value, g, provider);
         typeSer.writeTypeSuffix(g, typeIdDef);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java
@@ -262,7 +262,7 @@ public void serializeWithType(T value, JsonGenerator g, SerializerProvider provi
         WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
                 typeSer.typeId(value, JsonToken.START_ARRAY));
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        g.setCurrentValue(value);
+        g.assignCurrentValue(value);
         serializeContents(value, g, provider);
         typeSer.writeTypeSuffix(g, typeIdDef);
     }
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java
@@ -646,7 +646,7 @@ public void serializeWithType(Object bean, JsonGenerator gen,
 
         WritableTypeId typeIdDef = _typeIdDef(typeSer, bean, JsonToken.START_OBJECT);
         typeSer.writeTypePrefix(gen, typeIdDef);
-        gen.setCurrentValue(bean); // [databind#878]
+        gen.assignCurrentValue(bean); // [databind#878]
         if (_propertyFilterId != null) {
             serializeFieldsFiltered(bean, gen, provider);
         } else {
@@ -711,7 +711,7 @@ protected  void _serializeObjectId(Object bean, JsonGenerator g,
 
         typeSer.writeTypePrefix(g, typeIdDef);
         // 08-Jul-2021, tatu: Moved here from earlier place, wrt [databind#3160]
-        g.setCurrentValue(bean); // [databind#631]
+        g.assignCurrentValue(bean); // [databind#631]
         objectId.writeAsField(g, provider, w);
         if (_propertyFilterId != null) {
             serializeFieldsFiltered(bean, g, provider);
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java
@@ -111,7 +111,7 @@ public final void serialize(Collection<?> value, JsonGenerator g, SerializerProv
     @Override
     public void serializeContents(Collection<?> value, JsonGenerator g, SerializerProvider provider) throws IOException
     {
-        g.setCurrentValue(value);
+        g.assignCurrentValue(value);
         if (_elementSerializer != null) {
             serializeContentsUsing(value, g, provider, _elementSerializer);
             return;
diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java
@@ -727,7 +727,7 @@ public void serializeWithType(Map<?,?> value, JsonGenerator gen, SerializerProvi
         throws IOException
     {
         // [databind#631]: Assign current value, to be accessible by custom serializers
-        gen.setCurrentValue(value);
+        gen.assignCurrentValue(value);
         WritableTypeId typeIdDef = typeSer.writeTypePrefix(gen,
                 typeSer.typeId(value, JsonToken.START_OBJECT));
         serializeWithoutTypeInfo(value, gen, provider);
diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/TestCustomDeserializers.java b/src/test/java/com/fasterxml/jackson/databind/deser/TestCustomDeserializers.java
@@ -241,7 +241,7 @@ protected ParentClassDeserializer() {
         @Override
         public Object deserialize(JsonParser p, DeserializationContext ctxt)
                 throws IOException {
-            Object parent = p.getCurrentValue();
+            Object parent = p.currentValue();
             String desc = (parent == null) ? "NULL" : parent.getClass().getSimpleName();
             return "prop/"+ desc;
         }
diff --git a/src/test/java/com/fasterxml/jackson/databind/node/ArrayNodeTest.java b/src/test/java/com/fasterxml/jackson/databind/node/ArrayNodeTest.java
@@ -359,8 +359,8 @@ public void testParser() throws Exception
         assertNull(p.getCodec());
         assertNotNull(p.getParsingContext());
         assertTrue(p.getParsingContext().inRoot());
-        assertNotNull(p.getTokenLocation());
-        assertNotNull(p.getCurrentLocation());
+        assertNotNull(p.currentTokenLocation());
+        assertNotNull(p.currentLocation());
         assertNull(p.getEmbeddedObject());
         assertNull(p.currentNode());
 
diff --git a/src/test/java/com/fasterxml/jackson/databind/node/NodeContext2049Test.java b/src/test/java/com/fasterxml/jackson/databind/node/NodeContext2049Test.java
@@ -48,6 +48,8 @@ public Object createUsingDefault(DeserializationContext ctxt) throws IOException
     }
 
     static class ParentSettingDeserializerModifier extends BeanDeserializerModifier {
+        private static final long serialVersionUID = 1L;
+
         @Override
         public BeanDeserializerBuilder updateBuilder(DeserializationConfig config, BeanDescription beanDesc,
                   BeanDeserializerBuilder builder) {
diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/TestCustomSerializers.java b/src/test/java/com/fasterxml/jackson/databind/ser/TestCustomSerializers.java
@@ -121,7 +121,7 @@ protected ParentClassSerializer() {
         @Override
         public void serialize(Object value, JsonGenerator gen,
                 SerializerProvider provider) throws IOException {
-            Object parent = gen.getCurrentValue();
+            Object parent = gen.currentValue();
             String desc = (parent == null) ? "NULL" : parent.getClass().getSimpleName();
             gen.writeString(desc+"/"+value);
         }

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ public final void serialize(Object bean, JsonGenerator gen, SerializerProvider p`
`172`	`172`	`throws IOException`
`173`	`173`	`{`
`174`	`174`	`if (_objectIdWriter != null) {`
`175`		`- gen.setCurrentValue(bean); // [databind#631]`
	`175`	`+ gen.assignCurrentValue(bean); // [databind#631]`
`176`	`176`	`_serializeWithObjectId(bean, gen, provider, true);`
`177`	`177`	`return;`
`178`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public void serializeWithType(Object bean, JsonGenerator gen,`
`151`	`151`	`}`
`152`	`152`	`WritableTypeId typeIdDef = _typeIdDef(typeSer, bean, JsonToken.START_ARRAY);`
`153`	`153`	`typeSer.writeTypePrefix(gen, typeIdDef);`
`154`		`- gen.setCurrentValue(bean);`
	`154`	`+ gen.assignCurrentValue(bean);`
`155`	`155`	`serializeAsArray(bean, gen, provider);`
`156`	`156`	`typeSer.writeTypeSuffix(gen, typeIdDef);`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public void serializeWithType(List<String> value, JsonGenerator g, SerializerPro`
`85`	`85`	`{`
`86`	`86`	`WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,`
`87`	`87`	`typeSer.typeId(value, JsonToken.START_ARRAY));`
`88`		`- g.setCurrentValue(value);`
	`88`	`+ g.assignCurrentValue(value);`
`89`	`89`	`serializeContents(value, g, provider, value.size());`
`90`	`90`	`typeSer.writeTypeSuffix(g, typeIdDef);`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ public void serializeWithType(Map.Entry<?, ?> value, JsonGenerator g,`
`345`	`345`	`SerializerProvider provider, TypeSerializer typeSer) throws IOException`
`346`	`346`	`{`
`347`	`347`	`// [databind#631]: Assign current value, to be accessible by custom serializers`
`348`		`- g.setCurrentValue(value);`
	`348`	`+ g.assignCurrentValue(value);`
`349`	`349`	`WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,`
`350`	`350`	`typeSer.typeId(value, JsonToken.START_OBJECT));`
`351`	`351`	`serializeDynamic(value, g, provider);`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public void serializeWithType(Collection<String> value, JsonGenerator g,`
`88`	`88`	`{`
`89`	`89`	`WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,`
`90`	`90`	`typeSer.typeId(value, JsonToken.START_ARRAY));`
`91`		`- g.setCurrentValue(value);`
	`91`	`+ g.assignCurrentValue(value);`
`92`	`92`	`serializeContents(value, g, provider);`
`93`	`93`	`typeSer.writeTypeSuffix(g, typeIdDef);`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ public final void serializeWithType(T value, JsonGenerator g, SerializerProvider`
`134`	`134`	`WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,`
`135`	`135`	`typeSer.typeId(value, JsonToken.START_ARRAY));`
`136`	`136`	`// [databind#631]: Assign current value, to be accessible by custom serializers`
`137`		`- g.setCurrentValue(value);`
	`137`	`+ g.assignCurrentValue(value);`
`138`	`138`	`serializeContents(value, g, provider);`
`139`	`139`	`typeSer.writeTypeSuffix(g, typeIdDef);`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ public void serializeWithType(T value, JsonGenerator g, SerializerProvider provi`
`262`	`262`	`WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,`
`263`	`263`	`typeSer.typeId(value, JsonToken.START_ARRAY));`
`264`	`264`	`// [databind#631]: Assign current value, to be accessible by custom serializers`
`265`		`- g.setCurrentValue(value);`
	`265`	`+ g.assignCurrentValue(value);`
`266`	`266`	`serializeContents(value, g, provider);`
`267`	`267`	`typeSer.writeTypeSuffix(g, typeIdDef);`
`268`	`268`	`}`