chore: be more reliable when detecting if a connection is valid

mongodb · Jun 28, 2024 · a984d25 · a984d25
1 parent 0701b9a
commit a984d25
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/...ages/jetbrains-plugin/src/main/kotlin/com/mongodb/jbplugin/editor/MdbJavaEditorToolbar.kt b/...ages/jetbrains-plugin/src/main/kotlin/com/mongodb/jbplugin/editor/MdbJavaEditorToolbar.kt
@@ -79,7 +79,7 @@ class MdbJavaEditorToolbar(
             model.addAll(value)
             selectDataSourceWithId(selectedItem)
         }
-        get() = (connectionComboBox.model as DefaultComboBoxModel<LocalDataSource>).asSequence().toList()
+        get() = (connectionComboBox.model as DefaultComboBoxModel<LocalDataSource>).asSequence().toList().filterNotNull()
 
     var selectedDataSource: LocalDataSource?
         set(value) {
@@ -98,7 +98,11 @@ class MdbJavaEditorToolbar(
         if (id == null) {
             connectionComboBox.selectedItem = null
         } else {
-            val dataSourceIndex = dataSources.indexOf { it.uniqueId == id }
+            val dataSourceIndex =
+                (connectionComboBox.model as DefaultComboBoxModel<LocalDataSource?>)
+                    .asSequence()
+                    .toList()
+                    .indexOf { it?.uniqueId == id }
             if (dataSourceIndex == -1) {
                 connectionComboBox.selectedItem = null
             } else {

diff --git a/.../main/kotlin/com/mongodb/jbplugin/accessadapter/datagrip/adapter/DataGripMongoDbDriver.kt b/.../main/kotlin/com/mongodb/jbplugin/accessadapter/datagrip/adapter/DataGripMongoDbDriver.kt
@@ -229,8 +229,9 @@ fun LocalDataSource.isConnected(): Boolean =
     DatabaseConnectionManager
         .getInstance()
         .activeConnections
-        .find {
-            it.connectionPoint.dataSource == dataSource
-        }.let {
-            runCatching { it?.remoteConnection?.isClosed == false && it.remoteConnection.isValid(5) }.getOrDefault(false)
+        .any {
+            it.connectionPoint.dataSource == dataSource &&
+                runCatching {
+                    !it.remoteConnection.isClosed && it.remoteConnection.isValid(5)
+                }.getOrDefault(false)
         }