]> source.dussan.org Git - sonarqube.git/commitdiff
rename web service actions with the domainWsAction form
authorTeryk Bellahsene <teryk.bellahsene@sonarsource.com>
Fri, 15 May 2015 08:54:05 +0000 (10:54 +0200)
committerTeryk Bellahsene <teryk.bellahsene@sonarsource.com>
Fri, 15 May 2015 08:55:28 +0000 (10:55 +0200)
154 files changed:
server/sonar-server/src/main/java/org/sonar/server/batch/BatchAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java
server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java
server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java
server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java
server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java
server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java
server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/component/ws/ProvisionedProjectsAction.java
server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java
server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWs.java
server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/design/ws/ShowAction.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/BaseIssuesWsAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java
server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/BaseQGateWsAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGateWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java
server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BaseQProfileWsAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileBackupAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangelogAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCompareAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCopyAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileDeleteAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportersAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileImportersAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRenameAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSearchAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultAction.java
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java
server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java
server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java
server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java
server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java
server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java
server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java
server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java
server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java
server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/test/ws/TestAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java
server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsListAction.java
server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java
server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java
server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java
server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java
server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/BaseUsersWsAction.java [deleted file]
server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java
server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java [new file with mode: 0644]
server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java
server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/filter_by_tags.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_note_as_markdown_and_html.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags_filtered.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags_limited.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules_fields.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules_params.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rule.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_sticky.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_no_rules.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules_inheritance.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_rules_from_template_key.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_template_rules.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/severities_facet.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_active.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_no_active.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/statuses_facet.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/statuses_facet_sticky.json [deleted file]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/filter_by_tags.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_note_as_markdown_and_html.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags_filtered.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags_limited.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_2_rules.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_2_rules_fields.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_active_rules.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_active_rules_params.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rule.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_sticky.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_no_rules.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_profile_active_rules.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_profile_active_rules_inheritance.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_rules_from_template_key.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_template_rules.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/severities_facet.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/show_rule_active.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/show_rule_no_active.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/statuses_facet.json [new file with mode: 0644]
server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/statuses_facet_sticky.json [new file with mode: 0644]

diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchAction.java
deleted file mode 100644 (file)
index 367935d..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.batch;
-
-import org.sonar.server.ws.WsAction;
-
-public interface BatchAction extends WsAction {
-
-  // Marker interface
-}
index 383c1847cf99a252bb067d94b231668a8f08b05f..df6a4bccbb8e292ff29b4a4eb8bf3efe149a175b 100644 (file)
@@ -33,9 +33,9 @@ public class BatchWs implements WebService {
   public static final String API_ENDPOINT = "batch";
 
   private final BatchIndex batchIndex;
-  private final BatchAction[] actions;
+  private final BatchWsAction[] actions;
 
-  public BatchWs(BatchIndex batchIndex, BatchAction... actions) {
+  public BatchWs(BatchIndex batchIndex, BatchWsAction... actions) {
     this.batchIndex = batchIndex;
     this.actions = actions;
   }
@@ -48,7 +48,7 @@ public class BatchWs implements WebService {
 
     defineIndexAction(controller);
     defineFileAction(controller);
-    for (BatchAction action : actions) {
+    for (BatchWsAction action : actions) {
       action.define(controller);
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java
new file mode 100644 (file)
index 0000000..66f279a
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * 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.batch;
+
+import org.sonar.server.ws.WsAction;
+
+public interface BatchWsAction extends WsAction {
+  // Marker interface
+}
index 9f76061023a20313a6d1943196e99cde1e120073..92ca5e923b337b09e08ab25d956f243100547286 100644 (file)
@@ -36,7 +36,7 @@ import org.sonar.server.exceptions.ForbiddenException;
 import org.sonar.server.plugins.MimeTypes;
 import org.sonar.server.user.UserSession;
 
-public class GlobalRepositoryAction implements BatchAction {
+public class GlobalRepositoryAction implements BatchWsAction {
 
   private final DbClient dbClient;
   private final PropertiesDao propertiesDao;
index 16b3c4b0bec38623d1858b6b02886892455fb88a..e7177cea1c5c5a9f56d3da8ec9bad77b63804f9f 100644 (file)
 
 package org.sonar.server.batch;
 
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
 import org.sonar.api.resources.Scopes;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
@@ -40,9 +35,15 @@ import org.sonar.server.issue.index.IssueIndex;
 import org.sonar.server.plugins.MimeTypes;
 import org.sonar.server.user.UserSession;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
 import static com.google.common.collect.Maps.newHashMap;
 
-public class IssuesAction implements BatchAction {
+public class IssuesAction implements BatchWsAction {
 
   private static final String PARAM_KEY = "key";
 
index 9b7557aafdf773981082218f5ef007c1d3c7db25..9a1369f590ef8a87bdb5c751ebf10a35c53b5832 100644 (file)
@@ -27,7 +27,7 @@ import org.sonar.api.server.ws.WebService;
 import org.sonar.batch.protocol.input.ProjectRepositories;
 import org.sonar.server.plugins.MimeTypes;
 
-public class ProjectRepositoryAction implements BatchAction {
+public class ProjectRepositoryAction implements BatchWsAction {
 
   private static final String PARAM_KEY = "key";
   private static final String PARAM_PROFILE = "profile";
index 46f2c0d167191ec7685ea23a5a45d2c39b7058b7..a4ecc638736068eca0709e4b7463d6deb13d37bd 100644 (file)
@@ -34,7 +34,7 @@ import org.sonar.server.user.UserSession;
 import org.sonar.server.user.index.UserDoc;
 import org.sonar.server.user.index.UserIndex;
 
-public class UsersAction implements BatchAction {
+public class UsersAction implements BatchWsAction {
 
   private static final String PARAM_LOGINS = "logins";
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsAction.java
deleted file mode 100644 (file)
index ddbe535..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.component.ws;
-
-import org.sonar.server.ws.WsAction;
-
-public interface ProjectsAction extends WsAction {
-  // marker interface
-}
index 4b99a290d58466e3696847de1eb1a5c4a25c80f9..13ab2556780103e22650204979e581ab9287f2d5 100644 (file)
@@ -25,9 +25,9 @@ import org.sonar.api.server.ws.RailsHandler;
 import org.sonar.api.server.ws.WebService;
 
 public class ProjectsWs implements WebService {
-  private final ProjectsAction[] actions;
+  private final ProjectsWsAction[] actions;
 
-  public ProjectsWs(ProjectsAction... actions) {
+  public ProjectsWs(ProjectsWsAction... actions) {
     this.actions = actions;
   }
 
@@ -41,7 +41,7 @@ public class ProjectsWs implements WebService {
     defineCreateAction(controller);
     defineDestroyAction(controller);
 
-    for (ProjectsAction action : actions) {
+    for (ProjectsWsAction action : actions) {
       action.define(controller);
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWsAction.java
new file mode 100644 (file)
index 0000000..6423e0c
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * 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.component.ws;
+
+import org.sonar.server.ws.WsAction;
+
+public interface ProjectsWsAction extends WsAction {
+  // marker interface
+}
index 7acf67b055d86f1ada9a792ca3d1cfe25296648f..9abbd5c5907244d6f3f0f060389a3d4b207d43ed 100644 (file)
@@ -38,7 +38,7 @@ import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-public class ProvisionedProjectsAction implements ProjectsAction {
+public class ProvisionedProjectsAction implements ProjectsWsAction {
   private static final List<String> POSSIBLE_FIELDS = Arrays.asList("uuid", "key", "name", "creationDate");
 
   private final DbClient dbClient;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsAction.java
deleted file mode 100644 (file)
index f49cb28..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.dashboard.ws;
-
-import org.sonar.server.ws.WsAction;
-
-public interface DashboardsAction extends WsAction {
-
-  // Marker interface
-
-}
index 71e26c747dd9be7f683bab2a19dce54e9a95c813..b70211d339ebeed5e095c692a2fdb675d1df4cc3 100644 (file)
@@ -20,7 +20,6 @@
 package org.sonar.server.dashboard.ws;
 
 import com.google.common.collect.ListMultimap;
-import java.util.Collection;
 import org.sonar.api.server.ws.Request;
 import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
@@ -34,7 +33,9 @@ import org.sonar.server.db.DbClient;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.user.UserSession;
 
-public class DashboardsShowAction implements DashboardsAction {
+import java.util.Collection;
+
+public class DashboardsShowAction implements DashboardsWsAction {
 
   private static final String PARAM_KEY = "key";
 
index b3c8c7d93fa61957bb584074f7dab94bd2b1750d..a300c384c6fdba5bbd19c927e706818394884f5f 100644 (file)
@@ -23,9 +23,9 @@ import org.sonar.api.server.ws.WebService;
 
 public class DashboardsWs implements WebService {
 
-  private final DashboardsAction[] actions;
+  private final DashboardsWsAction[] actions;
 
-  public DashboardsWs(DashboardsAction... actions) {
+  public DashboardsWs(DashboardsWsAction... actions) {
     this.actions = actions;
   }
 
@@ -34,7 +34,7 @@ public class DashboardsWs implements WebService {
     NewController controller = context.createController("api/dashboards");
     controller.setSince("5.0");
     controller.setDescription("Management of dashboards and widgets");
-    for (DashboardsAction action : actions) {
+    for (DashboardsWsAction action : actions) {
       action.define(controller);
     }
     controller.done();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWsAction.java
new file mode 100644 (file)
index 0000000..46caef9
--- /dev/null
@@ -0,0 +1,28 @@
+/*
+ * 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.dashboard.ws;
+
+import org.sonar.server.ws.WsAction;
+
+public interface DashboardsWsAction extends WsAction {
+
+  // Marker interface
+
+}
index 7e3878981a8cab4c1619e7fba4bf99daa376afcb..2c5f3203ff47f540a9d0e19ce71c5c2c6cd29cbd 100644 (file)
@@ -36,9 +36,9 @@ import org.sonar.core.design.FileDependencyDto;
 import org.sonar.core.persistence.DbSession;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.user.UserSession;
-import org.sonar.server.user.ws.BaseUsersWsAction;
+import org.sonar.server.user.ws.UsersWsAction;
 
-public class ShowAction implements BaseUsersWsAction {
+public class ShowAction implements UsersWsAction {
 
   private static final String PARAM_FROM_PARENT_UUID = "fromParentUuid";
   private static final String PARAM_TO_PARENT_UUID = "toParentUuid";
index 880d8ac9e8a3ae42374bd6fc9e7ede62fc30801e..8ff65318f6b24c7c51ab7a13ed24a442864d435f 100644 (file)
@@ -28,7 +28,7 @@ import org.sonar.api.server.ws.WebService.Param;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.server.issue.IssueService;
 
-public class AuthorsAction implements BaseIssuesWsAction {
+public class AuthorsAction implements IssuesWsAction {
 
   private final IssueService service;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BaseIssuesWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/BaseIssuesWsAction.java
deleted file mode 100644 (file)
index 60fa19c..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.issue.ws;
-
-import org.sonar.server.ws.WsAction;
-
-interface BaseIssuesWsAction extends WsAction {
-
-  // Marker interface
-
-}
-
index 7b634bec3c8d9e5e6bafcfe281c7fb60d30e6be9..962e9c4da5e1a892bd1458afd8cfe05a701adadd 100644 (file)
@@ -38,7 +38,7 @@ import java.util.Map;
  * List issue tags matching a given query.
  * @since 5.1
  */
-public class ComponentTagsAction implements BaseIssuesWsAction {
+public class ComponentTagsAction implements IssuesWsAction {
 
   private static final String PARAM_COMPONENT_UUID = "componentUuid";
   private static final String PARAM_CREATED_AT = "createdAfter";
index 93d94ccada87cef31b168d1afe82ccee646c6423..cce3de4defe89ffad8cd83a0d8e1dadf4c3a0531 100644 (file)
@@ -58,7 +58,7 @@ import org.sonar.server.user.UserSession;
 
 import static com.google.common.collect.Maps.newHashMap;
 
-public class IssueShowAction implements BaseIssuesWsAction {
+public class IssueShowAction implements IssuesWsAction {
 
   public static final String SHOW_ACTION = "show";
 
index df9e92da85078f24634bef8ab2864d28bded3e7c..37311ccfdea13fef7ad4eac1b71a8c2f0941e286 100644 (file)
@@ -42,9 +42,9 @@ public class IssuesWs implements WebService {
   public static final String DO_ACTION_ACTION = "do_action";
   public static final String BULK_CHANGE_ACTION = "bulk_change";
 
-  private final BaseIssuesWsAction[] actions;
+  private final IssuesWsAction[] actions;
 
-  public IssuesWs(BaseIssuesWsAction... actions) {
+  public IssuesWs(IssuesWsAction... actions) {
     this.actions = actions;
   }
 
@@ -53,7 +53,7 @@ public class IssuesWs implements WebService {
     NewController controller = context.createController(API_ENDPOINT);
     controller.setDescription("Coding rule issues");
     controller.setSince("3.6");
-    for (BaseIssuesWsAction action : actions) {
+    for (IssuesWsAction action : actions) {
       action.define(controller);
     }
     defineRailsActions(controller);
diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java
new file mode 100644 (file)
index 0000000..249b51e
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * 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.issue.ws;
+
+import org.sonar.server.ws.WsAction;
+
+interface IssuesWsAction extends WsAction {
+  // Marker interface
+}
index 2956de301339d9c2ed4bf774a7b7043f6d0407c0..c0069644ae21dd715c83da547f4d4fc47822ab31 100644 (file)
@@ -74,7 +74,7 @@ import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.Maps.newHashMap;
 import static com.google.common.collect.Sets.newHashSet;
 
-public class SearchAction implements BaseIssuesWsAction {
+public class SearchAction implements IssuesWsAction {
 
   public static final String SEARCH_ACTION = "search";
 
index f6ccf7dc444d2f4641085453ad563a9557ae5525..03cbbbf9222f3439ad87b54b260e09bb17104421 100644 (file)
@@ -34,7 +34,7 @@ import java.util.List;
 /**
  * Set tags on an issue
  */
-public class SetTagsAction implements BaseIssuesWsAction {
+public class SetTagsAction implements IssuesWsAction {
 
   private final IssueService service;
 
index d4a862d16784e41e0dde741011a1cdbe6fd605c5..89c4d5fa7a5e4db45573870e125083dc3cd53b60 100644 (file)
@@ -32,7 +32,7 @@ import org.sonar.server.issue.IssueService;
  * List issue tags matching a given query.
  * @since 5.1
  */
-public class TagsAction implements BaseIssuesWsAction {
+public class TagsAction implements IssuesWsAction {
 
   private final IssueService service;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/BaseQGateWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/BaseQGateWsAction.java
deleted file mode 100644 (file)
index 08604fa..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.qualitygate.ws;
-
-import org.sonar.server.ws.WsAction;
-
-public interface BaseQGateWsAction extends WsAction {
-
-  // Marker interface
-}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGateWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGateWsAction.java
new file mode 100644 (file)
index 0000000..2d37074
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * 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.qualitygate.ws;
+
+import org.sonar.server.ws.WsAction;
+
+public interface QGateWsAction extends WsAction {
+
+  // Marker interface
+}
index 825a7e22308959ccf6b6bd9ac2d93a22ad051c35..1996e96462a2dbb81c9e1427b80bb29b41a7a8da 100644 (file)
@@ -31,7 +31,7 @@ import org.sonar.server.qualitygate.QualityGates;
 
 import java.util.Locale;
 
-public class QGatesAppAction implements BaseQGateWsAction {
+public class QGatesAppAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 237513b2edbc95c853dddd54ced3088f266b4294..c61f2a278385c77264ead88ddc69894971b2242d 100644 (file)
@@ -27,7 +27,7 @@ import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.qualitygate.db.QualityGateDto;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesCopyAction implements BaseQGateWsAction {
+public class QGatesCopyAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index c9c15aa0ffed527c72514cb890711efcabd69992..d3114898a6238e7f4e937d316919165eae571114 100644 (file)
@@ -27,7 +27,7 @@ import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.qualitygate.db.QualityGateDto;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesCreateAction implements BaseQGateWsAction {
+public class QGatesCreateAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 46bb19693f886022b5d5f5ff12f98cc656c1a63b..927622e4924628be7a3c54ffc21280e0b7a79131 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesCreateConditionAction implements BaseQGateWsAction {
+public class QGatesCreateConditionAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 79e5cbf6c957ac0fb87d3750e214ad9a88963e90..2edfc8da6793f7252f7172f6b60f16b6c025ed07 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesDeleteConditionAction implements BaseQGateWsAction {
+public class QGatesDeleteConditionAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 24f3946612cba5c42eb58a6dfe33f2c769335672..8bdcb84dc889942dd15636f22270d78ff7920d0f 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesDeselectAction implements BaseQGateWsAction {
+public class QGatesDeselectAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index d48762807c7d99391badf22874b3a533f863d1d2..e8aa7871747de841ff834d85dc294d58300b42df 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesDestroyAction implements BaseQGateWsAction {
+public class QGatesDestroyAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 8d28a4bc5f29230dd2e2b70b94643c28017d2f07..d7f5d37056602c02b60cdd4bbd2113db7e79290b 100644 (file)
@@ -28,7 +28,7 @@ import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.qualitygate.db.QualityGateDto;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesListAction implements BaseQGateWsAction {
+public class QGatesListAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index a091fc252a6c5b1dcf72233df05c9c37e5b71274..8491c29ff8b3d8ef59cb9e13ea31b45338512f49 100644 (file)
@@ -27,7 +27,7 @@ import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.core.qualitygate.db.QualityGateDto;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesRenameAction implements BaseQGateWsAction {
+public class QGatesRenameAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index be456a36f8bce31c7274ea76f0c65702a3624b86..e21973ceb65ceb653074bb4b21b33842a41478e9 100644 (file)
@@ -29,7 +29,7 @@ import org.sonar.core.qualitygate.db.ProjectQgateAssociation;
 import org.sonar.core.qualitygate.db.ProjectQgateAssociationQuery;
 import org.sonar.server.qualitygate.QgateProjectFinder;
 
-public class QGatesSearchAction implements BaseQGateWsAction {
+public class QGatesSearchAction implements QGateWsAction {
 
   private final QgateProjectFinder projectFinder;
 
index 27d0da8a1c995b91100ce1fb68a7b274934dc2ca..ce760117cbc247899053559d968f743c1d93213c 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesSelectAction implements BaseQGateWsAction {
+public class QGatesSelectAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 3d60abb07dcb6c59c30f504bc2363e1e186f813c..18fc05e019a0ef7bb2edcc2fea1687567ab995ff 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesSetAsDefaultAction implements BaseQGateWsAction {
+public class QGatesSetAsDefaultAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 18bdee9ecab80af80998d69c4e1e3f0ebd02c3b1..74710fa0f756b35d3b79d55e750da2edc62b8554 100644 (file)
@@ -34,7 +34,7 @@ import javax.annotation.Nullable;
 
 import java.util.Collection;
 
-public class QGatesShowAction implements BaseQGateWsAction {
+public class QGatesShowAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index e497c3db78df64ae781c0f2628d1ba14a7331645..ab76b7ec7555f4e48d788d11411c4d1561cc8173 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesUnsetDefaultAction implements BaseQGateWsAction {
+public class QGatesUnsetDefaultAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 090d00eca3e57e5a9c70c6886dcda4004820bdc3..1a5d8bf596ce89ea428221bb5960ea1d7e79850d 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualitygate.QualityGates;
 
-public class QGatesUpdateConditionAction implements BaseQGateWsAction {
+public class QGatesUpdateConditionAction implements QGateWsAction {
 
   private final QualityGates qualityGates;
 
index 3a47200d124d9c423cd78e4a803e321ae3597110..bb8bff8abba59f0d28119bdbcb452f215c9476fb 100644 (file)
@@ -42,9 +42,9 @@ public class QGatesWs implements WebService {
   static final String PARAM_PROJECT_ID = "projectId";
   static final String PARAM_ID = "id";
 
-  private final BaseQGateWsAction[] actions;
+  private final QGateWsAction[] actions;
 
-  public QGatesWs(BaseQGateWsAction... actions) {
+  public QGatesWs(QGateWsAction... actions) {
     this.actions = actions;
   }
 
@@ -54,7 +54,7 @@ public class QGatesWs implements WebService {
       .setSince("4.3")
       .setDescription("This service manages quality gates, including conditions and project association");
 
-    for (BaseQGateWsAction action : actions) {
+    for (QGateWsAction action : actions) {
       action.define(controller);
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BaseQProfileWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BaseQProfileWsAction.java
deleted file mode 100644 (file)
index 68a1d96..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.qualityprofile.ws;
-
-import org.sonar.server.ws.WsAction;
-
-/**
- * Marker interface for quality profile related web service end points
- */
-public interface BaseQProfileWsAction extends WsAction {
-
-  // Marker interface
-}
index aa347835a4875443524250dc4938f33e628b7211..f87f637f9569383c0479303751eb42714ca757b5 100644 (file)
@@ -35,7 +35,7 @@ import org.sonar.server.qualityprofile.QProfileFactory;
 
 import java.io.OutputStreamWriter;
 
-public class QProfileBackupAction implements BaseQProfileWsAction {
+public class QProfileBackupAction implements QProfileWsAction {
 
   private final QProfileBackuper backuper;
 
index 2b99c76429c35a5dd417f92dccf2a198815dd6f4..034cddd63466132a516e24ce5631ac361e1c82e3 100644 (file)
@@ -34,7 +34,7 @@ import org.sonar.server.user.UserSession;
 
 import static org.apache.commons.lang.StringUtils.isEmpty;
 
-public class QProfileChangeParentAction implements BaseQProfileWsAction {
+public class QProfileChangeParentAction implements QProfileWsAction {
 
   private static final String PARAM_PARENT_KEY = "parentKey";
 
index 04f2b73385ba671c9f4641a6bed2ee6385e5e508..6ad199294d5b28fa818bc2d12dfed3dbe14399a9 100644 (file)
@@ -44,7 +44,7 @@ import org.sonar.server.search.Result;
 import java.util.Date;
 import java.util.Map.Entry;
 
-public class QProfileChangelogAction implements BaseQProfileWsAction {
+public class QProfileChangelogAction implements QProfileWsAction {
 
   private static final String PARAM_SINCE = "since";
   private static final String PARAM_TO = "to";
index abbcedbf59e9002b6970d1e2be185d4cd7d58043..b455ab57d9c9580dec7ee3a44dcd01574a508cb0 100644 (file)
@@ -44,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-public class QProfileCompareAction implements BaseQProfileWsAction {
+public class QProfileCompareAction implements QProfileWsAction {
 
   private static final String ATTRIBUTE_LEFT = "left";
   private static final String ATTRIBUTE_RIGHT = "right";
index 341bf118083fbb1dd998c03e8d0aa62477755976..99b0a5c862fa0709cd20693ea122faa75ec9102b 100644 (file)
@@ -30,7 +30,7 @@ import org.sonar.core.qualityprofile.db.QualityProfileDto;
 import org.sonar.server.qualityprofile.QProfileCopier;
 import org.sonar.server.user.UserSession;
 
-public class QProfileCopyAction implements BaseQProfileWsAction {
+public class QProfileCopyAction implements QProfileWsAction {
 
   private static final String PARAM_PROFILE_NAME = "toName";
   private static final String PARAM_PROFILE_KEY = "fromKey";
index 6362ffb4a69459200b05e2f8f8946232704b10a9..18b7b821f28979480cf2c2b602dd6afff0b2fc00 100644 (file)
@@ -38,7 +38,7 @@ import org.sonar.server.qualityprofile.QProfileResult;
 import java.io.InputStream;
 import org.sonar.server.user.UserSession;
 
-public class QProfileCreateAction implements BaseQProfileWsAction {
+public class QProfileCreateAction implements QProfileWsAction {
 
   private static final String PARAM_PROFILE_NAME = "name";
   private static final String PARAM_LANGUAGE = "language";
index af966a63349182b5cc25339653b7de7d5e4e3d14..800031e678019adb93e51e0792548205a36df7d1 100644 (file)
@@ -30,7 +30,7 @@ import org.sonar.server.db.DbClient;
 import org.sonar.server.qualityprofile.QProfileFactory;
 import org.sonar.server.user.UserSession;
 
-public class QProfileDeleteAction implements BaseQProfileWsAction {
+public class QProfileDeleteAction implements QProfileWsAction {
 
   private final Languages languages;
   private final QProfileFactory profileFactory;
index 992b9a8c5fbf7ceec9f8874623effdbe60d11d5b..9efca568911f08b0624547cde994e460f69cfba8 100644 (file)
@@ -44,7 +44,7 @@ import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.List;
 
-public class QProfileExportAction implements BaseQProfileWsAction {
+public class QProfileExportAction implements QProfileWsAction {
 
   private static final String PARAM_PROFILE_NAME = "name";
   private static final String PARAM_LANGUAGE = "language";
index 76324f7484927fcb2db7fad7f42124eae63a6f98..fff90fc19c0981bf371070cd836751da900cee02 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService.NewController;
 import org.sonar.api.utils.text.JsonWriter;
 
-public class QProfileExportersAction implements BaseQProfileWsAction {
+public class QProfileExportersAction implements QProfileWsAction {
 
   private ProfileExporter[] exporters;
 
index 8b9389b4cc48a5ded78f5352729ae04d09281232..dba30bfb00f56271aeadfa6053911557b1ef23aa 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.utils.text.JsonWriter;
 
-public class QProfileImportersAction implements BaseQProfileWsAction {
+public class QProfileImportersAction implements QProfileWsAction {
 
   private final ProfileImporter[] importers;
 
index ed3c13c5fee12c2759da1aab88fe9a91139fa1c7..fd1790e2fe84a79209872a3183f90778f0bb51bf 100644 (file)
@@ -43,7 +43,7 @@ import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Map;
 
-public class QProfileInheritanceAction implements BaseQProfileWsAction {
+public class QProfileInheritanceAction implements QProfileWsAction {
 
   private final DbClient dbClient;
 
index aabf7126c45bc728183f4036b7225024d796f1cb..c36b90a3e778a7caf8a93fef7f7ba510c50725a8 100644 (file)
@@ -42,7 +42,7 @@ import org.sonar.server.db.DbClient;
 import org.sonar.server.exceptions.NotFoundException;
 import org.sonar.server.user.UserSession;
 
-public class QProfileProjectsAction implements BaseQProfileWsAction {
+public class QProfileProjectsAction implements QProfileWsAction {
 
   private static final String PARAM_KEY = "key";
   private static final String PARAM_SELECTED = "selected";
index a29c80b8b91098255516d06822ab6e504c81ab5e..65ef7a3b8d1c75d273da5607d8815942f9bedb40 100644 (file)
@@ -27,7 +27,7 @@ import org.sonar.core.permission.GlobalPermissions;
 import org.sonar.server.qualityprofile.QProfileFactory;
 import org.sonar.server.user.UserSession;
 
-public class QProfileRenameAction implements BaseQProfileWsAction {
+public class QProfileRenameAction implements QProfileWsAction {
 
   private static final String PARAM_PROFILE_NAME = "name";
   private static final String PARAM_PROFILE_KEY = "key";
index b6290e909576e5c46082067b79ff231f4a76861c..0daf91ff217690134c12ea4c825e6d77ecd9747f 100644 (file)
@@ -35,7 +35,7 @@ import org.sonar.server.qualityprofile.BulkChangeResult;
 import org.sonar.server.qualityprofile.QProfileBackuper;
 import org.sonar.server.user.UserSession;
 
-public class QProfileRestoreAction implements BaseQProfileWsAction {
+public class QProfileRestoreAction implements QProfileWsAction {
 
   private static final String PARAM_BACKUP = "backup";
   private final QProfileBackuper backuper;
index 22cbb5d2aed5c5dfe5df0aaf29f6389ac25905c6..9127ebefd45ab5d59473838e1752732393aa7b7a 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.Response;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.server.qualityprofile.QProfileService;
 
-public class QProfileRestoreBuiltInAction implements BaseQProfileWsAction {
+public class QProfileRestoreBuiltInAction implements QProfileWsAction {
 
   private final QProfileService service;
 
index d8149bf8849e42a841e8de378d0edd3cde9b11c0..7a2580ec02fcfaa34a6172797927acc4a5a7c9f9 100644 (file)
@@ -44,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-public class QProfileSearchAction implements BaseQProfileWsAction {
+public class QProfileSearchAction implements QProfileWsAction {
 
   private static final String FIELD_KEY = "key";
   private static final String FIELD_NAME = "name";
index c35c23cd955b625095c5c50b7204a51dc03fa072..0d1f0484277d7391a33064699b59bbb979e89dc6 100644 (file)
@@ -34,7 +34,7 @@ import org.sonar.server.user.UserSession;
 
 import static org.apache.commons.lang.StringUtils.isEmpty;
 
-public class QProfileSetDefaultAction implements BaseQProfileWsAction {
+public class QProfileSetDefaultAction implements QProfileWsAction {
 
   private static final String PARAM_LANGUAGE = "language";
   private static final String PARAM_PROFILE_NAME = "profileName";
diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java
new file mode 100644 (file)
index 0000000..c29f8fc
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ * 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.qualityprofile.ws;
+
+import org.sonar.server.ws.WsAction;
+
+/**
+ * Marker interface for quality profile related web service end points
+ */
+public interface QProfileWsAction extends WsAction {
+
+  // Marker interface
+}
index 0f2b50a6e7911d53a5d9f243b89ec311815d525a..67a48518ac4747ef105d9d7bce5d677bd6ee550e 100644 (file)
@@ -28,12 +28,12 @@ public class QProfilesWs implements WebService {
   private final RuleActivationActions ruleActivationActions;
   private final BulkRuleActivationActions bulkRuleActivationActions;
   private final ProjectAssociationActions projectAssociationActions;
-  private final BaseQProfileWsAction[] actions;
+  private final QProfileWsAction[] actions;
 
   public QProfilesWs(RuleActivationActions ruleActivationActions,
                      BulkRuleActivationActions bulkRuleActivationActions,
                      ProjectAssociationActions projectAssociationActions,
-                     BaseQProfileWsAction... actions) {
+                     QProfileWsAction... actions) {
     this.ruleActivationActions = ruleActivationActions;
     this.bulkRuleActivationActions = bulkRuleActivationActions;
     this.projectAssociationActions = projectAssociationActions;
@@ -49,7 +49,7 @@ public class QProfilesWs implements WebService {
     ruleActivationActions.define(controller);
     bulkRuleActivationActions.define(controller);
     projectAssociationActions.define(controller);
-    for(BaseQProfileWsAction action: actions) {
+    for(QProfileWsAction action: actions) {
       action.define(controller);
     }
 
index 12faa3fa9aca5f37cb1f87808ea8058364fc665f..11037dab47db30dd3c8d842b44b5b614b6a86bd1 100644 (file)
@@ -48,7 +48,7 @@ import org.sonar.server.user.UserSession;
 /**
  * @since 4.4
  */
-public class AppAction implements RulesAction {
+public class AppAction implements RulesWsAction {
 
   private final Languages languages;
   private final RuleRepositories ruleRepositories;
index 20430e3daff5d3b2b60e71e3f56454d7e8dfb576..43e95d449a1cbc4b639d8de2a3976bc75617009a 100644 (file)
@@ -41,7 +41,7 @@ import java.io.OutputStreamWriter;
 /**
  * @since 4.4
  */
-public class CreateAction implements RulesAction {
+public class CreateAction implements RulesWsAction {
 
   public static final String PARAM_CUSTOM_KEY = "custom_key";
   public static final String PARAM_MANUAL_KEY = "manual_key";
index 5520761fc45df85b0795ae7a49978a9eb6ac60dd..6cb1d25202e4c1e85e1252f59ec76222b0f3e77c 100644 (file)
@@ -29,7 +29,7 @@ import org.sonar.server.rule.RuleService;
 /**
  * @since 4.4
  */
-public class DeleteAction implements RulesAction {
+public class DeleteAction implements RulesWsAction {
 
   public static final String PARAM_KEY = "key";
 
index 87f2b89e75514d68df2b2f37682fb6fcb6b34dd1..60a3e4a0d3f7a38ceb832212ef7236700b6a1f70 100644 (file)
@@ -42,7 +42,7 @@ import java.util.regex.Pattern;
 /**
  * @since 5.1
  */
-public class RepositoriesAction implements RulesAction {
+public class RepositoriesAction implements RulesWsAction {
 
   private static final String LANGUAGE = "language";
   private static final String MATCH_ALL = ".*";
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesAction.java
deleted file mode 100644 (file)
index e6302ed..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.rule.ws;
-
-import org.sonar.server.ws.WsAction;
-
-/**
- * Marker interface for coding rule related actions
- *
- */
-interface RulesAction extends WsAction {
-
-  // Marker interface
-}
index 7b044dcbb4bb7cfd2651d14c75125a0d4262c4af..e20ee966fb3a79de62920fe0cd88c87521739c57 100644 (file)
@@ -23,9 +23,9 @@ import org.sonar.api.server.ws.WebService;
 
 public class RulesWs implements WebService {
 
-  private final RulesAction[] actions;
+  private final RulesWsAction[] actions;
 
-  public RulesWs(RulesAction... actions) {
+  public RulesWs(RulesWsAction... actions) {
     this.actions = actions;
   }
 
@@ -35,7 +35,7 @@ public class RulesWs implements WebService {
       .createController("api/rules")
       .setDescription("Coding rules");
 
-    for (RulesAction action : actions) {
+    for (RulesWsAction action : actions) {
       action.define(controller);
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java
new file mode 100644 (file)
index 0000000..d2c0ddb
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ * 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.rule.ws;
+
+import org.sonar.server.ws.WsAction;
+
+/**
+ * Marker interface for coding rule related actions
+ *
+ */
+interface RulesWsAction extends WsAction {
+  // Marker interface
+}
index 1044bffe7b0f9693e234e0f0d6a240ff92d7b89b..4cf9dafb973dfa9d62913ed5f7159da5947fdb54 100644 (file)
@@ -52,7 +52,7 @@ import org.sonar.server.user.UserSession;
 /**
  * @since 4.4
  */
-public class SearchAction extends SearchRequestHandler<RuleQuery, Rule> implements RulesAction {
+public class SearchAction extends SearchRequestHandler<RuleQuery, Rule> implements RulesWsAction {
 
   public static final String PARAM_REPOSITORIES = "repositories";
   public static final String PARAM_KEY = "rule_key";
index 2387e8db40e65ec02285f487ccb45f8cab118af1..b767d93972acb89e87d43f567008a9e23664603c 100644 (file)
@@ -32,7 +32,7 @@ import org.sonar.server.rule.RuleService;
 /**
  * @since 4.4
  */
-public class ShowAction implements RulesAction {
+public class ShowAction implements RulesWsAction {
 
   public static final String PARAM_KEY = "key";
   public static final String PARAM_ACTIVES = "actives";
index cec1677167152496c72ea1ab2752b6e28e6b9da5..a71790a61217e286f1c572db3ef28eecf4d9af5d 100644 (file)
@@ -30,7 +30,7 @@ import org.sonar.server.rule.RuleService;
 
 import java.util.Set;
 
-public class TagsAction implements RulesAction {
+public class TagsAction implements RulesWsAction {
 
   private final RuleService service;
 
index 8ee0104e5125721059e1a0df6ac4d2519e997aad..dad8c61eac5b73d37a9098ab1e610c6c0d82ec89 100644 (file)
@@ -37,7 +37,7 @@ import org.sonar.server.rule.Rule;
 import org.sonar.server.rule.RuleService;
 import org.sonar.server.rule.RuleUpdate;
 
-public class UpdateAction implements RulesAction {
+public class UpdateAction implements RulesWsAction {
 
   public static final String PARAM_KEY = "key";
   public static final String PARAM_TAGS = "tags";
index 940af9f8684c203ed3a07ca24db9c297d965b3f0..35751b53abd24c8c60c45cfb1948eb56bb8a41a8 100644 (file)
@@ -35,7 +35,7 @@ import org.sonar.core.persistence.DbSession;
 import org.sonar.server.db.DbClient;
 import org.sonar.server.user.UserSession;
 
-public class HashAction implements SourcesAction {
+public class HashAction implements SourcesWsAction {
 
   private final DbClient dbClient;
   private final UserSession userSession;
index 5dff47dc731c7d03d6097bc926a0425550f3145e..5a58c36fb65501f434031b73b57dd9edcd8c78c8 100644 (file)
@@ -33,7 +33,7 @@ import org.sonar.server.db.DbClient;
 import org.sonar.server.source.SourceService;
 import org.sonar.server.user.UserSession;
 
-public class IndexAction implements SourcesAction {
+public class IndexAction implements SourcesWsAction {
 
   private final DbClient dbClient;
   private final SourceService sourceService;
index 6d0599cf19ab19b0639ed77f86ee919c2000c808..7efb25586ec40c12ca7994cfb9c06c84972b6fbb 100644 (file)
@@ -39,7 +39,7 @@ import org.sonar.server.source.index.SourceLineDoc;
 import org.sonar.server.source.index.SourceLineIndex;
 import org.sonar.server.user.UserSession;
 
-public class LinesAction implements SourcesAction {
+public class LinesAction implements SourcesWsAction {
 
   private static final String PARAM_UUID = "uuid";
   private static final String PARAM_KEY = "key";
index 00f431d802daf492256d406cfd38b14c39ddc38b..81cc9c9054718e527559396ce1d51f50d8e1a3dc 100644 (file)
@@ -35,7 +35,7 @@ import org.sonar.server.db.DbClient;
 import org.sonar.server.source.SourceService;
 import org.sonar.server.user.UserSession;
 
-public class RawAction implements SourcesAction {
+public class RawAction implements SourcesWsAction {
 
   private final DbClient dbClient;
   private final SourceService sourceService;
index 418f2abc8b6e1575a8a7a21f73601f3363684466..c62e0bd881c6aed5d4e10794422ea3b2365fe3ac 100644 (file)
@@ -40,7 +40,7 @@ import org.sonar.server.source.index.SourceLineDoc;
 import org.sonar.server.source.index.SourceLineIndex;
 import org.sonar.server.user.UserSession;
 
-public class ScmAction implements SourcesAction {
+public class ScmAction implements SourcesWsAction {
 
   private final DbClient dbClient;
   private final SourceLineIndex sourceLineIndex;
index 54356aa3d369012af78c733be384fe17bb904214..61be5be83fe2b9dd059274e4561753964fc8d225 100644 (file)
@@ -33,7 +33,7 @@ import org.sonar.server.db.DbClient;
 import org.sonar.server.source.SourceService;
 import org.sonar.server.user.UserSession;
 
-public class ShowAction implements SourcesAction {
+public class ShowAction implements SourcesWsAction {
 
   private final SourceService sourceService;
   private final DbClient dbClient;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesAction.java
deleted file mode 100644 (file)
index 3db6f99..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.source.ws;
-
-import org.sonar.server.ws.WsAction;
-
-public interface SourcesAction extends WsAction {
-
-  // Marker interface
-}
index e35c8f72b5c9e0446f6e03e65f28c0bdca5001d1..2138b22eb5b44bf53da1437730b4b0fb7dec733f 100644 (file)
@@ -24,9 +24,9 @@ import org.sonar.api.server.ws.WebService;
 
 public class SourcesWs implements WebService {
 
-  private final SourcesAction[] actions;
+  private final SourcesWsAction[] actions;
 
-  public SourcesWs(SourcesAction... actions) {
+  public SourcesWs(SourcesWsAction... actions) {
     this.actions = actions;
   }
 
@@ -35,7 +35,7 @@ public class SourcesWs implements WebService {
     NewController controller = context.createController("api/sources")
       .setSince("4.2")
       .setDescription("Display sources information");
-    for (SourcesAction action : actions) {
+    for (SourcesWsAction action : actions) {
       action.define(controller);
     }
     controller.done();
diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java
new file mode 100644 (file)
index 0000000..ed8b4b6
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * 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.source.ws;
+
+import org.sonar.server.ws.WsAction;
+
+public interface SourcesWsAction extends WsAction {
+  // Marker interface
+}
diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestAction.java
deleted file mode 100644 (file)
index 7af1805..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.test.ws;
-
-import org.sonar.server.ws.WsAction;
-
-public interface TestAction extends WsAction {
-  // marker interface
-}
index 9160ee9d2b0f7d9b22de91580f33d16a5c934103..403fded577b3ab58e63b37db7cdff10a4a8843c5 100644 (file)
@@ -39,7 +39,7 @@ import org.sonar.server.test.index.CoveredFileDoc;
 import org.sonar.server.test.index.TestIndex;
 import org.sonar.server.user.UserSession;
 
-public class TestsCoveredFilesAction implements TestAction {
+public class TestsCoveredFilesAction implements TestsWsAction {
 
   public static final String TEST_UUID = "testUuid";
 
index 281f1219d5951bbb54066546d27542e9b4d80676..06ee6f79ae02fb96249c2b372df1af64ff255d76 100644 (file)
@@ -43,7 +43,7 @@ import org.sonar.server.test.index.TestDoc;
 import org.sonar.server.test.index.TestIndex;
 import org.sonar.server.user.UserSession;
 
-public class TestsListAction implements TestAction {
+public class TestsListAction implements TestsWsAction {
   public static final String TEST_UUID = "testUuid";
   public static final String TEST_FILE_UUID = "testFileUuid";
   public static final String TEST_FILE_KEY = "testFileKey";
index dcccd19d7ae152122a5a75c192dc8669bdb3657a..1e476d2075acfc008a58dc620ae1d04e9b719b46 100644 (file)
@@ -24,9 +24,9 @@ import org.sonar.api.server.ws.WebService;
 
 public class TestsWs implements WebService {
 
-  private final TestAction[] actions;
+  private final TestsWsAction[] actions;
 
-  public TestsWs(TestAction... actions) {
+  public TestsWs(TestsWsAction... actions) {
     this.actions = actions;
   }
 
@@ -36,7 +36,7 @@ public class TestsWs implements WebService {
       .setSince("4.4")
       .setDescription("Tests management");
 
-    for (TestAction action : actions) {
+    for (TestsWsAction action : actions) {
       action.define(controller);
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java
new file mode 100644 (file)
index 0000000..0a7eff2
--- /dev/null
@@ -0,0 +1,27 @@
+/*
+ * 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.test.ws;
+
+import org.sonar.server.ws.WsAction;
+
+public interface TestsWsAction extends WsAction {
+  // marker interface
+}
index 07f57d8aaffce345f653937ee17823e5727d83cc..4d4fdef44d911a10f58c39a4394ec461789235ce 100644 (file)
@@ -53,7 +53,7 @@ import org.sonar.server.ui.ViewProxy;
 import org.sonar.server.ui.Views;
 import org.sonar.server.user.UserSession;
 
-public class ComponentNavigationAction implements NavigationAction {
+public class ComponentNavigationAction implements NavigationWsAction {
 
   private static final String PARAM_COMPONENT_KEY = "componentKey";
 
index 3c8ae6b9a36847a40d14b2d1731dece3f1e8094e..3e0dc705ce22afcd242f4e7781f459be8ba7e846 100644 (file)
@@ -35,7 +35,7 @@ import org.sonar.server.ui.ViewProxy;
 import org.sonar.server.ui.Views;
 import org.sonar.server.user.UserSession;
 
-public class GlobalNavigationAction implements NavigationAction {
+public class GlobalNavigationAction implements NavigationWsAction {
 
   private static final String ANONYMOUS = null;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationAction.java
deleted file mode 100644 (file)
index 80443aa..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.ui.ws;
-
-import org.sonar.server.ws.WsAction;
-
-public interface NavigationAction extends WsAction {
-
-  // Marker interface for navigation related actions
-}
index ce5bbc55b9dabb86a7cf2ebf3f5d255a9e28ee3e..34941a1b042d69b61ad4e2564340d23691255fab 100644 (file)
@@ -23,9 +23,9 @@ import org.sonar.api.server.ws.WebService;
 
 public class NavigationWs implements WebService {
 
-  private final NavigationAction[] actions;
+  private final NavigationWsAction[] actions;
 
-  public NavigationWs(NavigationAction... actions) {
+  public NavigationWs(NavigationWsAction... actions) {
     this.actions = actions;
   }
 
@@ -35,7 +35,7 @@ public class NavigationWs implements WebService {
       .setDescription("Get information required to build navigation UI components")
       .setSince("5.2");
 
-    for (NavigationAction action : actions) {
+    for (NavigationWsAction action : actions) {
       action.define(navigation);
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java
new file mode 100644 (file)
index 0000000..59b9791
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * 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.ui.ws;
+
+import org.sonar.server.ws.WsAction;
+
+public interface NavigationWsAction extends WsAction {
+  // Marker interface for navigation related actions
+}
index 05aa5cf92626356e39a8ec40189936d173048329..e0dec9378282644fe8b0fbf304d4830ab0cd7061 100644 (file)
@@ -33,7 +33,7 @@ import org.sonar.server.ui.ViewProxy;
 import org.sonar.server.ui.Views;
 import org.sonar.server.user.UserSession;
 
-public class SettingsNavigationAction implements NavigationAction {
+public class SettingsNavigationAction implements NavigationWsAction {
 
   private final Settings settings;
   private final Views views;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/BaseUsersWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/BaseUsersWsAction.java
deleted file mode 100644 (file)
index b450674..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.user.ws;
-
-import org.sonar.server.ws.WsAction;
-
-public interface BaseUsersWsAction extends WsAction {
-
-  // Marker interface for UsersWs actions
-}
index 957a35a373456a99203c1e72773947303af4f209..e2d81b2bb70b362b0e3852ef490439a83dab6608 100644 (file)
@@ -28,7 +28,7 @@ import org.sonar.server.user.UpdateUser;
 import org.sonar.server.user.UserSession;
 import org.sonar.server.user.UserUpdater;
 
-public class ChangePasswordAction implements BaseUsersWsAction {
+public class ChangePasswordAction implements UsersWsAction {
 
   private static final String PARAM_LOGIN = "login";
   private static final String PARAM_PASSWORD = "password";
index 47a5e021a354a7b7ebb788d44a6a7203d37850e3..bd47e88ad2ac2c48ee3c30081ffb4559a88471c4 100644 (file)
@@ -32,7 +32,7 @@ import org.sonar.server.user.UserUpdater;
 import org.sonar.server.user.index.UserDoc;
 import org.sonar.server.user.index.UserIndex;
 
-public class CreateAction implements BaseUsersWsAction {
+public class CreateAction implements UsersWsAction {
 
   private static final String PARAM_LOGIN = "login";
   private static final String PARAM_PASSWORD = "password";
index 037f5deb12f2af4a5bd63cb4c9af7fecefd648da..422d4539d71c6423d083448e8063c8244d8c64af 100644 (file)
@@ -25,7 +25,7 @@ import org.sonar.api.server.ws.WebService.NewController;
 import org.sonar.api.utils.text.JsonWriter;
 import org.sonar.server.user.UserSession;
 
-public class CurrentUserAction implements BaseUsersWsAction {
+public class CurrentUserAction implements UsersWsAction {
   private final UserSession userSession;
 
   public CurrentUserAction(UserSession userSession) {
index 5af978d96bce2598c3f73a6aedb209ad60d2924d..1d154a887f3aa2d8bc366005389c0309bb8f8550 100644 (file)
@@ -31,7 +31,7 @@ import org.sonar.server.user.UserUpdater;
 import org.sonar.server.user.index.UserDoc;
 import org.sonar.server.user.index.UserIndex;
 
-public class DeactivateAction implements BaseUsersWsAction {
+public class DeactivateAction implements UsersWsAction {
 
   private static final String PARAM_LOGIN = "login";
 
index b25a72f39a384827010fef4d3334713b45d79e74..1df8897c762a762a4ba94ca4036dc61bdba365d0 100644 (file)
@@ -36,7 +36,7 @@ import javax.annotation.Nullable;
 
 import java.util.List;
 
-public class GroupsAction implements BaseUsersWsAction {
+public class GroupsAction implements UsersWsAction {
 
   private static final String PARAM_LOGIN = "login";
   private static final String PARAM_SELECTED = "selected";
index 996488ec57d0c367c997ede0de3471453df7d728..4b4dee32d4dcabb24bacd6fe323e498fa112b05c 100644 (file)
@@ -36,7 +36,7 @@ import javax.annotation.Nullable;
 import java.util.List;
 import java.util.Set;
 
-public class SearchAction implements BaseUsersWsAction {
+public class SearchAction implements UsersWsAction {
 
   private static final String FIELD_LOGIN = "login";
   private static final String FIELD_NAME = "name";
index 8b1adda213d3258b05e9dae9fb3a22e0e50c8184..23a7f2d25217c03a967b98c46047b1474b3f2f5c 100644 (file)
@@ -31,7 +31,7 @@ import org.sonar.server.user.UserUpdater;
 import org.sonar.server.user.index.UserDoc;
 import org.sonar.server.user.index.UserIndex;
 
-public class UpdateAction implements BaseUsersWsAction {
+public class UpdateAction implements UsersWsAction {
 
   private static final String PARAM_LOGIN = "login";
   private static final String PARAM_NAME = "name";
index 7a96a62140d6ff2e1e1f1b5fa2cdc208453927f2..476461d2c272a2cfc69489721adbbaa3ecefa864 100644 (file)
@@ -26,9 +26,9 @@ import org.sonar.api.server.ws.WebService;
 
 public class UsersWs implements WebService {
 
-  private final BaseUsersWsAction[] actions;
+  private final UsersWsAction[] actions;
 
-  public UsersWs(BaseUsersWsAction... actions) {
+  public UsersWs(UsersWsAction... actions) {
     this.actions = actions;
   }
 
@@ -39,7 +39,7 @@ public class UsersWs implements WebService {
       .setDescription("Users management");
 
     defineSearchAction(controller);
-    for (BaseUsersWsAction action : actions) {
+    for (UsersWsAction action : actions) {
       action.define(controller);
     }
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java
new file mode 100644 (file)
index 0000000..0454b86
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ * 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.user.ws;
+
+import org.sonar.server.ws.WsAction;
+
+public interface UsersWsAction extends WsAction {
+  // Marker interface for UsersWs actions
+}
index bb5aff54ef8dd4da0df10d90e8d06f437b01bfa9..d0d339f27b6e60781b22cf3b4aaeeaf877d3483f 100644 (file)
@@ -27,6 +27,5 @@ import org.sonar.api.server.ws.WebService;
  * Since 5.2, this interface is the base for Web Service marker interfaces
  */
 public interface WsAction extends RequestHandler, Definable<WebService.NewController> {
-
   // Marker interface
 }
index 63971f68f684e898d5a093053340c95955e0c509..ba2045a4f0f391cfefdc0b8d2ec293ddad4d06df 100644 (file)
@@ -31,8 +31,8 @@ public class IssuesWsTest {
 
   @Test
   public void define_actions() {
-    BaseIssuesWsAction action1 = mock(BaseIssuesWsAction.class);
-    BaseIssuesWsAction action2 = mock(BaseIssuesWsAction.class);
+    IssuesWsAction action1 = mock(IssuesWsAction.class);
+    IssuesWsAction action2 = mock(IssuesWsAction.class);
     IssuesWs ws = new IssuesWs(action1, action2);
     WebService.Context context = new WebService.Context();
     ws.define(context);
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/filter_by_tags.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/filter_by_tags.json
deleted file mode 100644 (file)
index e109ed2..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-{"total": 1, "p": 1, "ps": 100, "rules": [
-  {
-    "key": "xoo:x1",
-    "sysTags": ["tag1"],
-    "tags": []
-  }
-],
-"facets": [
-  {
-    "property": "tags",
-    "values": [
-      {
-        "val": "tag1",
-        "count": 1
-      },
-      {
-        "val": "tag2",
-        "count": 1
-      }
-    ]
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_note_as_markdown_and_html.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_note_as_markdown_and_html.json
deleted file mode 100644 (file)
index b4a4ecd..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "total": 1, "p": 1, "ps": 100,
-  "rules": [
-    {
-      "key": "xoo:x1",
-      "htmlNote": "this is <em>bold</em>",
-      "mdNote": "this is *bold*"
-    }
-  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags.json
deleted file mode 100644 (file)
index c9a14f3..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "tags": [
-    "sys1",
-    "java",
-    "world",
-    "hello"
-  ]
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags_filtered.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags_filtered.json
deleted file mode 100644 (file)
index 0ce4ec6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"tags": ["hello"]}
\ No newline at end of file
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags_limited.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags_limited.json
deleted file mode 100644 (file)
index 0ce4ec6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{"tags": ["hello"]}
\ No newline at end of file
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules.json
deleted file mode 100644 (file)
index a3da4d3..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "total": 2,
-  "p": 1,
-  "ps": 100,
-  "rules": [
-    {
-      "key": "xoo:x2",
-      "repo": "xoo",
-      "name": "Rule x2",
-      "htmlDesc": "Description x2",
-      "severity": "INFO",
-      "status": "READY",
-      "internalKey": "InternalKeyx2",
-      "isTemplate": false,
-      "tags": [
-        "tag1",
-        "tag2"
-      ],
-      "sysTags": [
-        "systag1",
-        "systag2"
-      ],
-      "debtRemFnType": "LINEAR",
-      "debtRemFnCoeff": "1h",
-      "debtRemFnOffset": "5min",
-      "lang": "xoo",
-      "params": []
-    },
-    {
-      "key": "xoo:x1",
-      "repo": "xoo",
-      "name": "Rule x1",
-      "htmlDesc": "Description x1",
-      "severity": "INFO",
-      "status": "READY",
-      "internalKey": "InternalKeyx1",
-      "isTemplate": false,
-      "tags": [
-        "tag1",
-        "tag2"
-      ],
-      "sysTags": [
-        "systag1",
-        "systag2"
-      ],
-      "debtRemFnType": "LINEAR",
-      "debtRemFnCoeff": "1h",
-      "debtRemFnOffset": "5min",
-      "lang": "xoo",
-      "params": []
-    }
-  ]
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules_fields.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules_fields.json
deleted file mode 100644 (file)
index 6be0655..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "total": 2, "p": 1, "ps": 100,
-  "rules": [
-    {
-      "key": "xoo:x2",
-      "name": "Rule x2",
-      "mdDesc": "A *Xoo* rule",
-      "htmlDesc": "A <em>Xoo</em> rule"
-    },
-    {
-      "key": "xoo:x1",
-      "name": "Rule x1",
-      "htmlDesc": "Description x1",
-    }
-  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules.json
deleted file mode 100644 (file)
index 76e721d..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "total": 1, "p": 1, "ps": 100,
-  "rules": [
-    {
-      "key": "xoo:x1"
-    }
-  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules_params.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules_params.json
deleted file mode 100644 (file)
index c8edf1a..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-{"total": 1, "p": 1, "ps": 100, "rules": [
-  {
-    "key": "xoo:x1",
-    "params": [
-      {
-        "key": "my_var",
-        "htmlDesc": "My small description",
-        "defaultValue": "some value",
-        "type": "string"
-      },
-      {
-        "key": "the_var",
-        "htmlDesc": "My small description",
-        "defaultValue": "other value",
-        "type": "integer"
-      }
-    ]
-  }
-]
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rule.json
deleted file mode 100644 (file)
index 0a22112..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-{"total": 1, "p": 1, "ps": 100, "rules": [
-  {
-    "key": "xoo:x1",
-    "debtChar": "RELIABILITY",
-    "debtCharName": "Reliability",
-    "debtSubChar": "HARD_RELIABILITY",
-    "debtSubCharName": "Hard Reliability",
-    "debtRemFnType": "LINEAR_OFFSET",
-    "debtRemFnCoeff": "1h",
-    "debtRemFnOffset": "15min",
-    "debtOverloaded": false,
-    "defaultDebtChar": "RELIABILITY",
-    "defaultDebtSubChar": "HARD_RELIABILITY",
-    "defaultDebtRemFnType": "LINEAR_OFFSET",
-    "defaultDebtRemFnCoeff": "1h",
-    "defaultDebtRemFnOffset": "15min"
-  }
-],
-"facets": [
-  {
-    "property": "debt_characteristics",
-    "values": [
-      {
-        "val": "RELIABILITY",
-        "count": 1
-      },
-      {
-        "val": "HARD_RELIABILITY",
-        "count": 1
-      },
-      {
-        "val": "NONE",
-        "count": 0
-      }
-    ]
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_sticky.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_sticky.json
deleted file mode 100644 (file)
index 59441d3..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "total": 1,
-  "p": 1,
-  "ps": 100,
-  "rules": [
-    {
-      "key": "xoo:x2",
-      "debtSubCharName": "Soft Reliability",
-      "defaultDebtRemFnType": "LINEAR_OFFSET",
-      "defaultDebtRemFnCoeff": "1h",
-      "defaultDebtRemFnOffset": "15min",
-      "debtChar": "RELIABILITY",
-      "debtOverloaded": true,
-      "debtCharName": "Reliability",
-      "debtRemFnType": "LINEAR_OFFSET",
-      "debtRemFnCoeff": "30min",
-      "debtRemFnOffset": "5min",
-      "debtSubChar": "SOFT_RELIABILITY",
-      "defaultDebtSubChar": "HARD_RELIABILITY",
-      "defaultDebtChar": "RELIABILITY"
-    }
-  ],
-  "facets": [
-    {
-      "property": "debt_characteristics",
-      "values": [
-        {
-          "val": "HARD_RELIABILITY",
-          "count": 1
-        },
-        {
-          "val": "SOFT_RELIABILITY",
-          "count": 1
-        },
-        {
-          "val": "RELIABILITY",
-          "count": 2
-        },
-        {
-          "val": "NONE",
-          "count": 2
-        }
-      ]
-    }
-  ]
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json
deleted file mode 100644 (file)
index a3d107c..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-{"total": 1, "p": 1, "ps": 100, "rules": [
-  {
-    "key": "xoo:x1",
-    "debtChar": "RELIABILITY",
-    "debtCharName": "Reliability",
-    "debtSubChar": "SOFT_RELIABILITY",
-    "debtSubCharName": "Soft Reliability",
-    "debtRemFnType": "LINEAR_OFFSET",
-    "debtRemFnCoeff": "2h",
-    "debtRemFnOffset": "25min",
-    "debtOverloaded": true,
-    "defaultDebtChar": "RELIABILITY",
-    "defaultDebtSubChar": "HARD_RELIABILITY",
-    "defaultDebtRemFnType": "LINEAR_OFFSET",
-    "defaultDebtRemFnCoeff": "1h",
-    "defaultDebtRemFnOffset": "15min"
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json
deleted file mode 100644 (file)
index 0a16329..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{"total": 1, "p": 1, "ps": 100, "rules": [
-  {
-    "key": "xoo:x1",
-    "debtChar": "RELIABILITY",
-    "debtCharName": "Reliability",
-    "debtSubChar": "SOFT_RELIABILITY",
-    "debtSubCharName": "Soft Reliability",
-    "debtRemFnType": "CONSTANT_ISSUE",
-    "debtRemFnOffset": "5min",
-    "debtOverloaded": true,
-    "defaultDebtChar": "RELIABILITY",
-    "defaultDebtSubChar": "HARD_RELIABILITY",
-    "defaultDebtRemFnType": "LINEAR_OFFSET",
-    "defaultDebtRemFnCoeff": "1h",
-    "defaultDebtRemFnOffset": "15min"
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json
deleted file mode 100644 (file)
index d778dc7..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{"total": 1, "p": 1, "ps": 100, "rules": [
-  {
-    "key": "xoo:x1",
-    "debtChar": "RELIABILITY",
-    "debtCharName": "Reliability",
-    "debtSubChar": "SOFT_RELIABILITY",
-    "debtSubCharName": "Soft Reliability",
-    "debtRemFnType": "LINEAR",
-    "debtRemFnCoeff": "1h",
-    "debtOverloaded": true,
-    "defaultDebtChar": "RELIABILITY",
-    "defaultDebtSubChar": "HARD_RELIABILITY",
-    "defaultDebtRemFnType": "LINEAR_OFFSET",
-    "defaultDebtRemFnCoeff": "1h",
-    "defaultDebtRemFnOffset": "15min"
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_no_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_no_rules.json
deleted file mode 100644 (file)
index 0e7286c..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "total": 0,
-    "p": 1,
-    "ps": 100,
-    "rules": [],
-    "actives": {},
-    "qProfiles": {}
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules.json
deleted file mode 100644 (file)
index 1b7d587..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "total":1,
-  "p":1,
-  "ps":100,
-  "rules": [
-    {
-      "key": "xoo:x1"
-    }
-  ],
-  "actives": {
-    "xoo:x1": [
-      {
-        "qProfile": "XOO_P2",
-        "inherit": "NONE",
-        "severity": "BLOCKER",
-        "params": []
-      }
-    ]
-  },
-  "qProfiles": {
-    "XOO_P2": {
-      "name": "P2",
-      "lang": "xoo",
-      "langName": "xoo"
-    }
-  }
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules_inheritance.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules_inheritance.json
deleted file mode 100644 (file)
index adc4821..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "total": 1,
-  "p": 1,
-  "ps": 100,
-  "rules": [
-    {
-      "key": "xoo:x1"
-    }
-  ],
-  "actives": {
-    "xoo:x1": [
-      {
-        "qProfile": "XOO_P2",
-        "inherit": "OVERRIDES",
-        "severity": "CRITICAL",
-        "params": []
-      }
-    ]
-  },
-  "qProfiles": {
-    "XOO_P2": {
-      "name": "P2",
-      "lang": "xoo",
-      "langName": "xoo",
-      "parent": "XOO_P1"
-    },
-    "XOO_P1": {
-      "name": "P1",
-      "lang": "xoo",
-      "langName": "xoo"
-    }
-  }
-}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_rules_from_template_key.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_rules_from_template_key.json
deleted file mode 100644 (file)
index f966859..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "total": 1, "p": 1, "ps": 100,
-  "rules": [
-    {
-      "key": "xoo:x2",
-      "templateKey": "xoo:x1"
-    }
-  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_template_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_template_rules.json
deleted file mode 100644 (file)
index c7a4498..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "total": 1, "p": 1, "ps": 100,
-  "rules": [
-  {
-    "key": "xoo:x1",
-    "isTemplate": true
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/severities_facet.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/severities_facet.json
deleted file mode 100644 (file)
index f2d9754..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{"total": 0, "p": 1, "ps": 100, "rules": [],
-"facets": [
-  {
-    "property": "severities",
-    "values": [
-      {
-        "val": "BLOCKER",
-        "count": 0
-      },{
-        "val": "CRITICAL",
-        "count": 0
-      },{
-        "val": "MAJOR",
-        "count": 0
-      },{
-        "val": "MINOR",
-        "count": 0
-      },
-      {
-        "val": "INFO",
-        "count": 0
-      }
-    ]
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_active.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_active.json
deleted file mode 100644 (file)
index 78fa263..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "rule": {
-    "key": "xoo:x1",
-    "repo": "xoo",
-    "name": "Rule x1",
-    "htmlDesc": "Description x1",
-    "severity": "INFO",
-    "status": "READY",
-    "internalKey": "InternalKeyx1",
-    "isTemplate": false,
-    "tags": ["tag1", "tag2"],
-    "sysTags": ["systag1", "systag2"],
-    "debtRemFnType": "LINEAR",
-    "debtRemFnCoeff": "1h",
-    "debtRemFnOffset": "5min",
-    "lang": "xoo",
-    "params": []
-  },
-  "actives": [
-    {
-      "qProfile": "XOO_P1",
-      "inherit": "NONE",
-      "severity": "BLOCKER",
-      "params": []
-    }
-  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_no_active.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_no_active.json
deleted file mode 100644 (file)
index f43b033..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-{"rule": {
-  "key": "xoo:x1",
-  "repo": "xoo",
-  "name": "Rule x1",
-  "htmlDesc": "Description x1",
-  "severity": "INFO",
-  "status": "READY",
-  "internalKey": "InternalKeyx1",
-  "isTemplate": false,
-  "tags": ["tag1", "tag2"],
-  "sysTags": ["systag1", "systag2"],
-  "debtRemFnType": "LINEAR",
-  "debtRemFnCoeff": "1h",
-  "debtRemFnOffset": "5min",
-  "lang": "xoo",
-  "params": []
-}}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/statuses_facet.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/statuses_facet.json
deleted file mode 100644 (file)
index 4692be8..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-{"total": 0, "p": 1, "ps": 100, "rules": [],
-"facets": [
-  {
-    "property": "statuses",
-    "values": [
-      {
-        "val": "BETA",
-        "count": 0
-      },{
-        "val": "DEPRECATED",
-        "count": 0
-      },{
-        "val": "READY",
-        "count": 0
-      }
-    ]
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/statuses_facet_sticky.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/statuses_facet_sticky.json
deleted file mode 100644 (file)
index a5b7a79..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-{"total": 1, "p": 1, "ps": 100, "rules": [
-  {"key": "xoo:x3"}
-],
-"facets": [
-  {
-    "property": "statuses",
-    "values": [
-      {
-        "val": "BETA",
-        "count": 1
-      },{
-        "val": "DEPRECATED",
-        "count": 1
-      },{
-        "val": "READY",
-        "count": 1
-      }
-    ]
-  }
-]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/filter_by_tags.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/filter_by_tags.json
new file mode 100644 (file)
index 0000000..e109ed2
--- /dev/null
@@ -0,0 +1,22 @@
+{"total": 1, "p": 1, "ps": 100, "rules": [
+  {
+    "key": "xoo:x1",
+    "sysTags": ["tag1"],
+    "tags": []
+  }
+],
+"facets": [
+  {
+    "property": "tags",
+    "values": [
+      {
+        "val": "tag1",
+        "count": 1
+      },
+      {
+        "val": "tag2",
+        "count": 1
+      }
+    ]
+  }
+]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_note_as_markdown_and_html.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_note_as_markdown_and_html.json
new file mode 100644 (file)
index 0000000..b4a4ecd
--- /dev/null
@@ -0,0 +1,9 @@
+{
+  "total": 1, "p": 1, "ps": 100,
+  "rules": [
+    {
+      "key": "xoo:x1",
+      "htmlNote": "this is <em>bold</em>",
+      "mdNote": "this is *bold*"
+    }
+  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags.json
new file mode 100644 (file)
index 0000000..c9a14f3
--- /dev/null
@@ -0,0 +1,8 @@
+{
+  "tags": [
+    "sys1",
+    "java",
+    "world",
+    "hello"
+  ]
+}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags_filtered.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags_filtered.json
new file mode 100644 (file)
index 0000000..0ce4ec6
--- /dev/null
@@ -0,0 +1 @@
+{"tags": ["hello"]}
\ No newline at end of file
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags_limited.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags_limited.json
new file mode 100644 (file)
index 0000000..0ce4ec6
--- /dev/null
@@ -0,0 +1 @@
+{"tags": ["hello"]}
\ No newline at end of file
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_2_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_2_rules.json
new file mode 100644 (file)
index 0000000..a3da4d3
--- /dev/null
@@ -0,0 +1,53 @@
+{
+  "total": 2,
+  "p": 1,
+  "ps": 100,
+  "rules": [
+    {
+      "key": "xoo:x2",
+      "repo": "xoo",
+      "name": "Rule x2",
+      "htmlDesc": "Description x2",
+      "severity": "INFO",
+      "status": "READY",
+      "internalKey": "InternalKeyx2",
+      "isTemplate": false,
+      "tags": [
+        "tag1",
+        "tag2"
+      ],
+      "sysTags": [
+        "systag1",
+        "systag2"
+      ],
+      "debtRemFnType": "LINEAR",
+      "debtRemFnCoeff": "1h",
+      "debtRemFnOffset": "5min",
+      "lang": "xoo",
+      "params": []
+    },
+    {
+      "key": "xoo:x1",
+      "repo": "xoo",
+      "name": "Rule x1",
+      "htmlDesc": "Description x1",
+      "severity": "INFO",
+      "status": "READY",
+      "internalKey": "InternalKeyx1",
+      "isTemplate": false,
+      "tags": [
+        "tag1",
+        "tag2"
+      ],
+      "sysTags": [
+        "systag1",
+        "systag2"
+      ],
+      "debtRemFnType": "LINEAR",
+      "debtRemFnCoeff": "1h",
+      "debtRemFnOffset": "5min",
+      "lang": "xoo",
+      "params": []
+    }
+  ]
+}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_2_rules_fields.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_2_rules_fields.json
new file mode 100644 (file)
index 0000000..6be0655
--- /dev/null
@@ -0,0 +1,15 @@
+{
+  "total": 2, "p": 1, "ps": 100,
+  "rules": [
+    {
+      "key": "xoo:x2",
+      "name": "Rule x2",
+      "mdDesc": "A *Xoo* rule",
+      "htmlDesc": "A <em>Xoo</em> rule"
+    },
+    {
+      "key": "xoo:x1",
+      "name": "Rule x1",
+      "htmlDesc": "Description x1",
+    }
+  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_active_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_active_rules.json
new file mode 100644 (file)
index 0000000..76e721d
--- /dev/null
@@ -0,0 +1,7 @@
+{
+  "total": 1, "p": 1, "ps": 100,
+  "rules": [
+    {
+      "key": "xoo:x1"
+    }
+  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_active_rules_params.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_active_rules_params.json
new file mode 100644 (file)
index 0000000..c8edf1a
--- /dev/null
@@ -0,0 +1,20 @@
+{"total": 1, "p": 1, "ps": 100, "rules": [
+  {
+    "key": "xoo:x1",
+    "params": [
+      {
+        "key": "my_var",
+        "htmlDesc": "My small description",
+        "defaultValue": "some value",
+        "type": "string"
+      },
+      {
+        "key": "the_var",
+        "htmlDesc": "My small description",
+        "defaultValue": "other value",
+        "type": "integer"
+      }
+    ]
+  }
+]
+}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rule.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rule.json
new file mode 100644 (file)
index 0000000..0a22112
--- /dev/null
@@ -0,0 +1,37 @@
+{"total": 1, "p": 1, "ps": 100, "rules": [
+  {
+    "key": "xoo:x1",
+    "debtChar": "RELIABILITY",
+    "debtCharName": "Reliability",
+    "debtSubChar": "HARD_RELIABILITY",
+    "debtSubCharName": "Hard Reliability",
+    "debtRemFnType": "LINEAR_OFFSET",
+    "debtRemFnCoeff": "1h",
+    "debtRemFnOffset": "15min",
+    "debtOverloaded": false,
+    "defaultDebtChar": "RELIABILITY",
+    "defaultDebtSubChar": "HARD_RELIABILITY",
+    "defaultDebtRemFnType": "LINEAR_OFFSET",
+    "defaultDebtRemFnCoeff": "1h",
+    "defaultDebtRemFnOffset": "15min"
+  }
+],
+"facets": [
+  {
+    "property": "debt_characteristics",
+    "values": [
+      {
+        "val": "RELIABILITY",
+        "count": 1
+      },
+      {
+        "val": "HARD_RELIABILITY",
+        "count": 1
+      },
+      {
+        "val": "NONE",
+        "count": 0
+      }
+    ]
+  }
+]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_sticky.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_sticky.json
new file mode 100644 (file)
index 0000000..59441d3
--- /dev/null
@@ -0,0 +1,46 @@
+{
+  "total": 1,
+  "p": 1,
+  "ps": 100,
+  "rules": [
+    {
+      "key": "xoo:x2",
+      "debtSubCharName": "Soft Reliability",
+      "defaultDebtRemFnType": "LINEAR_OFFSET",
+      "defaultDebtRemFnCoeff": "1h",
+      "defaultDebtRemFnOffset": "15min",
+      "debtChar": "RELIABILITY",
+      "debtOverloaded": true,
+      "debtCharName": "Reliability",
+      "debtRemFnType": "LINEAR_OFFSET",
+      "debtRemFnCoeff": "30min",
+      "debtRemFnOffset": "5min",
+      "debtSubChar": "SOFT_RELIABILITY",
+      "defaultDebtSubChar": "HARD_RELIABILITY",
+      "defaultDebtChar": "RELIABILITY"
+    }
+  ],
+  "facets": [
+    {
+      "property": "debt_characteristics",
+      "values": [
+        {
+          "val": "HARD_RELIABILITY",
+          "count": 1
+        },
+        {
+          "val": "SOFT_RELIABILITY",
+          "count": 1
+        },
+        {
+          "val": "RELIABILITY",
+          "count": 2
+        },
+        {
+          "val": "NONE",
+          "count": 2
+        }
+      ]
+    }
+  ]
+}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json
new file mode 100644 (file)
index 0000000..a3d107c
--- /dev/null
@@ -0,0 +1,18 @@
+{"total": 1, "p": 1, "ps": 100, "rules": [
+  {
+    "key": "xoo:x1",
+    "debtChar": "RELIABILITY",
+    "debtCharName": "Reliability",
+    "debtSubChar": "SOFT_RELIABILITY",
+    "debtSubCharName": "Soft Reliability",
+    "debtRemFnType": "LINEAR_OFFSET",
+    "debtRemFnCoeff": "2h",
+    "debtRemFnOffset": "25min",
+    "debtOverloaded": true,
+    "defaultDebtChar": "RELIABILITY",
+    "defaultDebtSubChar": "HARD_RELIABILITY",
+    "defaultDebtRemFnType": "LINEAR_OFFSET",
+    "defaultDebtRemFnCoeff": "1h",
+    "defaultDebtRemFnOffset": "15min"
+  }
+]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json
new file mode 100644 (file)
index 0000000..0a16329
--- /dev/null
@@ -0,0 +1,17 @@
+{"total": 1, "p": 1, "ps": 100, "rules": [
+  {
+    "key": "xoo:x1",
+    "debtChar": "RELIABILITY",
+    "debtCharName": "Reliability",
+    "debtSubChar": "SOFT_RELIABILITY",
+    "debtSubCharName": "Soft Reliability",
+    "debtRemFnType": "CONSTANT_ISSUE",
+    "debtRemFnOffset": "5min",
+    "debtOverloaded": true,
+    "defaultDebtChar": "RELIABILITY",
+    "defaultDebtSubChar": "HARD_RELIABILITY",
+    "defaultDebtRemFnType": "LINEAR_OFFSET",
+    "defaultDebtRemFnCoeff": "1h",
+    "defaultDebtRemFnOffset": "15min"
+  }
+]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json
new file mode 100644 (file)
index 0000000..d778dc7
--- /dev/null
@@ -0,0 +1,17 @@
+{"total": 1, "p": 1, "ps": 100, "rules": [
+  {
+    "key": "xoo:x1",
+    "debtChar": "RELIABILITY",
+    "debtCharName": "Reliability",
+    "debtSubChar": "SOFT_RELIABILITY",
+    "debtSubCharName": "Soft Reliability",
+    "debtRemFnType": "LINEAR",
+    "debtRemFnCoeff": "1h",
+    "debtOverloaded": true,
+    "defaultDebtChar": "RELIABILITY",
+    "defaultDebtSubChar": "HARD_RELIABILITY",
+    "defaultDebtRemFnType": "LINEAR_OFFSET",
+    "defaultDebtRemFnCoeff": "1h",
+    "defaultDebtRemFnOffset": "15min"
+  }
+]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_no_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_no_rules.json
new file mode 100644 (file)
index 0000000..0e7286c
--- /dev/null
@@ -0,0 +1,8 @@
+{
+    "total": 0,
+    "p": 1,
+    "ps": 100,
+    "rules": [],
+    "actives": {},
+    "qProfiles": {}
+}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_profile_active_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_profile_active_rules.json
new file mode 100644 (file)
index 0000000..1b7d587
--- /dev/null
@@ -0,0 +1,27 @@
+{
+  "total":1,
+  "p":1,
+  "ps":100,
+  "rules": [
+    {
+      "key": "xoo:x1"
+    }
+  ],
+  "actives": {
+    "xoo:x1": [
+      {
+        "qProfile": "XOO_P2",
+        "inherit": "NONE",
+        "severity": "BLOCKER",
+        "params": []
+      }
+    ]
+  },
+  "qProfiles": {
+    "XOO_P2": {
+      "name": "P2",
+      "lang": "xoo",
+      "langName": "xoo"
+    }
+  }
+}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_profile_active_rules_inheritance.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_profile_active_rules_inheritance.json
new file mode 100644 (file)
index 0000000..adc4821
--- /dev/null
@@ -0,0 +1,33 @@
+{
+  "total": 1,
+  "p": 1,
+  "ps": 100,
+  "rules": [
+    {
+      "key": "xoo:x1"
+    }
+  ],
+  "actives": {
+    "xoo:x1": [
+      {
+        "qProfile": "XOO_P2",
+        "inherit": "OVERRIDES",
+        "severity": "CRITICAL",
+        "params": []
+      }
+    ]
+  },
+  "qProfiles": {
+    "XOO_P2": {
+      "name": "P2",
+      "lang": "xoo",
+      "langName": "xoo",
+      "parent": "XOO_P1"
+    },
+    "XOO_P1": {
+      "name": "P1",
+      "lang": "xoo",
+      "langName": "xoo"
+    }
+  }
+}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_rules_from_template_key.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_rules_from_template_key.json
new file mode 100644 (file)
index 0000000..f966859
--- /dev/null
@@ -0,0 +1,8 @@
+{
+  "total": 1, "p": 1, "ps": 100,
+  "rules": [
+    {
+      "key": "xoo:x2",
+      "templateKey": "xoo:x1"
+    }
+  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_template_rules.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_template_rules.json
new file mode 100644 (file)
index 0000000..c7a4498
--- /dev/null
@@ -0,0 +1,8 @@
+{
+  "total": 1, "p": 1, "ps": 100,
+  "rules": [
+  {
+    "key": "xoo:x1",
+    "isTemplate": true
+  }
+]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/severities_facet.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/severities_facet.json
new file mode 100644 (file)
index 0000000..f2d9754
--- /dev/null
@@ -0,0 +1,25 @@
+{"total": 0, "p": 1, "ps": 100, "rules": [],
+"facets": [
+  {
+    "property": "severities",
+    "values": [
+      {
+        "val": "BLOCKER",
+        "count": 0
+      },{
+        "val": "CRITICAL",
+        "count": 0
+      },{
+        "val": "MAJOR",
+        "count": 0
+      },{
+        "val": "MINOR",
+        "count": 0
+      },
+      {
+        "val": "INFO",
+        "count": 0
+      }
+    ]
+  }
+]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/show_rule_active.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/show_rule_active.json
new file mode 100644 (file)
index 0000000..78fa263
--- /dev/null
@@ -0,0 +1,26 @@
+{
+  "rule": {
+    "key": "xoo:x1",
+    "repo": "xoo",
+    "name": "Rule x1",
+    "htmlDesc": "Description x1",
+    "severity": "INFO",
+    "status": "READY",
+    "internalKey": "InternalKeyx1",
+    "isTemplate": false,
+    "tags": ["tag1", "tag2"],
+    "sysTags": ["systag1", "systag2"],
+    "debtRemFnType": "LINEAR",
+    "debtRemFnCoeff": "1h",
+    "debtRemFnOffset": "5min",
+    "lang": "xoo",
+    "params": []
+  },
+  "actives": [
+    {
+      "qProfile": "XOO_P1",
+      "inherit": "NONE",
+      "severity": "BLOCKER",
+      "params": []
+    }
+  ]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/show_rule_no_active.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/show_rule_no_active.json
new file mode 100644 (file)
index 0000000..f43b033
--- /dev/null
@@ -0,0 +1,17 @@
+{"rule": {
+  "key": "xoo:x1",
+  "repo": "xoo",
+  "name": "Rule x1",
+  "htmlDesc": "Description x1",
+  "severity": "INFO",
+  "status": "READY",
+  "internalKey": "InternalKeyx1",
+  "isTemplate": false,
+  "tags": ["tag1", "tag2"],
+  "sysTags": ["systag1", "systag2"],
+  "debtRemFnType": "LINEAR",
+  "debtRemFnCoeff": "1h",
+  "debtRemFnOffset": "5min",
+  "lang": "xoo",
+  "params": []
+}}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/statuses_facet.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/statuses_facet.json
new file mode 100644 (file)
index 0000000..4692be8
--- /dev/null
@@ -0,0 +1,18 @@
+{"total": 0, "p": 1, "ps": 100, "rules": [],
+"facets": [
+  {
+    "property": "statuses",
+    "values": [
+      {
+        "val": "BETA",
+        "count": 0
+      },{
+        "val": "DEPRECATED",
+        "count": 0
+      },{
+        "val": "READY",
+        "count": 0
+      }
+    ]
+  }
+]}
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/statuses_facet_sticky.json b/server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/statuses_facet_sticky.json
new file mode 100644 (file)
index 0000000..a5b7a79
--- /dev/null
@@ -0,0 +1,20 @@
+{"total": 1, "p": 1, "ps": 100, "rules": [
+  {"key": "xoo:x3"}
+],
+"facets": [
+  {
+    "property": "statuses",
+    "values": [
+      {
+        "val": "BETA",
+        "count": 1
+      },{
+        "val": "DEPRECATED",
+        "count": 1
+      },{
+        "val": "READY",
+        "count": 1
+      }
+    ]
+  }
+]}