merged error enums in a single class.

microsoft · Sep 30, 2020 · d3088e7 · d3088e7
1 parent ea62350
commit d3088e7
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 280 deletions.
diff --git a/...plorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/AzureModule.java b/...plorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/AzureModule.java
@@ -26,11 +26,11 @@
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.authmanage.SubscriptionManager;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
-import com.microsoft.azuretools.authmanage.srvpri.exceptions.AzureRuntimeException;
+import com.microsoft.azuretools.enums.ErrorEnum;
+import com.microsoft.azuretools.exception.AzureRuntimeException;
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
-import com.microsoft.azuretools.enums.ErrorUIMapEnum;
 import com.microsoft.azuretools.sdkmanage.AzureManager;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureRefreshableNode;
@@ -123,14 +123,12 @@ private static String composeName() {
                     .filter(SubscriptionDetail::isSelected).collect(Collectors.toList());
             return String.format("%s (%s)", BASE_MODULE_NAME, getAccountDescription(selectedSubscriptions));
 
+        } catch (AzureRuntimeException e) {
+            DefaultLoader.getUIHelper().showInfoNotification(
+                    ERROR_GETTING_SUBSCRIPTIONS_TITLE, ErrorEnum.getDisplayMessageByCode(e.getCode()));
         } catch (Exception e) {
-            if (e instanceof AzureRuntimeException) {
-                DefaultLoader.getUIHelper().showInfoNotification(
-                        ERROR_GETTING_SUBSCRIPTIONS_TITLE, ErrorUIMapEnum.getViewMessageByCode(((AzureRuntimeException) e).getCode()));
-            } else {
-                final String msg = String.format(ERROR_GETTING_SUBSCRIPTIONS_MESSAGE, e.getMessage());
-                DefaultLoader.getUIHelper().showException(msg, e, ERROR_GETTING_SUBSCRIPTIONS_TITLE, false, true);
-            }
+            final String msg = String.format(ERROR_GETTING_SUBSCRIPTIONS_MESSAGE, e.getMessage());
+            DefaultLoader.getUIHelper().showException(msg, e, ERROR_GETTING_SUBSCRIPTIONS_TITLE, false, true);
         }
         return BASE_MODULE_NAME;
     }

diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/entity/BaseEntity.java b/Utils/azuretools-core/src/com/microsoft/azuretools/entity/BaseEntity.java
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/entity/ResponseWrapper.java b/Utils/azuretools-core/src/com/microsoft/azuretools/entity/ResponseWrapper.java
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorEnum.java b/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorEnum.java
@@ -26,17 +26,22 @@
  * Enums of backend errors for azure tools.
  */
 public enum ErrorEnum {
-    UNKNOWN_HOST_EXCEPTION(100000, "Encountered an unknown host exception."),
-    SOCKET_TIMEOUT_EXCEPTION(100002, "Encountered a socket timeout exception."),
-    FAILED_TO_GET_ACCESS_TOKEN_BY_CLI(100003, "Failed to get access token by Azure CLI command."),
+    UNKNOWN_HOST_EXCEPTION(100000, "Encountered an unknown host exception.",
+            "It seems you have an unstable network at the moment, please try again when network is available."),
+    SOCKET_TIMEOUT_EXCEPTION(100002, "Encountered a socket timeout exception.",
+            "Timeout when accessing azure, please try your operation again."),
+    FAILED_TO_GET_ACCESS_TOKEN_BY_CLI(100003, "Failed to get access token by Azure CLI command.",
+            "Failed to get access token, please try to login Azure CLI using 'az login' and try again."),
     ;
 
     private int errorCode;
     private String errorMessage;
+    private String displyMessage;
 
-    ErrorEnum(int errorCode, String errorMessage) {
+    ErrorEnum(int errorCode, String errorMessage, String displayMessage) {
         this.errorCode = errorCode;
         this.errorMessage = errorMessage;
+        this.displyMessage = displayMessage;
     }
 
     public int getErrorCode() {
@@ -47,4 +52,17 @@ public String getErrorMessage() {
         return errorMessage;
     }
 
+    public String getDisplyMessage() {
+        return displyMessage;
+    }
+
+    public static String getDisplayMessageByCode(int code) {
+        for (ErrorEnum e : ErrorEnum.values()) {
+            if (e.getErrorCode() == code) {
+                return e.getDisplyMessage();
+            }
+        }
+        throw new IllegalArgumentException(String.format("Not found enum for code: %s", code));
+    }
+
 }
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUIMapEnum.java b/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUIMapEnum.java
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUIMessageEnum.java b/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUIMessageEnum.java
diff --git a/...pri/exceptions/AzureRuntimeException.java → ...ools/exception/AzureRuntimeException.java b/...pri/exceptions/AzureRuntimeException.java → ...ools/exception/AzureRuntimeException.java
@@ -20,7 +20,7 @@
  * SOFTWARE.
  */
 
-package com.microsoft.azuretools.authmanage.srvpri.exceptions;
+package com.microsoft.azuretools.exception;
 
 import com.microsoft.azuretools.enums.ErrorEnum;
 

diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/sdkmanage/AzureCliAzureManager.java b/Utils/azuretools-core/src/com/microsoft/azuretools/sdkmanage/AzureCliAzureManager.java
@@ -34,7 +34,7 @@
 import com.microsoft.azuretools.authmanage.CommonSettings;
 import com.microsoft.azuretools.authmanage.Environment;
 import com.microsoft.azuretools.authmanage.models.AuthMethodDetails;
-import com.microsoft.azuretools.authmanage.srvpri.exceptions.AzureRuntimeException;
+import com.microsoft.azuretools.exception.AzureRuntimeException;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 import com.microsoft.azuretools.enums.ErrorEnum;
 import com.microsoft.azuretools.utils.CommandUtils;