Issue #22.

Author: highsource

compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaClassInfoCompiler.java

@@ -11,6 +11,7 @@
 import org.hisrc.jsonix.JsonixConstants;
 import org.hisrc.jsonix.definition.Mapping;
 import org.hisrc.jsonix.jsonschema.JsonSchemaBuilder;
+import org.hisrc.jsonix.jsonschema.JsonSchemaConstants;
 import org.hisrc.jsonix.naming.StandardNaming;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassTypeInfo;
@@ -36,7 +37,7 @@ public JsonSchemaMappingCompiler<T, C> getMappingCompiler() {
 	@Override
 	public JsonSchemaBuilder compile(MClassInfo<T, C> classInfo) {
 		final JsonSchemaBuilder classInfoSchema = new JsonSchemaBuilder();
-		classInfoSchema.addType("object");
+		classInfoSchema.addType(JsonSchemaConstants.OBJECT_TYPE);
 		final String localName = classInfo
 				.getContainerLocalName(JsonixConstants.DEFAULT_SCOPED_NAME_DELIMITER);
 		classInfoSchema.addTitle(localName);

compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaKeywords.java

@@ -87,12 +87,12 @@ public JsonSchemaBuilder visitElementRefPropertyInfo(
 		if (info.isMixed()) {
 			itemTypeSchemas
 					.add(new JsonSchemaBuilder()
-							.addType(XmlSchemaJsonSchemaConstants.STRING_TYPE_INFO_SCHEMA_REF));
+							.addRef(XmlSchemaJsonSchemaConstants.STRING_TYPE_INFO_SCHEMA_REF));
 		}
 		if (info.isDomAllowed()) {
 			itemTypeSchemas
 					.add(new JsonSchemaBuilder()
-							.addType(JsonixJsonSchemaConstants.DOM_TYPE_INFO_SCHEMA_REF));
+							.addRef(JsonixJsonSchemaConstants.DOM_TYPE_INFO_SCHEMA_REF));
 		}
 		if (info.isTypedObjectAllowed()) {
 			itemTypeSchemas.add(createElementRefSchema(info));
@@ -117,12 +117,12 @@ public JsonSchemaBuilder visitElementRefsPropertyInfo(
 		if (info.isMixed()) {
 			itemTypeSchemas
 					.add(new JsonSchemaBuilder()
-							.addType(XmlSchemaJsonSchemaConstants.STRING_TYPE_INFO_SCHEMA_REF));
+							.addRef(XmlSchemaJsonSchemaConstants.STRING_TYPE_INFO_SCHEMA_REF));
 		}
 		if (info.isDomAllowed()) {
 			itemTypeSchemas
 					.add(new JsonSchemaBuilder()
-							.addType(JsonixJsonSchemaConstants.DOM_TYPE_INFO_SCHEMA_REF));
+							.addRef(JsonixJsonSchemaConstants.DOM_TYPE_INFO_SCHEMA_REF));
 		}
 		if (info.isTypedObjectAllowed()) {
 			itemTypeSchemas.addAll(createElementRefsSchema(info));
@@ -163,12 +163,12 @@ public JsonSchemaBuilder visitAnyElementPropertyInfo(
 		if (info.isMixed()) {
 			itemTypeSchemas
 					.add(new JsonSchemaBuilder()
-							.addType(XmlSchemaJsonSchemaConstants.STRING_TYPE_INFO_SCHEMA_REF));
+							.addRef(XmlSchemaJsonSchemaConstants.STRING_TYPE_INFO_SCHEMA_REF));
 		}
 		if (info.isDomAllowed()) {
 			itemTypeSchemas
 					.add(new JsonSchemaBuilder()
-							.addType(JsonixJsonSchemaConstants.DOM_TYPE_INFO_SCHEMA_REF));
+							.addRef(JsonixJsonSchemaConstants.DOM_TYPE_INFO_SCHEMA_REF));
 		}
 		if (info.isTypedObjectAllowed()) {
 			final JsonSchemaBuilder anyElementSchema = new JsonSchemaBuilder()

compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaPropertyInfoCompilerVisitor.java

@@ -11,6 +11,8 @@
 import org.hisrc.jsonix.definition.Module;
 import org.hisrc.jsonix.definition.Modules;
 import org.hisrc.jsonix.jsonschema.JsonSchemaBuilder;
+import org.hisrc.jsonix.jsonschema.JsonSchemaConstants;
+import org.hisrc.jsonix.jsonschema.JsonSchemaKeywords;
 import org.jvnet.jaxb2_commons.xml.bind.model.MBuiltinLeafInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassInfo;
 import org.jvnet.jaxb2_commons.xml.bind.model.MClassRef;
@@ -70,7 +72,7 @@ public JsonSchemaBuilder visitClassRef(MClassRef<T, C> info) {
 
 	@Override
 	public JsonSchemaBuilder visitList(MList<T, C> info) {
-		return new JsonSchemaBuilder().addType("array").addItem(
+		return new JsonSchemaBuilder().addType(JsonSchemaConstants.ARRAY_TYPE).addItem(
 				info.getItemTypeInfo().acceptTypeInfoVisitor(this));
 	}
 

compiler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaRefTypeInfoCompilerVisitor.java

@@ -6,6 +6,7 @@
 
 import javax.xml.namespace.QName;
 
+import org.hisrc.jsonix.jsonschema.JsonSchemaKeywords;
 import org.jvnet.jaxb2_commons.xmlschema.XmlSchemaConstants;
 
 public class XmlSchemaJsonSchemaConstants {