-
-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
10 changed files
with
752 additions
and
271 deletions.
There are no files selected for viewing
This file contains 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 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 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
463 changes: 405 additions & 58 deletions
463
src/main/java/com/fasterxml/jackson/databind/EnumNamingStrategies.java
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains 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
157 changes: 157 additions & 0 deletions
157
src/main/java/com/fasterxml/jackson/databind/util/NamingStrategyImpls.java
This file contains 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,157 @@ | ||
| package com.fasterxml.jackson.databind.util; | ||
|
|
||
| /** | ||
| * Container for standard naming strategy implementations, specifically | ||
| * used by property naming strategies (see {@link com.fasterxml.jackson.databind.PropertyNamingStrategies}) | ||
| * and enum naming strategies (see {@link com.fasterxml.jackson.databind.EnumNamingStrategies}). | ||
| */ | ||
| public enum NamingStrategyImpls { | ||
| /** | ||
| * beanName -> beanName | ||
| */ | ||
| LOWER_CAMEL_CASE { | ||
| @Override | ||
| public String translate(String beanName) { | ||
| return beanName; // beanName is already in lower camel case | ||
| } | ||
| }, | ||
|
|
||
| /** | ||
| * beanName -> BeanName | ||
| */ | ||
| UPPER_CAMEL_CASE { | ||
| @Override | ||
| public String translate(String beanName) { | ||
| if (beanName == null || beanName.isEmpty()) { | ||
| return beanName; // garbage in, garbage out | ||
| } | ||
| // Replace first lower-case letter with upper-case equivalent | ||
| char c = beanName.charAt(0); | ||
| char uc = Character.toUpperCase(c); | ||
| if (c == uc) { | ||
| return beanName; | ||
| } | ||
| StringBuilder sb = new StringBuilder(beanName); | ||
| sb.setCharAt(0, uc); | ||
| return sb.toString(); | ||
| } | ||
| }, | ||
|
|
||
| /** | ||
| * beanName -> bean_name | ||
| */ | ||
| SNAKE_CASE { | ||
| @Override | ||
| public String translate(String beanName) { | ||
| if (beanName == null) return beanName; // garbage in, garbage out | ||
| int length = beanName.length(); | ||
| StringBuilder result = new StringBuilder(length * 2); | ||
| int resultLength = 0; | ||
| boolean wasPrevTranslated = false; | ||
| for (int i = 0; i < length; i++) { | ||
| char c = beanName.charAt(i); | ||
| if (i > 0 || c != '_') // skip first starting underscore | ||
| { | ||
| if (Character.isUpperCase(c)) { | ||
| if (!wasPrevTranslated && resultLength > 0 && result.charAt(resultLength - 1) != '_') { | ||
| result.append('_'); | ||
| resultLength++; | ||
| } | ||
| c = Character.toLowerCase(c); | ||
| wasPrevTranslated = true; | ||
| } else { | ||
| wasPrevTranslated = false; | ||
| } | ||
| result.append(c); | ||
| resultLength++; | ||
| } | ||
| } | ||
| return resultLength > 0 ? result.toString() : beanName; | ||
| } | ||
| }, | ||
|
|
||
| /** | ||
| * beanName -> BEAN_NAME | ||
| */ | ||
| UPPER_SNAKE_CASE { | ||
| @Override | ||
| public String translate(String beanName) { | ||
| String output = SNAKE_CASE.translate(beanName); | ||
| if (output == null) { | ||
| return null; | ||
| } | ||
| return output.toUpperCase(); | ||
| } | ||
| }, | ||
|
|
||
| /** | ||
| * beanName -> beanname | ||
| */ | ||
| LOWER_CASE { | ||
| @Override | ||
| public String translate(String beanName) { | ||
| if (beanName == null || beanName.isEmpty()) { | ||
| return beanName; | ||
| } | ||
| return beanName.toLowerCase(); | ||
| } | ||
| }, | ||
|
|
||
| /** | ||
| * beanName -> bean-name | ||
| */ | ||
| KEBAB_CASE { | ||
| @Override | ||
| public String translate(String beanName) { | ||
| return translateLowerCaseWithSeparator(beanName, '-'); | ||
| } | ||
| }, | ||
|
|
||
| /** | ||
| * beanName -> bean.name | ||
| */ | ||
| LOWER_DOT_CASE { | ||
| @Override | ||
| public String translate(String beanName) { | ||
| return translateLowerCaseWithSeparator(beanName, '.'); | ||
| } | ||
| }, | ||
| ; | ||
|
|
||
| public abstract String translate(final String beanName); | ||
|
|
||
| /** | ||
| * Helper method to share implementation between snake and dotted case. | ||
| */ | ||
| static String translateLowerCaseWithSeparator(final String beanName, final char separator) { | ||
| if (beanName == null || beanName.isEmpty()) { | ||
| return beanName; | ||
| } | ||
|
|
||
| final int length = beanName.length(); | ||
| final StringBuilder result = new StringBuilder(length + (length >> 1)); | ||
| int upperCount = 0; | ||
| for (int i = 0; i < length; ++i) { | ||
| char ch = beanName.charAt(i); | ||
| char lc = Character.toLowerCase(ch); | ||
|
|
||
| if (lc == ch) { // lower-case letter means we can get new word | ||
| // but need to check for multi-letter upper-case (acronym), where assumption | ||
| // is that the last upper-case char is start of a new word | ||
| if (upperCount > 1) { | ||
| // so insert hyphen before the last character now | ||
| result.insert(result.length() - 1, separator); | ||
| } | ||
| upperCount = 0; | ||
| } else { | ||
| // Otherwise starts new word, unless beginning of string | ||
| if ((upperCount == 0) && (i > 0)) { | ||
| result.append(separator); | ||
| } | ||
| ++upperCount; | ||
| } | ||
| result.append(lc); | ||
| } | ||
| return result.toString(); | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
...dk17/java/com/fasterxml/jackson/databind/tofix/RecordJsonCreatorAndJsonValue4724Test.java
This file contains 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,43 @@ | ||
| package com.fasterxml.jackson.databind.tofix; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonCreator; | ||
| import com.fasterxml.jackson.annotation.JsonValue; | ||
| import com.fasterxml.jackson.databind.testutil.DatabindTestUtil; | ||
| import com.fasterxml.jackson.databind.testutil.failure.JacksonTestFailureExpected; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| // [databind#4724] Deserialization behavior change with Java Records, JsonCreator and JsonValue between 2.17.2 => 2.18.0 | ||
| public class RecordJsonCreatorAndJsonValue4724Test | ||
| extends DatabindTestUtil | ||
| { | ||
|
|
||
| public record Something(String value) { | ||
| public Something { | ||
| if (value == null || value.isEmpty()) { | ||
| throw new IllegalArgumentException("Value cannot be null or empty"); | ||
| } | ||
| } | ||
|
|
||
| @JsonCreator | ||
| public static Something of(String value) { | ||
| if (value.isEmpty()) { | ||
| return null; | ||
| } | ||
| return new Something(value); | ||
| } | ||
|
|
||
| @Override | ||
| @JsonValue | ||
| public String toString() { | ||
| return value; | ||
| } | ||
| } | ||
|
|
||
| @JacksonTestFailureExpected | ||
| @Test | ||
| void deserialization() throws Exception { | ||
| newJsonMapper().readValue("\"\"", Something.class); | ||
| } | ||
|
|
||
| } |
Oops, something went wrong.