From 8d82c9cf9ba88c1517604b4063ad0fc2a9a1bb9a Mon Sep 17 00:00:00 2001 From: Teryk Bellahsene Date: Tue, 19 May 2015 17:32:19 +0200 Subject: [PATCH] consistent methods names for all WsAction classes --- ...epositoryAction.java => GlobalAction.java} | 4 +- ...positoryAction.java => ProjectAction.java} | 4 +- ...ComponentAppAction.java => AppAction.java} | 13 +- .../server/component/ws/ComponentsWs.java | 4 +- .../computation/ws/ComputationWsAction.java | 3 +- ...istoryWsAction.java => HistoryAction.java} | 13 +- .../server/computation/ws/IsQueueEmptyWs.java | 8 +- .../{QueueWsAction.java => QueueAction.java} | 5 +- ...tWsAction.java => SubmitReportAction.java} | 8 +- ...hboardsShowAction.java => ShowAction.java} | 4 +- .../{IssueShowAction.java => ShowAction.java} | 19 +- .../server/platform/ServerComponents.java | 247 +++++++++--------- .../server/platform/monitoring/Monitor.java | 3 +- ...ystemInfoWsAction.java => InfoAction.java} | 7 +- ...Action.java => MigrateDbSystemAction.java} | 8 +- ...estartWsAction.java => RestartAction.java} | 6 +- ...mStatusWsAction.java => StatusAction.java} | 6 +- ...ystemWsAction.java => UpgradesAction.java} | 9 +- ...ginsWsAction.java => AvailableAction.java} | 7 +- ...ginsWsAction.java => CancelAllAction.java} | 4 +- ...luginsWsAction.java => InstallAction.java} | 9 +- ...ginsWsAction.java => InstalledAction.java} | 6 +- ...luginsWsAction.java => PendingAction.java} | 8 +- ...ginsWsAction.java => UninstallAction.java} | 4 +- ...PluginsWsAction.java => UpdateAction.java} | 9 +- ...luginsWsAction.java => UpdatesAction.java} | 24 +- .../ws/DeleteAction.java} | 6 +- .../ws/GhostsAction.java} | 6 +- .../{component => project}/ws/ProjectsWs.java | 2 +- .../ws/ProjectsWsAction.java | 2 +- .../ws/ProvisionedAction.java} | 6 +- .../ws/package-info.java} | 12 +- .../{QGatesAppAction.java => AppAction.java} | 4 +- ...{QGatesCopyAction.java => CopyAction.java} | 4 +- ...tesCreateAction.java => CreateAction.java} | 4 +- ...Action.java => CreateConditionAction.java} | 4 +- ...Action.java => DeleteConditionAction.java} | 4 +- ...eselectAction.java => DeselectAction.java} | 4 +- ...sDestroyAction.java => DestroyAction.java} | 4 +- ...{QGatesListAction.java => ListAction.java} | 4 +- ...tesRenameAction.java => RenameAction.java} | 4 +- ...tesSearchAction.java => SearchAction.java} | 4 +- ...tesSelectAction.java => SelectAction.java} | 4 +- ...ultAction.java => SetAsDefaultAction.java} | 4 +- ...{QGatesShowAction.java => ShowAction.java} | 4 +- ...ultAction.java => UnsetDefaultAction.java} | 4 +- ...Action.java => UpdateConditionAction.java} | 4 +- ...ileBackupAction.java => BackupAction.java} | 4 +- ...entAction.java => ChangeParentAction.java} | 4 +- ...ngelogAction.java => ChangelogAction.java} | 4 +- ...eCompareAction.java => CompareAction.java} | 4 +- ...ProfileCopyAction.java => CopyAction.java} | 4 +- ...ileCreateAction.java => CreateAction.java} | 10 +- ...ileDeleteAction.java => DeleteAction.java} | 4 +- ...ileExportAction.java => ExportAction.java} | 4 +- ...ortersAction.java => ExportersAction.java} | 6 +- ...ortersAction.java => ImportersAction.java} | 6 +- ...anceAction.java => InheritanceAction.java} | 4 +- ...rojectsAction.java => ProjectsAction.java} | 13 +- ...ileRenameAction.java => RenameAction.java} | 4 +- ...eRestoreAction.java => RestoreAction.java} | 4 +- ...nAction.java => RestoreBuiltInAction.java} | 4 +- ...ileSearchAction.java => SearchAction.java} | 4 +- ...faultAction.java => SetDefaultAction.java} | 4 +- ...lesAction.java => CoveredFilesAction.java} | 9 +- .../{TestsListAction.java => ListAction.java} | 4 +- .../java/org/sonar/server/ui/JRubyFacade.java | 5 +- ...rentUserAction.java => CurrentAction.java} | 4 +- .../ws/projects-example-create.json | 0 .../ws/projects-example-ghosts.json | 0 .../ws/projects-example-index.json | 0 .../ws/projects-example-provisioned.json | 0 .../org/sonar/server/batch/BatchWsTest.java | 4 +- ...yActionTest.java => GlobalActionTest.java} | 4 +- ...ActionTest.java => ProjectActionTest.java} | 4 +- ...tAppActionTest.java => AppActionTest.java} | 4 +- .../server/component/ws/ComponentsWsTest.java | 2 +- .../server/component/ws/SearchActionTest.java | 2 +- .../computation/ws/ComputationWsTest.java | 24 +- ...Test.java => HistoryActionMediumTest.java} | 9 +- .../computation/ws/IsQueueEmptyWsTest.java | 4 +- ...WsActionTest.java => QueueActionTest.java} | 4 +- ...nTest.java => SubmitReportActionTest.java} | 14 +- ...howActionTest.java => ShowActionTest.java} | 4 +- ...oWsActionTest.java => InfoActionTest.java} | 4 +- ...st.java => MigrateDbSystemActionTest.java} | 4 +- ...ActionTest.java => RestartActionTest.java} | 4 +- ...sActionTest.java => StatusActionTest.java} | 11 +- .../server/platform/ws/SystemWsTest.java | 4 +- ...ctionTest.java => UpgradesActionTest.java} | 4 +- ...tUpdateCenterBasedPluginsWsActionTest.java | 5 +- ...tionTest.java => AvailableActionTest.java} | 4 +- ...tionTest.java => CancelAllActionTest.java} | 4 +- ...ActionTest.java => InstallActionTest.java} | 4 +- ...tionTest.java => InstalledActionTest.java} | 4 +- ...ActionTest.java => PendingActionTest.java} | 4 +- ...tionTest.java => UninstallActionTest.java} | 4 +- ...sActionTest.java => UpdateActionTest.java} | 4 +- ...ActionTest.java => UpdatesActionTest.java} | 4 +- .../ws/DeleteActionTest.java} | 6 +- .../ws/GhostsActionTest.java} | 6 +- .../ws/ProjectsWsTest.java | 2 +- .../ws/ProvisionedActionTest.java} | 6 +- ...sAppActionTest.java => AppActionTest.java} | 12 +- .../server/qualitygate/ws/QGatesWsTest.java | 12 +- ...pActionTest.java => BackupActionTest.java} | 4 +- ...java => ChangeParentActionMediumTest.java} | 2 +- ...tionTest.java => ChangelogActionTest.java} | 4 +- ...Test.java => CompareActionMediumTest.java} | 2 +- ...opyActionTest.java => CopyActionTest.java} | 4 +- ...mTest.java => CreateActionMediumTest.java} | 2 +- ...eActionTest.java => CreateActionTest.java} | 4 +- ...eActionTest.java => DeleteActionTest.java} | 4 +- ...tActionTest.java => ExportActionTest.java} | 6 +- ...tionTest.java => ExportersActionTest.java} | 4 +- ...tionTest.java => ImportersActionTest.java} | 4 +- ....java => InheritanceActionMediumTest.java} | 2 +- ...ctionTest.java => ProjectsActionTest.java} | 4 +- .../qualityprofile/ws/QProfilesWsTest.java | 34 +-- ...eActionTest.java => RenameActionTest.java} | 4 +- ...ActionTest.java => RestoreActionTest.java} | 4 +- ...est.java => RestoreBuiltInActionTest.java} | 4 +- ...hActionTest.java => SearchActionTest.java} | 4 +- ...ionTest.java => SetDefaultActionTest.java} | 4 +- ...nTest.java => CoveredFilesActionTest.java} | 6 +- ...istActionTest.java => ListActionTest.java} | 26 +- .../org/sonar/server/test/ws/TestsWsTest.java | 4 +- ...ActionTest.java => CurrentActionTest.java} | 4 +- .../org/sonar/server/user/ws/UsersWsTest.java | 2 +- .../return_global_referentials.json | 0 .../return_global_settings.json | 0 ...hout_scan_but_with_preview_permission.json | 0 .../project_referentials.json | 0 .../app.json | 0 .../app_with_it_measure.json | 0 .../app_with_measures.json | 0 .../app_with_overall_measure.json | 0 .../app_with_ut_measure.json | 0 .../list_history_reports.json | 0 .../list_queue_reports.json | 0 .../show_issue.json | 0 .../show_issue_on_removed_component.json | 0 .../show_issue_with_action_plan.json | 0 .../show_issue_with_actions.json | 0 .../show_issue_with_changelog.json | 0 .../show_issue_with_characteristics.json | 0 .../show_issue_with_comments.json | 0 .../show_issue_with_dates.json | 0 .../show_issue_with_sub_project.json | 0 .../show_issue_with_technical_debt.json | 0 .../show_issue_with_transitions.json | 0 .../show_issue_with_users.json | 0 .../properties_per_plugin.json | 0 .../some.jar | 0 .../properties_per_plugin.json | 36 --- .../ws/GhostsActionTest}/all-projects.json | 0 .../ws/GhostsActionTest}/pagination.json | 0 .../ProvisionedActionTest}/all-projects.json | 0 .../changelog_empty.json | 0 .../changelog_no_login.json | 0 .../changelog_no_param.json | 0 .../changelog_nominal.json | 0 .../changelog_page1.json | 0 .../changelog_page2.json | 0 .../changelog_page3.json | 0 .../compare_nominal.json | 0 .../compare_param_on_left.json | 0 .../compare_param_on_right.json | 0 .../copy_nominal.json | 0 .../copy_with_parent.json | 0 .../create-nominal.json | 0 .../create-with-messages.json | 0 .../create-no-importer.json | 0 .../exporters.json | 0 .../importers.json | 0 .../inheritance-buWide.json | 0 .../inheritance-simple.json | 0 .../all.json | 0 .../all_filtered.json | 0 .../authorized_selected.json | 0 .../deselected.json | 0 .../empty.json | 0 .../selected_page1.json | 0 .../selected_page2.json | 0 .../selected_ps3_page1.json | 0 .../selected_ps3_page2.json | 0 .../restore_profile.json | 0 .../search.json | 0 .../search_fields.json | 0 .../search_xoo1.json | 0 .../tests-covered-files.json | 0 .../list-main-file.json | 0 .../list-test-uuid.json | 0 .../test/ws/TestsShowActionTest/show.json | 18 -- .../show_from_test_data.json | 16 -- ...w_from_test_data_with_a_time_in_float.json | 9 - .../anonymous.json | 0 .../authenticated.json | 0 198 files changed, 483 insertions(+), 574 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/batch/{GlobalRepositoryAction.java => GlobalAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/batch/{ProjectRepositoryAction.java => ProjectAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/component/ws/{ComponentAppAction.java => AppAction.java} (98%) rename server/sonar-server/src/main/java/org/sonar/server/computation/ws/{HistoryWsAction.java => HistoryAction.java} (92%) rename server/sonar-server/src/main/java/org/sonar/server/computation/ws/{QueueWsAction.java => QueueAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/computation/ws/{SubmitReportWsAction.java => SubmitReportAction.java} (92%) rename server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/{DashboardsShowAction.java => ShowAction.java} (97%) rename server/sonar-server/src/main/java/org/sonar/server/issue/ws/{IssueShowAction.java => ShowAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/platform/ws/{SystemInfoWsAction.java => InfoAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/platform/ws/{MigrateDbSystemWsAction.java => MigrateDbSystemAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/platform/ws/{SystemRestartWsAction.java => RestartAction.java} (90%) rename server/sonar-server/src/main/java/org/sonar/server/platform/ws/{SystemStatusWsAction.java => StatusAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/platform/ws/{UpgradesSystemWsAction.java => UpgradesAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/plugins/ws/{AvailablePluginsWsAction.java => AvailableAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/plugins/ws/{CancelAllPluginsWsAction.java => CancelAllAction.java} (91%) rename server/sonar-server/src/main/java/org/sonar/server/plugins/ws/{InstallPluginsWsAction.java => InstallAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/plugins/ws/{InstalledPluginsWsAction.java => InstalledAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/plugins/ws/{PendingPluginsWsAction.java => PendingAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/plugins/ws/{UninstallPluginsWsAction.java => UninstallAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/plugins/ws/{UpdatePluginsWsAction.java => UpdateAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/plugins/ws/{UpdatesPluginsWsAction.java => UpdatesAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/{component/ws/ProjectsDeleteAction.java => project/ws/DeleteAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/{component/ws/ProjectsGhostsAction.java => project/ws/GhostsAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/{component => project}/ws/ProjectsWs.java (99%) rename server/sonar-server/src/main/java/org/sonar/server/{component => project}/ws/ProjectsWsAction.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/{component/ws/ProjectsProvisionedAction.java => project/ws/ProvisionedAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/{platform/ws/ServerWsAction.java => project/ws/package-info.java} (81%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesAppAction.java => AppAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesCopyAction.java => CopyAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesCreateAction.java => CreateAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesCreateConditionAction.java => CreateConditionAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesDeleteConditionAction.java => DeleteConditionAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesDeselectAction.java => DeselectAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesDestroyAction.java => DestroyAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesListAction.java => ListAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesRenameAction.java => RenameAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesSearchAction.java => SearchAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesSelectAction.java => SelectAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesSetAsDefaultAction.java => SetAsDefaultAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesShowAction.java => ShowAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesUnsetDefaultAction.java => UnsetDefaultAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/{QGatesUpdateConditionAction.java => UpdateConditionAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileBackupAction.java => BackupAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileChangeParentAction.java => ChangeParentAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileChangelogAction.java => ChangelogAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileCompareAction.java => CompareAction.java} (97%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileCopyAction.java => CopyAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileCreateAction.java => CreateAction.java} (92%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileDeleteAction.java => DeleteAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileExportAction.java => ExportAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileExportersAction.java => ExportersAction.java} (92%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileImportersAction.java => ImportersAction.java} (92%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileInheritanceAction.java => InheritanceAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileProjectsAction.java => ProjectsAction.java} (98%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileRenameAction.java => RenameAction.java} (94%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileRestoreAction.java => RestoreAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileRestoreBuiltInAction.java => RestoreBuiltInAction.java} (93%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileSearchAction.java => SearchAction.java} (97%) rename server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/{QProfileSetDefaultAction.java => SetDefaultAction.java} (95%) rename server/sonar-server/src/main/java/org/sonar/server/test/ws/{TestsCoveredFilesAction.java => CoveredFilesAction.java} (96%) rename server/sonar-server/src/main/java/org/sonar/server/test/ws/{TestsListAction.java => ListAction.java} (98%) rename server/sonar-server/src/main/java/org/sonar/server/user/ws/{CurrentUserAction.java => CurrentAction.java} (95%) rename server/sonar-server/src/main/resources/org/sonar/server/{component => project}/ws/projects-example-create.json (100%) rename server/sonar-server/src/main/resources/org/sonar/server/{component => project}/ws/projects-example-ghosts.json (100%) rename server/sonar-server/src/main/resources/org/sonar/server/{component => project}/ws/projects-example-index.json (100%) rename server/sonar-server/src/main/resources/org/sonar/server/{component => project}/ws/projects-example-provisioned.json (100%) rename server/sonar-server/src/test/java/org/sonar/server/batch/{GlobalRepositoryActionTest.java => GlobalActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/batch/{ProjectRepositoryActionTest.java => ProjectActionTest.java} (96%) rename server/sonar-server/src/test/java/org/sonar/server/component/ws/{ComponentAppActionTest.java => AppActionTest.java} (98%) rename server/sonar-server/src/test/java/org/sonar/server/computation/ws/{HistoryWsActionMediumTest.java => HistoryActionMediumTest.java} (96%) rename server/sonar-server/src/test/java/org/sonar/server/computation/ws/{QueueWsActionTest.java => QueueActionTest.java} (95%) rename server/sonar-server/src/test/java/org/sonar/server/computation/ws/{SubmitReportWsActionTest.java => SubmitReportActionTest.java} (89%) rename server/sonar-server/src/test/java/org/sonar/server/issue/ws/{IssueShowActionTest.java => ShowActionTest.java} (99%) rename server/sonar-server/src/test/java/org/sonar/server/platform/ws/{SystemInfoWsActionTest.java => InfoActionTest.java} (95%) rename server/sonar-server/src/test/java/org/sonar/server/platform/ws/{MigrateDbSystemWsActionTest.java => MigrateDbSystemActionTest.java} (98%) rename server/sonar-server/src/test/java/org/sonar/server/platform/ws/{SystemRestartWsActionTest.java => RestartActionTest.java} (94%) rename server/sonar-server/src/test/java/org/sonar/server/platform/ws/{SystemStatusWsActionTest.java => StatusActionTest.java} (98%) rename server/sonar-server/src/test/java/org/sonar/server/platform/ws/{UpgradesSystemWsActionTest.java => UpgradesActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/plugins/ws/{AvailablePluginsWsActionTest.java => AvailableActionTest.java} (96%) rename server/sonar-server/src/test/java/org/sonar/server/plugins/ws/{CancelAllPluginsWsActionTest.java => CancelAllActionTest.java} (95%) rename server/sonar-server/src/test/java/org/sonar/server/plugins/ws/{InstallPluginsWsActionTest.java => InstallActionTest.java} (96%) rename server/sonar-server/src/test/java/org/sonar/server/plugins/ws/{InstalledPluginsWsActionTest.java => InstalledActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/plugins/ws/{PendingPluginsWsActionTest.java => PendingActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/plugins/ws/{UninstallPluginsWsActionTest.java => UninstallActionTest.java} (96%) rename server/sonar-server/src/test/java/org/sonar/server/plugins/ws/{UpdatePluginsWsActionTest.java => UpdateActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/plugins/ws/{UpdatesPluginsWsActionTest.java => UpdatesActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/{component/ws/ProjectsDeleteActionTest.java => project/ws/DeleteActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/{component/ws/ProjectsGhostsActionTest.java => project/ws/GhostsActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/{component => project}/ws/ProjectsWsTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/{component/ws/ProjectsProvisionedActionTest.java => project/ws/ProvisionedActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/{QGatesAppActionTest.java => AppActionTest.java} (85%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileBackupActionTest.java => BackupActionTest.java} (95%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileChangeParentActionMediumTest.java => ChangeParentActionMediumTest.java} (99%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileChangelogActionTest.java => ChangelogActionTest.java} (98%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileCompareActionMediumTest.java => CompareActionMediumTest.java} (99%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileCopyActionTest.java => CopyActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileCreateActionMediumTest.java => CreateActionMediumTest.java} (98%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileCreateActionTest.java => CreateActionTest.java} (93%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileDeleteActionTest.java => DeleteActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileExportActionTest.java => ExportActionTest.java} (96%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileExportersActionTest.java => ExportersActionTest.java} (95%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileImportersActionTest.java => ImportersActionTest.java} (95%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileInheritanceActionMediumTest.java => InheritanceActionMediumTest.java} (99%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest.java => ProjectsActionTest.java} (98%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileRenameActionTest.java => RenameActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileRestoreActionTest.java => RestoreActionTest.java} (96%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileRestoreBuiltInActionTest.java => RestoreBuiltInActionTest.java} (94%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileSearchActionTest.java => SearchActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/{QProfileSetDefaultActionTest.java => SetDefaultActionTest.java} (97%) rename server/sonar-server/src/test/java/org/sonar/server/test/ws/{TestsCoveredFilesActionTest.java => CoveredFilesActionTest.java} (93%) rename server/sonar-server/src/test/java/org/sonar/server/test/ws/{TestsListActionTest.java => ListActionTest.java} (91%) rename server/sonar-server/src/test/java/org/sonar/server/user/ws/{CurrentUserActionTest.java => CurrentActionTest.java} (93%) rename server/sonar-server/src/test/resources/org/sonar/server/batch/{GlobalRepositoryActionTest => GlobalActionTest}/return_global_referentials.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/batch/{GlobalRepositoryActionTest => GlobalActionTest}/return_global_settings.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/batch/{GlobalRepositoryActionTest => GlobalActionTest}/return_only_license_settings_without_scan_but_with_preview_permission.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/batch/{ProjectRepositoryActionTest => ProjectActionTest}/project_referentials.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/component/ws/{ComponentAppActionTest => AppActionTest}/app.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/component/ws/{ComponentAppActionTest => AppActionTest}/app_with_it_measure.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/component/ws/{ComponentAppActionTest => AppActionTest}/app_with_measures.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/component/ws/{ComponentAppActionTest => AppActionTest}/app_with_overall_measure.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/component/ws/{ComponentAppActionTest => AppActionTest}/app_with_ut_measure.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/ws/{HistoryWsActionMediumTest => HistoryActionMediumTest}/list_history_reports.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/computation/ws/{QueueWsActionTest => QueueActionTest}/list_queue_reports.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_on_removed_component.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_action_plan.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_actions.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_changelog.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_characteristics.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_comments.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_dates.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_sub_project.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_technical_debt.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_transitions.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/issue/ws/{IssueShowActionTest => ShowActionTest}/show_issue_with_users.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/{AvailablePluginsWsActionTest => AvailableActionTest}/properties_per_plugin.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/{InstalledPluginsWsActionTest => InstalledActionTest}/some.jar (100%) delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/UpdatablePluginsWsActionTest/properties_per_plugin.json rename server/sonar-server/src/test/resources/org/sonar/server/{component/ws/ProjectsGhostsActionTest => project/ws/GhostsActionTest}/all-projects.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/{component/ws/ProjectsGhostsActionTest => project/ws/GhostsActionTest}/pagination.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/{component/ws/ProjectsProvisionedActionTest => project/ws/ProvisionedActionTest}/all-projects.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileChangelogActionTest => ChangelogActionTest}/changelog_empty.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileChangelogActionTest => ChangelogActionTest}/changelog_no_login.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileChangelogActionTest => ChangelogActionTest}/changelog_no_param.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileChangelogActionTest => ChangelogActionTest}/changelog_nominal.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileChangelogActionTest => ChangelogActionTest}/changelog_page1.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileChangelogActionTest => ChangelogActionTest}/changelog_page2.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileChangelogActionTest => ChangelogActionTest}/changelog_page3.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileCompareActionMediumTest => CompareActionMediumTest}/compare_nominal.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileCompareActionMediumTest => CompareActionMediumTest}/compare_param_on_left.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileCompareActionMediumTest => CompareActionMediumTest}/compare_param_on_right.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileCopyActionTest => CopyActionTest}/copy_nominal.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileCopyActionTest => CopyActionTest}/copy_with_parent.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileCreateActionMediumTest => CreateActionMediumTest}/create-nominal.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileCreateActionMediumTest => CreateActionMediumTest}/create-with-messages.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileCreateActionTest => CreateActionTest}/create-no-importer.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileExportersActionTest => ExportersActionTest}/exporters.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileImportersActionTest => ImportersActionTest}/importers.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileInheritanceActionMediumTest => InheritanceActionMediumTest}/inheritance-buWide.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileInheritanceActionMediumTest => InheritanceActionMediumTest}/inheritance-simple.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/all.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/all_filtered.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/authorized_selected.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/deselected.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/empty.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/selected_page1.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/selected_page2.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/selected_ps3_page1.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileProjectsActionTest => ProjectsActionTest}/selected_ps3_page2.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileRestoreActionTest => RestoreActionTest}/restore_profile.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileSearchActionTest => SearchActionTest}/search.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileSearchActionTest => SearchActionTest}/search_fields.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/{QProfileSearchActionTest => SearchActionTest}/search_xoo1.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/test/ws/{TestsCoveredFilesActionTest => CoveredFilesActionTest}/tests-covered-files.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/test/ws/{TestsListActionTest => ListActionTest}/list-main-file.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/test/ws/{TestsListActionTest => ListActionTest}/list-test-uuid.json (100%) delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data_with_a_time_in_float.json rename server/sonar-server/src/test/resources/org/sonar/server/user/ws/{CurrentUserActionTest => CurrentActionTest}/anonymous.json (100%) rename server/sonar-server/src/test/resources/org/sonar/server/user/ws/{CurrentUserActionTest => CurrentActionTest}/authenticated.json (100%) 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/GlobalAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/batch/GlobalRepositoryAction.java rename to server/sonar-server/src/main/java/org/sonar/server/batch/GlobalAction.java index 92ca5e923b3..84529cae0b7 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/GlobalAction.java @@ -36,13 +36,13 @@ import org.sonar.server.exceptions.ForbiddenException; import org.sonar.server.plugins.MimeTypes; import org.sonar.server.user.UserSession; -public class GlobalRepositoryAction implements BatchWsAction { +public class GlobalAction implements BatchWsAction { private final DbClient dbClient; private final PropertiesDao propertiesDao; private final UserSession userSession; - public GlobalRepositoryAction(DbClient dbClient, PropertiesDao propertiesDao, UserSession userSession) { + public GlobalAction(DbClient dbClient, PropertiesDao propertiesDao, UserSession userSession) { this.dbClient = dbClient; this.propertiesDao = propertiesDao; this.userSession = userSession; 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/ProjectAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/batch/ProjectRepositoryAction.java rename to server/sonar-server/src/main/java/org/sonar/server/batch/ProjectAction.java index 9a1369f590e..77d98330d15 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/ProjectAction.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 BatchWsAction { +public class ProjectAction implements BatchWsAction { private static final String PARAM_KEY = "key"; private static final String PARAM_PROFILE = "profile"; @@ -35,7 +35,7 @@ public class ProjectRepositoryAction implements BatchWsAction { private final ProjectRepositoryLoader projectReferentialsLoader; - public ProjectRepositoryAction(ProjectRepositoryLoader projectReferentialsLoader) { + public ProjectAction(ProjectRepositoryLoader projectReferentialsLoader) { this.projectReferentialsLoader = projectReferentialsLoader; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java rename to server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java index 85c835d9cdb..6a09d72477e 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentAppAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/AppAction.java @@ -20,10 +20,6 @@ package org.sonar.server.component.ws; -import java.util.List; -import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; import org.apache.commons.lang.BooleanUtils; import org.sonar.api.i18n.I18n; import org.sonar.api.measures.CoreMetrics; @@ -45,10 +41,15 @@ import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import java.util.List; +import java.util.Map; + import static com.google.common.collect.Lists.newArrayList; import static com.google.common.collect.Maps.newHashMap; -public class ComponentAppAction implements RequestHandler { +public class AppAction implements RequestHandler { private static final String PARAM_UUID = "uuid"; private static final String PARAM_PERIOD = "period"; @@ -63,7 +64,7 @@ public class ComponentAppAction implements RequestHandler { private final I18n i18n; private final UserSession userSession; - public ComponentAppAction(DbClient dbClient, Durations durations, I18n i18n, UserSession userSession) { + public AppAction(DbClient dbClient, Durations durations, I18n i18n, UserSession userSession) { this.dbClient = dbClient; this.durations = durations; this.i18n = i18n; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java index 94cadaa25f7..aba52c5b1bb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/component/ws/ComponentsWs.java @@ -26,10 +26,10 @@ import org.sonar.api.server.ws.WebService; public class ComponentsWs implements WebService { - private final ComponentAppAction appAction; + private final AppAction appAction; private final SearchAction searchAction; - public ComponentsWs(ComponentAppAction appAction, SearchAction searchAction) { + public ComponentsWs(AppAction appAction, SearchAction searchAction) { this.appAction = appAction; this.searchAction = searchAction; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ComputationWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ComputationWsAction.java index a4a9dd772c1..10ea28e79a9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ComputationWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/ComputationWsAction.java @@ -20,11 +20,12 @@ package org.sonar.server.computation.ws; import org.sonar.api.server.ws.WebService; +import org.sonar.server.ws.WsAction; /** * Used by {@link ComputationWs} to * loop over all its actions */ -interface ComputationWsAction { +interface ComputationWsAction extends WsAction{ void define(WebService.NewController controller); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/HistoryWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/HistoryAction.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ws/HistoryWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/ws/HistoryAction.java index 0bb4d2b1155..0320fcdefdf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/HistoryWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/HistoryAction.java @@ -20,10 +20,7 @@ package org.sonar.server.computation.ws; -import java.util.Arrays; -import java.util.Map; import org.sonar.api.server.ws.Request; -import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; @@ -37,15 +34,15 @@ import org.sonar.server.es.SearchResult; import org.sonar.server.issue.ws.IssuesWs; import org.sonar.server.user.UserSession; -// FIXME replace by api/activities/search -public class HistoryWsAction implements ComputationWsAction, RequestHandler { - - public static final String PARAM_TYPE = "type"; +import java.util.Arrays; +import java.util.Map; +// FIXME replace by api/activities/search +public class HistoryAction implements ComputationWsAction { private final ActivityIndex activityIndex; private final UserSession userSession; - public HistoryWsAction(ActivityIndex activityIndex, UserSession userSession) { + public HistoryAction(ActivityIndex activityIndex, UserSession userSession) { this.activityIndex = activityIndex; this.userSession = userSession; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java index d9c83b0fff1..ab580c50a98 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/IsQueueEmptyWs.java @@ -36,10 +36,10 @@ import java.util.List; public class IsQueueEmptyWs implements WebService { public static final String API_ENDPOINT = "api/analysis_reports"; - private final IsQueueEmptyWsAction action; + private final IsQueueEmptyAction action; public IsQueueEmptyWs(ReportQueue queue) { - this.action = new IsQueueEmptyWsAction(queue); + this.action = new IsQueueEmptyAction(queue); } @Override @@ -51,10 +51,10 @@ public class IsQueueEmptyWs implements WebService { controller.done(); } - static class IsQueueEmptyWsAction implements RequestHandler { + static class IsQueueEmptyAction implements RequestHandler { private final ReportQueue queue; - public IsQueueEmptyWsAction(ReportQueue queue) { + public IsQueueEmptyAction(ReportQueue queue) { this.queue = queue; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java index 39e6d3dcff4..fd20ecf2977 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/QueueAction.java @@ -21,7 +21,6 @@ package org.sonar.server.computation.ws; import org.sonar.api.server.ws.Request; -import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; @@ -35,10 +34,10 @@ import static org.sonar.api.utils.DateUtils.longToDate; /** * @since 5.0 */ -public class QueueWsAction implements ComputationWsAction, RequestHandler { +public class QueueAction implements ComputationWsAction { private final ReportQueue queue; - public QueueWsAction(ReportQueue queue) { + public QueueAction(ReportQueue queue) { this.queue = queue; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitReportWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitReportAction.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitReportWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitReportAction.java index 2c1347e956f..86f290b1f7d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitReportWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/ws/SubmitReportAction.java @@ -20,10 +20,8 @@ package org.sonar.server.computation.ws; -import java.io.InputStream; import org.apache.commons.io.IOUtils; import org.sonar.api.server.ws.Request; -import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.core.permission.GlobalPermissions; @@ -31,7 +29,9 @@ import org.sonar.server.computation.ComputationThreadLauncher; import org.sonar.server.computation.ReportQueue; import org.sonar.server.user.UserSession; -public class SubmitReportWsAction implements ComputationWsAction, RequestHandler { +import java.io.InputStream; + +public class SubmitReportAction implements ComputationWsAction { public static final String ACTION = "submit_report"; public static final String PARAM_PROJECT_KEY = "projectKey"; @@ -41,7 +41,7 @@ public class SubmitReportWsAction implements ComputationWsAction, RequestHandler private final ComputationThreadLauncher workerLauncher; private final UserSession userSession; - public SubmitReportWsAction(ReportQueue queue, ComputationThreadLauncher workerLauncher, UserSession userSession) { + public SubmitReportAction(ReportQueue queue, ComputationThreadLauncher workerLauncher, UserSession userSession) { this.queue = queue; this.workerLauncher = workerLauncher; this.userSession = userSession; 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/ShowAction.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/DashboardsShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/dashboard/ws/ShowAction.java index b70211d339e..354239cf756 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/ShowAction.java @@ -35,14 +35,14 @@ import org.sonar.server.user.UserSession; import java.util.Collection; -public class DashboardsShowAction implements DashboardsWsAction { +public class ShowAction implements DashboardsWsAction { private static final String PARAM_KEY = "key"; private final DbClient dbClient; private final UserSession userSession; - public DashboardsShowAction(DbClient dbClient, UserSession userSession) { + public ShowAction(DbClient dbClient, UserSession userSession) { this.dbClient = dbClient; this.userSession = userSession; } 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/ShowAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/issue/ws/IssueShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/issue/ws/ShowAction.java index 2e730160aa4..bafc9544aea 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/ShowAction.java @@ -20,11 +20,6 @@ package org.sonar.server.issue.ws; import com.google.common.io.Resources; -import java.util.Date; -import java.util.List; -import java.util.Map; -import javax.annotation.CheckForNull; -import javax.annotation.Nullable; import org.sonar.api.i18n.I18n; import org.sonar.api.issue.ActionPlan; import org.sonar.api.issue.Issue; @@ -56,9 +51,15 @@ import org.sonar.server.rule.Rule; import org.sonar.server.rule.RuleService; import org.sonar.server.user.UserSession; +import javax.annotation.CheckForNull; +import javax.annotation.Nullable; +import java.util.Date; +import java.util.List; +import java.util.Map; + import static com.google.common.collect.Maps.newHashMap; -public class IssueShowAction implements IssuesWsAction { +public class ShowAction implements IssuesWsAction { public static final String SHOW_ACTION = "show"; @@ -76,9 +77,9 @@ public class IssueShowAction implements IssuesWsAction { private final Durations durations; private final UserSession userSession; - public IssueShowAction(DbClient dbClient, IssueService issueService, IssueChangelogService issueChangelogService, IssueCommentService commentService, - IssueActionsWriter actionsWriter, ActionPlanService actionPlanService, UserFinder userFinder, DebtModelService debtModel, RuleService ruleService, - I18n i18n, Durations durations, UserSession userSession) { + public ShowAction(DbClient dbClient, IssueService issueService, IssueChangelogService issueChangelogService, IssueCommentService commentService, + IssueActionsWriter actionsWriter, ActionPlanService actionPlanService, UserFinder userFinder, DebtModelService debtModel, RuleService ruleService, + I18n i18n, Durations durations, UserSession userSession) { this.dbClient = dbClient; this.issueService = issueService; this.issueChangelogService = issueChangelogService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java index 02ccd463bef..8350f83f0a7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerComponents.java @@ -92,9 +92,9 @@ import org.sonar.server.activity.ws.ActivityMapping; import org.sonar.server.authentication.ws.AuthenticationWs; import org.sonar.server.batch.BatchIndex; import org.sonar.server.batch.BatchWs; -import org.sonar.server.batch.GlobalRepositoryAction; +import org.sonar.server.batch.GlobalAction; import org.sonar.server.batch.IssuesAction; -import org.sonar.server.batch.ProjectRepositoryAction; +import org.sonar.server.batch.ProjectAction; import org.sonar.server.batch.ProjectRepositoryLoader; import org.sonar.server.batch.UsersAction; import org.sonar.server.charts.ChartFactory; @@ -106,27 +106,25 @@ import org.sonar.server.component.db.ComponentDao; import org.sonar.server.component.db.ComponentIndexDao; import org.sonar.server.component.db.ComponentLinkDao; import org.sonar.server.component.db.SnapshotDao; -import org.sonar.server.component.ws.ComponentAppAction; import org.sonar.server.component.ws.ComponentsWs; import org.sonar.server.component.ws.EventsWs; -import org.sonar.server.component.ws.ProjectsGhostsAction; -import org.sonar.server.component.ws.ProjectsWs; -import org.sonar.server.component.ws.ProjectsProvisionedAction; +import org.sonar.server.project.ws.GhostsAction; +import org.sonar.server.project.ws.ProjectsWs; +import org.sonar.server.project.ws.ProvisionedAction; import org.sonar.server.component.ws.ResourcesWs; import org.sonar.server.computation.ComputationThreadLauncher; import org.sonar.server.computation.ReportQueue; import org.sonar.server.computation.ReportQueueCleaner; import org.sonar.server.computation.db.AnalysisReportDao; import org.sonar.server.computation.ws.ComputationWs; -import org.sonar.server.computation.ws.HistoryWsAction; +import org.sonar.server.computation.ws.HistoryAction; import org.sonar.server.computation.ws.IsQueueEmptyWs; -import org.sonar.server.computation.ws.QueueWsAction; -import org.sonar.server.computation.ws.SubmitReportWsAction; +import org.sonar.server.computation.ws.QueueAction; +import org.sonar.server.computation.ws.SubmitReportAction; import org.sonar.server.config.ws.PropertiesWs; import org.sonar.server.dashboard.db.DashboardDao; import org.sonar.server.dashboard.db.WidgetDao; import org.sonar.server.dashboard.db.WidgetPropertyDao; -import org.sonar.server.dashboard.ws.DashboardsShowAction; import org.sonar.server.dashboard.ws.DashboardsWs; import org.sonar.server.db.DatabaseChecker; import org.sonar.server.db.DbClient; @@ -189,11 +187,9 @@ import org.sonar.server.issue.notification.NewIssuesNotificationDispatcher; import org.sonar.server.issue.notification.NewIssuesNotificationFactory; import org.sonar.server.issue.ws.ComponentTagsAction; import org.sonar.server.issue.ws.IssueActionsWriter; -import org.sonar.server.issue.ws.IssueShowAction; import org.sonar.server.issue.ws.IssuesWs; import org.sonar.server.issue.ws.SetTagsAction; import org.sonar.server.language.ws.LanguageWs; -import org.sonar.server.language.ws.ListAction; import org.sonar.server.measure.MeasureFilterEngine; import org.sonar.server.measure.MeasureFilterExecutor; import org.sonar.server.measure.MeasureFilterFactory; @@ -215,13 +211,13 @@ import org.sonar.server.platform.monitoring.PluginsMonitor; import org.sonar.server.platform.monitoring.SonarQubeMonitor; import org.sonar.server.platform.monitoring.SystemMonitor; import org.sonar.server.platform.ws.L10nWs; -import org.sonar.server.platform.ws.MigrateDbSystemWsAction; +import org.sonar.server.platform.ws.MigrateDbSystemAction; import org.sonar.server.platform.ws.ServerWs; -import org.sonar.server.platform.ws.SystemInfoWsAction; -import org.sonar.server.platform.ws.SystemRestartWsAction; -import org.sonar.server.platform.ws.SystemStatusWsAction; +import org.sonar.server.platform.ws.InfoAction; +import org.sonar.server.platform.ws.RestartAction; +import org.sonar.server.platform.ws.StatusAction; import org.sonar.server.platform.ws.SystemWs; -import org.sonar.server.platform.ws.UpgradesSystemWsAction; +import org.sonar.server.platform.ws.UpgradesAction; import org.sonar.server.plugins.InstalledPluginReferentialFactory; import org.sonar.server.plugins.PluginDownloader; import org.sonar.server.plugins.ServerExtensionInstaller; @@ -229,36 +225,31 @@ import org.sonar.server.plugins.ServerPluginRepository; import org.sonar.server.plugins.ServerPluginExploder; import org.sonar.server.plugins.UpdateCenterClient; import org.sonar.server.plugins.UpdateCenterMatrixFactory; -import org.sonar.server.plugins.ws.AvailablePluginsWsAction; -import org.sonar.server.plugins.ws.CancelAllPluginsWsAction; -import org.sonar.server.plugins.ws.InstallPluginsWsAction; -import org.sonar.server.plugins.ws.InstalledPluginsWsAction; -import org.sonar.server.plugins.ws.PendingPluginsWsAction; +import org.sonar.server.plugins.ws.AvailableAction; +import org.sonar.server.plugins.ws.CancelAllAction; +import org.sonar.server.plugins.ws.InstallAction; +import org.sonar.server.plugins.ws.InstalledAction; +import org.sonar.server.plugins.ws.PendingAction; import org.sonar.server.plugins.ws.PluginUpdateAggregator; import org.sonar.server.plugins.ws.PluginWSCommons; import org.sonar.server.plugins.ws.PluginsWs; -import org.sonar.server.plugins.ws.UninstallPluginsWsAction; -import org.sonar.server.plugins.ws.UpdatePluginsWsAction; -import org.sonar.server.plugins.ws.UpdatesPluginsWsAction; +import org.sonar.server.plugins.ws.UninstallAction; +import org.sonar.server.plugins.ws.UpdateAction; +import org.sonar.server.plugins.ws.UpdatesAction; import org.sonar.server.properties.ProjectSettingsFactory; import org.sonar.server.qualitygate.QgateProjectFinder; import org.sonar.server.qualitygate.QualityGates; import org.sonar.server.qualitygate.RegisterQualityGates; -import org.sonar.server.qualitygate.ws.QGatesAppAction; -import org.sonar.server.qualitygate.ws.QGatesCopyAction; -import org.sonar.server.qualitygate.ws.QGatesCreateAction; -import org.sonar.server.qualitygate.ws.QGatesCreateConditionAction; -import org.sonar.server.qualitygate.ws.QGatesDeleteConditionAction; -import org.sonar.server.qualitygate.ws.QGatesDeselectAction; -import org.sonar.server.qualitygate.ws.QGatesDestroyAction; -import org.sonar.server.qualitygate.ws.QGatesListAction; -import org.sonar.server.qualitygate.ws.QGatesRenameAction; -import org.sonar.server.qualitygate.ws.QGatesSearchAction; -import org.sonar.server.qualitygate.ws.QGatesSelectAction; -import org.sonar.server.qualitygate.ws.QGatesSetAsDefaultAction; -import org.sonar.server.qualitygate.ws.QGatesShowAction; -import org.sonar.server.qualitygate.ws.QGatesUnsetDefaultAction; -import org.sonar.server.qualitygate.ws.QGatesUpdateConditionAction; +import org.sonar.server.qualitygate.ws.AppAction; +import org.sonar.server.qualitygate.ws.CreateConditionAction; +import org.sonar.server.qualitygate.ws.DeleteConditionAction; +import org.sonar.server.qualitygate.ws.DeselectAction; +import org.sonar.server.qualitygate.ws.DestroyAction; +import org.sonar.server.qualitygate.ws.SelectAction; +import org.sonar.server.qualitygate.ws.SetAsDefaultAction; +import org.sonar.server.qualitygate.ws.ShowAction; +import org.sonar.server.qualitygate.ws.UnsetDefaultAction; +import org.sonar.server.qualitygate.ws.UpdateConditionAction; import org.sonar.server.qualitygate.ws.QGatesWs; import org.sonar.server.qualityprofile.BuiltInProfiles; import org.sonar.server.qualityprofile.QProfileBackuper; @@ -282,23 +273,23 @@ import org.sonar.server.qualityprofile.index.ActiveRuleNormalizer; import org.sonar.server.qualityprofile.ws.BulkRuleActivationActions; import org.sonar.server.qualityprofile.ws.ProfilesWs; import org.sonar.server.qualityprofile.ws.ProjectAssociationActions; -import org.sonar.server.qualityprofile.ws.QProfileBackupAction; -import org.sonar.server.qualityprofile.ws.QProfileChangeParentAction; -import org.sonar.server.qualityprofile.ws.QProfileChangelogAction; -import org.sonar.server.qualityprofile.ws.QProfileCompareAction; -import org.sonar.server.qualityprofile.ws.QProfileCopyAction; -import org.sonar.server.qualityprofile.ws.QProfileCreateAction; -import org.sonar.server.qualityprofile.ws.QProfileDeleteAction; -import org.sonar.server.qualityprofile.ws.QProfileExportAction; -import org.sonar.server.qualityprofile.ws.QProfileExportersAction; -import org.sonar.server.qualityprofile.ws.QProfileImportersAction; -import org.sonar.server.qualityprofile.ws.QProfileInheritanceAction; -import org.sonar.server.qualityprofile.ws.QProfileProjectsAction; -import org.sonar.server.qualityprofile.ws.QProfileRenameAction; -import org.sonar.server.qualityprofile.ws.QProfileRestoreAction; -import org.sonar.server.qualityprofile.ws.QProfileRestoreBuiltInAction; -import org.sonar.server.qualityprofile.ws.QProfileSearchAction; -import org.sonar.server.qualityprofile.ws.QProfileSetDefaultAction; +import org.sonar.server.qualityprofile.ws.BackupAction; +import org.sonar.server.qualityprofile.ws.ChangeParentAction; +import org.sonar.server.qualityprofile.ws.ChangelogAction; +import org.sonar.server.qualityprofile.ws.CompareAction; +import org.sonar.server.qualityprofile.ws.CopyAction; +import org.sonar.server.qualityprofile.ws.CreateAction; +import org.sonar.server.qualityprofile.ws.DeleteAction; +import org.sonar.server.qualityprofile.ws.ExportAction; +import org.sonar.server.qualityprofile.ws.ExportersAction; +import org.sonar.server.qualityprofile.ws.ImportersAction; +import org.sonar.server.qualityprofile.ws.InheritanceAction; +import org.sonar.server.qualityprofile.ws.ProjectsAction; +import org.sonar.server.qualityprofile.ws.RenameAction; +import org.sonar.server.qualityprofile.ws.RestoreAction; +import org.sonar.server.qualityprofile.ws.RestoreBuiltInAction; +import org.sonar.server.qualityprofile.ws.SearchAction; +import org.sonar.server.qualityprofile.ws.SetDefaultAction; import org.sonar.server.qualityprofile.ws.QProfilesWs; import org.sonar.server.qualityprofile.ws.RuleActivationActions; import org.sonar.server.ruby.PlatformRackBridge; @@ -318,14 +309,10 @@ import org.sonar.server.rule.db.RuleDao; import org.sonar.server.rule.index.RuleIndex; import org.sonar.server.rule.index.RuleNormalizer; import org.sonar.server.rule.ws.ActiveRuleCompleter; -import org.sonar.server.rule.ws.AppAction; -import org.sonar.server.rule.ws.DeleteAction; import org.sonar.server.rule.ws.RepositoriesAction; import org.sonar.server.rule.ws.RuleMapping; import org.sonar.server.rule.ws.RulesWs; -import org.sonar.server.rule.ws.SearchAction; import org.sonar.server.rule.ws.TagsAction; -import org.sonar.server.rule.ws.UpdateAction; import org.sonar.server.search.IndexClient; import org.sonar.server.search.IndexQueue; import org.sonar.server.search.IndexSynchronizer; @@ -341,7 +328,6 @@ import org.sonar.server.source.ws.IndexAction; import org.sonar.server.source.ws.LinesAction; import org.sonar.server.source.ws.RawAction; import org.sonar.server.source.ws.ScmAction; -import org.sonar.server.source.ws.ShowAction; import org.sonar.server.source.ws.SourcesWs; import org.sonar.server.startup.CopyRequirementsFromCharacteristicsToRules; import org.sonar.server.startup.GeneratePluginIndex; @@ -360,8 +346,8 @@ import org.sonar.server.test.CoverageService; import org.sonar.server.test.index.TestIndex; import org.sonar.server.test.index.TestIndexDefinition; import org.sonar.server.test.index.TestIndexer; -import org.sonar.server.test.ws.TestsCoveredFilesAction; -import org.sonar.server.test.ws.TestsListAction; +import org.sonar.server.test.ws.CoveredFilesAction; +import org.sonar.server.test.ws.ListAction; import org.sonar.server.test.ws.TestsWs; import org.sonar.server.text.MacroInterpreter; import org.sonar.server.text.RubyTextService; @@ -387,6 +373,7 @@ import org.sonar.server.user.db.UserGroupDao; import org.sonar.server.user.index.UserIndex; import org.sonar.server.user.index.UserIndexDefinition; import org.sonar.server.user.index.UserIndexer; +import org.sonar.server.user.ws.CurrentAction; import org.sonar.server.user.ws.FavoritesWs; import org.sonar.server.user.ws.UserPropertiesWs; import org.sonar.server.user.ws.UsersWs; @@ -565,8 +552,8 @@ class ServerComponents { ThreadLocalDatabaseSessionFactory.class, // Server WS - SystemStatusWsAction.class, - MigrateDbSystemWsAction.class, + StatusAction.class, + MigrateDbSystemAction.class, SystemWs.class, // Listing WS @@ -616,17 +603,17 @@ class ServerComponents { // batch pico.addSingleton(BatchIndex.class); - pico.addSingleton(GlobalRepositoryAction.class); - pico.addSingleton(ProjectRepositoryAction.class); + pico.addSingleton(GlobalAction.class); + pico.addSingleton(ProjectAction.class); pico.addSingleton(ProjectRepositoryLoader.class); - pico.addSingleton(SubmitReportWsAction.class); + pico.addSingleton(SubmitReportAction.class); pico.addSingleton(IssuesAction.class); pico.addSingleton(UsersAction.class); pico.addSingleton(BatchWs.class); // Dashboard pico.addSingleton(DashboardsWs.class); - pico.addSingleton(DashboardsShowAction.class); + pico.addSingleton(org.sonar.server.dashboard.ws.ShowAction.class); // update center pico.addSingleton(UpdateCenterClient.class); @@ -643,23 +630,23 @@ class ServerComponents { pico.addSingleton(QProfileProjectLookup.class); pico.addSingleton(QProfileComparison.class); pico.addSingleton(BuiltInProfiles.class); - pico.addSingleton(QProfileRestoreBuiltInAction.class); - pico.addSingleton(QProfileSearchAction.class); - pico.addSingleton(QProfileSetDefaultAction.class); - pico.addSingleton(QProfileProjectsAction.class); - pico.addSingleton(QProfileDeleteAction.class); - pico.addSingleton(QProfileRenameAction.class); - pico.addSingleton(QProfileCopyAction.class); - pico.addSingleton(QProfileBackupAction.class); - pico.addSingleton(QProfileRestoreAction.class); - pico.addSingleton(QProfileCreateAction.class); - pico.addSingleton(QProfileImportersAction.class); - pico.addSingleton(QProfileInheritanceAction.class); - pico.addSingleton(QProfileChangeParentAction.class); - pico.addSingleton(QProfileChangelogAction.class); - pico.addSingleton(QProfileCompareAction.class); - pico.addSingleton(QProfileExportAction.class); - pico.addSingleton(QProfileExportersAction.class); + pico.addSingleton(RestoreBuiltInAction.class); + pico.addSingleton(SearchAction.class); + pico.addSingleton(SetDefaultAction.class); + pico.addSingleton(ProjectsAction.class); + pico.addSingleton(DeleteAction.class); + pico.addSingleton(RenameAction.class); + pico.addSingleton(CopyAction.class); + pico.addSingleton(BackupAction.class); + pico.addSingleton(RestoreAction.class); + pico.addSingleton(CreateAction.class); + pico.addSingleton(ImportersAction.class); + pico.addSingleton(InheritanceAction.class); + pico.addSingleton(ChangeParentAction.class); + pico.addSingleton(ChangelogAction.class); + pico.addSingleton(CompareAction.class); + pico.addSingleton(ExportAction.class); + pico.addSingleton(ExportersAction.class); pico.addSingleton(QProfilesWs.class); pico.addSingleton(ProfilesWs.class); pico.addSingleton(RuleActivationActions.class); @@ -690,22 +677,22 @@ class ServerComponents { pico.addSingleton(RuleUpdater.class); pico.addSingleton(RuleCreator.class); pico.addSingleton(RuleDeleter.class); - pico.addSingleton(UpdateAction.class); + pico.addSingleton(org.sonar.server.rule.ws.UpdateAction.class); pico.addSingleton(RulesWs.class); - pico.addSingleton(SearchAction.class); + pico.addSingleton(org.sonar.server.rule.ws.SearchAction.class); pico.addSingleton(org.sonar.server.rule.ws.ShowAction.class); pico.addSingleton(org.sonar.server.rule.ws.CreateAction.class); - pico.addSingleton(DeleteAction.class); + pico.addSingleton(org.sonar.server.rule.ws.DeleteAction.class); pico.addSingleton(TagsAction.class); pico.addSingleton(RuleMapping.class); pico.addSingleton(ActiveRuleCompleter.class); pico.addSingleton(RepositoriesAction.class); - pico.addSingleton(AppAction.class); + pico.addSingleton(org.sonar.server.rule.ws.AppAction.class); // languages pico.addSingleton(Languages.class); pico.addSingleton(LanguageWs.class); - pico.addSingleton(ListAction.class); + pico.addSingleton(org.sonar.server.language.ws.ListAction.class); // activity pico.addSingleton(ActivitiesWs.class); @@ -730,21 +717,21 @@ class ServerComponents { pico.addSingleton(ProjectQgateAssociationDao.class); pico.addSingleton(QgateProjectFinder.class); - pico.addSingleton(QGatesListAction.class); - pico.addSingleton(QGatesSearchAction.class); - pico.addSingleton(QGatesShowAction.class); - pico.addSingleton(QGatesCreateAction.class); - pico.addSingleton(QGatesRenameAction.class); - pico.addSingleton(QGatesCopyAction.class); - pico.addSingleton(QGatesDestroyAction.class); - pico.addSingleton(QGatesSetAsDefaultAction.class); - pico.addSingleton(QGatesUnsetDefaultAction.class); - pico.addSingleton(QGatesSelectAction.class); - pico.addSingleton(QGatesDeselectAction.class); - pico.addSingleton(QGatesCreateConditionAction.class); - pico.addSingleton(QGatesDeleteConditionAction.class); - pico.addSingleton(QGatesUpdateConditionAction.class); - pico.addSingleton(QGatesAppAction.class); + pico.addSingleton(org.sonar.server.qualitygate.ws.ListAction.class); + pico.addSingleton(org.sonar.server.qualitygate.ws.SearchAction.class); + pico.addSingleton(ShowAction.class); + pico.addSingleton(org.sonar.server.qualitygate.ws.CreateAction.class); + pico.addSingleton(org.sonar.server.qualitygate.ws.RenameAction.class); + pico.addSingleton(org.sonar.server.qualitygate.ws.CopyAction.class); + pico.addSingleton(DestroyAction.class); + pico.addSingleton(SetAsDefaultAction.class); + pico.addSingleton(UnsetDefaultAction.class); + pico.addSingleton(SelectAction.class); + pico.addSingleton(DeselectAction.class); + pico.addSingleton(CreateConditionAction.class); + pico.addSingleton(DeleteConditionAction.class); + pico.addSingleton(UpdateConditionAction.class); + pico.addSingleton(AppAction.class); pico.addSingleton(QGatesWs.class); // web services @@ -768,7 +755,7 @@ class ServerComponents { pico.addSingleton(org.sonar.server.user.ws.UpdateAction.class); pico.addSingleton(org.sonar.server.user.ws.DeactivateAction.class); pico.addSingleton(org.sonar.server.user.ws.ChangePasswordAction.class); - pico.addSingleton(org.sonar.server.user.ws.CurrentUserAction.class); + pico.addSingleton(CurrentAction.class); pico.addSingleton(org.sonar.server.user.ws.SearchAction.class); pico.addSingleton(org.sonar.server.user.ws.GroupsAction.class); pico.addSingleton(org.sonar.server.issue.ws.AuthorsAction.class); @@ -797,12 +784,12 @@ class ServerComponents { pico.addSingleton(ResourcesWs.class); pico.addSingleton(ComponentsWs.class); pico.addSingleton(ProjectsWs.class); - pico.addSingleton(ComponentAppAction.class); + pico.addSingleton(org.sonar.server.component.ws.AppAction.class); pico.addSingleton(org.sonar.server.component.ws.SearchAction.class); pico.addSingleton(EventsWs.class); pico.addSingleton(ComponentCleanerService.class); - pico.addSingleton(ProjectsProvisionedAction.class); - pico.addSingleton(ProjectsGhostsAction.class); + pico.addSingleton(ProvisionedAction.class); + pico.addSingleton(GhostsAction.class); // views pico.addSingleton(ViewIndexDefinition.class); @@ -825,7 +812,7 @@ class ServerComponents { pico.addSingleton(IssueBulkChangeService.class); pico.addSingleton(IssueChangelogFormatter.class); pico.addSingleton(IssuesWs.class); - pico.addSingleton(IssueShowAction.class); + pico.addSingleton(org.sonar.server.issue.ws.ShowAction.class); pico.addSingleton(org.sonar.server.issue.ws.SearchAction.class); pico.addSingleton(org.sonar.server.issue.ws.TagsAction.class); pico.addSingleton(SetTagsAction.class); @@ -882,7 +869,7 @@ class ServerComponents { pico.addSingleton(HtmlSourceDecorator.class); pico.addSingleton(SourceService.class); pico.addSingleton(SourcesWs.class); - pico.addSingleton(ShowAction.class); + pico.addSingleton(org.sonar.server.source.ws.ShowAction.class); pico.addSingleton(LinesAction.class); pico.addSingleton(HashAction.class); pico.addSingleton(RawAction.class); @@ -911,8 +898,8 @@ class ServerComponents { // Tests pico.addSingleton(CoverageService.class); pico.addSingleton(TestsWs.class); - pico.addSingleton(TestsCoveredFilesAction.class); - pico.addSingleton(TestsListAction.class); + pico.addSingleton(CoveredFilesAction.class); + pico.addSingleton(ListAction.class); pico.addSingleton(TestIndexDefinition.class); pico.addSingleton(TestIndex.class); pico.addSingleton(TestIndexer.class); @@ -940,11 +927,11 @@ class ServerComponents { // System pico.addSingletons(Arrays.asList( - SystemRestartWsAction.class, - SystemInfoWsAction.class, - UpgradesSystemWsAction.class, - MigrateDbSystemWsAction.class, - SystemStatusWsAction.class, + RestartAction.class, + InfoAction.class, + UpgradesAction.class, + MigrateDbSystemAction.class, + StatusAction.class, SystemWs.class, SystemMonitor.class, SonarQubeMonitor.class, @@ -957,14 +944,14 @@ class ServerComponents { // Plugins WS pico.addSingleton(PluginWSCommons.class); pico.addSingleton(PluginUpdateAggregator.class); - pico.addSingleton(InstalledPluginsWsAction.class); - pico.addSingleton(AvailablePluginsWsAction.class); - pico.addSingleton(UpdatesPluginsWsAction.class); - pico.addSingleton(PendingPluginsWsAction.class); - pico.addSingleton(InstallPluginsWsAction.class); - pico.addSingleton(UpdatePluginsWsAction.class); - pico.addSingleton(UninstallPluginsWsAction.class); - pico.addSingleton(CancelAllPluginsWsAction.class); + pico.addSingleton(InstalledAction.class); + pico.addSingleton(AvailableAction.class); + pico.addSingleton(UpdatesAction.class); + pico.addSingleton(PendingAction.class); + pico.addSingleton(InstallAction.class); + pico.addSingleton(UpdateAction.class); + pico.addSingleton(UninstallAction.class); + pico.addSingleton(CancelAllAction.class); pico.addSingleton(PluginsWs.class); // Compute engine @@ -972,8 +959,8 @@ class ServerComponents { pico.addSingleton(ComputationThreadLauncher.class); pico.addSingleton(ComputationWs.class); pico.addSingleton(IsQueueEmptyWs.class); - pico.addSingleton(QueueWsAction.class); - pico.addSingleton(HistoryWsAction.class); + pico.addSingleton(QueueAction.class); + pico.addSingleton(HistoryAction.class); pico.addSingleton(DefaultPeriodCleaner.class); pico.addSingleton(DefaultPurgeTask.class); pico.addSingleton(ProjectCleaner.class); diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/Monitor.java b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/Monitor.java index d451ca17306..b647c6c35eb 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/Monitor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/monitoring/Monitor.java @@ -20,6 +20,7 @@ package org.sonar.server.platform.monitoring; import org.sonar.api.ServerSide; +import org.sonar.server.platform.ws.InfoAction; import java.util.LinkedHashMap; @@ -35,7 +36,7 @@ public interface Monitor { /** * Type of attribute values must be supported by {@link org.sonar.api.utils.text.JsonWriter#valueObject(Object)} - * because of JSON export by {@link org.sonar.server.platform.ws.SystemInfoWsAction} + * because of JSON export by {@link InfoAction} */ LinkedHashMap attributes(); } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemInfoWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemInfoWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java index a90d17112ac..2507352e5bd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemInfoWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/InfoAction.java @@ -20,7 +20,6 @@ package org.sonar.server.platform.ws; -import java.util.Map; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; @@ -29,15 +28,17 @@ import org.sonar.core.permission.GlobalPermissions; import org.sonar.server.platform.monitoring.Monitor; import org.sonar.server.user.UserSession; +import java.util.Map; + /** * Implementation of the {@code info} action for the System WebService. */ -public class SystemInfoWsAction implements SystemWsAction { +public class InfoAction implements SystemWsAction { private final Monitor[] monitors; private final UserSession userSession; - public SystemInfoWsAction(UserSession userSession, Monitor... monitors) { + public InfoAction(UserSession userSession, Monitor... monitors) { this.userSession = userSession; this.monitors = monitors; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemAction.java index 97601e57f91..d2dddb36110 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/MigrateDbSystemAction.java @@ -33,7 +33,7 @@ import static org.sonar.server.db.migrations.DatabaseMigration.Status.RUNNING; /** * Implementation of the {@code migrate_db} action for the System WebService. */ -public class MigrateDbSystemWsAction implements SystemWsAction { +public class MigrateDbSystemAction implements SystemWsAction { private static final String UNSUPPORTED_DATABASE_MIGRATION_STATUS = "Unsupported DatabaseMigration status"; private static final String MESSAGE_STATUS_NONE = "Database is up-to-date, no migration needed."; @@ -55,9 +55,9 @@ public class MigrateDbSystemWsAction implements SystemWsAction { private final DatabaseMigration databaseMigration; private final Database database; - public MigrateDbSystemWsAction(DatabaseVersion databaseVersion, - Database database, - DatabaseMigration databaseMigration) { + public MigrateDbSystemAction(DatabaseVersion databaseVersion, + Database database, + DatabaseMigration databaseMigration) { this.databaseVersion = databaseVersion; this.database = database; this.databaseMigration = databaseMigration; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemRestartWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java similarity index 90% rename from server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemRestartWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java index 92665be650e..f4204520fcf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemRestartWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/RestartAction.java @@ -31,14 +31,14 @@ import org.sonar.server.platform.Platform; /** * Implementation of the {@code restart} action for the System WebService. */ -public class SystemRestartWsAction implements SystemWsAction { +public class RestartAction implements SystemWsAction { - private static final Logger LOGGER = Loggers.get(SystemRestartWsAction.class); + private static final Logger LOGGER = Loggers.get(RestartAction.class); private final Settings settings; private final Platform platform; - public SystemRestartWsAction(Settings settings, Platform platform) { + public RestartAction(Settings settings, Platform platform) { this.settings = settings; this.platform = platform; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemStatusWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemStatusWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java index 89e08b4dce5..cbead05cc15 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/SystemStatusWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/StatusAction.java @@ -37,16 +37,16 @@ import com.google.common.io.Resources; /** * Implementation of the {@code status} action for the System WebService. */ -public class SystemStatusWsAction implements SystemWsAction { +public class StatusAction implements SystemWsAction { - private static final Logger LOGGER = Loggers.get(SystemStatusWsAction.class); + private static final Logger LOGGER = Loggers.get(StatusAction.class); private final Server server; private final DatabaseMigration databaseMigration; private final Platform platform; private final DbClient dbClient; - public SystemStatusWsAction(Server server, DatabaseMigration databaseMigration, Platform platform, DbClient dbClient) { + public StatusAction(Server server, DatabaseMigration databaseMigration, Platform platform, DbClient dbClient) { this.server = server; this.databaseMigration = databaseMigration; this.platform = platform; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesSystemWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesSystemWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java index 5e845559201..3b7c0a88426 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesSystemWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ws/UpgradesAction.java @@ -19,8 +19,7 @@ */ package org.sonar.server.platform.ws; -import java.util.List; - +import com.google.common.io.Resources; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; @@ -32,12 +31,12 @@ import org.sonar.updatecenter.common.Release; import org.sonar.updatecenter.common.SonarUpdate; import org.sonar.updatecenter.common.UpdateCenter; -import com.google.common.io.Resources; +import java.util.List; /** * Implementation of the {@code upgrades} action for the System WebService. */ -public class UpgradesSystemWsAction implements SystemWsAction { +public class UpgradesAction implements SystemWsAction { private static final boolean DO_NOT_FORCE_REFRESH = false; @@ -55,7 +54,7 @@ public class UpgradesSystemWsAction implements SystemWsAction { private final UpdateCenterMatrixFactory updateCenterFactory; private final PluginWSCommons pluginWSCommons; - public UpgradesSystemWsAction(UpdateCenterMatrixFactory updateCenterFactory, PluginWSCommons pluginWSCommons) { + public UpgradesAction(UpdateCenterMatrixFactory updateCenterFactory, PluginWSCommons pluginWSCommons) { this.updateCenterFactory = updateCenterFactory; this.pluginWSCommons = pluginWSCommons; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailablePluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailablePluginsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java index bb0d0ea3313..4bb68ba25d8 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailablePluginsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/AvailableAction.java @@ -21,7 +21,6 @@ package org.sonar.server.plugins.ws; import com.google.common.collect.ImmutableSortedSet; import com.google.common.io.Resources; -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; @@ -30,9 +29,11 @@ import org.sonar.server.plugins.UpdateCenterMatrixFactory; import org.sonar.updatecenter.common.PluginUpdate; import org.sonar.updatecenter.common.UpdateCenter; +import java.util.Collection; + import static org.sonar.server.plugins.ws.PluginWSCommons.NAME_KEY_PLUGIN_UPDATE_ORDERING; -public class AvailablePluginsWsAction implements PluginsWsAction { +public class AvailableAction implements PluginsWsAction { private static final boolean DO_NOT_FORCE_REFRESH = false; private static final String ARRAY_PLUGINS = "plugins"; @@ -40,7 +41,7 @@ public class AvailablePluginsWsAction implements PluginsWsAction { private final UpdateCenterMatrixFactory updateCenterFactory; private final PluginWSCommons pluginWSCommons; - public AvailablePluginsWsAction(UpdateCenterMatrixFactory updateCenterFactory, PluginWSCommons pluginWSCommons) { + public AvailableAction(UpdateCenterMatrixFactory updateCenterFactory, PluginWSCommons pluginWSCommons) { this.updateCenterFactory = updateCenterFactory; this.pluginWSCommons = pluginWSCommons; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllPluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllPluginsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java index 1812db27095..2d10ce1070c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllPluginsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/CancelAllAction.java @@ -27,13 +27,13 @@ import org.sonar.server.plugins.PluginDownloader; import org.sonar.server.plugins.ServerPluginRepository; import org.sonar.server.user.UserSession; -public class CancelAllPluginsWsAction implements PluginsWsAction { +public class CancelAllAction implements PluginsWsAction { private final PluginDownloader pluginDownloader; private final ServerPluginRepository pluginRepository; private final UserSession userSession; - public CancelAllPluginsWsAction(PluginDownloader pluginDownloader, ServerPluginRepository pluginRepository, UserSession userSession) { + public CancelAllAction(PluginDownloader pluginDownloader, ServerPluginRepository pluginRepository, UserSession userSession) { this.pluginDownloader = pluginDownloader; this.pluginRepository = pluginRepository; this.userSession = userSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallPluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallPluginsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java index 3a55f4a3140..e69f4d61b1c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallPluginsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstallAction.java @@ -21,7 +21,6 @@ package org.sonar.server.plugins.ws; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import javax.annotation.Nullable; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; @@ -31,12 +30,14 @@ import org.sonar.server.plugins.UpdateCenterMatrixFactory; import org.sonar.server.user.UserSession; import org.sonar.updatecenter.common.PluginUpdate; +import javax.annotation.Nullable; + import static java.lang.String.format; /** * Implementation of the {@code install} action for the Plugins WebService. */ -public class InstallPluginsWsAction implements PluginsWsAction { +public class InstallAction implements PluginsWsAction { private static final String PARAM_KEY = "key"; private static final PluginUpdate MISSING_PLUGIN = null; @@ -45,8 +46,8 @@ public class InstallPluginsWsAction implements PluginsWsAction { private final PluginDownloader pluginDownloader; private final UserSession userSession; - public InstallPluginsWsAction(UpdateCenterMatrixFactory updateCenterFactory, - PluginDownloader pluginDownloader, UserSession userSession) { + public InstallAction(UpdateCenterMatrixFactory updateCenterFactory, + PluginDownloader pluginDownloader, UserSession userSession) { this.updateCenterFactory = updateCenterFactory; this.pluginDownloader = pluginDownloader; this.userSession = userSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledPluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledPluginsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java index dc2f3ff4be7..bd0addab688 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledPluginsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/InstalledAction.java @@ -40,14 +40,14 @@ import static org.sonar.server.plugins.ws.PluginWSCommons.NAME_KEY_PLUGIN_METADA /** * Implementation of the {@code installed} action for the Plugins WebService. */ -public class InstalledPluginsWsAction implements PluginsWsAction { +public class InstalledAction implements PluginsWsAction { private static final String ARRAY_PLUGINS = "plugins"; private final ServerPluginRepository pluginRepository; private final PluginWSCommons pluginWSCommons; - public InstalledPluginsWsAction(ServerPluginRepository pluginRepository, - PluginWSCommons pluginWSCommons) { + public InstalledAction(ServerPluginRepository pluginRepository, + PluginWSCommons pluginWSCommons) { this.pluginRepository = pluginRepository; this.pluginWSCommons = pluginWSCommons; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingPluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingPluginsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java index 29eb3cc9b53..86293e731d5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingPluginsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/PendingAction.java @@ -36,7 +36,7 @@ import static org.sonar.server.plugins.ws.PluginWSCommons.NAME_KEY_PLUGIN_METADA /** * Implementation of the {@code pending} action for the Plugins WebService. */ -public class PendingPluginsWsAction implements PluginsWsAction { +public class PendingAction implements PluginsWsAction { private static final String ARRAY_INSTALLING = "installing"; private static final String ARRAY_REMOVING = "removing"; @@ -45,9 +45,9 @@ public class PendingPluginsWsAction implements PluginsWsAction { private final ServerPluginRepository installer; private final PluginWSCommons pluginWSCommons; - public PendingPluginsWsAction(PluginDownloader pluginDownloader, - ServerPluginRepository installer, - PluginWSCommons pluginWSCommons) { + public PendingAction(PluginDownloader pluginDownloader, + ServerPluginRepository installer, + PluginWSCommons pluginWSCommons) { this.pluginDownloader = pluginDownloader; this.installer = installer; this.pluginWSCommons = pluginWSCommons; diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallPluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallPluginsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java index a4583e35b64..5e465fc2a89 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallPluginsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UninstallAction.java @@ -31,13 +31,13 @@ import static java.lang.String.format; /** * Implementation of the {@code uninstall} action for the Plugins WebService. */ -public class UninstallPluginsWsAction implements PluginsWsAction { +public class UninstallAction implements PluginsWsAction { private static final String PARAM_KEY = "key"; private final ServerPluginRepository pluginRepository; private final UserSession userSession; - public UninstallPluginsWsAction(ServerPluginRepository pluginRepository, UserSession userSession) { + public UninstallAction(ServerPluginRepository pluginRepository, UserSession userSession) { this.pluginRepository = pluginRepository; this.userSession = userSession; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatePluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatePluginsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java index 37382736ed9..1a8a3bc78e5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatePluginsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdateAction.java @@ -21,8 +21,6 @@ package org.sonar.server.plugins.ws; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; @@ -32,12 +30,15 @@ import org.sonar.server.plugins.UpdateCenterMatrixFactory; import org.sonar.server.user.UserSession; import org.sonar.updatecenter.common.PluginUpdate; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import static java.lang.String.format; /** * Implementation of the {@code update} action for the Plugins WebService. */ -public class UpdatePluginsWsAction implements PluginsWsAction { +public class UpdateAction implements PluginsWsAction { public static final String PARAM_KEY = "key"; public static final PluginUpdate MISSING_PLUGIN = null; @@ -46,7 +47,7 @@ public class UpdatePluginsWsAction implements PluginsWsAction { private final PluginDownloader pluginDownloader; private final UserSession userSession; - public UpdatePluginsWsAction(UpdateCenterMatrixFactory updateCenterFactory, PluginDownloader pluginDownloader, UserSession userSession) { + public UpdateAction(UpdateCenterMatrixFactory updateCenterFactory, PluginDownloader pluginDownloader, UserSession userSession) { this.updateCenterFactory = updateCenterFactory; this.pluginDownloader = pluginDownloader; this.userSession = userSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesPluginsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesPluginsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java index 0aedfd319fe..1e6014366bd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesPluginsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ws/UpdatesAction.java @@ -19,11 +19,10 @@ */ package org.sonar.server.plugins.ws; -import java.util.Collection; -import java.util.List; - -import javax.annotation.Nonnull; - +import com.google.common.base.Function; +import com.google.common.collect.ImmutableSortedSet; +import com.google.common.collect.Ordering; +import com.google.common.io.Resources; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; @@ -34,15 +33,14 @@ import org.sonar.updatecenter.common.Plugin; import org.sonar.updatecenter.common.PluginUpdate; import org.sonar.updatecenter.common.UpdateCenter; -import com.google.common.base.Function; -import com.google.common.collect.ImmutableSortedSet; -import com.google.common.collect.Ordering; -import com.google.common.io.Resources; +import javax.annotation.Nonnull; +import java.util.Collection; +import java.util.List; /** * Implementation of the {@code updates} action for the Plugins WebService. */ -public class UpdatesPluginsWsAction implements PluginsWsAction { +public class UpdatesAction implements PluginsWsAction { private static final boolean DO_NOT_FORCE_REFRESH = false; private static final String ARRAY_PLUGINS = "plugins"; @@ -61,9 +59,9 @@ public class UpdatesPluginsWsAction implements PluginsWsAction { private final PluginWSCommons pluginWSCommons; private final PluginUpdateAggregator aggregator; - public UpdatesPluginsWsAction(UpdateCenterMatrixFactory updateCenterMatrixFactory, - PluginWSCommons pluginWSCommons, - PluginUpdateAggregator aggregator) { + public UpdatesAction(UpdateCenterMatrixFactory updateCenterMatrixFactory, + PluginWSCommons pluginWSCommons, + PluginUpdateAggregator aggregator) { this.updateCenterMatrixFactory = updateCenterMatrixFactory; this.pluginWSCommons = pluginWSCommons; this.aggregator = aggregator; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsDeleteAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsDeleteAction.java rename to server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java index 179a24d741b..9596c367d5b 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsDeleteAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/DeleteAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; @@ -35,7 +35,7 @@ import javax.annotation.Nullable; import java.util.List; -public class ProjectsDeleteAction implements ProjectsWsAction { +public class DeleteAction implements ProjectsWsAction { private static final String ACTION = "delete"; private static final String PARAM_UUIDS = "uuids"; private static final String PARAM_KEYS = "keys"; @@ -44,7 +44,7 @@ public class ProjectsDeleteAction implements ProjectsWsAction { private final DbClient dbClient; private final UserSession userSession; - public ProjectsDeleteAction(ComponentCleanerService componentCleanerService, DbClient dbClient, UserSession userSession) { + public DeleteAction(ComponentCleanerService componentCleanerService, DbClient dbClient, UserSession userSession) { this.componentCleanerService = componentCleanerService; this.dbClient = dbClient; this.userSession = userSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsGhostsAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsGhostsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java index d230af26050..b80814de3d4 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsGhostsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/GhostsAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import com.google.common.io.Resources; import org.sonar.api.server.ws.Request; @@ -42,14 +42,14 @@ import java.util.Set; import static com.google.common.collect.Sets.newHashSet; -public class ProjectsGhostsAction implements ProjectsWsAction { +public class GhostsAction implements ProjectsWsAction { public static final String ACTION = "ghosts"; private static final Set POSSIBLE_FIELDS = newHashSet("uuid", "key", "name", "creationDate"); private final DbClient dbClient; private final UserSession userSession; - public ProjectsGhostsAction(DbClient dbClient, UserSession userSession) { + public GhostsAction(DbClient dbClient, UserSession userSession) { this.dbClient = dbClient; this.userSession = userSession; } 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/project/ws/ProjectsWs.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWs.java rename to server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWs.java index 4b6e9e10501..8c70d269a6b 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/project/ws/ProjectsWs.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import com.google.common.io.Resources; import org.sonar.api.server.ws.RailsHandler; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java index 6423e0c011c..5792d51ddaf 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProjectsWsAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import org.sonar.server.ws.WsAction; diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsProvisionedAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsProvisionedAction.java rename to server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java index 90d2b8cad37..8825707c1fc 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/component/ws/ProjectsProvisionedAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/ProvisionedAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import com.google.common.io.Resources; import org.sonar.api.server.ws.Request; @@ -40,13 +40,13 @@ import java.util.Set; import static com.google.common.collect.Sets.newHashSet; -public class ProjectsProvisionedAction implements ProjectsWsAction { +public class ProvisionedAction implements ProjectsWsAction { private static final Set POSSIBLE_FIELDS = newHashSet("uuid", "key", "name", "creationDate"); private final DbClient dbClient; private final UserSession userSession; - public ProjectsProvisionedAction(DbClient dbClient, UserSession userSession) { + public ProvisionedAction(DbClient dbClient, UserSession userSession) { this.dbClient = dbClient; this.userSession = userSession; } diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java similarity index 81% rename from server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java index 2e22c06bde2..b02c9e3b15a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ws/ServerWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/project/ws/package-info.java @@ -18,13 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +@ParametersAreNonnullByDefault +package org.sonar.server.project.ws; -import org.sonar.server.ws.WsAction; - -/** - * Marker interface for actions of the WS on URL api/server. - */ -public interface ServerWsAction extends WsAction { - -} +import javax.annotation.ParametersAreNonnullByDefault; 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/AppAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesAppAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/AppAction.java index 1996e96462a..a0e0c409003 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/AppAction.java @@ -31,7 +31,7 @@ import org.sonar.server.qualitygate.QualityGates; import java.util.Locale; -public class QGatesAppAction implements QGateWsAction { +public class AppAction implements QGateWsAction { private final QualityGates qualityGates; @@ -39,7 +39,7 @@ public class QGatesAppAction implements QGateWsAction { private final I18n i18n; - public QGatesAppAction(QualityGates qualityGates, Periods periods, I18n i18n) { + public AppAction(QualityGates qualityGates, Periods periods, I18n i18n) { this.qualityGates = qualityGates; this.periods = periods; this.i18n = i18n; 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/CopyAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCopyAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CopyAction.java index c61f2a27838..8c930728782 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/CopyAction.java @@ -27,11 +27,11 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.qualitygate.db.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; -public class QGatesCopyAction implements QGateWsAction { +public class CopyAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesCopyAction(QualityGates qualityGates) { + public CopyAction(QualityGates qualityGates) { this.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/CreateAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateAction.java index d3114898a62..d83aae3fc5f 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/CreateAction.java @@ -27,11 +27,11 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.qualitygate.db.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; -public class QGatesCreateAction implements QGateWsAction { +public class CreateAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesCreateAction(QualityGates qualityGates) { + public CreateAction(QualityGates qualityGates) { this.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/CreateConditionAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesCreateConditionAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/CreateConditionAction.java index 927622e4924..69a796d3d2a 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/CreateConditionAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class QGatesCreateConditionAction implements QGateWsAction { +public class CreateConditionAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesCreateConditionAction(QualityGates qualityGates) { + public CreateConditionAction(QualityGates qualityGates) { this.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/DeleteConditionAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeleteConditionAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeleteConditionAction.java index 2edfc8da679..f7d1d075af5 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/DeleteConditionAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class QGatesDeleteConditionAction implements QGateWsAction { +public class DeleteConditionAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesDeleteConditionAction(QualityGates qualityGates) { + public DeleteConditionAction(QualityGates qualityGates) { this.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/DeselectAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDeselectAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DeselectAction.java index 8bdcb84dc88..941efa19ffc 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/DeselectAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class QGatesDeselectAction implements QGateWsAction { +public class DeselectAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesDeselectAction(QualityGates qualityGates) { + public DeselectAction(QualityGates qualityGates) { this.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/DestroyAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesDestroyAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/DestroyAction.java index e8aa7871747..85b706c0df9 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/DestroyAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class QGatesDestroyAction implements QGateWsAction { +public class DestroyAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesDestroyAction(QualityGates qualityGates) { + public DestroyAction(QualityGates qualityGates) { this.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/ListAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesListAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ListAction.java index d7f5d370566..a18562154b7 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/ListAction.java @@ -28,11 +28,11 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.qualitygate.db.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; -public class QGatesListAction implements QGateWsAction { +public class ListAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesListAction(QualityGates qualityGates) { + public ListAction(QualityGates qualityGates) { this.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/RenameAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesRenameAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/RenameAction.java index 8491c29ff8b..42901fad207 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/RenameAction.java @@ -27,11 +27,11 @@ import org.sonar.api.utils.text.JsonWriter; import org.sonar.core.qualitygate.db.QualityGateDto; import org.sonar.server.qualitygate.QualityGates; -public class QGatesRenameAction implements QGateWsAction { +public class RenameAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesRenameAction(QualityGates qualityGates) { + public RenameAction(QualityGates qualityGates) { this.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/SearchAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSearchAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SearchAction.java index e21973ceb65..24ccf061c53 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/SearchAction.java @@ -29,11 +29,11 @@ import org.sonar.core.qualitygate.db.ProjectQgateAssociation; import org.sonar.core.qualitygate.db.ProjectQgateAssociationQuery; import org.sonar.server.qualitygate.QgateProjectFinder; -public class QGatesSearchAction implements QGateWsAction { +public class SearchAction implements QGateWsAction { private final QgateProjectFinder projectFinder; - public QGatesSearchAction(QgateProjectFinder projectFinder) { + public SearchAction(QgateProjectFinder projectFinder) { this.projectFinder = 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/SelectAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSelectAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SelectAction.java index ce760117cbc..f2f2b5bf622 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/SelectAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class QGatesSelectAction implements QGateWsAction { +public class SelectAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesSelectAction(QualityGates qualityGates) { + public SelectAction(QualityGates qualityGates) { this.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/SetAsDefaultAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesSetAsDefaultAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/SetAsDefaultAction.java index 18fc05e019a..828186cdb5e 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/SetAsDefaultAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class QGatesSetAsDefaultAction implements QGateWsAction { +public class SetAsDefaultAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesSetAsDefaultAction(QualityGates qualityGates) { + public SetAsDefaultAction(QualityGates qualityGates) { this.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/ShowAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesShowAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/ShowAction.java index 74710fa0f75..9b53247017f 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/ShowAction.java @@ -34,11 +34,11 @@ import javax.annotation.Nullable; import java.util.Collection; -public class QGatesShowAction implements QGateWsAction { +public class ShowAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesShowAction(QualityGates qualityGates) { + public ShowAction(QualityGates qualityGates) { this.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/UnsetDefaultAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUnsetDefaultAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UnsetDefaultAction.java index ab76b7ec755..b2210aded5e 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/UnsetDefaultAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class QGatesUnsetDefaultAction implements QGateWsAction { +public class UnsetDefaultAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesUnsetDefaultAction(QualityGates qualityGates) { + public UnsetDefaultAction(QualityGates qualityGates) { this.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/UpdateConditionAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/QGatesUpdateConditionAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualitygate/ws/UpdateConditionAction.java index 1a5d8bf596c..cb844e05861 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/UpdateConditionAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualitygate.QualityGates; -public class QGatesUpdateConditionAction implements QGateWsAction { +public class UpdateConditionAction implements QGateWsAction { private final QualityGates qualityGates; - public QGatesUpdateConditionAction(QualityGates qualityGates) { + public UpdateConditionAction(QualityGates qualityGates) { this.qualityGates = qualityGates; } 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/BackupAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileBackupAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/BackupAction.java index 0bca14c941d..69e320da5b0 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/BackupAction.java @@ -35,7 +35,7 @@ import org.sonar.server.qualityprofile.QProfileFactory; import java.io.OutputStreamWriter; import java.nio.charset.StandardCharsets; -public class QProfileBackupAction implements QProfileWsAction { +public class BackupAction implements QProfileWsAction { private final QProfileBackuper backuper; @@ -45,7 +45,7 @@ public class QProfileBackupAction implements QProfileWsAction { private final Languages languages; - public QProfileBackupAction(QProfileBackuper backuper, DbClient dbClient, QProfileFactory profileFactory, Languages languages) { + public BackupAction(QProfileBackuper backuper, DbClient dbClient, QProfileFactory profileFactory, Languages languages) { this.backuper = backuper; this.dbClient = dbClient; this.profileFactory = profileFactory; 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/ChangeParentAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangeParentAction.java index 034cddd6346..002ac94362e 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/ChangeParentAction.java @@ -34,7 +34,7 @@ import org.sonar.server.user.UserSession; import static org.apache.commons.lang.StringUtils.isEmpty; -public class QProfileChangeParentAction implements QProfileWsAction { +public class ChangeParentAction implements QProfileWsAction { private static final String PARAM_PARENT_KEY = "parentKey"; @@ -49,7 +49,7 @@ public class QProfileChangeParentAction implements QProfileWsAction { private final Languages languages; private final UserSession userSession; - public QProfileChangeParentAction(DbClient dbClient, RuleActivator ruleActivator, QProfileFactory profileFactory, Languages languages, UserSession userSession) { + public ChangeParentAction(DbClient dbClient, RuleActivator ruleActivator, QProfileFactory profileFactory, Languages languages, UserSession userSession) { this.dbClient = dbClient; this.ruleActivator = ruleActivator; this.profileFactory = profileFactory; 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/ChangelogAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileChangelogAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ChangelogAction.java index 6ad199294d5..af462f70cd5 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/ChangelogAction.java @@ -44,7 +44,7 @@ import org.sonar.server.search.Result; import java.util.Date; import java.util.Map.Entry; -public class QProfileChangelogAction implements QProfileWsAction { +public class ChangelogAction implements QProfileWsAction { private static final String PARAM_SINCE = "since"; private static final String PARAM_TO = "to"; @@ -54,7 +54,7 @@ public class QProfileChangelogAction implements QProfileWsAction { private QProfileFactory profileFactory; private Languages languages; - public QProfileChangelogAction(DbClient dbClient, ActivityIndex activityIndex, QProfileFactory profileFactory, Languages languages) { + public ChangelogAction(DbClient dbClient, ActivityIndex activityIndex, QProfileFactory profileFactory, Languages languages) { this.dbClient = dbClient; this.activityIndex = activityIndex; this.profileFactory = profileFactory; 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/CompareAction.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCompareAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CompareAction.java index b455ab57d9c..6659583cf6a 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/CompareAction.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; -public class QProfileCompareAction implements QProfileWsAction { +public class CompareAction implements QProfileWsAction { private static final String ATTRIBUTE_LEFT = "left"; private static final String ATTRIBUTE_RIGHT = "right"; @@ -69,7 +69,7 @@ public class QProfileCompareAction implements QProfileWsAction { private final RuleRepositories ruleRepositories; private final Languages languages; - public QProfileCompareAction(QProfileComparison comparator, RuleService ruleService, RuleRepositories ruleRepositories, Languages languages) { + public CompareAction(QProfileComparison comparator, RuleService ruleService, RuleRepositories ruleRepositories, Languages languages) { this.comparator = comparator; this.ruleService = ruleService; this.ruleRepositories = ruleRepositories; 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/CopyAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCopyAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CopyAction.java index 99b0a5c862f..f02a071c2c0 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/CopyAction.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 QProfileWsAction { +public class CopyAction implements QProfileWsAction { private static final String PARAM_PROFILE_NAME = "toName"; private static final String PARAM_PROFILE_KEY = "fromKey"; @@ -39,7 +39,7 @@ public class QProfileCopyAction implements QProfileWsAction { private final Languages languages; private final UserSession userSession; - public QProfileCopyAction(QProfileCopier profileCopier, Languages languages, UserSession userSession) { + public CopyAction(QProfileCopier profileCopier, Languages languages, UserSession userSession) { this.profileCopier = profileCopier; this.languages = languages; this.userSession = userSession; 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/CreateAction.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileCreateAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java index 18b7b821f28..b41ab309535 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/CreateAction.java @@ -34,11 +34,11 @@ import org.sonar.server.qualityprofile.QProfileExporters; import org.sonar.server.qualityprofile.QProfileFactory; import org.sonar.server.qualityprofile.QProfileName; import org.sonar.server.qualityprofile.QProfileResult; +import org.sonar.server.user.UserSession; import java.io.InputStream; -import org.sonar.server.user.UserSession; -public class QProfileCreateAction implements QProfileWsAction { +public class CreateAction implements QProfileWsAction { private static final String PARAM_PROFILE_NAME = "name"; private static final String PARAM_LANGUAGE = "language"; @@ -55,8 +55,8 @@ public class QProfileCreateAction implements QProfileWsAction { private final ProfileImporter[] importers; private final UserSession userSession; - public QProfileCreateAction(DbClient dbClient, QProfileFactory profileFactory, QProfileExporters exporters, - Languages languages, ProfileImporter[] importers, UserSession userSession) { + public CreateAction(DbClient dbClient, QProfileFactory profileFactory, QProfileExporters exporters, + Languages languages, ProfileImporter[] importers, UserSession userSession) { this.dbClient = dbClient; this.profileFactory = profileFactory; this.exporters = exporters; @@ -65,7 +65,7 @@ public class QProfileCreateAction implements QProfileWsAction { this.userSession = userSession; } - public QProfileCreateAction(DbClient dbClient, QProfileFactory profileFactory, QProfileExporters exporters, Languages languages, UserSession userSession) { + public CreateAction(DbClient dbClient, QProfileFactory profileFactory, QProfileExporters exporters, Languages languages, UserSession userSession) { this(dbClient, profileFactory, exporters, languages, new ProfileImporter[0], userSession); } 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/DeleteAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileDeleteAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/DeleteAction.java index 800031e6780..0af30ba17cb 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/DeleteAction.java @@ -30,14 +30,14 @@ import org.sonar.server.db.DbClient; import org.sonar.server.qualityprofile.QProfileFactory; import org.sonar.server.user.UserSession; -public class QProfileDeleteAction implements QProfileWsAction { +public class DeleteAction implements QProfileWsAction { private final Languages languages; private final QProfileFactory profileFactory; private final DbClient dbClient; private final UserSession userSession; - public QProfileDeleteAction(Languages languages, QProfileFactory profileFactory, DbClient dbClient, UserSession userSession) { + public DeleteAction(Languages languages, QProfileFactory profileFactory, DbClient dbClient, UserSession userSession) { this.languages = languages; this.profileFactory = profileFactory; this.dbClient = dbClient; 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/ExportAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java index 1750393c147..38f97c7e593 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/ExportAction.java @@ -44,7 +44,7 @@ import java.io.Writer; import java.nio.charset.StandardCharsets; import java.util.List; -public class QProfileExportAction implements QProfileWsAction { +public class ExportAction implements QProfileWsAction { private static final String PARAM_PROFILE_NAME = "name"; private static final String PARAM_LANGUAGE = "language"; @@ -60,7 +60,7 @@ public class QProfileExportAction implements QProfileWsAction { private final Languages languages; - public QProfileExportAction(DbClient dbClient, QProfileFactory profileFactory, QProfileBackuper backuper, QProfileExporters exporters, Languages languages) { + public ExportAction(DbClient dbClient, QProfileFactory profileFactory, QProfileBackuper backuper, QProfileExporters exporters, Languages languages) { this.dbClient = dbClient; this.profileFactory = profileFactory; this.backuper = backuper; 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/ExportersAction.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileExportersAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ExportersAction.java index fff90fc19c0..0196729e592 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/ExportersAction.java @@ -25,15 +25,15 @@ 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 QProfileWsAction { +public class ExportersAction implements QProfileWsAction { private ProfileExporter[] exporters; - public QProfileExportersAction(ProfileExporter[] exporters) { + public ExportersAction(ProfileExporter[] exporters) { this.exporters = exporters; } - public QProfileExportersAction() { + public ExportersAction() { this(new ProfileExporter[0]); } 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/ImportersAction.java similarity index 92% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileImportersAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ImportersAction.java index dba30bfb00f..6911be1242e 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/ImportersAction.java @@ -25,15 +25,15 @@ 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 QProfileWsAction { +public class ImportersAction implements QProfileWsAction { private final ProfileImporter[] importers; - public QProfileImportersAction(ProfileImporter[] importers) { + public ImportersAction(ProfileImporter[] importers) { this.importers = importers; } - public QProfileImportersAction() { + public ImportersAction() { this(new ProfileImporter[0]); } 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/InheritanceAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/InheritanceAction.java index fd1790e2fe8..5cf4062409d 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/InheritanceAction.java @@ -43,7 +43,7 @@ import javax.annotation.Nullable; import java.util.List; import java.util.Map; -public class QProfileInheritanceAction implements QProfileWsAction { +public class InheritanceAction implements QProfileWsAction { private final DbClient dbClient; @@ -55,7 +55,7 @@ public class QProfileInheritanceAction implements QProfileWsAction { private final Languages languages; - public QProfileInheritanceAction(DbClient dbClient, QProfileLookup profileLookup, QProfileLoader profileLoader, QProfileFactory profileFactory, Languages languages) { + public InheritanceAction(DbClient dbClient, QProfileLookup profileLookup, QProfileLoader profileLoader, QProfileFactory profileFactory, Languages languages) { this.dbClient = dbClient; this.profileLookup = profileLookup; this.profileLoader = profileLoader; 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/ProjectsAction.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileProjectsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/ProjectsAction.java index c36b90a3e77..f4b3bc9658f 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/ProjectsAction.java @@ -23,10 +23,6 @@ import com.google.common.base.Predicate; import com.google.common.collect.Collections2; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.List; import org.apache.commons.lang.builder.CompareToBuilder; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; @@ -42,7 +38,12 @@ import org.sonar.server.db.DbClient; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; -public class QProfileProjectsAction implements QProfileWsAction { +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; + +public class ProjectsAction implements QProfileWsAction { private static final String PARAM_KEY = "key"; private static final String PARAM_SELECTED = "selected"; @@ -57,7 +58,7 @@ public class QProfileProjectsAction implements QProfileWsAction { private final DbClient dbClient; private final UserSession userSession; - public QProfileProjectsAction(DbClient dbClient, UserSession userSession) { + public ProjectsAction(DbClient dbClient, UserSession userSession) { this.dbClient = dbClient; this.userSession = userSession; } 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/RenameAction.java similarity index 94% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRenameAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RenameAction.java index 65ef7a3b8d1..e8202c64b02 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/RenameAction.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 QProfileWsAction { +public class RenameAction implements QProfileWsAction { private static final String PARAM_PROFILE_NAME = "name"; private static final String PARAM_PROFILE_KEY = "key"; @@ -35,7 +35,7 @@ public class QProfileRenameAction implements QProfileWsAction { private final QProfileFactory profileFactory; private final UserSession userSession; - public QProfileRenameAction(QProfileFactory profileFactory, UserSession userSession) { + public RenameAction(QProfileFactory profileFactory, UserSession userSession) { this.profileFactory = profileFactory; this.userSession = userSession; } 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/RestoreAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreAction.java index 621bf9473f0..c94625c0635 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/RestoreAction.java @@ -36,14 +36,14 @@ import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.StandardCharsets; -public class QProfileRestoreAction implements QProfileWsAction { +public class RestoreAction implements QProfileWsAction { private static final String PARAM_BACKUP = "backup"; private final QProfileBackuper backuper; private final Languages languages; private final UserSession userSession; - public QProfileRestoreAction(QProfileBackuper backuper, Languages languages, UserSession userSession) { + public RestoreAction(QProfileBackuper backuper, Languages languages, UserSession userSession) { this.backuper = backuper; this.languages = languages; this.userSession = userSession; 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/RestoreBuiltInAction.java similarity index 93% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInAction.java index 9127ebefd45..8d421a78012 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/RestoreBuiltInAction.java @@ -25,11 +25,11 @@ import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.server.qualityprofile.QProfileService; -public class QProfileRestoreBuiltInAction implements QProfileWsAction { +public class RestoreBuiltInAction implements QProfileWsAction { private final QProfileService service; - public QProfileRestoreBuiltInAction(QProfileService service) { + public RestoreBuiltInAction(QProfileService service) { this.service = 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/SearchAction.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSearchAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java index 7a2580ec02f..ecdbbf53efb 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/SearchAction.java @@ -44,7 +44,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -public class QProfileSearchAction implements QProfileWsAction { +public class SearchAction implements QProfileWsAction { private static final String FIELD_KEY = "key"; private static final String FIELD_NAME = "name"; @@ -71,7 +71,7 @@ public class QProfileSearchAction implements QProfileWsAction { private final QualityProfileDao qualityProfileDao; - public QProfileSearchAction(Languages languages, QProfileLookup profileLookup, QProfileLoader profileLoader, QualityProfileDao qualityProfileDao) { + public SearchAction(Languages languages, QProfileLookup profileLookup, QProfileLoader profileLoader, QualityProfileDao qualityProfileDao) { this.languages = languages; this.profileLookup = profileLookup; this.profileLoader = profileLoader; 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/SetDefaultAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultAction.java rename to server/sonar-server/src/main/java/org/sonar/server/qualityprofile/ws/SetDefaultAction.java index 0d1f0484277..e0032982045 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/SetDefaultAction.java @@ -34,7 +34,7 @@ import org.sonar.server.user.UserSession; import static org.apache.commons.lang.StringUtils.isEmpty; -public class QProfileSetDefaultAction implements QProfileWsAction { +public class SetDefaultAction implements QProfileWsAction { private static final String PARAM_LANGUAGE = "language"; private static final String PARAM_PROFILE_NAME = "profileName"; @@ -47,7 +47,7 @@ public class QProfileSetDefaultAction implements QProfileWsAction { private final QProfileFactory profileFactory; private final UserSession userSession; - public QProfileSetDefaultAction(Languages languages, QProfileLookup profileLookup, QProfileFactory profileFactory, UserSession userSession) { + public SetDefaultAction(Languages languages, QProfileLookup profileLookup, QProfileFactory profileFactory, UserSession userSession) { this.languages = languages; this.profileLookup = profileLookup; this.profileFactory = profileFactory; 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/CoveredFilesAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsCoveredFilesAction.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/CoveredFilesAction.java index 50c87eaaf51..e09b0c34a1b 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/CoveredFilesAction.java @@ -24,8 +24,6 @@ import com.google.common.base.Function; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.io.Resources; -import java.util.List; -import java.util.Map; import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; @@ -39,7 +37,10 @@ import org.sonar.server.test.index.CoveredFileDoc; import org.sonar.server.test.index.TestIndex; import org.sonar.server.user.UserSession; -public class TestsCoveredFilesAction implements TestsWsAction { +import java.util.List; +import java.util.Map; + +public class CoveredFilesAction implements TestsWsAction { public static final String TEST_UUID = "testUuid"; @@ -47,7 +48,7 @@ public class TestsCoveredFilesAction implements TestsWsAction { private final TestIndex index; private final UserSession userSession; - public TestsCoveredFilesAction(DbClient dbClient, TestIndex index, UserSession userSession) { + public CoveredFilesAction(DbClient dbClient, TestIndex index, UserSession userSession) { this.dbClient = dbClient; this.index = index; this.userSession = userSession; 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/ListAction.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/test/ws/TestsListAction.java rename to server/sonar-server/src/main/java/org/sonar/server/test/ws/ListAction.java index f74b34f87c5..d757bc46c25 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/ListAction.java @@ -45,7 +45,7 @@ import javax.annotation.Nullable; import java.util.List; import java.util.Map; -public class TestsListAction implements TestsWsAction { +public class ListAction 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"; @@ -56,7 +56,7 @@ public class TestsListAction implements TestsWsAction { private final TestIndex testIndex; private final UserSession userSession; - public TestsListAction(DbClient dbClient, TestIndex testIndex, UserSession userSession) { + public ListAction(DbClient dbClient, TestIndex testIndex, UserSession userSession) { this.dbClient = dbClient; this.testIndex = testIndex; this.userSession = userSession; diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java index 71a39f1e1f9..5e08f594cc9 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java +++ b/server/sonar-server/src/main/java/org/sonar/server/ui/JRubyFacade.java @@ -58,6 +58,7 @@ import org.sonar.server.platform.Platform; import org.sonar.server.platform.ServerIdGenerator; import org.sonar.server.platform.ServerSettings; import org.sonar.server.platform.SettingsChangeNotifier; +import org.sonar.server.platform.ws.UpgradesAction; import org.sonar.server.plugins.InstalledPluginReferentialFactory; import org.sonar.server.plugins.PluginDownloader; import org.sonar.server.plugins.ServerPluginRepository; @@ -382,9 +383,9 @@ public final class JRubyFacade { /** * Checks whether the SQ instance is up and running (ie. not in safemode and with an up-to-date database). *

- * This method duplicates most of the logic code written in {@link org.sonar.server.platform.ws.UpgradesSystemWsAction} + * This method duplicates most of the logic code written in {@link UpgradesAction} * class. There is no need to refactor code to avoid this duplication since this method is only used by RoR code - * which will soon be replaced by pure JS code based on the {@link org.sonar.server.platform.ws.UpgradesSystemWsAction} + * which will soon be replaced by pure JS code based on the {@link UpgradesAction} * WebService. *

*/ 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/CurrentAction.java similarity index 95% rename from server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentUserAction.java rename to server/sonar-server/src/main/java/org/sonar/server/user/ws/CurrentAction.java index 422d4539d71..f3784f06c26 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/CurrentAction.java @@ -25,10 +25,10 @@ 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 UsersWsAction { +public class CurrentAction implements UsersWsAction { private final UserSession userSession; - public CurrentUserAction(UserSession userSession) { + public CurrentAction(UserSession userSession) { this.userSession = userSession; } diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-create.json b/server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-create.json similarity index 100% rename from server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-create.json rename to server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-create.json diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-ghosts.json b/server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-ghosts.json similarity index 100% rename from server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-ghosts.json rename to server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-ghosts.json diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-index.json b/server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-index.json similarity index 100% rename from server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-index.json rename to server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-index.json diff --git a/server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-provisioned.json b/server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-provisioned.json similarity index 100% rename from server/sonar-server/src/main/resources/org/sonar/server/component/ws/projects-example-provisioned.json rename to server/sonar-server/src/main/resources/org/sonar/server/project/ws/projects-example-provisioned.json diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java index 3dee07e1a02..f0778ab7da0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/BatchWsTest.java @@ -58,8 +58,8 @@ public class BatchWsTest { @Before public void before() { tester = new WsTester(new BatchWs(batchIndex, - new GlobalRepositoryAction(mock(DbClient.class), mock(PropertiesDao.class), userSessionRule), - new ProjectRepositoryAction(mock(ProjectRepositoryLoader.class)), + new GlobalAction(mock(DbClient.class), mock(PropertiesDao.class), userSessionRule), + new ProjectAction(mock(ProjectRepositoryLoader.class)), new IssuesAction(mock(DbClient.class), mock(IssueIndex.class), userSessionRule))); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalRepositoryActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/batch/GlobalRepositoryActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java index b6944c77738..b9ffed89f19 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalRepositoryActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/GlobalActionTest.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class GlobalRepositoryActionTest { +public class GlobalActionTest { @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @Rule @@ -66,7 +66,7 @@ public class GlobalRepositoryActionTest { when(dbClient.openSession(false)).thenReturn(session); when(dbClient.metricDao()).thenReturn(metricDao); - tester = new WsTester(new BatchWs(mock(BatchIndex.class), new GlobalRepositoryAction(dbClient, propertiesDao, userSessionRule))); + tester = new WsTester(new BatchWs(mock(BatchIndex.class), new GlobalAction(dbClient, propertiesDao, userSessionRule))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java index 161d65ce6d9..dc70a1eae9d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectRepositoryActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/batch/ProjectActionTest.java @@ -34,7 +34,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class ProjectRepositoryActionTest { +public class ProjectActionTest { @Mock ProjectRepositoryLoader projectRepositoryLoader; @@ -43,7 +43,7 @@ public class ProjectRepositoryActionTest { @Before public void setUp() { - tester = new WsTester(new BatchWs(mock(BatchIndex.class), new ProjectRepositoryAction(projectRepositoryLoader))); + tester = new WsTester(new BatchWs(mock(BatchIndex.class), new ProjectAction(projectRepositoryLoader))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java index 5089d87590c..c29c021743b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentAppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/AppActionTest.java @@ -61,7 +61,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class ComponentAppActionTest { +public class AppActionTest { @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @@ -104,7 +104,7 @@ public class ComponentAppActionTest { when(measureDao.findByComponentKeyAndMetricKeys(eq(session), anyString(), anyListOf(String.class))).thenReturn(measures); - tester = new WsTester(new ComponentsWs(new ComponentAppAction(dbClient, durations, i18n, userSessionRule), mock(SearchAction.class))); + tester = new WsTester(new ComponentsWs(new AppAction(dbClient, durations, i18n, userSessionRule), mock(SearchAction.class))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java index 486e5b33741..94baa386fc6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/ComponentsWsTest.java @@ -42,7 +42,7 @@ public class ComponentsWsTest { @Before public void setUp() { - WsTester tester = new WsTester(new ComponentsWs(new ComponentAppAction(mock(DbClient.class), mock(Durations.class), mock(I18n.class), userSessionRule), new SearchAction(mock(DbClient.class), userSessionRule))); + WsTester tester = new WsTester(new ComponentsWs(new AppAction(mock(DbClient.class), mock(Durations.class), mock(I18n.class), userSessionRule), new SearchAction(mock(DbClient.class), userSessionRule))); controller = tester.controller("api/components"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java index c63ff362391..7e3a0766895 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/component/ws/SearchActionTest.java @@ -55,7 +55,7 @@ public class SearchActionTest { DbClient dbClient = new DbClient(dbTester.database(), dbTester.myBatis(), new ComponentDao(), new AuthorizationDao(dbTester.myBatis()), new ComponentIndexDao() ); - tester = new WsTester(new ComponentsWs(mock(ComponentAppAction.class), new SearchAction(dbClient, userSessionRule))); + tester = new WsTester(new ComponentsWs(mock(AppAction.class), new SearchAction(dbClient, userSessionRule))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ComputationWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ComputationWsTest.java index 8da36798f95..742afbf0d27 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ComputationWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/ComputationWsTest.java @@ -21,29 +21,29 @@ package org.sonar.server.computation.ws; import org.junit.Test; -import org.sonar.api.server.ws.RequestHandler; import org.sonar.api.server.ws.WebService; +import org.sonar.server.activity.index.ActivityIndex; +import org.sonar.server.computation.ComputationThreadLauncher; +import org.sonar.server.computation.ReportQueue; +import org.sonar.server.user.UserSession; +import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; public class ComputationWsTest { + WsTester ws = new WsTester(new ComputationWs( + new QueueAction(mock(ReportQueue.class)), + new SubmitReportAction(mock(ReportQueue.class), mock(ComputationThreadLauncher.class), mock(UserSession.class)), + new HistoryAction(mock(ActivityIndex.class), mock(UserSession.class)))); + @Test public void define() { - ComputationWs ws = new ComputationWs(new ComputationWsAction() { - @Override - public void define(WebService.NewController controller) { - WebService.NewAction upload = controller.createAction("upload"); - upload.setHandler(mock(RequestHandler.class)); - } - }); - WebService.Context context = new WebService.Context(); - ws.define(context); + WebService.Controller controller = ws.controller("api/computation"); - WebService.Controller controller = context.controller("api/computation"); assertThat(controller).isNotNull(); assertThat(controller.description()).isNotEmpty(); - assertThat(controller.actions()).hasSize(1); + assertThat(controller.actions()).hasSize(3); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryWsActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryActionMediumTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryWsActionMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryActionMediumTest.java index 82da6149876..21bd5520948 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryWsActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/HistoryActionMediumTest.java @@ -20,7 +20,6 @@ package org.sonar.server.computation.ws; -import java.util.Date; import org.junit.Before; import org.junit.ClassRule; import org.junit.Rule; @@ -34,23 +33,25 @@ import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; +import java.util.Date; + /** * TODO replace this medium test by a small test */ -public class HistoryWsActionMediumTest { +public class HistoryActionMediumTest { @ClassRule public static ServerTester tester = new ServerTester(); @Rule public UserSessionRule userSessionRule = UserSessionRule.forServerTester(tester); - HistoryWsAction sut; + HistoryAction sut; ActivityService activityService; @Before public void setUp() { tester.clearDbAndIndexes(); - sut = tester.get(HistoryWsAction.class); + sut = tester.get(HistoryAction.class); activityService = tester.get(ActivityService.class); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java index 32c9e9432d9..e88401ec61a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/IsQueueEmptyWsTest.java @@ -38,14 +38,14 @@ import static org.mockito.Mockito.when; public class IsQueueEmptyWsTest { - IsQueueEmptyWs.IsQueueEmptyWsAction sut; + IsQueueEmptyWs.IsQueueEmptyAction sut; ReportQueue queue; Response response; @Before public void before() { queue = mock(ReportQueue.class); - sut = new IsQueueEmptyWs.IsQueueEmptyWsAction(queue); + sut = new IsQueueEmptyWs.IsQueueEmptyAction(queue); response = mock(Response.class); when(response.stream()).thenReturn(new FakeStream()); diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueActionTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueActionTest.java index 42f6f11a075..86e27721204 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/QueueActionTest.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.core.computation.db.AnalysisReportDto.Status.PENDING; -public class QueueWsActionTest { +public class QueueActionTest { WsTester tester; private ReportQueue queue; @@ -43,7 +43,7 @@ public class QueueWsActionTest { @Before public void setup() { queue = mock(ReportQueue.class); - tester = new WsTester(new ComputationWs(new QueueWsAction(queue))); + tester = new WsTester(new ComputationWs(new QueueAction(queue))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportActionTest.java similarity index 89% rename from server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportActionTest.java index 95910bcfdc0..4998ab619d7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/ws/SubmitReportActionTest.java @@ -40,18 +40,18 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class SubmitReportWsActionTest { +public class SubmitReportActionTest { @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); ComputationThreadLauncher workerLauncher = mock(ComputationThreadLauncher.class); ReportQueue queue = mock(ReportQueue.class); WsTester wsTester; - SubmitReportWsAction sut; + SubmitReportAction sut; @Before public void before() { - sut = new SubmitReportWsAction(queue, workerLauncher, userSessionRule); + sut = new SubmitReportAction(queue, workerLauncher, userSessionRule); wsTester = new WsTester(new ComputationWs(sut)); } @@ -76,8 +76,8 @@ public class SubmitReportWsActionTest { WsTester.TestRequest request = wsTester .newGetRequest(ComputationWs.ENDPOINT, "submit_report") - .setParam(SubmitReportWsAction.PARAM_PROJECT_KEY, "P1") - .setParam(SubmitReportWsAction.PARAM_REPORT_DATA, null); + .setParam(SubmitReportAction.PARAM_PROJECT_KEY, "P1") + .setParam(SubmitReportAction.PARAM_REPORT_DATA, null); WsTester.Result response = request.execute(); verify(queue).add(eq("P1"), any(InputStream.class)); @@ -91,8 +91,8 @@ public class SubmitReportWsActionTest { WsTester.TestRequest request = wsTester .newGetRequest(ComputationWs.ENDPOINT, "submit_report") - .setParam(SubmitReportWsAction.PARAM_PROJECT_KEY, "P1") - .setParam(SubmitReportWsAction.PARAM_REPORT_DATA, null); + .setParam(SubmitReportAction.PARAM_PROJECT_KEY, "P1") + .setParam(SubmitReportAction.PARAM_REPORT_DATA, null); request.execute(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java index ab039a878d2..61e7a768110 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/issue/ws/IssueShowActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/issue/ws/ShowActionTest.java @@ -73,7 +73,7 @@ import static org.mockito.Mockito.when; * TODO Should be replaced by medium tests, as there are too many dependencies */ @RunWith(MockitoJUnitRunner.class) -public class IssueShowActionTest { +public class ShowActionTest { @org.junit.Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @@ -144,7 +144,7 @@ public class IssueShowActionTest { when(i18n.message(any(Locale.class), eq("created"), eq((String) null))).thenReturn("Created"); tester = new WsTester(new IssuesWs( - new IssueShowAction( + new ShowAction( dbClient, issueService, issueChangelogService, commentService, new IssueActionsWriter(issueService, actionService, userSessionRule), actionPlanService, userFinder, debtModel, ruleService, i18n, durations, userSessionRule) diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemInfoWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemInfoWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java index f93b1fd2992..74cf84b130f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemInfoWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java @@ -36,14 +36,14 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class SystemInfoWsActionTest { +public class InfoActionTest { @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone().login("login") .setName("name"); Monitor monitor1 = mock(Monitor.class); Monitor monitor2 = mock(Monitor.class); - SystemInfoWsAction sut = new SystemInfoWsAction(userSessionRule, monitor1, monitor2); + InfoAction sut = new InfoAction(userSessionRule, monitor1, monitor2); @Test(expected = ForbiddenException.class) public void should_fail_when_does_not_have_admin_right() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemActionTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemActionTest.java index 1090640f063..8cbee38474f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/MigrateDbSystemActionTest.java @@ -46,7 +46,7 @@ import static org.sonar.server.db.migrations.DatabaseMigration.Status.RUNNING; import static org.sonar.server.db.migrations.DatabaseMigration.Status.SUCCEEDED; import static org.sonar.test.JsonAssert.assertJson; -public class MigrateDbSystemWsActionTest { +public class MigrateDbSystemActionTest { private static final String UPTODATE_MSG = "Database is up-to-date, no migration needed."; private static final String MIG_NOT_SUPPORTED_MSG = "Upgrade is not supported on embedded database."; @@ -68,7 +68,7 @@ public class MigrateDbSystemWsActionTest { Database database = mock(Database.class); Dialect dialect = mock(Dialect.class); DatabaseMigration databaseMigration = mock(DatabaseMigration.class); - MigrateDbSystemWsAction underTest = new MigrateDbSystemWsAction(databaseVersion, database, databaseMigration); + MigrateDbSystemAction underTest = new MigrateDbSystemAction(databaseVersion, database, databaseMigration); Request request = mock(Request.class); WsTester.TestResponse response = new WsTester.TestResponse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemRestartWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemRestartWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java index 4329ff9a5d5..34db99aa9a8 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemRestartWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/RestartActionTest.java @@ -28,11 +28,11 @@ import org.sonar.server.ws.WsTester; import static org.junit.Assert.fail; import static org.mockito.Mockito.*; -public class SystemRestartWsActionTest { +public class RestartActionTest { Settings settings = new Settings(); Platform platform = mock(Platform.class); - SystemRestartWsAction sut = new SystemRestartWsAction(settings, platform); + RestartAction sut = new RestartAction(settings, platform); @Test public void restart_if_dev_mode() throws Exception { diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemStatusWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemStatusWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java index a64e45a95b9..26f3c2dc54a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemStatusWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/StatusActionTest.java @@ -19,9 +19,6 @@ */ package org.sonar.server.platform.ws; -import java.io.File; -import java.util.Date; -import java.util.Set; import org.junit.Before; import org.junit.Test; import org.sonar.api.platform.Server; @@ -34,6 +31,10 @@ import org.sonar.server.db.migrations.DatabaseMigration; import org.sonar.server.platform.Platform; import org.sonar.server.ws.WsTester; +import java.io.File; +import java.util.Date; +import java.util.Set; + import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.not; import static com.google.common.collect.ImmutableSet.of; @@ -45,7 +46,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.test.JsonAssert.assertJson; -public class SystemStatusWsActionTest { +public class StatusActionTest { private static final String DUMMY_CONTROLLER_KEY = "dummy"; private static final String SERVER_ID = "20150504120436"; @@ -64,7 +65,7 @@ public class SystemStatusWsActionTest { private DbClient dbClient = mock(DbClient.class); private DbSession dbSession = mock(DbSession.class); private IsAliveMapper isAliveMapper = mock(IsAliveMapper.class); - private SystemStatusWsAction underTest = new SystemStatusWsAction(server, databaseMigration, platform, dbClient); + private StatusAction underTest = new StatusAction(server, databaseMigration, platform, dbClient); private Request request = mock(Request.class); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java index a475adf91f7..a00bc635f87 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java @@ -32,8 +32,8 @@ public class SystemWsTest { @Test public void define() { - SystemRestartWsAction action1 = new SystemRestartWsAction(mock(Settings.class), mock(Platform.class)); - SystemInfoWsAction action2 = new SystemInfoWsAction(new AnonymousMockUserSession()); + RestartAction action1 = new RestartAction(mock(Settings.class), mock(Platform.class)); + InfoAction action2 = new InfoAction(new AnonymousMockUserSession()); SystemWs ws = new SystemWs(action1, action2); WebService.Context context = new WebService.Context(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesSystemWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesSystemWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java index 24557f8b035..e5939d5a45d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesSystemWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/ws/UpgradesActionTest.java @@ -41,7 +41,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.test.JsonAssert.assertJson; -public class UpgradesSystemWsActionTest { +public class UpgradesActionTest { private static final String DUMMY_CONTROLLER_KEY = "dummy"; private static final String JSON_EMPTY_UPGRADE_LIST = "{" + @@ -50,7 +50,7 @@ public class UpgradesSystemWsActionTest { private UpdateCenterMatrixFactory updateCenterFactory = mock(UpdateCenterMatrixFactory.class); private UpdateCenter updateCenter = mock(UpdateCenter.class); - private UpgradesSystemWsAction underTest = new UpgradesSystemWsAction(updateCenterFactory, new PluginWSCommons()); + private UpgradesAction underTest = new UpgradesAction(updateCenterFactory, new PluginWSCommons()); private Request request = mock(Request.class); private WsTester.TestResponse response = new WsTester.TestResponse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java index 92c7fbab55a..03682b2ffdb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AbstractUpdateCenterBasedPluginsWsActionTest.java @@ -19,7 +19,6 @@ */ package org.sonar.server.plugins.ws; -import java.net.URL; import org.junit.Before; import org.sonar.api.server.ws.Request; import org.sonar.api.utils.DateUtils; @@ -31,6 +30,8 @@ import org.sonar.updatecenter.common.Release; import org.sonar.updatecenter.common.UpdateCenter; import org.sonar.updatecenter.common.Version; +import java.net.URL; + import static org.mockito.Matchers.anyBoolean; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -60,7 +61,7 @@ public class AbstractUpdateCenterBasedPluginsWsActionTest { } protected static URL resource(String s) { - Class clazz = AvailablePluginsWsActionTest.class; + Class clazz = AvailableActionTest.class; return clazz.getResource(clazz.getSimpleName() + "/" + s); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java index 220975fbfd5..b6c59f1ab61 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/AvailableActionTest.java @@ -36,7 +36,7 @@ import static org.sonar.updatecenter.common.PluginUpdate.Status.DEPENDENCIES_REQ import static org.sonar.updatecenter.common.PluginUpdate.Status.INCOMPATIBLE; import static org.sonar.updatecenter.common.PluginUpdate.Status.REQUIRE_SONAR_UPGRADE; -public class AvailablePluginsWsActionTest extends AbstractUpdateCenterBasedPluginsWsActionTest { +public class AvailableActionTest extends AbstractUpdateCenterBasedPluginsWsActionTest { private static final Plugin FULL_PROPERTIES_PLUGIN = new Plugin("p_key") .setName("p_name") @@ -52,7 +52,7 @@ public class AvailablePluginsWsActionTest extends AbstractUpdateCenterBasedPlugi .addOutgoingDependency(release(PLUGIN_1, "0.3.6")) .addOutgoingDependency(release(PLUGIN_2, "1.0.0")); - private AvailablePluginsWsAction underTest = new AvailablePluginsWsAction(updateCenterFactory, new PluginWSCommons()); + private AvailableAction underTest = new AvailableAction(updateCenterFactory, new PluginWSCommons()); @Test public void action_available_is_defined() { diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllPluginsWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java index 11f91f15ef6..26d06a8a233 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllPluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/CancelAllActionTest.java @@ -36,7 +36,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -public class CancelAllPluginsWsActionTest { +public class CancelAllActionTest { private static final String DUMMY_CONTROLLER_KEY = "dummy"; @Rule @@ -44,7 +44,7 @@ public class CancelAllPluginsWsActionTest { private PluginDownloader pluginDownloader = mock(PluginDownloader.class); private ServerPluginRepository pluginRepository = mock(ServerPluginRepository.class); - private CancelAllPluginsWsAction underTest = new CancelAllPluginsWsAction(pluginDownloader, pluginRepository, userSessionRule); + private CancelAllAction underTest = new CancelAllAction(pluginDownloader, pluginRepository, userSessionRule); private Request request = mock(Request.class); private WsTester.TestResponse response = new WsTester.TestResponse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallPluginsWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java index 1be07a38451..6cac3de746d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallPluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstallActionTest.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class InstallPluginsWsActionTest { +public class InstallActionTest { private static final String DUMMY_CONTROLLER_KEY = "dummy"; private static final String CONTROLLER_KEY = "api/plugins"; private static final String ACTION_KEY = "install"; @@ -56,7 +56,7 @@ public class InstallPluginsWsActionTest { private UpdateCenterMatrixFactory updateCenterFactory = mock(UpdateCenterMatrixFactory.class); private UpdateCenter updateCenter = mock(UpdateCenter.class); private PluginDownloader pluginDownloader = mock(PluginDownloader.class); - private InstallPluginsWsAction underTest = new InstallPluginsWsAction(updateCenterFactory, pluginDownloader, userSessionRule); + private InstallAction underTest = new InstallAction(updateCenterFactory, pluginDownloader, userSessionRule); private WsTester wsTester = new WsTester(new PluginsWs(underTest)); private WsTester.TestRequest invalidRequest = wsTester.newPostRequest(CONTROLLER_KEY, ACTION_KEY); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java index ab79848ff97..15d405ccfa7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/InstalledActionTest.java @@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.test.JsonAssert.assertJson; -public class InstalledPluginsWsActionTest { +public class InstalledActionTest { private static final String DUMMY_CONTROLLER_KEY = "dummy"; private static final String JSON_EMPTY_PLUGIN_LIST = "{" + @@ -48,7 +48,7 @@ public class InstalledPluginsWsActionTest { public TemporaryFolder temp = new TemporaryFolder(); private ServerPluginRepository pluginRepository = mock(ServerPluginRepository.class); - private InstalledPluginsWsAction underTest = new InstalledPluginsWsAction(pluginRepository, new PluginWSCommons()); + private InstalledAction underTest = new InstalledAction(pluginRepository, new PluginWSCommons()); private Request request = mock(Request.class); private WsTester.TestResponse response = new WsTester.TestResponse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java index 56cd9e86cbf..a9620d490c6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingPluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/PendingActionTest.java @@ -34,13 +34,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.test.JsonAssert.assertJson; -public class PendingPluginsWsActionTest { +public class PendingActionTest { private static final String DUMMY_CONTROLLER_KEY = "dummy"; PluginDownloader pluginDownloader = mock(PluginDownloader.class); ServerPluginRepository serverPluginRepository = mock(ServerPluginRepository.class); - PendingPluginsWsAction underTest = new PendingPluginsWsAction(pluginDownloader, serverPluginRepository, new PluginWSCommons()); + PendingAction underTest = new PendingAction(pluginDownloader, serverPluginRepository, new PluginWSCommons()); Request request = mock(Request.class); WsTester.TestResponse response = new WsTester.TestResponse(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallPluginsWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java index 42f42aab246..4bf85e00f1b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallPluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UninstallActionTest.java @@ -35,7 +35,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class UninstallPluginsWsActionTest { +public class UninstallActionTest { private static final String DUMMY_CONTROLLER_KEY = "dummy"; private static final String CONTROLLER_KEY = "api/plugins"; private static final String ACTION_KEY = "uninstall"; @@ -48,7 +48,7 @@ public class UninstallPluginsWsActionTest { public ExpectedException expectedException = ExpectedException.none(); private ServerPluginRepository pluginRepository = mock(ServerPluginRepository.class); - private UninstallPluginsWsAction underTest = new UninstallPluginsWsAction(pluginRepository, userSessionRule); + private UninstallAction underTest = new UninstallAction(pluginRepository, userSessionRule); private WsTester wsTester = new WsTester(new PluginsWs(underTest)); private Request invalidRequest = wsTester.newGetRequest(CONTROLLER_KEY, ACTION_KEY); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatePluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatePluginsWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java index 750dae46318..22c8ac0fc05 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatePluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdateActionTest.java @@ -45,7 +45,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -public class UpdatePluginsWsActionTest { +public class UpdateActionTest { private static final String DUMMY_CONTROLLER_KEY = "dummy"; private static final String CONTROLLER_KEY = "api/plugins"; private static final String ACTION_KEY = "update"; @@ -58,7 +58,7 @@ public class UpdatePluginsWsActionTest { private UpdateCenterMatrixFactory updateCenterFactory = mock(UpdateCenterMatrixFactory.class); private UpdateCenter updateCenter = mock(UpdateCenter.class); private PluginDownloader pluginDownloader = mock(PluginDownloader.class); - private UpdatePluginsWsAction underTest = new UpdatePluginsWsAction(updateCenterFactory, pluginDownloader, userSessionRule); + private UpdateAction underTest = new UpdateAction(updateCenterFactory, pluginDownloader, userSessionRule); private WsTester wsTester = new WsTester(new PluginsWs(underTest)); private Request invalidRequest = wsTester.newGetRequest(CONTROLLER_KEY, ACTION_KEY); diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesPluginsWsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesPluginsWsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java index 4784b7cedae..54aeddee145 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesPluginsWsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/plugins/ws/UpdatesActionTest.java @@ -33,7 +33,7 @@ import static org.sonar.test.JsonAssert.assertJson; import static org.sonar.updatecenter.common.PluginUpdate.Status.COMPATIBLE; import static org.sonar.updatecenter.common.PluginUpdate.Status.INCOMPATIBLE; -public class UpdatesPluginsWsActionTest extends AbstractUpdateCenterBasedPluginsWsActionTest { +public class UpdatesActionTest extends AbstractUpdateCenterBasedPluginsWsActionTest { private static final Plugin JAVA_PLUGIN = new Plugin("java") .setName("Java") .setDescription("SonarQube rule engine."); @@ -70,7 +70,7 @@ public class UpdatesPluginsWsActionTest extends AbstractUpdateCenterBasedPlugins .addOutgoingDependency(release(JAVA_PLUGIN, "1.0")); - private UpdatesPluginsWsAction underTest = new UpdatesPluginsWsAction(updateCenterFactory, + private UpdatesAction underTest = new UpdatesAction(updateCenterFactory, new PluginWSCommons(), new PluginUpdateAggregator() ); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsDeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsDeleteActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java index b21454b0980..38915debf48 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsDeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/DeleteActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import com.google.common.collect.ImmutableMap; import org.junit.After; @@ -77,7 +77,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @Category(DbTests.class) -public class ProjectsDeleteActionTest { +public class DeleteActionTest { @ClassRule public static DbTester db = new DbTester(); @@ -104,7 +104,7 @@ public class ProjectsDeleteActionTest { when(resourceType.getBooleanProperty(anyString())).thenReturn(true); ResourceTypes mockResourceTypes = mock(ResourceTypes.class); when(mockResourceTypes.get(anyString())).thenReturn(resourceType); - ws = new WsTester(new ProjectsWs(new ProjectsDeleteAction(new ComponentCleanerService(dbClient, new IssueAuthorizationIndexer(dbClient, es.client()), new IssueIndexer( + ws = new WsTester(new ProjectsWs(new DeleteAction(new ComponentCleanerService(dbClient, new IssueAuthorizationIndexer(dbClient, es.client()), new IssueIndexer( dbClient, es.client()), new SourceLineIndexer(dbClient, es.client()), new TestIndexer(dbClient, es.client()), mockResourceTypes), dbClient, userSessionRule))); db.truncateTables(); es.truncateIndices(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsGhostsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsGhostsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java index 1cd6a645b01..3b3535d2fb9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsGhostsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/GhostsActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import com.google.common.io.Resources; import org.apache.commons.lang.StringUtils; @@ -50,7 +50,7 @@ import org.sonar.test.JsonAssert; import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) -public class ProjectsGhostsActionTest { +public class GhostsActionTest { @ClassRule public static DbTester db = new DbTester(); @@ -65,7 +65,7 @@ public class ProjectsGhostsActionTest { public void setUp() { dbClient = new DbClient(db.database(), db.myBatis(), new ComponentDao(), new SnapshotDao(System2.INSTANCE)); dbSession = dbClient.openSession(false); - ws = new WsTester(new ProjectsWs(new ProjectsGhostsAction(dbClient, userSessionRule))); + ws = new WsTester(new ProjectsWs(new GhostsAction(dbClient, userSessionRule))); db.truncateTables(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsWsTest.java rename to server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsTest.java index 003bb4fa72a..7bd3f1d0aa3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProjectsWsTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import org.junit.Before; import org.junit.Test; diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsProvisionedActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsProvisionedActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java index 2abe36c9447..c96928f068c 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/component/ws/ProjectsProvisionedActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/project/ws/ProvisionedActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.component.ws; +package org.sonar.server.project.ws; import com.google.common.io.Resources; import org.apache.commons.lang.StringUtils; @@ -51,7 +51,7 @@ import org.sonar.test.JsonAssert; import static org.assertj.core.api.Assertions.assertThat; @Category(DbTests.class) -public class ProjectsProvisionedActionTest { +public class ProvisionedActionTest { @ClassRule public static DbTester db = new DbTester(); @@ -76,7 +76,7 @@ public class ProjectsProvisionedActionTest { dbSession = dbClient.openSession(false); componentDao = dbClient.componentDao(); db.truncateTables(); - ws = new WsTester(new ProjectsWs(new ProjectsProvisionedAction(dbClient, userSessionRule))); + ws = new WsTester(new ProjectsWs(new ProvisionedAction(dbClient, userSessionRule))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java similarity index 85% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java index 7cbbb3db16d..8da15e9fd29 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesAppActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/AppActionTest.java @@ -47,7 +47,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class QGatesAppActionTest { +public class AppActionTest { @Mock private QualityGates qGates; @@ -63,11 +63,11 @@ public class QGatesAppActionTest { @Before public void setUp() { tester = new WsTester(new QGatesWs( - new QGatesListAction(qGates), new QGatesShowAction(qGates), new QGatesSearchAction(mock(QgateProjectFinder.class)), - new QGatesCreateAction(qGates), new QGatesCopyAction(qGates), new QGatesDestroyAction(qGates), new QGatesRenameAction(qGates), - new QGatesSetAsDefaultAction(qGates), new QGatesUnsetDefaultAction(qGates), - new QGatesCreateConditionAction(qGates), new QGatesUpdateConditionAction(qGates), new QGatesDeleteConditionAction(qGates), - new QGatesSelectAction(qGates), new QGatesDeselectAction(qGates), new QGatesAppAction(qGates, periods, i18n))); + new ListAction(qGates), new ShowAction(qGates), new SearchAction(mock(QgateProjectFinder.class)), + new CreateAction(qGates), new CopyAction(qGates), new DestroyAction(qGates), new RenameAction(qGates), + new SetAsDefaultAction(qGates), new UnsetDefaultAction(qGates), + new CreateConditionAction(qGates), new UpdateConditionAction(qGates), new DeleteConditionAction(qGates), + new SelectAction(qGates), new DeselectAction(qGates), new AppAction(qGates, periods, i18n))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java index 0eea3c11b57..e912b781678 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ws/QGatesWsTest.java @@ -60,18 +60,18 @@ public class QGatesWsTest { private QgateProjectFinder projectFinder; @Mock - private QGatesAppAction appHandler; + private AppAction appHandler; WsTester tester; @Before public void setUp() { tester = new WsTester(new QGatesWs( - new QGatesListAction(qGates), new QGatesShowAction(qGates), new QGatesSearchAction(projectFinder), - new QGatesCreateAction(qGates), new QGatesCopyAction(qGates), new QGatesDestroyAction(qGates), new QGatesRenameAction(qGates), - new QGatesSetAsDefaultAction(qGates), new QGatesUnsetDefaultAction(qGates), - new QGatesCreateConditionAction(qGates), new QGatesUpdateConditionAction(qGates), new QGatesDeleteConditionAction(qGates), - new QGatesSelectAction(qGates), new QGatesDeselectAction(qGates), new QGatesAppAction(qGates, mock(Periods.class), mock(I18n.class)))); + new ListAction(qGates), new ShowAction(qGates), new SearchAction(projectFinder), + new CreateAction(qGates), new CopyAction(qGates), new DestroyAction(qGates), new RenameAction(qGates), + new SetAsDefaultAction(qGates), new UnsetDefaultAction(qGates), + new CreateConditionAction(qGates), new UpdateConditionAction(qGates), new DeleteConditionAction(qGates), + new SelectAction(qGates), new DeselectAction(qGates), new AppAction(qGates, mock(Periods.class), mock(I18n.class)))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileBackupActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileBackupActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java index b039d48813f..37c920b63fa 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileBackupActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/BackupActionTest.java @@ -45,7 +45,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; @RunWith(MockitoJUnitRunner.class) -public class QProfileBackupActionTest { +public class BackupActionTest { @ClassRule public static final DbTester db = new DbTester(); @@ -64,7 +64,7 @@ public class QProfileBackupActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileBackupAction(backuper, dbClient, new QProfileFactory(dbClient), LanguageTesting.newLanguages("xoo")))); + new BackupAction(backuper, dbClient, new QProfileFactory(dbClient), LanguageTesting.newLanguages("xoo")))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentActionMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java index 14beeb84bc1..52ead319c32 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangeParentActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangeParentActionMediumTest.java @@ -44,7 +44,7 @@ import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; -public class QProfileChangeParentActionMediumTest { +public class ChangeParentActionMediumTest { // TODO Replace with DbTester + EsTester once DaoV2 is removed @ClassRule diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java index 5a3aa537365..3aaf7638a58 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ChangelogActionTest.java @@ -59,7 +59,7 @@ import java.util.Map; import static org.mockito.Mockito.mock; import static org.sonar.server.qualityprofile.QProfileTesting.XOO_P1_KEY; -public class QProfileChangelogActionTest { +public class ChangelogActionTest { @ClassRule public static DbTester dbTester = new DbTester(); @@ -97,7 +97,7 @@ public class QProfileChangelogActionTest { dbSession.clearCache(); wsTester = new WsTester(new QProfilesWs(mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileChangelogAction(db, new ActivityIndex(esTester.client()), new QProfileFactory(db), LanguageTesting.newLanguages("xoo")))); + new ChangelogAction(db, new ActivityIndex(esTester.client()), new QProfileFactory(db), LanguageTesting.newLanguages("xoo")))); } @After diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java index 49447da2611..d60550fb732 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CompareActionMediumTest.java @@ -43,7 +43,7 @@ import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; -public class QProfileCompareActionMediumTest { +public class CompareActionMediumTest { @ClassRule public static ServerTester tester = new ServerTester().addXoo() diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java index bf14f0935bb..161132b851e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CopyActionTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class QProfileCopyActionTest { +public class CopyActionTest { @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @@ -55,7 +55,7 @@ public class QProfileCopyActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileCopyAction(qProfileCopier, LanguageTesting.newLanguages("xoo"), userSessionRule))); + new CopyAction(qProfileCopier, LanguageTesting.newLanguages("xoo"), userSessionRule))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionMediumTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionMediumTest.java index d0c187dd61f..994cee4a07d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionMediumTest.java @@ -41,7 +41,7 @@ import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; -public class QProfileCreateActionMediumTest { +public class CreateActionMediumTest { // TODO Replace with simpler test with DbTester / EsTester after removal of DaoV2 @ClassRule diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java index d3085347f13..1b6a67a9309 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/CreateActionTest.java @@ -36,7 +36,7 @@ import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -public class QProfileCreateActionTest { +public class CreateActionTest { @ClassRule public static final DbTester db = new DbTester(); @@ -51,7 +51,7 @@ public class QProfileCreateActionTest { String xooKey = "xoo"; WsTester wsTester = new WsTester(new QProfilesWs( mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileCreateAction(dbClient, new QProfileFactory(dbClient), null, LanguageTesting.newLanguages(xooKey), userSessionRule))); + new CreateAction(dbClient, new QProfileFactory(dbClient), null, LanguageTesting.newLanguages(xooKey), userSessionRule))); Action create = wsTester.controller("api/qualityprofiles").action("create"); assertThat(create.params()).hasSize(2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java index c7ac2685824..083e2034e28 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileDeleteActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/DeleteActionTest.java @@ -48,7 +48,7 @@ import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -public class QProfileDeleteActionTest { +public class DeleteActionTest { @ClassRule public static DbTester dbTester = new DbTester(); @@ -85,7 +85,7 @@ public class QProfileDeleteActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileDeleteAction(new Languages(xoo1, xoo2), new QProfileFactory(dbClient), dbClient, userSessionRule))); + new DeleteAction(new Languages(xoo1, xoo2), new QProfileFactory(dbClient), dbClient, userSessionRule))); } @After diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileExportActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileExportActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java index d145d0f7421..d87d18ab36d 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileExportActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportActionTest.java @@ -55,7 +55,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class QProfileExportActionTest { +public class ExportActionTest { @ClassRule public static final DbTester db = new DbTester(); @@ -95,7 +95,7 @@ public class QProfileExportActionTest { wsTester = new WsTester(new QProfilesWs(mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileExportAction(dbClient, new QProfileFactory(dbClient), backuper, exporters, LanguageTesting.newLanguages("xoo")))); + new ExportAction(dbClient, new QProfileFactory(dbClient), backuper, exporters, LanguageTesting.newLanguages("xoo")))); } @After @@ -187,7 +187,7 @@ public class QProfileExportActionTest { WsTester myWsTester = new WsTester(new QProfilesWs(mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileExportAction(dbClient, new QProfileFactory(dbClient), backuper, myExporters, LanguageTesting.newLanguages("xoo")))); + new ExportAction(dbClient, new QProfileFactory(dbClient), backuper, myExporters, LanguageTesting.newLanguages("xoo")))); Action export = myWsTester.controller("api/qualityprofiles").action("export"); assertThat(export.params()).hasSize(2); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileExportersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileExportersActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java index 9e3c4d3190c..fb84e89a46e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileExportersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ExportersActionTest.java @@ -28,13 +28,13 @@ import java.io.Writer; import static org.mockito.Mockito.mock; -public class QProfileExportersActionTest { +public class ExportersActionTest { @Test public void importers_nominal() throws Exception { WsTester wsTester = new WsTester(new QProfilesWs( mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileExportersAction(createExporters()))); + new ExportersAction(createExporters()))); wsTester.newGetRequest("api/qualityprofiles", "exporters").execute().assertJson(getClass(), "exporters.json"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileImportersActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java similarity index 95% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileImportersActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java index dfd16c7d012..955d7447f2b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileImportersActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ImportersActionTest.java @@ -29,13 +29,13 @@ import java.io.Reader; import static org.mockito.Mockito.mock; -public class QProfileImportersActionTest { +public class ImportersActionTest { @Test public void importers_nominal() throws Exception { WsTester wsTester = new WsTester(new QProfilesWs( mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileImportersAction(createImporters()))); + new ImportersAction(createImporters()))); wsTester.newGetRequest("api/qualityprofiles", "importers").execute().assertJson(getClass(), "importers.json"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceActionMediumTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceActionMediumTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest.java index 58dcf278b0b..6db05c6f350 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileInheritanceActionMediumTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest.java @@ -41,7 +41,7 @@ import org.sonar.server.tester.ServerTester; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; -public class QProfileInheritanceActionMediumTest { +public class InheritanceActionMediumTest { @ClassRule public static final ServerTester tester = new ServerTester(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java index fd05411c6a0..097531c9741 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/ProjectsActionTest.java @@ -51,7 +51,7 @@ import org.sonar.test.DbTests; import static org.mockito.Mockito.mock; @Category(DbTests.class) -public class QProfileProjectsActionTest { +public class ProjectsActionTest { @ClassRule public static final DbTester dbTester = new DbTester(); @@ -88,7 +88,7 @@ public class QProfileProjectsActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileProjectsAction(dbClient, userSessionRule))); + new ProjectsAction(dbClient, userSessionRule))); userSessionRule.login("obiwan").setUserId(userId.intValue()); new UserDao(dbTester.myBatis(), mock(System2.class)) diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java index 7f6dc975e6d..a27423428e0 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfilesWsTest.java @@ -63,23 +63,23 @@ public class QProfilesWsTest { new RuleActivationActions(profileService), new BulkRuleActivationActions(profileService, ruleService, i18n, userSessionRule), new ProjectAssociationActions(null, null, null, languages, userSessionRule), - new QProfileCreateAction(null, null, null, languages, importers, userSessionRule), - new QProfileImportersAction(importers), - new QProfileRestoreBuiltInAction(null), - new QProfileSearchAction(languages, null, null, null), - new QProfileSetDefaultAction(languages, null, null, userSessionRule), - new QProfileProjectsAction(null, userSessionRule), - new QProfileBackupAction(null, null, null, languages), - new QProfileRestoreAction(null, languages, userSessionRule), - new QProfileChangelogAction(null, null, null, languages), - new QProfileChangeParentAction(null, null, null, languages, userSessionRule), - new QProfileCompareAction(null, null, null, languages), - new QProfileCopyAction(null, languages, userSessionRule), - new QProfileDeleteAction(languages, null, null, userSessionRule), - new QProfileExportAction(null, null, null, mock(QProfileExporters.class), languages), - new QProfileExportersAction(), - new QProfileInheritanceAction(null, null, null, null, languages), - new QProfileRenameAction(null, userSessionRule) + new CreateAction(null, null, null, languages, importers, userSessionRule), + new ImportersAction(importers), + new RestoreBuiltInAction(null), + new SearchAction(languages, null, null, null), + new SetDefaultAction(languages, null, null, userSessionRule), + new ProjectsAction(null, userSessionRule), + new BackupAction(null, null, null, languages), + new RestoreAction(null, languages, userSessionRule), + new ChangelogAction(null, null, null, languages), + new ChangeParentAction(null, null, null, languages, userSessionRule), + new CompareAction(null, null, null, languages), + new CopyAction(null, languages, userSessionRule), + new DeleteAction(languages, null, null, userSessionRule), + new ExportAction(null, null, null, mock(QProfileExporters.class), languages), + new ExportersAction(), + new InheritanceAction(null, null, null, null, languages), + new RenameAction(null, userSessionRule) )).controller(QProfilesWs.API_ENDPOINT); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRenameActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRenameActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java index fc6a0536b22..d5d70d40cb6 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRenameActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RenameActionTest.java @@ -40,7 +40,7 @@ import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -public class QProfileRenameActionTest { +public class RenameActionTest { @ClassRule public static DbTester dbTester = new DbTester(); @@ -71,7 +71,7 @@ public class QProfileRenameActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileRenameAction(new QProfileFactory(dbClient), userSessionRule))); + new RenameAction(new QProfileFactory(dbClient), userSessionRule))); } @After diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java similarity index 96% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java index 4d538499782..7ad552f84b3 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreActionTest.java @@ -43,7 +43,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) -public class QProfileRestoreActionTest { +public class RestoreActionTest { @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @@ -59,7 +59,7 @@ public class QProfileRestoreActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileRestoreAction(backuper, LanguageTesting.newLanguages("xoo"), userSessionRule))); + new RestoreAction(backuper, LanguageTesting.newLanguages("xoo"), userSessionRule))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java similarity index 94% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java index 043a8b372c1..1c433dd8ea9 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileRestoreBuiltInActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/RestoreBuiltInActionTest.java @@ -32,7 +32,7 @@ import org.sonar.server.ws.WsTester; import static org.mockito.Mockito.mock; @RunWith(MockitoJUnitRunner.class) -public class QProfileRestoreBuiltInActionTest { +public class RestoreBuiltInActionTest { @Mock QProfileService profileService; @@ -48,7 +48,7 @@ public class QProfileRestoreBuiltInActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileRestoreBuiltInAction(profileService))); + new RestoreBuiltInAction(profileService))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java index 4c13287ec35..28650acc86a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SearchActionTest.java @@ -42,7 +42,7 @@ import org.sonar.server.ws.WsTester; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -public class QProfileSearchActionTest { +public class SearchActionTest { @ClassRule public static DbTester dbTester = new DbTester(); @@ -76,7 +76,7 @@ public class QProfileSearchActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileSearchAction(new Languages(xoo1, xoo2), new QProfileLookup(dbClient), profileLoader, qualityProfileDao))); + new SearchAction(new Languages(xoo1, xoo2), new QProfileLookup(dbClient), profileLoader, qualityProfileDao))); } @After diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java index e621bd0d0b5..1c543a0a1b5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/QProfileSetDefaultActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/ws/SetDefaultActionTest.java @@ -43,7 +43,7 @@ import org.sonar.server.ws.WsTester; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; -public class QProfileSetDefaultActionTest { +public class SetDefaultActionTest { @ClassRule public static DbTester dbTester = new DbTester(); @@ -74,7 +74,7 @@ public class QProfileSetDefaultActionTest { mock(RuleActivationActions.class), mock(BulkRuleActivationActions.class), mock(ProjectAssociationActions.class), - new QProfileSetDefaultAction(LanguageTesting.newLanguages(xoo1Key, xoo2Key), new QProfileLookup(dbClient), new QProfileFactory(dbClient), userSessionRule))); + new SetDefaultAction(LanguageTesting.newLanguages(xoo1Key, xoo2Key), new QProfileLookup(dbClient), new QProfileFactory(dbClient), userSessionRule))); } @After diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java index a0156dcbf70..d0c68a032de 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsCoveredFilesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/CoveredFilesActionTest.java @@ -40,9 +40,9 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.sonar.server.component.ComponentTesting.newFileDto; import static org.sonar.server.component.ComponentTesting.newProjectDto; -import static org.sonar.server.test.ws.TestsCoveredFilesAction.TEST_UUID; +import static org.sonar.server.test.ws.CoveredFilesAction.TEST_UUID; -public class TestsCoveredFilesActionTest { +public class CoveredFilesActionTest { @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @@ -54,7 +54,7 @@ public class TestsCoveredFilesActionTest { public void setUp() { dbClient = mock(DbClient.class, RETURNS_DEEP_STUBS); testIndex = mock(TestIndex.class, RETURNS_DEEP_STUBS); - ws = new WsTester(new TestsWs(new TestsCoveredFilesAction(dbClient, testIndex, userSessionRule))); + ws = new WsTester(new TestsWs(new CoveredFilesAction(dbClient, testIndex, userSessionRule))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsListActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java similarity index 91% rename from server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsListActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java index 3de460c906d..753687d911e 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsListActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/ListActionTest.java @@ -47,7 +47,7 @@ import java.util.Arrays; import java.util.List; @Category(DbTests.class) -public class TestsListActionTest { +public class ListActionTest { DbClient dbClient; DbSession dbSession; TestIndex testIndex; @@ -69,7 +69,7 @@ public class TestsListActionTest { es.truncateIndices(); testIndex = new TestIndex(es.client()); - ws = new WsTester(new TestsWs(new TestsListAction(dbClient, testIndex, userSessionRule))); + ws = new WsTester(new TestsWs(new ListAction(dbClient, testIndex, userSessionRule))); } @After @@ -96,7 +96,7 @@ public class TestsListActionTest { .setStackTrace(TestFile1.STACKTRACE) ); - WsTester.TestRequest request = ws.newGetRequest("api/tests", "list").setParam(TestsListAction.TEST_UUID, TestFile1.UUID); + WsTester.TestRequest request = ws.newGetRequest("api/tests", "list").setParam(ListAction.TEST_UUID, TestFile1.UUID); request.execute().assertJson(getClass(), "list-test-uuid.json"); } @@ -118,7 +118,7 @@ public class TestsListActionTest { .setMessage(TestFile1.MESSAGE) .setStackTrace(TestFile1.STACKTRACE)); - WsTester.TestRequest request = ws.newGetRequest("api/tests", "list").setParam(TestsListAction.TEST_FILE_UUID, TestFile1.FILE_UUID); + WsTester.TestRequest request = ws.newGetRequest("api/tests", "list").setParam(ListAction.TEST_FILE_UUID, TestFile1.FILE_UUID); request.execute().assertJson(getClass(), "list-test-uuid.json"); } @@ -141,7 +141,7 @@ public class TestsListActionTest { .setStackTrace(TestFile1.STACKTRACE) ); - WsTester.TestRequest request = ws.newGetRequest("api/tests", "list").setParam(TestsListAction.TEST_FILE_KEY, TestFile1.KEY); + WsTester.TestRequest request = ws.newGetRequest("api/tests", "list").setParam(ListAction.TEST_FILE_KEY, TestFile1.KEY); request.execute().assertJson(getClass(), "list-test-uuid.json"); } @@ -189,8 +189,8 @@ public class TestsListActionTest { .setStackTrace(TestFile2.STACKTRACE)); WsTester.TestRequest request = ws.newGetRequest("api/tests", "list") - .setParam(TestsListAction.SOURCE_FILE_UUID, mainFileUuid) - .setParam(TestsListAction.SOURCE_FILE_LINE_NUMBER, "10"); + .setParam(ListAction.SOURCE_FILE_UUID, mainFileUuid) + .setParam(ListAction.SOURCE_FILE_LINE_NUMBER, "10"); request.execute().assertJson(getClass(), "list-main-file.json"); } @@ -202,7 +202,7 @@ public class TestsListActionTest { @Test(expected = IllegalArgumentException.class) public void fail_when_main_file_uuid_without_line_number() throws Exception { - ws.newGetRequest("api/tests", "list").setParam(TestsListAction.SOURCE_FILE_UUID, "ANY-UUID").execute(); + ws.newGetRequest("api/tests", "list").setParam(ListAction.SOURCE_FILE_UUID, "ANY-UUID").execute(); } @Test(expected = ForbiddenException.class) @@ -210,7 +210,7 @@ public class TestsListActionTest { userSessionRule.addProjectUuidPermissions(UserRole.USER, TestFile1.PROJECT_UUID); dbClient.componentDao().insert(dbSession, TestFile1.newDto()); dbSession.commit(); - ws.newGetRequest("api/tests", "list").setParam(TestsListAction.TEST_FILE_UUID, TestFile1.FILE_UUID).execute(); + ws.newGetRequest("api/tests", "list").setParam(ListAction.TEST_FILE_UUID, TestFile1.FILE_UUID).execute(); } @Test(expected = ForbiddenException.class) @@ -218,7 +218,7 @@ public class TestsListActionTest { userSessionRule.addProjectUuidPermissions(UserRole.USER, TestFile1.PROJECT_UUID); dbClient.componentDao().insert(dbSession, TestFile1.newDto()); dbSession.commit(); - ws.newGetRequest("api/tests", "list").setParam(TestsListAction.TEST_FILE_UUID, TestFile1.FILE_UUID).execute(); + ws.newGetRequest("api/tests", "list").setParam(ListAction.TEST_FILE_UUID, TestFile1.FILE_UUID).execute(); } @Test(expected = ForbiddenException.class) @@ -226,7 +226,7 @@ public class TestsListActionTest { userSessionRule.addProjectUuidPermissions(UserRole.USER, TestFile1.PROJECT_UUID); dbClient.componentDao().insert(dbSession, TestFile1.newDto()); dbSession.commit(); - ws.newGetRequest("api/tests", "list").setParam(TestsListAction.TEST_FILE_KEY, TestFile1.KEY).execute(); + ws.newGetRequest("api/tests", "list").setParam(ListAction.TEST_FILE_KEY, TestFile1.KEY).execute(); } @Test(expected = ForbiddenException.class) @@ -237,8 +237,8 @@ public class TestsListActionTest { dbSession.commit(); ws.newGetRequest("api/tests", "list") - .setParam(TestsListAction.SOURCE_FILE_UUID, mainFileUuid) - .setParam(TestsListAction.SOURCE_FILE_LINE_NUMBER, "10") + .setParam(ListAction.SOURCE_FILE_UUID, mainFileUuid) + .setParam(ListAction.SOURCE_FILE_LINE_NUMBER, "10") .execute(); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java index c052d9c03bd..545c92fb4f7 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/test/ws/TestsWsTest.java @@ -41,8 +41,8 @@ public class TestsWsTest { @Before public void setUp() { WsTester tester = new WsTester(new TestsWs( - new TestsListAction(mock(DbClient.class), mock(TestIndex.class), userSessionRule), - new TestsCoveredFilesAction(mock(DbClient.class), mock(TestIndex.class), userSessionRule))); + new ListAction(mock(DbClient.class), mock(TestIndex.class), userSessionRule), + new CoveredFilesAction(mock(DbClient.class), mock(TestIndex.class), userSessionRule))); controller = tester.controller("api/tests"); } diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentUserActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentUserActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java index 3ee91682a3f..7eba15eba16 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentUserActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/CurrentActionTest.java @@ -26,7 +26,7 @@ import org.sonar.core.permission.GlobalPermissions; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.WsTester; -public class CurrentUserActionTest { +public class CurrentActionTest { @Rule public UserSessionRule userSessionRule = UserSessionRule.standalone(); @@ -34,7 +34,7 @@ public class CurrentUserActionTest { @Before public void before() { - tester = new WsTester(new UsersWs(new CurrentUserAction(userSessionRule))); + tester = new WsTester(new UsersWs(new CurrentAction(userSessionRule))); } @Test diff --git a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java index bb5fd484cc5..ccbb54a3830 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/user/ws/UsersWsTest.java @@ -43,7 +43,7 @@ public class UsersWsTest { WsTester tester = new WsTester(new UsersWs( new CreateAction(mock(UserIndex.class), mock(UserUpdater.class), mock(I18n.class), userSessionRule), new UpdateAction(mock(UserIndex.class), mock(UserUpdater.class), userSessionRule), - new CurrentUserAction(userSessionRule), + new CurrentAction(userSessionRule), new DeactivateAction(mock(UserIndex.class), mock(UserUpdater.class), userSessionRule), new ChangePasswordAction(mock(UserUpdater.class), userSessionRule), new SearchAction(mock(UserIndex.class)))); diff --git a/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalRepositoryActionTest/return_global_referentials.json b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_global_referentials.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalRepositoryActionTest/return_global_referentials.json rename to server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_global_referentials.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalRepositoryActionTest/return_global_settings.json b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_global_settings.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalRepositoryActionTest/return_global_settings.json rename to server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_global_settings.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalRepositoryActionTest/return_only_license_settings_without_scan_but_with_preview_permission.json b/server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_only_license_settings_without_scan_but_with_preview_permission.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalRepositoryActionTest/return_only_license_settings_without_scan_but_with_preview_permission.json rename to server/sonar-server/src/test/resources/org/sonar/server/batch/GlobalActionTest/return_only_license_settings_without_scan_but_with_preview_permission.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectRepositoryActionTest/project_referentials.json b/server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectRepositoryActionTest/project_referentials.json rename to server/sonar-server/src/test/resources/org/sonar/server/batch/ProjectActionTest/project_referentials.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_it_measure.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_it_measure.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_it_measure.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_it_measure.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_measures.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_measures.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_measures.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_overall_measure.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_overall_measure.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_overall_measure.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_overall_measure.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_ut_measure.json b/server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_ut_measure.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/ws/ComponentAppActionTest/app_with_ut_measure.json rename to server/sonar-server/src/test/resources/org/sonar/server/component/ws/AppActionTest/app_with_ut_measure.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/ws/HistoryWsActionMediumTest/list_history_reports.json b/server/sonar-server/src/test/resources/org/sonar/server/computation/ws/HistoryActionMediumTest/list_history_reports.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/ws/HistoryWsActionMediumTest/list_history_reports.json rename to server/sonar-server/src/test/resources/org/sonar/server/computation/ws/HistoryActionMediumTest/list_history_reports.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/ws/QueueWsActionTest/list_queue_reports.json b/server/sonar-server/src/test/resources/org/sonar/server/computation/ws/QueueActionTest/list_queue_reports.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/computation/ws/QueueWsActionTest/list_queue_reports.json rename to server/sonar-server/src/test/resources/org/sonar/server/computation/ws/QueueActionTest/list_queue_reports.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_component.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_on_removed_component.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_on_removed_component.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_on_removed_component.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_action_plan.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_action_plan.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_action_plan.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_action_plan.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_actions.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_actions.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_actions.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_actions.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_changelog.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_changelog.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_changelog.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_changelog.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_characteristics.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_characteristics.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_characteristics.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_characteristics.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_comments.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_comments.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_comments.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_comments.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_dates.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_dates.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_dates.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_dates.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_sub_project.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_sub_project.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_sub_project.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_technical_debt.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_technical_debt.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_technical_debt.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_transitions.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_transitions.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_transitions.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_transitions.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_users.json b/server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_users.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/issue/ws/IssueShowActionTest/show_issue_with_users.json rename to server/sonar-server/src/test/resources/org/sonar/server/issue/ws/ShowActionTest/show_issue_with_users.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest/properties_per_plugin.json b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailablePluginsWsActionTest/properties_per_plugin.json rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/AvailableActionTest/properties_per_plugin.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest/some.jar b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledPluginsWsActionTest/some.jar rename to server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/InstalledActionTest/some.jar diff --git a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/UpdatablePluginsWsActionTest/properties_per_plugin.json b/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/UpdatablePluginsWsActionTest/properties_per_plugin.json deleted file mode 100644 index 055feb3713b..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/plugins/ws/UpdatablePluginsWsActionTest/properties_per_plugin.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "plugins": [ - { - "key": "p_key", - "name": "p_name", - "category": "p_category", - "description": "p_description", - "license": "p_license", - "organizationName": "p_orga_name", - "organizationUrl": "p_orga_url", - "termsAndConditionsUrl": "p_t_and_c_url", - "release": { - "version": "1.12.1", - "date": "2015-04-16", - "artifact": { - "name": "p_file.jar", - "url": "http://p_file.jar" - } - }, - "update": { - "status": "COMPATIBLE", - "requires": [ - { - "key": "p_key_1", - "name": "p_name_1" - }, - { - "key": "p_key_2", - "name": "p_name_2", - "description": "p_desc_2" - } - ] - } - } - ] -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ProjectsGhostsActionTest/all-projects.json b/server/sonar-server/src/test/resources/org/sonar/server/project/ws/GhostsActionTest/all-projects.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/ws/ProjectsGhostsActionTest/all-projects.json rename to server/sonar-server/src/test/resources/org/sonar/server/project/ws/GhostsActionTest/all-projects.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ProjectsGhostsActionTest/pagination.json b/server/sonar-server/src/test/resources/org/sonar/server/project/ws/GhostsActionTest/pagination.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/ws/ProjectsGhostsActionTest/pagination.json rename to server/sonar-server/src/test/resources/org/sonar/server/project/ws/GhostsActionTest/pagination.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/ws/ProjectsProvisionedActionTest/all-projects.json b/server/sonar-server/src/test/resources/org/sonar/server/project/ws/ProvisionedActionTest/all-projects.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/component/ws/ProjectsProvisionedActionTest/all-projects.json rename to server/sonar-server/src/test/resources/org/sonar/server/project/ws/ProvisionedActionTest/all-projects.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_empty.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_empty.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_empty.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_empty.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_no_login.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_no_login.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_no_login.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_no_login.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_no_param.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_no_param.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_no_param.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_no_param.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_nominal.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_nominal.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_nominal.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_nominal.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_page1.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_page1.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_page1.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_page1.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_page2.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_page2.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_page2.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_page2.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_page3.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_page3.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileChangelogActionTest/changelog_page3.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ChangelogActionTest/changelog_page3.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest/compare_nominal.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_nominal.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest/compare_nominal.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_nominal.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest/compare_param_on_left.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_left.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest/compare_param_on_left.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_left.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest/compare_param_on_right.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_right.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCompareActionMediumTest/compare_param_on_right.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CompareActionMediumTest/compare_param_on_right.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest/copy_nominal.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CopyActionTest/copy_nominal.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest/copy_nominal.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CopyActionTest/copy_nominal.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest/copy_with_parent.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CopyActionTest/copy_with_parent.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCopyActionTest/copy_with_parent.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CopyActionTest/copy_with_parent.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest/create-nominal.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-nominal.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest/create-nominal.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-nominal.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest/create-with-messages.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCreateActionMediumTest/create-with-messages.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionMediumTest/create-with-messages.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest/create-no-importer.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/create-no-importer.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileCreateActionTest/create-no-importer.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/CreateActionTest/create-no-importer.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileExportersActionTest/exporters.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ExportersActionTest/exporters.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileExportersActionTest/exporters.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ExportersActionTest/exporters.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileImportersActionTest/importers.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ImportersActionTest/importers.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileImportersActionTest/importers.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ImportersActionTest/importers.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileInheritanceActionMediumTest/inheritance-buWide.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest/inheritance-buWide.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileInheritanceActionMediumTest/inheritance-buWide.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest/inheritance-buWide.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileInheritanceActionMediumTest/inheritance-simple.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest/inheritance-simple.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileInheritanceActionMediumTest/inheritance-simple.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/InheritanceActionMediumTest/inheritance-simple.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all_filtered.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all_filtered.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/all_filtered.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/all_filtered.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/authorized_selected.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/authorized_selected.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/authorized_selected.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/authorized_selected.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/deselected.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/deselected.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/deselected.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/deselected.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/empty.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/empty.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/empty.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/empty.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page1.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page1.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page1.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page1.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page2.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page2.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_page2.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_page2.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page1.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page1.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page1.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page1.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page2.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page2.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileProjectsActionTest/selected_ps3_page2.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/ProjectsActionTest/selected_ps3_page2.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest/restore_profile.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileRestoreActionTest/restore_profile.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/RestoreActionTest/restore_profile.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest/search.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/SearchActionTest/search.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest/search.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/SearchActionTest/search.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest/search_fields.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/SearchActionTest/search_fields.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest/search_fields.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/SearchActionTest/search_fields.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest/search_xoo1.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/SearchActionTest/search_xoo1.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/QProfileSearchActionTest/search_xoo1.json rename to server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/ws/SearchActionTest/search_xoo1.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsCoveredFilesActionTest/tests-covered-files.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoveredFilesActionTest/tests-covered-files.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsCoveredFilesActionTest/tests-covered-files.json rename to server/sonar-server/src/test/resources/org/sonar/server/test/ws/CoveredFilesActionTest/tests-covered-files.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsListActionTest/list-main-file.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-main-file.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsListActionTest/list-main-file.json rename to server/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-main-file.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsListActionTest/list-test-uuid.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-test-uuid.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsListActionTest/list-test-uuid.json rename to server/sonar-server/src/test/resources/org/sonar/server/test/ws/ListActionTest/list-test-uuid.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show.json deleted file mode 100644 index f8832a0f01f..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show.json +++ /dev/null @@ -1,18 +0,0 @@ -{ -"tests": [ - { - "name": "test1", - "status": "OK", - "durationInMs": 10, - "coveredLines": 32 - }, - { - "name": "test2", - "status": "ERROR", - "durationInMs": 97, - "coveredLines": 21, - "message": "expected: but was:", - "stackTrace" : "java.lang.AssertionError: expected: but was:\n\tat org.junit.Assert.fail(Assert.java:91)\n\tat org.junit.Assert.failNotEquals(Assert.java:645)\n\tat org.junit.Assert.assertEquals(Assert.java:126)\n\tat org.junit.Assert.assertEquals(Assert.java:145)\n" - } - ] -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json deleted file mode 100644 index 97a9239999b..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "tests": [ - { - "name": "test1", - "status": "OK", - "durationInMs": 10 - }, - { - "name": "test2", - "status": "ERROR", - "durationInMs": 97, - "message": "expected: but was:", - "stackTrace": "java.lang.AssertionError: expected: but was:\n\tat org.junit.Assert.fail(Assert.java:91)\n\tat org.junit.Assert.failNotEquals(Assert.java:645)\n\tat org.junit.Assert.assertEquals(Assert.java:126)\n\tat org.junit.Assert.assertEquals(Assert.java:145)\n" - } - ] -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data_with_a_time_in_float.json b/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data_with_a_time_in_float.json deleted file mode 100644 index 3f45bdbbe10..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/test/ws/TestsShowActionTest/show_from_test_data_with_a_time_in_float.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "tests": [ - { - "name": "test1", - "status": "OK", - "durationInMs": 12 - } - ] -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CurrentUserActionTest/anonymous.json b/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CurrentActionTest/anonymous.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/ws/CurrentUserActionTest/anonymous.json rename to server/sonar-server/src/test/resources/org/sonar/server/user/ws/CurrentActionTest/anonymous.json diff --git a/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CurrentUserActionTest/authenticated.json b/server/sonar-server/src/test/resources/org/sonar/server/user/ws/CurrentActionTest/authenticated.json similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/user/ws/CurrentUserActionTest/authenticated.json rename to server/sonar-server/src/test/resources/org/sonar/server/user/ws/CurrentActionTest/authenticated.json -- 2.39.5