Skip to content

Commit 524a7a4

Browse files
committed
refactor code.
1 parent 777b76c commit 524a7a4

File tree

1 file changed

+15
-8
lines changed
  • PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/sqlserver/task

1 file changed

+15
-8
lines changed

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

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55

66
package com.microsoft.azure.toolkit.intellij.sqlserver.task;
77

8-
import com.microsoft.azure.management.Azure;
98
import com.microsoft.azure.management.resources.ResourceGroup;
109
import com.microsoft.azure.toolkit.intellij.common.Draft;
10+
import com.microsoft.azure.toolkit.lib.Azure;
11+
import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
1112
import com.microsoft.azure.toolkit.lib.common.model.Region;
1213
import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
14+
import com.microsoft.azure.toolkit.lib.resource.AzureGroup;
15+
import com.microsoft.azure.toolkit.lib.resource.ResourceGroupEntity;
1316
import com.microsoft.azure.toolkit.lib.sqlserver.SqlServerConfig;
1417
import com.microsoft.azure.toolkit.lib.sqlserver.model.SqlServerEntity;
1518
import com.microsoft.azure.toolkit.lib.sqlserver.service.AzureSqlServer;
@@ -49,16 +52,13 @@ public ISqlServer execute() {
4952
EventUtil.logEvent(EventType.info, operation, Collections.singletonMap(TelemetryConstants.SUBSCRIPTIONID, subscriptionId));
5053
// create resource group if necessary.
5154
if (config.getResourceGroup() instanceof Draft) {
52-
Azure azure = AuthMethodManager.getInstance().getAzureClient(subscriptionId);
53-
ResourceGroup newResourceGroup = azure.resourceGroups().define(config.getResourceGroup().name()).withRegion(config.getRegion().getName()).create();
55+
ResourceGroupEntity newResourceGroup = Azure.az(AzureGroup.class)
56+
.subscription(subscriptionId).create(config.getResourceGroup().name(), config.getRegion().getName());
5457
config.setResourceGroup(newResourceGroup);
5558
}
5659
// create sql server
57-
SqlServerEntity entity = SqlServerEntity.builder().name(config.getServerName()).subscriptionId(config.getSubscription().subscriptionId())
58-
.resourceGroup(config.getResourceGroup().name()).region(Region.fromName(config.getRegion().getName())).administratorLoginName(config.getAdminUsername())
59-
.enableAccessFromAzureServices(config.isAllowAccessFromAzureServices()).enableAccessFromLocalMachine(config.isAllowAccessFromLocalMachine())
60-
.build();
61-
return com.microsoft.azure.toolkit.lib.Azure.az(AzureSqlServer.class).sqlServer(entity).create()
60+
SqlServerEntity entity = this.fromConfig(this.config);
61+
return Azure.az(AzureSqlServer.class).sqlServer(entity).create()
6262
.withAdministratorLoginPassword(String.valueOf(config.getPassword()))
6363
.commit();
6464
} catch (final RuntimeException e) {
@@ -69,4 +69,11 @@ public ISqlServer execute() {
6969
}
7070
}
7171

72+
private SqlServerEntity fromConfig(SqlServerConfig config) {
73+
return SqlServerEntity.builder().name(config.getServerName()).subscriptionId(config.getSubscription().subscriptionId())
74+
.resourceGroup(config.getResourceGroup().name()).region(Region.fromName(config.getRegion().getName())).administratorLoginName(config.getAdminUsername())
75+
.enableAccessFromAzureServices(config.isAllowAccessFromAzureServices()).enableAccessFromLocalMachine(config.isAllowAccessFromLocalMachine())
76+
.build();
77+
}
78+
7279
}

0 commit comments

Comments
 (0)