Skip to content

Commit 2a5faf6

Browse files
committed
Warnings cleanup
1 parent 29bb430 commit 2a5faf6

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.fasterxml.jackson.databind.JavaType;
1010
import com.fasterxml.jackson.databind.exc.InvalidTypeIdException;
1111
import com.fasterxml.jackson.databind.jsontype.NamedType;
12+
import com.fasterxml.jackson.databind.jsontype.PolymorphicTypeValidator;
1213
import com.fasterxml.jackson.databind.jsontype.impl.ClassNameIdResolver;
1314
import com.fasterxml.jackson.databind.type.TypeFactory;
1415

@@ -24,17 +25,20 @@ public class AvroTypeIdResolver extends ClassNameIdResolver
2425

2526
private final Map<Class<?>, String> _typeIds = new HashMap<>();
2627

27-
public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory, Collection<NamedType> subTypes) {
28-
this(baseType, typeFactory);
28+
public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory,
29+
PolymorphicTypeValidator ptv,
30+
Collection<NamedType> subTypes) {
31+
this(baseType, typeFactory, ptv);
2932
if (subTypes != null) {
3033
for (NamedType namedType : subTypes) {
3134
registerSubtype(namedType.getType(), namedType.getName());
3235
}
3336
}
3437
}
3538

36-
public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory) {
37-
super(baseType, typeFactory);
39+
public AvroTypeIdResolver(JavaType baseType, TypeFactory typeFactory,
40+
PolymorphicTypeValidator ptv) {
41+
super(baseType, typeFactory, ptv);
3842
}
3943

4044
@Override

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public TypeDeserializer buildTypeDeserializer(DeserializationConfig config, Java
5050
protected TypeIdResolver idResolver(MapperConfig<?> config,
5151
JavaType baseType, PolymorphicTypeValidator subtypeValidator,
5252
Collection<NamedType> subtypes, boolean forSer, boolean forDeser) {
53-
return new AvroTypeIdResolver(baseType, config.getTypeFactory(), subtypes);
53+
return new AvroTypeIdResolver(baseType, config.getTypeFactory(), subtypeValidator,
54+
subtypes);
5455
}
5556
}

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/interop/annotations/StringableTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import java.util.ArrayList;
1111
import java.util.HashMap;
1212
import java.util.Map;
13+
import java.util.Objects;
1314

1415
import org.apache.avro.reflect.AvroSchema;
1516
import org.apache.avro.reflect.Stringable;
@@ -18,8 +19,6 @@
1819
import com.fasterxml.jackson.dataformat.avro.interop.ApacheAvroInteropUtil;
1920
import com.fasterxml.jackson.dataformat.avro.interop.InteropTestBase;
2021

21-
import avro.shaded.com.google.common.base.Objects;
22-
2322
import static org.assertj.core.api.Assertions.assertThat;
2423
import static org.junit.Assume.assumeTrue;
2524

@@ -60,7 +59,7 @@ public boolean equals(Object o) {
6059
if (o == this) return true;
6160
if (!(o instanceof CustomStringableKey)) return false;
6261
CustomStringableKey other = (CustomStringableKey) o;
63-
return Objects.equal(test, other.test);
62+
return Objects.equals(test, other.test);
6463
}
6564
}
6665

@@ -81,8 +80,8 @@ public boolean equals(Object o) {
8180
if (o == this) return true;
8281
if (!(o instanceof CustomStringableKey)) return false;
8382
BigNumberWrapper other = (BigNumberWrapper) o;
84-
return Objects.equal(bigDecimal, other.bigDecimal)
85-
&& Objects.equal(bigInteger, other.bigInteger);
83+
return Objects.equals(bigDecimal, other.bigDecimal)
84+
&& Objects.equals(bigInteger, other.bigInteger);
8685
}
8786
}
8887

0 commit comments

Comments
 (0)