DHFPROD-3448: fix pass at trying to adapt 2.x to 9 latest

Author: aebadirad

marklogic-data-hub/build.gradle

@@ -25,8 +25,8 @@ ext.junitJupiterVersion  = '5.0.0-RC3'
 
 dependencies {
     compile 'com.marklogic:marklogic-client-api:4.0.3.1'
-    compile 'com.marklogic:mlcp-util:0.3.0'
-    compile 'com.marklogic:ml-app-deployer:3.4.0'
+    compile 'com.marklogic:mlcp-util:0.9.0'
+    compile 'com.marklogic:ml-app-deployer:3.10.1'
     compile 'commons-io:commons-io:2.4'
     compile 'org.apache.commons:commons-text:1.1'
 
@@ -48,8 +48,8 @@ dependencies {
     testCompile 'org.hamcrest:hamcrest-junit:2.0.0.0'
     testCompile 'org.easymock:easymock:3.4'
     testCompile 'ch.qos.logback:logback-classic:1.1.11'
-    testCompile("com.marklogic:mlcp-util:0.3.0")
-    testCompile("com.marklogic:mlcp:9.0.3") {
+    testCompile("com.marklogic:mlcp-util:0.9.0")
+    testCompile("com.marklogic:mlcp:10.0.2") {
       exclude group: 'org.apache.avro', module: 'avro-tools'
     }
 }

marklogic-data-hub/src/main/java/com/marklogic/hub/DataHub.java

@@ -152,31 +152,46 @@ public boolean isServerVersionValid(String versionString) {
                 versionString = new Versions(hubConfig).getMarkLogicVersion();
             }
             int major = Integer.parseInt(versionString.replaceAll("([^.]+)\\..*", "$1"));
-            if (major < 9) {
+            if (major != 9) {
                 return false;
             }
             boolean isNightly = versionString.matches("[^-]+-(\\d{4})(\\d{2})(\\d{2})");
-            if (major == 9) {
-                String alteredString = versionString.replaceAll("[^\\d]+", "");
-                if (alteredString.length() < 4) {
-                    alteredString = StringUtils.rightPad(alteredString, 4, "0");
-                }
-                int ver = Integer.parseInt(alteredString.substring(0, 4));
-                if (!isNightly && ver < 9011) {
-                    return false;
-                }
+
+            //Support any 9.0 version >= 9.1-1.
+            int minor = 0;
+            int hotFixNum = 0;
+
+            //Extract minor version in cases where versions is of type 9.0-6.2 or 9.0-6
+            if(versionString.matches("^.*-(.+)\\.(.*)")) {
+                minor = Integer.parseInt(versionString.replaceAll("^.*-(.+)\\..*", "$1"));
+                hotFixNum = Integer.parseInt(versionString.replaceAll("^.*-(.+)\\.(.*)", "$2"));
+            }
+            else if(versionString.matches("^.*-(.+)$")){
+                minor = Integer.parseInt(versionString.replaceAll("^.*-(.+)$", "$1"));
+            }
+            //left pad minor version with 0 if it is < 10
+            String modifiedMinor = minor < 10 ? StringUtils.leftPad(String.valueOf(minor), 2, "0"):String.valueOf(minor) ;
+
+            //left pad hotFixNum  with 0 if it is < 10
+            String modifiedHotFixNum = hotFixNum < 10 ? StringUtils.leftPad(String.valueOf(hotFixNum), 2, "0"):String.valueOf(hotFixNum) ;
+            String alteredString = StringUtils.join(modifiedMinor, modifiedHotFixNum);
+            int ver = Integer.parseInt(alteredString);
+
+            //ver >= 500 => 9.1-1 and above is supported
+            if (!isNightly && ver < 100) {
+                return false;
             }
             if (isNightly) {
                 String dateString = versionString.replaceAll("[^-]+-(\\d{4})(\\d{2})(\\d{2})", "$1-$2-$3");
-                Date minDate = new GregorianCalendar(2017, 6, 1).getTime();
+                //Support all 9.0-nightly on or after 5/5/2018
+                Date minDate = new GregorianCalendar(2018, Calendar.MAY, 5).getTime();
                 Date date = new SimpleDateFormat("y-M-d").parse(dateString);
                 if (date.before(minDate)) {
                     return false;
                 }
             }
 
-        }
-        catch(Exception e) {
+        } catch (Exception e) {
             throw new ServerValidationException(e.toString());
         }
         return true;

marklogic-data-hub/src/main/java/com/marklogic/hub/deploy/commands/LoadHubModulesCommand.java

@@ -66,7 +66,7 @@ public void execute(CommandContext context) {
         assetFileLoader.setDocumentFileReader(jarDocumentFileReader);
 
         DefaultModulesLoader modulesLoader = new DefaultModulesLoader(assetFileLoader);
-        modulesLoader.addFailureListener(throwable -> {
+        modulesLoader.addFailureListener((throwable, client) -> {
             // ensure we throw the first exception
             if (caughtException == null) {
                 caughtException = throwable;

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/flow-lib.xqy

@@ -253,7 +253,7 @@ declare function flow:run-flow(
   $options as map:map)
 {
   (: assert that we are in query mode :)
-  let $_must_run_in_query_mode as xs:unsignedLong := xdmp:request-timestamp()
+  (: )let $_must_run_in_query_mode as xs:unsignedLong := xdmp:request-timestamp() :)
 
   (: configure the run context :)
   let $_ := (

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.hub/lib/hub-entities.xqy

@@ -103,8 +103,7 @@ declare function hent:dump-search-options($entities as json:array)
 {
   let $uber-model := hent:uber-model(json:array-values($entities) ! xdmp:to-json(.)/object-node())
   return
-    (: call fix-options because of https://github.com/marklogic/entity-services/issues/359 :)
-    hent:fix-options(es:search-options-generate($uber-model))
+    es:search-options-generate($uber-model)
 };
 
 declare function hent:dump-indexes($entities as json:array)

marklogic-data-hub/src/test/java/com/marklogic/hub/DataHubTest.java

@@ -146,17 +146,17 @@ public void testInvalidServer9nightly() {
 
     @Test
     public void testValidateServer9() {
-        assertFalse(dh.isServerVersionValid("9.0"));
+        assertFalse(dh.isServerVersionValid("9.0-1"));
     }
 
     @Test
-    public void testValidateServer9011() {
-        assertTrue(dh.isServerVersionValid("9.0-1.1"));
+    public void testValidateServer90102() {
+        assertTrue(dh.isServerVersionValid("9.0-10.2"));
     }
 
     @Test
     public void testValidateServerBeyond9() {
-        assertTrue(dh.isServerVersionValid("9.0-2"));
+        assertTrue(dh.isServerVersionValid("9.0-20170719"));
     }
 
     @Test