aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2015-06-02 14:14:25 +0200
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>2015-06-02 14:15:02 +0200
commit1401fcc1796c9adef599cc3d0bc77d87b78834ec (patch)
tree9add471b6226ed2ae9cbbc3fce894fec8707f8b2
parent0638cd03da8e0bbb88f670a103a661d0c18540a6 (diff)
downloadsonarqube-1401fcc1796c9adef599cc3d0bc77d87b78834ec.tar.gz
sonarqube-1401fcc1796c9adef599cc3d0bc77d87b78834ec.zip
add MetricsWsModule
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java36
-rw-r--r--server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java10
-rw-r--r--server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java35
3 files changed, 73 insertions, 8 deletions
diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java
new file mode 100644
index 00000000000..4ac2423a008
--- /dev/null
+++ b/server/sonar-server/src/main/java/org/sonar/server/metric/ws/MetricsWsModule.java
@@ -0,0 +1,36 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.sonar.server.metric.ws;
+
+import org.sonar.core.component.Module;
+
+public class MetricsWsModule extends Module {
+ @Override
+ protected void configureModule() {
+ add(
+ MetricsWs.class,
+ CreateAction.class,
+ DeleteAction.class,
+ DomainsAction.class,
+ SearchAction.class,
+ TypesAction.class);
+ }
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
index 73972ef1ed7..c8b5f739899 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java
@@ -169,8 +169,7 @@ import org.sonar.server.measure.template.ProjectFilter;
import org.sonar.server.measure.ws.ManualMeasuresWs;
import org.sonar.server.measure.ws.TimeMachineWs;
import org.sonar.server.metric.CoreCustomMetrics;
-import org.sonar.server.metric.ws.MetricsWs;
-import org.sonar.server.metric.ws.SearchAction;
+import org.sonar.server.metric.ws.MetricsWsModule;
import org.sonar.server.notifications.NotificationCenter;
import org.sonar.server.notifications.NotificationService;
import org.sonar.server.permission.InternalPermissionService;
@@ -494,13 +493,8 @@ public class PlatformLevel4 extends PlatformLevel {
DefaultMetricFinder.class,
TimeMachineWs.class,
ManualMeasuresWs.class,
- MetricsWs.class,
- SearchAction.class,
- org.sonar.server.metric.ws.TypesAction.class,
- org.sonar.server.metric.ws.DomainsAction.class,
- org.sonar.server.metric.ws.DeleteAction.class,
- org.sonar.server.metric.ws.CreateAction.class,
+ MetricsWsModule.class,
// quality gates
QualityGateDao.class,
diff --git a/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java
new file mode 100644
index 00000000000..fba94669370
--- /dev/null
+++ b/server/sonar-server/src/test/java/org/sonar/server/metric/ws/MetricsWsModuleTest.java
@@ -0,0 +1,35 @@
+/*
+ * SonarQube, open source software quality management tool.
+ * Copyright (C) 2008-2014 SonarSource
+ * mailto:contact AT sonarsource DOT com
+ *
+ * SonarQube is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * SonarQube is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+package org.sonar.server.metric.ws;
+
+import org.junit.Test;
+import org.sonar.core.platform.ComponentContainer;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class MetricsWsModuleTest {
+ @Test
+ public void verify_count_of_added_components() {
+ ComponentContainer container = new ComponentContainer();
+ new MetricsWsModule().configure(container);
+ assertThat(container.size()).isEqualTo(8);
+ }
+}