Merge branch '2.11'

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/ser/TestSerializationOrder.java

@@ -11,12 +11,6 @@
 public class TestSerializationOrder
     extends BaseMapTest
 {
-    /*
-    /**********************************************************
-    /* Annotated helper classes
-    /**********************************************************
-     */
-
     static class BeanWithCreator
     {
         public int a;
@@ -33,7 +27,7 @@ static class BeanWithCreator
     static class BeanWithOrder
     {
         public int d, b, a, c;
-        
+
         public BeanWithOrder(int a, int b, int c, int d) {
             this.a = a;
             this.b = b;
@@ -59,10 +53,10 @@ static class OrderMixIn { }
 
     @JsonPropertyOrder(value={"a","b","x","z"})
     static class BeanFor268 {
-    	@JsonProperty("a") public String xA = "a";
-    	@JsonProperty("z") public String aZ = "z";
-    	@JsonProperty("b") public String xB() { return "b"; }
-    	@JsonProperty("x") public String aX() { return "x"; }
+        @JsonProperty("a") public String xA = "a";
+        @JsonProperty("z") public String aZ = "z";
+    	   @JsonProperty("b") public String xB() { return "b"; }
+    	   @JsonProperty("x") public String aX() { return "x"; }
     }
 
     static class BeanFor459 {
@@ -72,7 +66,7 @@ static class BeanFor459 {
         public int a = 1;
     }
 
-    // For [Issue#311]
+    // For [databind#311]
     @JsonPropertyOrder(alphabetic = true)
     public class BeanForGH311 {
         private final int a;
@@ -87,14 +81,14 @@ public BeanForGH311(@JsonProperty("b") int b, @JsonProperty("a") int a) { //b an
         public int getA() { return a; }
         public int getB() { return b; }
     }
-    
+
     /*
     /*********************************************
     /* Unit tests
     /*********************************************
      */
 
-    private final ObjectMapper MAPPER = objectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     public void testImplicitOrderByCreator() throws Exception
     {
@@ -111,7 +105,6 @@ public void testAlphabeticOrder() throws Exception
         assertEquals("{\"d\":4,\"a\":1,\"b\":2,\"c\":3}", MAPPER.writeValueAsString(new SubBeanWithOrder(1, 2, 3, 4)));
     }
 
-
     public void testOrderWithMixins() throws Exception
     {
         ObjectMapper mapper = jsonMapperBuilder()
@@ -136,6 +129,7 @@ public void testOrderWithFeature() throws Exception
                 mapper.writeValueAsString(new BeanFor459()));
     }
 
+    // [databind#311]
     public void testAlphaAndCreatorOrdering() throws Exception
     {
         ObjectMapper mapper = jsonMapperBuilder()