From ce138d8485820fca38397ee9d75989f760439658 Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Fri, 15 May 2015 10:54:05 +0200 Subject: [PATCH] rename web service actions with the domainWsAction form --- .../main/java/org/sonar/server/batch/BatchWs.java | 6 +++--- .../batch/{BatchAction.java => BatchWsAction.java} | 3 +-- .../sonar/server/batch/GlobalRepositoryAction.java | 2 +- .../java/org/sonar/server/batch/IssuesAction.java | 13 +++++++------ .../sonar/server/batch/ProjectRepositoryAction.java | 2 +- .../java/org/sonar/server/batch/UsersAction.java | 2 +- .../org/sonar/server/component/ws/ProjectsWs.java | 6 +++--- .../{ProjectsAction.java => ProjectsWsAction.java} | 2 +- .../component/ws/ProvisionedProjectsAction.java | 2 +- .../server/dashboard/ws/DashboardsShowAction.java | 5 +++-- .../org/sonar/server/dashboard/ws/DashboardsWs.java | 6 +++--- ...ashboardsAction.java => DashboardsWsAction.java} | 2 +- .../java/org/sonar/server/design/ws/ShowAction.java | 4 ++-- .../org/sonar/server/issue/ws/AuthorsAction.java | 2 +- .../sonar/server/issue/ws/ComponentTagsAction.java | 2 +- .../org/sonar/server/issue/ws/IssueShowAction.java | 2 +- .../java/org/sonar/server/issue/ws/IssuesWs.java | 6 +++--- ...{BaseIssuesWsAction.java => IssuesWsAction.java} | 5 +---- .../org/sonar/server/issue/ws/SearchAction.java | 2 +- .../org/sonar/server/issue/ws/SetTagsAction.java | 2 +- .../java/org/sonar/server/issue/ws/TagsAction.java | 2 +- .../{BaseQGateWsAction.java => QGateWsAction.java} | 2 +- .../server/qualitygate/ws/QGatesAppAction.java | 2 +- .../server/qualitygate/ws/QGatesCopyAction.java | 2 +- .../server/qualitygate/ws/QGatesCreateAction.java | 2 +- .../qualitygate/ws/QGatesCreateConditionAction.java | 2 +- .../qualitygate/ws/QGatesDeleteConditionAction.java | 2 +- .../server/qualitygate/ws/QGatesDeselectAction.java | 2 +- .../server/qualitygate/ws/QGatesDestroyAction.java | 2 +- .../server/qualitygate/ws/QGatesListAction.java | 2 +- .../server/qualitygate/ws/QGatesRenameAction.java | 2 +- .../server/qualitygate/ws/QGatesSearchAction.java | 2 +- .../server/qualitygate/ws/QGatesSelectAction.java | 2 +- .../qualitygate/ws/QGatesSetAsDefaultAction.java | 2 +- .../server/qualitygate/ws/QGatesShowAction.java | 2 +- .../qualitygate/ws/QGatesUnsetDefaultAction.java | 2 +- .../qualitygate/ws/QGatesUpdateConditionAction.java | 2 +- .../org/sonar/server/qualitygate/ws/QGatesWs.java | 6 +++--- .../qualityprofile/ws/QProfileBackupAction.java | 2 +- .../ws/QProfileChangeParentAction.java | 2 +- .../qualityprofile/ws/QProfileChangelogAction.java | 2 +- .../qualityprofile/ws/QProfileCompareAction.java | 2 +- .../qualityprofile/ws/QProfileCopyAction.java | 2 +- .../qualityprofile/ws/QProfileCreateAction.java | 2 +- .../qualityprofile/ws/QProfileDeleteAction.java | 2 +- .../qualityprofile/ws/QProfileExportAction.java | 2 +- .../qualityprofile/ws/QProfileExportersAction.java | 2 +- .../qualityprofile/ws/QProfileImportersAction.java | 2 +- .../ws/QProfileInheritanceAction.java | 2 +- .../qualityprofile/ws/QProfileProjectsAction.java | 2 +- .../qualityprofile/ws/QProfileRenameAction.java | 2 +- .../qualityprofile/ws/QProfileRestoreAction.java | 2 +- .../ws/QProfileRestoreBuiltInAction.java | 2 +- .../qualityprofile/ws/QProfileSearchAction.java | 2 +- .../qualityprofile/ws/QProfileSetDefaultAction.java | 2 +- ...eQProfileWsAction.java => QProfileWsAction.java} | 2 +- .../sonar/server/qualityprofile/ws/QProfilesWs.java | 6 +++--- .../java/org/sonar/server/rule/ws/AppAction.java | 2 +- .../java/org/sonar/server/rule/ws/CreateAction.java | 2 +- .../java/org/sonar/server/rule/ws/DeleteAction.java | 2 +- .../sonar/server/rule/ws/RepositoriesAction.java | 2 +- .../main/java/org/sonar/server/rule/ws/RulesWs.java | 6 +++--- .../ws/{RulesAction.java => RulesWsAction.java} | 3 +-- .../java/org/sonar/server/rule/ws/SearchAction.java | 2 +- .../java/org/sonar/server/rule/ws/ShowAction.java | 2 +- .../java/org/sonar/server/rule/ws/TagsAction.java | 2 +- .../java/org/sonar/server/rule/ws/UpdateAction.java | 2 +- .../java/org/sonar/server/source/ws/HashAction.java | 2 +- .../org/sonar/server/source/ws/IndexAction.java | 2 +- .../org/sonar/server/source/ws/LinesAction.java | 2 +- .../java/org/sonar/server/source/ws/RawAction.java | 2 +- .../java/org/sonar/server/source/ws/ScmAction.java | 2 +- .../java/org/sonar/server/source/ws/ShowAction.java | 2 +- .../java/org/sonar/server/source/ws/SourcesWs.java | 6 +++--- .../ws/{SourcesAction.java => SourcesWsAction.java} | 3 +-- .../server/test/ws/TestsCoveredFilesAction.java | 2 +- .../org/sonar/server/test/ws/TestsListAction.java | 2 +- .../main/java/org/sonar/server/test/ws/TestsWs.java | 6 +++--- .../test/ws/{TestAction.java => TestsWsAction.java} | 2 +- .../server/ui/ws/ComponentNavigationAction.java | 2 +- .../sonar/server/ui/ws/GlobalNavigationAction.java | 2 +- .../java/org/sonar/server/ui/ws/NavigationWs.java | 6 +++--- ...avigationAction.java => NavigationWsAction.java} | 3 +-- .../server/ui/ws/SettingsNavigationAction.java | 2 +- .../sonar/server/user/ws/ChangePasswordAction.java | 2 +- .../java/org/sonar/server/user/ws/CreateAction.java | 2 +- .../org/sonar/server/user/ws/CurrentUserAction.java | 2 +- .../org/sonar/server/user/ws/DeactivateAction.java | 2 +- .../java/org/sonar/server/user/ws/GroupsAction.java | 2 +- .../java/org/sonar/server/user/ws/SearchAction.java | 2 +- .../java/org/sonar/server/user/ws/UpdateAction.java | 2 +- .../main/java/org/sonar/server/user/ws/UsersWs.java | 6 +++--- .../{BaseUsersWsAction.java => UsersWsAction.java} | 3 +-- .../src/main/java/org/sonar/server/ws/WsAction.java | 1 - .../org/sonar/server/issue/ws/IssuesWsTest.java | 4 ++-- .../filter_by_tags.json | 0 .../get_note_as_markdown_and_html.json | 0 .../get_tags.json | 0 .../get_tags_filtered.json | 0 .../get_tags_limited.json | 0 .../search_2_rules.json | 0 .../search_2_rules_fields.json | 0 .../search_active_rules.json | 0 .../search_active_rules_params.json | 0 .../search_debt_rule.json | 0 .../search_debt_rules_sticky.json | 0 ...les_with_default_and_overridden_debt_values.json | 0 ..._linear_offset_and_overridden_constant_debt.json | 0 ...lt_linear_offset_and_overridden_linear_debt.json | 0 .../search_no_rules.json | 0 .../search_profile_active_rules.json | 0 .../search_profile_active_rules_inheritance.json | 0 .../search_rules_from_template_key.json | 0 .../search_template_rules.json | 0 .../severities_facet.json | 0 .../show_rule_active.json | 0 .../show_rule_no_active.json | 0 .../statuses_facet.json | 0 .../statuses_facet_sticky.json | 0 119 files changed, 126 insertions(+), 133 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/batch/{BatchAction.java => BatchWsAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/component/ws/{ProjectsAction.java => ProjectsWsAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/{DashboardsAction.java => DashboardsWsAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/issue/ws/{BaseIssuesWsAction.java => IssuesWsAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{BaseQGateWsAction.java => QGateWsAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{BaseQProfileWsAction.java => QProfileWsAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/rule/ws/{RulesAction.java => RulesWsAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/source/ws/{SourcesAction.java => SourcesWsAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/test/ws/{TestAction.java => TestsWsAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/ui/ws/{NavigationAction.java => NavigationWsAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/user/ws/{BaseUsersWsAction.java => UsersWsAction.java} (94%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/filter_by_tags.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/get_note_as_markdown_and_html.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/get_tags.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/get_tags_filtered.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/get_tags_limited.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_2_rules.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_2_rules_fields.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_active_rules.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_active_rules_params.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_debt_rule.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_debt_rules_sticky.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_debt_rules_with_default_and_overridden_debt_values.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_no_rules.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_profile_active_rules.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_profile_active_rules_inheritance.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_rules_from_template_key.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/search_template_rules.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/severities_facet.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/show_rule_active.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/show_rule_no_active.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/statuses_facet.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/rule/ws/{RulesWebServiceMediumTest => RulesWsMediumTest}/statuses_facet_sticky.json (100%) diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java index 383c1847cf9..df6a4bccbb8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWs.java @@ -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/BatchAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/batch/BatchAction.java rename to server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java index 367935d1ade..66f279a690b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/BatchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/BatchWsAction.java @@ -21,7 +21,6 @@ package org.sonar.server.batch; import org.sonar.server.ws.WsAction; -public interface BatchAction extends WsAction { - +public interface BatchWsAction extends WsAction { // Marker interface } diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java index 9f76061023a..92ca5e923b3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java index 16b3c4b0bec..e7177cea1c5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/IssuesAction.java @@ -20,11 +20,6 @@ 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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java index 9b7557aafdf..9a1369f590e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java b/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java index 46f2c0d1671..a4ecc638736 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/batch/UsersAction.java @@ -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/ProjectsWs.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java index 4b99a290d58..13ab2556780 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java @@ -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/ProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWsAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWsAction.java index ddbe535b745..6423e0c011c 100644 --- 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/ProjectsWsAction.java @@ -22,6 +22,6 @@ package org.sonar.server.component.ws; import org.sonar.server.ws.WsAction; -public interface ProjectsAction extends WsAction { +public interface ProjectsWsAction extends WsAction { // marker interface } diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProvisionedProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProvisionedProjectsAction.java index 7acf67b055d..9abbd5c5907 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProvisionedProjectsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProvisionedProjectsAction.java @@ -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 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/DashboardsShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java index 71e26c747dd..b70211d339e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWs.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWs.java index b3c8c7d93fa..a300c384c6f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWs.java @@ -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/DashboardsAction.java b/server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWsAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsWsAction.java index f49cb281301..46caef931be 100644 --- 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/DashboardsWsAction.java @@ -21,7 +21,7 @@ package org.sonar.server.dashboard.ws; import org.sonar.server.ws.WsAction; -public interface DashboardsAction extends WsAction { +public interface DashboardsWsAction extends WsAction { // Marker interface diff --git a/server/sonar-server/src/main/java/org/sonar/server/design/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/design/ws/ShowAction.java index 7e3878981a8..2c5f3203ff4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/design/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/design/ws/ShowAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java index 880d8ac9e8a..8ff65318f6b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/AuthorsAction.java @@ -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/ComponentTagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java index 7b634bec3c8..962e9c4da5e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/ComponentTagsAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java index 93d94ccada8..cce3de4defe 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java index df9e92da850..37311ccfdea 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWs.java @@ -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/BaseIssuesWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/issue/ws/BaseIssuesWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssuesWsAction.java index 60fa19cf591..249b51ee770 100644 --- 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/IssuesWsAction.java @@ -21,9 +21,6 @@ package org.sonar.server.issue.ws; import org.sonar.server.ws.WsAction; -interface BaseIssuesWsAction extends WsAction { - +interface IssuesWsAction extends WsAction { // Marker interface - } - diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java index 2956de30133..c0069644ae2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SearchAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java index f6ccf7dc444..03cbbbf9222 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/SetTagsAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java index d4a862d1678..89c4d5fa7a5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/issue/ws/TagsAction.java @@ -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/QGateWsAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/BaseQGateWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGateWsAction.java index 08604fa3d4a..2d37074fc07 100644 --- 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/QGateWsAction.java @@ -21,7 +21,7 @@ package org.sonar.server.qualitygate.ws; import org.sonar.server.ws.WsAction; -public interface BaseQGateWsAction extends WsAction { +public interface QGateWsAction extends WsAction { // Marker interface } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java index 825a7e22308..1996e96462a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java index 237513b2edb..c61f2a27838 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java index c9c15aa0ffe..d3114898a62 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java index 46bb19693f8..927622e4924 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java index 79e5cbf6c95..2edfc8da679 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java index 24f3946612c..8bdcb84dc88 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java index d48762807c7..e8aa7871747 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java index 8d28a4bc5f2..d7f5d370566 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java index a091fc252a6..8491c29ff8b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java index be456a36f8b..e21973ceb65 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java index 27d0da8a1c9..ce760117cbc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java index 3d60abb07dc..18fc05e019a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java index 18bdee9ecab..74710fa0f75 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java index e497c3db78d..ab76b7ec755 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java index 090d00eca3e..1a5d8bf596c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java index 3a47200d124..bb8bff8abba 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesWs.java @@ -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/QProfileBackupAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileBackupAction.java index aa347835a48..f87f637f956 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileBackupAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileBackupAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentAction.java index 2b99c76429c..034cddd6346 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangelogAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangelogAction.java index 04f2b73385b..6ad199294d5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangelogAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangelogAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCompareAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCompareAction.java index abbcedbf59e..b455ab57d9c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCompareAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCompareAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCopyAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCopyAction.java index 341bf118083..99b0a5c862f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCopyAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCopyAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java index 6362ffb4a69..18b7b821f28 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileDeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileDeleteAction.java index af966a63349..800031e6780 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileDeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileDeleteAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportAction.java index 992b9a8c5fb..9efca568911 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportersAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportersAction.java index 76324f74849..fff90fc19c0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportersAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileImportersAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileImportersAction.java index 8b9389b4cc4..dba30bfb00f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileImportersAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileImportersAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceAction.java index ed3c13c5fee..fd1790e2fe8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java index aabf7126c45..c36b90a3e77 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRenameAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRenameAction.java index a29c80b8b91..65ef7a3b8d1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRenameAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRenameAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreAction.java index b6290e90957..0daf91ff217 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java index 22cbb5d2aed..9127ebefd45 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSearchAction.java index d8149bf8849..7a2580ec02f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSearchAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultAction.java index c35c23cd955..0d1f0484277 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultAction.java @@ -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/BaseQProfileWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BaseQProfileWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileWsAction.java index 68a1d96e33d..c29f8fc18f0 100644 --- 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/QProfileWsAction.java @@ -24,7 +24,7 @@ import org.sonar.server.ws.WsAction; /** * Marker interface for quality profile related web service end points */ -public interface BaseQProfileWsAction extends WsAction { +public interface QProfileWsAction extends WsAction { // Marker interface } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java index 0f2b50a6e79..67a48518ac4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfilesWs.java @@ -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); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java index 12faa3fa9ac..11037dab47d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/AppAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java index 20430e3daff..43e95d449a1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/CreateAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java index 5520761fc45..6cb1d25202e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/DeleteAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java index 87f2b89e755..60a3e4a0d3f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RepositoriesAction.java @@ -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/RulesWs.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java index 7b044dcbb4b..e20ee966fb3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWs.java @@ -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/RulesAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesAction.java rename to server/sonar-server/src/main/java/org/sonar/server/rule/ws/RulesWsAction.java index e6302ed4b58..d2c0ddb889b 100644 --- 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/RulesWsAction.java @@ -25,7 +25,6 @@ import org.sonar.server.ws.WsAction; * Marker interface for coding rule related actions * */ -interface RulesAction extends WsAction { - +interface RulesWsAction extends WsAction { // Marker interface } diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java index 1044bffe7b0..4cf9dafb973 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/SearchAction.java @@ -52,7 +52,7 @@ import org.sonar.server.user.UserSession; /** * @since 4.4 */ -public class SearchAction extends SearchRequestHandler implements RulesAction { +public class SearchAction extends SearchRequestHandler implements RulesWsAction { public static final String PARAM_REPOSITORIES = "repositories"; public static final String PARAM_KEY = "rule_key"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java index 2387e8db40e..b767d93972a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/ShowAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java index cec16771671..a71790a6121 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/TagsAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java index 8ee0104e512..dad8c61eac5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/rule/ws/UpdateAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java index 940af9f8684..35751b53abd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/HashAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java index 5dff47dc731..5a58c36fb65 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/IndexAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java index 6d0599cf19a..7efb25586ec 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/LinesAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java index 00f431d802d..81cc9c90547 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/RawAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java index 418f2abc8b6..c62e0bd881c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ScmAction.java @@ -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; diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java index 54356aa3d36..61be5be83fe 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/ShowAction.java @@ -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/SourcesWs.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java index e35c8f72b5c..2138b22eb5b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWs.java @@ -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/SourcesAction.java b/server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesAction.java rename to server/sonar-server/src/main/java/org/sonar/server/source/ws/SourcesWsAction.java index 3db6f99e0c4..ed8b4b60982 100644 --- 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/SourcesWsAction.java @@ -22,7 +22,6 @@ package org.sonar.server.source.ws; import org.sonar.server.ws.WsAction; -public interface SourcesAction extends WsAction { - +public interface SourcesWsAction extends WsAction { // Marker interface } diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java index 9160ee9d2b0..403fded577b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsListAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsListAction.java index 281f1219d59..06ee6f79ae0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsListAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsListAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java index dcccd19d7ae..1e476d2075a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWs.java @@ -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/TestAction.java b/server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/test/ws/TestAction.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsWsAction.java index 7af1805edef..0a7eff2faf6 100644 --- 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/TestsWsAction.java @@ -22,6 +22,6 @@ package org.sonar.server.test.ws; import org.sonar.server.ws.WsAction; -public interface TestAction extends WsAction { +public interface TestsWsAction extends WsAction { // marker interface } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java index 07f57d8aaff..4d4fdef44d9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/ComponentNavigationAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java index 3c8ae6b9a36..3e0dc705ce2 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/GlobalNavigationAction.java @@ -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/NavigationWs.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java index ce5bbc55b9d..34941a1b042 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWs.java @@ -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/NavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationAction.java rename to server/sonar-server/src/main/java/org/sonar/server/ui/ws/NavigationWsAction.java index 80443aaf662..59b9791633c 100644 --- 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/NavigationWsAction.java @@ -21,7 +21,6 @@ package org.sonar.server.ui.ws; import org.sonar.server.ws.WsAction; -public interface NavigationAction extends WsAction { - +public interface NavigationWsAction extends WsAction { // Marker interface for navigation related actions } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java index 05aa5cf9262..e0dec937828 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/ws/SettingsNavigationAction.java @@ -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/ChangePasswordAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java index 957a35a3734..e2d81b2bb70 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/ChangePasswordAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java index 47a5e021a35..bd47e88ad2a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CreateAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java index 037f5deb12f..422d4539d71 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java @@ -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) { diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java index 5af978d96bc..1d154a887f3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/DeactivateAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java index b25a72f39a3..1df8897c762 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/GroupsAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java index 996488ec57d..4b4dee32d4d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/SearchAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java index 8b1adda213d..23a7f2d2521 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UpdateAction.java @@ -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"; diff --git a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java index 7a96a62140d..476461d2c27 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWs.java @@ -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/BaseUsersWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/user/ws/BaseUsersWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/user/ws/UsersWsAction.java index b4506744948..0454b86377c 100644 --- 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/UsersWsAction.java @@ -21,7 +21,6 @@ package org.sonar.server.user.ws; import org.sonar.server.ws.WsAction; -public interface BaseUsersWsAction extends WsAction { - +public interface UsersWsAction extends WsAction { // Marker interface for UsersWs actions } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java index bb5aff54ef8..d0d339f27b6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WsAction.java @@ -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 { - // Marker interface } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java index 63971f68f68..ba2045a4f0f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssuesWsTest.java @@ -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/RulesWsMediumTest/filter_by_tags.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/filter_by_tags.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/filter_by_tags.json 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/RulesWsMediumTest/get_note_as_markdown_and_html.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_note_as_markdown_and_html.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_note_as_markdown_and_html.json 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/RulesWsMediumTest/get_tags.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags.json 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/RulesWsMediumTest/get_tags_filtered.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags_filtered.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags_filtered.json 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/RulesWsMediumTest/get_tags_limited.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/get_tags_limited.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/get_tags_limited.json 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/RulesWsMediumTest/search_2_rules.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_2_rules.json 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/RulesWsMediumTest/search_2_rules_fields.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_2_rules_fields.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_2_rules_fields.json 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/RulesWsMediumTest/search_active_rules.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_active_rules.json 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/RulesWsMediumTest/search_active_rules_params.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_active_rules_params.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_active_rules_params.json 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/RulesWsMediumTest/search_debt_rule.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rule.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rule.json 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/RulesWsMediumTest/search_debt_rules_sticky.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_sticky.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_sticky.json 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/RulesWsMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_and_overridden_debt_values.json 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/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_constant_debt.json 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/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_debt_rules_with_default_linear_offset_and_overridden_linear_debt.json 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/RulesWsMediumTest/search_no_rules.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_no_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_no_rules.json 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/RulesWsMediumTest/search_profile_active_rules.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_profile_active_rules.json 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/RulesWsMediumTest/search_profile_active_rules_inheritance.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_profile_active_rules_inheritance.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_profile_active_rules_inheritance.json 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/RulesWsMediumTest/search_rules_from_template_key.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_rules_from_template_key.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_rules_from_template_key.json 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/RulesWsMediumTest/search_template_rules.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/search_template_rules.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/search_template_rules.json 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/RulesWsMediumTest/severities_facet.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/severities_facet.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/severities_facet.json 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/RulesWsMediumTest/show_rule_active.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_active.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/show_rule_active.json 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/RulesWsMediumTest/show_rule_no_active.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/show_rule_no_active.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/show_rule_no_active.json 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/RulesWsMediumTest/statuses_facet.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/statuses_facet.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/statuses_facet.json 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/RulesWsMediumTest/statuses_facet_sticky.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWebServiceMediumTest/statuses_facet_sticky.json rename to server/sonar-server/src/test/resources/org/sonar/server/rule/ws/RulesWsMediumTest/statuses_facet_sticky.json -- 2.39.5