Skip to content

Commit b1a1da2

Browse files
cowtowncodercowtowncoder
committed
Warnings removal
1 parent e59fad9 commit b1a1da2

File tree

15 files changed

+47
-31
lines changed

15 files changed

+47
-31
lines changed

‎afterburner/src/main/java/com/fasterxml/jackson/module/afterburner/deser/SuperSonicBeanDeserializer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
135135
}
136136
final Object bean = _valueInstantiator.createUsingDefault(ctxt);
137137
// [databind#631]: Assign current value, to be accessible by custom serializers
138-
p.setCurrentValue(bean);
138+
p.assignCurrentValue(bean);
139139
if (p.canReadObjectId()) {
140140
Object id = p.getObjectId();
141141
if (id != null) {
@@ -174,7 +174,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec
174174
throws IOException
175175
{
176176
// [databind#631]: Assign current value, to be accessible by custom serializers
177-
p.setCurrentValue(bean);
177+
p.assignCurrentValue(bean);
178178
if (_injectables != null) {
179179
injectValues(ctxt, bean);
180180
}
@@ -191,7 +191,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec
191191
return super.deserialize(p, ctxt, bean);
192192
}
193193
} else if (!p.hasToken(JsonToken.FIELD_NAME)
194-
|| !prop.getName().equals(p.getCurrentName())) {
194+
|| !prop.getName().equals(p.currentName())) {
195195
// no, something funky, use base impl for special cases
196196
return super.deserialize(p, ctxt, bean);
197197
}
@@ -233,7 +233,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c
233233
// Allow Object Id references to come in as JSON Objects as well...
234234
if ((_objectIdReader != null) && _objectIdReader.maySerializeAsObject()) {
235235
if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)
236-
&& _objectIdReader.isValidReferencePropertyName(p.getCurrentName(), p)) {
236+
&& _objectIdReader.isValidReferencePropertyName(p.currentName(), p)) {
237237
return deserializeFromObjectId(p, ctxt);
238238
}
239239
}
@@ -252,7 +252,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c
252252
}
253253
final Object bean = _valueInstantiator.createUsingDefault(ctxt);
254254
// [databind#631]: Assign current value, to be accessible by custom serializers
255-
p.setCurrentValue(bean);
255+
p.assignCurrentValue(bean);
256256
if (p.canReadObjectId()) {
257257
Object id = p.getObjectId();
258258
if (id != null) {
@@ -269,7 +269,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c
269269
return super.deserialize(p, ctxt, bean);
270270
}
271271
} else if (!p.hasToken(JsonToken.FIELD_NAME)
272-
|| !prop.getName().equals(p.getCurrentName())) {
272+
|| !prop.getName().equals(p.currentName())) {
273273
return super.deserialize(p, ctxt, bean);
274274
}
275275
// and deserialize

‎afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/ser/CustomBeanPropertyWriterTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public SampleObject(String field1, Integer field2, Integer field3) {
2727
}
2828

2929
static class Only2BeanSerializerModifier extends BeanSerializerModifier {
30+
private static final long serialVersionUID = 1L;
31+
3032
@Override
3133
public List<BeanPropertyWriter> changeProperties(SerializationConfig config, BeanDescription beanDesc, List<BeanPropertyWriter> props)
3234
{

‎afterburner/src/test/java/perftest/MediaItem.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public static MediaItem deserialize(JsonParser jp) throws IOException
4141
}
4242
MediaItem item = new MediaItem();
4343
while (jp.nextToken() == JsonToken.FIELD_NAME) {
44-
String name = jp.getCurrentName();
44+
String name = jp.currentName();
4545
if (name == "images") {
4646
item._photos = deserializeImages(jp);
4747
} else if (name == "content") {
@@ -163,7 +163,7 @@ public static Photo deserialize(JsonParser jp) throws IOException
163163
{
164164
Photo photo = new Photo();
165165
while (jp.nextToken() == JsonToken.FIELD_NAME) {
166-
String name = jp.getCurrentName();
166+
String name = jp.currentName();
167167
jp.nextToken();
168168
Integer I = sFields.get(name);
169169
if (I != null) {
@@ -301,7 +301,7 @@ public static Content deserialize(JsonParser jp) throws IOException
301301
Content content = new Content();
302302

303303
while (jp.nextToken() == JsonToken.FIELD_NAME) {
304-
String name = jp.getCurrentName();
304+
String name = jp.currentName();
305305
jp.nextToken();
306306
Integer I = sFields.get(name);
307307
if (I != null) {

‎android-record/src/main/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordModule.java

+7-3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@
5858
* @author Eran Leshem
5959
**/
6060
public class AndroidRecordModule extends SimpleModule {
61+
private static final long serialVersionUID = 1L;
62+
6163
private static final class AndroidRecordNaming
6264
extends DefaultAccessorNamingStrategy
6365
{
@@ -66,7 +68,7 @@ private static final class AndroidRecordNaming
6668
*/
6769
private final Set<String> _componentNames;
6870

69-
private AndroidRecordNaming(MapperConfig<?> config, AnnotatedClass forClass) {
71+
AndroidRecordNaming(MapperConfig<?> config, AnnotatedClass forClass) {
7072
super(config, forClass,
7173
// no setters for (immutable) Records:
7274
null,
@@ -89,7 +91,9 @@ public String findNameForRegularGetter(AnnotatedMethod am, String name)
8991
}
9092
}
9193

92-
private static class AndroidRecordClassIntrospector extends BasicClassIntrospector {
94+
static class AndroidRecordClassIntrospector extends BasicClassIntrospector {
95+
private static final long serialVersionUID = 1L;
96+
9397
@Override
9498
protected POJOPropertiesCollector collectProperties(MapperConfig<?> config, JavaType type, MixInResolver r,
9599
boolean forSerialization) {
@@ -159,7 +163,7 @@ && isDesugaredRecordClass(raw)) {
159163
return defaultInstantiator;
160164
}
161165

162-
private static Stream<Field> getDesugaredRecordComponents(Class<?> raw) {
166+
static Stream<Field> getDesugaredRecordComponents(Class<?> raw) {
163167
return Arrays.stream(raw.getDeclaredFields()).filter(field -> ! Modifier.isStatic(field.getModifiers()));
164168
}
165169
}

‎android-record/src/test/java/com/fasterxml/jackson/module/androidrecord/AndroidRecordTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
* @author Eran Leshem
2323
**/
2424
public class AndroidRecordTest extends TestCase {
25-
private static final class Simple extends RecordTag {
25+
static final class Simple extends RecordTag {
2626
static int si = 7;
2727
private final int i;
2828
private final int j;
2929
private final String s;
3030
private final List<String> l;
3131
private final AtomicInteger ai;
3232

33-
private Simple(int i, int j, String s, List<String> l, AtomicInteger ai) {
33+
Simple(int i, int j, String s, List<String> l, AtomicInteger ai) {
3434
this.i = i;
3535
this.j = j;
3636
this.s = s;
@@ -72,26 +72,26 @@ public boolean equals(Object o) {
7272
}
7373
}
7474

75-
private static final class MultipleConstructors extends RecordTag {
75+
static final class MultipleConstructors extends RecordTag {
7676
private final int i;
7777
private final List<String> l;
7878

79-
private MultipleConstructors(int i, List<String> l) {
79+
MultipleConstructors(int i, List<String> l) {
8080
this.i = i;
8181
this.l = l;
8282
}
8383

84-
private MultipleConstructors(String s, List<String> l) {
84+
MultipleConstructors(String s, List<String> l) {
8585
i = Integer.parseInt(s);
8686
this.l = l;
8787
}
8888

89-
private MultipleConstructors(int i, String s, List<String> l) {
89+
MultipleConstructors(int i, String s, List<String> l) {
9090
this.i = i;
9191
this.l = l;
9292
}
9393

94-
private MultipleConstructors(List<Integer> l, int i) {
94+
MultipleConstructors(List<Integer> l, int i) {
9595
this.i = i;
9696
this.l = null;
9797
}
@@ -106,16 +106,16 @@ List<String> l() {
106106
}
107107

108108

109-
private static final class ConflictingConstructors extends RecordTag {
109+
static final class ConflictingConstructors extends RecordTag {
110110
private final int i;
111111
private final String s;
112112

113-
private ConflictingConstructors(int i, String s) {
113+
ConflictingConstructors(int i, String s) {
114114
this.i = i;
115115
this.s = s;
116116
}
117117

118-
private ConflictingConstructors(String s, int i) {
118+
ConflictingConstructors(String s, int i) {
119119
this.i = i;
120120
this.s = s;
121121
}

‎blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/BBDeserializerModifier.java

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
public class BBDeserializerModifier extends BeanDeserializerModifier
2929
{
30+
private static final long serialVersionUID = 1L;
31+
3032
private static final MethodHandle TRAMPOLINE, BOOLEAN_TRAMPOLINE, LONG_TRAMPOLINE, INT_TRAMPOLINE;
3133

3234
static {

‎blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/deser/SuperSonicBeanDeserializer.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public Object deserialize(JsonParser p, DeserializationContext ctxt) throws IOEx
135135
}
136136
final Object bean = _valueInstantiator.createUsingDefault(ctxt);
137137
// [databind#631]: Assign current value, to be accessible by custom serializers
138-
p.setCurrentValue(bean);
138+
p.assignCurrentValue(bean);
139139
if (p.canReadObjectId()) {
140140
Object id = p.getObjectId();
141141
if (id != null) {
@@ -174,7 +174,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec
174174
throws IOException
175175
{
176176
// [databind#631]: Assign current value, to be accessible by custom deserializers
177-
p.setCurrentValue(bean);
177+
p.assignCurrentValue(bean);
178178
if (_injectables != null) {
179179
injectValues(ctxt, bean);
180180
}
@@ -191,7 +191,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt, Objec
191191
return super.deserialize(p, ctxt, bean);
192192
}
193193
} else if (!p.hasToken(JsonToken.FIELD_NAME)
194-
|| !prop.getName().equals(p.getCurrentName())) {
194+
|| !prop.getName().equals(p.currentName())) {
195195
// no, something funky, use base impl for special cases
196196
return super.deserialize(p, ctxt, bean);
197197
}
@@ -233,7 +233,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c
233233
// Allow Object Id references to come in as JSON Objects as well...
234234
if ((_objectIdReader != null) && _objectIdReader.maySerializeAsObject()) {
235235
if (p.hasTokenId(JsonTokenId.ID_FIELD_NAME)
236-
&& _objectIdReader.isValidReferencePropertyName(p.getCurrentName(), p)) {
236+
&& _objectIdReader.isValidReferencePropertyName(p.currentName(), p)) {
237237
return deserializeFromObjectId(p, ctxt);
238238
}
239239
}
@@ -252,7 +252,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c
252252
}
253253
final Object bean = _valueInstantiator.createUsingDefault(ctxt);
254254
// [databind#631]: Assign current value, to be accessible by custom serializers
255-
p.setCurrentValue(bean);
255+
p.assignCurrentValue(bean);
256256
if (p.canReadObjectId()) {
257257
Object id = p.getObjectId();
258258
if (id != null) {
@@ -269,7 +269,7 @@ public final Object deserializeFromObject(JsonParser p, DeserializationContext c
269269
return super.deserialize(p, ctxt, bean);
270270
}
271271
} else if (!p.hasToken(JsonToken.FIELD_NAME)
272-
|| !prop.getName().equals(p.getCurrentName())) {
272+
|| !prop.getName().equals(p.currentName())) {
273273
return super.deserialize(p, ctxt, bean);
274274
}
275275
// and deserialize

‎blackbird/src/main/java/com/fasterxml/jackson/module/blackbird/ser/BBSerializerModifier.java

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626

2727
public class BBSerializerModifier extends BeanSerializerModifier
2828
{
29+
private static final long serialVersionUID = 1L;
30+
2931
private final Function<Class<?>, Lookup> _lookups;
3032
private final UnaryOperator<Lookup> _accessGrant;
3133

‎blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/BlackbirdTestBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ protected void verifyFieldName(JsonParser jp, String expName)
251251
throws IOException
252252
{
253253
assertEquals(expName, jp.getText());
254-
assertEquals(expName, jp.getCurrentName());
254+
assertEquals(expName, jp.currentName());
255255
}
256256

257257
protected void verifyIntValue(JsonParser jp, long expValue)

‎blackbird/src/test/java/com/fasterxml/jackson/module/blackbird/ser/CustomBeanPropertyWriterTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ public SampleObject(String field1, Integer field2, Integer field3) {
2727
}
2828

2929
static class Only2BeanSerializerModifier extends BeanSerializerModifier {
30+
private static final long serialVersionUID = 1L;
31+
3032
@Override
3133
public List<BeanPropertyWriter> changeProperties(SerializationConfig config, BeanDescription beanDesc, List<BeanPropertyWriter> props)
3234
{

‎jakarta-xmlbind/src/test/java/com/fasterxml/jackson/module/jakarta/xmlbind/TestVersions.java

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55

66
import com.fasterxml.jackson.databind.type.TypeFactory;
77

8-
import com.fasterxml.jackson.module.jakarta.xmlbind.JakartaXmlBindAnnotationIntrospector;
9-
108
public class TestVersions extends ModuleTestBase
119
{
1210
public void testVersions()

‎jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestDeserializerCaching.java

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ static class MyType {
5252

5353
static class MyBeanDeserializerModifier extends BeanDeserializerModifier
5454
{
55+
private static final long serialVersionUID = 1L;
56+
5557
static int count = 0;
5658

5759
@Override

‎mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClasses.java

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ protected Bean() { }
3333
/**********************************************************
3434
*/
3535

36+
@SuppressWarnings("synthetic-access")
3637
public void testSimpleInteface() throws Exception
3738
{
3839
ObjectMapper mapper = newMrBeanMapper();

‎mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestAbstractClassesWithOverrides.java

+2
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public void testOverrides() throws Exception
8585
verifyBean(bean2);
8686
}
8787

88+
@SuppressWarnings("synthetic-access")
8889
public void testReAbstractedMethods() throws Exception
8990
{
9091
AbstractTypeMaterializer mat = new AbstractTypeMaterializer();
@@ -161,6 +162,7 @@ public void testEagerFailureOnReAbstractedMethods() throws Exception
161162
}
162163
}
163164

165+
@SuppressWarnings("synthetic-access")
164166
private void verifyBean(Bean bean) {
165167
assertNotNull(bean);
166168
assertEquals("abc", bean.getX());

‎mrbean/src/test/java/com/fasterxml/jackson/module/mrbean/TestSimpleMaterializedInterfaces.java

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public interface OtherInterface {
5959
}
6060

6161
public interface BeanWithDefaultForOtherInterface extends Bean, OtherInterface {
62+
@Override
6263
public default boolean anyValuePresent() {
6364
return getX() > 0 || getA() != null;
6465
}

0 commit comments

Comments
 (0)