refactor codes.

microsoft · Sep 29, 2020 · ea62350 · ea62350
1 parent b2624a3
commit ea62350
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 43 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
@@ -125,8 +125,8 @@ private static String composeName() {
 
         } catch (Exception e) {
             if (e instanceof AzureRuntimeException) {
-                DefaultLoader.getUIHelper().showInfoNotification(ERROR_GETTING_SUBSCRIPTIONS_TITLE
-                        , ErrorUIMapEnum.getViewMessageByCode(((AzureRuntimeException) e).getCode()));
+                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);

diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/entity/ResponseWrapper.java b/Utils/azuretools-core/src/com/microsoft/azuretools/entity/ResponseWrapper.java
@@ -24,10 +24,14 @@
 
 /**
  * Wrapper Entify for remote procedure call response.
+ * @TODOs try to seperate data and error into different classes.
  */
 public class ResponseWrapper<T> extends BaseEntity {
 
     private T data;
+    /**
+     * default is 0, and 0 means no error.
+     */
     private int errorCode;
     private String errorMessage;
     private String originalMessage;

diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUIMapEnum.java b/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUIMapEnum.java
@@ -56,7 +56,7 @@ public static ErrorUIMessageEnum getViewMessageEnumByCode(int code) {
                 return e.getViewMessage();
             }
         }
-        return null;
+        throw new IllegalArgumentException(String.format("Not found enum for code: %s", code));
     }
 
     public static String getViewMessageByCode(int code) {

diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUIMessageEnum.java b/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUIMessageEnum.java
@@ -29,7 +29,7 @@ public enum ErrorUIMessageEnum {
 
     UNKNOWN_HOST_EXCEPTION("It seems you have an unstable network at the moment, please try again when network is available."),
     SOCKET_TIMEOUT_EXCEPTION("Timeout when accessing azure, please try your operation again."),
-    FAILED_TO_GET_ACCESS_TOKEN_BY_CLI("Failed to get access token, please try to login azure cli using 'az login' and try again."),
+    FAILED_TO_GET_ACCESS_TOKEN_BY_CLI("Failed to get access token, please try to login Azure CLI using 'az login' and try again."),
     ;
 
     private String text;

diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUITitleEnum.java b/Utils/azuretools-core/src/com/microsoft/azuretools/enums/ErrorUITitleEnum.java