DHFPROD-3581: Adding indexes to final-database.json and throwing error if file is not copied

Author: rahulvudutala

marklogic-data-hub/src/test/java/com/marklogic/bootstrap/Installer.java

@@ -46,14 +46,7 @@ public void bootstrapHub() {
         }
 
         if (!isInstalled) {
-            try {
-                Path srcDir = Paths.get("src", "test", "ml-config", "databases","final-database.json");
-                Path dstDir = Paths.get(adminHubConfig.getUserDatabaseDir().toString(), "test-final-database.json");
-                FileUtils.copyFile(srcDir.toAbsolutePath().toFile(), dstDir.toAbsolutePath().toFile());
-            } catch (IOException ioe) {
-                ioe.printStackTrace();
-            }
-
+            copyTestIndexesFileToProject();
             dataHub.install();
 
             User dataHubDeveloper = new User(new API(adminHubConfig.getManageClient()), "test-data-hub-developer");
@@ -79,6 +72,16 @@ public void bootstrapHub() {
         }
     }
 
+    private void copyTestIndexesFileToProject() {
+        try {
+            Path srcDir = Paths.get("src", "test", "ml-config", "databases","final-database.json");
+            Path dstDir = Paths.get(adminHubConfig.getUserDatabaseDir().toString(), "test-final-database.json");
+            FileUtils.copyFile(srcDir.toAbsolutePath().toFile(), dstDir.toAbsolutePath().toFile());
+        } catch (IOException ioe) {
+            throw new RuntimeException("Unable to copy test indexes file to project", ioe);
+        }
+    }
+
     public static void main(String[] args) {
         SpringApplication app = new SpringApplication(Installer.class, ApplicationConfig.class);
         app.setWebApplicationType(WebApplicationType.NONE);

marklogic-data-hub/src/test/ml-config/databases/final-database.json

@@ -20,59 +20,79 @@
       "invalid-values" : "reject"
     },
     {
-      "scalar-type" : "string",
-      "namespace-uri" : "",
-      "localname" : "searchStrCityFacet",
-      "collation" : "http://marklogic.com/collation/",
-      "range-value-positions" : false,
-      "invalid-values" : "reject"
+      "scalar-type": "decimal",
+      "namespace-uri": "",
+      "localname": "decimalProp",
+      "collation": "",
+      "range-value-positions": false,
+      "invalid-values": "reject"
     },
     {
-      "scalar-type": "int",
+      "scalar-type": "double",
       "namespace-uri": "",
-      "localname": "numRangeIntProp",
+      "localname": "doubleProp",
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
     },
     {
-      "scalar-type": "decimal",
+      "scalar-type": "float",
       "namespace-uri": "",
-      "localname": "numRangeIntegerProp",
+      "localname": "floatProp",
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
     },
     {
-      "scalar-type": "long",
-      "namespace-uri": "",
-      "localname": "numRangeLongProp",
+      "scalar-type" : "string",
+      "namespace-uri" : "",
+      "localname" : "strNameProp",
+      "collation" : "http://marklogic.com/collation/codepoint",
+      "range-value-positions" : false,
+      "invalid-values" : "reject"
+    },
+    {
+      "scalar-type" : "string",
+      "namespace-uri" : "",
+      "localname" : "srchEntyProp1",
+      "collation" : "http://marklogic.com/collation/codepoint",
+      "range-value-positions" : false,
+      "invalid-values" : "reject"
+    }
+  ],
+  "range-path-index": [
+    {
+      "scalar-type": "int",
+      "path-expression": "//*:instance/NumericEntity/intProp",
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
     },
     {
-      "scalar-type": "float",
-      "namespace-uri": "",
-      "localname": "numRangeFloatProp",
+      "scalar-type": "long",
+      "path-expression": "//*:instance/NumericEntity/longProp",
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
     },
     {
-      "scalar-type": "double",
-      "namespace-uri": "",
-      "localname": "numRangeDoubleProp",
+      "scalar-type": "int",
+      "path-expression": "//*:instance/NumStringEntity/intProp",
       "collation": "",
       "range-value-positions": false,
       "invalid-values": "reject"
-    }
-  ],
-  "range-path-index": [
+    },
+    {
+      "scalar-type": "string",
+      "path-expression": "//*:instance/NumStringEntity/strCityProp",
+      "collation": "http://marklogic.com/collation/codepoint",
+      "range-value-positions": false,
+      "invalid-values": "reject"
+    },
     {
       "scalar-type": "string",
-      "path-expression": "//*:instance/SearchFacetsEntity/searchStrNameFacet",
-      "collation": "http://marklogic.com/collation/",
+      "path-expression": "//*:instance/EntitiesSearchEntity/srchEntyProp2",
+      "collation": "http://marklogic.com/collation/codepoint",
       "range-value-positions": false,
       "invalid-values": "reject"
     }