respect JsonPropertyOrder

Author: pjfanning

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

@@ -1,6 +1,6 @@
 package tools.jackson.module.scala.introspect
 
-import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.{JsonCreator, JsonPropertyOrder}
 import tools.jackson.core.Version
 import tools.jackson.databind.JacksonModule.SetupContext
 import tools.jackson.databind.`type`.{CollectionLikeType, MapLikeType, ReferenceType, SimpleType}
@@ -42,7 +42,13 @@ class ScalaAnnotationIntrospectorInstance(scalaAnnotationIntrospectorModule: Sca
   override def findSerializationSortAlphabetically(config: MapperConfig[_], ann: Annotated): java.lang.Boolean = {
     ann match {
       case ac: AnnotatedClass if scalaAnnotationIntrospectorModule.isMaybeScalaBeanType(ac.getAnnotated) =>
-        !config.isEnabled(MapperFeature.SORT_CREATOR_PROPERTIES_FIRST)
+        val annotation = _findAnnotation(ac, classOf[JsonPropertyOrder])
+        if (annotation != null) {
+          // delegate to JacksonAnnotationIntrospector
+          None.orNull
+        } else {
+          !config.isEnabled(MapperFeature.SORT_CREATOR_PROPERTIES_FIRST)
+        }
       case _ => None.orNull
     }
   }

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

@@ -69,6 +69,8 @@ object CaseClassSerializerTest {
   case class ClassWithUnorderedFields(f3: Int = 3, f2: Int = 2, f0: Int = 0, f1: Int = 1)
   @JsonPropertyOrder(Array("f0", "f1", "f2", "f3"))
   case class AnnotatedClassWithUnorderedFields(f3: Int = 3, f2: Int = 2, f0: Int = 0, f1: Int = 1)
+  @JsonPropertyOrder(alphabetic = true)
+  case class AnnotatedClassWithUnorderedFields2(f3: Int = 3, f2: Int = 2, f0: Int = 0, f1: Int = 1)
 }
 
 class CaseClassSerializerTest extends SerializerTest {
@@ -244,4 +246,8 @@ class CaseClassSerializerTest extends SerializerTest {
   it should "respect JsonPropertyOrder" in {
     serialize(AnnotatedClassWithUnorderedFields(), newMapper) shouldEqual """{"f0":0,"f1":1,"f2":2,"f3":3}"""
   }
+
+  it should "respect JsonPropertyOrder alphabetic=true" in {
+    serialize(AnnotatedClassWithUnorderedFields(), newMapper) shouldEqual """{"f0":0,"f1":1,"f2":2,"f3":3}"""
+  }
 }