Merge pull request eclipse-che#1200 from eclipse/CHE-1112_2

Che 1112 Remove che-core-api-account

Author: skabashnyuk

assembly/assembly-ide-war/pom.xml

@@ -56,10 +56,6 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-client-gwt-account</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-client-gwt-auth</artifactId>

assembly/assembly-ide-war/src/main/resources/org/eclipse/che/ide/IDE.gwt.xml

@@ -72,7 +72,6 @@
     <inherits name='org.eclipse.che.api.Git'/>
     <inherits name='org.eclipse.che.api.Project'/>
     <inherits name='org.eclipse.che.api.User'/>
-    <inherits name='org.eclipse.che.api.Account'/>
     <inherits name='org.eclipse.che.api.Factory'/>
     <inherits name="org.eclipse.che.api.Workspace"/>
     <inherits name="org.eclipse.che.api.Ssh"/>

assembly/assembly-wsmaster-war/pom.xml

@@ -50,10 +50,6 @@
             <groupId>javax.inject</groupId>
             <artifactId>javax.inject</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-api-account</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-auth</artifactId>

core/commons/che-core-commons-env/src/main/java/org/eclipse/che/commons/env/EnvironmentContext.java

@@ -56,7 +56,6 @@ public static void reset() {
 
     private boolean workspaceTemporary;
 
-    private String accountId;
 
     public EnvironmentContext() {
     }
@@ -65,7 +64,6 @@ public EnvironmentContext(EnvironmentContext other) {
         setUser(other.getUser());
         setWorkspaceName(other.getWorkspaceName());
         setWorkspaceId(other.getWorkspaceId());
-        setAccountId(other.getAccountId());
         setWorkspaceTemporary(other.isWorkspaceTemporary());
     }
 
@@ -94,14 +92,6 @@ public void setWorkspaceId(String workspaceId) {
         this.workspaceId = workspaceId;
     }
 
-    public String getAccountId() {
-        return accountId;
-    }
-
-    public void setAccountId(String accountId) {
-        this.accountId = accountId;
-    }
-
     public boolean isWorkspaceTemporary() {
         return workspaceTemporary;
     }

core/commons/che-core-commons-env/src/test/java/org/eclipse/che/commons/env/EnvironmentContextTest.java

@@ -14,23 +14,23 @@
 import org.eclipse.che.commons.user.UserImpl;
 import org.testng.annotations.Test;
 
-import static org.testng.Assert.*;
-
 import java.util.Collections;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
 public class EnvironmentContextTest {
 
     @Test
     public void shouldBeAbleToSetEnvContextInSameThread() {
         //given
         EnvironmentContext expected = EnvironmentContext.getCurrent();
-        expected.setAccountId("acc1");
         expected.setWorkspaceId("ws1");
         expected.setWorkspaceTemporary(true);
         expected.setUser(new UserImpl("user", "id", "token", Collections.singleton("role"), false));
 
         EnvironmentContext actual = EnvironmentContext.getCurrent();
-        assertEquals(actual.getAccountId(), "acc1");
         assertEquals(actual.getWorkspaceId(), "ws1");
         assertTrue(actual.isWorkspaceTemporary());
         User actualUser = actual.getUser();
@@ -45,7 +45,6 @@ public void shouldBeAbleToSetEnvContextInSameThread() {
     public void shouldNotBeAbleToSeeContextInOtherThread() {
         //given
         final EnvironmentContext expected = EnvironmentContext.getCurrent();
-        expected.setAccountId("acc1");
         expected.setWorkspaceId("ws1");
         expected.setWorkspaceTemporary(true);
         expected.setUser(new UserImpl("user", "id", "token", Collections.singleton("role"), false));
@@ -61,4 +60,4 @@ public void run() {
 
     }
 
-}
+}

core/ide/che-core-ide-app/pom.xml

@@ -91,10 +91,6 @@
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-api-workspace-shared</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.che.core</groupId>
-            <artifactId>che-core-client-gwt-account</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.eclipse.che.core</groupId>
             <artifactId>che-core-client-gwt-auth</artifactId>

core/ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/core/CoreGinModule.java

@@ -21,8 +21,6 @@
 import com.google.web.bindery.event.shared.EventBus;
 import com.google.web.bindery.event.shared.SimpleEventBus;
 
-import org.eclipse.che.api.account.gwt.client.AccountServiceClient;
-import org.eclipse.che.api.account.gwt.client.AccountServiceClientImpl;
 import org.eclipse.che.api.auth.client.OAuthServiceClient;
 import org.eclipse.che.api.auth.client.OAuthServiceClientImpl;
 import org.eclipse.che.api.factory.gwt.client.FactoryServiceClient;
@@ -193,9 +191,9 @@
 import org.eclipse.che.ide.ui.dialogs.message.MessageDialogPresenter;
 import org.eclipse.che.ide.ui.dialogs.message.MessageDialogView;
 import org.eclipse.che.ide.ui.dialogs.message.MessageDialogViewImpl;
+import org.eclipse.che.ide.ui.dropdown.DropDownListFactory;
 import org.eclipse.che.ide.ui.dropdown.DropDownWidget;
 import org.eclipse.che.ide.ui.dropdown.DropDownWidgetImpl;
-import org.eclipse.che.ide.ui.dropdown.DropDownListFactory;
 import org.eclipse.che.ide.ui.loaders.initialization.LoaderView;
 import org.eclipse.che.ide.ui.loaders.initialization.LoaderViewImpl;
 import org.eclipse.che.ide.ui.loaders.request.LoaderFactory;
@@ -325,7 +323,6 @@ private void configurePlatformApiGwtClients() {
         bind(UserServiceClient.class).to(UserServiceClientImpl.class).in(Singleton.class);
         bind(UserProfileServiceClient.class).to(UserProfileServiceClientImpl.class).in(Singleton.class);
         bind(GitServiceClient.class).to(GitServiceClientImpl.class).in(Singleton.class);
-        bind(AccountServiceClient.class).to(AccountServiceClientImpl.class).in(Singleton.class);
         bind(OAuthServiceClient.class).to(OAuthServiceClientImpl.class).in(Singleton.class);
         bind(FactoryServiceClient.class).to(FactoryServiceClientImpl.class).in(Singleton.class);
         bind(ProjectServiceClient.class).to(ProjectServiceClientImpl.class).in(Singleton.class);