Fix #1233

Author: cowtowncoder

release-notes/VERSION

@@ -36,6 +36,7 @@ Project: jackson-databind
  (reported by Lokesh K)
 #1221: Use `Throwable.addSuppressed()` directly and/or via try-with-resources
 #1232: Add support for `JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES`
+#1232: Add support for `JsonFormat.Feature.WRITE_SORTED_MAP_ENTRIES`
 
 2.7.5 (not yet released)
 

src/main/java/com/fasterxml/jackson/databind/DeserializationContext.java

@@ -1248,11 +1248,27 @@ public JsonMappingException weirdNumberException(Number value, Class<?> instClas
                         instClass.getName(), String.valueOf(value), msg),
                 value, instClass);
     }
-    
+
+    /**
+     * Helper method for constructing instantiation exception for specified type,
+     * to indicate problem with physically constructing instance of
+     * specified class (missing constructor, exception from constructor)
+     *<p>
+     * Note that most of the time this method should NOT be called; instead,
+     * {@link #handleInstantiationProblem} should be called which will call this method
+     * if necessary.
+     */
+    public JsonMappingException instantiationException(Class<?> instClass, Throwable t) {
+        return JsonMappingException.from(_parser,
+                String.format("Can not construct instance of %s, problem: %s",
+                        instClass.getName(), t.getMessage()), t);
+    }
+
     /**
      * Helper method for constructing exception to indicate that given type id
      * could not be resolved to a valid subtype of specified base type, during
      * polymorphic deserialization.
+     *<p>
      * Note that most of the time this method should NOT be called; instead,
      * {@link #handleUnknownTypeId} should be called which will call this method
      * if necessary.
@@ -1269,29 +1285,14 @@ public JsonMappingException unknownTypeIdException(JavaType baseType, String typ
 
     /*
     /**********************************************************
-    /* Methods for constructing semantic exceptions; mostly
-    /* deprecated since 2.8; to be replaced by `reportXxx()`
+    /* Methods for constructing semantic exceptions
     /**********************************************************
      */
-    
+
     /**
-     * Helper method for constructing instantiation exception for specified type,
-     * to indicate problem with physically constructing instance of
-     * specified class (missing constructor, exception from constructor)
-     *
      * @deprecated Since 2.8 use {@link #reportInstantiationException} instead
      */
     @Deprecated
-    public JsonMappingException instantiationException(Class<?> instClass, Throwable t) {
-        return JsonMappingException.from(_parser,
-                String.format("Can not construct instance of %s, problem: %s", instClass.getName(), t.getMessage()), t);
-    }
-
-    /**
-        *
-        * @deprecated Since 2.8 use {@link #reportInstantiationException} instead
-        */
-    @Deprecated
     public JsonMappingException instantiationException(Class<?> instClass, String msg) {
         return JsonMappingException.from(_parser,
                 String.format("Can not construct instance of %s: %s",

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

@@ -4,6 +4,7 @@
 import java.lang.reflect.Type;
 import java.util.*;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.*;
@@ -387,6 +388,13 @@ public JsonSerializer<?> createContextual(SerializerProvider provider,
             Boolean b = intr.findSerializationSortAlphabetically(propertyAcc);
             sortKeys = (b != null) && b.booleanValue();
         }
+        JsonFormat.Value format = findFormatOverrides(provider, property, Map.class);
+        if (format != null) {
+            Boolean B = format.getFeature(JsonFormat.Feature.WRITE_SORTED_MAP_ENTRIES);
+            if (B != null) {
+                sortKeys = B.booleanValue();
+            }
+        }
         MapSerializer mser = withResolved(property, keySer, ser, ignored, sortKeys);
         if (suppressableValue != _suppressableValue) {
             mser = mser.withContentInclusion(suppressableValue);

src/test/java/com/fasterxml/jackson/databind/struct/FormatFeaturesTest.java

@@ -95,6 +95,18 @@ static class CaseInsensitiveRoleWrapper
         public Role role;
     }
 
+    static class SortedKeysMap {
+        @JsonFormat(with = JsonFormat.Feature.WRITE_SORTED_MAP_ENTRIES)
+        public Map<String,Integer> values = new LinkedHashMap<>();
+
+        protected SortedKeysMap() { }
+
+        public SortedKeysMap put(String key, int value) {
+            values.put(key, value);
+            return this;
+        }
+    }
+
     /*
     /**********************************************************
     /* Test methods, writing with single-element unwrapping
@@ -230,4 +242,13 @@ public void testCaseInsensitive() throws Exception {
         assertEquals("12", w.role.ID);
         assertEquals("Foo", w.role.Name);
     }
+
+    // [databind#1232]: allow forcing sorting on Map keys
+    public void testOrderedMaps() throws Exception {
+        SortedKeysMap map = new SortedKeysMap()
+            .put("b", 2)
+            .put("a", 1);
+        assertEquals(aposToQuotes("{'values':{'a':1,'b':2}}"),
+                MAPPER.writeValueAsString(map));
+    }
 }