Issue #120: Update project log support

Author: eharris369

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MicroclimateApplication.java

@@ -13,7 +13,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.core.runtime.IPath;
@@ -48,7 +48,7 @@ public class MicroclimateApplication {
 	private String containerId;
 	private ProjectCapabilities projectCapabilities;
 	private String action;
-	private List<ProjectLogInfo> logInfos = Collections.emptyList();
+	private List<ProjectLogInfo> logInfos = new ArrayList<ProjectLogInfo>();
 	private boolean metricsAvailable = false;
 
 	// Must be updated whenever httpPort changes. Can be null
@@ -140,7 +140,35 @@ public synchronized void setAction(String action) {
 		this.action = action;
 	}
 
+	public synchronized void addLogInfos(List<ProjectLogInfo> newLogInfos) {
+		if (newLogInfos == null || newLogInfos.isEmpty()) {
+			MCLogger.logError("Trying to add empty log infos to project: " + name);
+			return;
+		}
+		if (this.logInfos == null || this.logInfos.isEmpty()) {
+			this.logInfos = newLogInfos;
+			return;
+		}
+		for (ProjectLogInfo newLogInfo : newLogInfos) {
+			boolean found = false;
+			for (ProjectLogInfo logInfo : this.logInfos) {
+				// There should not be more than one log with the same name for a project
+				if (logInfo.logName.equals(newLogInfo.logName)) {
+					found = true;
+					break;
+				}
+			}
+			if (!found) {
+				this.logInfos.add(newLogInfo);
+			}
+		}
+	}
+	
 	public synchronized void setLogInfos(List<ProjectLogInfo> logInfos) {
+		if (logInfos == null) {
+			MCLogger.logError("The logs should not be set to null for project: " + name);
+			return;
+		}
 		this.logInfos = logInfos;
 	}
 

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateConnection.java

@@ -468,13 +468,16 @@ public List<ProjectLogInfo> requestProjectLogs(MicroclimateApplication app) thro
 		return logList;
 	}
 
-	private List<ProjectLogInfo> getLogs(JSONArray logs, String type) throws JSONException {
+	public static List<ProjectLogInfo> getLogs(JSONArray logs, String type) throws JSONException {
 		List<ProjectLogInfo> logList = new ArrayList<ProjectLogInfo>();
 		if (logs != null) {
 			for (int i = 0; i < logs.length(); i++) {
 				JSONObject log = logs.getJSONObject(i);
 				if (log.has(MCConstants.KEY_LOG_NAME)) {
 					String logName = log.getString(MCConstants.KEY_LOG_NAME);
+					if ("-".equals(logName)) {
+						continue;
+					}
 					String workspacePath = null;
 					if (log.has(MCConstants.KEY_LOG_WORKSPACE_PATH)) {
 						workspacePath = log.getString(MCConstants.KEY_LOG_WORKSPACE_PATH);

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/connection/MicroclimateSocket.java

@@ -16,6 +16,7 @@
 import java.net.URISyntaxException;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
@@ -28,6 +29,7 @@
 import com.ibm.microclimate.core.internal.MCUtil;
 import com.ibm.microclimate.core.internal.MicroclimateApplication;
 import com.ibm.microclimate.core.internal.console.OldSocketConsole;
+import com.ibm.microclimate.core.internal.console.ProjectLogInfo;
 import com.ibm.microclimate.core.internal.console.SocketConsole;
 import com.ibm.microclimate.core.internal.constants.MCConstants;
 import com.ibm.microclimate.core.internal.constants.ProjectType;
@@ -76,6 +78,7 @@ public class MicroclimateSocket {
 			EVENT_CONTAINER_LOGS = "container-logs",				//$NON-NLS-1$
 			EVENT_PROJECT_VALIDATED = "projectValidated",			//$NON-NLS-1$
 			EVENT_LOG_UPDATE = "log-update",						//$NON-NLS-1$
+			EVENT_PROJECT_LOGS_LIST_CHANGED = "projectLogsListChanged",		//$NON-NLS-1$
 			EVENT_PROJECT_SETTINGS_CHANGED = "projectSettingsChanged";	//$NON-NLS-1$
 
 	public MicroclimateSocket(MicroclimateConnection mcConnection) throws URISyntaxException {
@@ -238,6 +241,19 @@ public void call(Object... arg0) {
 				}
 			}
 		})
+		.on(EVENT_PROJECT_LOGS_LIST_CHANGED, new Emitter.Listener() {
+			@Override
+			public void call(Object... arg0) {
+				MCLogger.log(EVENT_PROJECT_LOGS_LIST_CHANGED + ": " + arg0[0].toString()); //$NON-NLS-1$
+
+				try {
+					JSONObject event = new JSONObject(arg0[0].toString());
+					onProjectLogsListChanged(event);
+				} catch (JSONException e) {
+					MCLogger.logError("Error parsing JSON: " + arg0[0].toString(), e); //$NON-NLS-1$
+				}
+			}
+		})
 		.on(EVENT_LOG_UPDATE, new Emitter.Listener() {
 			@Override
 			public void call(Object... arg0) {
@@ -527,6 +543,31 @@ private void onLogUpdate(JSONObject event) throws JSONException {
 		}
 	}
 
+	private void onProjectLogsListChanged(JSONObject event) throws JSONException {
+		String projectID = event.getString(MCConstants.KEY_PROJECT_ID);
+		MicroclimateApplication app = mcConnection.getAppByID(projectID);
+		if (app == null) {
+			// Likely a new project is being created
+			mcConnection.refreshApps(projectID);
+			MCUtil.updateConnection(mcConnection);
+			return;
+		}
+		
+		String type;
+		if (event.has(MCConstants.KEY_LOG_BUILD)) {
+			type = MCConstants.KEY_LOG_BUILD;
+			JSONArray logs = event.getJSONArray(MCConstants.KEY_LOG_BUILD);
+			List<ProjectLogInfo> logInfos = MicroclimateConnection.getLogs(logs, type);
+			app.addLogInfos(logInfos);
+		}
+		if (event.has(MCConstants.KEY_LOG_APP)) {
+			type = MCConstants.KEY_LOG_APP;
+			JSONArray logs = event.getJSONArray(MCConstants.KEY_LOG_APP);
+			List<ProjectLogInfo> logInfos = MicroclimateConnection.getLogs(logs, type);
+			app.addLogInfos(logInfos);
+		}
+	}
+	
 	private void onValidationEvent(JSONObject event) throws JSONException {
 		String projectID = event.getString(MCConstants.KEY_PROJECT_ID);
 		MicroclimateApplication app = mcConnection.getAppByID(projectID);