Skip to content

Commit 88de033

Browse files
Flanker32Flanker32
committed
Extract variable for azure messenger
1 parent 7d332e1 commit 88de033

File tree

2 files changed

+33
-27
lines changed

2 files changed

+33
-27
lines changed

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/library/function/CreateFunctionHandler.java‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,26 @@
66
package com.microsoft.azure.toolkit.intellij.function.runner.library.function;
77

88
import com.google.common.base.Preconditions;
9+
import com.microsoft.azure.management.applicationinsights.v2015_05_01.ApplicationInsightsComponent;
10+
import com.microsoft.azure.management.appservice.FunctionApp;
11+
import com.microsoft.azure.management.appservice.FunctionApp.DefinitionStages.WithCreate;
12+
import com.microsoft.azure.management.appservice.PricingTier;
913
import com.microsoft.azure.management.resources.fluentcore.arm.Region;
14+
import com.microsoft.azure.toolkit.intellij.function.runner.deploy.FunctionDeployModel;
15+
import com.microsoft.azure.toolkit.lib.common.exception.AzureExecutionException;
16+
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
1017
import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
18+
import com.microsoft.azure.toolkit.lib.common.messager.IAzureMessager;
19+
import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
20+
import com.microsoft.azure.toolkit.lib.legacy.appservice.AppServiceUtils;
1121
import com.microsoft.azure.toolkit.lib.legacy.appservice.OperatingSystemEnum;
12-
import com.microsoft.azure.toolkit.lib.common.exception.AzureExecutionException;
1322
import com.microsoft.azure.toolkit.lib.legacy.function.configurations.ElasticPremiumPricingTier;
1423
import com.microsoft.azure.toolkit.lib.legacy.function.configurations.FunctionExtensionVersion;
1524
import com.microsoft.azure.toolkit.lib.legacy.function.configurations.RuntimeConfiguration;
1625
import com.microsoft.azure.toolkit.lib.legacy.function.handlers.runtime.FunctionRuntimeHandler;
1726
import com.microsoft.azure.toolkit.lib.legacy.function.handlers.runtime.LinuxFunctionRuntimeHandler;
1827
import com.microsoft.azure.toolkit.lib.legacy.function.handlers.runtime.WindowsFunctionRuntimeHandler;
1928
import com.microsoft.azure.toolkit.lib.legacy.function.utils.FunctionUtils;
20-
import com.microsoft.azure.toolkit.lib.legacy.appservice.AppServiceUtils;
21-
import com.microsoft.azure.management.applicationinsights.v2015_05_01.ApplicationInsightsComponent;
22-
import com.microsoft.azure.management.appservice.FunctionApp;
23-
import com.microsoft.azure.management.appservice.FunctionApp.DefinitionStages.WithCreate;
24-
import com.microsoft.azure.management.appservice.PricingTier;
25-
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
26-
import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
27-
import com.microsoft.azure.toolkit.intellij.function.runner.deploy.FunctionDeployModel;
2829
import com.microsoft.azuretools.telemetrywrapper.Operation;
2930
import com.microsoft.tooling.msservices.helpers.azure.sdk.AzureSDKManager;
3031
import org.apache.commons.lang3.StringUtils;
@@ -50,11 +51,13 @@ public class CreateFunctionHandler {
5051

5152
private final FunctionDeployModel ctx;
5253
private final Operation operation;
54+
private final IAzureMessager messenger;
5355

5456
public CreateFunctionHandler(FunctionDeployModel ctx, Operation operation) {
5557
Preconditions.checkNotNull(ctx);
5658
this.ctx = ctx;
5759
this.operation = operation;
60+
this.messenger = AzureMessager.getMessager();
5861
}
5962

6063
public FunctionApp execute() {
@@ -77,7 +80,7 @@ public FunctionApp execute() {
7780
type = AzureOperation.Type.SERVICE
7881
)
7982
private FunctionApp createFunctionApp() {
80-
AzureMessager.getMessager().info(message("function.create.hint.startCreateFunction"));
83+
messenger.info(message("function.create.hint.startCreateFunction"));
8184
final WithCreate withCreate;
8285
try {
8386
final FunctionRuntimeHandler runtimeHandler = getFunctionRuntimeHandler();
@@ -95,7 +98,7 @@ private FunctionApp createFunctionApp() {
9598

9699
final FunctionApp result = withCreate.create();
97100
operation.trackProperty("pricingTier", ctx.getPricingTier());
98-
AzureMessager.getMessager().info(message("function.create.hint.functionCreated", ctx.getAppName()));
101+
messenger.info(message("function.create.hint.functionCreated", ctx.getAppName()));
99102
return result;
100103
}
101104

@@ -129,7 +132,7 @@ private Map<String, String> bindingApplicationInsights() {
129132
instrumentationKey = insights.instrumentationKey();
130133
} catch (final IOException | RuntimeException e) {
131134
// swallow exception for application insights, which should not block function creation
132-
AzureMessager.getMessager().warning(message("function.create.error.createApplicationInsightsFailed", ctx.getAppName()));
135+
messenger.warning(message("function.create.error.createApplicationInsightsFailed", ctx.getAppName()));
133136
}
134137
}
135138
return Collections.singletonMap(APP_INSIGHTS_INSTRUMENTATION_KEY, instrumentationKey);
@@ -175,7 +178,7 @@ private void setDefaultAppSetting(Map result, String settingName, String setting
175178

176179
final String setting = (String) result.get(settingName);
177180
if (StringUtils.isEmpty(setting)) {
178-
AzureMessager.getMessager().info(settingIsEmptyMessage);
181+
messenger.info(settingIsEmptyMessage);
179182
result.put(settingName, settingValue);
180183
}
181184
}
@@ -185,9 +188,9 @@ private void overrideDefaultAppSetting(Map result, String settingName, String se
185188

186189
final String setting = (String) result.get(settingName);
187190
if (StringUtils.isEmpty(setting)) {
188-
AzureMessager.getMessager().info(settingIsEmptyMessage);
191+
messenger.info(settingIsEmptyMessage);
189192
} else if (!setting.equals(settingValue)) {
190-
AzureMessager.getMessager().warning(String.format(changeSettingMessage, setting));
193+
messenger.warning(String.format(changeSettingMessage, setting));
191194
}
192195
result.put(settingName, settingValue);
193196
}

‎PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/library/function/DeployFunctionHandler.java‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.microsoft.azure.toolkit.lib.common.exception.AzureExecutionException;
1313
import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
1414
import com.microsoft.azure.toolkit.lib.common.messager.AzureMessager;
15+
import com.microsoft.azure.toolkit.lib.common.messager.IAzureMessager;
1516
import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
1617
import com.microsoft.azure.toolkit.lib.legacy.appservice.AppServiceUtils;
1718
import com.microsoft.azure.toolkit.lib.legacy.appservice.DeployTarget;
@@ -60,31 +61,33 @@ public class DeployFunctionHandler {
6061
private static final OperatingSystemEnum DEFAULT_OS = OperatingSystemEnum.Windows;
6162
private final FunctionDeployModel model;
6263
private final Operation operation;
64+
private final IAzureMessager messenger;
6365

6466
public DeployFunctionHandler(@NotNull FunctionDeployModel model, @NotNull Operation operation) {
6567
this.model = model;
6668
this.operation = operation;
69+
this.messenger = AzureMessager.getMessager();
6770
}
6871

6972
@AzureOperation(name = "function.deploy_artifact", type = AzureOperation.Type.SERVICE)
7073
public FunctionApp execute() throws Exception {
7174
final FunctionApp app = getFunctionApp();
7275
updateFunctionAppSettings(app);
7376
final DeployTarget deployTarget = new DeployTarget(app, DeployTargetType.FUNCTION);
74-
AzureMessager.getMessager().info(message("function.deploy.hint.startDeployFunction"));
77+
messenger.info(message("function.deploy.hint.startDeployFunction"));
7578
getArtifactHandler().publish(deployTarget);
76-
AzureMessager.getMessager().info(message("function.deploy.hint.deployDone", model.getAppName()));
79+
messenger.info(message("function.deploy.hint.deployDone", model.getAppName()));
7780
listHTTPTriggerUrls();
7881
return (FunctionApp) deployTarget.getApp();
7982
}
8083

8184
private void updateFunctionAppSettings(final FunctionApp app) {
82-
AzureMessager.getMessager().info(message("function.deploy.hint.updateFunctionApp"));
85+
messenger.info(message("function.deploy.hint.updateFunctionApp"));
8386
// Work around of https://github.com/Azure/azure-sdk-for-java/issues/1755
8487
final Update update = app.update();
8588
configureAppSettings(update::withAppSettings, getAppSettingsWithDefaultValue());
8689
update.apply();
87-
AzureMessager.getMessager().info(message("function.deploy.hint.updateDone", model.getAppName()));
90+
messenger.info(message("function.deploy.hint.updateDone", model.getAppName()));
8891
}
8992

9093
private void configureAppSettings(final Consumer<Map> withAppSettings, final Map appSettings) {
@@ -112,13 +115,13 @@ private void listHTTPTriggerUrls() {
112115
AuthorizationLevel.ANONYMOUS.toString()))
113116
.collect(Collectors.toList());
114117
if (CollectionUtils.isEmpty(httpFunction) || CollectionUtils.isEmpty(anonymousTriggers)) {
115-
AzureMessager.getMessager().info(message("function.deploy.hint.noAnonymousHttpTrigger"));
118+
messenger.info(message("function.deploy.hint.noAnonymousHttpTrigger"));
116119
return;
117120
}
118-
AzureMessager.getMessager().info(message("function.deploy.hint.httpTriggerUrls"));
119-
anonymousTriggers.forEach(trigger -> AzureMessager.getMessager().info(String.format("\t %s : %s", trigger.getName(), trigger.getTriggerUrl())));
121+
messenger.info(message("function.deploy.hint.httpTriggerUrls"));
122+
anonymousTriggers.forEach(trigger -> messenger.info(String.format("\t %s : %s", trigger.getName(), trigger.getTriggerUrl())));
120123
if (anonymousTriggers.size() < httpFunction.size()) {
121-
AzureMessager.getMessager().info(message("function.deploy.error.listHttpTriggerFailed"));
124+
messenger.info(message("function.deploy.error.listHttpTriggerFailed"));
122125
}
123126
}
124127

@@ -137,7 +140,7 @@ private List<FunctionResource> listFunctions() {
137140
for (int i = 0; i < LIST_TRIGGERS_MAX_RETRY; i++) {
138141
try {
139142
Thread.sleep(LIST_TRIGGERS_RETRY_PERIOD_IN_SECONDS * 1000);
140-
AzureMessager.getMessager().info(String.format(message("function.deploy.hint.syncTriggers"), i + 1, LIST_TRIGGERS_MAX_RETRY));
143+
messenger.info(String.format(message("function.deploy.hint.syncTriggers"), i + 1, LIST_TRIGGERS_MAX_RETRY));
141144
functionApp.syncTriggers();
142145
final List<FunctionResource> triggers =
143146
model.getAzureClient().appServices().functionApps()
@@ -206,7 +209,7 @@ private void setDefaultAppSetting(Map result, String settingName, String setting
206209

207210
final String setting = (String) result.get(settingName);
208211
if (StringUtils.isEmpty(setting)) {
209-
AzureMessager.getMessager().info(settingIsEmptyMessage);
212+
messenger.info(settingIsEmptyMessage);
210213
result.put(settingName, settingValue);
211214
}
212215
}
@@ -216,9 +219,9 @@ private void overrideDefaultAppSetting(Map result, String settingName, String se
216219

217220
final String setting = (String) result.get(settingName);
218221
if (StringUtils.isEmpty(setting)) {
219-
AzureMessager.getMessager().info(settingIsEmptyMessage);
222+
messenger.info(settingIsEmptyMessage);
220223
} else if (!setting.equals(settingValue)) {
221-
AzureMessager.getMessager().warning(String.format(changeSettingMessage, setting));
224+
messenger.warning(String.format(changeSettingMessage, setting));
222225
}
223226
result.put(settingName, settingValue);
224227
}

0 commit comments

Comments
 (0)