From 5da7be4d837aa7dffbf3c0eebee53b8cc4a809c9 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Sun, 29 Jan 2017 15:48:02 +0100 Subject: [PATCH] SONAR-8716 Remove unused method UserSession#checkGlobalPermission(String) --- .../src/main/java/org/sonar/ce/user/CeUserSession.java | 5 ----- .../java/org/sonar/server/user/AbstractUserSession.java | 5 ----- .../java/org/sonar/server/user/ServerUserSession.java | 2 +- .../org/sonar/server/user/ThreadLocalUserSession.java | 6 ------ .../src/main/java/org/sonar/server/user/UserSession.java | 6 ------ .../java/org/sonar/server/tester/UserSessionRule.java | 6 ------ .../java/org/sonar/server/user/ServerUserSessionTest.java | 8 -------- 7 files changed, 1 insertion(+), 37 deletions(-) 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 ec52e02dc40..ea40800bfe6 100644 --- 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 checkGlobalPermission(String globalPermission) { - return notImplemented(); - } - @Override public UserSession checkAnyPermissions(Collection globalPermissions) { return notImplemented(); 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 f769729758c..68e0aabe85a 100644 --- 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 @@ -68,11 +68,6 @@ public abstract class AbstractUserSession implements UserSession { return this; } - @Override - public UserSession checkGlobalPermission(String globalPermission) { - return checkPermission(globalPermission); - } - @Override public UserSession checkAnyPermissions(Collection globalPermissionsToTest) { List userGlobalPermissions = globalPermissions(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java index d837b8754d1..1923dbd19e3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ServerUserSession.java @@ -46,7 +46,7 @@ import static com.google.common.collect.Maps.newHashMap; import static java.util.Objects.requireNonNull; /** - * Part of the current HTTP session + * Implementation of {@link UserSession} used in web server */ public class ServerUserSession extends AbstractUserSession { private Map projectKeyByComponentKey = newHashMap(); 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 c94ea11d004..a37169496c6 100644 --- 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 @@ -109,12 +109,6 @@ public class ThreadLocalUserSession implements UserSession { return this; } - @Override - public UserSession checkGlobalPermission(String globalPermission) { - get().checkGlobalPermission(globalPermission); - return this; - } - @Override public UserSession checkAnyPermissions(Collection globalPermissions) { get().checkAnyPermissions(globalPermissions); 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 c3c6496145c..3e456ca7393 100644 --- 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 @@ -75,12 +75,6 @@ public interface UserSession { */ UserSession checkPermission(String globalPermission); - /** - * @deprecated Only used by Views plugin. - */ - @Deprecated - UserSession checkGlobalPermission(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}. 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 5f0b6cd9501..c1d09db0ff4 100644 --- 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 @@ -321,12 +321,6 @@ public class UserSessionRule implements TestRule, UserSession { return this; } - @Override - public UserSession checkGlobalPermission(String globalPermission) { - currentUserSession.checkGlobalPermission(globalPermission); - return this; - } - @Override public UserSession checkAnyPermissions(Collection globalPermissions) { currentUserSession.checkAnyPermissions(globalPermissions); diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java index b2a0109ae70..b2f96903a15 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ServerUserSessionTest.java @@ -318,14 +318,6 @@ public class ServerUserSessionTest { assertThat(session.hasGlobalPermission(QUALITY_GATE_ADMIN)).isFalse(); } - @Test - public void deprecated_check_global_permission() throws Exception { - addGlobalPermissions("profileadmin", "admin"); - UserSession session = newUserSession(userDto); - - session.checkGlobalPermission(QUALITY_PROFILE_ADMIN); - } - @Test public void fail_if_user_dto_is_null() throws Exception { expectedException.expect(NullPointerException.class); -- 2.39.5