Use @JsonProperty over EnumNamingStrategy for Enum serializaton (#4040)

Author: iProdigy

src/main/java/com/fasterxml/jackson/databind/ser/std/EnumSerializer.java

@@ -299,6 +299,6 @@ protected static EnumValues constructEnumNamingStrategyValues(SerializationConfi
         EnumNamingStrategy enumNamingStrategy = EnumNamingStrategyFactory.createEnumNamingStrategyInstance(
             namingDef, config.canOverrideAccessModifiers());
         return enumNamingStrategy == null ? null : EnumValues.constructUsingEnumNamingStrategy(
-            config, enumClass, enumNamingStrategy);
+            config, annotatedClass, enumNamingStrategy);
     }
 }

src/main/java/com/fasterxml/jackson/databind/util/EnumValues.java

@@ -156,14 +156,52 @@ public static EnumValues constructFromToString(MapperConfig<?> config, Class<Enu
         return construct(config, enumClass, external);
     }
 
+    /**
+     * Returns String serializations of Enum name using an instance of {@link EnumNamingStrategy}.
+     * <p>
+     * The output {@link EnumValues} should contain values that are symmetric to
+     * {@link EnumResolver#constructUsingEnumNamingStrategy(DeserializationConfig, AnnotatedClass, EnumNamingStrategy)}.
+     *
+     * @since 2.16
+     */
+    public static EnumValues constructUsingEnumNamingStrategy(MapperConfig<?> config, AnnotatedClass annotatedClass,
+            EnumNamingStrategy namingStrategy)
+    {
+        // prepare data
+        final AnnotationIntrospector ai = config.getAnnotationIntrospector();
+        final Class<?> enumCls0 = annotatedClass.getRawType();
+        final Class<Enum<?>> enumCls = _enumClass(enumCls0);
+        final Enum<?>[] enumConstants = _enumConstants(enumCls0);
+
+        // introspect
+        String[] names = new String[enumConstants.length];
+        if (ai != null) {
+            ai.findEnumValues(config, annotatedClass, enumConstants, names);
+        }
+
+        // build
+        SerializableString[] textual = new SerializableString[enumConstants.length];
+        for (int i = 0, len = enumConstants.length; i < len; i++) {
+            Enum<?> enumValue = enumConstants[i];
+            String name = names[i];
+            if (name == null) {
+                name = namingStrategy.convertEnumToExternalName(enumValue.name());
+            }
+            textual[i] = config.compileString(name);
+        }
+        return construct(enumCls, textual);
+    }
+
     /**
      * Returns String serializations of Enum name using an instance of {@link EnumNamingStrategy}.
      *
      * The output {@link EnumValues} should contain values that are symmetric to
      * {@link EnumResolver#constructUsingEnumNamingStrategy(DeserializationConfig, AnnotatedClass, EnumNamingStrategy)}.
      *
      * @since 2.15
+     * @deprecated Since 2.16; use {@link #constructUsingEnumNamingStrategy(MapperConfig, AnnotatedClass, EnumNamingStrategy)} instead.
      */
+    @Deprecated
     public static EnumValues constructUsingEnumNamingStrategy(MapperConfig<?> config, Class<Enum<?>> enumClass, EnumNamingStrategy namingStrategy) {
         Class<? extends Enum<?>> cls = ClassUtil.findEnumType(enumClass);
         Enum<?>[] values = cls.getEnumConstants();

src/test/java/com/fasterxml/jackson/databind/ser/jdk/EnumNamingSerializationTest.java

@@ -48,6 +48,13 @@ static enum EnumFlavorD {
         PEANUT_BUTTER
     }
 
+    @EnumNaming(EnumNamingStrategies.CamelCaseStrategy.class)
+    static enum EnumFlavorE {
+        PEANUT_BUTTER,
+        @JsonProperty("almond")
+        ALMOND_BUTTER
+    }
+
     static class EnumFlavorWrapperBean {
         public EnumSauceB sauce;
 
@@ -102,4 +109,12 @@ public void testDesrEnumWithEnumMap() throws Exception {
 
         assertEquals(a2q("{'mayoNezz':'value'}"), str);
     }
+    
+    public void testEnumNamingStrategyWithOverride() throws Exception {
+        String almond = MAPPER.writeValueAsString(EnumFlavorE.ALMOND_BUTTER);
+        assertEquals(q("almond"), almond);
+
+        String peanut = MAPPER.writeValueAsString(EnumFlavorE.PEANUT_BUTTER);
+        assertEquals(q("peanutButter"), peanut);
+    }
 }