Removed accountid from environment context

eclipse-che · May 6, 2016 · 87d3a54 · 87d3a54
1 parent b48c15e
commit 87d3a54
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 18 deletions.
diff --git a/...ns/che-core-commons-env/src/main/java/org/eclipse/che/commons/env/EnvironmentContext.java b/...ns/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;
     }

diff --git a/...he-core-commons-env/src/test/java/org/eclipse/che/commons/env/EnvironmentContextTest.java b/...he-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() {
 
     }
 
-}
+}
diff --git a/...i-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java b/...i-factory/src/main/java/org/eclipse/che/api/factory/server/impl/FactoryBaseValidator.java
@@ -102,10 +102,9 @@ protected void validateProjects(Factory factory) throws BadRequestException {
      */
     protected void validateAccountId(Factory factory) throws ServerException, ForbiddenException {
         // TODO do we need check if user is temporary?
-        final String accountId = factory.getCreator() != null ? emptyToNull(factory.getCreator().getAccountId()) : null;
         final String userId = factory.getCreator() != null ? factory.getCreator().getUserId() : null;
 
-        if (accountId == null || userId == null) {
+        if (userId == null) {
             return;
         }