Remove issue index in ApplyPermissionsStep

Now done in IndexIssuesStep for a while, so useless here

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java
index 98eda287df306dd1f702e2c5264f2547d39e8467..187c2f0ac778d7f265e37851de9608127536405a 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ApplyPermissionsStep.java
@@ -31,7 +31,6 @@ import org.sonar.server.computation.component.DbIdsRepository;
 import org.sonar.server.computation.component.DepthTraversalTypeAwareCrawler;
 import org.sonar.server.computation.component.TreeRootHolder;
 import org.sonar.server.computation.component.TypeAwareVisitorAdapter;
-import org.sonar.server.issue.index.IssueAuthorizationIndexer;
 
 import static org.sonar.server.computation.component.ComponentVisitor.Order.PRE_ORDER;
 
@@ -42,15 +41,12 @@ public class ApplyPermissionsStep implements ComputationStep {
 
   private final DbClient dbClient;
   private final DbIdsRepository dbIdsRepository;
-  private final IssueAuthorizationIndexer indexer;
   private final PermissionRepository permissionRepository;
   private final TreeRootHolder treeRootHolder;
 
-  public ApplyPermissionsStep(DbClient dbClient, DbIdsRepository dbIdsRepository, IssueAuthorizationIndexer indexer,
-    PermissionRepository permissionRepository, TreeRootHolder treeRootHolder) {
+  public ApplyPermissionsStep(DbClient dbClient, DbIdsRepository dbIdsRepository, PermissionRepository permissionRepository, TreeRootHolder treeRootHolder) {
     this.dbClient = dbClient;
     this.dbIdsRepository = dbIdsRepository;
-    this.indexer = indexer;
     this.permissionRepository = permissionRepository;
     this.treeRootHolder = treeRootHolder;
   }
@@ -74,8 +70,6 @@ public class ApplyPermissionsStep implements ComputationStep {
         permissionRepository.grantDefaultRoles(session, projectId, Qualifiers.PROJECT);
         session.commit();
       }
-      // As batch is still apply permission on project, indexing of issue authorization must always been done
-      indexer.index();
     } finally {
       MyBatis.closeQuietly(session);
     }

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java
index 1e70cc7c6712e8ba8b59a20ba5be44733c040cf9..57eaba6ac64aef695ba73682850b25c05cecca56 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ReportComputationSteps.java
@@ -93,9 +93,9 @@ public class ReportComputationSteps implements ComputationSteps {
       SwitchSnapshotStep.class,
       IndexComponentsStep.class,
       PurgeDatastoresStep.class,
+      ApplyPermissionsStep.class,
 
       // ES indexing is done after all db changes
-      ApplyPermissionsStep.class,
       IndexIssuesStep.class,
       IndexTestsStep.class,
 

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java
index 3d43435daf02fec92c905d3887c04163d10b96ae..c7433470457fcf9c02bbb88dfe68bc68b4921033 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/ApplyPermissionsStepTest.java
@@ -19,12 +19,8 @@
  */
 package org.sonar.server.computation.step;
 
-import java.util.List;
-import java.util.Map;
-import org.elasticsearch.search.SearchHit;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -44,9 +40,6 @@ import org.sonar.server.computation.batch.TreeRootHolderRule;
 import org.sonar.server.computation.component.Component;
 import org.sonar.server.computation.component.DbIdsRepositoryImpl;
 import org.sonar.server.computation.component.ReportComponent;
-import org.sonar.server.es.EsTester;
-import org.sonar.server.issue.index.IssueAuthorizationIndexer;
-import org.sonar.server.issue.index.IssueIndexDefinition;
 import org.sonar.test.DbTests;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -58,9 +51,6 @@ public class ApplyPermissionsStepTest extends BaseStepTest {
   private static final String PROJECT_KEY = "PROJECT_KEY";
   private static final String PROJECT_UUID = "PROJECT_UUID";
 
-  @ClassRule
-  public static EsTester esTester = new EsTester().addDefinitions(new IssueIndexDefinition(new Settings()));
-
   @Rule
   public DbTester dbTester = DbTester.create(System2.INSTANCE);
 
@@ -75,24 +65,17 @@ public class ApplyPermissionsStepTest extends BaseStepTest {
 
   DbIdsRepositoryImpl dbIdsRepository;
 
-  IssueAuthorizationIndexer issueAuthorizationIndexer;
   ApplyPermissionsStep step;
 
   @Before
   public void setUp() {
-    dbTester.truncateTables();
-    esTester.truncateIndices();
-
     dbSession = dbClient.openSession(false);
 
     settings = new Settings();
 
-    issueAuthorizationIndexer = new IssueAuthorizationIndexer(dbClient, esTester.client());
-    issueAuthorizationIndexer.setEnabled(true);
-
     dbIdsRepository = new DbIdsRepositoryImpl();
 
-    step = new ApplyPermissionsStep(dbClient, dbIdsRepository, issueAuthorizationIndexer, new PermissionRepository(dbClient, settings), treeRootHolder);
+    step = new ApplyPermissionsStep(dbClient, dbIdsRepository, new PermissionRepository(dbClient, settings), treeRootHolder);
   }
 
   @After
@@ -120,12 +103,6 @@ public class ApplyPermissionsStepTest extends BaseStepTest {
 
     assertThat(dbClient.componentDao().selectOrFailByKey(dbSession, PROJECT_KEY).getAuthorizationUpdatedAt()).isNotNull();
     assertThat(dbClient.roleDao().selectGroupPermissions(dbSession, DefaultGroups.ANYONE, projectDto.getId())).containsOnly(UserRole.USER);
-    List<SearchHit> issueAuthorizationHits = esTester.getDocuments(IssueIndexDefinition.INDEX, IssueIndexDefinition.TYPE_AUTHORIZATION);
-    assertThat(issueAuthorizationHits).hasSize(1);
-    Map<String, Object> issueAhutorization = issueAuthorizationHits.get(0).sourceAsMap();
-    assertThat(issueAhutorization.get("project")).isEqualTo(PROJECT_UUID);
-    assertThat((List<String>) issueAhutorization.get("groups")).containsOnly(DefaultGroups.ANYONE);
-    assertThat((List<String>) issueAhutorization.get("users")).isEmpty();
   }
 
   @Test