Fix NPE in web app run configuration

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/WebAppConfiguration.java

@@ -16,6 +16,7 @@
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.InvalidDataException;
+import com.intellij.openapi.util.WriteExternalException;
 import com.microsoft.azure.toolkit.intellij.common.AzureArtifact;
 import com.microsoft.azure.toolkit.intellij.common.AzureArtifactManager;
 import com.microsoft.azure.toolkit.intellij.common.AzureArtifactType;
@@ -84,6 +85,12 @@ public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEn
         return new WebAppRunState(getProject(), this);
     }
 
+    @Override
+    public void writeExternal(Element element) throws WriteExternalException {
+        element.getChildren().forEach(child -> element.removeChild(child.getName()));
+        super.writeExternal(element);
+    }
+
     @Override
     public void readExternal(final Element element) throws InvalidDataException {
         super.readExternal(element);

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/WebAppRunState.java

@@ -29,6 +29,7 @@
 import com.microsoft.azuretools.utils.WebAppUtils;
 import com.microsoft.intellij.RunProcessHandler;
 import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.compress.utils.FileNameUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -49,6 +50,7 @@
 import static com.microsoft.intellij.ui.messages.AzureBundle.message;
 
 public class WebAppRunState extends AzureRunProfileState<IAppService> {
+    private File artifact;
     private WebAppConfiguration webAppConfiguration;
     private final IntelliJWebAppSettingModel webAppSettingModel;
 
@@ -65,14 +67,13 @@ public WebAppRunState(Project project, WebAppConfiguration webAppConfiguration)
     @Override
     @AzureOperation(name = "webapp.deploy_artifact", params = {"this.webAppConfiguration.getWebAppName()"}, type = AzureOperation.Type.ACTION)
     public IAppService executeSteps(@NotNull RunProcessHandler processHandler, @NotNull Operation operation) throws Exception {
-        File file = new File(getTargetPath());
-        if (!file.exists()) {
-            throw new FileNotFoundException(message("webapp.deploy.error.noTargetFile", file.getAbsolutePath()));
+        artifact = new File(getTargetPath());
+        if (!artifact.exists()) {
+            throw new FileNotFoundException(message("webapp.deploy.error.noTargetFile", artifact.getAbsolutePath()));
         }
-        webAppConfiguration.setTargetName(file.getName());
         final IWebAppBase deployTarget = getOrCreateDeployTargetFromAppSettingModel(processHandler);
         updateApplicationSettings(deployTarget, processHandler);
-        AzureWebAppMvpModel.getInstance().deployArtifactsToWebApp(deployTarget, file, webAppSettingModel.isDeployToRoot(), processHandler);
+        AzureWebAppMvpModel.getInstance().deployArtifactsToWebApp(deployTarget, artifact, webAppSettingModel.isDeployToRoot(), processHandler);
         return deployTarget;
     }
 
@@ -118,9 +119,8 @@ protected void onSuccess(IAppService result, @NotNull RunProcessHandler processH
             AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, result));
         }
         updateConfigurationDataModel(result);
-        int indexOfDot = webAppSettingModel.getTargetName().lastIndexOf(".");
-        final String fileName = webAppSettingModel.getTargetName().substring(0, indexOfDot);
-        final String fileType = webAppSettingModel.getTargetName().substring(indexOfDot + 1);
+        final String fileName = FileNameUtils.getBaseName(artifact.getName());
+        final String fileType = FileNameUtils.getExtension(artifact.getName());
         final String url = getUrl(result, fileName, fileType);
         processHandler.setText(message("appService.deploy.hint.succeed"));
         processHandler.setText("URL: " + url);

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppDeployConfigurationPanel.java

@@ -225,8 +225,10 @@ private synchronized void fillDeploymentSlots(List<IWebAppDeploymentSlot> slotLi
     @Override
     public void setValue(WebAppDeployRunConfigurationModel data) {
         // artifact
-        Optional.ofNullable(data.getArtifactConfig()).map(config -> AzureArtifactManager.getInstance(this.project)
-                .getAzureArtifactById(AzureArtifactType.valueOf(config.getArtifactType()), config.getArtifactIdentifier()))
+        Optional.ofNullable(data.getArtifactConfig())
+                .filter(config -> !StringUtils.isAnyEmpty(config.getArtifactIdentifier(), config.getArtifactType()))
+                .map(config -> AzureArtifactManager.getInstance(this.project)
+                        .getAzureArtifactById(AzureArtifactType.valueOf(config.getArtifactType()), config.getArtifactIdentifier()))
                 .ifPresent(artifact -> comboBoxArtifact.setArtifact(artifact));
         // web app
         Optional.ofNullable(data.getWebAppConfig()).ifPresent(webApp -> {

PluginsAndFeatures/azure-toolkit-for-intellij/src/main/java/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/slimui/WebAppSlimSettingPanel.java

@@ -91,6 +91,9 @@ protected JLabel getLblMavenProject() {
 
     @Override
     protected void resetFromConfig(@NotNull WebAppConfiguration configuration) {
+        if (StringUtils.isAllEmpty(configuration.getWebAppId(), configuration.getWebAppName())) {
+            return;
+        }
         final Subscription subscription = Subscription.builder().id(configuration.getSubscriptionId()).build();
         final ResourceGroup resourceGroup = configuration.isCreatingResGrp() ?
                 new DraftResourceGroup(subscription, configuration.getResourceGroup()) :
@@ -104,9 +107,9 @@ protected void resetFromConfig(@NotNull WebAppConfiguration configuration) {
                 AppServicePlanEntity.builder().id(configuration.getAppServicePlanId()).build();
         final DeploymentSlotConfig slotConfig = !configuration.isDeployToSlot() ? null :
                 StringUtils.equals(configuration.getSlotName(), Constants.CREATE_NEW_SLOT) ?
-                        DeploymentSlotConfig.builder().name(configuration.getNewSlotName())
+                        DeploymentSlotConfig.builder().newCreate(true).name(configuration.getNewSlotName())
                                 .configurationSource(configuration.getNewSlotConfigurationSource()).build() :
-                        DeploymentSlotConfig.builder().name(configuration.getSlotName()).build();
+                        DeploymentSlotConfig.builder().newCreate(false).name(configuration.getSlotName()).build();
         final DiagnosticConfig diagnosticConfig = DiagnosticConfig.builder()
                 .enableApplicationLog(configuration.getModel().isEnableApplicationLog())
                 .applicationLogLevel(LogLevel.fromString(configuration.getModel().getApplicationLogLevel()))
@@ -127,19 +130,19 @@ protected void resetFromConfig(@NotNull WebAppConfiguration configuration) {
                 configBuilder.region(region).pricingTier(pricingTier).monitorConfig(monitorConfig).build();
         final AzureArtifactConfig artifactConfig = AzureArtifactConfig.builder()
                 .artifactIdentifier(configuration.getArtifactIdentifier())
-                .artifactType(configuration.getAzureArtifactType().name()).build();
+                .artifactType(Optional.ofNullable(configuration.getAzureArtifactType()).map(AzureArtifactType::name).orElse(null)).build();
         final WebAppDeployRunConfigurationModel runConfigurationModel = WebAppDeployRunConfigurationModel.builder()
                 .webAppConfig(webAppConfig)
                 .artifactConfig(artifactConfig)
                 .deployToRoot(configuration.isDeployToRoot())
                 .slotPanelVisible(configuration.isSlotPanelVisible())
                 .openBrowserAfterDeployment(configuration.isOpenBrowserAfterDeployment()).build();
-        pnlDeployment.setData(runConfigurationModel);
+        pnlDeployment.setValue(runConfigurationModel);
     }
 
     @Override
     protected void apply(@NotNull WebAppConfiguration configuration) {
-        final WebAppDeployRunConfigurationModel runConfigurationModel = pnlDeployment.getData();
+        final WebAppDeployRunConfigurationModel runConfigurationModel = pnlDeployment.getValue();
         Optional.ofNullable(runConfigurationModel.getWebAppConfig()).ifPresent(webAppConfig -> {
             configuration.setWebAppId(webAppConfig.getResourceId());
             configuration.setSubscriptionId(webAppConfig.getSubscriptionId());