Changes for move of JsonFactory to diff package

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/Module.java

@@ -3,6 +3,7 @@
 import java.util.Collection;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.databind.cfg.MutableConfigOverride;
 import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier;
 import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler;

src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java

@@ -14,6 +14,7 @@
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.CharacterEscapes;
 import com.fasterxml.jackson.core.io.SegmentedStringWriter;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.core.type.ResolvedType;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.core.util.*;

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

@@ -58,7 +58,7 @@ static class NoCopyMapper extends ObjectMapper { }
 
     public void testFactorFeatures()
     {
-        assertTrue(MAPPER.isEnabled(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES));
+        assertTrue(MAPPER.isEnabled(TokenStreamFactory.Feature.CANONICALIZE_FIELD_NAMES));
     }
 
     public void testGeneratorFeatures()

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

@@ -11,6 +11,7 @@
 
 import com.fasterxml.jackson.core.*;
 import com.fasterxml.jackson.core.io.SerializedString;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
 /**

src/test/java/com/fasterxml/jackson/databind/ext/jdk8/OptionalUnwrappedTest.java

@@ -4,7 +4,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
-import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatVisitorWrapper;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonObjectFormatVisitor;

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

@@ -1,7 +1,7 @@
 package com.fasterxml.jackson.databind.jsontype;
 
 import com.fasterxml.jackson.core.*;
-
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.databind.*;
 
 public class TypeDeserializerTest extends BaseMapTest

src/test/java/com/fasterxml/jackson/databind/ser/TestSerializerProvider.java

@@ -2,7 +2,7 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.cfg.GeneratorSettings;
 import com.fasterxml.jackson.databind.ser.BeanSerializerFactory;

src/test/java/com/fasterxml/jackson/databind/ser/filter/NullSerializationTest.java

@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.cfg.GeneratorSettings;

src/test/java/perf/ManualReadPerfUntyped.java

@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.databind.*;
 
 public class ManualReadPerfUntyped extends ObjectReaderTestBase

src/test/java/perf/ManualReadPerfUntypedReader.java

@@ -3,6 +3,7 @@
 import java.io.*;
 
 import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.core.json.JsonFactory;
 import com.fasterxml.jackson.databind.*;
 
 public class ManualReadPerfUntypedReader extends ObjectReaderTestBase