Skip to content

Commit 12c494d

Browse files
committed
Extract web app deployment models to appservice ide library
1 parent a05ca00 commit 12c494d

File tree

24 files changed

+112
-30
lines changed

24 files changed

+112
-30
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ dependencies {
217217
exclude group: "com.microsoft.azure", module: "azure-client-runtime"
218218
exclude group: "javax.xml.bind", module: "jaxb-api"
219219
}
220+
compile 'com.microsoft.azure:azure-toolkit-ide-appservice-lib:' + azureToolkitVersion
220221

221222
compile 'com.nimbusds:oauth2-oidc-sdk:9.7', { force = true }
222223

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/AppServiceComboBoxModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
package com.microsoft.azure.toolkit.intellij.appservice;
77

8-
import com.microsoft.azure.toolkit.lib.appservice.AppServiceConfig;
8+
import com.microsoft.azure.toolkit.ide.appservice.model.AppServiceConfig;
99
import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
1010
import com.microsoft.azure.toolkit.lib.appservice.service.IAppService;
1111
import lombok.Getter;

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/AppServiceInfoAdvancedPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.intellij.openapi.project.Project;
99
import com.intellij.ui.TitledSeparator;
1010
import com.intellij.util.ui.JBUI;
11+
import com.microsoft.azure.toolkit.ide.appservice.model.AppServiceConfig;
1112
import com.microsoft.azure.toolkit.intellij.appservice.platform.RuntimeComboBox;
1213
import com.microsoft.azure.toolkit.intellij.common.component.RegionComboBox;
1314
import com.microsoft.azure.toolkit.intellij.common.component.resourcegroup.ResourceGroupComboBox;
@@ -17,7 +18,6 @@
1718
import com.microsoft.azure.toolkit.intellij.common.AzureArtifactComboBox;
1819
import com.microsoft.azure.toolkit.intellij.common.AzureArtifactManager;
1920
import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
20-
import com.microsoft.azure.toolkit.lib.appservice.AppServiceConfig;
2121
import com.microsoft.azure.toolkit.lib.appservice.entity.AppServicePlanEntity;
2222
import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
2323
import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/AppServiceInfoBasicPanel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
import com.intellij.openapi.project.Project;
99
import com.intellij.ui.TitledSeparator;
10+
import com.microsoft.azure.toolkit.ide.appservice.model.AppServiceConfig;
1011
import com.microsoft.azure.toolkit.intellij.appservice.platform.RuntimeComboBox;
1112
import com.microsoft.azure.toolkit.intellij.common.AzureArtifact;
1213
import com.microsoft.azure.toolkit.intellij.common.AzureArtifactComboBox;
1314
import com.microsoft.azure.toolkit.intellij.common.AzureArtifactManager;
1415
import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
1516
import com.microsoft.azure.toolkit.intellij.common.DraftResourceGroup;
16-
import com.microsoft.azure.toolkit.lib.appservice.AppServiceConfig;
1717
import com.microsoft.azure.toolkit.lib.appservice.DraftServicePlan;
1818
import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
1919
import com.microsoft.azure.toolkit.lib.auth.AzureAccount;

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/AppServiceMonitorPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
import com.intellij.openapi.project.Project;
99
import com.intellij.ui.TitledSeparator;
10+
import com.microsoft.azure.toolkit.ide.appservice.model.ApplicationInsightsConfig;
11+
import com.microsoft.azure.toolkit.ide.appservice.model.MonitorConfig;
1012
import com.microsoft.azure.toolkit.intellij.appservice.insights.ApplicationInsightsComboBox;
1113
import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
1214
import com.microsoft.azure.toolkit.intellij.common.IntegerTextField;
13-
import com.microsoft.azure.toolkit.lib.appservice.ApplicationInsightsConfig;
14-
import com.microsoft.azure.toolkit.lib.appservice.MonitorConfig;
1515
import com.microsoft.azure.toolkit.lib.appservice.model.DiagnosticConfig;
1616
import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
1717

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/appservice/insights/ApplicationInsightsComboBox.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
import com.intellij.icons.AllIcons;
88
import com.intellij.ui.components.fields.ExtendableTextComponent;
9+
import com.microsoft.azure.toolkit.ide.appservice.model.ApplicationInsightsConfig;
910
import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
1011
import com.microsoft.azure.toolkit.intellij.function.runner.component.CreateApplicationInsightsDialog;
11-
import com.microsoft.azure.toolkit.lib.appservice.ApplicationInsightsConfig;
1212
import com.microsoft.azure.toolkit.lib.common.model.Subscription;
1313
import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
1414
import com.microsoft.azuretools.azurecommons.helpers.NotNull;
@@ -61,7 +61,7 @@ protected List<? extends ApplicationInsightsConfig> loadItems() throws Exception
6161
subscription == null ? Collections.emptyList() :
6262
AzureSDKManager.getInsightsResources(subscription.getId())
6363
.stream()
64-
.map(ApplicationInsightsConfig::new)
64+
.map(instance -> new ApplicationInsightsConfig(instance.name(), instance.instrumentationKey()))
6565
.collect(Collectors.toList());
6666
return ListUtils.union(newItems, existingItems);
6767
}

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/function/FunctionAppConfigFormPanelAdvance.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77

88
import com.intellij.openapi.project.Project;
99
import com.intellij.ui.DocumentAdapter;
10+
import com.microsoft.azure.toolkit.ide.appservice.model.ApplicationInsightsConfig;
11+
import com.microsoft.azure.toolkit.ide.appservice.model.MonitorConfig;
1012
import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
1113
import com.microsoft.azure.toolkit.lib.appservice.model.PricingTier;
1214
import com.microsoft.azure.toolkit.intellij.appservice.AppServiceInfoAdvancedPanel;
1315
import com.microsoft.azure.toolkit.intellij.appservice.AppServiceMonitorPanel;
1416
import com.microsoft.azure.toolkit.intellij.appservice.insights.ApplicationInsightsComboBox;
1517
import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
16-
import com.microsoft.azure.toolkit.lib.appservice.ApplicationInsightsConfig;
17-
import com.microsoft.azure.toolkit.lib.appservice.MonitorConfig;
1818
import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
1919
import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
2020
import com.microsoft.azure.toolkit.lib.function.FunctionAppConfig;

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/function/FunctionAppCreationDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
package com.microsoft.azure.toolkit.intellij.function;
77

88
import com.intellij.openapi.project.Project;
9+
import com.microsoft.azure.toolkit.ide.appservice.model.ApplicationInsightsConfig;
10+
import com.microsoft.azure.toolkit.ide.appservice.model.MonitorConfig;
911
import com.microsoft.azure.toolkit.intellij.appservice.AppServiceInfoBasicPanel;
1012
import com.microsoft.azure.toolkit.intellij.common.AzureFormPanel;
1113
import com.microsoft.azure.toolkit.intellij.common.ConfigDialog;
12-
import com.microsoft.azure.toolkit.lib.appservice.ApplicationInsightsConfig;
13-
import com.microsoft.azure.toolkit.lib.appservice.MonitorConfig;
1414
import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
1515
import com.microsoft.azure.toolkit.lib.function.FunctionAppConfig;
1616
import com.microsoft.azuretools.azurecommons.helpers.Nullable;

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/function/runner/deploy/FunctionDeployModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package com.microsoft.azure.toolkit.intellij.function.runner.deploy;
77

8+
import com.microsoft.azure.toolkit.ide.appservice.model.ApplicationInsightsConfig;
9+
import com.microsoft.azure.toolkit.ide.appservice.model.MonitorConfig;
810
import com.microsoft.azure.toolkit.intellij.function.runner.core.FunctionUtils;
9-
import com.microsoft.azure.toolkit.lib.appservice.ApplicationInsightsConfig;
10-
import com.microsoft.azure.toolkit.lib.appservice.MonitorConfig;
1111
import com.microsoft.azure.toolkit.lib.appservice.entity.AppServicePlanEntity;
1212
import com.microsoft.azure.toolkit.lib.appservice.model.DiagnosticConfig;
1313
import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/WebAppComboBoxModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
package com.microsoft.azure.toolkit.intellij.webapp;
77

8+
import com.microsoft.azure.toolkit.ide.appservice.webapp.model.WebAppConfig;
89
import com.microsoft.azure.toolkit.intellij.appservice.AppServiceComboBoxModel;
910
import com.microsoft.azure.toolkit.lib.appservice.service.IWebApp;
10-
import com.microsoft.azure.toolkit.lib.webapp.WebAppConfig;
1111
import com.microsoft.azuretools.core.mvp.model.AzureMvpModel;
1212
import com.microsoft.azuretools.core.mvp.model.webapp.WebAppSettingModel;
1313
import lombok.Getter;

0 commit comments

Comments
 (0)