minor changes

FasterXML · Apr 20, 2018 · 34efcb4 · 34efcb4
1 parent 27943e3
commit 34efcb4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java b/src/main/java/com/fasterxml/jackson/databind/ObjectMapper.java
@@ -355,9 +355,11 @@ protected ObjectMapper(MapperBuilder<?,?> builder)
         _subtypeResolver = builder.subtypeResolver();
 
         // Ser/deser framework factories
-        SerializerFactory sf = builder.serializerFactory();
+        {
-        _serializationContexts = builder.serializationContexts()
+            SerializerFactory sf = builder.serializerFactory();
-                .forMapper(this, _streamFactory, sf);
+            _serializationContexts = builder.serializationContexts()
+                    .forMapper(this, _streamFactory, sf);
+        }
 
         _deserializationContext = builder.deserializationContext();
         _injectableValues = builder.injectableValues();

diff --git a/src/main/java/com/fasterxml/jackson/databind/cfg/SerializationContexts.java b/src/main/java/com/fasterxml/jackson/databind/cfg/SerializationContexts.java
@@ -66,12 +66,12 @@ protected SerializationContexts(TokenStreamFactory tsf,
      * (as opposed to coming into existence during building, module registration).
      * Necessary usually to initialize non-configuration state, such as caching.
      */
-    public SerializationContexts forMapper(ObjectMapper mapper,
+    public SerializationContexts forMapper(Object mapper,
             TokenStreamFactory tsf, SerializerFactory serializerFactory) {
         return forMapper(mapper, tsf, serializerFactory, _defaultCache());
     }
 
-    protected abstract SerializationContexts forMapper(ObjectMapper mapper,
+    protected abstract SerializationContexts forMapper(Object mapper,
             TokenStreamFactory tsf, SerializerFactory serializerFactory,
             SerializerCache cache);
 
@@ -142,7 +142,7 @@ public DefaultImpl(TokenStreamFactory tsf,
         }
 
         @Override
-        public SerializationContexts forMapper(ObjectMapper mapper,
+        public SerializationContexts forMapper(Object mapper,
                 TokenStreamFactory tsf, SerializerFactory serializerFactory,
                 SerializerCache cache) {
             return new DefaultImpl(tsf, serializerFactory, cache);

diff --git a/src/main/java/com/fasterxml/jackson/databind/jsontype/SubtypeResolver.java b/src/main/java/com/fasterxml/jackson/databind/jsontype/SubtypeResolver.java
@@ -17,9 +17,9 @@ public abstract class SubtypeResolver
     implements Snapshottable<SubtypeResolver>
 {
     /*
-    /**********************************************************
+    /**********************************************************************
-    /* Copyable
+    /* Snapshottable
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -33,9 +33,9 @@ public abstract class SubtypeResolver
     public abstract SubtypeResolver snapshot();
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Methods for registering external subtype definitions
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**
@@ -50,9 +50,9 @@ public abstract class SubtypeResolver
     public abstract SubtypeResolver registerSubtypes(Collection<Class<?>> subtypes);
 
     /*
-    /**********************************************************
+    /**********************************************************************
     /* Subtype resolution
-    /**********************************************************
+    /**********************************************************************
      */
 
     /**

diff --git a/src/test/java/com/fasterxml/jackson/databind/ser/filter/NullSerializationTest.java b/src/test/java/com/fasterxml/jackson/databind/ser/filter/NullSerializationTest.java
@@ -45,7 +45,7 @@ public MyNullSerializerContexts(TokenStreamFactory tsf, SerializerFactory serial
         }
 
         @Override
-        public SerializationContexts forMapper(ObjectMapper mapper,
+        public SerializationContexts forMapper(Object mapper,
                 TokenStreamFactory tsf, SerializerFactory serializerFactory,
                 SerializerCache cache) {
             return new MyNullSerializerContexts(tsf, serializerFactory, cache);