Fix #3580 Enum (de)serialization in conjunction with JsonFormat.Shape.NUMBER_INT
#5333
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
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
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
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,53 @@ | ||
| package com.fasterxml.jackson.databind.records; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonFormat; | ||
| import com.fasterxml.jackson.annotation.JsonValue; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.databind.exc.InvalidFormatException; | ||
| import com.fasterxml.jackson.databind.json.JsonMapper; | ||
| import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| // [databind#3580] Enum (de)serialization in conjunction with JsonFormat.Shape.NUMBER_INT | ||
| public class EnumNumberFormatShapeRecord3580Test | ||
| extends DatabindTestUtil | ||
| { | ||
| public record Record3580(@JsonFormat(shape = JsonFormat.Shape.NUMBER) RecordState3580 state) {} | ||
|
|
||
| public enum RecordState3580 { | ||
| OFF(17), | ||
| ON(31), | ||
| UNKNOWN(99); | ||
|
|
||
| private int value; | ||
|
|
||
| RecordState3580(int value) { this.value = value; } | ||
|
|
||
| @JsonValue | ||
| public int value() {return this.value;} | ||
| } | ||
|
|
||
| @Test | ||
| public void testEnumNumberFormatShapeRecord3580() | ||
| throws Exception | ||
| { | ||
| ObjectMapper mapper = JsonMapper.builder().build(); | ||
|
|
||
| // Serialize | ||
| assertEquals("{\"state\":17}", mapper.writeValueAsString(new Record3580(RecordState3580.OFF))); // | ||
| assertEquals("{\"state\":31}", mapper.writeValueAsString(new Record3580(RecordState3580.ON))); // | ||
| assertEquals("{\"state\":99}", mapper.writeValueAsString(new Record3580(RecordState3580.UNKNOWN))); // | ||
|
|
||
| // Pass Deserialize | ||
| assertEquals(RecordState3580.OFF, mapper.readValue("{\"state\":17}", Record3580.class).state); // Pojo[state=OFF] | ||
| assertEquals(RecordState3580.ON, mapper.readValue("{\"state\":31}", Record3580.class).state); // Pojo[state=OFF] | ||
| assertEquals(RecordState3580.UNKNOWN, mapper.readValue("{\"state\":99}", Record3580.class).state); // Pojo[state=OFF] | ||
|
|
||
| // Fail : Try to use ordinal number | ||
| assertThrows(InvalidFormatException.class, () -> mapper.readValue("{\"state\":0}", Record3580.class)); | ||
| } | ||
| } |
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,58 @@ | ||
| package com.fasterxml.jackson.databind.format; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonFormat; | ||
| import com.fasterxml.jackson.annotation.JsonValue; | ||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import com.fasterxml.jackson.databind.exc.InvalidFormatException; | ||
| import com.fasterxml.jackson.databind.json.JsonMapper; | ||
| import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertThrows; | ||
|
|
||
| // [databind#3580] Enum (de)serialization in conjunction with JsonFormat.Shape.NUMBER_INT | ||
| public class EnumNumberFormatShape3580Test | ||
| extends DatabindTestUtil | ||
| { | ||
| public static class Pojo3580 { | ||
| public PojoState3580 state; | ||
| public Pojo3580() {} | ||
| public Pojo3580(PojoState3580 state) {this.state = state;} | ||
| } | ||
|
|
||
| @JsonFormat(shape = JsonFormat.Shape.NUMBER_INT) | ||
| public enum PojoState3580 { | ||
| OFF(17), | ||
| ON(31), | ||
| UNKNOWN(99); | ||
|
|
||
| private int value; | ||
|
|
||
| PojoState3580(int value) { this.value = value; } | ||
|
|
||
| @JsonValue | ||
| public int value() {return this.value;} | ||
| } | ||
|
|
||
| @Test | ||
| public void testEnumNumberFormatShape3580() | ||
| throws Exception | ||
| { | ||
| ObjectMapper mapper = JsonMapper.builder().build(); | ||
|
|
||
| // Serialize | ||
| assertEquals("{\"state\":17}", mapper.writeValueAsString(new Pojo3580(PojoState3580.OFF))); // | ||
| assertEquals("{\"state\":31}", mapper.writeValueAsString(new Pojo3580(PojoState3580.ON))); // | ||
| assertEquals("{\"state\":99}", mapper.writeValueAsString(new Pojo3580(PojoState3580.UNKNOWN))); // | ||
|
|
||
| // Pass Deserialize | ||
| assertEquals(PojoState3580.OFF, mapper.readValue("{\"state\":17}", Pojo3580.class).state); // Pojo[state=OFF] | ||
| assertEquals(PojoState3580.ON, mapper.readValue("{\"state\":31}", Pojo3580.class).state); // Pojo[state=OFF] | ||
| assertEquals(PojoState3580.UNKNOWN, mapper.readValue("{\"state\":99}", Pojo3580.class).state); // Pojo[state=OFF] | ||
|
|
||
| // Fail : Try to use ordinal number | ||
| assertThrows(InvalidFormatException.class, () -> mapper.readValue("{\"state\":0}", Pojo3580.class)); | ||
| } | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.