diff options
| author | Sébastien Lesaint <sebastien.lesaint@sonarsource.com> | 2018-06-29 17:43:30 +0200 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2018-07-09 10:39:31 +0200 |
| commit | b6db84fc5567c190f2df589c4dbca59852200e05 (patch) | |
| tree | f70f5273cee6621897c2dc023764cbbf82e4851b /server | |
| parent | f311f5e5c9ee2be43bea3b632f6e4f5920450d36 (diff) | |
| download | sonarqube-b6db84fc5567c190f2df589c4dbca59852200e05.tar.gz sonarqube-b6db84fc5567c190f2df589c4dbca59852200e05.zip | |
remove useless debt classes from Compute Engine
Diffstat (limited to 'server')
4 files changed, 1 insertions, 11 deletions
diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index ab5d85d7efb..d35935d8943 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -88,8 +88,6 @@ import org.sonar.process.Props; import org.sonar.process.logging.LogbackHelper; import org.sonar.server.component.index.ComponentIndexer; import org.sonar.server.config.ConfigurationProvider; -import org.sonar.server.debt.DebtModelPluginRepository; -import org.sonar.server.debt.DebtRulesXMLImporter; import org.sonar.server.es.EsModule; import org.sonar.server.es.ProjectIndexersImpl; import org.sonar.server.event.NewAlerts; @@ -430,10 +428,6 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { DoNotFixNotificationDispatcher.newMetadata(), NewIssuesNotificationFactory.class, // used by SendIssueNotificationsStep - // technical debt - DebtModelPluginRepository.class, - DebtRulesXMLImporter.class, - // Notifications AlertsEmailTemplate.class, EmailSettings.class, diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java index c658dd775ff..44a7ba9cf5c 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/ComputeEngineContainerImplTest.java @@ -97,7 +97,7 @@ public class ComputeEngineContainerImplTest { assertThat(picoContainer.getComponentAdapters()) .hasSize( CONTAINER_ITSELF - + 75 // level 4 + + 73 // level 4 + 21 // content of QualityGateModule + 6 // content of CeConfigurationModule + 4 // content of CeQueueModule diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java index 037f03fd353..82c9fda381a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtModelPluginRepository.java @@ -29,7 +29,6 @@ import java.util.Collections; import java.util.Map; import org.picocontainer.Startable; import org.sonar.api.Plugin; -import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; import org.sonar.core.platform.PluginInfo; import org.sonar.core.platform.PluginRepository; @@ -45,7 +44,6 @@ import static com.google.common.collect.Lists.newArrayList; * </p> */ @ServerSide -@ComputeEngineSide public class DebtModelPluginRepository implements Startable { public static final String DEFAULT_MODEL = "technical-debt"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java index 6a54c92d562..4eee358fdbf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/debt/DebtRulesXMLImporter.java @@ -37,7 +37,6 @@ import org.codehaus.staxmate.SMInputFactory; import org.codehaus.staxmate.in.SMHierarchicCursor; import org.codehaus.staxmate.in.SMInputCursor; import org.sonar.api.rule.RuleKey; -import org.sonar.api.ce.ComputeEngineSide; import org.sonar.api.server.ServerSide; import org.sonar.api.utils.Duration; import org.sonar.api.utils.ValidationMessages; @@ -69,7 +68,6 @@ import static org.sonar.server.debt.DebtModelXMLExporter.RULE_KEY; * Import rules debt definitions from an XML */ @ServerSide -@ComputeEngineSide public class DebtRulesXMLImporter { public List<RuleDebt> importXML(String xml, ValidationMessages validationMessages) { |