warnings clean up

Author: cowtowncoder

afterburner/src/test/java/com/fasterxml/jackson/module/afterburner/util/MyClassLoaderWithArtificialTiming.java

@@ -4,7 +4,8 @@
 
 /**
  * An extension of MyClassLoader with controllable blocking behavior of the
- * {@link #defineClassOnParent(ClassLoader, String, byte[], int, int)} method, allowing the interleaving of threads
+ * {@code defineClassOnParent(ClassLoader, String, byte[], int, int)} method,
+ * allowing the interleaving of threads
  * through {@link #loadAndResolve(ClassName, byte[])} to be controlled by an external test harness.
  */
 public class MyClassLoaderWithArtificialTiming extends MyClassLoader {

jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/BaseJaxbTest.java

@@ -4,9 +4,10 @@
 import java.util.Map;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.cfg.MapperBuilder;
 import com.fasterxml.jackson.databind.introspect.AnnotationIntrospectorPair;
 import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
-
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationIntrospector;
 
 public abstract class BaseJaxbTest
@@ -34,6 +35,13 @@ protected ObjectMapper getJaxbMapper()
         return mapper;
     }
 
+    @SuppressWarnings("deprecation")
+    protected MapperBuilder<?,?> getJaxbMapperBuilder()
+    {
+        return JsonMapper.builder()
+                .annotationIntrospector(new JaxbAnnotationIntrospector());
+    }
+
     protected ObjectMapper getJaxbAndJacksonMapper()
     {
         ObjectMapper mapper = new ObjectMapper();

jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestAccessType.java

@@ -106,8 +106,9 @@ public void testForJackson288() throws Exception
 
      public void testInclusionIssue40() throws Exception
      {
-         ObjectMapper mapper = getJaxbMapper();
-         mapper.enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME);
+         ObjectMapper mapper = getJaxbMapperBuilder()
+                 .enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
+                 .build();
          String json = mapper.writeValueAsString(new Bean40());
          @SuppressWarnings("unchecked")
          Map<String,Object> map = mapper.readValue(json, Map.class);

jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAnnotationIntrospector.java

@@ -233,9 +233,10 @@ public void testDetection() throws Exception
      */
     public void testSerializeDeserializeWithJaxbAnnotations() throws Exception
     {
-        ObjectMapper mapper = getJaxbMapper();
-        // test expects that wrapper name be used...
-        mapper.enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME);
+        ObjectMapper mapper = getJaxbMapperBuilder()
+                // test expects that wrapper name be used...
+                .enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
+                .build();
 
         mapper.enable(SerializationFeature.INDENT_OUTPUT);
         JaxbExample ex = new JaxbExample();

jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/introspect/TestJaxbAutoDetect.java

@@ -113,8 +113,9 @@ public void testAutoDetectDisable() throws IOException
         assertEquals("b", result.get("b"));
 
         // But when disabling auto-detection, just one
-        mapper = getJaxbMapper();
-        mapper.configure(MapperFeature.AUTO_DETECT_GETTERS, false);
+        mapper = getJaxbMapperBuilder()
+              .configure(MapperFeature.AUTO_DETECT_GETTERS, false)
+              .build();
         result = writeAndMap(mapper, bean);
         assertEquals(1, result.size());
         assertNull(result.get("a"));

jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/misc/TestElementWrapper.java

@@ -77,9 +77,10 @@ public Bean25(int... v0) {
     // [JACKSON-436]
     public void testWrapperWithCollection() throws Exception
     {
-        ObjectMapper mapper = getJaxbMapper();
-        // for fun, force renaming with wrapper annotation, even for JSON
-        mapper.enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME);
+        ObjectMapper mapper = getJaxbMapperBuilder()
+                // for fun, force renaming with wrapper annotation, even for JSON
+                .enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
+                .build();
         Collection<IPhone> phones = new HashSet<IPhone>();
         phones.add(new Phone("555-6666"));
         Person p = new Person();
@@ -108,17 +109,19 @@ public void testWrapperRenaming() throws Exception
         input.id = 3;
         assertEquals("{\"id\":3}", mapper.writeValueAsString(input));
         // but if we create new instance, configure
-        mapper = getJaxbMapper();
-        mapper.enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME);
+        mapper = getJaxbMapperBuilder()
+                .enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
+                .build();
         assertEquals("{\"wrap\":3}", mapper.writeValueAsString(input));
     }
 
     // [Issue#25]
     public void testWrapperDefaultName() throws Exception
     {
         ObjectMapper mapper = getJaxbMapper();
-        mapper = getJaxbMapper();
-        mapper.enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME);
+        mapper = getJaxbMapperBuilder()
+                .enable(MapperFeature.USE_WRAPPER_NAME_AS_PROPERTY_NAME)
+                .build();
         Bean25 input = new Bean25(1, 2, 3);
         final String JSON = "{\"values\":[1,2,3]}";
         assertEquals(JSON, mapper.writeValueAsString(input));