Skip to content

Commit 5888efa

Browse files
committed
Warnings clean up wrt jackson-databind changes
1 parent 57c04f8 commit 5888efa

File tree

5 files changed

+11
-15
lines changed

5 files changed

+11
-15
lines changed

avro/src/main/java/com/fasterxml/jackson/dataformat/avro/AvroTypeIdResolver.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,24 @@ public class AvroTypeIdResolver extends ClassNameIdResolver
2929

3030
public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory,
3131
PolymorphicTypeValidator ptv,
32-
Collection<NamedType> subTypes) {
33-
this(baseType, typeFactory, ptv);
32+
Collection<NamedType> subTypes)
33+
{
34+
super(baseType, typeFactory, subTypes, ptv);
3435
if (subTypes != null) {
3536
for (NamedType namedType : subTypes) {
36-
registerSubtype(namedType.getType(), namedType.getName());
37+
//registerSubtype(namedType.getType(), namedType.getName());
38+
_idTypes.put(namedType.getName(), namedType.getType());
3739
}
3840
}
3941
}
4042

41-
public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory,
42-
PolymorphicTypeValidator ptv) {
43-
super(baseType, typeFactory, ptv);
44-
}
45-
43+
/*// Not used as of Jackson 2.19
4644
@Override
4745
public void registerSubtype(Class<?> type, String name) {
4846
_idTypes.put(name, type);
4947
// _typeIds.put(type, name);
5048
}
49+
*/
5150

5251
@Override
5352
protected JavaType _typeFromId(String id, DatabindContext ctxt) throws IOException {

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/PolymorphicRoundtripTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType base
292292
config.getPolymorphicTypeValidator());
293293
} else {
294294
return new ClassNameIdResolver(baseType, config.getTypeFactory(),
295-
config.getPolymorphicTypeValidator());
295+
null, config.getPolymorphicTypeValidator());
296296
}
297297
}
298298
}
@@ -303,7 +303,7 @@ class MultipleClassNameIdResolver extends ClassNameIdResolver implements Multipl
303303

304304
MultipleClassNameIdResolver(JavaType baseType, TypeFactory typeFactory,
305305
PolymorphicTypeValidator ptv) {
306-
super(baseType, typeFactory, ptv);
306+
super(baseType, typeFactory, null, ptv);
307307
}
308308

309309
@Override

ion/src/test/java/com/fasterxml/jackson/dataformat/ion/polymorphism/IonAnnotationTypeDeserializerWithClassNameAnnotationTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ static class ClassNameIonAnnotationIntrospector extends IonAnnotationIntrospecto
102102

103103
@Override
104104
protected TypeIdResolver defaultIdResolver(MapperConfig<?> config, JavaType baseType) {
105-
return new ClassNameIdResolver(baseType, config.getTypeFactory(), config.getPolymorphicTypeValidator());
105+
return new ClassNameIdResolver(baseType, config.getTypeFactory(),
106+
null, config.getPolymorphicTypeValidator());
106107
}
107108
}
108109

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixInputDecorator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
import com.fasterxml.jackson.core.io.IOContext;
77
import com.fasterxml.jackson.core.io.InputDecorator;
8-
import org.junit.jupiter.api.Test;
9-
import static org.junit.jupiter.api.Assertions.*;
108

119
@SuppressWarnings("serial")
1210
public class PrefixInputDecorator extends InputDecorator

smile/src/test/java/com/fasterxml/jackson/dataformat/smile/testutil/PrefixOutputDecorator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import com.fasterxml.jackson.core.io.IOContext;
66
import com.fasterxml.jackson.core.io.OutputDecorator;
7-
import org.junit.jupiter.api.Test;
8-
import static org.junit.jupiter.api.Assertions.*;
97

108
@SuppressWarnings("serial")
119
public class PrefixOutputDecorator extends OutputDecorator

0 commit comments

Comments
 (0)