SONAR-8716 drop unused methods in UserSessionRule

No more need to define permission on projects referenced
by their keys.

diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java b/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
index 27832abccd053d2be441b8ce4954a0c4c8450b65..18698808e6a61e8886a2e868f28186b85125d124 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/tester/AbstractMockUserSession.java
@@ -33,11 +33,9 @@ import static com.google.common.collect.Maps.newHashMap;
 public abstract class AbstractMockUserSession<T extends AbstractMockUserSession> extends AbstractUserSession {
   private final Class<T> clazz;
   private List<String> globalPermissions = Collections.emptyList();
-  private HashMultimap<String, String> projectKeyByPermission = HashMultimap.create();
   private HashMultimap<String, String> projectUuidByPermission = HashMultimap.create();
   private HashMultimap<String, String> permissionsByOrganizationUuid = HashMultimap.create();
   private Map<String, String> projectUuidByComponentUuid = newHashMap();
-  private List<String> projectPermissionsCheckedByKey = newArrayList();
   private List<String> projectPermissionsCheckedByUuid = newArrayList();
 
   protected AbstractMockUserSession(Class<T> clazz) {
@@ -49,16 +47,6 @@ public abstract class AbstractMockUserSession<T extends AbstractMockUserSession>
     return clazz.cast(this);
   }
 
-  /**
-   * Deprecated, please use {@link #addProjectUuidPermissions}
-   */
-  @Deprecated
-  public T addProjectPermissions(String projectPermission, String... projectKeys) {
-    this.projectPermissionsCheckedByKey.add(projectPermission);
-    this.projectKeyByPermission.putAll(projectPermission, newArrayList(projectKeys));
-    return clazz.cast(this);
-  }
-
   public T addProjectUuidPermissions(String projectPermission, String... projectUuids) {
     this.projectPermissionsCheckedByUuid.add(projectPermission);
     this.projectUuidByPermission.putAll(projectPermission, newArrayList(projectUuids));
@@ -68,15 +56,6 @@ public abstract class AbstractMockUserSession<T extends AbstractMockUserSession>
     return clazz.cast(this);
   }
 
-  /**
-   * Deprecated, please use {@link #addComponentUuidPermission}
-   */
-  @Deprecated
-  public T addComponentPermission(String projectPermission, String projectKey, String componentKey) {
-    addProjectPermissions(projectPermission, projectKey);
-    return clazz.cast(this);
-  }
-
   public T addComponentUuidPermission(String projectPermission, String projectUuid, String componentUuid) {
     this.projectUuidByComponentUuid.put(componentUuid, projectUuid);
     addProjectUuidPermissions(projectPermission, projectUuid);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
index dd45902edcce10d17a0924aa8747b50523dd1b58..737ec03cda4e5fa220d253266e3d37592ab57d3c 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/tester/UserSessionRule.java
@@ -191,18 +191,6 @@ public class UserSessionRule implements TestRule, UserSession {
     return this;
   }
 
-  @Deprecated
-  public UserSessionRule addComponentPermission(String projectPermission, String projectKey, String componentKey) {
-    ensureAbstractMockUserSession().addComponentPermission(projectPermission, projectKey, componentKey);
-    return this;
-  }
-
-  @Deprecated
-  public UserSessionRule addProjectPermissions(String projectPermission, String... projectKeys) {
-    ensureAbstractMockUserSession().addProjectPermissions(projectPermission, projectKeys);
-    return this;
-  }
-
   public UserSessionRule addOrganizationPermission(String organizationUuid, String permission) {
     ensureAbstractMockUserSession().addOrganizationPermission(organizationUuid, permission);
     return this;