Merge branch 'endgame-202211' into endgame-202211.next

wangmingliang-ms · wangmingliang-ms · commit 755f83714120 · 2022-12-02T17:36:03.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/dbtools/AzureCosmosDbAccountParamEditor.java b/PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-cosmos/src/main/java/com/microsoft/azure/toolkit/intellij/cosmos/dbtools/AzureCosmosDbAccountParamEditor.java
@@ -83,8 +83,7 @@ public AzureCosmosDbAccountParamEditor(@Nonnull DatabaseAccountKind kind, @Nonnu
         combox.addValueChangedListener(this::setAccount);
         interchange.addPersistentProperty(KEY_COSMOS_ACCOUNT_ID);
         final String accountId = interchange.getProperty(KEY_COSMOS_ACCOUNT_ID);
-        final boolean isModifying = StringUtils.isNotBlank(dataSource.getUsername());
-        if (isModifying && StringUtils.isNotBlank(accountId)) {
+        if (StringUtils.isNotBlank(accountId)) {
             combox.setValue(new AzureComboBox.ItemReference<>(i -> i.getId().equals(accountId)));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,7 @@ public AzureCosmosDbAccountParamEditor(@Nonnull DatabaseAccountKind kind, @Nonnu`
`83`	`83`	`combox.addValueChangedListener(this::setAccount);`
`84`	`84`	`interchange.addPersistentProperty(KEY_COSMOS_ACCOUNT_ID);`
`85`	`85`	`final String accountId = interchange.getProperty(KEY_COSMOS_ACCOUNT_ID);`
`86`		`- final boolean isModifying = StringUtils.isNotBlank(dataSource.getUsername());`
`87`		`- if (isModifying && StringUtils.isNotBlank(accountId)) {`
	`86`	`+ if (StringUtils.isNotBlank(accountId)) {`
`88`	`87`	`combox.setValue(new AzureComboBox.ItemReference<>(i -> i.getId().equals(accountId)));`
`89`	`88`	`}`
`90`	`89`