Skip to content

Commit 992c0fa

Browse files
cowtowncodercowtowncoder
committed
Moar warnings removal (3.0-proofing)
1 parent ba2cf9a commit 992c0fa

16 files changed

+25
-18
lines changed

‎src/main/java/com/fasterxml/jackson/databind/node/TreeTraversingParser.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,19 @@ public boolean isClosed() {
152152
/**********************************************************
153153
*/
154154

155-
@Override public String getCurrentName() {
155+
@Override
156+
public String currentName() {
156157
NodeCursor crsr = _nodeCursor;
157158
if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {
158159
crsr = crsr.getParent();
159160
}
160161
return (crsr == null) ? null : crsr.getCurrentName();
161162
}
162163

164+
@Deprecated // since 2.17
165+
@Override
166+
public String getCurrentName() { return currentName(); }
167+
163168
@Override public void overrideCurrentName(String name) {
164169
NodeCursor crsr = _nodeCursor;
165170
if (_currToken == JsonToken.START_OBJECT || _currToken == JsonToken.START_ARRAY) {

‎src/main/java/com/fasterxml/jackson/databind/ser/BeanSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public final void serialize(Object bean, JsonGenerator gen, SerializerProvider p
172172
throws IOException
173173
{
174174
if (_objectIdWriter != null) {
175-
gen.setCurrentValue(bean); // [databind#631]
175+
gen.assignCurrentValue(bean); // [databind#631]
176176
_serializeWithObjectId(bean, gen, provider, true);
177177
return;
178178
}

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/BeanAsArraySerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public void serializeWithType(Object bean, JsonGenerator gen,
151151
}
152152
WritableTypeId typeIdDef = _typeIdDef(typeSer, bean, JsonToken.START_ARRAY);
153153
typeSer.writeTypePrefix(gen, typeIdDef);
154-
gen.setCurrentValue(bean);
154+
gen.assignCurrentValue(bean);
155155
serializeAsArray(bean, gen, provider);
156156
typeSer.writeTypeSuffix(gen, typeIdDef);
157157
}

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/IndexedStringListSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void serializeWithType(List<String> value, JsonGenerator g, SerializerPro
8585
{
8686
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
8787
typeSer.typeId(value, JsonToken.START_ARRAY));
88-
g.setCurrentValue(value);
88+
g.assignCurrentValue(value);
8989
serializeContents(value, g, provider, value.size());
9090
typeSer.writeTypeSuffix(g, typeIdDef);
9191
}

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/MapEntrySerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public void serializeWithType(Map.Entry<?, ?> value, JsonGenerator g,
345345
SerializerProvider provider, TypeSerializer typeSer) throws IOException
346346
{
347347
// [databind#631]: Assign current value, to be accessible by custom serializers
348-
g.setCurrentValue(value);
348+
g.assignCurrentValue(value);
349349
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
350350
typeSer.typeId(value, JsonToken.START_OBJECT));
351351
serializeDynamic(value, g, provider);

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/StringCollectionSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void serializeWithType(Collection<String> value, JsonGenerator g,
8888
{
8989
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
9090
typeSer.typeId(value, JsonToken.START_ARRAY));
91-
g.setCurrentValue(value);
91+
g.assignCurrentValue(value);
9292
serializeContents(value, g, provider);
9393
typeSer.writeTypeSuffix(g, typeIdDef);
9494
}

‎src/main/java/com/fasterxml/jackson/databind/ser/impl/UnwrappingBeanSerializer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ protected BeanSerializerBase asArraySerializer() {
127127
@Override
128128
public final void serialize(Object bean, JsonGenerator gen, SerializerProvider provider) throws IOException
129129
{
130-
gen.setCurrentValue(bean); // [databind#631]
130+
gen.assignCurrentValue(bean); // [databind#631]
131131
if (_objectIdWriter != null) {
132132
_serializeWithObjectId(bean, gen, provider, false);
133133
return;
@@ -147,7 +147,7 @@ public void serializeWithType(Object bean, JsonGenerator gen, SerializerProvider
147147
provider.reportBadDefinition(handledType(),
148148
"Unwrapped property requires use of type information: cannot serialize without disabling `SerializationFeature.FAIL_ON_UNWRAPPED_TYPE_IDENTIFIERS`");
149149
}
150-
gen.setCurrentValue(bean); // [databind#631]
150+
gen.assignCurrentValue(bean); // [databind#631]
151151
if (_objectIdWriter != null) {
152152
_serializeWithObjectId(bean, gen, provider, typeSer);
153153
return;

‎src/main/java/com/fasterxml/jackson/databind/ser/std/ArraySerializerBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public final void serializeWithType(T value, JsonGenerator g, SerializerProvider
134134
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
135135
typeSer.typeId(value, JsonToken.START_ARRAY));
136136
// [databind#631]: Assign current value, to be accessible by custom serializers
137-
g.setCurrentValue(value);
137+
g.assignCurrentValue(value);
138138
serializeContents(value, g, provider);
139139
typeSer.writeTypeSuffix(g, typeIdDef);
140140
}

‎src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ public void serializeWithType(T value, JsonGenerator g, SerializerProvider provi
262262
WritableTypeId typeIdDef = typeSer.writeTypePrefix(g,
263263
typeSer.typeId(value, JsonToken.START_ARRAY));
264264
// [databind#631]: Assign current value, to be accessible by custom serializers
265-
g.setCurrentValue(value);
265+
g.assignCurrentValue(value);
266266
serializeContents(value, g, provider);
267267
typeSer.writeTypeSuffix(g, typeIdDef);
268268
}

‎src/main/java/com/fasterxml/jackson/databind/ser/std/BeanSerializerBase.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ public void serializeWithType(Object bean, JsonGenerator gen,
646646

647647
WritableTypeId typeIdDef = _typeIdDef(typeSer, bean, JsonToken.START_OBJECT);
648648
typeSer.writeTypePrefix(gen, typeIdDef);
649-
gen.setCurrentValue(bean); // [databind#878]
649+
gen.assignCurrentValue(bean); // [databind#878]
650650
if (_propertyFilterId != null) {
651651
serializeFieldsFiltered(bean, gen, provider);
652652
} else {
@@ -711,7 +711,7 @@ protected void _serializeObjectId(Object bean, JsonGenerator g,
711711

712712
typeSer.writeTypePrefix(g, typeIdDef);
713713
// 08-Jul-2021, tatu: Moved here from earlier place, wrt [databind#3160]
714-
g.setCurrentValue(bean); // [databind#631]
714+
g.assignCurrentValue(bean); // [databind#631]
715715
objectId.writeAsField(g, provider, w);
716716
if (_propertyFilterId != null) {
717717
serializeFieldsFiltered(bean, g, provider);

‎src/main/java/com/fasterxml/jackson/databind/ser/std/CollectionSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public final void serialize(Collection<?> value, JsonGenerator g, SerializerProv
111111
@Override
112112
public void serializeContents(Collection<?> value, JsonGenerator g, SerializerProvider provider) throws IOException
113113
{
114-
g.setCurrentValue(value);
114+
g.assignCurrentValue(value);
115115
if (_elementSerializer != null) {
116116
serializeContentsUsing(value, g, provider, _elementSerializer);
117117
return;

‎src/main/java/com/fasterxml/jackson/databind/ser/std/MapSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ public void serializeWithType(Map<?,?> value, JsonGenerator gen, SerializerProvi
727727
throws IOException
728728
{
729729
// [databind#631]: Assign current value, to be accessible by custom serializers
730-
gen.setCurrentValue(value);
730+
gen.assignCurrentValue(value);
731731
WritableTypeId typeIdDef = typeSer.writeTypePrefix(gen,
732732
typeSer.typeId(value, JsonToken.START_OBJECT));
733733
serializeWithoutTypeInfo(value, gen, provider);

‎src/test/java/com/fasterxml/jackson/databind/deser/TestCustomDeserializers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ protected ParentClassDeserializer() {
241241
@Override
242242
public Object deserialize(JsonParser p, DeserializationContext ctxt)
243243
throws IOException {
244-
Object parent = p.getCurrentValue();
244+
Object parent = p.currentValue();
245245
String desc = (parent == null) ? "NULL" : parent.getClass().getSimpleName();
246246
return "prop/"+ desc;
247247
}

‎src/test/java/com/fasterxml/jackson/databind/node/ArrayNodeTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -359,8 +359,8 @@ public void testParser() throws Exception
359359
assertNull(p.getCodec());
360360
assertNotNull(p.getParsingContext());
361361
assertTrue(p.getParsingContext().inRoot());
362-
assertNotNull(p.getTokenLocation());
363-
assertNotNull(p.getCurrentLocation());
362+
assertNotNull(p.currentTokenLocation());
363+
assertNotNull(p.currentLocation());
364364
assertNull(p.getEmbeddedObject());
365365
assertNull(p.currentNode());
366366

‎src/test/java/com/fasterxml/jackson/databind/node/NodeContext2049Test.java

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ public Object createUsingDefault(DeserializationContext ctxt) throws IOException
4848
}
4949

5050
static class ParentSettingDeserializerModifier extends BeanDeserializerModifier {
51+
private static final long serialVersionUID = 1L;
52+
5153
@Override
5254
public BeanDeserializerBuilder updateBuilder(DeserializationConfig config, BeanDescription beanDesc,
5355
BeanDeserializerBuilder builder) {

‎src/test/java/com/fasterxml/jackson/databind/ser/TestCustomSerializers.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ protected ParentClassSerializer() {
121121
@Override
122122
public void serialize(Object value, JsonGenerator gen,
123123
SerializerProvider provider) throws IOException {
124-
Object parent = gen.getCurrentValue();
124+
Object parent = gen.currentValue();
125125
String desc = (parent == null) ? "NULL" : parent.getClass().getSimpleName();
126126
gen.writeString(desc+"/"+value);
127127
}

0 commit comments

Comments
 (0)