Merge branch 'qianjin-sqlserver-04-showproperties-4-actions' into qianjin-sqlserver-05-all

Author: shenqianjin

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

@@ -12,8 +12,8 @@
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
+import com.microsoft.azure.toolkit.intellij.sqlserver.task.CreateSqlServerTask;
 import com.microsoft.azure.toolkit.lib.sqlserver.SqlServerConfig;
-import com.microsoft.azure.toolkit.lib.sqlserver.SqlServerService;
 import com.microsoft.azure.toolkit.lib.sqlserver.service.ISqlServer;
 import com.microsoft.azuretools.authmanage.AuthMethodManager;
 import com.microsoft.azuretools.utils.AzureUIRefreshCore;
@@ -74,7 +74,7 @@ private void createSqlServer(final SqlServerConfig config, SqlServerCreationDial
             final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
             indicator.setIndeterminate(true);
             DefaultLoader.getIdeHelper().invokeLater(dialog::close);
-            ISqlServer server = SqlServerService.getInstance().create(config);
+            ISqlServer server = new CreateSqlServerTask(config).execute();
             refreshAzureExplorer(server);
         };
         String progressMessage = Node.getProgressMessage(AzureActionEnum.CREATE.getDoingName(), SqlServerModule.MODULE_NAME, config.getServerName());

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

@@ -18,13 +18,6 @@ public class SqlServerDatabaseComboBox extends AzureComboBox<SqlDatabaseEntity>
 
     private ISqlServer server;
 
-    public void setSubscription(ISqlServer server) {
-        if (Objects.equals(server, this.server)) {
-            return;
-        }
-        this.refreshItems();
-    }
-
     public void setServer(ISqlServer server) {
         if (Objects.equals(server, this.server)) {
             return;

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

@@ -21,13 +21,18 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+/**
+ * TODO(Qianjin) : extend RegionComboBox
+ */
 public class SqlServerRegionComboBox extends AzureComboBox<Region> {
 
     private static final String REGION_UNAVAILABLE_MESSAGE = "Your subscription does not have access to create a server "
         + "in the selected region. For the latest information about region availability for your subscription, go to "
         + "aka.ms/sqlcapacity. Please try another region or create a support ticket to request access.";
 
     private Subscription subscription;
+    private boolean validated;
+    private AzureValidationInfo validatedInfo;
 
     public void setSubscription(Subscription subscription) {
         if (Objects.equals(subscription, this.subscription)) {
@@ -62,6 +67,14 @@ protected String getItemText(Object item) {
         return super.getItemText(item);
     }
 
+    @Override
+    public void setItem(Region item) {
+        if (!item.equals(getItem())) {
+            validated = false;
+        }
+        super.setItem(item);
+    }
+
     @Override
     public boolean isRequired() {
         return true;
@@ -70,16 +83,19 @@ public boolean isRequired() {
     @NotNull
     @Override
     public AzureValidationInfo doValidate() {
-        final AzureValidationInfo info = super.doValidate();
-        if (!AzureValidationInfo.OK.equals(info)) {
-            return info;
+        if (validated && Objects.isNull(validatedInfo)) {
+            return validatedInfo;
         }
-        AzureSqlServer service = com.microsoft.azure.toolkit.lib.Azure.az(AzureSqlServer.class);
-        if (!service.checkRegionCapability(subscription.subscriptionId(), getValue().getName())) {
-            final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();
-            return builder.input(this).message(REGION_UNAVAILABLE_MESSAGE).type(AzureValidationInfo.Type.ERROR).build();
+        validatedInfo = super.doValidate();
+        if (AzureValidationInfo.OK.equals(validatedInfo)) {
+            AzureSqlServer service = com.microsoft.azure.toolkit.lib.Azure.az(AzureSqlServer.class);
+            if (!service.checkRegionCapability(subscription.subscriptionId(), getValue().getName())) {
+                final AzureValidationInfo.AzureValidationInfoBuilder builder = AzureValidationInfo.builder();
+                validatedInfo = builder.input(this).message(REGION_UNAVAILABLE_MESSAGE).type(AzureValidationInfo.Type.ERROR).build();
+            }
         }
-        return info;
+        validated = true;
+        return validatedInfo;
     }
 
     /**

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

@@ -67,7 +67,7 @@ private void init() {
 
     private void initListeners() {
         this.subscriptionComboBox.addItemListener(this::onSubscriptionChanged);
-        this.adminUsernameTextField.getDocument().addDocumentListener(generateAdminUsernameListener());
+        this.adminUsernameTextField.getDocument().addDocumentListener(this.onAdminUsernameChanged());
     }
 
     private void onSubscriptionChanged(final ItemEvent e) {
@@ -79,7 +79,7 @@ private void onSubscriptionChanged(final ItemEvent e) {
         }
     }
 
-    private DocumentListener generateAdminUsernameListener() {
+    private DocumentListener onAdminUsernameChanged() {
         return new TextDocumentListenerAdapter() {
             @Override
             public void onDocumentChanged() {

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

@@ -22,14 +22,20 @@
 
 package com.microsoft.azure.toolkit.intellij.sqlserver.creation;
 
+import com.google.common.base.Preconditions;
 import com.intellij.openapi.project.Project;
+import com.microsoft.azure.management.resources.Subscription;
 import com.microsoft.azure.toolkit.intellij.common.AzureDialog;
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
 import com.microsoft.azure.toolkit.lib.sqlserver.SqlServerConfig;
+import com.microsoft.azuretools.core.mvp.model.AzureMvpModel;
+import org.apache.commons.collections4.CollectionUtils;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 
+import java.util.List;
+
 import static com.microsoft.intellij.ui.messages.AzureBundle.message;
 
 public class SqlServerCreationDialog extends AzureDialog<SqlServerConfig> {
@@ -95,7 +101,9 @@ protected void toggleAdvancedMode(boolean advancedMode) {
     }
 
     private void createUIComponents() {
-        SqlServerConfig config = SqlServerConfig.getDefaultConfig();
+        final List<Subscription> selectedSubscriptions = AzureMvpModel.getInstance().getSelectedSubscriptions();
+        Preconditions.checkArgument(CollectionUtils.isNotEmpty(selectedSubscriptions), "There is no subscription in your account.");
+        SqlServerConfig config = SqlServerConfig.getDefaultConfig(selectedSubscriptions.get(0));
         basic = new SqlServerCreationBasicPanel(config);
         advanced = new SqlServerCreationAdvancedPanel(config);
     }

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

@@ -43,6 +43,9 @@
 import java.util.List;
 import java.util.Map;
 
+/**
+ * TODO (qianjin): shared common code
+ */
 public class SqlServerPropertyView extends BaseEditor implements MvpView {
 
     public static final String ID = "com.microsoft.azure.toolkit.intellij.sqlserver.properties.SqlServerPropertyView";

…lkit/lib/sqlserver/SqlServerService.java …/sqlserver/task/CreateSqlServerTask.javaPluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/sqlserver/SqlServerService.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/task/CreateSqlServerTask.java PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/lib/sqlserver/SqlServerService.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/task/CreateSqlServerTask.java

@@ -3,14 +3,14 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
 
-package com.microsoft.azure.toolkit.lib.sqlserver;
+package com.microsoft.azure.toolkit.intellij.sqlserver.task;
 
 import com.microsoft.azure.management.Azure;
 import com.microsoft.azure.management.resources.ResourceGroup;
 import com.microsoft.azure.toolkit.intellij.common.Draft;
 import com.microsoft.azure.toolkit.lib.common.model.Region;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
-import com.microsoft.azure.toolkit.lib.sqlserver.model.SqlFirewallRuleEntity;
+import com.microsoft.azure.toolkit.lib.sqlserver.SqlServerConfig;
 import com.microsoft.azure.toolkit.lib.sqlserver.model.SqlServerEntity;
 import com.microsoft.azure.toolkit.lib.sqlserver.service.AzureSqlServer;
 import com.microsoft.azure.toolkit.lib.sqlserver.service.ISqlServer;
@@ -25,11 +25,12 @@
 
 import java.util.Collections;
 
-public class SqlServerService {
-    private static final SqlServerService instance = new SqlServerService();
+public class CreateSqlServerTask {
 
-    public static SqlServerService getInstance() {
-        return SqlServerService.instance;
+    private final SqlServerConfig config;
+
+    public CreateSqlServerTask(SqlServerConfig config) {
+        this.config = config;
     }
 
     @AzureOperation(
@@ -40,7 +41,7 @@ public static SqlServerService getInstance() {
         },
         type = AzureOperation.Type.SERVICE
     )
-    public ISqlServer create(final SqlServerConfig config) {
+    public ISqlServer execute() {
         final Operation operation = TelemetryManager.createOperation(ActionConstants.MySQL.CREATE);
         try {
             operation.start();

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

@@ -39,12 +39,9 @@ public class SqlServerConfig {
     private boolean allowAccessFromAzureServices;
     private boolean allowAccessFromLocalMachine;
 
-    public static SqlServerConfig getDefaultConfig() {
+    public static SqlServerConfig getDefaultConfig(Subscription subscription) {
         final String defaultNameSuffix = DateFormatUtils.format(new Date(), "yyyyMMddHHmmss");
         final SqlServerConfig config = new SqlServerConfig();
-        final List<Subscription> selectedSubscriptions = AzureMvpModel.getInstance().getSelectedSubscriptions();
-        Preconditions.checkArgument(CollectionUtils.isNotEmpty(selectedSubscriptions), "There is no subscription in your account.");
-        Subscription subscription = selectedSubscriptions.get(0);
         config.setSubscription(subscription);
         DraftResourceGroup resourceGroup = DraftResourceGroup.builder().subscription(subscription).name("rs-" + defaultNameSuffix).build();
         config.setResourceGroup(resourceGroup);