Change EnumNamingStrategy.convertEnumToExternalName() to take MapperConfig argument (#4679)

Author: JooHyukKim

src/main/java/tools/jackson/databind/EnumNamingStrategies.java

@@ -1,5 +1,8 @@
 package tools.jackson.databind;
 
+import tools.jackson.databind.cfg.MapperConfig;
+import tools.jackson.databind.introspect.AnnotatedClass;
+
 /**
  * A container class for implementations of the {@link EnumNamingStrategy} interface.
  */
@@ -49,7 +52,9 @@ public static class CamelCaseStrategy implements EnumNamingStrategy
         public static final CamelCaseStrategy INSTANCE = new CamelCaseStrategy();
 
         @Override
-        public String convertEnumToExternalName(String enumName) {
+        public String convertEnumToExternalName(MapperConfig<?> config, AnnotatedClass cls,
+                String enumName)
+        {
             if (enumName == null) {
                 return null;
             }

src/main/java/tools/jackson/databind/EnumNamingStrategy.java

@@ -1,5 +1,8 @@
 package tools.jackson.databind;
 
+import tools.jackson.databind.cfg.MapperConfig;
+import tools.jackson.databind.introspect.AnnotatedClass;
+
 /**
  * Defines how the string representation of an enum is converted into an external property name for mapping
  * during deserialization.
@@ -11,9 +14,13 @@ public interface EnumNamingStrategy {
      * the implementation of this {@link EnumNamingStrategy}.
      *
      * @param enumName the name of the enum value to translate
+     * @param config the mapper configuration
+     * @param cls the Enum class
+     *
      * @return the external property name that corresponds to the given <code>enumName</code>
      * according to the implementation of this {@link EnumNamingStrategy}.
      */
-    public String convertEnumToExternalName(String enumName);
+    public String convertEnumToExternalName(MapperConfig<?> config, AnnotatedClass cls,
+                String enumName);
 
 }

src/main/java/tools/jackson/databind/deser/jdk/EnumDeserializer.java

@@ -11,9 +11,11 @@
 import tools.jackson.databind.annotation.JacksonStdImpl;
 import tools.jackson.databind.cfg.CoercionAction;
 import tools.jackson.databind.cfg.CoercionInputShape;
+import tools.jackson.databind.cfg.MapperConfig;
 import tools.jackson.databind.deser.SettableBeanProperty;
 import tools.jackson.databind.deser.ValueInstantiator;
 import tools.jackson.databind.deser.std.StdScalarDeserializer;
+import tools.jackson.databind.introspect.AnnotatedClass;
 import tools.jackson.databind.introspect.AnnotatedMethod;
 import tools.jackson.databind.type.LogicalType;
 import tools.jackson.databind.util.ClassUtil;
@@ -53,7 +55,7 @@ public class EnumDeserializer
 
     /**
      * Look up map with <b>key</b> as <code>Enum.name()</code> converted by
-     * {@link EnumNamingStrategy#convertEnumToExternalName(String)}
+     * {@link EnumNamingStrategy#convertEnumToExternalName(MapperConfig, AnnotatedClass, String)}
      * and <b>value</b> as Enums.
      */
     protected final CompactStringObjectMap _lookupByEnumNaming;

src/main/java/tools/jackson/databind/deser/jdk/JDKKeyDeserializer.java

@@ -16,6 +16,8 @@
 import tools.jackson.databind.*;
 import tools.jackson.databind.annotation.JacksonStdImpl;
 import tools.jackson.databind.cfg.EnumFeature;
+import tools.jackson.databind.cfg.MapperConfig;
+import tools.jackson.databind.introspect.AnnotatedClass;
 import tools.jackson.databind.introspect.AnnotatedMethod;
 import tools.jackson.databind.util.ClassUtil;
 import tools.jackson.databind.util.EnumResolver;
@@ -375,7 +377,7 @@ final static class EnumKD extends JDKKeyDeserializer
 
         /**
          * Look up map with <b>key</b> as <code>Enum.name()</code> converted by
-         * {@link EnumNamingStrategy#convertEnumToExternalName(String)}
+         * {@link EnumNamingStrategy#convertEnumToExternalName(MapperConfig, AnnotatedClass, String)}
          * and <b>value</b> as Enums.
          *
          * @since 2.15

src/main/java/tools/jackson/databind/util/EnumResolver.java

@@ -207,7 +207,9 @@ public static EnumResolver constructUsingEnumNamingStrategy(DeserializationConfi
             Enum<?> anEnum = enumConstants[i];
             String name = names[i];
             if (name == null) {
-                name = enumNamingStrategy.convertEnumToExternalName(anEnum.name());
+                name = enumNamingStrategy.convertEnumToExternalName(config,
+                        annotatedClass,
+                        anEnum.name());
             }
             map.put(name, anEnum);
             String[] aliases = allAliases[i];

src/main/java/tools/jackson/databind/util/EnumValues.java

@@ -144,7 +144,8 @@ public static EnumValues constructUsingEnumNamingStrategy(MapperConfig<?> config
             Enum<?> enumValue = enumConstants[i];
             String name = names[i];
             if (name == null) {
-                name = namingStrategy.convertEnumToExternalName(enumValue.name());
+                name = namingStrategy.convertEnumToExternalName(config, annotatedClass,
+                        enumValue.name());
             }
             if (useLowerCase) {
                 name = name.toLowerCase();

src/test/java/tools/jackson/databind/introspect/EnumNamingStrategiesTest.java

@@ -6,6 +6,7 @@
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.databind.EnumNamingStrategies;
+import tools.jackson.databind.cfg.MapperConfig;
 import tools.jackson.databind.testutil.DatabindTestUtil;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -112,7 +113,7 @@ public class EnumNamingStrategiesTest extends DatabindTestUtil
 
     /**
      * Unit test to verify the implementation of
-     * {@link tools.jackson.databind.EnumNamingStrategies.CamelCaseStrategy#convertEnumToExternalName(String)}
+     * {@link tools.jackson.databind.EnumNamingStrategies.CamelCaseStrategy#convertEnumToExternalName(MapperConfig, AnnotatedClass, String)}
      * without the context of an ObjectMapper.
      */
     @Test
@@ -122,7 +123,7 @@ public void testCamelCaseStrategyStandAlone() {
             final String expected = pair[1];
 
             String actual = EnumNamingStrategies.CamelCaseStrategy.INSTANCE
-                    .convertEnumToExternalName(input);
+                    .convertEnumToExternalName(null, null, input);
 
             assertEquals(expected, actual);
         }