diff options
| author | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 11:54:20 -0700 |
|---|---|---|
| committer | Marvin Bertin <marvin.bertin@gmail.com> | 2017-10-10 11:54:20 -0700 |
| commit | 19a70318ecee81872fffe23c03d83e725610911d (patch) | |
| tree | 984510310c95856fcdcb463d9a242f9773795266 /src/main/scala/xyz/driver/pdsuicommon/json/JsonSerializer.scala | |
| parent | 05aa114cfd22228f0457b6457ce441af5eabfc60 (diff) | |
| parent | 4f83461cba1f78e607ca2a4edb6fa26f6e16e732 (diff) | |
| download | rest-query-19a70318ecee81872fffe23c03d83e725610911d.tar.gz rest-query-19a70318ecee81872fffe23c03d83e725610911d.tar.bz2 rest-query-19a70318ecee81872fffe23c03d83e725610911d.zip | |
fix merge conflicts with master
Diffstat (limited to 'src/main/scala/xyz/driver/pdsuicommon/json/JsonSerializer.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/pdsuicommon/json/JsonSerializer.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/pdsuicommon/json/JsonSerializer.scala b/src/main/scala/xyz/driver/pdsuicommon/json/JsonSerializer.scala index a53f1dd..9383a1c 100644 --- a/src/main/scala/xyz/driver/pdsuicommon/json/JsonSerializer.scala +++ b/src/main/scala/xyz/driver/pdsuicommon/json/JsonSerializer.scala @@ -3,7 +3,7 @@ package xyz.driver.pdsuicommon.json import java.text.SimpleDateFormat import com.fasterxml.jackson.annotation.JsonInclude -import com.fasterxml.jackson.databind.ObjectMapper +import com.fasterxml.jackson.databind.{DeserializationFeature, ObjectMapper} import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule import com.fasterxml.jackson.module.scala.DefaultScalaModule import com.fasterxml.jackson.module.scala.experimental.ScalaObjectMapper @@ -15,6 +15,7 @@ object JsonSerializer { mapper.registerModule(new JavaTimeModule) mapper.setDateFormat(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")) mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL) + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) def serialize(value: Any): String = { mapper.writeValueAsString(value) |