Minor additions post #4039

Author: cowtowncoder

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

@@ -74,25 +74,23 @@ public class EnumSerializer
     /**********************************************************
      */
 
+    /**
+     * @deprecated Since 2.16
+     */
+    @Deprecated // since 2.16
     public EnumSerializer(EnumValues v, Boolean serializeAsIndex)
     {
-        super(v.getEnumClass(), false);
-        _values = v;
-        _serializeAsIndex = serializeAsIndex;
-        _valuesByEnumNaming = null;
-        _valuesByToString = null;
+        this(v, serializeAsIndex, null, null);
     }
 
     /**
      * @since 2.15
+     * @deprecated Since 2.16
      */
+    @Deprecated
     public EnumSerializer(EnumValues v, Boolean serializeAsIndex, EnumValues valuesByEnumNaming)
     {
-        super(v.getEnumClass(), false);
-        _values = v;
-        _serializeAsIndex = serializeAsIndex;
-        _valuesByEnumNaming = valuesByEnumNaming;
-        _valuesByToString = null;
+        this(v, serializeAsIndex, valuesByEnumNaming, null);
     }
 
     /**
@@ -145,7 +143,8 @@ public JsonSerializer<?> createContextual(SerializerProvider serializers,
             Boolean serializeAsIndex = _isShapeWrittenUsingIndex(type,
                     format, false, _serializeAsIndex);
             if (!Objects.equals(serializeAsIndex, _serializeAsIndex)) {
-                return new EnumSerializer(_values, serializeAsIndex);
+                return new EnumSerializer(_values, serializeAsIndex,
+                        _valuesByEnumNaming, _valuesByToString);
             }
         }
         return this;

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

@@ -160,7 +160,7 @@ public static EnumValues constructFromToString(MapperConfig<?> config, Class<Enu
      * 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, Class, EnumNamingStrategy)}.
+     * {@link EnumResolver#constructUsingEnumNamingStrategy(DeserializationConfig, AnnotatedClass, EnumNamingStrategy)}.
      *
      * @since 2.15
      */