Fix an issue with Java 7 compilation

Author: cowtowncoder

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

@@ -234,7 +234,13 @@ protected static ObjectMapper newObjectMapper() {
 
     // @since 2.10
     protected static ObjectMapper.Builder objectMapperBuilder() {
-        return (ObjectMapper.Builder)(Object) ObjectMapper.builder();
+        /* 27-Aug-2018, tatu: Now this is weird -- with Java 7, we seem to need
+         *   explicit type parameters, but not with Java 8.
+         *   This need renders builder-approach pretty much useless for Java 7,
+         *   which is ok for 3.x (where baseline is Java 8), but potentially
+         *   problematic for 2.10. Oh well.
+         */
+        return (ObjectMapper.Builder) ObjectMapper.<ObjectMapper,ObjectMapper.Builder>builder();
     }
 
     // @since 2.7

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

@@ -228,7 +228,7 @@ public void testConfigForPropertySorting() throws Exception
         assertFalse(dc.shouldSortPropertiesAlphabetically());
 
         // but when enabled, should be visible:
-        m = ObjectMapper.builder()
+        m = objectMapperBuilder()
                 .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
                 .build();
         sc = m.getSerializationConfig();

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

@@ -174,7 +174,7 @@ public void testIssue560() throws Exception
         A a = new A("myname", 29, "mysurname");
 
         // Property SerializationConfig.SerializationFeature.DEFAULT_VIEW_INCLUSION set to false
-        ObjectMapper mapper = ObjectMapper.builder()
+        ObjectMapper mapper = objectMapperBuilder()
             .configure(MapperFeature.DEFAULT_VIEW_INCLUSION, Boolean.FALSE)
             .addMixIn(A.class, AMixInAnnotation.class)
             .build();