Merge pull request #227 from marklogic/revert-213-dino/197-Refactor-to-autodeploy

Revert "fixed #197"

Author: paxtonhare

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

@@ -69,43 +69,42 @@
 
 public class DataHub {
 
-	static final private Logger LOGGER = LoggerFactory.getLogger(DataHub.class);
-
-	private ManageConfig config;
-	private ManageClient client;
-
-	private File assetInstallTimeFile = new File("./assetInstallTime.properties");
-	private HubConfig hubConfig;
-
-	public DataHub(HubConfig hubConfig) {
-		init(hubConfig);
-	}
-
-	public DataHub(String host, String username, String password) {
-		hubConfig = new HubConfig();
-		hubConfig.host = host;
-		hubConfig.adminUsername = username;
-		hubConfig.adminPassword = password;
-		init(hubConfig);
-	}
-
-	private void init(HubConfig hubConfig) {
-		this.hubConfig = hubConfig;
-		config = new ManageConfig(hubConfig.host, 8002, hubConfig.adminUsername, hubConfig.adminPassword);
-		client = new ManageClient(config);
-	}
-
-	public void setAssetInstallTimeFile(File assetInstallTimeFile) {
-		this.assetInstallTimeFile = assetInstallTimeFile;
-	}
-
-	/**
-	 * Determines if the data hub is installed in MarkLogic
-	 * 
-	 * @return true if installed, false otherwise
-	 */
-	public boolean isInstalled() {
-	    ServerManager sm = new ServerManager(client);
+    static final private Logger LOGGER = LoggerFactory.getLogger(DataHub.class);
+
+    private ManageConfig config;
+    private ManageClient client;
+
+    private File assetInstallTimeFile = new File("./assetInstallTime.properties");
+    private HubConfig hubConfig;
+
+    public DataHub(HubConfig hubConfig) {
+        init(hubConfig);
+    }
+
+    public DataHub(String host, String username, String password) {
+        hubConfig = new HubConfig();
+        hubConfig.host = host;
+        hubConfig.adminUsername = username;
+        hubConfig.adminPassword = password;
+        init(hubConfig);
+    }
+
+    private void init(HubConfig hubConfig) {
+        this.hubConfig = hubConfig;
+        config = new ManageConfig(hubConfig.host, 8002, hubConfig.adminUsername, hubConfig.adminPassword);
+        client = new ManageClient(config);
+    }
+
+    public void setAssetInstallTimeFile(File assetInstallTimeFile) {
+        this.assetInstallTimeFile = assetInstallTimeFile;
+    }
+
+    /**
+     * Determines if the data hub is installed in MarkLogic
+     * @return true if installed, false otherwise
+     */
+    public boolean isInstalled() {
+        ServerManager sm = new ServerManager(client);
         DatabaseManager dm = new DatabaseManager(client);
 
         ResourcesFragment srf = sm.getAsXml();
@@ -153,9 +152,9 @@ public boolean isInstalled() {
         boolean forestsOk = (stagingForestsExist && finalForestsExist && tracingForestsExist);
 
         return (appserversOk && dbsOk && forestsOk);
-	}
+    }
 
-	/**
+    /**
      * Validates the MarkLogic server to ensure compatibility with the hub
      * @throws ServerValidationException if the server is not compatible
      */

quick-start/src/main/java/com/marklogic/hub/factory/EntityModelFactory.java

@@ -68,6 +68,7 @@ public EntityModel createEntity(String entityName, String entityFilePath, SyncSt
         EntityModel entityModel = new EntityModel();
         entityModel.setEntityName(entityName);
         //this will be updated after traversing its modules
+        entityModel.setSynched(this.entitiesInServer.containsKey(entityName));
 
         FlowModelFactory flowModelFactory = new FlowModelFactory(
                 this.entitiesInServer.get(entityName), entityName);
@@ -96,9 +97,11 @@ private void setEntityModules(EntityModel entityModel, String entityFilePath,
         for (String folderName : folderNames) {
             if (folderName.equalsIgnoreCase(RestModelFactory.REST_FOLDER_NAME)) {
                 restModel = restModelFactory.createRest(modulesParentDirectory, syncStatusService);
+                entityModel.setSynched(entityModel.isSynched() && restModel.isSynched());
             } else {
                 FlowModel flowModel = flowModelFactory.createFlow(modulesParentDirectory,
                         folderName, flowType, syncStatusService);
+                entityModel.setSynched(entityModel.isSynched() && flowModel.isSynched());
                 flows.add(flowModel);
             }
         }

quick-start/src/main/java/com/marklogic/hub/factory/FlowModelFactory.java

@@ -43,6 +43,7 @@ public FlowModel createNewFlow(File userPluginDirPath, String flowName,
         FlowModel flowModel = new FlowModel();
         flowModel.setEntityName(entityName);
         flowModel.setFlowName(flowName);
+        flowModel.setSynched(false);
 
         Scaffolding.createFlow(entityName, flowName, flowType, pluginFormat,
                 dataFormat, userPluginDirPath);
@@ -71,6 +72,7 @@ public FlowModel createFlow(String parentDirPath, String flowName,
                 && flowType.equals(flow.getType())) {
             synched = syncStatusService.isDirectorySynched(absolutePath);
         }
+        flowModel.setSynched(synched);
         return flowModel;
     }
 }

quick-start/src/main/java/com/marklogic/hub/model/EntityModel.java

@@ -9,6 +9,7 @@ public class EntityModel {
     private String entityName;
     private List<FlowModel> inputFlows;
     private List<FlowModel> harmonizeFlows;
+    private boolean isSynched;
     private RestModel inputRest;
     private RestModel harmonizeRest;
 
@@ -60,6 +61,30 @@ public void setHarmonizeFlows(List<FlowModel> harmonizeFlows) {
         this.harmonizeFlows = harmonizeFlows;
     }
 
+    public boolean isSynched() {
+        return isSynched;
+    }
+
+    public void setSynched(boolean isSynched) {
+        this.isSynched = isSynched;
+    }
+
+    public void setInputFlowsSynched(boolean synched) {
+        if (inputFlows != null) {
+            for (FlowModel model : inputFlows) {
+                model.setSynched(synched);
+            }
+        }
+    }
+
+    public void setHarmonizeFlowsSynched(boolean synched) {
+        if (harmonizeFlows != null) {
+            for (FlowModel model : harmonizeFlows) {
+                model.setSynched(synched);
+            }
+        }
+    }
+
     public RestModel getInputRest() {
         return inputRest;
     }
@@ -82,6 +107,8 @@ public String toString() {
         sb.append("{");
         sb.append("entityName=");
         sb.append(entityName);
+        sb.append("isSynched=");
+        sb.append(isSynched);
         sb.append("}");
 
         return sb.toString();

quick-start/src/main/java/com/marklogic/hub/model/FlowModel.java

@@ -4,6 +4,7 @@ public class FlowModel {
 
     private String entityName;
     private String flowName;
+    private boolean isSynched;
     private TreeData treeData;
 
     public String getEntityName() {
@@ -23,6 +24,14 @@ public void setFlowName(String flowName) {
         this.flowName = flowName;
     }
 
+    public boolean isSynched() {
+        return isSynched;
+    }
+
+    public void setSynched(boolean isSynched) {
+        this.isSynched = isSynched;
+    }
+
     public TreeData getTreeData() {
         return treeData;
     }
@@ -37,8 +46,10 @@ public String toString() {
         sb.append("{");
         sb.append("entityName=");
         sb.append(entityName);
-        sb.append(" flowName=");
+        sb.append("flowName=");
         sb.append(flowName);
+        sb.append("isSynched=");
+        sb.append(isSynched);
         sb.append("}");
 
         return sb.toString();

quick-start/src/main/java/com/marklogic/hub/service/DataHubService.java

@@ -31,10 +31,8 @@ public void install() throws DataHubException {
     }
 
     public void installUserModules() throws DataHubException {
-    	LOGGER.debug("installUserModules");
         DataHub dataHub = getDataHub();
         try {
-        	LOGGER.debug("pluginDir:" + environmentConfiguration.getUserPluginDir());
             dataHub.installUserModules(environmentConfiguration.getUserPluginDir());
         } catch(Throwable e) {
             throw new DataHubException(e.getMessage(), e);