Skip to content

Commit 4c5f500

Browse files
committed
extracted serer retrieve logic from Config to Dialog.
1 parent 4c7ac96 commit 4c5f500

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@
2222

2323
package com.microsoft.azure.toolkit.intellij.sqlserver.creation;
2424

25+
import com.google.common.base.Preconditions;
2526
import com.intellij.openapi.project.Project;
27+
import com.microsoft.azure.management.resources.Subscription;
2628
import com.microsoft.azure.toolkit.intellij.common.AzureDialog;
2729
import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
2830
import com.microsoft.azure.toolkit.lib.sqlserver.SqlServerConfig;
31+
import com.microsoft.azuretools.core.mvp.model.AzureMvpModel;
32+
import org.apache.commons.collections4.CollectionUtils;
2933
import org.jetbrains.annotations.Nullable;
3034

3135
import javax.swing.*;
3236

37+
import java.util.List;
38+
3339
import static com.microsoft.intellij.ui.messages.AzureBundle.message;
3440

3541
public class SqlServerCreationDialog extends AzureDialog<SqlServerConfig> {
@@ -95,7 +101,9 @@ protected void toggleAdvancedMode(boolean advancedMode) {
95101
}
96102

97103
private void createUIComponents() {
98-
SqlServerConfig config = SqlServerConfig.getDefaultConfig();
104+
final List<Subscription> selectedSubscriptions = AzureMvpModel.getInstance().getSelectedSubscriptions();
105+
Preconditions.checkArgument(CollectionUtils.isNotEmpty(selectedSubscriptions), "There is no subscription in your account.");
106+
SqlServerConfig config = SqlServerConfig.getDefaultConfig(selectedSubscriptions.get(0));
99107
basic = new SqlServerCreationBasicPanel(config);
100108
advanced = new SqlServerCreationAdvancedPanel(config);
101109
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,9 @@ public class SqlServerConfig {
3939
private boolean allowAccessFromAzureServices;
4040
private boolean allowAccessFromLocalMachine;
4141

42-
public static SqlServerConfig getDefaultConfig() {
42+
public static SqlServerConfig getDefaultConfig(Subscription subscription) {
4343
final String defaultNameSuffix = DateFormatUtils.format(new Date(), "yyyyMMddHHmmss");
4444
final SqlServerConfig config = new SqlServerConfig();
45-
final List<Subscription> selectedSubscriptions = AzureMvpModel.getInstance().getSelectedSubscriptions();
46-
Preconditions.checkArgument(CollectionUtils.isNotEmpty(selectedSubscriptions), "There is no subscription in your account.");
47-
Subscription subscription = selectedSubscriptions.get(0);
4845
config.setSubscription(subscription);
4946
DraftResourceGroup resourceGroup = DraftResourceGroup.builder().subscription(subscription).name("rs-" + defaultNameSuffix).build();
5047
config.setResourceGroup(resourceGroup);

0 commit comments

Comments
 (0)