#376 Generated model artifact files now have "GENERATED" at the end of their filename

Author: rjrudin

src/main/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsCommand.java

@@ -124,7 +124,7 @@ protected void generateInstanceConverter(AppConfig appConfig, GeneratedCode code
 					}
 					return;
 				}
-				out = new File(esDir, code.getTitle() + "-" + code.getVersion() + "-GENERATED.xqy");
+				out = new File(esDir, code.getTitle() + "-" + code.getVersion() + ".xqy.GENERATED");
 				logMessage = "Instance converter does not match existing file, so writing to: ";
 			}
 			try {
@@ -152,7 +152,7 @@ protected void generateSearchOptions(GeneratedCode code, File modulesDir) {
 					}
 					return;
 				}
-				out = new File(optionsDir, code.getTitle() + "-GENERATED.xml");
+				out = new File(optionsDir, code.getTitle() + "xml.GENERATED");
 				logMessage = "Search options does not match existing file, so writing to: ";
 			}
 			try {
@@ -187,7 +187,7 @@ protected void generateDatabaseProperties(AppConfig appConfig, GeneratedCode cod
 					}
 					return;
 				}
-				out = new File(dbDir, "content-database-GENERATED.json");
+				out = new File(dbDir, "content-database.json.GENERATED");
 				logMessage = "Database properties does not match existing file, so writing to: ";
 			}
 			try {
@@ -226,7 +226,7 @@ protected void generateSchema(AppConfig appConfig, GeneratedCode code) {
 					}
 					return;
 				}
-				out = new File(dir, code.getTitle() + "-" + code.getVersion() + "-GENERATED.xsd");
+				out = new File(dir, code.getTitle() + "-" + code.getVersion() + "xsd.GENERATED");
 				logMessage = "Schema does not match existing file, so writing to: ";
 			}
 			try {
@@ -256,7 +256,7 @@ protected void generateExtractionTemplate(AppConfig appConfig, GeneratedCode cod
 					}
 					return;
 				}
-				out = new File(dir, code.getTitle() + "-" + code.getVersion() + "-GENERATED.tdex");
+				out = new File(dir, code.getTitle() + "-" + code.getVersion() + "tdex.GENERATED");
 				logMessage = "Extraction template does not match existing file, so writing to: ";
 			}
 			try {

src/test/java/com/marklogic/appdeployer/command/es/GenerateModelArtifactsTest.java

@@ -6,10 +6,12 @@
 import com.marklogic.appdeployer.command.restapis.DeployRestApiServersCommand;
 import com.marklogic.client.DatabaseClient;
 import com.marklogic.client.io.StringHandle;
+import org.apache.commons.io.FileUtils;
 import org.junit.After;
 import org.junit.Test;
 
 import java.io.File;
+import java.io.IOException;
 
 public class GenerateModelArtifactsTest extends AbstractAppDeployerTest {
 
@@ -19,12 +21,13 @@ public void tearDown() {
 	}
 
 	@Test
-	public void test() {
+	public void test() throws IOException {
 		String projectPath = "src/test/resources/entity-services-project";
 		File srcDir = new File(projectPath, "src");
 		if (srcDir.exists()) {
-			srcDir.delete();
+			FileUtils.cleanDirectory(srcDir);
 		}
+
 		appConfig.setConfigDir(new ConfigDir(new File(projectPath + "/src/main/ml-config")));
 		appConfig.setModelsPath(projectPath + "/data/entity-services");
 		appConfig.getModulePaths().clear();
@@ -57,10 +60,10 @@ public void test() {
 		deploySampleApp();
 
 		// These shouldn't exist because the content is the same
-		assertFalse(new File(projectPath, "src/main/ml-modules/ext/entity-services/Race-0.0.1-GENERATED.xqy").exists());
-		assertFalse(new File(projectPath, "src/main/ml-modules/options/Race-GENERATED.xml").exists());
-		assertFalse(new File(projectPath, "src/main/ml-config/databases/content-database-GENERATED.json").exists());
-		assertFalse(new File(projectPath, "src/main/ml-schemas/Race-0.0.1-GENERATED.xsd").exists());
-		assertFalse(new File(projectPath, "src/main/ml-schemas/Race-0.0.1-GENERATED.tdex").exists());
+		assertFalse(new File(projectPath, "src/main/ml-modules/ext/entity-services/Race-0.0.1.xqy.GENERATED").exists());
+		assertFalse(new File(projectPath, "src/main/ml-modules/options/Race.xml.GENERATED").exists());
+		assertFalse(new File(projectPath, "src/main/ml-config/databases/content-database.json.GENERATED").exists());
+		assertFalse(new File(projectPath, "src/main/ml-schemas/Race-0.0.1.xsd.GENERATED").exists());
+		assertFalse(new File(projectPath, "src/main/ml-schemas/Race-0.0.1.tdex.GENERATED").exists());
 	}
 }