redhat-developer · sbouchet · Dec 7, 2023 · Nov 10, 2023 · Nov 30, 2023 · Nov 30, 2023
diff --git a/src/it/java/org/jboss/tools/intellij/openshift/test/ui/AbstractBaseTest.java b/src/it/java/org/jboss/tools/intellij/openshift/test/ui/AbstractBaseTest.java
@@ -14,10 +14,10 @@
 import com.intellij.remoterobot.utils.WaitForConditionTimeoutException;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.idestatusbar.IdeStatusBar;
 import com.redhat.devtools.intellij.commonuitest.fixtures.mainidewindow.toolwindowspane.ToolWindowsPane;
+import org.jboss.tools.intellij.openshift.test.ui.annotations.UITest;
 import org.jboss.tools.intellij.openshift.test.ui.dialogs.ProjectStructureDialog;
 import org.jboss.tools.intellij.openshift.test.ui.junit.TestRunnerExtension;
 import org.jboss.tools.intellij.openshift.test.ui.runner.IdeaRunner;
-import org.jboss.tools.intellij.openshift.test.ui.annotations.UITest;
 import org.jboss.tools.intellij.openshift.test.ui.utils.ProjectUtility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -29,7 +29,7 @@
  */
 @ExtendWith(TestRunnerExtension.class)
 @UITest
-abstract public class AbstractBaseTest {
+public abstract class AbstractBaseTest {
 
     protected static RemoteRobot robot;
 

diff --git a/src/it/java/org/jboss/tools/intellij/openshift/utils/helm/HelmCliTest.java b/src/it/java/org/jboss/tools/intellij/openshift/utils/helm/HelmCliTest.java
@@ -15,22 +15,28 @@
 import org.jboss.tools.intellij.openshift.utils.ToolFactory;
 import org.jboss.tools.intellij.openshift.utils.odo.Odo;
 
+import java.util.Random;
 
 public abstract class HelmCliTest extends BasePlatformTestCase {
 
     protected Helm helm;
 
+    private String projectName = "prj-" + new Random().nextInt();
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         Odo odo = ToolFactory.getInstance().createOdo(getProject()).get();
         OdoCluster.INSTANCE.login(odo);
+        odo.createProject(projectName);
         this.helm = ToolFactory.getInstance().createHelm(getProject()).get();
         Charts.addRepository(Charts.REPOSITORY_STABLE, helm);
     }
 
     @Override
     protected void tearDown() throws Exception {
+        Odo odo = ToolFactory.getInstance().createOdo(getProject()).get();
+        odo.deleteProject(projectName);
         super.tearDown();
     }
 

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/GettingStartedToolWindow.java b/src/main/java/org/jboss/tools/intellij/openshift/GettingStartedToolWindow.java
@@ -144,7 +144,7 @@ private GettingStartedGroupLessons buildOpenShiftFuncLessons() {
                 gifStartDeployLesson
         );
 
-        GettingStartedGroupLessons groupLessons = new GettingStartedGroupLessons(
+        return new GettingStartedGroupLessons(
                 "Getting Started with OpenShift Toolkit",
                 "Start your application development on OpenShift or Kubernetes",
                 loginLesson,
@@ -153,7 +153,6 @@ private GettingStartedGroupLessons buildOpenShiftFuncLessons() {
                 startDevLesson,
                 startDebugLesson,
                 startDeployLesson);
-        return groupLessons;
     }
 
     private URL getLessonGif(String name) {

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/HelmAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/HelmAction.java
@@ -41,19 +41,19 @@ public void actionPerformed(AnActionEvent anActionEvent, TreePath path, Object s
         if (helm == null) {
           return;
         }
-        this.actionPerformed(anActionEvent, (Object) getElement(selected), helm);
+        this.actionPerformedOnSelectedObject(anActionEvent, getElement(selected), helm);
     }
 
     private Helm getHelm(AnActionEvent anActionEvent) {
         try {
-          return ActionUtils.getApplicationRootNode(anActionEvent).getHelm(true).getNow(null);
+            return ActionUtils.getApplicationRootNode(anActionEvent).getHelm(true).getNow(null);
         } catch(Exception e) {
           LOGGER.warn("Could not get helm: " + e.getMessage(), e);
           return null;
         }
     }
 
-    public abstract void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Helm helm);
+    public abstract void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Helm helm);
 
     protected abstract String getTelemetryActionName();
 

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/OdoAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/OdoAction.java
@@ -41,7 +41,7 @@ public void actionPerformed(AnActionEvent anActionEvent, TreePath path, Object s
         if (odo == null) {
           return;
         }
-        this.actionPerformed(anActionEvent, (Object) getElement(selected), odo);
+        this.actionPerformedOnSelectedObject(anActionEvent, getElement(selected), odo);
     }
 
     private Odo getOdo(AnActionEvent anActionEvent) {
@@ -53,7 +53,7 @@ private Odo getOdo(AnActionEvent anActionEvent) {
         }
     }
 
-    public abstract void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo);
+    public abstract void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo);
 
     protected abstract String getTelemetryActionName();
 

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/OpenGettingStartedAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/OpenGettingStartedAction.java
@@ -31,7 +31,7 @@ protected String getTelemetryActionName() {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         Project project = anActionEvent.getProject();
         if (project == null) {
             return;

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/binding/DeleteBindingAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/binding/DeleteBindingAction.java
@@ -27,7 +27,7 @@ public DeleteBindingAction() {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         try {
             BindingNode node = (BindingNode) selected;
             if (Messages.NO == Messages.showYesNoDialog("Delete binding '" + node.getName() + "'.\nAre you sure?",

diff --git a/...ain/java/org/jboss/tools/intellij/openshift/actions/binding/ShowBindingDetailsAction.java b/...ain/java/org/jboss/tools/intellij/openshift/actions/binding/ShowBindingDetailsAction.java
@@ -24,7 +24,7 @@ public ShowBindingDetailsAction() {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         BindingNode node = (BindingNode) selected;
         BindingDetailDialog dialog = new BindingDetailDialog(anActionEvent.getProject(), null, node.getBinding());
         dialog.show();

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/AboutAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/AboutAction.java
@@ -33,7 +33,7 @@ public AboutAction() {
   protected String getTelemetryActionName() { return "about"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     runWithProgress((ProgressIndicator progress) -> {
       try {
         odo.about();

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/LoginAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/LoginAction.java
@@ -37,7 +37,7 @@ public LoginAction() {
     protected String getTelemetryActionName() { return "login to cluster"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ApplicationsRootNode clusterNode = (ApplicationsRootNode) selected;
     runWithProgress((ProgressIndicator progress) -> {
         try {

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/OpenConsoleAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/cluster/OpenConsoleAction.java
@@ -26,7 +26,7 @@ public class OpenConsoleAction extends LoggedInClusterAction {
   protected String getTelemetryActionName() { return "open console"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     try {
       String url = odo.consoleURL();
       BrowserUtil.open(url);

diff --git a/...main/java/org/jboss/tools/intellij/openshift/actions/component/CreateComponentAction.java b/...main/java/org/jboss/tools/intellij/openshift/actions/component/CreateComponentAction.java
@@ -65,7 +65,7 @@ public static void execute(ParentableNode<?> parentNode) {
   protected String getTelemetryActionName() { return "create component"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     NamespaceNode namespaceNode = ((NamespaceNode) selected);
     ApplicationsRootNode rootNode = namespaceNode.getRoot();
     Project project = rootNode.getProject();

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/component/DebugComponentAction.java b/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, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         Project project = anActionEvent.getData(CommonDataKeys.PROJECT);
         if (project == null) {
             sendTelemetryResults(TelemetryResult.ABORTED);

diff --git a/...main/java/org/jboss/tools/intellij/openshift/actions/component/DeleteComponentAction.java b/...main/java/org/jboss/tools/intellij/openshift/actions/component/DeleteComponentAction.java
@@ -37,7 +37,7 @@ public DeleteComponentAction() {
   protected String getTelemetryActionName() { return "delete component"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ComponentNode componentNode = (ComponentNode) selected;
     Component component = componentNode.getComponent();
     NamespaceNode namespaceNode = componentNode.getParent();

diff --git a/...in/java/org/jboss/tools/intellij/openshift/actions/component/DescribeComponentAction.java b/...in/java/org/jboss/tools/intellij/openshift/actions/component/DescribeComponentAction.java
@@ -35,13 +35,7 @@ public DescribeComponentAction() {
   protected String getTelemetryActionName() { return "describe component"; }
 
   @Override
-  public boolean isVisible(Object selected) {
-    boolean visible = super.isVisible(selected);
-    return visible;
-  }
-
-  @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ComponentNode componentNode = (ComponentNode) selected;
     Component component = componentNode.getComponent();
     NamespaceNode namespaceNode = componentNode.getParent();

diff --git a/...ain/java/org/jboss/tools/intellij/openshift/actions/component/FeatureComponentAction.java b/...ain/java/org/jboss/tools/intellij/openshift/actions/component/FeatureComponentAction.java
@@ -86,7 +86,7 @@ protected String getTelemetryActionName() {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         ComponentNode componentNode = (ComponentNode) selected;
         Component component = componentNode.getComponent();
         NamespaceNode namespaceNode = componentNode.getParent();

diff --git a/...n/java/org/jboss/tools/intellij/openshift/actions/component/FollowLogComponentAction.java b/...n/java/org/jboss/tools/intellij/openshift/actions/component/FollowLogComponentAction.java
@@ -21,7 +21,7 @@ public class FollowLogComponentAction extends ShowLogComponentAction {
   protected String getTelemetryActionName() { return "follow component log"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     doLog((ComponentNode) selected, odo, true);
   }
 }
diff --git a/...main/java/org/jboss/tools/intellij/openshift/actions/component/ImportComponentAction.java b/...main/java/org/jboss/tools/intellij/openshift/actions/component/ImportComponentAction.java
@@ -48,7 +48,7 @@ public boolean isVisible(Object selected) {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         ComponentNode componentNode = (ComponentNode) selected;
         Component component = componentNode.getComponent();
         NamespaceNode namespaceNode = componentNode.getParent();

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/component/LinkComponentAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/component/LinkComponentAction.java
@@ -43,12 +43,6 @@ public LinkComponentAction() {
   @Override
   protected String getTelemetryActionName() { return "link component to component"; }
 
-  @Override
-  public boolean isVisible(Object selected) {
-    boolean visible = super.isVisible(selected);
-    return visible;
-  }
-
   protected String getSelectedTargetComponent(Odo odo, String project, String component) throws IOException {
     String targetComponent = null;
 
@@ -73,7 +67,7 @@ protected String getSelectedTargetComponent(Odo odo, String project, String comp
   }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ComponentNode componentNode = (ComponentNode) selected;
     Component sourceComponent = componentNode.getComponent();
     NamespaceNode namespaceNode = componentNode.getParent();

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/component/LinkServiceAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/component/LinkServiceAction.java
@@ -54,7 +54,7 @@ protected String getTelemetryActionName() {
 
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         ComponentNode componentNode = (ComponentNode) selected;
         Component component = componentNode.getComponent();
         NamespaceNode namespaceNode = componentNode.getParent();

diff --git a/...ain/java/org/jboss/tools/intellij/openshift/actions/component/ShowLogComponentAction.java b/...ain/java/org/jboss/tools/intellij/openshift/actions/component/ShowLogComponentAction.java
@@ -57,7 +57,7 @@ public boolean isVisible(Object selected) {
     }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         doLog((ComponentNode) selected, odo, false);
     }
 

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/helm/OpenHelmChartsAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/helm/OpenHelmChartsAction.java
@@ -22,7 +22,7 @@
 public class OpenHelmChartsAction extends HelmAction {
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Helm helm) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Helm helm) {
         Project project = getEventProject(anActionEvent);
         ChartsDialog dialog = new ChartsDialog((ApplicationsRootNode) selected, helm, project);
         sendTelemetryResults(TelemetryService.TelemetryResult.SUCCESS);

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/helm/UninstallReleaseAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/helm/UninstallReleaseAction.java
@@ -30,7 +30,7 @@
 public class UninstallReleaseAction extends HelmAction {
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Helm helm) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Helm helm) {
     Project project = getEventProject(anActionEvent);
     ChartReleaseNode releaseNode = (ChartReleaseNode) selected;
     if (releaseNode == null) {

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/project/CreateProjectAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/project/CreateProjectAction.java
@@ -48,7 +48,7 @@ public static void execute(ApplicationsRootNode rootNode) {
     action.doActionPerformed(rootNode, odo, rootNode.getProject());
   }
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ApplicationsRootNode clusterNode = (ApplicationsRootNode) selected;
     doActionPerformed(clusterNode, odo, getEventProject(anActionEvent));
   }

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/project/DeleteProjectAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/project/DeleteProjectAction.java
@@ -38,7 +38,7 @@ public DeleteProjectAction() {
   protected String getTelemetryActionName() { return "delete project"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     NamespaceNode namespaceNode = (NamespaceNode) selected;
     if (Messages.NO == Messages.showYesNoDialog("Delete Project '" + namespaceNode.getName() + "'.\nAre you sure?", "Delete Project",
         Messages.getQuestionIcon())) {

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/registry/CreateRegistryAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/registry/CreateRegistryAction.java
@@ -37,7 +37,7 @@ public CreateRegistryAction() {
     protected String getTelemetryActionName() { return "create registry"; }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         DevfileRegistriesNode registriesNode = (DevfileRegistriesNode) selected;
         try {
             List<DevfileRegistry> registries = ProgressManager.getInstance().

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/registry/DeleteRegistryAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/registry/DeleteRegistryAction.java
@@ -33,7 +33,7 @@ public DeleteRegistryAction() {
     protected String getTelemetryActionName() { return "delete registry"; }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         DevfileRegistryNode registryNode = (DevfileRegistryNode) selected;
         if (Messages.NO == Messages.showYesNoDialog("Delete registry '" + registryNode.getName() + "'.\nAre you sure?", "Delete registry",
                 Messages.getQuestionIcon())) {

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/service/CreateServiceAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/service/CreateServiceAction.java
@@ -39,7 +39,7 @@ public CreateServiceAction() {
     protected String getTelemetryActionName() { return "create service"; }
 
     @Override
-    public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+    public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
         NamespaceNode namespaceNode = (NamespaceNode) selected;
         if (namespaceNode == null) {
             return;

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/service/DeleteServiceAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/service/DeleteServiceAction.java
@@ -36,7 +36,7 @@ public DeleteServiceAction() {
   protected String getTelemetryActionName() { return "delete service"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ServiceNode serviceNode = (ServiceNode) selected;
     NamespaceNode namespaceNode = serviceNode.getParent();
     if (Messages.NO == Messages.showYesNoDialog(

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/service/DescribeServiceAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/service/DescribeServiceAction.java
@@ -34,7 +34,7 @@ public DescribeServiceAction() {
   protected String getTelemetryActionName() { return "describe service"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ServiceNode serviceNode = (ServiceNode) selected;
     NamespaceNode namespaceNode = serviceNode.getParent();
     runWithProgress((ProgressIndicator progress) -> {

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/service/LinkComponentAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/service/LinkComponentAction.java
@@ -44,7 +44,7 @@ public LinkComponentAction() {
   protected String getTelemetryActionName() { return "link service to component"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
     ServiceNode serviceNode = (ServiceNode) selected;
     NamespaceNode namespaceNode = serviceNode.getParent();
     runWithProgress((ProgressIndicator progress) -> {

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/actions/url/OpenInBrowserAction.java b/src/main/java/org/jboss/tools/intellij/openshift/actions/url/OpenInBrowserAction.java
@@ -29,7 +29,7 @@ public OpenInBrowserAction() {
   protected String getTelemetryActionName() { return "open URL"; }
 
   @Override
-  public void actionPerformed(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
+  public void actionPerformedOnSelectedObject(AnActionEvent anActionEvent, Object selected, @NotNull Odo odo) {
       BrowserUtil.open(getURL(((URLNode)selected).getUrl()));
       sendTelemetryResults(TelemetryResult.SUCCESS);
   }

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/oauth/AccountService.java b/src/main/java/org/jboss/tools/intellij/openshift/oauth/AccountService.java
@@ -39,7 +39,7 @@ public static AccountService getDefault() {
 		return INSTANCE;
 	}
 
-	public IAccountModel getModel() {
+	private IAccountModel getModel() {
 		if (null == model) {
 			model = new AccountModel();
 		}

diff --git a/src/main/java/org/jboss/tools/intellij/openshift/oauth/model/Account.java b/src/main/java/org/jboss/tools/intellij/openshift/oauth/model/Account.java
@@ -100,8 +100,9 @@ public String getToken(int tokenType) {
 	    return getAccessToken();
 	  case TokenProvider.REFRESH_TOKEN:
 	    return getRefreshToken();
+          default:
+              throw new IllegalStateException("Unexpected value: " + tokenType);
 	  }
-    return null;
   }
 
   @Override