diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-22 14:59:13 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-22 14:59:13 +0100 |
commit | e60d1f51fc020026b8f68740fb6ccae62c1fab50 (patch) | |
tree | 3730b6e0a623729787b110d542667418a46d2de0 /container-jersey2 | |
parent | 1cfd4e1f30db81d466d0dd51d5f1329a99556eb9 (diff) |
Add JavaTimeModule to Jersey. Exclude Jackson from athenz bundle
Diffstat (limited to 'container-jersey2')
-rw-r--r-- | container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala b/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala index c83f6a63954..4ebe8c3285a 100644 --- a/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala +++ b/container-jersey2/src/main/scala/com/yahoo/container/servlet/jersey/JerseyServletProvider.scala @@ -5,6 +5,7 @@ import java.io.{IOException, InputStream} import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.datatype.jdk8.Jdk8Module +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider import com.yahoo.container.di.componentgraph.Provider import com.yahoo.container.di.config.RestApiContext @@ -21,7 +22,6 @@ import org.glassfish.jersey.servlet.ServletContainer import org.objectweb.asm.ClassReader import scala.collection.JavaConverters._ - import scala.util.control.Exception @@ -96,7 +96,8 @@ class JerseyServletProvider(restApiContext: RestApiContext) extends Provider[Ser def jacksonDatatypeJdk8Provider: JacksonJaxbJsonProvider = { val provider = new JacksonJaxbJsonProvider() - provider.setMapper(new ObjectMapper().registerModule(new Jdk8Module)) + provider.setMapper( + new ObjectMapper().registerModule(new Jdk8Module).registerModule(new JavaTimeModule)) provider } |