Merge branch 'endgame-june' into endgame-june.next

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/messager/IntellijAzureMessage.java

@@ -18,8 +18,8 @@
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskContext;
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import lombok.Setter;
+import lombok.extern.java.Log;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
@@ -35,12 +35,13 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.logging.Level;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @Setter
-@RequiredArgsConstructor
+@Log
 public class IntellijAzureMessage implements IAzureMessage {
     static final Pattern URL_PATTERN = Pattern.compile("\\s+(https?|ftp)://(www\\d?|[a-zA-Z0-9]+)?.[a-zA-Z0-9-]+(:|.)([a-zA-Z0-9.]+|(\\d+)?)([/?:].*)?");
     static final String DEFAULT_MESSAGE_TITLE = "Azure";
@@ -59,6 +60,13 @@ public class IntellijAzureMessage implements IAzureMessage {
     @Getter
     private final IAzureMessage original;
 
+    public IntellijAzureMessage(@Nonnull IAzureMessage original) {
+        this.original = original;
+        if (original.getPayload() instanceof Throwable) {
+            log.log(Level.WARNING, "caught error in IntellijAzureMessager", ((Throwable) original.getPayload()));
+        }
+    }
+
     public IntellijAzureMessage(@Nonnull Type type, @Nonnull String message) {
         this(new SimpleMessage(type, message));
     }
@@ -143,7 +151,7 @@ public Boolean getBackgrounded() {
     private static String getCause(@Nonnull Throwable throwable) {
         final Throwable root = getRecognizableCause(throwable);
         if (Objects.isNull(root)) {
-            return null;
+            return ExceptionUtils.getRootCause(throwable).toString();
         }
         String cause = null;
         if (root instanceof ManagementException) {
@@ -163,7 +171,7 @@ private static Throwable getRecognizableCause(@Nonnull Throwable throwable) {
                 continue;
             }
             final String rootClassName = t.getClass().getName();
-            if (rootClassName.startsWith("com.microsoft.azure") || rootClassName.startsWith("com.azure")) {
+            if (rootClassName.startsWith("com.microsoft") || rootClassName.startsWith("com.azure")) {
                 return t;
             }
         }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/referencebook/AzureSdkTreePanel.java

@@ -131,7 +131,8 @@ private void loadData(final Map<String, List<AzureSdkCategoryEntity>> categoryTo
         final DefaultMutableTreeNode root = (DefaultMutableTreeNode) this.model.getRoot();
         root.removeAllChildren();
         final Map<String, AzureSdkServiceEntity> serviceMap = services.stream().collect(Collectors.toMap(e -> getServiceKeyByName(e.getName()), e -> e));
-        final List<String> categories = categoryToServiceMap.keySet().stream().sorted().collect(Collectors.toList());
+        final List<String> categories = categoryToServiceMap.keySet().stream().filter(StringUtils::isNotBlank).sorted(
+                (s1, s2) -> StringUtils.contains(s1, "Others") ? 1 : StringUtils.contains(s2, "Others") ? -1 : s1.compareTo(s2)).collect(Collectors.toList());
         for (final String category : categories) {
             // no feature found for current category
             if (CollectionUtils.isEmpty(categoryToServiceMap.get(category)) ||

PluginsAndFeatures/azure-toolkit-for-intellij/resources/com/microsoft/azure/toolkit/operation/titles_sqlserver_intellij.properties

@@ -1,9 +1,6 @@
-sqlserver.create=create Azure Database for SQL Server({0}) in subscription({1})
-sqlserver|database.list.server|subscription=list all Azure SQL Server database schemas in server({0}) of subscription({1})
-sqlserver|region.list.supported=list Azure SQL Server-supported regions
-sqlserver|version.list.supported=list Azure SQL Server-supported versions
-sqlserver.update_password=update password of SQL Server instance
-sqlserver.connect_server=connect to Azure SQL Server({0})
-sqlserver.delete=delete SQL Server({0})
-sqlserver.open_portal=open configuration page of SQL Server({0}) in portal
-sqlserver.show_properties=show properties of SQL Server({0})
+sqlserver|server.create=create SQL Server({0}) in subscription({1})
+sqlserver|server.delete=delete SQL Server({0})
+sqlserver|server.open_portal=open configuration page of SQL Server({0}) in portal
+sqlserver|server.show_properties=show properties of SQL Server({0})
+sqlserver|server.open_by_database_tools=open SQL Server({0}) by Database Tools plugin.
+sqlserver|server.database_load|subscription=list all SQL Server databases in server({0}) of subscription({1})

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/springcloud/properties/SpringCloudAppPanel.java

@@ -173,7 +173,9 @@ private void setApp(@Nonnull SpringCloudApp app) {
     private void updateForm() {
         assert Objects.nonNull(app): "app is not specified";
         final String testUrl = app.entity().getTestUrl();
-        this.txtTestEndpoint.setHyperlinkText(testUrl.length() > 60 ? testUrl.substring(0, 60) + "..." : testUrl);
+        if (testUrl != null) {
+            this.txtTestEndpoint.setHyperlinkText(testUrl.length() > 60 ? testUrl.substring(0, 60) + "..." : testUrl);
+        }
         this.txtTestEndpoint.setHyperlinkTarget(testUrl);
 
         final SpringCloudSku sku = app.getCluster().entity().getSku();

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/OpenSqlServerByToolsAction.java

@@ -60,7 +60,7 @@ protected String getOperationName(NodeActionEvent event) {
         return ActionConstants.parse(ActionConstants.SqlServer.CONNECT_TO_SERVER).getOperationName();
     }
 
-    @AzureOperation(name = "sqlserver.connect_server", params = {"this.node.getServer().entity().getName()"}, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "sqlserver|server.open_by_database_tools", params = {"this.node.getServer().entity().getName()"}, type = AzureOperation.Type.ACTION)
     private void doActionPerformed(boolean isLoggedIn, Project project) {
         try {
             if (!isLoggedIn ||

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/common/SqlServerDatabaseComboBox.java

@@ -44,7 +44,7 @@ protected String getItemText(Object item) {
 
     @Override
     @AzureOperation(
-        name = "sqlserver|database.list.server|subscription",
+        name = "sqlserver|server.database_load|subscription",
         params = {"this.server.name()", "this.subscription.subscriptionId()"},
         type = AzureOperation.Type.SERVICE
     )

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/task/CreateSqlServerTask.java

@@ -34,7 +34,7 @@ public CreateSqlServerTask(SqlServerConfig config) {
     }
 
     @AzureOperation(
-        name = "sqlserver.create",
+        name = "sqlserver|server.create",
         params = {
             "config.getServerName()",
             "config.getSubscription().displayName()"

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/ui/SignInWindow.java

@@ -7,7 +7,6 @@
 
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
@@ -38,7 +37,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.jdesktop.swingx.JXHyperlink;
 import org.jetbrains.annotations.Nullable;
-import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
@@ -197,27 +195,9 @@ private AuthMethodDetails doServicePrincipalLogin() {
     }
 
     private static AuthMethodDetails checkCanceled(ProgressIndicator indicator, Mono<? extends AuthMethodDetails> mono) {
-        CompletableFuture<? extends AuthMethodDetails> future = mono.toFuture();
-        Disposable disposable = Flux.interval(Duration.ofSeconds(1)).map(ts -> {
-            if (indicator != null) {
-                indicator.checkCanceled();
-            }
-            return 1;
-        }).onErrorResume(e -> {
-            if (e instanceof ProcessCanceledException) {
-                future.cancel(true);
-            }
-            return Mono.empty();
-        }).subscribeOn(Schedulers.boundedElastic()).subscribe();
-        try {
-            return future.get();
-        } catch (CancellationException e) {
-            return null;
-        } catch (Throwable e) {
-            throw new AzureToolkitRuntimeException("Cannot login due to error: " + e.getMessage(), e);
-        } finally {
-            disposable.dispose();
-        }
+        final Mono<AuthMethodDetails> cancelMono = Flux.interval(Duration.ofSeconds(1)).map(ignore -> indicator.isCanceled())
+            .any(cancel -> cancel).map(ignore -> new AuthMethodDetails()).subscribeOn(Schedulers.boundedElastic());
+        return Mono.firstWithSignal(cancelMono, mono.subscribeOn(Schedulers.boundedElastic())).block();
     }
 
     @Override
@@ -328,7 +308,7 @@ private synchronized AuthMethodDetails doDeviceLogin() {
                 ErrorWindow.show(project, ex.getMessage(), SIGN_IN_ERROR);
             }
         }
-        return null;
+        return new AuthMethodDetails();
     }
 
     private static AuthMethodDetails fromAccountEntity(AccountEntity entity) {

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/springcloud/SpringCloudNode.java

@@ -42,7 +42,7 @@ public SpringCloudNode(AzureRefreshableNode parent, SpringCloudCluster cluster)
 
     public void onAppCreatedOrRemoved(SpringCloudApp app) {
         if (this.cluster.name().equals(app.getCluster().name())) {
-            refreshItems();
+            this.load(true);
         }
     }
 

Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/sqlserver/SqlServerNode.java

@@ -66,18 +66,18 @@ public List<NodeAction> getNodeActions() {
         return super.getNodeActions();
     }
 
-    @AzureOperation(name = "sqlserver.delete", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "sqlserver|server.delete", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
     private void delete() {
         this.serverState = SERVER_UPDATING;
         this.getParent().removeNode(this.subscriptionId, this.getId(), SqlServerNode.this);
     }
 
-    @AzureOperation(name = "sqlserver.open_portal", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "sqlserver|server.open_portal", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
     private void openInPortal() {
         this.openResourcesInPortal(this.subscriptionId, this.server.entity().getId());
     }
 
-    @AzureOperation(name = "sqlserver.show_properties", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
+    @AzureOperation(name = "sqlserver|server.show_properties", params = {"this.server.entity().getName()"}, type = AzureOperation.Type.ACTION)
     private void showProperties() {
         DefaultLoader.getUIHelper().openSqlServerPropertyView(SqlServerNode.this);
     }