Skip to content

Commit fe38029

Browse files
fix params of @AzureOperation.
1 parent 53e3aab commit fe38029

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-springcloud/src/main/java/com/microsoft/azure/toolkit/intellij/springcloud/deplolyment/SpringCloudDeploymentConfigurationState.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import com.intellij.execution.ui.ConsoleView;
1717
import com.intellij.execution.ui.ConsoleViewContentType;
1818
import com.intellij.openapi.project.Project;
19-
import com.intellij.openapi.vfs.VfsUtil;
2019
import com.microsoft.azure.toolkit.ide.springcloud.SpringCloudActionsContributor;
2120
import com.microsoft.azure.toolkit.intellij.common.RunProcessHandler;
2221
import com.microsoft.azure.toolkit.intellij.common.messager.IntellijAzureMessager;
@@ -105,12 +104,12 @@ public void processTerminated(@Nonnull ProcessEvent event) {
105104
return new DefaultExecutionResult(consoleView, processHandler);
106105
}
107106

108-
@AzureOperation(name = "user/springcloud.deploy_app.app", params = {"this.config.getAppConfig().getAppName()"})
107+
@AzureOperation(name = "user/springcloud.deploy_app.app", params = {"this.config.getApp().getName()"})
109108
public SpringCloudDeployment execute(IAzureMessager messager) {
110109
OperationContext.current().setMessager(messager);
111110
OperationContext.current().setTelemetryProperties(getTelemetryProperties());
112111
final SpringCloudDeploymentDraft deployment = this.config.getDeployment();
113-
final Optional<File> opFile = Optional.ofNullable(deployment.getArtifact()).map(IArtifact::getFile);
112+
final Optional<File> opFile = Optional.ofNullable(deployment).map(SpringCloudDeploymentDraft::getArtifact).map(IArtifact::getFile);
114113
final Action.Id<Void> REOPEN = Action.Id.of("user/springcloud.reopen_deploy_dialog");
115114
final Action<Void> reopen = new Action<>(REOPEN).withHandler((v) -> DeploySpringCloudAppAction.deploy(this.config, this.project));
116115
if (opFile.isEmpty() || opFile.filter(File::exists).isEmpty()) {
@@ -196,7 +195,7 @@ private void waitUntilAppReady(SpringCloudDeployment springCloudDeployment) {
196195

197196
protected Map<String, String> getTelemetryProperties() {
198197
final Map<String, String> props = new HashMap<>();
199-
final SpringCloudDeploymentDraft deployment = config.getDeployment();
198+
final SpringCloudDeploymentDraft deployment = Objects.requireNonNull(config.getDeployment());
200199
props.put("runtime", String.valueOf(deployment.getRuntimeVersion()));
201200
props.put("subscriptionId", deployment.getSubscriptionId());
202201
props.put("public", String.valueOf(deployment.getParent().isPublicEndpointEnabled()));

0 commit comments

Comments
 (0)