Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.fasterxml.jackson.module.scala;

import com.fasterxml.jackson.annotation.JsonProperty;

public enum AnnotatedColor {
@JsonProperty("red") RED
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.fasterxml.jackson.module.scala.`enum`

import com.fasterxml.jackson.annotation.JsonProperty

enum ColorEnum { case Red, Green, Blue }

case class Colors(set: Set[ColorEnum])
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.{JsonInclude, JsonProperty, JsonSubTypes
import com.fasterxml.jackson.core.JsonGenerator
import com.fasterxml.jackson.databind.annotation.JsonSerialize
import com.fasterxml.jackson.databind.{JsonSerializer, SerializationFeature, SerializerProvider}
import com.fasterxml.jackson.module.scala.{DefaultScalaModule, JacksonModule}
import com.fasterxml.jackson.module.scala.{AnnotatedColor, DefaultScalaModule, JacksonModule}

import scala.annotation.meta.getter
import scala.beans.BeanProperty
Expand All @@ -22,7 +22,6 @@ class TupleKeySerializer extends JsonSerializer[Product] {
}
}


object MapSerializerTest {

class BeanieWeenie(@BeanProperty @JsonProperty("a") var a: Int,
Expand Down Expand Up @@ -117,4 +116,9 @@ class MapSerializerTest extends SerializerTest {
val v = m.writeValueAsString(wrapper)
v shouldBe """{"map":{}}"""
}

it should "support JsonProperty annotation on Java enum key" in {
val map = Map(AnnotatedColor.RED -> "redValue")
newMapper.writeValueAsString(map) shouldEqual """{"red":"redValue"}"""
}
}