handle null file configs (when removed) when notified of changes

this change is required by the change in ConfigWatcher at redhat-developer/intellij-common#202 Signed-off-by: Andre Dietisheim <[email protected]>
redhat-developer · Nov 22, 2023 · a49dbc5 · a49dbc5
1 parent 3e1cf9e
commit a49dbc5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,7 @@ sinceIdeaBuild=232
 projectVersion=1.2.1-SNAPSHOT
 jetBrainsToken=invalid
 jetBrainsChannel=stable
-intellijPluginVersion=1.15.0
+intellijPluginVersion=1.16.0
 intellijCommonVersion=1.9.3-SNAPSHOT
 telemetryPluginVersion=1.0.0.44
 kotlin.stdlib.default.dependency = false

diff --git a/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/AllContexts.kt b/src/main/kotlin/com/redhat/devtools/intellij/kubernetes/model/AllContexts.kt
@@ -245,12 +245,13 @@ open class AllContexts(
 		 * The latter gets closed/recreated whenever the context changes in
 		 * [com.redhat.devtools.intellij.kubernetes.model.client.KubeConfigAdapter].
 		 */
-		val watcher = ConfigWatcher(path) { _, config -> onKubeConfigChanged(config) }
+		val watcher = ConfigWatcher(path) { _, config: io.fabric8.kubernetes.api.model.Config? -> onKubeConfigChanged(config) }
 		runAsync(watcher::run)
 	}
 
-	protected open fun onKubeConfigChanged(fileConfig: io.fabric8.kubernetes.api.model.Config) {
+	protected open fun onKubeConfigChanged(fileConfig: io.fabric8.kubernetes.api.model.Config?) {
 		synchronized(this) {
+			fileConfig ?: return
 			val client = client.get() ?: return
 			val clientConfig = client.config.configuration
 			if (ConfigHelper.areEqual(fileConfig, clientConfig)) {

diff --git a/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/AllContextsTest.kt b/src/test/kotlin/com/redhat/devtools/intellij/kubernetes/model/AllContextsTest.kt
@@ -398,6 +398,15 @@ class AllContextsTest {
 		verify(modelChange, never()).fireCurrentNamespaceChanged(anyOrNull(), anyOrNull())
 	}
 
+	@Test
+	fun `#onKubeConfigChanged() should NOT fire if new config is null`() {
+		// given
+		// when
+		allContexts.onKubeConfigChanged(null)
+		// then
+		verify(modelChange, never()).fireAllContextsChanged()
+	}
+
 	@Test
 	fun `#onKubeConfigChanged() should NOT fire if existing config and given config are equal`() {
 		// given
@@ -550,7 +559,7 @@ class AllContextsTest {
 		}
 
 		/** override with public method so that it can be tested**/
-		public override fun onKubeConfigChanged(fileConfig: Config) {
+		public override fun onKubeConfigChanged(fileConfig: Config?) {
 			super.onKubeConfigChanged(fileConfig)
 		}