From: Julien Lancelot <julien.lancelot@sonarsource.com>
Date: Fri, 31 Oct 2014 14:11:24 +0000 (+0100)
Subject: Remove useless field "permission" in IssueAuthorization index
X-Git-Tag: 5.0-RC1~444
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3576e24ee8bbf16df1fe3cb8149c69cfd0c8f895;p=sonarqube.git

Remove useless field "permission" in IssueAuthorization index
---

diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java b/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java
index 7810f90be0d..6289cb3816e 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/db/IssueAuthorizationDao.java
@@ -71,8 +71,7 @@ public class IssueAuthorizationDao extends BaseDao<IssueAuthorizationMapper, Iss
         IssueAuthorizationDto issueAuthorizationDto = authorizationDtoMap.get(project);
         if (issueAuthorizationDto == null) {
           issueAuthorizationDto = new IssueAuthorizationDto()
-            .setProjectUuid(project)
-            .setPermission(UserRole.USER);
+            .setProjectUuid(project);
           issueAuthorizationDto.setUpdatedAt(updatedAt);
         }
         if (group != null) {
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationDoc.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationDoc.java
index ab5574d0c71..5a31cc7fad2 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationDoc.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationDoc.java
@@ -37,10 +37,6 @@ public class IssueAuthorizationDoc extends BaseDoc {
     return getField(IssueAuthorizationNormalizer.IssueAuthorizationField.PROJECT.field());
   }
 
-  public String permission() {
-    return getField(IssueAuthorizationNormalizer.IssueAuthorizationField.PERMISSION.field());
-  }
-
   public List<String> groups() {
     return (List<String>) getField(IssueAuthorizationNormalizer.IssueAuthorizationField.GROUPS.field());
   }
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationNormalizer.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationNormalizer.java
index 1519c428399..a2bd856d303 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationNormalizer.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueAuthorizationNormalizer.java
@@ -44,12 +44,11 @@ public class IssueAuthorizationNormalizer extends BaseNormalizer<IssueAuthorizat
   public static final class IssueAuthorizationField extends Indexable {
 
     public static final IndexField PROJECT = add(IndexField.Type.STRING, "project");
-    public static final IndexField PERMISSION = add(IndexField.Type.STRING, "permission");
     public static final IndexField GROUPS = add(IndexField.Type.STRING, "groups");
     public static final IndexField USERS = add(IndexField.Type.STRING, "users");
     public static final IndexField UPDATED_AT = add(IndexField.Type.DATE, BaseNormalizer.UPDATED_AT_FIELD);
 
-    public static final Set<IndexField> ALL_FIELDS = ImmutableSet.of(PROJECT, PERMISSION, GROUPS, USERS, UPDATED_AT);
+    public static final Set<IndexField> ALL_FIELDS = ImmutableSet.of(PROJECT, GROUPS, USERS, UPDATED_AT);
   }
 
   @Override
@@ -59,7 +58,6 @@ public class IssueAuthorizationNormalizer extends BaseNormalizer<IssueAuthorizat
     Preconditions.checkNotNull(dto.getProjectUuid(), "Project uuid is null");
 
     update.put(IssueAuthorizationField.PROJECT.field(), dto.getProjectUuid());
-    update.put(IssueAuthorizationField.PERMISSION.field(), dto.getPermission());
     update.put(IssueAuthorizationField.USERS.field(), dto.getUsers());
     update.put(IssueAuthorizationField.GROUPS.field(), dto.getGroups());
     update.put(IssueAuthorizationField.UPDATED_AT.field(), dto.getUpdatedAt());
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
index 69cfdeae4c9..3bc3b6093a5 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/issue/index/IssueIndex.java
@@ -40,7 +40,6 @@ import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortBuilders;
 import org.elasticsearch.search.sort.SortOrder;
 import org.sonar.api.issue.Issue;
-import org.sonar.api.web.UserRole;
 import org.sonar.core.issue.db.IssueDto;
 import org.sonar.server.issue.IssueQuery;
 import org.sonar.server.issue.filter.IssueFilterParameters;
@@ -312,7 +311,7 @@ public class IssueIndex extends BaseIndex<Issue, IssueDto, String> {
       QueryBuilders.filteredQuery(
         QueryBuilders.matchAllQuery(),
         FilterBuilders.boolFilter()
-          .must(FilterBuilders.termFilter(IssueAuthorizationNormalizer.IssueAuthorizationField.PERMISSION.field(), UserRole.USER), groupsAndUser)
+          .must(groupsAndUser)
           .cache(true))
       );
   }
diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexMediumTest.java
index fb8e51c52d0..721ee38d81d 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/issue/index/IssueAuthorizationIndexMediumTest.java
@@ -91,7 +91,6 @@ public class IssueAuthorizationIndexMediumTest {
     IssueAuthorizationDoc issueAuthorizationDoc = index.getByKey(project.uuid());
     assertThat(issueAuthorizationDoc).isNotNull();
     assertThat(issueAuthorizationDoc.project()).isEqualTo("ABCD");
-    assertThat(issueAuthorizationDoc.permission()).isEqualTo("user");
     assertThat(issueAuthorizationDoc.groups()).containsExactly("devs");
     assertThat(issueAuthorizationDoc.users()).containsExactly("john");
     assertThat(issueAuthorizationDoc.updatedAt()).isNotNull();
@@ -146,7 +145,6 @@ public class IssueAuthorizationIndexMediumTest {
     IssueAuthorizationDoc issueAuthorizationDoc = index.getByKey(project.uuid());
     assertThat(issueAuthorizationDoc).isNotNull();
     assertThat(issueAuthorizationDoc.project()).isEqualTo("ABCD");
-    assertThat(issueAuthorizationDoc.permission()).isEqualTo("user");
     assertThat(issueAuthorizationDoc.groups()).containsExactly("devs");
     assertThat(issueAuthorizationDoc.users()).containsExactly("john");
     assertThat(issueAuthorizationDoc.updatedAt()).isNotNull();
diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java
index ed2c9496911..34c4e622d91 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/permission/InternalPermissionServiceMediumTest.java
@@ -97,7 +97,6 @@ public class InternalPermissionServiceMediumTest {
     IssueAuthorizationDoc issueAuthorizationDoc = index.getNullableByKey(project.uuid());
     assertThat(issueAuthorizationDoc).isNotNull();
     assertThat(issueAuthorizationDoc.project()).isEqualTo(project.uuid());
-    assertThat(issueAuthorizationDoc.permission()).isEqualTo(UserRole.USER);
     assertThat(issueAuthorizationDoc.users()).containsExactly(user.getLogin());
     assertThat(issueAuthorizationDoc.groups()).isEmpty();
   }
@@ -126,7 +125,6 @@ public class InternalPermissionServiceMediumTest {
     IssueAuthorizationDoc issueAuthorizationDoc = index.getNullableByKey(project.uuid());
     assertThat(issueAuthorizationDoc).isNotNull();
     assertThat(issueAuthorizationDoc.project()).isEqualTo(project.uuid());
-    assertThat(issueAuthorizationDoc.permission()).isEqualTo(UserRole.USER);
     assertThat(issueAuthorizationDoc.users()).containsExactly(user2.getLogin());
     assertThat(issueAuthorizationDoc.groups()).isEmpty();
   }
diff --git a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueAuthorizationDto.java b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueAuthorizationDto.java
index 97d3a3bb413..eaed351cad7 100644
--- a/sonar-core/src/main/java/org/sonar/core/issue/db/IssueAuthorizationDto.java
+++ b/sonar-core/src/main/java/org/sonar/core/issue/db/IssueAuthorizationDto.java
@@ -48,15 +48,6 @@ public final class IssueAuthorizationDto extends Dto<String> implements Serializ
     return this;
   }
 
-  public String getPermission() {
-    return permission;
-  }
-
-  public IssueAuthorizationDto setPermission(String permission) {
-    this.permission = permission;
-    return this;
-  }
-
   public List<String> getGroups() {
     return groups;
   }
diff --git a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueAuthorizationDtoTest.java b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueAuthorizationDtoTest.java
index 22b7e4943a8..9c83be95ca7 100644
--- a/sonar-core/src/test/java/org/sonar/core/issue/db/IssueAuthorizationDtoTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/issue/db/IssueAuthorizationDtoTest.java
@@ -31,13 +31,11 @@ public class IssueAuthorizationDtoTest {
   public void getter_and_setter() throws Exception {
     IssueAuthorizationDto dto = new IssueAuthorizationDto()
       .setProjectUuid("Sample")
-      .setPermission("user")
       .setGroups(newArrayList("sonar-users"))
       .setUsers(newArrayList("john"));
 
     assertThat(dto.getKey()).isEqualTo("Sample");
     assertThat(dto.getProjectUuid()).isEqualTo("Sample");
-    assertThat(dto.getPermission()).isEqualTo("user");
     assertThat(dto.getGroups()).containsExactly("sonar-users");
     assertThat(dto.getUsers()).containsExactly("john");
   }
@@ -46,7 +44,6 @@ public class IssueAuthorizationDtoTest {
   public void add_group() throws Exception {
     IssueAuthorizationDto dto = new IssueAuthorizationDto()
       .setProjectUuid("Sample")
-      .setPermission("user")
       .setGroups(newArrayList("sonar-users"))
       .setUsers(newArrayList("john"));
 
@@ -61,7 +58,6 @@ public class IssueAuthorizationDtoTest {
   public void add_user() throws Exception {
     IssueAuthorizationDto dto = new IssueAuthorizationDto()
       .setProjectUuid("Sample")
-      .setPermission("user")
       .setGroups(newArrayList("sonar-users"))
       .setUsers(newArrayList("john"));