Remove outdated properties from web app setting model

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.webapp/src/com/microsoft/azuretools/webapp/ui/AppServiceCreateDialog.java

@@ -1121,7 +1121,7 @@ protected void fillJavaVersion() {
     private void recordUserSettings() {
         try {
             CommonUtils.setPreference(CommonUtils.SUBSCRIPTION, getSelectedItem(comboSubscription));
-            CommonUtils.setPreference(CommonUtils.RUNTIME_OS, model.getOS().toString());
+            CommonUtils.setPreference(CommonUtils.RUNTIME_OS, model.getOperatingSystem());
             CommonUtils.setPreference(CommonUtils.RUNTIME_LINUX, getSelectedItem(comboLinuxRuntime));
             CommonUtils.setPreference(CommonUtils.RUNTIME_JAVAVERSION, getSelectedItem(cbJavaVersion));
             CommonUtils.setPreference(CommonUtils.RUNTIME_WEBCONTAINER, getSelectedItem(comboWebContainer));

Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/WebAppSettingModel.java

@@ -5,10 +5,9 @@
 
 package com.microsoft.azuretools.core.mvp.model.webapp;
 
-import com.azure.resourcemanager.appservice.models.JavaVersion;
 import com.azure.resourcemanager.appservice.models.LogLevel;
-import com.azure.resourcemanager.appservice.models.OperatingSystem;
-import com.azure.resourcemanager.appservice.models.RuntimeStack;
+import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
+import com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem;
 import com.microsoft.azure.toolkit.lib.appservice.model.Runtime;
 import com.microsoft.azure.toolkit.lib.appservice.model.WebContainer;
 import com.microsoft.azuretools.telemetry.TelemetryConstants;
@@ -46,16 +45,6 @@ public class WebAppSettingModel {
     private String appServicePlanId = "";
     private String region = "";
     private String pricing = "";
-    @Deprecated
-    private String webContainer = "";
-    @Deprecated
-    private OperatingSystem os = OperatingSystem.LINUX;
-    @Deprecated
-    private JavaVersion jdkVersion = JavaVersion.JAVA_8_NEWEST;
-    @Deprecated
-    private String stack = "TOMCAT";
-    @Deprecated
-    private String version = "8.5-jre8";
 
     // todo: change string values to app service library model
     private String operatingSystem;
@@ -72,24 +61,9 @@ public class WebAppSettingModel {
     private boolean enableApplicationLog = false;
     private String applicationLogLevel = LogLevel.ERROR.toString();
 
-    @Deprecated
-    public RuntimeStack getLinuxRuntime() {
-        return new RuntimeStack(this.stack, this.version);
-    }
-
-    @Deprecated
-    public OperatingSystem getOS() {
-        return this.os;
-    }
-
-    @Deprecated
-    public void setOS(OperatingSystem os) {
-        this.os = os;
-    }
-
     public Runtime getRuntime() {
         if (StringUtils.isAllEmpty(operatingSystem, webAppContainer, webAppJavaVersion)) {
-            return parseRuntimeFromDeprecatedConfiguration();
+            return null;
         }
         final com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem system =
                 com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem.fromString(operatingSystem);
@@ -100,22 +74,9 @@ public Runtime getRuntime() {
     }
 
     public void saveRuntime(Runtime runtime) {
-        this.operatingSystem = runtime.getOperatingSystem().getValue();
-        this.webAppContainer = runtime.getWebContainer().getValue();
-        this.webAppJavaVersion = runtime.getJavaVersion().getValue();
-    }
-
-    private Runtime parseRuntimeFromDeprecatedConfiguration() {
-        final com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem system =
-                com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem.fromString(this.os.name());
-        if (system == com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem.LINUX) {
-            return Runtime.getRuntimeFromLinuxFxVersion(getLinuxRuntime().toString());
-        }
-        final com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion javaVersion =
-                com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion.fromString(getJdkVersion().toString());
-        final com.microsoft.azure.toolkit.lib.appservice.model.WebContainer container =
-                com.microsoft.azure.toolkit.lib.appservice.model.WebContainer.fromString(getWebContainer());
-        return Runtime.getRuntime(com.microsoft.azure.toolkit.lib.appservice.model.OperatingSystem.WINDOWS, container, javaVersion);
+        this.operatingSystem = Optional.ofNullable(runtime).map(Runtime::getOperatingSystem).map(OperatingSystem::getValue).orElse(null);
+        this.webAppContainer = Optional.ofNullable(runtime).map(Runtime::getWebContainer).map(WebContainer::getValue).orElse(null);
+        this.webAppJavaVersion = Optional.ofNullable(runtime).map(Runtime::getJavaVersion).map(JavaVersion::getValue).orElse(null);
     }
 
     public Map<String, String> getTelemetryProperties(Map<String, String> properties) {