-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Fix failing double
JsonCreators in jackson 2.12.0
#2978
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
cowtowncoder
merged 1 commit into
FasterXML:2.12
from
carterkozak:ckozak/fix_double_creator_regression
Dec 13, 2020
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
src/test/java/com/fasterxml/jackson/databind/deser/std/StdValueInstantiatorTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package com.fasterxml.jackson.databind.deser.std; | ||
|
||
import com.fasterxml.jackson.databind.BaseMapTest; | ||
|
||
import java.math.BigDecimal; | ||
|
||
public class StdValueInstantiatorTest extends BaseMapTest { | ||
|
||
public void testDoubleValidation_valid() { | ||
assertTrue(StdValueInstantiator.canConvertToDouble(BigDecimal.ZERO)); | ||
assertTrue(StdValueInstantiator.canConvertToDouble(BigDecimal.ONE)); | ||
assertTrue(StdValueInstantiator.canConvertToDouble(BigDecimal.TEN)); | ||
assertTrue(StdValueInstantiator.canConvertToDouble(BigDecimal.valueOf(-1.5D))); | ||
} | ||
|
||
public void testDoubleValidation_invalid() { | ||
BigDecimal value = BigDecimal.valueOf(Double.MAX_VALUE).add(BigDecimal.valueOf(Double.MAX_VALUE)); | ||
assertFalse(StdValueInstantiator.canConvertToDouble(value)); | ||
} | ||
} |
229 changes: 229 additions & 0 deletions
229
src/test/java/com/fasterxml/jackson/databind/jsontype/TestDoubleJsonCreator.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,229 @@ | ||
package com.fasterxml.jackson.databind.jsontype; | ||
|
||
import com.fasterxml.jackson.annotation.JsonAnyGetter; | ||
import com.fasterxml.jackson.annotation.JsonAnySetter; | ||
import com.fasterxml.jackson.annotation.JsonCreator; | ||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
import com.fasterxml.jackson.annotation.JsonProperty; | ||
import com.fasterxml.jackson.annotation.JsonSetter; | ||
import com.fasterxml.jackson.annotation.JsonSubTypes; | ||
import com.fasterxml.jackson.annotation.JsonTypeInfo; | ||
import com.fasterxml.jackson.annotation.JsonTypeName; | ||
import com.fasterxml.jackson.annotation.JsonValue; | ||
import com.fasterxml.jackson.core.type.TypeReference; | ||
import com.fasterxml.jackson.databind.BaseMapTest; | ||
|
||
import java.io.IOException; | ||
import java.util.HashMap; | ||
import java.util.Map; | ||
import java.util.Objects; | ||
|
||
public class TestDoubleJsonCreator extends BaseMapTest { | ||
|
||
public static final class UnionExample { | ||
private final Base value; | ||
|
||
@JsonCreator(mode = JsonCreator.Mode.DELEGATING) | ||
private UnionExample(Base value) { | ||
this.value = value; | ||
} | ||
|
||
@JsonValue | ||
private Base getValue() { | ||
return value; | ||
} | ||
|
||
public static UnionExample double_(AliasDouble value) { | ||
return new UnionExample(new DoubleWrapper(value)); | ||
} | ||
|
||
public <T> T accept(Visitor<T> visitor) { | ||
return value.accept(visitor); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object other) { | ||
return this == other || (other instanceof UnionExample && equalTo((UnionExample) other)); | ||
} | ||
|
||
private boolean equalTo(UnionExample other) { | ||
return this.value.equals(other.value); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hashCode(this.value); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "UnionExample{value: " + value + '}'; | ||
} | ||
|
||
public interface Visitor<T> { | ||
T visitDouble(AliasDouble value); | ||
|
||
T visitUnknown(String unknownType); | ||
} | ||
|
||
@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type", visible = true, defaultImpl = UnknownWrapper.class) | ||
@JsonSubTypes(@JsonSubTypes.Type(UnionExample.DoubleWrapper.class)) | ||
@JsonIgnoreProperties(ignoreUnknown = true) | ||
private interface Base { | ||
<T> T accept(Visitor<T> visitor); | ||
} | ||
|
||
@JsonTypeName("double") | ||
private static final class DoubleWrapper implements Base { | ||
private final AliasDouble value; | ||
|
||
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES) | ||
private DoubleWrapper(@JsonSetter("double") AliasDouble value) { | ||
Objects.requireNonNull(value, "double cannot be null"); | ||
this.value = value; | ||
} | ||
|
||
@JsonProperty("double") | ||
private AliasDouble getValue() { | ||
return value; | ||
} | ||
|
||
@Override | ||
public <T> T accept(Visitor<T> visitor) { | ||
return visitor.visitDouble(value); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object other) { | ||
return this == other || (other instanceof DoubleWrapper && equalTo((DoubleWrapper) other)); | ||
} | ||
|
||
private boolean equalTo(DoubleWrapper other) { | ||
return this.value.equals(other.value); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hashCode(this.value); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "DoubleWrapper{value: " + value + '}'; | ||
} | ||
} | ||
|
||
@JsonTypeInfo( | ||
use = JsonTypeInfo.Id.NAME, | ||
include = JsonTypeInfo.As.EXISTING_PROPERTY, | ||
property = "type", | ||
visible = true) | ||
private static final class UnknownWrapper implements Base { | ||
private final String type; | ||
|
||
private final Map<String, Object> value; | ||
|
||
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES) | ||
private UnknownWrapper(@JsonProperty("type") String type) { | ||
this(type, new HashMap<String, Object>()); | ||
} | ||
|
||
private UnknownWrapper(String type, Map<String, Object> value) { | ||
Objects.requireNonNull(type, "type cannot be null"); | ||
Objects.requireNonNull(value, "value cannot be null"); | ||
this.type = type; | ||
this.value = value; | ||
} | ||
|
||
@JsonProperty | ||
private String getType() { | ||
return type; | ||
} | ||
|
||
@JsonAnyGetter | ||
private Map<String, Object> getValue() { | ||
return value; | ||
} | ||
|
||
@JsonAnySetter | ||
private void put(String key, Object val) { | ||
value.put(key, val); | ||
} | ||
|
||
@Override | ||
public <T> T accept(Visitor<T> visitor) { | ||
return visitor.visitUnknown(type); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object other) { | ||
return this == other || (other instanceof UnknownWrapper && equalTo((UnknownWrapper) other)); | ||
} | ||
|
||
private boolean equalTo(UnknownWrapper other) { | ||
return this.type.equals(other.type) && this.value.equals(other.value); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hash(this.type, this.value); | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return "UnknownWrapper{type: " + type + ", value: " + value + '}'; | ||
} | ||
} | ||
} | ||
|
||
public static final class AliasDouble { | ||
private final double value; | ||
|
||
private AliasDouble(double value) { | ||
this.value = value; | ||
} | ||
|
||
@JsonValue | ||
public double get() { | ||
return value; | ||
} | ||
|
||
@Override | ||
public String toString() { | ||
return String.valueOf(value); | ||
} | ||
|
||
@Override | ||
public boolean equals(Object other) { | ||
return this == other | ||
|| (other instanceof AliasDouble | ||
&& Double.doubleToLongBits(this.value) == Double.doubleToLongBits(((AliasDouble) other).value)); | ||
} | ||
|
||
@Override | ||
public int hashCode() { | ||
return Objects.hashCode(value); | ||
} | ||
|
||
@JsonCreator(mode = JsonCreator.Mode.DELEGATING) | ||
public static AliasDouble of(double value) { | ||
return new AliasDouble(value); | ||
} | ||
} | ||
|
||
public void testDeserializationTypeFieldLast() throws IOException { | ||
UnionExample expected = UnionExample.double_(AliasDouble.of(2.0D)); | ||
UnionExample actual = objectMapper().readValue( | ||
a2q("{'double': 2.0,'type':'double'}"), | ||
new TypeReference<UnionExample>() {}); | ||
assertEquals(expected, actual); | ||
} | ||
|
||
public void testDeserializationTypeFieldFirst() throws IOException { | ||
UnionExample expected = UnionExample.double_(AliasDouble.of(2.0D)); | ||
UnionExample actual = objectMapper().readValue( | ||
a2q("{'type':'double','double': 2.0}"), | ||
new TypeReference<UnionExample>() {}); | ||
assertEquals(expected, actual); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. While this test passes on both versions. |
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test passes on 2.11 and fails on 2.12 with: