fix: dont NPE if initializing odo fails (#536) (#589)

* fixed NPE
* preserve error that possibly happens
* simplified usage/async download of odo

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

src/it/java/org/jboss/tools/intellij/openshift/utils/odo/OdoCliTest.java

@@ -14,8 +14,6 @@
 import com.intellij.testFramework.fixtures.BasePlatformTestCase;
 import com.redhat.devtools.intellij.common.utils.MessagesHelper;
 import org.apache.commons.io.FileUtils;
-import org.junit.After;
-import org.junit.Before;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,7 +24,6 @@
 
 import static org.awaitility.Awaitility.await;
 import static org.awaitility.Awaitility.with;
-import static org.junit.Assert.assertNotNull;
 
 
 public abstract class OdoCliTest extends BasePlatformTestCase {

src/main/java/org/jboss/tools/intellij/openshift/actions/OdoAction.java

@@ -16,13 +16,18 @@
 import org.jboss.tools.intellij.openshift.telemetry.TelemetrySender;
 import org.jboss.tools.intellij.openshift.telemetry.TelemetryService;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.swing.tree.TreePath;
 
 import static org.jboss.tools.intellij.openshift.telemetry.TelemetryService.PREFIX_ACTION;
 
 public abstract class OdoAction extends StructureTreeAction implements TelemetryHandler {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(OdoAction.class);
+
   protected TelemetrySender telemetrySender;
 
   protected OdoAction(Class... filters) {
@@ -32,14 +37,23 @@ protected OdoAction(Class... filters) {
     @Override
     public void actionPerformed(AnActionEvent anActionEvent, TreePath path, Object selected) {
         telemetrySender = new TelemetrySender(PREFIX_ACTION + getTelemetryActionName());
-        this.actionPerformed(anActionEvent, (Object) getElement(selected), getOdo(anActionEvent));
+        Odo odo = getOdo(anActionEvent);
+        if (odo == null) {
+          return;
+        }
+        this.actionPerformed(anActionEvent, (Object) getElement(selected), odo);
     }
 
     private Odo getOdo(AnActionEvent anActionEvent) {
-        return ActionUtils.getApplicationRootNode(anActionEvent).getOdo();
+        try {
+          return ActionUtils.getApplicationRootNode(anActionEvent).getOdo().getNow(null);
+        } catch(Exception e) {
+          LOGGER.warn("Could not get odo: " + e.getMessage(), e);
+          return null;
+        }
     }
 
-    public abstract void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo);
+    public abstract void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo);
 
     protected abstract String getTelemetryActionName();
 

src/main/java/org/jboss/tools/intellij/openshift/actions/OpenGettingStartedAction.java

@@ -16,6 +16,7 @@
 import com.intellij.openapi.wm.ToolWindowManager;
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsRootNode;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
 
 public class OpenGettingStartedAction extends OdoAction {
     private static final String GETTING_STARTED_WINDOW_ID = "OpenShiftGettingStarted";
@@ -30,7 +31,7 @@ protected String getTelemetryActionName() {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         Project project = anActionEvent.getProject();
         if (project == null) {
             return;

src/main/java/org/jboss/tools/intellij/openshift/actions/binding/DeleteBindingAction.java

@@ -17,6 +17,7 @@
 import org.jboss.tools.intellij.openshift.telemetry.TelemetryService;
 import org.jboss.tools.intellij.openshift.tree.application.BindingNode;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
@@ -26,7 +27,7 @@ public DeleteBindingAction() {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         try {
             BindingNode node = (BindingNode) selected;
             if (Messages.NO == Messages.showYesNoDialog("Delete binding '" + node.getName() + "'.\nAre you sure?",

src/main/java/org/jboss/tools/intellij/openshift/actions/binding/ShowBindingDetailsAction.java

@@ -16,14 +16,15 @@
 import org.jboss.tools.intellij.openshift.tree.application.BindingNode;
 import org.jboss.tools.intellij.openshift.ui.binding.BindingDetailDialog;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
 
 public class ShowBindingDetailsAction extends OdoAction {
     public ShowBindingDetailsAction() {
         super(BindingNode.class);
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         BindingNode node = (BindingNode) selected;
         BindingDetailDialog dialog = new BindingDetailDialog(anActionEvent.getProject(), null, node.getBinding());
         dialog.show();

src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/AboutAction.java

@@ -17,6 +17,7 @@
 import org.jboss.tools.intellij.openshift.actions.OdoAction;
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsRootNode;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
@@ -32,7 +33,7 @@ public AboutAction() {
   protected String getTelemetryActionName() { return "about"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     runWithProgress((ProgressIndicator progress) -> {
       try {
         odo.about();

src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/LoginAction.java

@@ -18,6 +18,7 @@
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsRootNode;
 import org.jboss.tools.intellij.openshift.ui.cluster.LoginDialog;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
@@ -36,12 +37,12 @@ public LoginAction() {
     protected String getTelemetryActionName() { return "login to cluster"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ApplicationsRootNode clusterNode = (ApplicationsRootNode) selected;
     runWithProgress((ProgressIndicator progress) -> {
         try {
           LoginDialog loginDialog = UIHelper.executeInUI(() -> {
-            LoginDialog dialog = new LoginDialog(anActionEvent.getProject(), null, clusterNode.getOdo().getMasterUrl().toString());
+            LoginDialog dialog = new LoginDialog(anActionEvent.getProject(), null, odo.getMasterUrl().toString());
             dialog.show();
             return dialog;
             });
@@ -64,6 +65,7 @@ public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo od
         }
       },
       "Logging in...",
-      getEventProject(anActionEvent));
+      getEventProject(anActionEvent)
+    );
   }
 }

src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/OpenConsoleAction.java

@@ -14,6 +14,7 @@
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.ui.Messages;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
@@ -25,7 +26,7 @@ public class OpenConsoleAction extends LoggedInClusterAction {
   protected String getTelemetryActionName() { return "open console"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     try {
       String url = odo.consoleURL();
       BrowserUtil.open(url);

src/main/java/org/jboss/tools/intellij/openshift/actions/component/CreateComponentAction.java

@@ -53,15 +53,19 @@ public static void execute(ParentableNode<?> parentNode) {
     CreateComponentAction action = (CreateComponentAction) ActionManager.getInstance().getAction(CreateComponentAction.class.getName());
     NamespaceNode namespaceNode = (NamespaceNode) parentNode;
     action.telemetrySender = new TelemetrySender(PREFIX_ACTION + action.getTelemetryActionName());
-    action.doActionPerformed(namespaceNode, namespaceNode.getRoot().getOdo(), namespaceNode.getName(),
-        namespaceNode.getRoot(), namespaceNode.getRoot().getProject());
+    Odo odo = namespaceNode.getRoot().getOdo().getNow(null);
+    if (odo == null) {
+      return;
+    }
+    action.doActionPerformed(namespaceNode, odo, namespaceNode.getName(),
+              namespaceNode.getRoot(), namespaceNode.getRoot().getProject());
   }
 
   @Override
   protected String getTelemetryActionName() { return "create component"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     NamespaceNode namespaceNode = ((NamespaceNode) selected);
     ApplicationsRootNode rootNode = ((ParentableNode<Object>) selected).getRoot();
     Project project = rootNode.getProject();

src/main/java/org/jboss/tools/intellij/openshift/actions/component/DebugComponentAction.java

@@ -74,7 +74,7 @@ protected String getTelemetryActionName() {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         Project project = anActionEvent.getData(CommonDataKeys.PROJECT);
         if (project == null) {
             sendTelemetryResults(TelemetryResult.ABORTED);