fix: 'Class initialization must not depend on service' (redhat-developer#921)

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

Author: adietish

src/main/java/org/jboss/tools/intellij/openshift/oauth/AccountService.java

@@ -28,8 +28,6 @@ public class AccountService {
 
   private static final AccountService INSTANCE = new AccountService();
 
-  private final LoginProvider provider = LoginProvider.get();
-
   private IAccountModel model;
 
   private AccountService() {
@@ -109,7 +107,9 @@ public String getToken(String serverId, int tokenType, Object context) {
     }
   }
 
+
   private String performLogin(IAuthorizationServer server, IAccount account, int tokenType, Object context) {
+    LoginProvider provider = LoginProvider.get();
     if (null != provider) {
       LoginResponse response = provider.login(server, context);
       if (null != response) {

src/main/java/org/jboss/tools/intellij/openshift/oauth/model/AccountModel.java

@@ -17,8 +17,6 @@
 
 public class AccountModel implements IAccountModel {
 
-    private final ServersRepository repository = ApplicationManager.getApplication().getService(ServersRepository.class);
-
 	@Override
 	public IAuthorizationServer createAuthorizationServer(String id) {
         return new AuthorizationServer(id);
@@ -34,6 +32,7 @@ private IAuthorizationServer merge(ServerExtensionPoint registeredServer, Author
 
 	@Override
 	public List<IAuthorizationServer> getAuthorizationServers() {
+		ServersRepository repository = ApplicationManager.getApplication().getService(ServersRepository.class);
 		List<IAuthorizationServer> servers = repository.getServers();
 		List<ServerExtensionPoint> registeredServers = ServerExtensionPoint.EP_NAME.getExtensionList();
 		List<IAuthorizationServer> nservers = registeredServers

src/main/java/org/jboss/tools/intellij/openshift/tree/application/ApplicationsRootNode.java

@@ -320,6 +320,7 @@ public ApplicationsRootNode getRoot() {
   @Override
   public void dispose() {
     disposeClientAwareCLIs();
+    client.close();
   }
 
   protected KubernetesClient getClient() {