explicitly prefer declared order of params

Author: pjfanning

src/main/scala/tools/jackson/module/scala/introspect/ScalaAnnotationIntrospectorModule.scala

@@ -38,6 +38,15 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
     }
   }
 
+  // For Scala, we want to use the declared order of the fields in the class
+  override def findSerializationSortAlphabetically(config: MapperConfig[_], ann: Annotated): java.lang.Boolean = {
+    ann match {
+      case ac: AnnotatedClass if scalaAnnotationIntrospectorModule.isMaybeScalaBeanType(ac.getAnnotated) =>
+        java.lang.Boolean.FALSE
+      case _ => None.orNull
+    }
+  }
+
   override def findImplicitPropertyName(mapperConfig: MapperConfig[_], member: AnnotatedMember): String = {
     member match {
       case af: AnnotatedField => fieldName(af).orNull

src/test/scala/tools/jackson/module/scala/ClassTagExtensionsTest.scala

@@ -136,8 +136,7 @@ class ClassTagExtensionsTest extends JacksonTest {
     val result = mapper.writerWithView[PublicView].writeValueAsString(instance)
     result should equal("""{"foo":"foo"}""")
     val resultInView = mapper.writerWithView[PrivateView].writeValueAsString(instance)
-    // JSON order for non-constructor params changed in Jackson 3 due to https://github.com/FasterXML/jackson-databind/pull/4572
-    resultInView should equal("""{"bar":42,"foo":"foo"}""")
+    resultInView should equal("""{"foo":"foo","bar":42}""")
   }
 
   it should "produce writer with type" in {

src/test/scala/tools/jackson/module/scala/ser/CaseClassSerializerTest.scala

@@ -160,8 +160,7 @@ class CaseClassSerializerTest extends SerializerTest {
     val bean = new NonCaseWithBeanProperty
     bean.id = 1
     bean.bar = "foo"
-    // JSON order for non-constructor params changed in Jackson 3 due to https://github.com/FasterXML/jackson-databind/pull/4572
-    serialize(bean) should equal( """{"bar":"foo","id":1}""")
+    serialize(bean) should equal( """{"id":1,"bar":"foo"}""")
   }
 
   it should "serialize a nested case class" in {
@@ -186,10 +185,7 @@ class CaseClassSerializerTest extends SerializerTest {
       def isBoolean = boolean
     }
     val foo = new Foo("str", false)
-    val mapper = newBuilder
-      .disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
-      .build()
-    mapper.writeValueAsString(foo) should equal ("""{"string":"str","boolean":false}""")
+    serialize(foo) should equal ("""{"string":"str","boolean":false}""")
   }
 
   it should "serialize java getters returning java collections" in {

src/test/scala/tools/jackson/module/scala/ser/OptionSerializerTest.scala

@@ -130,11 +130,10 @@ class OptionSerializerTest extends SerializerTest {
 
   it should "support default typing" in {
     case class User(name: String, email: Option[String] = None)
-    val mapper = newBuilder.disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY).build()
     val user = User("John Smith", Some("john.smith@unit.uk"))
     val expected = """{"name":"John Smith","email":"john.smith@unit.uk"}"""
-    mapper.writeValueAsString(user) shouldEqual expected
-    val mapper2 = newBuilder.disable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
+    newMapper.writeValueAsString(user) shouldEqual expected
+    val mapper2 = newBuilder
       .activateDefaultTyping(new DefaultBaseTypeLimitingValidator)
       .build()
     mapper2.writeValueAsString(user) shouldEqual expected