Bugfix/dhfprod DHFPROD-1307, DHFPROD-1400, DHFPROD-1263 (#1476)

* DHFPROD-1307: PreInstallCheck task displays readable status

* DHFPROD-1400: Fixed DHF isInstalled checks in gradle command

* Restore the original logic, to execute through tests

Author: aebadirad

marklogic-data-hub/src/main/java/com/marklogic/hub/impl/DataHubImpl.java

@@ -73,9 +73,9 @@ public class DataHubImpl implements DataHub {
     private AdminManager _adminManager;
 
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-	private String finalFile = "final-database.json";
-	private String stagingFile = "staging-database.json";
-	private String jobsFile = "job-database.json";
+    private String finalFile = "final-database.json";
+    private String stagingFile = "staging-database.json";
+    private String jobsFile = "job-database.json";
 
     public DataHubImpl(HubConfig hubConfig) {
         if (hubConfig == null) {
@@ -131,10 +131,9 @@ public InstallInfo isInstalled() {
 
         InstallInfo installInfo = InstallInfo.create();
 
-        if (hubConfig.getIsProvisionedEnvironment()){
+        if (hubConfig.getIsProvisionedEnvironment()) {
             return assumedProvisionedInstallInfo(installInfo);
-        }
-        else {
+        } else {
             ResourcesFragment srf = null;
             try {
                 srf = getServerManager().getAsXml();
@@ -405,7 +404,6 @@ public HashMap<String, Boolean> runPreInstallCheck(Versions versions) {
         }
 
         Set<Integer> ports = portsInUse.keySet();
-
         String serverName = portsInUse.get(hubConfig.getPort(DatabaseKind.STAGING));
         stagingPortInUse = ports.contains(hubConfig.getPort(DatabaseKind.STAGING)) && serverName != null && !serverName.equals(hubConfig.getHttpName(DatabaseKind.STAGING));
         if (stagingPortInUse) {
@@ -440,7 +438,9 @@ public HashMap<String, Boolean> runPreInstallCheck(Versions versions) {
         response.put("jobPortInUse", jobPortInUse);
         response.put("jobPortInUseBy", jobPortInUseBy);
         response.put("safeToInstall", isSafeToInstall());
-
+        if ((boolean) response.get("safeToInstall")) {
+            response.put("dhfVersion", versions.getHubVersion());
+        }
         return response;
     }
 
@@ -527,9 +527,9 @@ public void installStaging(HubDeployStatusListener listener) {
 
     @Override
     public void updateIndexes() {
-    	HubAppDeployer deployer = new HubAppDeployer(getManageClient(), getAdminManager(), null, hubConfig.newStagingClient());
+        HubAppDeployer deployer = new HubAppDeployer(getManageClient(), getAdminManager(), null, hubConfig.newStagingClient());
 
-    	AppConfig finalConfig = hubConfig.getFinalAppConfig();
+        AppConfig finalConfig = hubConfig.getFinalAppConfig();
         List<Command> finalDBCommand = new ArrayList<>();
         finalDBCommand.add(new DeployHubDatabaseCommand(hubConfig, finalFile));
         deployer.setFinalCommandsList(finalDBCommand);

ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/DeleteJobsTask.groovy

@@ -39,7 +39,7 @@ class DeleteJobsTask extends HubTask {
         println("Deleting jobs: " + jobIds)
         def jobManager = getJobManager()
         def dh = getDataHub()
-        if (!dh.isInstalled()) {
+        if (!isHubInstalled()) {
             println("Data Hub is not installed.")
             return
         }

ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/DeployUserModulesTask.groovy

@@ -26,7 +26,7 @@ class DeployUserModulesTask extends HubTask {
     @TaskAction
     void deployUserModules() {
         def dh = getDataHub()
-        if (!dh.isInstalled()) {
+        if (!isHubInstalled()) {
             println("Data Hub is not installed.")
             return
         }

ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/ExportJobsTask.groovy

@@ -46,7 +46,7 @@ class ExportJobsTask extends HubTask {
 
         def jobManager = getJobManager()
         def dh = getDataHub()
-        if (!dh.isInstalled()) {
+        if (!isHubInstalled()) {
             println("Data Hub is not installed.")
             return
         }

ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/ImportJobsTask.groovy

@@ -33,7 +33,7 @@ class ImportJobsTask extends HubTask {
 
         def jobManager = getJobManager()
         def dh = getDataHub()
-        if (!dh.isInstalled()) {
+        if (!isHubInstalled()) {
             println("Data Hub is not installed.")
             return
         }

ml-data-hub-plugin/src/main/groovy/com/marklogic/gradle/task/PreinstallCheckTask.groovy

@@ -55,6 +55,11 @@ class PreinstallCheckTask extends HubTask {
 
             throw new TaskExecutionException(this, new Throwable(sb.toString()))
         }
-        print(dh.toString())
+
+        if(preInstallCheck.get("safeToInstall")) {
+            print("DHF is not installed. Run mlDeploy task to install DHF")
+        } else {
+            print("DHF Version: " + preInstallCheck.get("dhfVersion") + " is installed")
+        }
     }
 }