Merge pull request #234 from derms/dev

rjrudin · web-flow · commit 17cd9239ab9c · 2018-01-25T16:27:02.000-05:00
added additional loadModelDefinition method
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) {

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,10 @@ public void execute(CommandContext context) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`protected GeneratedCode loadModelDefinition(AppConfig appConfig, File f, EntityServicesManager mgr) {`
	`60`	`+ return loadModelDefinition(buildCodeGenerationRequest(appConfig),f,mgr);`
	`61`	`+ }`
	`62`	`+`
	`63`	`+ protected GeneratedCode loadModelDefinition(CodeGenerationRequest codeGenerationRequest, File f, EntityServicesManager mgr) {`
`60`	`64`	`String name = f.getName();`
`61`	`65`	`String modelDefinition = null;`
`62`	`66`	`try {`
`@@ -65,7 +69,7 @@ protected GeneratedCode loadModelDefinition(AppConfig appConfig, File f, EntityS`
`65`	`69`	`throw new RuntimeException("Unable to read model definition from file: " + f.getAbsolutePath(), e);`
`66`	`70`	`}`
`67`	`71`	`String modelUri = mgr.loadModel(name, modelDefinition);`
`68`		`- return mgr.generateCode(modelUri, buildCodeGenerationRequest(appConfig));`
	`72`	`+ return mgr.generateCode(modelUri, codeGenerationRequest);`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`protected CodeGenerationRequest buildCodeGenerationRequest(AppConfig appConfig) {`