From 6d1494fa65656a9d2e52222d5d8a3b437f4215ed Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 10 Apr 2018 19:18:44 -0700
Subject: [PATCH] minor compilation fixes

---
 .../fasterxml/jackson/jaxrs/json/TestCanSerialize.java   | 7 ++++---
 .../jaxrs/json/TestSerializeWithoutAutoflush.java        | 3 ++-
 .../fasterxml/jackson/jaxrs/xml/TestCanSerialize.java    | 7 ++++---
 .../fasterxml/jackson/jaxrs/yaml/TestCanSerialize.java   | 9 ++++-----
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestCanSerialize.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestCanSerialize.java
index 728f5ac8..7166624f 100644
--- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestCanSerialize.java
+++ b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestCanSerialize.java
@@ -4,7 +4,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
+import com.fasterxml.jackson.databind.DefaultTyping;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
@@ -21,8 +21,9 @@ static class Simple {
 
     public void testCanSerialize() throws IOException
     {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY);
+        ObjectMapper mapper = ObjectMapper.builder()
+                .enableDefaultTyping(DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY)
+                .build();
     
         // construct test object
         List<String> l = new ArrayList<String>();
diff --git a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestSerializeWithoutAutoflush.java b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestSerializeWithoutAutoflush.java
index 12be06cc..314203ae 100644
--- a/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestSerializeWithoutAutoflush.java
+++ b/json/src/test/java/com/fasterxml/jackson/jaxrs/json/TestSerializeWithoutAutoflush.java
@@ -9,6 +9,7 @@
 import javax.ws.rs.core.MediaType;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.DefaultTyping;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 
@@ -28,8 +29,8 @@ public void testCanSerialize() throws IOException
     {
         ObjectMapper mapper = ObjectMapper.builder()
                 .disable(SerializationFeature.FLUSH_AFTER_WRITE_VALUE)
+                .enableDefaultTyping(DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY)
                 .build();
-        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY);
 
         JacksonJsonProvider provider = new JacksonJsonProvider(mapper);
 
diff --git a/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestCanSerialize.java b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestCanSerialize.java
index 19d5374f..8508a81d 100644
--- a/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestCanSerialize.java
+++ b/xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestCanSerialize.java
@@ -4,7 +4,7 @@
 import java.util.*;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
+import com.fasterxml.jackson.databind.DefaultTyping;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
@@ -21,8 +21,9 @@ static class Simple {
 
     public void testCanSerialize() throws IOException
     {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY);
+        ObjectMapper mapper = ObjectMapper.builder()
+                .enableDefaultTyping(DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY)
+                .build();
     
         // construct test object
         List<String> l = new ArrayList<String>();
diff --git a/yaml/src/test/java/com/fasterxml/jackson/jaxrs/yaml/TestCanSerialize.java b/yaml/src/test/java/com/fasterxml/jackson/jaxrs/yaml/TestCanSerialize.java
index 9c4302f0..445ed008 100644
--- a/yaml/src/test/java/com/fasterxml/jackson/jaxrs/yaml/TestCanSerialize.java
+++ b/yaml/src/test/java/com/fasterxml/jackson/jaxrs/yaml/TestCanSerialize.java
@@ -1,15 +1,13 @@
 package com.fasterxml.jackson.jaxrs.yaml;
 
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.databind.DefaultTyping;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Unit test to check [JACKSON-540]
- */
 public class TestCanSerialize extends JaxrsTestBase
 {
     static class Simple {
@@ -21,8 +19,9 @@ static class Simple {
 
     public void testCanSerialize() throws IOException
     {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY);
+        ObjectMapper mapper = ObjectMapper.builder()
+                .enableDefaultTyping(DefaultTyping.NON_FINAL, JsonTypeInfo.As.WRAPPER_ARRAY)
+                .build();
     
         // construct test object
         List<String> l = new ArrayList<String>();