SONAR-8716 Remove unused method UserSession#checkAnyPermissions(Collection)

diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java b/server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java
index ea40800bfe664b6e9ffaaf1332239b833d51b3a6..c67c2880f30931f98484404f99d3d01e93fd1d34 100644 (file)
--- a/server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java
+++ b/server/sonar-ce/src/main/java/org/sonar/ce/user/CeUserSession.java
@@ -85,11 +85,6 @@ public class CeUserSession implements UserSession {
     return notImplemented();
   }
 
-  @Override
-  public UserSession checkAnyPermissions(Collection<String> globalPermissions) {
-    return notImplemented();
-  }
-
   @Override
   public boolean hasPermission(String globalPermission) {
     return notImplementedBooleanMethod();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java
index 68e0aabe85a61c751333ddf2aff123dd9315fe55..905075358511dcc8b5ecb088d97b45326efeb1f1 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/AbstractUserSession.java
@@ -19,8 +19,6 @@
  */
 package org.sonar.server.user;
 
-import java.util.Collection;
-import java.util.List;
 import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.exceptions.UnauthorizedException;
 
@@ -68,18 +66,6 @@ public abstract class AbstractUserSession implements UserSession {
     return this;
   }
 
-  @Override
-  public UserSession checkAnyPermissions(Collection<String> globalPermissionsToTest) {
-    List<String> userGlobalPermissions = globalPermissions();
-    for (String userGlobalPermission : userGlobalPermissions) {
-      if (globalPermissionsToTest.contains(userGlobalPermission)) {
-        return this;
-      }
-    }
-
-    throw new ForbiddenException(INSUFFICIENT_PRIVILEGES_MESSAGE);
-  }
-
   @Override
   public boolean hasPermission(String globalPermission) {
     return isRoot() || globalPermissions().contains(globalPermission);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
index a37169496c6198fcdfe6a7845f1cdb51ae405973..2a03c9af16d387f369820b9622339dd674b9064e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/ThreadLocalUserSession.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.user;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import javax.annotation.CheckForNull;
@@ -109,12 +108,6 @@ public class ThreadLocalUserSession implements UserSession {
     return this;
   }
 
-  @Override
-  public UserSession checkAnyPermissions(Collection<String> globalPermissions) {
-    get().checkAnyPermissions(globalPermissions);
-    return this;
-  }
-
   @Override
   public boolean hasPermission(String globalPermission) {
     return get().hasPermission(globalPermission);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
index b2419e2294c20ff1f3ca35eb89f2d96a3604c815..2eb5b59817756ef08c22d9e68a47a3a4e8c936a8 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/user/UserSession.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.user;
 
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import javax.annotation.CheckForNull;
@@ -72,23 +71,24 @@ public interface UserSession {
 
   /**
    * Ensures that permission is granted to user, otherwise throws a {@link org.sonar.server.exceptions.ForbiddenException}.
+
    * @deprecated in 6.3 because it doesn't support organizations
-   *
+   * @see org.sonar.core.permission.GlobalPermissions
    * @see #checkIsRoot() for system administrators
    * @see #checkOrganizationPermission(String, String) for organization members
    */
   @Deprecated
   UserSession checkPermission(String globalPermission);
 
-  /**
-   * Ensures that at least one of the global permissions is granted to user. If none are granted,
-   * then throws a {@link org.sonar.server.exceptions.ForbiddenException}.
-   */
-  UserSession checkAnyPermissions(Collection<String> globalPermissions);
-
   /**
    * Does the user have the given permission ?
+
+   * @deprecated in 6.3 because if doesn't support organizations
+   * @see org.sonar.core.permission.GlobalPermissions
+   * @see #isRoot()
+   * @see #hasOrganizationPermission(String, String)
    */
+  @Deprecated
   boolean hasPermission(String globalPermission);
 
   /**

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 c1d09db0ff4629825af1b2940230844f55169f5f..fb6f4995c1f538f037a66f047d2f7bc112f8dee1 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
@@ -20,7 +20,6 @@
 package org.sonar.server.tester;
 
 import com.google.common.base.Preconditions;
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import javax.annotation.CheckForNull;
@@ -321,12 +320,6 @@ public class UserSessionRule implements TestRule, UserSession {
     return this;
   }
 
-  @Override
-  public UserSession checkAnyPermissions(Collection<String> globalPermissions) {
-    currentUserSession.checkAnyPermissions(globalPermissions);
-    return this;
-  }
-
   @Override
   public boolean hasPermission(String globalPermission) {
     return currentUserSession.hasPermission(globalPermission);