DHFPROD-10578: Lazy hubclient object creation

Author: rahulvudutala

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

@@ -35,12 +35,10 @@
 public class ConfigureAppServerBasePaths extends AbstractCommand {
 
     private final HubConfigImpl hubConfig;
-    private final HubClientImpl hubClient;
     private ObjectMapper mapper = new ObjectMapper();
 
-    public ConfigureAppServerBasePaths(HubConfig hubConfig, HubClient hubClient) {
+    public ConfigureAppServerBasePaths(HubConfig hubConfig) {
         this.hubConfig = (HubConfigImpl) hubConfig;
-        this.hubClient = (HubClientImpl) hubClient;
         setExecuteSortOrder(SortOrderConstants.DEPLOY_OTHER_SERVERS + 1);
     }
 
@@ -130,13 +128,17 @@ private String getBasePathConfig() {
     }
 
     private void waitForGateWayToRestart() {
-        DatabaseClient databaseClient = hubClient.getStagingClient();
         int maxTimeToWaitInMs = 90000;
         int maxRetries = 15;
         int sleepTime = maxTimeToWaitInMs/maxRetries;
+        HubClientImpl hubClient = null;
 
         while(maxRetries > 0) {
             try {
+                if(hubClient == null) {
+                    hubClient = (HubClientImpl) hubConfig.newHubClient();
+                }
+                DatabaseClient databaseClient = hubClient.getStagingClient();
                 if(databaseClient.checkConnection().isConnected()) {
                     logger.info("Checking gateway status: " + databaseClient.checkConnection().isConnected());
                     break;

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

@@ -708,8 +708,7 @@ private void updateServerCommandList(Map<String, List<Command>> commandMap) {
             }
             newCommands.add(c);
         }
-        hubClient = hubClient == null ? hubConfig.newHubClient() : hubClient;
-        newCommands.add(new ConfigureAppServerBasePaths(hubConfig, hubClient));
+        newCommands.add(new ConfigureAppServerBasePaths(hubConfig));
         commandMap.put(key, newCommands);
     }