Merge pull request #5078 from microsoft/fixes/webAppJavaVersion

Fix serialization of JavaVersion in WebAppConfiguration

Author: Flanker32

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

@@ -14,6 +14,8 @@
 import com.intellij.openapi.options.ConfigurationException;
 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.management.appservice.JavaVersion;
 import com.microsoft.azure.management.appservice.OperatingSystem;
 import com.microsoft.azure.management.appservice.RuntimeStack;
@@ -29,10 +31,12 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
+import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Map;
+import java.util.Optional;
 
 import static com.microsoft.intellij.ui.messages.AzureBundle.message;
 
@@ -43,6 +47,7 @@ public class WebAppConfiguration extends AzureRunConfigurationBase<IntelliJWebAp
     private static final String TOMCAT = "tomcat";
     private static final String JAVA = "java";
     private static final String JBOSS = "jboss";
+    public static final String JAVA_VERSION = "javaVersion";
     private final IntelliJWebAppSettingModel webAppSettingModel;
     @Getter
     @Setter
@@ -71,6 +76,23 @@ public RunProfileState getState(@NotNull Executor executor, @NotNull ExecutionEn
         return new WebAppRunState(getProject(), this);
     }
 
+    @Override
+    public void readExternal(final Element element) throws InvalidDataException {
+        super.readExternal(element);
+        Optional.ofNullable(element.getChild(JAVA_VERSION))
+                .map(javaVersionElement -> javaVersionElement.getAttributeValue(JAVA_VERSION))
+                .ifPresent(javaVersion -> webAppSettingModel.setJdkVersion(JavaVersion.fromString(javaVersion)));
+    }
+
+    @Override
+    public void writeExternal(final Element element) throws WriteExternalException {
+        super.writeExternal(element);
+        Optional.ofNullable(webAppSettingModel.getJdkVersion())
+                .map(JavaVersion::toString)
+                .map(javaVersion -> new Element(JAVA_VERSION).setAttribute(JAVA_VERSION, javaVersion))
+                .ifPresent(element::addContent);
+    }
+
     @Override
     public void validate() throws ConfigurationException {
         if (webAppSettingModel.isCreatingNew()) {