Remove ComputationStep.supportedProjectQualifiers() as it was only used for Views

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java
index f48a8fd3368cf4867145eac2671c27570a263601..3fa3e2c7ac6e8b321a41a9dd1e137ffb930d13a9 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ComputationService.java
@@ -22,7 +22,6 @@ package org.sonar.server.computation;
 
 import com.google.common.base.Throwables;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang.ArrayUtils;
 import org.sonar.api.server.ServerSide;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.TempFolder;
@@ -92,11 +91,9 @@ public class ComputationService {
       ComputationContext context = new ComputationContext(reader, project);
       context.setProjectSettings(projectSettingsFactory.newProjectSettings(project.getId()));
       for (ComputationStep step : steps.orderedSteps()) {
-        if (ArrayUtils.contains(step.supportedProjectQualifiers(), context.getProject().qualifier())) {
-          Profiler stepProfiler = Profiler.createIfDebug(LOG).startDebug(step.getDescription());
-          step.execute(context);
-          stepProfiler.stopDebug();
-        }
+        Profiler stepProfiler = Profiler.createIfDebug(LOG).startDebug(step.getDescription());
+        step.execute(context);
+        stepProfiler.stopDebug();
       }
       item.dto.setStatus(SUCCESS);
     } catch (Throwable e) {

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 b43a7679bfa421b09fa0b4637f957012dae493ec..022ee3eb068759988ce07dd84cccc213f510a1e5 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
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.issue.index.IssueAuthorizationIndexer;
 
@@ -32,11 +31,6 @@ public class ApplyPermissionsStep implements ComputationStep {
     this.indexer = indexer;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT, Qualifiers.VIEW};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     indexer.index();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java
index 7f5577f8fcdab584d28c98b16633cb5fee9e2849..69e131118964497a439c240e1bb50354f9544b14 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ComputationStep.java
@@ -27,11 +27,6 @@ import org.sonar.server.computation.ComputationContext;
  */
 public interface ComputationStep {
 
-  /**
-   * Allows to distinguish standard projects from view projects
-   */
-  String[] supportedProjectQualifiers();
-
   void execute(ComputationContext context);
 
   String getDescription();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java
index aba41a433b29164b68e1ff3e984f88faed6e5f11..60d3f219759ca12657d0bd1ead99004bc8be58bf 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexComponentsStep.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.core.resource.ResourceIndexerDao;
 import org.sonar.server.computation.ComputationContext;
 
@@ -34,11 +33,6 @@ public class IndexComponentsStep implements ComputationStep {
     this.resourceIndexerDao = resourceIndexerDao;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT, Qualifiers.VIEW};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     resourceIndexerDao.indexProject(context.getProject().getId());

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java
index ac55607385aa81499c77e5cb154fdca1d7abbc99..e1caae311efa7f623d7a1d805b9c63ebd825f75e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexIssuesStep.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.issue.index.IssueAuthorizationIndexer;
 import org.sonar.server.issue.index.IssueIndexer;
@@ -35,11 +34,6 @@ public class IndexIssuesStep implements ComputationStep {
     this.indexer = indexer;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     authorizationIndexer.index();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexSourceLinesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexSourceLinesStep.java
index 8bcc854162b4a9c622f8f362586ebd0fe2620ad6..35f0e12de9f696b729da0d6d7d2460370b74f94c 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexSourceLinesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexSourceLinesStep.java
@@ -19,7 +19,6 @@
  */
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.source.index.SourceLineIndexer;
 
@@ -31,11 +30,6 @@ public class IndexSourceLinesStep implements ComputationStep {
     this.indexer = indexer;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     indexer.index(context.getProject().uuid());

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java
index 7c44fd7c9b77dacca947b731a4699f2b435b7142..c6498ed21cbcd6302c1f57d17ae5a072d545619f 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexTestsStep.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.test.index.TestIndexer;
 
@@ -32,11 +31,6 @@ public class IndexTestsStep implements ComputationStep {
     this.indexer = indexer;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     indexer.index(context.getProject().uuid());

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexViewsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexViewsStep.java
index 1825f6c246678fb9f159f6b05e0bc2d850c38435..98ca5fdc826b294ea3b15d42aa07dc59392d648b 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexViewsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/IndexViewsStep.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.view.index.ViewIndexer;
 
@@ -32,11 +31,6 @@ public class IndexViewsStep implements ComputationStep {
     this.indexer = indexer;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.VIEW};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     indexer.index(context.getProject().uuid());

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
index 720ee98c87224333482c18251d3d1159a274a835..af46d652ac409e140688cb0034e14bb0076e33bb 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/ParseReportStep.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReportReader;
 import org.sonar.server.computation.ComputationContext;
@@ -36,11 +35,6 @@ public class ParseReportStep implements ComputationStep {
     this.issueComputation = issueComputation;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT, Qualifiers.VIEW};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     int rootComponentRef = context.getReportMetadata().getRootComponentRef();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java
index 582a469e45c63fe00ceb75c19d1e37e5e37c74b5..68234957871799b340d8271c885c0d84123dff47 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistDuplicationsStep.java
@@ -22,7 +22,6 @@ package org.sonar.server.computation.step;
 
 import org.apache.commons.lang.StringEscapeUtils;
 import org.sonar.api.measures.CoreMetrics;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.batch.protocol.Constants;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReport.Range;
@@ -48,11 +47,6 @@ public class PersistDuplicationsStep implements ComputationStep {
     this.dbClient = dbClient;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     DbSession session = dbClient.openSession(true);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
index c23ea3fe6d774898c66fd95ffcd34c94324722dc..2b1f3c7ef90a8c577216d119f407dfb0366bc18f 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistEventsStep.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.System2;
 import org.sonar.batch.protocol.Constants;
 import org.sonar.batch.protocol.output.BatchReport;
@@ -43,11 +42,6 @@ public class PersistEventsStep implements ComputationStep {
     this.system2 = system2;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     DbSession session = dbClient.openSession(false);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
index 78df32a46aa9816f8552e7673cf3bcaf83944bdc..b8ce0a1f5d351c54ec032d48e643028a0064b579 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistFileSourcesStep.java
@@ -27,7 +27,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.LineIterator;
 import org.apache.ibatis.session.ResultContext;
 import org.apache.ibatis.session.ResultHandler;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.System2;
 import org.sonar.batch.protocol.Constants;
 import org.sonar.batch.protocol.output.BatchReport;
@@ -66,11 +65,6 @@ public class PersistFileSourcesStep implements ComputationStep {
     this.system2 = system2;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     int rootComponentRef = context.getReportMetadata().getRootComponentRef();

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java
index 139280a3b9a7f9fca3efd998f5fc058a537fad8d..0c781491669f1a24b623fe6cfb31f59b6e5c63d5 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistIssuesStep.java
@@ -24,9 +24,12 @@ import org.sonar.api.issue.IssueComment;
 import org.sonar.api.issue.internal.DefaultIssue;
 import org.sonar.api.issue.internal.DefaultIssueComment;
 import org.sonar.api.issue.internal.FieldDiffs;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.System2;
-import org.sonar.core.issue.db.*;
+import org.sonar.core.issue.db.IssueChangeDto;
+import org.sonar.core.issue.db.IssueChangeMapper;
+import org.sonar.core.issue.db.IssueDto;
+import org.sonar.core.issue.db.IssueMapper;
+import org.sonar.core.issue.db.UpdateConflictResolver;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
 import org.sonar.server.computation.ComputationContext;
@@ -52,11 +55,6 @@ public class PersistIssuesStep implements ComputationStep {
     this.issueCache = issueCache;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     DbSession session = dbClient.openSession(true);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java
index b020867387bb4d3dabb86bc4c43bd3d82f18c539..0094159b2980ad4507b019bcdfe56f17c0372d45 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistMeasuresStep.java
@@ -22,7 +22,6 @@ package org.sonar.server.computation.step;
 
 import com.google.common.annotations.VisibleForTesting;
 import org.sonar.api.measures.CoreMetrics;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.rule.RuleKey;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReportReader;
@@ -56,11 +55,6 @@ public class PersistMeasuresStep implements ComputationStep {
     this.metricCache = metricCache;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT, Qualifiers.VIEW};
-  }
-
   @Override
   public String getDescription() {
     return "Persist measures";

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java
index f956015012078906451090a43949e911c1d4ed1a..c518eec382599fc5c65ec05e7d6338ecaa82d2fc 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistNumberOfDaysSinceLastCommitStep.java
@@ -21,7 +21,6 @@
 package org.sonar.server.computation.step;
 
 import org.sonar.api.measures.CoreMetrics;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.System2;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReportReader;
@@ -59,11 +58,6 @@ public class PersistNumberOfDaysSinceLastCommitStep implements ComputationStep {
     this.system = system;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public String getDescription() {
     return "Compute and persist the number of days since last commit";

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
index e94a1aad53d89d1e1533c7867442e8b86bc43416..ac6f68f9cbafdc4ddf90b1ee923d9a85d88a0bae 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistProjectLinksStep.java
@@ -24,7 +24,6 @@ import com.google.common.base.Predicate;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import org.sonar.api.i18n.I18n;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.batch.protocol.Constants;
 import org.sonar.batch.protocol.output.BatchReport;
 import org.sonar.batch.protocol.output.BatchReportReader;
@@ -64,11 +63,6 @@ public class PersistProjectLinksStep implements ComputationStep {
     this.i18n = i18n;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     DbSession session = dbClient.openSession(false);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java
index c3180f8e665b3866daa8fcb15f9cc0b84c8af37f..b4b49bd8a7169c0a98c7ad558f2982236a3a56c2 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PersistTestsStep.java
@@ -28,7 +28,6 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Table;
 import org.apache.ibatis.session.ResultContext;
 import org.apache.ibatis.session.ResultHandler;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.internal.Uuids;
 import org.sonar.api.utils.log.Logger;
@@ -66,11 +65,6 @@ public class PersistTestsStep implements ComputationStep {
     this.system = system;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext computationContext) {
     DbSession session = dbClient.openSession(true);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java
index 8e9417f46269cfc8e33c0c15fa7a1cc8dcde7107..e7be2274c0563abcc020c446c6895ff7c2309605 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/PurgeDatastoresStep.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.core.computation.dbcleaner.ProjectCleaner;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
@@ -38,11 +37,6 @@ public class PurgeDatastoresStep implements ComputationStep {
     this.dbClient = dbClient;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT, Qualifiers.VIEW};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     DbSession session = dbClient.openSession(true);

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java
index 977d31e6aa620481236fac31c6fb47fe8a62b4cb..614c5373a4f621fffe95ea2ceceda68c7fd8ad8e 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SendIssueNotificationsStep.java
@@ -21,12 +21,15 @@ package org.sonar.server.computation.step;
 
 import com.google.common.collect.ImmutableSet;
 import org.sonar.api.issue.internal.DefaultIssue;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.core.component.ComponentDto;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.computation.issue.IssueCache;
 import org.sonar.server.computation.issue.RuleCache;
-import org.sonar.server.issue.notification.*;
+import org.sonar.server.issue.notification.IssueChangeNotification;
+import org.sonar.server.issue.notification.MyNewIssuesNotification;
+import org.sonar.server.issue.notification.NewIssuesNotification;
+import org.sonar.server.issue.notification.NewIssuesNotificationFactory;
+import org.sonar.server.issue.notification.NewIssuesStatistics;
 import org.sonar.server.notifications.NotificationService;
 import org.sonar.server.util.CloseableIterator;
 
@@ -57,11 +60,6 @@ public class SendIssueNotificationsStep implements ComputationStep {
     this.newIssuesNotificationFactory = newIssuesNotificationFactory;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     if (service.hasProjectSubscribersForTypes(context.getProject().uuid(), NOTIF_TYPES)) {

diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
index b073cd53ca124c122b362b0c03c224b43efce983..5d39075307ec9cffa827f1fdb5dfbfe14116cf42 100644 (file)
--- a/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/computation/step/SwitchSnapshotStep.java
@@ -20,7 +20,6 @@
 
 package org.sonar.server.computation.step;
 
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.core.component.SnapshotDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.core.persistence.MyBatis;
@@ -38,11 +37,6 @@ public class SwitchSnapshotStep implements ComputationStep {
     this.dbClient = dbClient;
   }
 
-  @Override
-  public String[] supportedProjectQualifiers() {
-    return new String[] {Qualifiers.PROJECT, Qualifiers.VIEW};
-  }
-
   @Override
   public void execute(ComputationContext context) {
     DbSession session = dbClient.openSession(true);

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
index 3d275761af4cb0b6b047e33677c8a088a961da7b..7a32079aae069facd7791a000e884b9acca8fa03 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ComputationServiceTest.java
@@ -26,7 +26,6 @@ import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.utils.System2;
 import org.sonar.api.utils.ZipUtils;
 import org.sonar.api.utils.internal.JUnitTempFolder;
@@ -55,7 +54,6 @@ import static org.junit.Assert.fail;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -68,9 +66,8 @@ public class ComputationServiceTest {
   public JUnitTempFolder tempFolder = new JUnitTempFolder();
   @Rule
   public LogTester logTester = new LogTester();
-  ComputationStep projectStep1 = mockStep(Qualifiers.PROJECT);
-  ComputationStep projectStep2 = mockStep(Qualifiers.PROJECT);
-  ComputationStep viewStep = mockStep(Qualifiers.VIEW);
+  ComputationStep projectStep1 = mockStep();
+  ComputationStep projectStep2 = mockStep();
   ComputationSteps steps = mock(ComputationSteps.class);
   ActivityService activityService = mock(ActivityService.class);
   System2 system = mock(System2.class);
@@ -91,7 +88,7 @@ public class ComputationServiceTest {
     logTester.setLevel(LoggerLevel.INFO);
 
     // view step is not supposed to be executed
-    when(steps.orderedSteps()).thenReturn(Arrays.asList(projectStep1, projectStep2, viewStep));
+    when(steps.orderedSteps()).thenReturn(Arrays.asList(projectStep1, projectStep2));
     AnalysisReportDto dto = newDefaultReport();
     File zip = generateZip();
 
@@ -108,7 +105,6 @@ public class ComputationServiceTest {
     // execute only the steps supporting the project qualifier
     verify(projectStep1).execute(any(ComputationContext.class));
     verify(projectStep2).execute(any(ComputationContext.class));
-    verify(viewStep, never()).execute(any(ComputationContext.class));
     verify(activityService).save(any(Activity.class));
   }
 
@@ -175,9 +171,8 @@ public class ComputationServiceTest {
     assertThat(logTester.logs()).contains(String.format("The snapshot ID #%s provided by the report #%s does not exist anymore.", ANY_SNAPSHOT_ID, report.getId()));
   }
 
-  private ComputationStep mockStep(String... qualifiers) {
+  private ComputationStep mockStep() {
     ComputationStep step = mock(ComputationStep.class);
-    when(step.supportedProjectQualifiers()).thenReturn(qualifiers);
     when(step.getDescription()).thenReturn(RandomStringUtils.randomAscii(5));
     return step;
   }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BaseStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/BaseStepTest.java
index 224a8316a39d170ae241a8b50bb65e51afbc1382..af67e9b6038c897c2240efff9f8b920874a27965 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/BaseStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/BaseStepTest.java
@@ -35,6 +35,5 @@ public abstract class BaseStepTest {
   public void test_metadata() {
     assertThat(step().toString()).isNotEmpty();
     assertThat(step().getDescription()).isNotEmpty();
-    assertThat(step().supportedProjectQualifiers().length).isGreaterThan(0);
   }
 }

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java
index 3b701890519022e87474336ba099cc0449119bfc..bf0ba151e541ed4c22840c050895c2226355e85d 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexSourceLinesStepTest.java
@@ -19,20 +19,18 @@
  */
 package org.sonar.server.computation.step;
 
-import org.sonar.server.source.db.FileSourceDao;
-
 import org.elasticsearch.search.SearchHit;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.api.config.Settings;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.batch.protocol.output.BatchReportReader;
 import org.sonar.core.persistence.DbTester;
 import org.sonar.server.component.ComponentTesting;
 import org.sonar.server.computation.ComputationContext;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.es.EsTester;
+import org.sonar.server.source.db.FileSourceDao;
 import org.sonar.server.source.db.FileSourceTesting;
 import org.sonar.server.source.index.SourceLineDoc;
 import org.sonar.server.source.index.SourceLineIndexDefinition;
@@ -66,11 +64,6 @@ public class IndexSourceLinesStepTest extends BaseStepTest {
     return new IndexSourceLinesStep(sourceLineIndexer);
   }
 
-  @Test
-  public void supported_project_qualifiers() {
-    assertThat(step().supportedProjectQualifiers()).containsOnly(Qualifiers.PROJECT);
-  }
-
   @Test
   public void index_source() throws Exception {
     dbTester.prepareDbUnit(getClass(), "index_source.xml");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java
index 1d6e7ce5628e824953de043956a446b8f7ec4314..c5ea4eabe3ca40330dbf739f03256351439f10e8 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/IndexTestsStepTest.java
@@ -25,7 +25,6 @@ import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.sonar.api.config.Settings;
-import org.sonar.api.resources.Qualifiers;
 import org.sonar.batch.protocol.output.BatchReportReader;
 import org.sonar.core.persistence.DbTester;
 import org.sonar.server.component.ComponentTesting;
@@ -67,11 +66,6 @@ public class IndexTestsStepTest extends BaseStepTest {
     return new IndexTestsStep(testIndexer);
   }
 
-  @Test
-  public void supported_project_qualifiers() {
-    assertThat(step().supportedProjectQualifiers()).containsOnly(Qualifiers.PROJECT);
-  }
-
   @Test
   public void index_test() throws Exception {
     dbTester.prepareDbUnit(getClass(), "index_source.xml");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java
index 7eb4a84499a46bf6b63c8c4821a96b3de81c6101..77c87f580a26cae6df02e769b00dca2448760340 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistEventsStepTest.java
@@ -20,7 +20,11 @@
 
 package org.sonar.server.computation.step;
 
-import org.junit.*;
+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;
 import org.junit.rules.TemporaryFolder;
 import org.sonar.api.utils.System2;
@@ -38,7 +42,6 @@ import org.sonar.test.DbTests;
 
 import java.io.File;
 
-import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -81,11 +84,6 @@ public class PersistEventsStepTest extends BaseStepTest {
     session.close();
   }
 
-  @Test
-  public void execute_only_on_projects() {
-    assertThat(step.supportedProjectQualifiers()).containsOnly("TRK");
-  }
-
   @Test
   public void nothing_to_do_when_no_events_in_report() throws Exception {
     dbTester.prepareDbUnit(getClass(), "nothing_to_do_when_no_events_in_report.xml");

diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java
index d12038ba96a06f7474a2ab79e64a228489e5478a..81e423d147a1e0c313639081234b2178f7d91162 100644 (file)
--- a/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/computation/step/PersistProjectLinksStepTest.java
@@ -91,11 +91,6 @@ public class PersistProjectLinksStepTest extends BaseStepTest {
     session.close();
   }
 
-  @Test
-  public void execute_only_on_projects() {
-    assertThat(step.supportedProjectQualifiers()).containsOnly("TRK");
-  }
-
   @Test
   public void add_links_on_project_and_module() throws Exception {
     dbTester.prepareDbUnit(getClass(), "empty.xml");