Skip to content

Commit c0c8817

Browse files
committed
Minor test cleanup
1 parent 4cfee07 commit c0c8817

File tree

10 files changed

+31
-1
lines changed

10 files changed

+31
-1
lines changed

src/main/java/com/fasterxml/jackson/databind/deser/CreatorProperty.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ public CreatorProperty withName(PropertyName newName) {
111111

112112
@Override
113113
public CreatorProperty withValueDeserializer(JsonDeserializer<?> deser) {
114+
if (_valueDeserializer == deser) {
115+
return this;
116+
}
114117
return new CreatorProperty(this, deser);
115118
}
116119

src/main/java/com/fasterxml/jackson/databind/deser/SettableBeanProperty.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ public final Object deserialize(JsonParser p, DeserializationContext ctxt) throw
503503
}
504504
return _valueDeserializer.deserialize(p, ctxt);
505505
}
506-
506+
507507
/*
508508
/**********************************************************
509509
/* Helper methods

src/main/java/com/fasterxml/jackson/databind/deser/impl/FieldProperty.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ public FieldProperty withName(PropertyName newName) {
7373

7474
@Override
7575
public FieldProperty withValueDeserializer(JsonDeserializer<?> deser) {
76+
if (_valueDeserializer == deser) {
77+
return this;
78+
}
7679
return new FieldProperty(this, deser);
7780
}
7881

src/main/java/com/fasterxml/jackson/databind/deser/impl/InnerClassProperty.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ public InnerClassProperty withName(PropertyName newName) {
8181

8282
@Override
8383
public InnerClassProperty withValueDeserializer(JsonDeserializer<?> deser) {
84+
if (_valueDeserializer == deser) {
85+
return this;
86+
}
8487
return new InnerClassProperty(this, deser);
8588
}
8689

src/main/java/com/fasterxml/jackson/databind/deser/impl/ManagedReferenceProperty.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ public ManagedReferenceProperty withName(PropertyName newName) {
6969

7070
@Override
7171
public ManagedReferenceProperty withValueDeserializer(JsonDeserializer<?> deser) {
72+
if (_valueDeserializer == deser) {
73+
return this;
74+
}
7275
return new ManagedReferenceProperty(this, deser);
7376
}
7477

src/main/java/com/fasterxml/jackson/databind/deser/impl/MethodProperty.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ public MethodProperty withName(PropertyName newName) {
6666

6767
@Override
6868
public MethodProperty withValueDeserializer(JsonDeserializer<?> deser) {
69+
if (_valueDeserializer == deser) {
70+
return this;
71+
}
6972
return new MethodProperty(this, deser);
7073
}
7174

src/main/java/com/fasterxml/jackson/databind/deser/impl/ObjectIdReferenceProperty.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ public ObjectIdReferenceProperty(ObjectIdReferenceProperty src, PropertyName new
4040

4141
@Override
4242
public SettableBeanProperty withValueDeserializer(JsonDeserializer<?> deser) {
43+
if (_valueDeserializer == deser) {
44+
return this;
45+
}
4346
return new ObjectIdReferenceProperty(this, deser);
4447
}
4548

src/main/java/com/fasterxml/jackson/databind/deser/impl/ObjectIdValueProperty.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ public ObjectIdValueProperty withName(PropertyName newName) {
4747

4848
@Override
4949
public ObjectIdValueProperty withValueDeserializer(JsonDeserializer<?> deser) {
50+
if (_valueDeserializer == deser) {
51+
return this;
52+
}
5053
return new ObjectIdValueProperty(this, deser);
5154
}
5255

src/main/java/com/fasterxml/jackson/databind/deser/impl/SetterlessProperty.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ public SetterlessProperty withName(PropertyName newName) {
5959

6060
@Override
6161
public SetterlessProperty withValueDeserializer(JsonDeserializer<?> deser) {
62+
if (_valueDeserializer == deser) {
63+
return this;
64+
}
6265
return new SetterlessProperty(this, deser);
6366
}
6467

src/test/java/com/fasterxml/jackson/databind/convert/ConvertingAbstractSerializer795Test.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ public static class NonAbstractCustomTypeUser {
6565
}
6666
}
6767

68+
/*
69+
/**********************************************************
70+
/* Test methods
71+
/**********************************************************
72+
*/
73+
6874
private static final ObjectMapper JSON_MAPPER = new ObjectMapper();
6975

7076
public void testAbstractTypeDeserialization() throws Exception {

0 commit comments

Comments
 (0)