Try to resolve Java 7 compilation issues

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/BaseMapTest.java

@@ -234,7 +234,7 @@ protected static ObjectMapper newObjectMapper() {
 
     // @since 2.10
     protected static ObjectMapper.Builder objectMapperBuilder() {
-        return (ObjectMapper.Builder) (Object) ObjectMapper.builder();
+        return (ObjectMapper.Builder)(Object) ObjectMapper.builder();
     }
 
     // @since 2.7

src/test/java/com/fasterxml/jackson/databind/deser/TestBasicAnnotations.java

@@ -195,7 +195,7 @@ public void testAnnotationsDisabled() throws Exception
         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 void testEnumsWhenDisabled() throws Exception
         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 void testEnumsWhenDisabled() throws Exception
 
     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);

src/test/java/com/fasterxml/jackson/databind/deser/TestSetterlessProperties.java

@@ -68,7 +68,7 @@ public void testSimpleSetterlessCollectionFailure()
         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 void testSimpleSetterlessMapOk()
     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 void testSimpleSetterlessMapFailure()
         }
     }
 
-    /* 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);

src/test/java/com/fasterxml/jackson/databind/deser/creators/CreatorPropertiesTest.java

@@ -96,7 +96,7 @@ public void testConstructorPropertiesInference() throws Exception
         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:

src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreators3.java

@@ -135,7 +135,7 @@ public String getName(){
 
     public void testCreator541() throws Exception
     {
-        ObjectMapper mapper = ObjectMapper.builder()
+        ObjectMapper mapper = objectMapperBuilder()
                 .disable(
                 MapperFeature.AUTO_DETECT_CREATORS,
                 MapperFeature.AUTO_DETECT_FIELDS,

src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKNumberDeserTest.java

@@ -131,7 +131,7 @@ public void testTextualNullAsNumber() throws Exception
             verifyException(e, "Cannot coerce String \"null\"");
         }
 
-        ObjectMapper noCoerceMapper = ObjectMapper.builder()
+        ObjectMapper noCoerceMapper = objectMapperBuilder()
                 .disable(MapperFeature.ALLOW_COERCION_OF_SCALARS)
                 .build();
         try {

src/test/java/com/fasterxml/jackson/databind/introspect/AutoDetect1947Test.java

@@ -30,7 +30,7 @@ public void setShouldNotBeDetected(String shouldNotBeDetected) {
     }
     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)

src/test/java/com/fasterxml/jackson/databind/introspect/TestNamingStrategyStd.java

@@ -363,15 +363,15 @@ public void testNamingWithObjectNode() throws Exception
 
     public void testExplicitRename() throws Exception
     {
-      ObjectMapper m = ObjectMapper.builder()
+      ObjectMapper m = objectMapperBuilder()
               .propertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE)
               .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
               .build();
       // by default, renaming will not take place on explicitly named fields
       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)

src/test/java/com/fasterxml/jackson/databind/introspect/TestPropertyConflicts.java

@@ -116,7 +116,7 @@ public void testRegularAndIsGetter() throws Exception
 
     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 void testInferredNameConflictsWithSetters() throws Exception
     }
 
     public void testIssue541() throws Exception {
-        ObjectMapper mapper = ObjectMapper.builder()
+        ObjectMapper mapper = objectMapperBuilder()
                 .disable(
                 MapperFeature.AUTO_DETECT_CREATORS,
                 MapperFeature.AUTO_DETECT_FIELDS,

src/test/java/com/fasterxml/jackson/databind/jsontype/TestGenericListSerialization.java

@@ -54,7 +54,7 @@ public void testSubTypesFor356() throws Exception
         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();
 

src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedArraySerialization.java

@@ -148,7 +148,7 @@ public void testGenericArray() throws Exception
         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));

src/test/java/com/fasterxml/jackson/databind/mixins/MapperMixinsCopy1998Test.java

@@ -119,7 +119,7 @@ private String getString(MyModelRoot myModelInstance, ObjectMapper myObjectMappe
 
     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)