Issue #22.

Author: highsource

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

@@ -4,9 +4,6 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
-import javax.json.JsonBuilderFactory;
-import javax.json.spi.JsonProvider;
-
 import org.apache.commons.lang3.Validate;
 import org.hisrc.jsonix.definition.JsonSchema;
 import org.hisrc.jsonix.definition.Mapping;
@@ -46,11 +43,7 @@ public Module<T, C> getModule() {
 		return module;
 	}
 
-	public JsonSchemaBuilder compile(JsonStructureWriter<T, C> writer) {
-		final JsonProvider provider = JsonProvider.provider();
-		final JsonBuilderFactory builderFactory = provider
-				.createBuilderFactory(null);
-
+	public JsonSchemaBuilder compile() {
 		final Map<Mapping<T, C>, JsonSchemaBuilder> mappingSchemas = new LinkedHashMap<Mapping<T, C>, JsonSchemaBuilder>(
 				this.module.getMappings().size());
 		for (Mapping<T, C> mapping : this.module.getMappings()) {
@@ -78,10 +71,6 @@ public JsonSchemaBuilder compile(JsonStructureWriter<T, C> writer) {
 			}
 		}
 
-		for (JsonSchema jsonSchema : module.getJsonSchemas()) {
-			writer.writeJsonStructure(module, schema.build(builderFactory),
-					jsonSchema.getFileName());
-		}
 		return schema;
 	}
 }

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

@@ -1,9 +1,14 @@
 package org.hisrc.jsonix.compilation.jsonschema;
 
+import javax.json.JsonBuilderFactory;
+import javax.json.JsonObject;
+import javax.json.spi.JsonProvider;
+
 import org.apache.commons.lang3.Validate;
 import org.hisrc.jsonix.definition.JsonSchema;
 import org.hisrc.jsonix.definition.Module;
 import org.hisrc.jsonix.definition.Modules;
+import org.hisrc.jsonix.jsonschema.JsonSchemaBuilder;
 
 public class JsonSchemaModulesCompiler<T, C extends T> {
 
@@ -19,12 +24,20 @@ public Modules<T, C> getModules() {
 	}
 
 	public void compile(JsonStructureWriter<T, C> writer) {
+		final JsonProvider provider = JsonProvider.provider();
+		final JsonBuilderFactory builderFactory = provider
+				.createBuilderFactory(null);
 		for (final Module<T, C> module : this.modules.getModules()) {
 			if (!module.isEmpty()) {
 				for (JsonSchema jsonSchema : module.getJsonSchemas()) {
 					final JsonSchemaModuleCompiler<T, C> moduleCompiler = new JsonSchemaModuleCompiler<T, C>(
 							this, module, jsonSchema);
-					moduleCompiler.compile(writer);
+					final JsonSchemaBuilder moduleSchema = moduleCompiler
+							.compile();
+					final JsonObject moduleSchemaJsonObject = moduleSchema
+							.build(builderFactory);
+					writer.writeJsonStructure(module, moduleSchemaJsonObject,
+							jsonSchema.getFileName());
 				}
 			}
 		}