From 95b9ca9139d51a8292cba97308762cf786651dc4 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Fri, 1 Dec 2023 10:20:42 +0900 Subject: [PATCH 1/4] Create ci-stale-issue-pr.yaml --- .github/workflows/ci-stale-issue-pr.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/ci-stale-issue-pr.yaml diff --git a/.github/workflows/ci-stale-issue-pr.yaml b/.github/workflows/ci-stale-issue-pr.yaml new file mode 100644 index 0000000000..c4303f83a3 --- /dev/null +++ b/.github/workflows/ci-stale-issue-pr.yaml @@ -0,0 +1,17 @@ +name: 'Stale issues and PRs' +on: + schedule: + - cron: '30 1 * * *' + +jobs: + stale: + runs-on: ubuntu-22.04 + steps: + - uses: actions/stale@v4 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + stale-issue-message: 'The issue had no activity for 30 days, mark with Stale label.' + stale-pr-message: 'The pr had no activity for 30 days, mark with Stale label.' + days-before-stale: 30 + days-before-close: -1 + operations-per-run: 700 From 211da987fc46c9f36649cffdd8b708a8a404fc42 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Tue, 26 Aug 2025 03:59:05 +0900 Subject: [PATCH 2/4] Fix 5271 --- .../deser/enums/EnumDeserializer5271Test.java | 46 +++++++++++++++++++ .../databind/ser/EnumAsMapKeyTest.java | 2 + 2 files changed, 48 insertions(+) create mode 100644 src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializer5271Test.java diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializer5271Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializer5271Test.java new file mode 100644 index 0000000000..df955625b9 --- /dev/null +++ b/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializer5271Test.java @@ -0,0 +1,46 @@ +package com.fasterxml.jackson.databind.deser.enums; + +import org.junit.jupiter.api.Test; + +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; +import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +public class EnumDeserializer5271Test + extends DatabindTestUtil +{ + public enum MyEnum { + T10("10%"), T20("20%"), T30("30%"); + + private final String code; + + MyEnum(String code) { + this.code = code; + } + + @JsonValue + public String getCode() { + return code; + } + } + + @Test + void convertStringToEnum() { + _testConvert( + jsonMapperBuilder().disable(DeserializationFeature.READ_ENUMS_USING_TO_STRING) + .build() + ); + _testConvert(jsonMapperBuilder().enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING) + .build() + ); + } + + private void _testConvert(JsonMapper mapper) { + assertThat(mapper.convertValue("10%", MyEnum.class)) + .isEqualTo(MyEnum.T10); + } + +} \ No newline at end of file diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/EnumAsMapKeyTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/EnumAsMapKeyTest.java index c7f4685fa7..d84d381628 100644 --- a/src/test/java/com/fasterxml/jackson/databind/ser/EnumAsMapKeyTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/ser/EnumAsMapKeyTest.java @@ -130,6 +130,8 @@ public void testCustomEnumMapKeySerializer() throws Exception { public void testJsonValueForEnumMapKey() throws Exception { assertEquals(a2q("{'stuff':{'longValue':'foo'}}"), MAPPER.writeValueAsString(new MyStuff594("foo"))); + MyStuff594 ff = MAPPER.readValue(a2q("{'stuff':{'longValue':'foo'}}"), MyStuff594.class); + System.out.println(); } // [databind#2129] From 676c3c236c95cca44887c10adce1a3cbba9e40f1 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Tue, 26 Aug 2025 04:01:02 +0900 Subject: [PATCH 3/4] Fix 5271 --- .../databind/deser/enums/EnumDeserializer5271Test.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializer5271Test.java b/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializer5271Test.java index df955625b9..1f52925174 100644 --- a/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializer5271Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/enums/EnumDeserializer5271Test.java @@ -5,12 +5,10 @@ import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.json.JsonMapper; -import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; public class EnumDeserializer5271Test - extends DatabindTestUtil { public enum MyEnum { T10("10%"), T20("20%"), T30("30%"); @@ -29,11 +27,10 @@ public String getCode() { @Test void convertStringToEnum() { - _testConvert( - jsonMapperBuilder().disable(DeserializationFeature.READ_ENUMS_USING_TO_STRING) + _testConvert(JsonMapper.builder().disable(DeserializationFeature.READ_ENUMS_USING_TO_STRING) .build() ); - _testConvert(jsonMapperBuilder().enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING) + _testConvert(JsonMapper.builder().enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING) .build() ); } From 614abddd33fffe3974d1e6386529c472d4ecced6 Mon Sep 17 00:00:00 2001 From: "Kim, Joo Hyuk" Date: Tue, 26 Aug 2025 04:01:44 +0900 Subject: [PATCH 4/4] Clean --- .github/workflows/ci-stale-issue-pr.yaml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 .github/workflows/ci-stale-issue-pr.yaml diff --git a/.github/workflows/ci-stale-issue-pr.yaml b/.github/workflows/ci-stale-issue-pr.yaml deleted file mode 100644 index c4303f83a3..0000000000 --- a/.github/workflows/ci-stale-issue-pr.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: 'Stale issues and PRs' -on: - schedule: - - cron: '30 1 * * *' - -jobs: - stale: - runs-on: ubuntu-22.04 - steps: - - uses: actions/stale@v4 - with: - repo-token: ${{ secrets.GITHUB_TOKEN }} - stale-issue-message: 'The issue had no activity for 30 days, mark with Stale label.' - stale-pr-message: 'The pr had no activity for 30 days, mark with Stale label.' - days-before-stale: 30 - days-before-close: -1 - operations-per-run: 700