Merge pull request #30 from eharris369/25-dontCacheConnectionDetails

Issue #25: Re-initialize connection information on reconnect

Author: eharris369

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

@@ -67,7 +67,7 @@ public class MicroclimateApplication {
 
 		// The mcConnection.localWorkspacePath will end in /microclimate-workspace
 		// and the path passed here will start with /microclimate-workspace, so here we fix the duplication.
-		this.fullLocalPath = MCUtil.appendPathWithoutDupe(mcConnection.localWorkspacePath, pathInWorkspace);
+		this.fullLocalPath = MCUtil.appendPathWithoutDupe(mcConnection.getWorkspacePath(), pathInWorkspace);
 
 		setBaseUrl();
 

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

@@ -51,8 +51,9 @@ public class MicroclimateConnection {
 	private static final Pattern pattern = Pattern.compile(BRANCH_VERSION);
 
 	public final URI baseUrl;
-	public final IPath localWorkspacePath;
-	public final String versionStr;
+	private IPath localWorkspacePath;
+	private String versionStr;
+	private String connectionErrorMsg = null;
 
 	public final MicroclimateSocket mcSocket;
 
@@ -224,6 +225,10 @@ public boolean checkVersion(int requiredVersion, String requiredVersionBr) {
 
 		return false;
 	}
+	
+	public String getConnectionErrorMsg() {
+		return this.connectionErrorMsg;
+	}
 
 	private static Path getWorkspacePath(JSONObject env) throws JSONException {
 		// Try the internal system property first
@@ -507,6 +512,41 @@ public synchronized void onConnectionError() {
 	 */
 	public synchronized void clearConnectionError() {
 		MCLogger.log("MCConnection to " + baseUrl + " restored"); //$NON-NLS-1$ //$NON-NLS-2$
+		
+		// Reset any cached information in case it has changed
+		try {
+			JSONObject envData = getEnvData(baseUrl);
+			String version = getMCVersion(envData);
+			if (UNKNOWN_VERSION.equals(versionStr)) {
+				MCLogger.logError("Failed to get the Microclimate version after reconnect");
+				this.connectionErrorMsg = NLS.bind(Messages.MicroclimateConnection_ErrConnection_VersionUnknown, MCConstants.REQUIRED_MC_VERSION);
+				MCUtil.updateConnection(this);
+				return;
+			}
+			if (!isSupportedVersion(version)) {
+				MCLogger.logError("The detected version of Microclimate after reconnect is not supported: " + version);
+				this.connectionErrorMsg = NLS.bind(Messages.MicroclimateConnection_ErrConnection_OldVersion, versionStr, MCConstants.REQUIRED_MC_VERSION);
+				MCUtil.updateConnection(this);
+				return;
+			}
+			this.versionStr = version;
+			IPath path = getWorkspacePath(envData);
+			if (path == null) {
+				// This should not happen since the version was ok
+				MCLogger.logError("Failed to get the local workspace path after reconnect");
+				this.connectionErrorMsg = Messages.MicroclimateConnection_ErrConnection_WorkspaceErr;
+				MCUtil.updateConnection(this);
+				return;
+			}
+			this.localWorkspacePath = path;
+		} catch (Exception e) {
+			MCLogger.logError("An exception occurred while trying to update the connection information", e);
+			this.connectionErrorMsg = Messages.MicroclimateConnection_ErrConnection_UpdateCacheException;
+			MCUtil.updateConnection(this);
+			return;
+		}
+		
+		this.connectionErrorMsg = null;
 		isConnected = true;
 		refreshApps(null);
 		MCUtil.updateConnection(this);

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/messages/Messages.java

@@ -23,6 +23,7 @@ public class Messages extends NLS {
 	public static String MicroclimateConnection_ErrContactingServerDialogMsg;
 	public static String MicroclimateConnection_ErrContactingServerDialogTitle;
 	public static String MicroclimateConnection_ErrGettingProjectListTitle;
+	public static String MicroclimateConnection_ErrConnection_UpdateCacheException;
 
 	public static String MicroclimateConnectionException_ConnectingToMCFailed;
 

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/messages/messages.properties

@@ -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
@@ -16,6 +16,7 @@ MicroclimateConnection_ErrConnection_WorkspaceErr=The location of your Microclim
 MicroclimateConnection_ErrContactingServerDialogMsg=Failed to contact the Microclimate server at {0}.
 MicroclimateConnection_ErrContactingServerDialogTitle=Error contacting Microclimate server
 MicroclimateConnection_ErrGettingProjectListTitle=Error getting list of projects
+MicroclimateConnection_ErrConnection_UpdateCacheException=An error occurred while initializing the Microclimate connection. Check the workspace logs.
 
 MicroclimateConnectionException_ConnectingToMCFailed=Connecting to Microclimate at {0} failed.
 

dev/com.ibm.microclimate.ui/plugin.properties

@@ -17,10 +17,10 @@ Bundle-Name = Microclimate UI Plugin
 
 ACTION_REFRESH=Re&fresh
 
-ACTION_OPEN_MICROCLIMATE_UI=Open Microclimate &UI
-ACTION_CREATE_NEW_PROJECT=Open Create &Project Page
-ACTION_IMPORT_PROJECT=Open &Import Project Page
-ACTION_REMOVE_CONNECTION=&Remove Connection
+ACTION_CONNECTION_OPEN_MICROCLIMATE_UI=Open Microclimate &UI
+ACTION_CONNECTION_CREATE_NEW_PROJECT=Open New &Project Page
+ACTION_CONNECTION_IMPORT_PROJECT=Open &Import Project Page
+ACTION_CONNECTION_REMOVE_CONNECTION=&Remove Connection
 
 ACTION_OPEN_APP=&Open Application
 ACTION_CONTAINER_SHELL=Open &Container Shell

dev/com.ibm.microclimate.ui/plugin.xml

@@ -208,28 +208,28 @@
 				id="com.ibm.microclimate.ui.removeConnection"
 				enablesFor="1"
 				menubarPath="group.additions"
-				label="%ACTION_REMOVE_CONNECTION"
+				label="%ACTION_CONNECTION_REMOVE_CONNECTION"
 				class="com.ibm.microclimate.ui.internal.actions.RemoveConnectionAction"/>
 			<action
 				id="com.ibm.microclimate.ui.importProject"
 				enablesFor="1"
 				menubarPath="group.new"
 				icon="%DEFAULT_ICON_PATH"
-				label="%ACTION_IMPORT_PROJECT"
+				label="%ACTION_CONNECTION_IMPORT_PROJECT"
 				class="com.ibm.microclimate.ui.internal.actions.OpenMicroclimateUIAction"/>
 			<action
 				id="com.ibm.microclimate.ui.createNewProject"
 				enablesFor="1"
 				menubarPath="group.new"
 				icon="%DEFAULT_ICON_PATH"
-				label="%ACTION_CREATE_NEW_PROJECT"
+				label="%ACTION_CONNECTION_CREATE_NEW_PROJECT"
 				class="com.ibm.microclimate.ui.internal.actions.OpenMicroclimateUIAction"/>
 			<action
 				id="com.ibm.microclimate.ui.openMicroclimateUI"
 				enablesFor="1"
 				menubarPath="group.new"
 				icon="%DEFAULT_ICON_PATH"
-				label="%ACTION_OPEN_MICROCLIMATE_UI"
+				label="%ACTION_CONNECTION_OPEN_MICROCLIMATE_UI"
 				class="com.ibm.microclimate.ui.internal.actions.OpenMicroclimateUIAction"/>
 		</objectContribution>
 	</extension>

dev/com.ibm.microclimate.ui/src/com/ibm/microclimate/ui/internal/views/MicroclimateNavigatorLabelProvider.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
@@ -48,7 +48,11 @@ public String getText(Object element) {
 			MicroclimateConnection connection = (MicroclimateConnection)element;
 			String text = Messages.MicroclimateConnectionLabel + " " + connection.baseUrl;
 			if (!connection.isConnected()) {
-				text = text + " (" + Messages.MicroclimateDisconnected + ")";
+				String errorMsg = connection.getConnectionErrorMsg();
+				if (errorMsg == null) {
+					errorMsg = Messages.MicroclimateDisconnected;
+				}
+				text = text + " (" + errorMsg + ")";
 			} else if (connection.getApps().size() == 0) {
 				text = text + " (" + Messages.MicroclimateConnectionNoProjects + ")";
 			}
@@ -85,7 +89,11 @@ public StyledString getStyledText(Object element) {
 			styledString = new StyledString(Messages.MicroclimateConnectionLabel + " " );
 			styledString.append(connection.baseUrl.toString(), StyledString.QUALIFIER_STYLER);
 			if (!connection.isConnected()) {
-				styledString.append(" (" + Messages.MicroclimateDisconnected + ")", ERROR_STYLER);
+				String errorMsg = connection.getConnectionErrorMsg();
+				if (errorMsg == null) {
+					errorMsg = Messages.MicroclimateDisconnected;
+				}
+				styledString.append(" (" + errorMsg + ")", ERROR_STYLER);
 			} else if (connection.getApps().size() == 0) {
 				styledString.append(" (" + Messages.MicroclimateConnectionNoProjects + ")", StyledString.DECORATIONS_STYLER);
 			}