Issue #42: remove projects that are not in the list on a refresh

Author: eharris369

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

@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018 IBM Corporation and others.
+ * Copyright (c) 2018, 2019 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -11,6 +11,9 @@
 
 package com.ibm.microclimate.core.internal;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -38,11 +41,13 @@ public static void getAppsFromProjectsJson(MicroclimateConnection mcConnection,
 		try {
 			MCLogger.log(projectsJson);
 			JSONArray appArray = new JSONArray(projectsJson);
+			Set<String> idSet = new HashSet<String>();
 
 			for(int i = 0; i < appArray.length(); i++) {
 				JSONObject appJso = appArray.getJSONObject(i);
 				try {
 					String id = appJso.getString(MCConstants.KEY_PROJECT_ID);
+					idSet.add(id);
 					// If a project id was passed in then only process the JSON object for that project
 					if (projectID == null || projectID.equals(id)) {
 						synchronized(MicroclimateApplicationFactory.class) {
@@ -65,6 +70,17 @@ public static void getAppsFromProjectsJson(MicroclimateConnection mcConnection,
 					MCLogger.logError("Error parsing project json: " + appJso, e); //$NON-NLS-1$
 				}
 			}
+			
+			// If refreshing all of the projects, remove any projects that are not in the list returned by Microclimate.
+			// This will only happen if something goes wrong and no delete event is received from Microclimate for a
+			// project.
+			if (projectID == null) {
+				for (String id : mcConnection.getAppIds()) {
+					if (!idSet.contains(id)) {
+						mcConnection.removeApp(id);
+					}
+				}
+			}
 		} catch (Exception e) {
 			MCLogger.logError("Error parsing json for project array.", e); //$NON-NLS-1$
 		}

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

@@ -17,9 +17,11 @@
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -285,6 +287,12 @@ public List<MicroclimateApplication> getApps() {
 			return new ArrayList<MicroclimateApplication>(appMap.values());
 		}
 	}
+	
+	public Set<String> getAppIds() {
+		synchronized(appMap) {
+			return new HashSet<String>(appMap.keySet());
+		}
+	}
 
 	public MicroclimateApplication removeApp(String projectID) {
 		synchronized(appMap) {