Issue #67.

highsource · Jul 17, 2016 · e90b9cf · e90b9cf
1 parent 34907b3
commit e90b9cf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...iler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaMappingCompiler.java b/...iler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/JsonSchemaMappingCompiler.java
@@ -86,7 +86,7 @@ private void addElementInfos(final JsonSchemaBuilder schema) {
 					new JsonSchemaBuilder().addAllOf(qNameRef).addAllOf(nameConstant));
 
 			elementInfoSchema.addProperty(JsonixConstants.VALUE_PROPERTY_NAME,
-					createTypeInfoSchemaRef(elementInfo, typeInfo));
+					getTypeInfoProducer(elementInfo, typeInfo).createTypeInfoSchemaRef(this));
 
 			elementInfoSchema.add(JsonixJsonSchemaConstants.ELEMENT_NAME_PROPERTY_NAME,
 					new JsonSchemaBuilder()
@@ -95,7 +95,7 @@ private void addElementInfos(final JsonSchemaBuilder schema) {
 									elementName.getNamespaceURI()));
 			if (scope != null) {
 				elementInfoSchema.add(JsonixJsonSchemaConstants.SCOPE_PROPERTY_NAME,
-						createTypeInfoSchemaRef(scope, scope));
+						getTypeInfoProducer(elementInfo, typeInfo).createTypeInfoSchemaRef(this));
 			}
 			schema.addAnyOf(elementInfoSchema);
 		}

diff --git a/...ler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/typeinfo/ClassInfoProducer.java b/...ler/src/main/java/org/hisrc/jsonix/compilation/jsonschema/typeinfo/ClassInfoProducer.java
@@ -45,8 +45,8 @@ public JsonSchemaBuilder compile(JsonSchemaMappingCompiler<T, C> mappingCompiler
 		final MClassTypeInfo<T, C, ?> baseTypeInfo = classInfo.getBaseTypeInfo();
 		final JsonSchemaBuilder typeInfoSchema;
 		if (baseTypeInfo != null) {
-			final JsonSchemaBuilder baseTypeInfoSchema = mappingCompiler.createTypeInfoSchemaRef(baseTypeInfo,
-					baseTypeInfo);
+			final JsonSchemaBuilder baseTypeInfoSchema = mappingCompiler.getTypeInfoProducer(baseTypeInfo, baseTypeInfo)
+					.createTypeInfoSchemaRef(mappingCompiler);
 			typeInfoSchema = new JsonSchemaBuilder();
 			typeInfoSchema.addAllOf(baseTypeInfoSchema);
 			typeInfoSchema.addAllOf(classInfoSchema);