diff --git a/src/test/java/tools/jackson/datatype/joda/DateTimeTest.java b/src/test/java/tools/jackson/datatype/joda/DateTimeTest.java index e9ca88b..c4d487f 100644 --- a/src/test/java/tools/jackson/datatype/joda/DateTimeTest.java +++ b/src/test/java/tools/jackson/datatype/joda/DateTimeTest.java @@ -9,6 +9,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonTypeInfo; + +import tools.jackson.core.json.JsonWriteFeature; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.SerializationFeature; @@ -79,6 +81,7 @@ private static interface TypeInfoMixIn { private final ObjectMapper MAPPER = mapperWithModule(); private final static ObjectMapper STRING_MAPPER = mapperWithModuleBuilder() + .disable(JsonWriteFeature.ESCAPE_FORWARD_SLASHES) .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) .build(); diff --git a/src/test/java/tools/jackson/datatype/joda/JodaTestBase.java b/src/test/java/tools/jackson/datatype/joda/JodaTestBase.java index df52a55..11caa0c 100644 --- a/src/test/java/tools/jackson/datatype/joda/JodaTestBase.java +++ b/src/test/java/tools/jackson/datatype/joda/JodaTestBase.java @@ -11,7 +11,6 @@ import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.cfg.CoercionAction; import tools.jackson.databind.cfg.CoercionInputShape; -import tools.jackson.databind.cfg.MapperBuilder; import tools.jackson.databind.json.JsonMapper; import junit.framework.TestCase; @@ -59,36 +58,36 @@ protected static interface MixinForPolymorphism { /********************************************************************** */ - protected static MapperBuilder mapperWithModuleBuilder() { + protected static JsonMapper.Builder mapperWithModuleBuilder() { return JsonMapper.builder() .addModule(new JodaModule()); } - protected static MapperBuilder jodaMapperBuilder(DateFormat df) { + protected static JsonMapper.Builder jodaMapperBuilder(DateFormat df) { return mapperWithModuleBuilder() .defaultDateFormat(df); } - protected static MapperBuilder jodaMapperBuilder(TimeZone tz) { + protected static JsonMapper.Builder jodaMapperBuilder(TimeZone tz) { return mapperWithModuleBuilder() .defaultTimeZone(tz); } - protected static ObjectMapper mapperWithModule() { + protected static JsonMapper mapperWithModule() { return mapperWithModuleBuilder().build(); } - protected static ObjectMapper mapperWithModule(DateFormat df) { + protected static JsonMapper mapperWithModule(DateFormat df) { return jodaMapperBuilder(df) .build(); } - protected static ObjectMapper mapperWithModule(TimeZone tz) { + protected static JsonMapper mapperWithModule(TimeZone tz) { return jodaMapperBuilder(tz) .build(); } - protected static ObjectMapper mapperWithFailFromEmptyString() { + protected static JsonMapper mapperWithFailFromEmptyString() { return mapperWithModuleBuilder() .withCoercionConfigDefaults(cfg -> cfg.setCoercion(CoercionInputShape.EmptyString, CoercionAction.Fail) diff --git a/src/test/java/tools/jackson/datatype/joda/TimeZoneTest.java b/src/test/java/tools/jackson/datatype/joda/TimeZoneTest.java index 0ea2702..0e36600 100644 --- a/src/test/java/tools/jackson/datatype/joda/TimeZoneTest.java +++ b/src/test/java/tools/jackson/datatype/joda/TimeZoneTest.java @@ -4,6 +4,9 @@ import org.joda.time.DateTimeZone; import com.fasterxml.jackson.annotation.JsonTypeInfo; + +import tools.jackson.core.json.JsonWriteFeature; + import tools.jackson.databind.*; // for [datatype-joda#44] @@ -37,7 +40,9 @@ private static interface TypeInfoMixIn { /********************************************************** */ - private final ObjectMapper MAPPER = mapperWithModule(); + private final ObjectMapper MAPPER = mapperWithModuleBuilder() + .disable(JsonWriteFeature.ESCAPE_FORWARD_SLASHES) + .build(); public void testSimple() throws Exception { diff --git a/src/test/java/tools/jackson/datatype/joda/ser/InstantSerializationTest.java b/src/test/java/tools/jackson/datatype/joda/ser/InstantSerializationTest.java index 5bb2356..39fe6c4 100644 --- a/src/test/java/tools/jackson/datatype/joda/ser/InstantSerializationTest.java +++ b/src/test/java/tools/jackson/datatype/joda/ser/InstantSerializationTest.java @@ -5,6 +5,7 @@ import org.joda.time.DateTime; import org.joda.time.Instant; +import tools.jackson.core.json.JsonWriteFeature; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.SerializationFeature; import tools.jackson.datatype.joda.JodaTestBase; @@ -32,6 +33,7 @@ public void testCustomFormatInstantSer() throws Exception { final String json = MAPPER.writer() .without(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .without(JsonWriteFeature.ESCAPE_FORWARD_SLASHES) .writeValueAsString(new FormattedInstant(new Instant(0L))); assertEquals(aposToQuotes( "{'value':'01/01/1970 00_00_00_000'}"), json); diff --git a/src/test/java/tools/jackson/datatype/joda/ser/IntervalSerializationTest.java b/src/test/java/tools/jackson/datatype/joda/ser/IntervalSerializationTest.java index f13b8ea..553e07c 100644 --- a/src/test/java/tools/jackson/datatype/joda/ser/IntervalSerializationTest.java +++ b/src/test/java/tools/jackson/datatype/joda/ser/IntervalSerializationTest.java @@ -7,6 +7,8 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonTypeInfo; + +import tools.jackson.core.json.JsonWriteFeature; import tools.jackson.databind.*; import tools.jackson.datatype.joda.JodaTestBase; @@ -31,6 +33,7 @@ static class FormattedInterval private final ObjectMapper MAPPER = mapperWithModuleBuilder() .enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS) + .disable(JsonWriteFeature.ESCAPE_FORWARD_SLASHES) .build(); private final ObjectWriter WRITER = MAPPER.writer(); diff --git a/src/test/java/tools/jackson/datatype/joda/ser/JodaSerializationTest.java b/src/test/java/tools/jackson/datatype/joda/ser/JodaSerializationTest.java index 0a34581..e85a8d6 100644 --- a/src/test/java/tools/jackson/datatype/joda/ser/JodaSerializationTest.java +++ b/src/test/java/tools/jackson/datatype/joda/ser/JodaSerializationTest.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonTypeInfo; +import tools.jackson.core.json.JsonWriteFeature; import tools.jackson.databind.ObjectMapper; import tools.jackson.databind.ObjectWriter; import tools.jackson.databind.SerializationFeature; @@ -37,6 +38,7 @@ public T getContents() { private final ObjectMapper MAPPER = mapperWithModuleBuilder() .enable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, SerializationFeature.WRITE_DURATIONS_AS_TIMESTAMPS) + .disable(JsonWriteFeature.ESCAPE_FORWARD_SLASHES) .build(); private final ObjectWriter WRITER = MAPPER.writer(); diff --git a/src/test/java/tools/jackson/datatype/joda/ser/WriteZoneIdTest.java b/src/test/java/tools/jackson/datatype/joda/ser/WriteZoneIdTest.java index df4e364..f33b85d 100644 --- a/src/test/java/tools/jackson/datatype/joda/ser/WriteZoneIdTest.java +++ b/src/test/java/tools/jackson/datatype/joda/ser/WriteZoneIdTest.java @@ -4,6 +4,8 @@ import org.joda.time.DateTimeZone; import com.fasterxml.jackson.annotation.JsonFormat; + +import tools.jackson.core.json.JsonWriteFeature; import tools.jackson.databind.ObjectMapper; import tools.jackson.datatype.joda.JodaTestBase; @@ -24,7 +26,9 @@ public DummyClassWithDate(DateTime date) { public void testJacksonAnnotatedPOJOWithDateWithTimezoneToJson() throws Exception { - ObjectMapper mapper = mapperWithModule(); + ObjectMapper mapper = mapperWithModuleBuilder() + .disable(JsonWriteFeature.ESCAPE_FORWARD_SLASHES) + .build(); String ZONE_ID = "Asia/Krasnoyarsk"; DummyClassWithDate input = new DummyClassWithDate(new DateTime(2015, 11, 23, 22, 06, 39,