Merge pull request #19 from rpdai/master

Support enriching schema objects with property-specific information of a bean

Author: cowtowncoder

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

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
@@ -461,6 +462,15 @@ public void setRequired(Boolean required) {
 		this.required = required;
 	}
 
+	/**
+	 * Override this to add information specific to the property of bean
+	 * For example, bean validation annotations could be used to specify
+	 * value constraints in the schema
+	 * @param beanProperty
+	 */
+	public void enrichWithBeanProperty(BeanProperty beanProperty) {
+	}
+
 	/**
 	 * Create a schema which verifies only that an object is of the given format.
 	 * @param format the format to expect

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

@@ -57,7 +57,7 @@ public void setWrapperFactory(WrapperFactory wrapperFactory) {
 
     @Override
     public void optionalProperty(BeanProperty prop) throws JsonMappingException {
-        schema.putOptionalProperty(prop.getName(), propertySchema(prop));
+        schema.putOptionalProperty(prop, propertySchema(prop));
     }
 
     @Override
@@ -68,7 +68,7 @@ public void optionalProperty(String name, JsonFormatVisitable handler, JavaType
 
     @Override
     public void property(BeanProperty prop) throws JsonMappingException {
-        schema.putProperty(prop.getName(), propertySchema(prop));
+        schema.putProperty(prop, propertySchema(prop));
     }
 
     @Override

src/main/java/com/fasterxml/jackson/module/jsonSchema/types/ObjectSchema.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.BeanProperty;
 import com.fasterxml.jackson.databind.jsonFormatVisitors.JsonFormatTypes;
 import com.fasterxml.jackson.module.jsonSchema.JsonSchema;
 
@@ -140,13 +141,24 @@ public boolean isObjectSchema() {
 		return true;
 	}
 
+	public void putOptionalProperty(BeanProperty property, JsonSchema jsonSchema) {
+		jsonSchema.enrichWithBeanProperty(property);
+		properties.put(property.getName(), jsonSchema);
+	}
+	
 	public void putOptionalProperty(String name, JsonSchema jsonSchema) {
 		properties.put(name, jsonSchema);
 	}
 
 	public JsonSchema putPatternProperty(String regex, JsonSchema value) {
 		return patternProperties.put(regex, value);
 	}
+	
+	public JsonSchema putProperty(BeanProperty property, JsonSchema value) {
+		value.setRequired(true);
+		value.enrichWithBeanProperty(property);
+		return properties.put(property.getName(), value);		
+	}
 
 	public JsonSchema putProperty(String name, JsonSchema value) {
 		value.setRequired(true);