From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Sun, 29 Jan 2017 15:36:23 +0000 (+0100)
Subject: SONAR-8716 Deprecate UserSession#globalPermissions()
X-Git-Tag: 6.3-RC1~267
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=54c908420bee1f6a0920e0b19bfcea194f2e3a7d;p=sonarqube.git

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 1e3a0515e99..bb6b2eb662f 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
@@ -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 d64da6db3d9..b322d900aca 100644
--- 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 {