Add JsonSchemaGenerator(ObjectWriter)

Author: cowtowncoder

pom.xml

@@ -8,7 +8,7 @@
   <groupId>com.fasterxml.jackson.module</groupId>
   <artifactId>jackson-module-jsonSchema</artifactId>
   <name>jackson-module-jsonSchema</name>
-  <version>2.5.1-SNAPSHOT</version>
+  <version>2.6.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <description>Add-on module for Jackson (http://jackson.codehaus.org) to support
 JSON Schema (http://tools.ietf.org/html/draft-zyp-json-schema-03) version 3 generation.
@@ -34,7 +34,7 @@ JSON Schema (http://tools.ietf.org/html/draft-zyp-json-schema-03) version 3 gene
   </developers>
   <properties>
     <version.jackson.annotations>2.5.0</version.jackson.annotations>
-    <version.jackson.core>2.5.0</version.jackson.core>
+    <version.jackson.core>2.6.0-SNAPSHOT</version.jackson.core>
 
     <osgi.export>${project.groupId}.jsonSchema.*</osgi.export>
   </properties>

release-notes/VERSION

@@ -4,6 +4,11 @@ Project: jackson-module-jsonSchema
 === Releases ===
 ------------------------------------------------------------------------
 
+2.6.0 (not yet released)
+
+- Added `JsonSchemaGenerator(ObjectWriter)` to allow use of (re-)configured `ObjectWriter`
+  instead of `ObjectMapper` which can not be configured.
+
 2.5.1 (not yet released)
 
 ...

src/main/java/com/fasterxml/jackson/module/jsonSchema/JsonSchemaGenerator.java

@@ -1,8 +1,6 @@
 package com.fasterxml.jackson.module.jsonSchema;
 
-import com.fasterxml.jackson.databind.JavaType;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.module.jsonSchema.factories.SchemaFactoryWrapper;
 import com.fasterxml.jackson.module.jsonSchema.factories.WrapperFactory;
 
@@ -13,8 +11,16 @@
  */
 public class JsonSchemaGenerator
 {
+    /**
+     * @deprecated Since 2.6
+     */
     protected final ObjectMapper _mapper;
 
+    /**
+     * @since 2.6
+     */
+    protected final ObjectWriter _writer;
+
     private final WrapperFactory _wrapperFactory;
 
     public JsonSchemaGenerator(ObjectMapper mapper) {
@@ -23,20 +29,37 @@ public JsonSchemaGenerator(ObjectMapper mapper) {
 
     public JsonSchemaGenerator(ObjectMapper mapper, WrapperFactory wrapperFactory) {
         _mapper = mapper;
-        _wrapperFactory = wrapperFactory == null ? new WrapperFactory() : wrapperFactory;
+        _writer = mapper.writer();
+        _wrapperFactory = (wrapperFactory == null) ? new WrapperFactory() : wrapperFactory;
+    }
+
+    /**
+     * @since 2.6
+     */
+    public JsonSchemaGenerator(ObjectWriter w) {
+        this(w, null);
     }
 
+    /**
+     * @since 2.6
+     */
+    public JsonSchemaGenerator(ObjectWriter w, WrapperFactory wrapperFactory) {
+        _mapper = null;
+        _writer = w;
+        _wrapperFactory = (wrapperFactory == null) ? new WrapperFactory() : wrapperFactory;
+    }
+    
     public JsonSchema generateSchema(Class<?> type) throws JsonMappingException
     {
-        SchemaFactoryWrapper visitor = _wrapperFactory.getWrapper(_mapper == null ? null : _mapper.getSerializerProvider());
-        _mapper.acceptJsonFormatVisitor(type, visitor);
+        SchemaFactoryWrapper visitor = _wrapperFactory.getWrapper(null);
+        _writer.acceptJsonFormatVisitor(type, visitor);
         return visitor.finalSchema();
     }
 
     public JsonSchema generateSchema(JavaType type) throws JsonMappingException
     {
-        SchemaFactoryWrapper visitor = _wrapperFactory.getWrapper(_mapper == null ? null : _mapper.getSerializerProvider());
-        _mapper.acceptJsonFormatVisitor(type, visitor);
+        SchemaFactoryWrapper visitor = _wrapperFactory.getWrapper(null);
+        _writer.acceptJsonFormatVisitor(type, visitor);
         return visitor.finalSchema();
     }
 }

src/main/java/com/fasterxml/jackson/module/jsonSchema/customProperties/TitleSchemaFactoryWrapper.java

@@ -19,14 +19,18 @@ private static class TitleSchemaFactoryWrapperFactory extends WrapperFactory {
 	    @Override
 	    public SchemaFactoryWrapper getWrapper(SerializerProvider p) {
 	        SchemaFactoryWrapper wrapper = new TitleSchemaFactoryWrapper();
-	        wrapper.setProvider(p);
+	        if (p != null) {
+	            wrapper.setProvider(p);
+	        }
 	        return wrapper;
 	    };
 
 	    @Override
-        public SchemaFactoryWrapper getWrapper(SerializerProvider p, VisitorContext rvc) {
+	    public SchemaFactoryWrapper getWrapper(SerializerProvider p, VisitorContext rvc) {
             SchemaFactoryWrapper wrapper = new TitleSchemaFactoryWrapper();
-            wrapper.setProvider(p);
+            if (p != null) {
+                wrapper.setProvider(p);
+            }
             wrapper.setVisitorContext(rvc);
             return wrapper;
         }

src/main/java/com/fasterxml/jackson/module/jsonSchema/factories/SchemaFactoryWrapper.java

@@ -22,15 +22,15 @@ public class SchemaFactoryWrapper implements JsonFormatVisitorWrapper, Visitor
     public SchemaFactoryWrapper() {
         this(null, new WrapperFactory());
     }
-    
+
     public SchemaFactoryWrapper(SerializerProvider p) {
         this(p, new WrapperFactory());
     }
 
     protected SchemaFactoryWrapper(WrapperFactory wrapperFactory) {
         this(null, wrapperFactory);
     }
-    
+
     protected SchemaFactoryWrapper(SerializerProvider p, WrapperFactory wrapperFactory) {
         provider = p;
         schemaProvider = new JsonSchemaFactory();
@@ -135,7 +135,7 @@ public JsonMapFormatVisitor expectMapFormat(JavaType type)
     }
 
     @Override
-    public Visitor setVisitorContext(VisitorContext rvc) {
+    public SchemaFactoryWrapper setVisitorContext(VisitorContext rvc) {
         visitorContext = rvc;
         return this;
     }

src/main/java/com/fasterxml/jackson/module/jsonSchema/factories/WrapperFactory.java

@@ -7,11 +7,11 @@
  * to nested schema factories.
  * @author jphelan
  */
-public class WrapperFactory {
-	
-	public SchemaFactoryWrapper getWrapper(SerializerProvider provider) {
-		return new SchemaFactoryWrapper(provider);
-	}
+public class WrapperFactory
+{
+    public SchemaFactoryWrapper getWrapper(SerializerProvider provider) {
+        return new SchemaFactoryWrapper(provider);
+    }
 
     public SchemaFactoryWrapper getWrapper(SerializerProvider provider, VisitorContext rvc) {
         SchemaFactoryWrapper wrapper = new SchemaFactoryWrapper(provider);