SONAR-8716 Deprecate UserSession#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 1e3a0515e991327e7ca4571e83dbf0cf8e0bf20d..bb6b2eb662f81e794b471ca4f5778246319d3c02 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
@@ -105,6 +105,10 @@ public interface UserSession {
    */
   UserSession checkOrganizationPermission(String organizationUuid, String permission);
 
+  /**
+   * @deprecated in 6.3 because of organizations. No replacement yet.
+   */
+  @Deprecated
   List<String> globalPermissions();
 
   /**

diff --git a/sonar-db/src/main/java/org/sonar/db/permission/AuthorizationDao.java b/sonar-db/src/main/java/org/sonar/db/permission/AuthorizationDao.java
index d64da6db3d9e6b71754674bc706d07f5f849a11e..b322d900aca71290c6451cfcb4e7c02e7a7dbedd 100644 (file)
--- a/sonar-db/src/main/java/org/sonar/db/permission/AuthorizationDao.java
+++ b/sonar-db/src/main/java/org/sonar/db/permission/AuthorizationDao.java
@@ -160,6 +160,10 @@ public class AuthorizationDao implements Dao {
     return dbSession.selectList(sql, params);
   }
 
+  /**
+   * @deprecated because it does not support organizations
+   */
+  @Deprecated
   public List<String> selectGlobalPermissions(@Nullable String userLogin) {
     DbSession session = mybatis.openSession(false);
     try {