Merge pull request #2259 from digma-ai/fix-nullable-env

make newEnv in environmentChanged nullable Closes #2257

Author: shalom938

ide-common/src/main/java/org/digma/intellij/plugin/analytics/Environment.java

@@ -187,6 +187,9 @@ public Env findById(@NotNull String envId) {
     }
 
     private Optional<Env> find(@Nullable String envIdToFind) {
+        if(envIdToFind == null){
+            return Optional.empty();
+        }
         return environments.stream().filter(env -> env.getId().equals(envIdToFind)).findFirst();
     }
 
@@ -223,7 +226,7 @@ private void notifyEnvironmentsListChange() {
     }
 
 
-    private void notifyEnvironmentChanged(Env oldEnv, Env newEnv) {
+    private void notifyEnvironmentChanged(@Nullable Env oldEnv, @Nullable Env newEnv) {
         if (project.isDisposed()) {
             return;
         }

ide-common/src/main/java/org/digma/intellij/plugin/analytics/EnvironmentChangeHandler.java

@@ -10,6 +10,7 @@
 import org.digma.intellij.plugin.log.Log;
 import org.digma.intellij.plugin.model.rest.environment.Env;
 import org.digma.intellij.plugin.psi.*;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -30,7 +31,7 @@ public EnvironmentChangeHandler(Project project) {
     //environmentChanged must run in a background thread.
     //when fired by the Environment object it is on background
     @Override
-    public void environmentChanged(Env newEnv) {
+    public void environmentChanged(@Nullable Env newEnv) {
 
         try {
 

ide-common/src/main/java/org/digma/intellij/plugin/analytics/EnvironmentChanged.java

@@ -2,6 +2,7 @@
 
 import com.intellij.util.messages.Topic;
 import org.digma.intellij.plugin.model.rest.environment.Env;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ public interface EnvironmentChanged {
     @com.intellij.util.messages.Topic.ProjectLevel
     Topic<EnvironmentChanged> ENVIRONMENT_CHANGED_TOPIC = Topic.create("ENVIRONMENT_CHANGED_TOPIC", EnvironmentChanged.class);
 
-    void environmentChanged(Env newEnv);
+    void environmentChanged(@Nullable Env newEnv);
 
     void environmentsListChanged(List<Env> newEnvironments);
 

ide-common/src/main/java/org/digma/intellij/plugin/document/CodeLensProviderDocumentInfoAndEnvironmentChangedListener.java

@@ -6,6 +6,7 @@
 import org.digma.intellij.plugin.common.Backgroundable;
 import org.digma.intellij.plugin.errorreporting.ErrorReporter;
 import org.digma.intellij.plugin.model.rest.environment.Env;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -32,7 +33,7 @@ public void documentInfoChanged(PsiFile psiFile) {
     }
 
     @Override
-    public void environmentChanged(Env newEnv) {
+    public void environmentChanged(@Nullable Env newEnv) {
         Backgroundable.executeOnPooledThread(() -> {
             try {
                 var changedPsiFiles = CodeLensProvider.getInstance(project).refresh();

ide-common/src/main/java/org/digma/intellij/plugin/psi/LanguageService.java

@@ -394,7 +394,7 @@ default String detectMethodBySpan(@NotNull Project project, String spanCodeObjec
     /**
      * let language services do something on environmentChanged. for example to update the current method context.
      */
-    default void environmentChanged(Env newEnv) {
+    default void environmentChanged(@Nullable Env newEnv) {
         //nothing to do , implement for specific languages if necessary
     }
 

src/main/kotlin/org/digma/intellij/plugin/ui/jcef/JCefComponent.kt

@@ -222,9 +222,11 @@ private constructor(
 
         project.messageBus.connect(parentDisposable).subscribe(
             EnvironmentChanged.ENVIRONMENT_CHANGED_TOPIC, object : EnvironmentChanged {
-                override fun environmentChanged(newEnv: Env) {
+                override fun environmentChanged(newEnv: Env?) {
                     try {
-                        sendCurrentEnvironment(jbCefBrowser.cefBrowser, newEnv)
+                        newEnv?.let {
+                            sendCurrentEnvironment(jbCefBrowser.cefBrowser, it)
+                        }
                     } catch (e: Throwable) {
                         ErrorReporter.getInstance().reportError("JCefComponent.environmentChanged", e)
                     }

src/main/kotlin/org/digma/intellij/plugin/ui/recentactivity/RecentActivityUpdater.kt

@@ -51,7 +51,7 @@ class RecentActivityUpdater(val project: Project) : Disposable {
 
     init {
         project.messageBus.connect(this).subscribe<EnvironmentChanged>(EnvironmentChanged.ENVIRONMENT_CHANGED_TOPIC, object : EnvironmentChanged {
-            override fun environmentChanged(newEnv: Env) {
+            override fun environmentChanged(newEnv: Env?) {
                 Backgroundable.ensurePooledThreadWithoutReadAccess { updateLatestActivities() }
             }