From 7c02798680ccd9742d8182e876b01cd0238a25c7 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Thu, 21 May 2015 11:34:35 +0200 Subject: [PATCH] Remove ComputationStep.supportedProjectQualifiers() as it was only used for Views --- .../server/computation/ComputationService.java | 9 +++------ .../computation/step/ApplyPermissionsStep.java | 6 ------ .../server/computation/step/ComputationStep.java | 5 ----- .../computation/step/IndexComponentsStep.java | 6 ------ .../server/computation/step/IndexIssuesStep.java | 6 ------ .../computation/step/IndexSourceLinesStep.java | 6 ------ .../server/computation/step/IndexTestsStep.java | 6 ------ .../server/computation/step/IndexViewsStep.java | 6 ------ .../server/computation/step/ParseReportStep.java | 6 ------ .../computation/step/PersistDuplicationsStep.java | 6 ------ .../server/computation/step/PersistEventsStep.java | 6 ------ .../computation/step/PersistFileSourcesStep.java | 6 ------ .../server/computation/step/PersistIssuesStep.java | 12 +++++------- .../computation/step/PersistMeasuresStep.java | 6 ------ .../PersistNumberOfDaysSinceLastCommitStep.java | 6 ------ .../computation/step/PersistProjectLinksStep.java | 6 ------ .../server/computation/step/PersistTestsStep.java | 6 ------ .../computation/step/PurgeDatastoresStep.java | 6 ------ .../step/SendIssueNotificationsStep.java | 12 +++++------- .../server/computation/step/SwitchSnapshotStep.java | 6 ------ .../server/computation/ComputationServiceTest.java | 13 ++++--------- .../sonar/server/computation/step/BaseStepTest.java | 1 - .../computation/step/IndexSourceLinesStepTest.java | 9 +-------- .../server/computation/step/IndexTestsStepTest.java | 6 ------ .../computation/step/PersistEventsStepTest.java | 12 +++++------- .../step/PersistProjectLinksStepTest.java | 5 ----- 26 files changed, 23 insertions(+), 157 deletions(-) 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 f48a8fd3368..3fa3e2c7ac6 100644 --- 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 b43a7679bfa..022ee3eb068 100644 --- 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 7f5577f8fcd..69e13111896 100644 --- 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 aba41a433b2..60d3f219759 100644 --- 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 ac55607385a..e1caae311ef 100644 --- 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 8bcc854162b..35f0e12de9f 100644 --- 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 7c44fd7c9b7..c6498ed21cb 100644 --- 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 1825f6c2466..98ca5fdc826 100644 --- 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 720ee98c872..af46d652ac4 100644 --- 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 582a469e45c..68234957871 100644 --- 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 c23ea3fe6d7..2b1f3c7ef90 100644 --- 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 78df32a46aa..b8ce0a1f5d3 100644 --- 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 139280a3b9a..0c781491669 100644 --- 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 b020867387b..0094159b298 100644 --- 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 f9560150120..c518eec3825 100644 --- 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 e94a1aad53d..ac6f68f9cba 100644 --- 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 c3180f8e665..b4b49bd8a71 100644 --- 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 8e9417f4626..e7be2274c05 100644 --- 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 977d31e6aa6..614c5373a4f 100644 --- 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 b073cd53ca1..5d39075307e 100644 --- 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 3d275761af4..7a32079aae0 100644 --- 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 224a8316a39..af67e9b6038 100644 --- 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 3b701890519..bf0ba151e54 100644 --- 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 1d6e7ce5628..c5ea4eabe3c 100644 --- 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 7eb4a84499a..77c87f580a2 100644 --- 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 d12038ba96a..81e423d147a 100644 --- 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"); -- 2.39.5