diff options
| author | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-09-27 23:20:27 +0200 |
|---|---|---|
| committer | Simon Brandhof <simon.brandhof@sonarsource.com> | 2017-09-28 16:45:25 +0200 |
| commit | 28b037824df235edd3dc599b517977ee31cb7547 (patch) | |
| tree | 68441a2b6cdb88e454159694ec0cd635430dfeb0 /server | |
| parent | bfb49e25b626c15b9fcd9ef144222442da1df391 (diff) | |
| download | sonarqube-28b037824df235edd3dc599b517977ee31cb7547.tar.gz sonarqube-28b037824df235edd3dc599b517977ee31cb7547.zip | |
Access ProjectMeasuresIndex from Compute Engine
Diffstat (limited to 'server')
3 files changed, 7 insertions, 1 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 9d777bc0e7d..3b17e7b545c 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 @@ -98,6 +98,7 @@ import org.sonar.server.issue.notification.NewIssuesNotificationDispatcher; import org.sonar.server.issue.notification.NewIssuesNotificationFactory; import org.sonar.server.issue.workflow.FunctionExecutor; import org.sonar.server.issue.workflow.IssueWorkflow; +import org.sonar.server.measure.index.ProjectMeasuresIndex; import org.sonar.server.measure.index.ProjectMeasuresIndexer; import org.sonar.server.metric.CoreCustomMetrics; import org.sonar.server.metric.DefaultMetricFinder; @@ -341,6 +342,7 @@ public class ComputeEngineContainerImpl implements ComputeEngineContainer { // measure CoreCustomMetrics.class, DefaultMetricFinder.class, + ProjectMeasuresIndex.class, // users DeprecatedUserFinder.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 9f4b1ac07e1..235bd4cc071 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 @@ -129,7 +129,7 @@ public class ComputeEngineContainerImplTest { assertThat(picoContainer.getComponentAdapters()) .hasSize( CONTAINER_ITSELF - + 73 // level 4 + + 74 // level 4 + 4 // content of CeConfigurationModule + 7 // content of CeQueueModule + 4 // content of CeHttpModule diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java b/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java index 1015e27b289..dc7c3db668f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java +++ b/server/sonar-server/src/main/java/org/sonar/server/measure/index/ProjectMeasuresIndex.java @@ -48,6 +48,8 @@ import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilde import org.elasticsearch.search.aggregations.bucket.terms.support.IncludeExclude; import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.sort.FieldSortBuilder; +import org.sonar.api.ce.ComputeEngineSide; +import org.sonar.api.server.ServerSide; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.server.es.DefaultIndexSettingsElement; import org.sonar.server.es.EsClient; @@ -102,6 +104,8 @@ import static org.sonarqube.ws.client.project.ProjectsWsParameters.FILTER_LANGUA import static org.sonarqube.ws.client.project.ProjectsWsParameters.FILTER_TAGS; import static org.sonarqube.ws.client.project.ProjectsWsParameters.MAX_PAGE_SIZE; +@ComputeEngineSide +@ServerSide public class ProjectMeasuresIndex { public static final List<String> SUPPORTED_FACETS = ImmutableList.of( |