simplified usage/async download of odo (#536)

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

Author: adietish

build.gradle

@@ -113,7 +113,7 @@ dependencies {
             'org.apache.commons:commons-compress:1.21',
             'org.apache.commons:commons-exec:1.3',
             'org.apache.commons:commons-lang3:3.9',
-            'com.redhat.devtools.intellij:intellij-common:1.9.1',
+            'com.redhat.devtools.intellij:intellij-common:1.9.3-SNAPSHOT',
             'io.jsonwebtoken:jjwt-impl:0.11.2',
             'io.jsonwebtoken:jjwt-jackson:0.11.2',
             'org.keycloak:keycloak-installed-adapter:20.0.5',

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

@@ -20,14 +20,19 @@
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsRootNode;
 import org.jboss.tools.intellij.openshift.tree.application.ApplicationsTreeStructure;
 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 {
 
-    protected TelemetrySender telemetrySender;
+  private static final Logger LOGGER = LoggerFactory.getLogger(OdoAction.class);
+
+  protected TelemetrySender telemetrySender;
 
   protected OdoAction(Class... filters) {
     super(filters);
@@ -36,15 +41,35 @@ 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) {
-        Tree tree = getTree(anActionEvent);
-        return ((ApplicationsRootNode) ((ApplicationsTreeStructure) tree.getClientProperty(Constants.STRUCTURE_PROPERTY)).getApplicationsRoot()).getOdo();
+        try {
+          Tree tree = getTree(anActionEvent);
+          if (tree == null) {
+            return null;
+          }
+          ApplicationsTreeStructure structure = (ApplicationsTreeStructure) tree.getClientProperty(Constants.STRUCTURE_PROPERTY);
+          if (structure == null) {
+            return null;
+          }
+          ApplicationsRootNode root = (ApplicationsRootNode) structure.getApplicationsRoot();
+          if (root == null) {
+            return null;
+          }
+          return root.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

@@ -16,6 +16,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;
 
@@ -25,7 +26,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

@@ -16,6 +16,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;
 import java.util.concurrent.CompletableFuture;
@@ -31,7 +32,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) {
     CompletableFuture.runAsync(() -> {
       try {
         odo.about();

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

@@ -14,6 +14,7 @@
 import com.intellij.openapi.ui.Messages;
 import com.redhat.devtools.intellij.common.utils.UIHelper;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
@@ -26,7 +27,7 @@ public class ListComponentsAction extends LoggedInClusterAction {
   protected String getTelemetryActionName() { return "list components"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     CompletableFuture.runAsync(() -> {
       try {
         odo.listComponents();

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

@@ -14,6 +14,7 @@
 import com.intellij.openapi.ui.Messages;
 import com.redhat.devtools.intellij.common.utils.UIHelper;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
@@ -26,7 +27,7 @@ public class ListServicesAction extends LoggedInClusterAction {
     protected String getTelemetryActionName() { return "list services"; }
 
      @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
+    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         CompletableFuture.runAsync(() -> {
             try {
                 odo.listServices();

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

@@ -17,6 +17,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;
 import java.util.concurrent.CompletableFuture;
@@ -33,25 +34,24 @@ public LoginAction() {
     protected String getTelemetryActionName() { return "login to cluster"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, Odo odo) {
-    ApplicationsRootNode clusterNode = (ApplicationsRootNode) selected;
+  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     CompletableFuture.runAsync(() -> {
-        try {
-          LoginDialog loginDialog = UIHelper.executeInUI(() -> {
-            LoginDialog dialog = new LoginDialog(anActionEvent.getProject(), null, clusterNode.getOdo().getMasterUrl().toString());
-            dialog.show();
-            return dialog;
-            });
-          if (loginDialog.isOK()) {
-            odo.login(loginDialog.getClusterURL(), loginDialog.getUserName(), loginDialog.getPassword(), loginDialog.getToken());
-            sendTelemetryResults(TelemetryResult.SUCCESS);
-          } else {
-            sendTelemetryResults(TelemetryResult.ABORTED);
-          }
-        } catch (IOException e) {
-          sendTelemetryError(e);
-          UIHelper.executeInUI(() -> Messages.showErrorDialog("Error: " + e.getLocalizedMessage(), "Login"));
+      try {
+        LoginDialog loginDialog = UIHelper.executeInUI(() -> {
+          LoginDialog dialog = new LoginDialog(anActionEvent.getProject(), null, odo.getMasterUrl().toString());
+          dialog.show();
+          return dialog;
+        });
+        if (loginDialog.isOK()) {
+          odo.login(loginDialog.getClusterURL(), loginDialog.getUserName(), loginDialog.getPassword(), loginDialog.getToken());
+          sendTelemetryResults(TelemetryResult.SUCCESS);
+        } else {
+          sendTelemetryResults(TelemetryResult.ABORTED);
         }
-      });
+      } catch (IOException e) {
+        sendTelemetryError(e);
+        UIHelper.executeInUI(() -> Messages.showErrorDialog("Error: " + e.getLocalizedMessage(), "Login"));
+      }
+    });
   }
 }

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);