Restrct logic for config model in AppServiceComboBox

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceComboBox.java

@@ -12,8 +12,6 @@
 import com.microsoft.azure.toolkit.intellij.common.AzureComboBox;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
-import lombok.Getter;
-import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 import rx.Subscription;
 
@@ -26,8 +24,6 @@ public abstract class AppServiceComboBox<T extends AppServiceComboBoxModel> exte
     protected Project project;
     protected Subscription subscription;
 
-    @Getter
-    @Setter
     private T configModel;
 
     public AppServiceComboBox(final Project project) {
@@ -36,13 +32,18 @@ public AppServiceComboBox(final Project project) {
         this.setRenderer(new AppCombineBoxRender(this));
     }
 
+    public void setConfigModel(T configModel) {
+        this.configModel = configModel;
+        setValue(new ItemReference<>(item -> AppServiceComboBoxModel.isSameApp(item, configModel)));
+    }
+
     @NotNull
     @Override
     protected List<? extends T> loadItems() throws Exception {
         final List<T> items = loadAppServiceModels();
-        if (super.getItemReference() != null && configModel != null && configModel.isNewCreateResource()) {
-            final T target = items.stream().filter(model -> getItemReference().is(model)).findAny().orElse(null);
-            if (target == null) {
+        if (configModel != null && configModel.isNewCreateResource()) {
+            final boolean exist = items.stream().anyMatch(item -> AppServiceComboBoxModel.isSameApp(item, configModel));
+            if (!exist) {
                 items.add(configModel);
             }
         }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java

@@ -121,10 +121,6 @@ public void setValue(final ItemReference<T> val) {
         this.refreshValue();
     }
 
-    protected ItemReference<T> getItemReference() {
-        return this.value instanceof ItemReference ? (ItemReference<T>) this.value : null;
-    }
-
     private void refreshValue() {
         if (Objects.equals(this.value, this.getSelectedItem())) {
             return;

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/deploy/ui/FunctionDeploymentPanel.java

@@ -135,7 +135,6 @@ protected void resetFromConfig(@NotNull FunctionDeployConfiguration configuratio
             final FunctionAppComboBoxModel configModel = new FunctionAppComboBoxModel(configuration.getModel());
             appSettingsFunctionApp = configModel;
             functionAppComboBox.setConfigModel(configModel);
-            functionAppComboBox.setValue(new AzureComboBox.ItemReference<>(value -> AppServiceComboBoxModel.isSameApp(value, configModel)));
         }
         functionAppComboBox.refreshItems();
         final Module previousModule = configuration.getModule();

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

@@ -187,7 +187,6 @@ protected void resetFromConfig(@NotNull WebAppConfiguration configuration) {
         if (!StringUtils.isAllEmpty(configuration.getWebAppName(), configuration.getWebAppId())) {
             final WebAppComboBoxModel configModel = new WebAppComboBoxModel(configuration.getModel());
             comboBoxWebApp.setConfigModel(configModel);
-            comboBoxWebApp.setValue(new AzureComboBox.ItemReference<>(value -> AppServiceComboBoxModel.isSameApp(value, configModel)));
         }
         comboBoxWebApp.refreshItems();
         if (configuration.getAzureArtifactType() != null) {