Merge pull request #234 from derms/dev

added additional loadModelDefinition method
marklogic · Jan 25, 2018 · 17cd923 · 17cd923
2 parents 72094bd + 2fc4bf1
commit 17cd923
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java b/src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java
@@ -57,6 +57,10 @@ public void execute(CommandContext context) {
 	}
 
 	protected GeneratedCode loadModelDefinition(AppConfig appConfig, File f, EntityServicesManager mgr) {
+		return loadModelDefinition(buildCodeGenerationRequest(appConfig),f,mgr);
+	}
+
+	protected GeneratedCode loadModelDefinition(CodeGenerationRequest codeGenerationRequest, File f, EntityServicesManager mgr) {
 		String name = f.getName();
 		String modelDefinition = null;
 		try {
@@ -65,7 +69,7 @@ protected GeneratedCode loadModelDefinition(AppConfig appConfig, File f, EntityS
 			throw new RuntimeException("Unable to read model definition from file: " + f.getAbsolutePath(), e);
 		}
 		String modelUri = mgr.loadModel(name, modelDefinition);
-		return mgr.generateCode(modelUri, buildCodeGenerationRequest(appConfig));
+		return mgr.generateCode(modelUri, codeGenerationRequest);
 	}
 
 	protected CodeGenerationRequest buildCodeGenerationRequest(AppConfig appConfig) {