fixed #477

Author: paxtonhare

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

@@ -104,6 +104,7 @@ private ServerManager getServerManager() {
         }
         return this._serverManager;
     }
+    void setServerManager(ServerManager manager) { this._serverManager = manager; }
     /**
      * Determines if the data hub is installed in MarkLogic
      * @return true if installed, false otherwise
@@ -155,14 +156,21 @@ public InstallInfo isInstalled() {
 
     /**
      * Validates the MarkLogic server to ensure compatibility with the hub
+     * @return true if valid, false otherwise
      * @throws ServerValidationException if the server is not compatible
      */
-    public void validateServer() throws ServerValidationException {
+    public boolean isServerVersionValid() {
+        return isServerVersionValid(null);
+    }
+
+    public boolean isServerVersionValid(String versionString) {
         try {
-            String versionString = getAdminManager().getServerVersion();
+            if (versionString == null) {
+                versionString = getMarkLogicVersion();
+            }
             int major = Integer.parseInt(versionString.replaceAll("([^.]+)\\..*", "$1"));
             if (major < 8) {
-                throw new ServerValidationException("Invalid MarkLogic Server Version: " + versionString);
+                return false;
             }
             boolean isNightly = versionString.matches("[^-]+-(\\d{4})(\\d{2})(\\d{2})");
             if (major == 8) {
@@ -172,7 +180,7 @@ public void validateServer() throws ServerValidationException {
                 }
                 int ver = Integer.parseInt(alteredString.substring(0, 4));
                 if (!isNightly && ver < 8070) {
-                    throw new ServerValidationException("Invalid MarkLogic Server Version: " + versionString);
+                    return false;
                 }
             }
             if (major == 9) {
@@ -182,22 +190,23 @@ public void validateServer() throws ServerValidationException {
                 }
                 int ver = Integer.parseInt(alteredString.substring(0, 4));
                 if (!isNightly && ver < 9011) {
-                    throw new ServerValidationException("Invalid MarkLogic Server Version: " + versionString);
+                    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();
                 Date date = new SimpleDateFormat("y-M-d").parse(dateString);
                 if (date.before(minDate)) {
-                    throw new ServerValidationException("Invalid MarkLogic Server Version: " + versionString);
+                    return false;
                 }
             }
 
         }
         catch(Exception e) {
             throw new ServerValidationException(e.toString());
         }
+        return true;
     }
 
     public void initProject() {
@@ -368,6 +377,52 @@ public Map<String, List<Command>> getCommands() {
         return commandMap;
     }
 
+    public Map<Integer, String> getServerPortsInUse() {
+        Map<Integer, String> portsInUse = new HashMap<>();
+        ResourcesFragment srf = getServerManager().getAsXml();
+        srf.getListItemNameRefs().forEach(s -> {
+            Fragment fragment = getServerManager().getPropertiesAsXml(s);
+            int port = Integer.parseInt(fragment.getElementValue("//m:port"));
+            portsInUse.put(port, s);
+        });
+        return portsInUse;
+    }
+
+    public PreInstallCheck runPreInstallCheck() {
+        PreInstallCheck check = new PreInstallCheck();
+
+        Map<Integer, String> portsInUse = getServerPortsInUse();
+        Set<Integer> ports = portsInUse.keySet();
+
+        String serverName = portsInUse.get(hubConfig.stagingPort);
+        check.stagingPortInUse = ports.contains(hubConfig.stagingPort) && serverName != null && !serverName.equals(hubConfig.stagingHttpName);
+        if (check.stagingPortInUse) {
+            check.stagingPortInUseBy = serverName;
+        }
+
+        serverName = portsInUse.get(hubConfig.finalPort);
+        check.finalPortInUse = ports.contains(hubConfig.finalPort) && serverName != null && !serverName.equals(hubConfig.finalHttpName);
+        if (check.finalPortInUse) {
+            check.finalPortInUseBy = serverName;
+        }
+
+        serverName = portsInUse.get(hubConfig.jobPort);
+        check.jobPortInUse = ports.contains(hubConfig.jobPort) && serverName != null && !serverName.equals(hubConfig.jobHttpName);
+        if (check.jobPortInUse) {
+            check.jobPortInUseBy = serverName;
+        }
+
+        serverName = portsInUse.get(hubConfig.tracePort);
+        check.tracePortInUse = ports.contains(hubConfig.tracePort) && serverName != null && !serverName.equals(hubConfig.traceHttpName);
+        if (check.tracePortInUse) {
+            check.tracePortInUseBy = serverName;
+        }
+
+        check.serverVersion = getMarkLogicVersion();
+        check.serverVersionOk = isServerVersionValid(check.serverVersion);
+        return check;
+    }
+
     /**
      * Installs the data hub configuration and server-side modules into MarkLogic
      */
@@ -433,15 +488,7 @@ public String getHubVersion() {
     }
 
     public String getMarkLogicVersion() {
-        ServerEvaluationCall eval = hubConfig.newAppServicesClient().newServerEval();
-        String xqy = "xdmp:version()";
-        EvalResultIterator result = eval.xquery(xqy).eval();
-        if (result.hasNext()) {
-            return result.next().getString();
-        }
-        else {
-            throw new RuntimeException("Couldn't determine MarkLogic Version");
-        }
+        return getAdminManager().getServerVersion();
     }
 
     public static int versionCompare(String v1, String v2) {

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

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2012-2016 MarkLogic Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.marklogic.hub;
+
+public class PreInstallCheck {
+    public boolean stagingPortInUse;
+    public String stagingPortInUseBy;
+    public boolean finalPortInUse;
+    public String finalPortInUseBy;
+    public boolean jobPortInUse;
+    public String jobPortInUseBy;
+    public boolean tracePortInUse;
+    public String tracePortInUseBy;
+    public boolean serverVersionOk;
+    public String serverVersion;
+
+    public boolean isSafeToInstall() {
+        return !(stagingPortInUse ||
+            finalPortInUse ||
+            jobPortInUse ||
+            tracePortInUse) && serverVersionOk;
+    }
+}

marklogic-data-hub/src/main/java/com/marklogic/hub/error/ServerValidationException.java

@@ -15,7 +15,7 @@
  */
 package com.marklogic.hub.error;
 
-public class ServerValidationException extends Exception {
+public class ServerValidationException extends RuntimeException {
 
     private static final long serialVersionUID = -958991214928671059L;