From b1a1da29157fd14af6a7d277b8ada636d865bb79 Mon Sep 17 00:00:00 2001 From: Tatu Saloranta Date: Wed, 10 Apr 2024 10:17:07 -0700 Subject: [PATCH] Warnings removal --- .../deser/SuperSonicBeanDeserializer.java | 12 +++++------ .../ser/CustomBeanPropertyWriterTest.java | 2 ++ .../src/test/java/perftest/MediaItem.java | 6 +++--- .../androidrecord/AndroidRecordModule.java | 10 +++++++--- .../androidrecord/AndroidRecordTest.java | 20 +++++++++---------- .../deser/BBDeserializerModifier.java | 2 ++ .../deser/SuperSonicBeanDeserializer.java | 12 +++++------ .../blackbird/ser/BBSerializerModifier.java | 2 ++ .../module/blackbird/BlackbirdTestBase.java | 2 +- .../ser/CustomBeanPropertyWriterTest.java | 2 ++ .../module/jakarta/xmlbind/TestVersions.java | 2 -- .../jaxb/misc/TestDeserializerCaching.java | 2 ++ .../module/mrbean/TestAbstractClasses.java | 1 + .../TestAbstractClassesWithOverrides.java | 2 ++ .../TestSimpleMaterializedInterfaces.java | 1 + 15 files changed, 47 insertions(+), 31 deletions(-) diff --git a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SuperSonicBeanDeserializer.java b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SuperSonicBeanDeserializer.java index 60e8102c..9b4f9f77 100644 --- a/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SuperSonicBeanDeserializer.java +++ b/afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SuperSonicBeanDeserializer.java @@ -135,7 +135,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx } final Object bean = _valueInstantiator.createUsingDefault(ctxt); // [databind#631]: Assign current value, to be accessible by custom serializers - p.setCurrentValue(bean); + p.assignCurrentValue(bean); if (p.canReadObjectId()) { Object id = p.getObjectId(); if (id != null) { @@ -174,7 +174,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec 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); } @@ -191,7 +191,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec return super.deserialize(p, ctxt, bean); } } else if (!p.hasToken(JsonToken.FIELD_NAME) - || !prop.getName().equals(p.getCurrentName())) { + || !prop.getName().equals(p.currentName())) { // no, something funky, use base impl for special cases return super.deserialize(p, ctxt, bean); } @@ -233,7 +233,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c // Allow Object Id references to come in as JSON Objects as well... if ((_objectIdReader != null) && _objectIdReader.maySerializeAsObject()) { if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME) - && _objectIdReader.isValidReferencePropertyName(p.getCurrentName(), p)) { + && _objectIdReader.isValidReferencePropertyName(p.currentName(), p)) { return deserializeFromObjectId(p, ctxt); } } @@ -252,7 +252,7 @@ public final Object deserializeFromObject(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 (p.canReadObjectId()) { Object id = p.getObjectId(); if (id != null) { @@ -269,7 +269,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c return super.deserialize(p, ctxt, bean); } } else if (!p.hasToken(JsonToken.FIELD_NAME) - || !prop.getName().equals(p.getCurrentName())) { + || !prop.getName().equals(p.currentName())) { return super.deserialize(p, ctxt, bean); } // and deserialize diff --git a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/ser/CustomBeanPropertyWriterTest.java b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/ser/CustomBeanPropertyWriterTest.java index f72b9b24..cb93248b 100644 --- a/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/ser/CustomBeanPropertyWriterTest.java +++ b/afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/ser/CustomBeanPropertyWriterTest.java @@ -27,6 +27,8 @@ public SampleObject(String field1, Integer field2, Integer field3) { } static class Only2BeanSerializerModifier extends BeanSerializerModifier { + private static final long serialVersionUID = 1L; + @Override public List changeProperties(SerializationConfig config, BeanDescription beanDesc, List props) { diff --git a/afterburner/src/test/java/perftest/MediaItem.java b/afterburner/src/test/java/perftest/MediaItem.java index 8af13ea0..918db3e4 100644 --- a/afterburner/src/test/java/perftest/MediaItem.java +++ b/afterburner/src/test/java/perftest/MediaItem.java @@ -41,7 +41,7 @@ public static MediaItem deserialize(JsonParser jp) throws IOException } MediaItem item = new MediaItem(); while (jp.nextToken() == JsonToken.FIELD_NAME) { - String name = jp.getCurrentName(); + String name = jp.currentName(); if (name == "images") { item._photos = deserializeImages(jp); } else if (name == "content") { @@ -163,7 +163,7 @@ public static Photo deserialize(JsonParser jp) throws IOException { Photo photo = new Photo(); while (jp.nextToken() == JsonToken.FIELD_NAME) { - String name = jp.getCurrentName(); + String name = jp.currentName(); jp.nextToken(); Integer I = sFields.get(name); if (I != null) { @@ -301,7 +301,7 @@ public static Content deserialize(JsonParser jp) throws IOException Content content = new Content(); while (jp.nextToken() == JsonToken.FIELD_NAME) { - String name = jp.getCurrentName(); + String name = jp.currentName(); jp.nextToken(); Integer I = sFields.get(name); if (I != null) { diff --git a/android-record/src/main/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordModule.java b/android-record/src/main/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordModule.java index 893b3fe4..2f5b9973 100644 --- a/android-record/src/main/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordModule.java +++ b/android-record/src/main/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordModule.java @@ -58,6 +58,8 @@ * @author Eran Leshem **/ public class AndroidRecordModule extends SimpleModule { + private static final long serialVersionUID = 1L; + private static final class AndroidRecordNaming extends DefaultAccessorNamingStrategy { @@ -66,7 +68,7 @@ private static final class AndroidRecordNaming */ private final Set _componentNames; - private AndroidRecordNaming(MapperConfig config, AnnotatedClass forClass) { + AndroidRecordNaming(MapperConfig config, AnnotatedClass forClass) { super(config, forClass, // no setters for (immutable) Records: null, @@ -89,7 +91,9 @@ public String findNameForRegularGetter(AnnotatedMethod am, String name) } } - private static class AndroidRecordClassIntrospector extends BasicClassIntrospector { + static class AndroidRecordClassIntrospector extends BasicClassIntrospector { + private static final long serialVersionUID = 1L; + @Override protected POJOPropertiesCollector collectProperties(MapperConfig config, JavaType type, MixInResolver r, boolean forSerialization) { @@ -159,7 +163,7 @@ && isDesugaredRecordClass(raw)) { return defaultInstantiator; } - private static Stream getDesugaredRecordComponents(Class raw) { + static Stream getDesugaredRecordComponents(Class raw) { return Arrays.stream(raw.getDeclaredFields()).filter(field -> ! Modifier.isStatic(field.getModifiers())); } } diff --git a/android-record/src/test/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordTest.java b/android-record/src/test/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordTest.java index 33da329f..2b47f0f3 100644 --- a/android-record/src/test/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordTest.java +++ b/android-record/src/test/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordTest.java @@ -22,7 +22,7 @@ * @author Eran Leshem **/ public class AndroidRecordTest extends TestCase { - private static final class Simple extends RecordTag { + static final class Simple extends RecordTag { static int si = 7; private final int i; private final int j; @@ -30,7 +30,7 @@ private static final class Simple extends RecordTag { private final List l; private final AtomicInteger ai; - private Simple(int i, int j, String s, List l, AtomicInteger ai) { + Simple(int i, int j, String s, List l, AtomicInteger ai) { this.i = i; this.j = j; this.s = s; @@ -72,26 +72,26 @@ public boolean equals(Object o) { } } - private static final class MultipleConstructors extends RecordTag { + static final class MultipleConstructors extends RecordTag { private final int i; private final List l; - private MultipleConstructors(int i, List l) { + MultipleConstructors(int i, List l) { this.i = i; this.l = l; } - private MultipleConstructors(String s, List l) { + MultipleConstructors(String s, List l) { i = Integer.parseInt(s); this.l = l; } - private MultipleConstructors(int i, String s, List l) { + MultipleConstructors(int i, String s, List l) { this.i = i; this.l = l; } - private MultipleConstructors(List l, int i) { + MultipleConstructors(List l, int i) { this.i = i; this.l = null; } @@ -106,16 +106,16 @@ List l() { } - private static final class ConflictingConstructors extends RecordTag { + static final class ConflictingConstructors extends RecordTag { private final int i; private final String s; - private ConflictingConstructors(int i, String s) { + ConflictingConstructors(int i, String s) { this.i = i; this.s = s; } - private ConflictingConstructors(String s, int i) { + ConflictingConstructors(String s, int i) { this.i = i; this.s = s; } diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/BBDeserializerModifier.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/BBDeserializerModifier.java index ff92a30f..a0013b45 100644 --- a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/BBDeserializerModifier.java +++ b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/BBDeserializerModifier.java @@ -27,6 +27,8 @@ public class BBDeserializerModifier extends BeanDeserializerModifier { + private static final long serialVersionUID = 1L; + private static final MethodHandle TRAMPOLINE, BOOLEAN_TRAMPOLINE, LONG_TRAMPOLINE, INT_TRAMPOLINE; static { diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SuperSonicBeanDeserializer.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SuperSonicBeanDeserializer.java index 16189bba..9fc970a7 100644 --- a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SuperSonicBeanDeserializer.java +++ b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SuperSonicBeanDeserializer.java @@ -135,7 +135,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx } final Object bean = _valueInstantiator.createUsingDefault(ctxt); // [databind#631]: Assign current value, to be accessible by custom serializers - p.setCurrentValue(bean); + p.assignCurrentValue(bean); if (p.canReadObjectId()) { Object id = p.getObjectId(); if (id != null) { @@ -174,7 +174,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec throws IOException { // [databind#631]: Assign current value, to be accessible by custom deserializers - p.setCurrentValue(bean); + p.assignCurrentValue(bean); if (_injectables != null) { injectValues(ctxt, bean); } @@ -191,7 +191,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec return super.deserialize(p, ctxt, bean); } } else if (!p.hasToken(JsonToken.FIELD_NAME) - || !prop.getName().equals(p.getCurrentName())) { + || !prop.getName().equals(p.currentName())) { // no, something funky, use base impl for special cases return super.deserialize(p, ctxt, bean); } @@ -233,7 +233,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c // Allow Object Id references to come in as JSON Objects as well... if ((_objectIdReader != null) && _objectIdReader.maySerializeAsObject()) { if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME) - && _objectIdReader.isValidReferencePropertyName(p.getCurrentName(), p)) { + && _objectIdReader.isValidReferencePropertyName(p.currentName(), p)) { return deserializeFromObjectId(p, ctxt); } } @@ -252,7 +252,7 @@ public final Object deserializeFromObject(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 (p.canReadObjectId()) { Object id = p.getObjectId(); if (id != null) { @@ -269,7 +269,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c return super.deserialize(p, ctxt, bean); } } else if (!p.hasToken(JsonToken.FIELD_NAME) - || !prop.getName().equals(p.getCurrentName())) { + || !prop.getName().equals(p.currentName())) { return super.deserialize(p, ctxt, bean); } // and deserialize diff --git a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/BBSerializerModifier.java b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/BBSerializerModifier.java index 44c2c571..3345e343 100644 --- a/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/BBSerializerModifier.java +++ b/blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/BBSerializerModifier.java @@ -26,6 +26,8 @@ public class BBSerializerModifier extends BeanSerializerModifier { + private static final long serialVersionUID = 1L; + private final Function, Lookup> _lookups; private final UnaryOperator _accessGrant; diff --git a/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/BlackbirdTestBase.java b/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/BlackbirdTestBase.java index a952ca79..88b2c300 100644 --- a/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/BlackbirdTestBase.java +++ b/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/BlackbirdTestBase.java @@ -251,7 +251,7 @@ protected void verifyFieldName(JsonParser jp, String expName) throws IOException { assertEquals(expName, jp.getText()); - assertEquals(expName, jp.getCurrentName()); + assertEquals(expName, jp.currentName()); } protected void verifyIntValue(JsonParser jp, long expValue) diff --git a/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/ser/CustomBeanPropertyWriterTest.java b/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/ser/CustomBeanPropertyWriterTest.java index 2cd9f7be..1d816ac6 100644 --- a/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/ser/CustomBeanPropertyWriterTest.java +++ b/blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/ser/CustomBeanPropertyWriterTest.java @@ -27,6 +27,8 @@ public SampleObject(String field1, Integer field2, Integer field3) { } static class Only2BeanSerializerModifier extends BeanSerializerModifier { + private static final long serialVersionUID = 1L; + @Override public List changeProperties(SerializationConfig config, BeanDescription beanDesc, List props) { diff --git a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java index 9f55043f..66909fa0 100644 --- a/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java +++ b/jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java @@ -5,8 +5,6 @@ import com.fasterxml.jackson.databind.type.TypeFactory; -import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector; - public class TestVersions extends ModuleTestBase { public void testVersions() diff --git a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDeserializerCaching.java b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDeserializerCaching.java index ac133265..54c1fcb4 100644 --- a/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDeserializerCaching.java +++ b/jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDeserializerCaching.java @@ -52,6 +52,8 @@ static class MyType { static class MyBeanDeserializerModifier extends BeanDeserializerModifier { + private static final long serialVersionUID = 1L; + static int count = 0; @Override diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClasses.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClasses.java index 1307a412..df002bda 100644 --- a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClasses.java +++ b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClasses.java @@ -33,6 +33,7 @@ protected Bean() { } /********************************************************** */ + @SuppressWarnings("synthetic-access") public void testSimpleInteface() throws Exception { ObjectMapper mapper = newMrBeanMapper(); diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClassesWithOverrides.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClassesWithOverrides.java index df157411..22b60655 100644 --- a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClassesWithOverrides.java +++ b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClassesWithOverrides.java @@ -85,6 +85,7 @@ public void testOverrides() throws Exception verifyBean(bean2); } + @SuppressWarnings("synthetic-access") public void testReAbstractedMethods() throws Exception { AbstractTypeMaterializer mat = new AbstractTypeMaterializer(); @@ -161,6 +162,7 @@ public void testEagerFailureOnReAbstractedMethods() throws Exception } } + @SuppressWarnings("synthetic-access") private void verifyBean(Bean bean) { assertNotNull(bean); assertEquals("abc", bean.getX()); diff --git a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestSimpleMaterializedInterfaces.java b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestSimpleMaterializedInterfaces.java index c4e7f4ff..a1d58e86 100644 --- a/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestSimpleMaterializedInterfaces.java +++ b/mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestSimpleMaterializedInterfaces.java @@ -59,6 +59,7 @@ public interface OtherInterface { } public interface BeanWithDefaultForOtherInterface extends Bean, OtherInterface { + @Override public default boolean anyValuePresent() { return getX() > 0 || getA() != null; }