Make the Storage Explorer workable with null storage account.

wezhang · wezhang · commit 733955b5f8a4 · 2018-03-06T19:13:30.000+08:00
Signed-off-by: Wei Zhang &lt;wezhang@outlook.com&gt;
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/common/ClusterManagerEx.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/common/ClusterManagerEx.java
@@ -175,7 +175,7 @@ synchronized Optional<List<IClusterDetail>> getSubscriptionHDInsightClustersOfTy
         }
     }
 
-    List<IClusterDetail> getHdinsightAdditionalClusterDetails() {
+    public List<IClusterDetail> getHdinsightAdditionalClusterDetails() {
         return hdinsightAdditionalClusterDetails;
     }
 
@@ -293,6 +293,7 @@ public synchronized void removeHDInsightAdditionalCluster(HDInsightAdditionalClu
         return 1: cluster already exist in current cluster list
         return 2: cluster is valid to add to cluster list but storage account is not default
      */
+    @Deprecated
     public int isHDInsightAdditionalStorageExist(String clusterName, String storageName) {
         final ImmutableList<IClusterDetail> cachedClusterDetails =
                 Optional.of(ClusterMetaDataService.getInstance().getCachedClusterDetails())
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/EmulatorClusterDetail.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/EmulatorClusterDetail.java
@@ -5,6 +5,7 @@
 import com.microsoft.azure.hdinsight.sdk.storage.IHDIStorageAccount;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
+import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 
 import java.io.IOException;
 import java.util.List;
@@ -120,6 +121,7 @@ public String getResourceGroup() {
 		}
 
 	@Override
+	@Nullable
 		public IHDIStorageAccount getStorageAccount() throws HDIException {
 			return null;
 		}
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/HDInsightAdditionalClusterDetail.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/HDInsightAdditionalClusterDetail.java
@@ -30,6 +30,7 @@
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.authmanage.Environment;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
+import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 import com.microsoft.azuretools.sdkmanage.AzureManager;
 
 import java.io.IOException;
@@ -43,9 +44,10 @@ public class HDInsightAdditionalClusterDetail implements IClusterDetail {
     private String passWord;
 
     @Expose
+    @Nullable
     private HDStorageAccount defaultStorageAccount;
 
-    public HDInsightAdditionalClusterDetail(String clusterName, String userName, String passWord, HDStorageAccount storageAccount) {
+    public HDInsightAdditionalClusterDetail(String clusterName, String userName, String passWord, @Nullable HDStorageAccount storageAccount) {
         this.clusterName = clusterName;
         this.userName = userName;
         this.passWord = passWord;
@@ -139,6 +141,7 @@ public String getOSType() {
     }
 
     @Override
+    @Nullable
     public IHDIStorageAccount getStorageAccount() throws HDIException {
         return defaultStorageAccount;
     }
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/IClusterDetail.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/cluster/IClusterDetail.java
@@ -27,6 +27,7 @@
 import com.microsoft.azure.hdinsight.sdk.storage.IHDIStorageAccount;
 import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
+import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 
 import java.io.IOException;
 import java.util.List;
@@ -65,7 +66,7 @@ public interface IClusterDetail {
 
     String getResourceGroup();
 
-    IHDIStorageAccount getStorageAccount() throws HDIException;
+    @Nullable IHDIStorageAccount getStorageAccount() throws HDIException;
 
     List<HDStorageAccount> getAdditionalStorageAccounts();
 
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/storage/HDStorageAccount.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/sdk/storage/HDStorageAccount.java
@@ -23,6 +23,7 @@
 
 import com.microsoft.azure.hdinsight.sdk.cluster.IClusterDetail;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
+import com.microsoft.azuretools.azurecommons.helpers.Nullable;
 import com.microsoft.tooling.msservices.model.storage.ClientStorageAccount;
 
 public class HDStorageAccount extends ClientStorageAccount implements IHDIStorageAccount {
@@ -31,7 +32,7 @@ public class HDStorageAccount extends ClientStorageAccount implements IHDIStorag
     private String defaultContainer;
     private IClusterDetail clusterDetail;
 
-    public HDStorageAccount(IClusterDetail clusterDetail, String fullStorageBlobName, String key, boolean isDefault, String defaultContainer) {
+    public HDStorageAccount(@Nullable IClusterDetail clusterDetail, String fullStorageBlobName, String key, boolean isDefault, String defaultContainer) {
         super(getStorageShortName(fullStorageBlobName));
         this.setPrimaryKey(key);
         this.fullStorageBlobName = fullStorageBlobName;
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/serverexplore/hdinsightnode/ClusterNode.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/serverexplore/hdinsightnode/ClusterNode.java
@@ -24,6 +24,7 @@
 import com.microsoft.azure.hdinsight.common.*;
 import com.microsoft.azure.hdinsight.sdk.cluster.*;
 import com.microsoft.azure.hdinsight.sdk.common.CommonConstant;
+import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.StringHelper;
 import com.microsoft.azuretools.telemetry.AppInsightsConstants;
 import com.microsoft.azuretools.telemetry.TelemetryProperties;
@@ -43,9 +44,10 @@ public class ClusterNode extends RefreshableNode implements TelemetryProperties
     private static final String CLUSTER_MODULE_ID = ClusterNode.class.getName();
     private static final String ICON_PATH = CommonConst.ClusterIConPath;
 
+    @NotNull
     private IClusterDetail clusterDetail;
 
-    public ClusterNode(Node parent, IClusterDetail clusterDetail) {
+    public ClusterNode(Node parent, @NotNull IClusterDetail clusterDetail) {
         super(CLUSTER_MODULE_ID, getClusterNameWitStatus(clusterDetail), parent, ICON_PATH, true);
         this.clusterDetail = clusterDetail;
         this.loadActions();
@@ -160,7 +162,7 @@ private static String getClusterNameWitStatus(IClusterDetail clusterDetail) {
     }
 
     private void openUrlLink(String linkUrl) {
-        if (clusterDetail != null && !StringHelper.isNullOrWhiteSpace(clusterDetail.getName())) {
+        if (!StringHelper.isNullOrWhiteSpace(clusterDetail.getName())) {
             try {
                 Desktop.getDesktop().browse(new URI(linkUrl));
             } catch (Exception exception) {
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/serverexplore/hdinsightnode/StorageAccountFolderNode.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/serverexplore/hdinsightnode/StorageAccountFolderNode.java
@@ -24,21 +24,24 @@
 import com.microsoft.azure.hdinsight.common.CommonConst;
 import com.microsoft.azure.hdinsight.sdk.cluster.IClusterDetail;
 import com.microsoft.azure.hdinsight.sdk.storage.HDStorageAccount;
+import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;
 import com.microsoft.tooling.msservices.serviceexplorer.Node;
 import com.microsoft.tooling.msservices.serviceexplorer.RefreshableNode;
 import com.microsoft.tooling.msservices.serviceexplorer.azure.storage.asm.StorageNode;
 
 import java.util.List;
+import java.util.Optional;
 
 public class StorageAccountFolderNode extends RefreshableNode {
     private static final String STORAGE_ACCOUNT_FOLDER_MODULE_ID = StorageAccountFolderNode.class.getName();
     private static final String STORAGE_ACCOUNT_NAME = "Storage Accounts";
     private static final String ICON_PATH = CommonConst.StorageAccountFoldIConPath;
 
+    @NotNull
     private IClusterDetail clusterDetail;
-    public StorageAccountFolderNode(Node parent, IClusterDetail clusterDetail) {
+    public StorageAccountFolderNode(Node parent, @NotNull IClusterDetail clusterDetail) {
         super(STORAGE_ACCOUNT_FOLDER_MODULE_ID, STORAGE_ACCOUNT_NAME, parent, ICON_PATH);
         this.clusterDetail = clusterDetail;
         load(false);
@@ -47,10 +50,14 @@ public StorageAccountFolderNode(Node parent, IClusterDetail clusterDetail) {
     @Override
     protected void refreshItems()
             throws AzureCmdException {
-        if (clusterDetail != null && !clusterDetail.isEmulator()) {
+        if (!clusterDetail.isEmulator()) {
             try {
                 clusterDetail.getConfigurationInfo();
-                addChildNode(new StorageAccountNode(this, clusterDetail.getStorageAccount(), true));
+
+                Optional.ofNullable(clusterDetail.getStorageAccount())
+                        .map(defaultStorageAccount -> new StorageAccountNode(this, defaultStorageAccount, true))
+                        .ifPresent(this::addChildNode);
+
                 List<HDStorageAccount> additionalStorageAccount = clusterDetail.getAdditionalStorageAccounts();
                 if (additionalStorageAccount != null) {
                     for (HDStorageAccount account : additionalStorageAccount) {
diff --git a/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/serverexplore/hdinsightnode/StorageAccountNode.java b/Utils/hdinsight-node-common/src/com/microsoft/azure/hdinsight/serverexplore/hdinsightnode/StorageAccountNode.java
@@ -31,6 +31,8 @@
 import com.microsoft.azure.storage.blob.BlobContainerProperties;
 import com.microsoft.azure.storage.blob.CloudBlobContainer;
 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.azurecommons.helpers.StringHelper;
 import com.microsoft.azuretools.telemetry.AppInsightsConstants;
 import com.microsoft.azuretools.telemetry.TelemetryProperties;
@@ -52,7 +54,7 @@ public class StorageAccountNode extends RefreshableNode implements TelemetryProp
 
     private IHDIStorageAccount storageAccount;
 
-    public StorageAccountNode(Node parent, IHDIStorageAccount storageAccount, boolean isDefaultStorageAccount) {
+    public StorageAccountNode(Node parent, @NotNull IHDIStorageAccount storageAccount, boolean isDefaultStorageAccount) {
        super(STORAGE_ACCOUNT_MODULE_ID, isDefaultStorageAccount ? storageAccount.getName() + DEFAULT_STORAGE_FLAG : storageAccount.getName(), parent, getIconPath(storageAccount));
         this.storageAccount = storageAccount;
         load(false);

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ synchronized Optional<List<IClusterDetail>> getSubscriptionHDInsightClustersOfTy`
`175`	`175`	`}`
`176`	`176`	`}`
`177`	`177`
`178`		`- List<IClusterDetail> getHdinsightAdditionalClusterDetails() {`
	`178`	`+ public List<IClusterDetail> getHdinsightAdditionalClusterDetails() {`
`179`	`179`	`return hdinsightAdditionalClusterDetails;`
`180`	`180`	`}`
`181`	`181`
`@@ -293,6 +293,7 @@ public synchronized void removeHDInsightAdditionalCluster(HDInsightAdditionalClu`
`293`	`293`	`return 1: cluster already exist in current cluster list`
`294`	`294`	`return 2: cluster is valid to add to cluster list but storage account is not default`
`295`	`295`	`*/`
	`296`	`+ @Deprecated`
`296`	`297`	`public int isHDInsightAdditionalStorageExist(String clusterName, String storageName) {`
`297`	`298`	`final ImmutableList<IClusterDetail> cachedClusterDetails =`
`298`	`299`	`Optional.of(ClusterMetaDataService.getInstance().getCachedClusterDetails())`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import com.microsoft.azure.hdinsight.sdk.storage.IHDIStorageAccount;`
`6`	`6`	`import com.microsoft.azuretools.authmanage.models.SubscriptionDetail;`
`7`	`7`	`import com.microsoft.azuretools.azurecommons.helpers.AzureCmdException;`
	`8`	`+import com.microsoft.azuretools.azurecommons.helpers.Nullable;`
`8`	`9`
`9`	`10`	`import java.io.IOException;`
`10`	`11`	`import java.util.List;`
`@@ -120,6 +121,7 @@ public String getResourceGroup() {`
`120`	`121`	`}`
`121`	`122`
`122`	`123`	`@Override`
	`124`	`+ @Nullable`
`123`	`125`	`public IHDIStorageAccount getStorageAccount() throws HDIException {`
`124`	`126`	`return null;`
`125`	`127`	`}`