Skip to content

Commit 323c86d

Browse files
deployment may not have artifact
1 parent c11fc86 commit 323c86d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ public class SpringCloudDeploymentConfiguration extends LocatableConfigurationBa
5656
@Getter
5757
@Nullable
5858
private SpringCloudApp app;
59+
@Nullable
5960
private ResourceId appId;
6061
@Setter
62+
@Nullable
6163
private AzureArtifact artifact;
6264

6365
public SpringCloudDeploymentConfiguration(@Nonnull Project project, @Nonnull ConfigurationFactory factory, String name) {
@@ -107,7 +109,7 @@ public void setDeployment(@Nullable SpringCloudDeploymentDraft deployment) {
107109
if (Objects.nonNull(deployment)) {
108110
this.app = deployment.getParent();
109111
this.appId = ResourceId.fromString(this.app.getId());
110-
this.artifact = ((WrappedAzureArtifact) deployment.getArtifact()).getArtifact();
112+
this.artifact = Optional.ofNullable((WrappedAzureArtifact) deployment.getArtifact()).map(WrappedAzureArtifact::getArtifact).orElse(null);
111113
}
112114
}
113115

@@ -117,7 +119,7 @@ public SpringCloudDeploymentDraft getDeployment() {
117119
if (Objects.nonNull(app)) {
118120
final SpringCloudDeployment d = Optional.ofNullable(app.getActiveDeployment()).orElseGet(() -> app.deployments().create("default", null));
119121
final SpringCloudDeploymentDraft deployment = (SpringCloudDeploymentDraft) (d.isDraft() ? d : d.update());
120-
deployment.setArtifact(new WrappedAzureArtifact(this.artifact, this.getProject()));
122+
Optional.ofNullable(this.artifact).map(a -> new WrappedAzureArtifact(a, this.getProject())).ifPresent(deployment::setArtifact);
121123
return deployment;
122124
}
123125
return null;

0 commit comments

Comments
 (0)