DHFPROD-7002: GH 5308 - targetEntity still being set on new match/merge steps instead of targetEntityType

Author: fsnow

marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/artifacts/matching.sjs

@@ -72,7 +72,7 @@ function defaultArtifact(artifactName) {
     batchSize: 100,
     sourceDatabase: dataHub.config.FINALDATABASE,
     targetDatabase: dataHub.config.FINALDATABASE,
-    targetEntity: "Change this to a valid entity type name; e.g. Customer",
+    targetEntityType: "Change this to a valid entity type name; e.g. Customer",
     sourceQuery: "cts.collectionQuery('Change this to a valid collection name; e.g. Customer')",
     collections: [
       "mastering-summary"

marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/artifacts/merging.sjs

@@ -74,7 +74,7 @@ function defaultArtifact(artifactName) {
     sourceDatabase: dataHub.config.FINALDATABASE,
     targetDatabase: dataHub.config.FINALDATABASE,
     permissions: defaultPermissions,
-    targetEntity: "Change this to a valid entity type name; e.g. Customer",
+    targetEntityType: "Change this to a valid entity type name; e.g. Customer",
     sourceQuery: "cts.collectionQuery('mastering-summary')",
     provenanceGranularityLevel: 'coarse',
     collections: [],

marklogic-data-hub/src/test/java/com/marklogic/hub/scaffolding/CreateDefaultFlowTest.java

@@ -17,7 +17,7 @@ void test() {
         File file = new ScaffoldingImpl(getHubConfig()).createDefaultFlow("defaultFlowTest");
         ObjectNode json = readJsonObject(file);
         JsonNode mappingStep = json.get("steps").get("2");
-        
+
         assertEquals("mapping-step", mappingStep.get("name").asText());
         assertEquals(
             "Change this to a valid entity type name; e.g. Customer",

marklogic-data-hub/src/test/java/com/marklogic/hub/scaffolding/CreateStepTest.java

@@ -176,7 +176,7 @@ private void verifyStep(String stepName, JsonNode step, String stepType){
         else if ("matching".equalsIgnoreCase(stepType) || "merging".equalsIgnoreCase(stepType)){
             assertEquals("query", step.get("selectedSource").asText());
             assertEquals("json", step.get("targetFormat").asText());
-            assertEquals("Change this to a valid entity type name; e.g. Customer", step.get("targetEntity").asText());
+            assertEquals("Change this to a valid entity type name; e.g. Customer", step.get("targetEntityType").asText());
             assertEquals(false, step.get("stepUpdate").asBoolean());
             if ("matching".equalsIgnoreCase(stepType)) {
                 assertNotNull( step.get("matchRulesets"));