diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2018-08-16 21:25:25 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2018-08-16 21:25:25 -0700 |
commit | 454b95f364219d8601cb39221508c67d6714680d (patch) | |
tree | f228000cf32f1c4534b91b14b7ac901b8d0237f1 /src/test/java | |
parent | f3456f51341ddb10090b6b36763e66a2588cfeb3 (diff) | |
download | jackson-databind-454b95f364219d8601cb39221508c67d6714680d.tar.gz |
Try to resolve Java 7 compilation issues
Diffstat (limited to 'src/test/java')
12 files changed, 19 insertions, 19 deletions
diff --git a/src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java b/src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java index abaa62a15..5e1b65ad3 100644 --- a/src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java @@ -234,7 +234,7 @@ public abstract class BaseMapTest // @since 2.10 protected static ObjectMapper.Builder objectMapperBuilder() { - return (ObjectMapper.Builder) (Object) ObjectMapper.builder(); + return (ObjectMapper.Builder)(Object) ObjectMapper.builder(); } // @since 2.7 diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/TestBasicAnnotations.java b/src/test/java/com/fasterxml/jackson/databind/deser/TestBasicAnnotations.java index 467a84ff3..d349ea615 100644 --- a/src/test/java/com/fasterxml/jackson/databind/deser/TestBasicAnnotations.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/TestBasicAnnotations.java @@ -195,7 +195,7 @@ public class TestBasicAnnotations AnnoBean bean = MAPPER.readValue("{ \"y\" : 0 }", AnnoBean.class); assertEquals(0, bean.value); - ObjectMapper m = ObjectMapper.builder() + ObjectMapper m = objectMapperBuilder() .configure(MapperFeature.USE_ANNOTATIONS, false) .build(); // without annotations, should default to default bean-based name... @@ -208,7 +208,7 @@ public class TestBasicAnnotations ObjectMapper m = new ObjectMapper(); assertEquals(Alpha.B, m.readValue(quote("B"), Alpha.class)); - m = ObjectMapper.builder() + m = objectMapperBuilder() .configure(MapperFeature.USE_ANNOTATIONS, false) .build(); // should still use the basic name handling here @@ -217,7 +217,7 @@ public class TestBasicAnnotations public void testNoAccessOverrides() throws Exception { - ObjectMapper m = ObjectMapper.builder() + ObjectMapper m = objectMapperBuilder() .disable(MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS) .build(); SimpleBean bean = m.readValue("{\"x\":1,\"y\":2}", SimpleBean.class); diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/TestSetterlessProperties.java b/src/test/java/com/fasterxml/jackson/databind/deser/TestSetterlessProperties.java index cfa0616d4..75053c464 100644 --- a/src/test/java/com/fasterxml/jackson/databind/deser/TestSetterlessProperties.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/TestSetterlessProperties.java @@ -68,7 +68,7 @@ public class TestSetterlessProperties ObjectMapper m = new ObjectMapper(); // by default, it should be enabled assertTrue(m.isEnabled(MapperFeature.USE_GETTERS_AS_SETTERS)); - m = ObjectMapper.builder() + m = objectMapperBuilder() .configure(MapperFeature.USE_GETTERS_AS_SETTERS, false) .build(); assertFalse(m.isEnabled(MapperFeature.USE_GETTERS_AS_SETTERS)); @@ -100,7 +100,7 @@ public class TestSetterlessProperties public void testSimpleSetterlessMapFailure() throws Exception { - ObjectMapper m = ObjectMapper.builder() + ObjectMapper m = objectMapperBuilder() .configure(MapperFeature.USE_GETTERS_AS_SETTERS, false) .build(); // so this should fail now without a setter @@ -113,12 +113,12 @@ public class TestSetterlessProperties } } - /* Test for [JACKSON-328], precedence of "getter-as-setter" (for Lists) versus + /* Test precedence of "getter-as-setter" (for Lists) versus * field for same property. */ public void testSetterlessPrecedence() throws Exception { - ObjectMapper m = ObjectMapper.builder() + ObjectMapper m = objectMapperBuilder() .configure(MapperFeature.USE_GETTERS_AS_SETTERS, true) .build(); Dual value = m.readValue("{\"list\":[1,2,3]}, valueType)", Dual.class); diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/creators/CreatorPropertiesTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/creators/CreatorPropertiesTest.java index bbbe9bcd8..c690613fe 100644 --- a/src/test/java/com/fasterxml/jackson/databind/deser/creators/CreatorPropertiesTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/creators/CreatorPropertiesTest.java @@ -96,7 +96,7 @@ public class CreatorPropertiesTest extends BaseMapTest assertEquals(6, result.y); // but change if configuration changed - ObjectMapper mapper = ObjectMapper.builder() + ObjectMapper mapper = objectMapperBuilder() .disable(MapperFeature.INFER_CREATOR_FROM_CONSTRUCTOR_PROPERTIES) .build(); // in which case fields are set directly: diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators3.java b/src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators3.java index 47943de6a..d07932bd2 100644 --- a/src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators3.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators3.java @@ -135,7 +135,7 @@ public class TestCreators3 extends BaseMapTest public void testCreator541() throws Exception { - ObjectMapper mapper = ObjectMapper.builder() + ObjectMapper mapper = objectMapperBuilder() .disable( MapperFeature.AUTO_DETECT_CREATORS, MapperFeature.AUTO_DETECT_FIELDS, diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java index 7f4c68a61..f23f45466 100644 --- a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java @@ -131,7 +131,7 @@ public class JDKNumberDeserTest extends BaseMapTest verifyException(e, "Cannot coerce String \"null\""); } - ObjectMapper noCoerceMapper = ObjectMapper.builder() + ObjectMapper noCoerceMapper = objectMapperBuilder() .disable(MapperFeature.ALLOW_COERCION_OF_SCALARS) .build(); try { diff --git a/src/test/java/com/fasterxml/jackson/databind/introspect/AutoDetect1947Test.java b/src/test/java/com/fasterxml/jackson/databind/introspect/AutoDetect1947Test.java index 1b6cc20ff..165bcc64c 100644 --- a/src/test/java/com/fasterxml/jackson/databind/introspect/AutoDetect1947Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/introspect/AutoDetect1947Test.java @@ -30,7 +30,7 @@ public class AutoDetect1947Test extends BaseMapTest } public void testDisablingAll() throws Exception { - ObjectMapper mapper = ObjectMapper.builder() + ObjectMapper mapper = objectMapperBuilder() .disable(MapperFeature.AUTO_DETECT_SETTERS) .disable(MapperFeature.AUTO_DETECT_FIELDS) .disable(MapperFeature.AUTO_DETECT_GETTERS) diff --git a/src/test/java/com/fasterxml/jackson/databind/introspect/TestNamingStrategyStd.java b/src/test/java/com/fasterxml/jackson/databind/introspect/TestNamingStrategyStd.java index a62594002..e59e1d748 100644 --- a/src/test/java/com/fasterxml/jackson/databind/introspect/TestNamingStrategyStd.java +++ b/src/test/java/com/fasterxml/jackson/databind/introspect/TestNamingStrategyStd.java @@ -363,7 +363,7 @@ public class TestNamingStrategyStd extends BaseMapTest public void testExplicitRename() throws Exception
{
- ObjectMapper m = ObjectMapper.builder()
+ ObjectMapper m = objectMapperBuilder()
.propertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
.enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
.build();
@@ -371,7 +371,7 @@ public class TestNamingStrategyStd extends BaseMapTest assertEquals(aposToQuotes("{'firstName':'Peter','lastName':'Venkman','user_age':'35'}"),
m.writeValueAsString(new ExplicitBean()));
- m = ObjectMapper.builder()
+ m = objectMapperBuilder()
.propertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
.enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
.enable(MapperFeature.ALLOW_EXPLICIT_PROPERTY_RENAMING)
diff --git a/src/test/java/com/fasterxml/jackson/databind/introspect/TestPropertyConflicts.java b/src/test/java/com/fasterxml/jackson/databind/introspect/TestPropertyConflicts.java index 9672c270d..19a158b95 100644 --- a/src/test/java/com/fasterxml/jackson/databind/introspect/TestPropertyConflicts.java +++ b/src/test/java/com/fasterxml/jackson/databind/introspect/TestPropertyConflicts.java @@ -116,7 +116,7 @@ public class TestPropertyConflicts extends BaseMapTest public void testInferredNameConflictsWithGetters() throws Exception { - ObjectMapper mapper = ObjectMapper.builder() + ObjectMapper mapper = objectMapperBuilder() .annotationIntrospector(new InferingIntrospector()) .build(); String json = mapper.writeValueAsString(new Infernal()); @@ -132,7 +132,7 @@ public class TestPropertyConflicts extends BaseMapTest } public void testIssue541() throws Exception { - ObjectMapper mapper = ObjectMapper.builder() + ObjectMapper mapper = objectMapperBuilder() .disable( MapperFeature.AUTO_DETECT_CREATORS, MapperFeature.AUTO_DETECT_FIELDS, diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java index 05602370e..0f3cc04b7 100644 --- a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java @@ -54,7 +54,7 @@ public class TestGenericListSerialization embedded.add(new Child1()); embedded.add(new Child2()); input.setResult(embedded); - ObjectMapper mapper = ObjectMapper.builder() + ObjectMapper mapper = objectMapperBuilder() .configure(MapperFeature.USE_STATIC_TYPING, true) .build(); diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedArraySerialization.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedArraySerialization.java index f0469d4dd..102c2017d 100644 --- a/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedArraySerialization.java +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedArraySerialization.java @@ -148,7 +148,7 @@ public class TestTypedArraySerialization assertEquals(EXP, MAPPER.writeValueAsString(input)); // then with static typing enabled: - ObjectMapper m = ObjectMapper.builder() + ObjectMapper m = objectMapperBuilder() .configure(MapperFeature.USE_STATIC_TYPING, true) .build(); assertEquals(EXP, m.writeValueAsString(input)); diff --git a/src/test/java/com/fasterxml/jackson/databind/mixins/MapperMixinsCopy1998Test.java b/src/test/java/com/fasterxml/jackson/databind/mixins/MapperMixinsCopy1998Test.java index 733bd6cdb..2a78dcd5e 100644 --- a/src/test/java/com/fasterxml/jackson/databind/mixins/MapperMixinsCopy1998Test.java +++ b/src/test/java/com/fasterxml/jackson/databind/mixins/MapperMixinsCopy1998Test.java @@ -119,7 +119,7 @@ public class MapperMixinsCopy1998Test extends BaseMapTest private ObjectMapper defaultMapper() { - return ObjectMapper.builder() + return objectMapperBuilder() .serializationInclusion(JsonInclude.Include.NON_EMPTY) .configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false) .configure(MapperFeature.ALLOW_COERCION_OF_SCALARS, false) |