From 5334895ce0eacaa2a2787cd6c47ac507dbe0d723 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Tue, 13 Aug 2019 17:17:51 +0200 Subject: [PATCH] remove dependency from sonar-webserver-webapi to sonar-server --- .../component/ComponentTreeBuilderTest.java | 2 - .../org/sonar/server/metric/MetricToDto.java | 0 .../sonar/server/telemetry/TelemetryData.java | 0 .../telemetry/TelemetryDataJsonWriter.java | 0 .../server/telemetry/TelemetryDataLoader.java | 0 server/sonar-server/build.gradle | 10 ----- .../platform}/AbstractSystemInfoWriter.java | 2 +- .../server/platform/PersistentSettings.java | 1 + .../platform/PersistentSettingsTest.java | 1 + .../test/projects/test-core-plugin/pom.xml | 36 ----------------- .../target/test-core-plugin-0.1-SNAPSHOT.jar | Bin 2452 -> 0 bytes .../active_rule25.json | 6 --- .../active_rule391.json | 7 ---- .../rule_A.json | 13 ------ .../rule_C.json | 13 ------ .../rule_b.json | 13 ------ .../active_rule_ace.json | 6 --- .../active_rule_empty.json | 6 --- .../find_inactive_rules_with_tags/tags_a.json | 14 ------- .../tags_ab.json | 15 ------- .../tags_ace.json | 15 ------- .../tags_bc.json | 14 ------- .../tags_empty.json | 13 ------ .../shared/active_rule25.json | 6 --- .../shared/active_rule2702.json | 16 -------- .../shared/active_rule391.json | 7 ---- .../shared/active_rule523.json | 6 --- .../shared/rule1482.json | 27 ------------- .../QProfileRuleLookupTest/shared/rule25.json | 13 ------ .../shared/rule719.json | 14 ------- .../shared/rule759.json | 13 ------ .../shared/rule860.json | 14 ------- .../shared/rule944.json | 14 ------- server/sonar-webserver-common/build.gradle | 9 +++++ .../server/app/ProcessCommandWrapper.java | 0 .../server/app/ProcessCommandWrapperImpl.java | 0 .../sonar/server/app/RestartFlagHolder.java | 0 .../server/app/RestartFlagHolderImpl.java | 0 .../org/sonar/server/app}/package-info.java | 2 +- .../sonar/server/branch/BranchFeature.java | 0 .../server/branch/BranchFeatureExtension.java | 0 .../server/branch/BranchFeatureProxy.java | 0 .../server/branch/BranchFeatureProxyImpl.java | 0 .../org/sonar/server/branch/package-info.java | 0 .../sonar/server/health/ClusterHealth.java | 0 .../java/org/sonar/server/health/Health.java | 0 .../sonar/server/health/HealthChecker.java | 0 .../org/sonar/server/health/package-info.java | 0 .../server/platform}/SystemInfoWriter.java | 2 +- .../sonar/server/platform}/package-info.java | 2 +- .../sonar/server/plugins/InstalledPlugin.java | 0 .../server/plugins/PluginDownloader.java | 0 .../server/plugins/PluginFileSystem.java | 0 .../server/plugins/PluginUninstaller.java | 0 .../plugins/ServerPluginJarExploder.java | 0 .../plugins/ServerPluginRepository.java | 0 .../server/plugins/UpdateCenterClient.java | 0 .../plugins/UpdateCenterMatrixFactory.java | 0 .../plugins/WebServerExtensionInstaller.java | 0 .../edition/EditionBundledPlugins.java | 0 .../server/plugins/edition/package-info.java | 0 .../sonar/server/plugins/package-info.java | 1 - .../project/ProjectLifeCycleListener.java | 0 .../project/ProjectLifeCycleListeners.java | 0 .../ProjectLifeCycleListenersImpl.java | 0 .../sonar/server/project/RekeyedProject.java | 0 .../org/sonar/server/project/Visibility.java | 0 .../sonar/server/project/package-info.java | 0 .../server/qualitygate/ProjectsInWarning.java | 0 .../changeevent/QGChangeEvent.java | 0 .../changeevent/QGChangeEventListener.java | 0 .../changeevent/QGChangeEventListeners.java | 0 .../QGChangeEventListenersImpl.java | 0 .../qualitygate/changeevent/Trigger.java | 0 .../qualitygate/changeevent/package-info.java | 0 .../setting}/ProjectConfigurationLoader.java | 2 +- .../ProjectConfigurationLoaderImpl.java | 3 +- .../setting}/SettingsChangeNotifier.java | 2 +- .../sonar/server/setting}/package-info.java | 2 +- .../app/ProcessCommandWrapperImplTest.java | 0 .../branch/BranchFeatureProxyImplTest.java | 0 .../server/branch/BranchFeatureRule.java | 0 .../health/TestStandaloneHealthChecker.java | 0 .../server/plugins/PluginDownloaderTest.java | 0 .../server/plugins/PluginFileSystemTest.java | 0 .../server/plugins/PluginUninstallerTest.java | 0 .../plugins/ServerPluginJarExploderTest.java | 0 .../plugins/ServerPluginRepositoryTest.java | 0 .../org/sonar/server/plugins/TestPluginA.java | 0 .../server/plugins/TestProjectUtils.java | 0 .../plugins/UpdateCenterClientTest.java | 0 .../UpdateCenterMatrixFactoryTest.java | 0 .../server/plugins/UpdateCenterServlet.java | 0 .../edition/EditionBundledPluginsTest.java | 0 .../ProjectLifeCycleListenersImplTest.java | 0 .../server/project/RekeyedProjectTest.java | 0 .../QGChangeEventListenersImplTest.java | 0 .../changeevent/QGChangeEventTest.java | 0 .../ProjectConfigurationLoaderImplTest.java | 2 +- .../setting}/SettingsChangeNotifierTest.java | 2 +- .../TestProjectConfigurationLoader.java | 2 +- .../src/test/projects/.gitignore | 0 .../src/test/projects/README.txt | 0 .../test/projects/fake-report-plugin/pom.xml | 0 .../fake-report-plugin/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../fake-report-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/fake-sqale-plugin/pom.xml | 0 .../fake-sqale-plugin/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../target/fake-sqale-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/fake-views-plugin/pom.xml | 0 .../fake-views-plugin/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../target/fake-views-plugin-0.1-SNAPSHOT.jar | Bin .../src/test/projects/pom.xml | 0 .../test/projects/test-base-plugin-v2/pom.xml | 0 .../test-base-plugin-v2/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../target/test-base-plugin-0.2-SNAPSHOT.jar | Bin .../test/projects/test-base-plugin/pom.xml | 0 .../test-base-plugin/src/BasePlugin.java | 0 .../sonar/plugins/testbase/api/BaseApi.java | 0 .../target/test-base-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/test-extend-plugin/pom.xml | 0 .../test-extend-plugin/src/ExtendPlugin.java | 0 .../test-extend-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/test-libs-plugin/pom.xml | 0 .../test-libs-plugin/src/LibsPlugin.java | 0 .../target/test-libs-plugin-0.1-SNAPSHOT.jar | Bin .../test/projects/test-require-plugin/pom.xml | 0 .../src/RequirePlugin.java | 0 .../test-require-plugin-0.1-SNAPSHOT.jar | Bin .../projects/test-requirenew-plugin/pom.xml | 0 .../src/RequirePlugin.java | 0 .../test-requirenew-plugin-0.1-SNAPSHOT.jar | Bin .../src/test/resources/logback-test.xml | 26 ++++++++++++ server/sonar-webserver-webapi/build.gradle | 6 +++ .../java/org/sonar/server/ce/CeModule.java | 6 +-- .../sonar/server/ce/http/CeHttpClient.java | 0 .../server/ce/http/CeHttpClientImpl.java | 0 .../sonar/server/ce/http/package-info.java | 0 .../org/sonar/server/ce/package-info.java | 0 .../sonar/server/ce/queue/BranchSupport.java | 0 .../ce/queue/BranchSupportDelegate.java | 0 .../sonar/server/ce/queue/CeQueueCleaner.java | 0 .../server/ce/queue/ReportSubmitter.java | 0 .../sonar/server/ce/queue/package-info.java | 0 .../component/ComponentCleanerService.java | 0 .../server/component/ComponentFinder.java | 0 .../server/component/ComponentService.java | 0 .../server/component/ComponentUpdater.java | 0 .../sonar/server/component/NewComponent.java | 0 .../sonar/server/component/package-info.java | 0 .../server/component/ws/SearchAction.java | 4 +- .../component/ws/SearchProjectsAction.java | 5 +-- .../sonar/server/favorite/FavoriteFinder.java | 0 .../sonar/server/favorite/FavoriteModule.java | 0 .../sonar/server/favorite/package-info.java | 0 .../server/health/AppNodeClusterCheck.java | 0 .../server/health/CeStatusNodeCheck.java | 0 .../server/health/ClusterHealthCheck.java | 0 .../server/health/ClusterHealthSubCheck.java | 0 .../server/health/DbConnectionNodeCheck.java | 0 .../sonar/server/health/EsStatusCheck.java | 0 .../server/health/EsStatusClusterCheck.java | 0 .../server/health/EsStatusNodeCheck.java | 0 .../server/health/HealthCheckerImpl.java | 0 .../sonar/server/health/HealthReducer.java | 0 ...althStateRefresherExecutorServiceImpl.java | 0 .../sonar/server/health/NodeHealthCheck.java | 0 .../sonar/server/health/NodeHealthModule.java | 0 .../server/health/NodeHealthProviderImpl.java | 0 .../health/WebServerSafemodeNodeCheck.java | 0 .../health/WebServerStatusNodeCheck.java | 0 .../org/sonar/server/health/package-info.java | 23 +++++++++++ .../issue/AbstractChangeTagsAction.java | 0 .../java/org/sonar/server/issue/Action.java | 0 .../org/sonar/server/issue/ActionContext.java | 0 .../org/sonar/server/issue/AddTagsAction.java | 0 .../org/sonar/server/issue/AssignAction.java | 0 .../org/sonar/server/issue/CommentAction.java | 0 .../issue/IssueChangePostProcessor.java | 0 .../issue/IssueChangePostProcessorImpl.java | 0 .../org/sonar/server/issue/IssueFinder.java | 0 .../sonar/server/issue/IssuesFinderSort.java | 0 .../sonar/server/issue/RemoveTagsAction.java | 0 .../java/org/sonar/server/issue/Result.java | 0 .../sonar/server/issue/SetSeverityAction.java | 0 .../org/sonar/server/issue/SetTypeAction.java | 0 .../sonar/server/issue/TransitionAction.java | 0 .../sonar/server/issue/TransitionService.java | 0 .../sonar/server/issue/WebIssueStorage.java | 0 .../org/sonar/server/issue/package-info.java | 0 .../sonar/server/issue/ws/IssueWsModule.java | 8 +--- .../server/language}/LanguageParamUtils.java | 2 +- .../sonar/server/language/package-info.java | 23 +++++++++++ .../server/measure/live/IssueCounter.java | 0 .../measure/live/IssueMetricFormula.java | 0 .../live/IssueMetricFormulaFactory.java | 0 .../live/IssueMetricFormulaFactoryImpl.java | 0 .../measure/live/LiveMeasureComputer.java | 0 .../measure/live/LiveMeasureComputerImpl.java | 2 +- .../measure/live/LiveMeasureModule.java | 0 .../measure/live/LiveQualityGateComputer.java | 0 .../live/LiveQualityGateComputerImpl.java | 0 .../server/measure/live/MeasureMatrix.java | 0 .../server/measure/live/package-info.java | 0 .../ApplyPermissionTemplateQuery.java | 0 .../permission/DefaultTemplatesResolver.java | 0 .../DefaultTemplatesResolverImpl.java | 0 .../permission/GroupPermissionChange.java | 0 .../permission/GroupPermissionChanger.java | 0 .../server/permission/PermissionChange.java | 0 .../permission/PermissionTemplateService.java | 0 .../server/permission/PermissionUpdater.java | 0 .../permission/UserPermissionChange.java | 0 .../permission/UserPermissionChanger.java | 0 .../sonar/server/platform/ws/InfoAction.java | 1 + .../QualityGateConditionsUpdater.java | 0 .../qualitygate/QualityGateConverter.java | 0 .../server/qualitygate/QualityGateModule.java | 4 +- .../qualitygate/QualityGateUpdater.java | 0 .../qualitygate/RegisterQualityGates.java | 0 .../qualitygate/ValidRatingMetrics.java | 0 .../server/qualitygate/package-info.java | 0 .../qualityprofile/BulkChangeResult.java | 0 .../qualityprofile/QProfileBackuper.java | 0 .../qualityprofile/QProfileBackuperImpl.java | 0 .../qualityprofile/QProfileComparison.java | 0 .../server/qualityprofile/QProfileCopier.java | 0 .../qualityprofile/QProfileExporters.java | 0 .../qualityprofile/QProfileFactory.java | 0 .../qualityprofile/QProfileFactoryImpl.java | 0 .../server/qualityprofile/QProfileReset.java | 0 .../qualityprofile/QProfileResetImpl.java | 0 .../QProfileRestoreSummary.java | 0 .../server/qualityprofile/QProfileResult.java | 0 .../server/qualityprofile/QProfileRules.java | 0 .../qualityprofile/QProfileRulesImpl.java | 0 .../server/qualityprofile/QProfileTree.java | 0 .../qualityprofile/QProfileTreeImpl.java | 0 .../RegisterQualityProfiles.java | 0 .../server/qualityprofile/package-info.java | 0 .../qualityprofile/ws/CreateAction.java | 7 ++-- .../qualityprofile/ws/ExportAction.java | 6 +-- .../qualityprofile/ws/SearchAction.java | 2 +- .../org/sonar/server/rule/NewCustomRule.java | 0 .../server/rule/ReactivationException.java | 0 .../org/sonar/server/rule/RuleCreator.java | 0 .../org/sonar/server/rule/RuleTagHelper.java | 0 .../org/sonar/server/rule/RuleUpdate.java | 0 .../org/sonar/server/rule/RuleUpdater.java | 0 .../org/sonar/server/rule/package-info.java | 22 ++++++++++ .../org/sonar/server/rule/ws}/EnumUtils.java | 2 +- .../server/rule/ws/RuleQueryFactory.java | 2 +- .../sonar/server/setting/ws/SetAction.java | 4 +- .../sonar/server/source/CharactersReader.java | 0 .../server/source/DecorationDataHolder.java | 0 .../server/source/HtmlSourceDecorator.java | 0 .../server/source/HtmlTextDecorator.java | 0 .../sonar/server/source/OpeningHtmlTag.java | 0 .../sonar/server/source/SourceService.java | 0 .../org/sonar/server/source/package-info.java | 0 .../java/org/sonar/server/text/Macro.java | 0 .../sonar/server/text/MacroInterpreter.java | 0 .../java/org/sonar/server/text/RuleMacro.java | 0 .../org/sonar/server/ui/DeprecatedViews.java | 0 .../org/sonar/server/ui/PageDecorations.java | 0 .../org/sonar/server/ui/PageRepository.java | 5 ++- .../org/sonar/server/ui/VersionFormatter.java | 0 .../sonar/server/ui/WebAnalyticsLoader.java | 0 .../server/ui/WebAnalyticsLoaderImpl.java | 0 .../org/sonar/server/ui/package-info.java | 0 .../server/ui/page/CorePageDefinition.java | 0 .../sonar/server/ui/page/package-info.java | 0 .../org/sonar/server/ce/CeModuleTest.java | 38 ++++++++++++++++++ .../server/ce/http/CeHttpClientTest.java | 0 .../ce/queue/BranchReportSubmitterTest.java | 0 .../server/ce/queue/BranchSupportTest.java | 0 .../server/ce/queue/CeQueueCleanerTest.java | 0 .../server/ce/queue/ReportSubmitterTest.java | 0 .../ComponentCleanerServiceTest.java | 0 .../server/component/ComponentFinderTest.java | 0 .../component/ComponentServiceTest.java | 0 .../ComponentServiceUpdateKeyTest.java | 0 .../component/ComponentUpdaterTest.java | 0 .../server/component/NewComponentTest.java | 0 .../server/component/TestComponentFinder.java | 0 .../server/favorite/FavoriteModuleTest.java | 0 .../health/AppNodeClusterCheckTest.java | 0 .../server/health/CeStatusNodeCheckTest.java | 0 .../server/health/ClusterHealthTest.java | 0 .../health/DbConnectionNodeCheckTest.java | 0 .../health/EsStatusClusterCheckTest.java | 0 .../server/health/EsStatusNodeCheckTest.java | 0 .../org/sonar/server/health/HealthAssert.java | 0 .../server/health/HealthCheckerImplTest.java | 0 .../org/sonar/server/health/HealthTest.java | 0 .../server/health/NodeHealthModuleTest.java | 0 .../health/NodeHealthProviderImplTest.java | 0 .../WebServerSafemodeNodeCheckTest.java | 0 .../health/WebServerStatusNodeCheckTest.java | 0 .../org/sonar/server/issue/ActionTest.java | 0 .../sonar/server/issue/AddTagsActionTest.java | 0 .../sonar/server/issue/AssignActionTest.java | 0 .../sonar/server/issue/CommentActionTest.java | 0 .../sonar/server/issue/IssueFinderTest.java | 0 .../server/issue/IssuesFinderSortTest.java | 0 .../server/issue/RemoveTagsActionTest.java | 0 .../org/sonar/server/issue/ResultTest.java | 0 .../sonar/server/issue/RulesAggregation.java | 0 .../server/issue/RulesAggregationTest.java | 0 .../server/issue/SetSeverityActionTest.java | 0 .../sonar/server/issue/SetTypeActionTest.java | 0 .../issue/TestIssueChangePostProcessor.java | 0 .../server/issue/TransitionActionTest.java | 0 .../server/issue/TransitionServiceTest.java | 0 .../server/issue/WebIssueStorageTest.java | 0 .../server/issue/ws/IssueWsModuleTest.java | 2 +- .../language}/LanguageParamUtilsTest.java | 2 +- .../IssueMetricFormulaFactoryImplTest.java | 0 .../live/LiveMeasureComputerImplTest.java | 4 +- .../measure/live/LiveMeasureModuleTest.java | 0 .../live/LiveQualityGateComputerImplTest.java | 0 .../measure/live/MeasureMatrixTest.java | 0 .../live/TestIssueMetricFormulaFactory.java | 0 .../ApplyPermissionTemplateQueryTest.java | 4 +- .../DefaultTemplatesResolverImplTest.java | 0 .../DefaultTemplatesResolverRule.java | 0 .../GroupPermissionChangerTest.java | 0 .../PermissionTemplateServiceTest.java | 0 .../permission/UserPermissionChangerTest.java | 0 .../server/platform/ws/InfoActionTest.java | 3 +- .../server/platform/ws/SystemWsTest.java | 3 +- .../QualityGateConditionsUpdaterTest.java | 0 .../qualitygate/QualityGateConverterTest.java | 0 .../qualitygate/QualityGateModuleTest.java | 2 +- .../qualitygate/QualityGateUpdaterTest.java | 4 +- .../qualitygate/RegisterQualityGatesTest.java | 0 .../QProfileBackuperImplTest.java | 2 +- .../QProfileComparisonTest.java | 0 .../qualityprofile/QProfileCopierTest.java | 0 .../qualityprofile/QProfileExportersTest.java | 0 .../QProfileFactoryImplTest.java | 0 .../qualityprofile/QProfileResetImplTest.java | 0 .../qualityprofile/QProfileRuleImplTest.java | 0 .../qualityprofile/QProfileRulesImplTest.java | 0 .../qualityprofile/QProfileTesting.java | 0 .../qualityprofile/QProfileTreeImplTest.java | 0 ...gisterQualityProfilesNotificationTest.java | 0 .../RegisterQualityProfilesTest.java | 0 .../sonar/server/rule/RuleCreatorTest.java | 0 .../sonar/server/rule/RuleTagHelperTest.java | 0 .../sonar/server/rule/RuleUpdaterTest.java | 0 .../server/setting/ws/SetActionTest.java | 6 +-- .../source/DecorationDataHolderTest.java | 0 .../source/HtmlSourceDecoratorTest.java | 0 .../server/source/HtmlTextDecoratorTest.java | 0 .../server/source/OpeningHtmlTagTest.java | 0 .../server/source/SourceServiceTest.java | 0 .../server/text/MacroInterpreterTest.java | 0 .../sonar/server/ui/DeprecatedViewsTest.java | 0 .../sonar/server/ui/PageDecorationsTest.java | 0 .../sonar/server/ui/PageRepositoryTest.java | 0 .../sonar/server/ui/VersionFormatterTest.java | 0 .../server/ui/WebAnalyticsLoaderImplTest.java | 0 .../server/user/ws/SetHomepageActionTest.java | 2 +- .../duplicates-xml-backup.xml | 0 server/sonar-webserver/build.gradle | 12 +++++- .../platform}/ClusterSystemInfoWriter.java | 2 +- .../platform}/StandaloneSystemInfoWriter.java | 4 +- .../platform}/SystemInfoWriterModule.java | 3 +- .../platformlevel/PlatformLevel4.java | 12 +++++- .../qualitygate/ProjectsInWarningDaemon.java | 0 .../qualitygate/ProjectsInWarningModule.java} | 15 ++++--- .../server/qualitygate/package-info.java | 23 +++++++++++ .../org/sonar/server/rule/RegisterRules.java | 0 .../org/sonar/server/rule/package-info.java | 23 +++++++++++ .../webhook/WebhookQGChangeEventListener.java | 0 .../sonar/server/webhook/package-info.java | 0 .../ClusterSystemInfoWriterTest.java | 2 +- .../StandaloneSystemInfoWriterTest.java | 2 +- .../platform}/SystemInfoWriterModuleTest.java | 3 +- .../ProjectsInWarningDaemonTest.java | 0 .../ProjectsInWarningModuleTest.java | 37 +++++++++++++++++ .../sonar/server/rule/RegisterRulesTest.java | 0 .../WebhookQGChangeEventListenerTest.java | 0 388 files changed, 323 insertions(+), 395 deletions(-) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/metric/MetricToDto.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/telemetry/TelemetryData.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java (100%) rename server/{sonar-server => sonar-server-common}/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java (100%) rename server/{sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws => sonar-server/src/main/java/org/sonar/server/platform}/AbstractSystemInfoWriter.java (98%) delete mode 100644 server/sonar-server/src/test/projects/test-core-plugin/pom.xml delete mode 100644 server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule25.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_active_rules_with_inheritance/active_rule391.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_A.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_C.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_sorted_ignoring_case/rule_b.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_ace.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/active_rule_empty.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_a.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ab.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_ace.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_bc.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/find_inactive_rules_with_tags/tags_empty.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule25.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule2702.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule391.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/active_rule523.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule1482.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json delete mode 100644 server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/app/RestartFlagHolder.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java (100%) rename server/{sonar-server/src/main/java/org/sonar/server/favorite => sonar-webserver-common/src/main/java/org/sonar/server/app}/package-info.java (96%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/branch/BranchFeature.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/branch/package-info.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/health/ClusterHealth.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/health/Health.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/health/HealthChecker.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/health/package-info.java (100%) rename server/{sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws => sonar-webserver-common/src/main/java/org/sonar/server/platform}/SystemInfoWriter.java (96%) rename server/{sonar-server/src/main/java/org/sonar/server/settings => sonar-webserver-common/src/main/java/org/sonar/server/platform}/package-info.java (96%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/InstalledPlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/PluginDownloader.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/PluginFileSystem.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/PluginUninstaller.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/edition/package-info.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/plugins/package-info.java (99%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/project/RekeyedProject.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/project/Visibility.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/project/package-info.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java (100%) rename server/{sonar-server/src/main/java/org/sonar/server/settings => sonar-webserver-common/src/main/java/org/sonar/server/setting}/ProjectConfigurationLoader.java (98%) rename server/{sonar-server/src/main/java/org/sonar/server/settings => sonar-webserver-common/src/main/java/org/sonar/server/setting}/ProjectConfigurationLoaderImpl.java (97%) rename server/{sonar-server/src/main/java/org/sonar/server/platform => sonar-webserver-common/src/main/java/org/sonar/server/setting}/SettingsChangeNotifier.java (97%) rename server/{sonar-server/src/main/java/org/sonar/server/permission => sonar-webserver-common/src/main/java/org/sonar/server/setting}/package-info.java (96%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/branch/BranchFeatureRule.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/TestPluginA.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/TestProjectUtils.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/project/RekeyedProjectTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java (100%) rename server/{sonar-server/src/test/java/org/sonar/server/settings => sonar-webserver-common/src/test/java/org/sonar/server/setting}/ProjectConfigurationLoaderImplTest.java (99%) rename server/{sonar-server/src/test/java/org/sonar/server/platform => sonar-webserver-common/src/test/java/org/sonar/server/setting}/SettingsChangeNotifierTest.java (98%) rename server/{sonar-server/src/test/java/org/sonar/server/settings => sonar-webserver-common/src/test/java/org/sonar/server/setting}/TestProjectConfigurationLoader.java (97%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/.gitignore (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/README.txt (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-report-plugin/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-report-plugin/src/BasePlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-sqale-plugin/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-sqale-plugin/src/BasePlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-views-plugin/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-views-plugin/src/BasePlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-base-plugin-v2/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-base-plugin-v2/src/BasePlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-base-plugin/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-base-plugin/src/BasePlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-extend-plugin/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-extend-plugin/src/ExtendPlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-libs-plugin/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-libs-plugin/src/LibsPlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-require-plugin/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-require-plugin/src/RequirePlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-requirenew-plugin/pom.xml (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java (100%) rename server/{sonar-server => sonar-webserver-common}/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar (100%) create mode 100644 server/sonar-webserver-common/src/test/resources/logback-test.xml rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/CeModule.java (88%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/http/CeHttpClient.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/http/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/queue/BranchSupport.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ce/queue/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/component/ComponentCleanerService.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/component/ComponentFinder.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/component/ComponentService.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/component/ComponentUpdater.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/component/NewComponent.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/component/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/favorite/FavoriteFinder.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/favorite/FavoriteModule.java (100%) rename server/{sonar-server-common => sonar-webserver-webapi}/src/main/java/org/sonar/server/favorite/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/ClusterHealthCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/EsStatusCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/HealthCheckerImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/HealthReducer.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/NodeHealthCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/NodeHealthModule.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java (100%) create mode 100644 server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/package-info.java rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/Action.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/ActionContext.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/AddTagsAction.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/AssignAction.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/CommentAction.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/IssueFinder.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/IssuesFinderSort.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/RemoveTagsAction.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/Result.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/SetSeverityAction.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/SetTypeAction.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/TransitionAction.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/TransitionService.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/WebIssueStorage.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/issue/package-info.java (100%) rename server/{sonar-server/src/main/java/org/sonar/server/util => sonar-webserver-webapi/src/main/java/org/sonar/server/language}/LanguageParamUtils.java (97%) create mode 100644 server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/package-info.java rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/IssueCounter.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java (99%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/measure/live/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/GroupPermissionChange.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/PermissionChange.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/PermissionTemplateService.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/PermissionUpdater.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/UserPermissionChange.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/permission/UserPermissionChanger.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java (91%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualitygate/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/qualityprofile/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/rule/NewCustomRule.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/rule/ReactivationException.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/rule/RuleCreator.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/rule/RuleTagHelper.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/rule/RuleUpdate.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/rule/RuleUpdater.java (100%) create mode 100644 server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/package-info.java rename server/{sonar-server/src/main/java/org/sonar/server/util => sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws}/EnumUtils.java (97%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/source/CharactersReader.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/source/DecorationDataHolder.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/source/HtmlTextDecorator.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/source/OpeningHtmlTag.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/source/SourceService.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/source/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/text/Macro.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/text/MacroInterpreter.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/text/RuleMacro.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/DeprecatedViews.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/PageDecorations.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/PageRepository.java (96%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/VersionFormatter.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/package-info.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/main/java/org/sonar/server/ui/page/package-info.java (100%) create mode 100644 server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/component/ComponentFinderTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/component/ComponentServiceTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/component/NewComponentTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/component/TestComponentFinder.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/ClusterHealthTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/HealthAssert.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/HealthTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/ActionTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/AddTagsActionTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/AssignActionTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/CommentActionTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/IssueFinderTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/ResultTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/RulesAggregation.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/RulesAggregationTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/SetTypeActionTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/TransitionActionTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/TransitionServiceTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java (100%) rename server/{sonar-server/src/test/java/org/sonar/server/util => sonar-webserver-webapi/src/test/java/org/sonar/server/language}/LanguageParamUtilsTest.java (97%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java (99%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java (93%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java (98%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java (99%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/rule/RuleCreatorTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/source/SourceServiceTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/text/MacroInterpreterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ui/PageDecorationsTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ui/PageRepositoryTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ui/VersionFormatterTest.java (100%) rename server/{sonar-server => sonar-webserver-webapi}/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java (100%) rename server/{sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest => sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperTest}/duplicates-xml-backup.xml (100%) rename server/{sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws => sonar-webserver/src/main/java/org/sonar/server/platform}/ClusterSystemInfoWriter.java (99%) rename server/{sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws => sonar-webserver/src/main/java/org/sonar/server/platform}/StandaloneSystemInfoWriter.java (98%) rename server/{sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws => sonar-webserver/src/main/java/org/sonar/server/platform}/SystemInfoWriterModule.java (97%) rename server/{sonar-server => sonar-webserver}/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java (100%) rename server/{sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java => sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java} (76%) create mode 100644 server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java rename server/{sonar-server => sonar-webserver}/src/main/java/org/sonar/server/rule/RegisterRules.java (100%) create mode 100644 server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java rename server/{sonar-server => sonar-webserver}/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java (100%) rename server/{sonar-server => sonar-webserver}/src/main/java/org/sonar/server/webhook/package-info.java (100%) rename server/{sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws => sonar-webserver/src/test/java/org/sonar/server/platform}/ClusterSystemInfoWriterTest.java (99%) rename server/{sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws => sonar-webserver/src/test/java/org/sonar/server/platform}/StandaloneSystemInfoWriterTest.java (99%) rename server/{sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws => sonar-webserver/src/test/java/org/sonar/server/platform}/SystemInfoWriterModuleTest.java (96%) rename server/{sonar-server => sonar-webserver}/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java (100%) create mode 100644 server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java rename server/{sonar-server => sonar-webserver}/src/test/java/org/sonar/server/rule/RegisterRulesTest.java (100%) rename server/{sonar-server => sonar-webserver}/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java (100%) diff --git a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java index 8ce64c942dd..69edab2e6c6 100644 --- a/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java +++ b/server/sonar-ce-task-projectanalysis/src/test/java/org/sonar/ce/task/projectanalysis/component/ComponentTreeBuilderTest.java @@ -46,9 +46,7 @@ import static org.mockito.Mockito.when; import static org.sonar.ce.task.projectanalysis.component.ComponentVisitor.Order.PRE_ORDER; import static org.sonar.db.component.ComponentTesting.newPrivateProjectDto; import static org.sonar.db.organization.OrganizationTesting.newOrganizationDto; -import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.DIRECTORY; import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.FILE; -import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.MODULE; import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.PROJECT; import static org.sonar.scanner.protocol.output.ScannerReport.Component.ComponentType.UNRECOGNIZED; import static org.sonar.scanner.protocol.output.ScannerReport.Component.newBuilder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/metric/MetricToDto.java b/server/sonar-server-common/src/main/java/org/sonar/server/metric/MetricToDto.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/metric/MetricToDto.java rename to server/sonar-server-common/src/main/java/org/sonar/server/metric/MetricToDto.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryData.java b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryData.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryData.java rename to server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryData.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java rename to server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryDataJsonWriter.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java b/server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java rename to server/sonar-server-common/src/main/java/org/sonar/server/telemetry/TelemetryDataLoader.java diff --git a/server/sonar-server/build.gradle b/server/sonar-server/build.gradle index 4084fea8809..13ff9a20c67 100644 --- a/server/sonar-server/build.gradle +++ b/server/sonar-server/build.gradle @@ -4,15 +4,6 @@ sonarqube { } } -sourceSets { - test { - resources { - srcDirs += ['src/test/projects'] - } - } -} - - import org.apache.tools.ant.filters.ReplaceTokens processResources { filesMatching('build.properties') { @@ -53,7 +44,6 @@ dependencies { compile project(':server:sonar-webserver-auth') compile project(':server:sonar-webserver-common') compile project(':server:sonar-webserver-es') - compile project(':server:sonar-webserver-ws') compile project(':sonar-core') compile project(':sonar-duplications') compile project(':sonar-scanner-protocol') diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/AbstractSystemInfoWriter.java b/server/sonar-server/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.java similarity index 98% rename from server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/AbstractSystemInfoWriter.java rename to server/sonar-server/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.java index c6d2b88de20..fad900559ed 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/AbstractSystemInfoWriter.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/AbstractSystemInfoWriter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +package org.sonar.server.platform; import java.util.Collection; import org.sonar.api.utils.text.JsonWriter; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java b/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java index 74d7aef1e0f..818e13930c3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/PersistentSettings.java @@ -25,6 +25,7 @@ import org.sonar.api.config.Settings; import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.property.PropertyDto; +import org.sonar.server.setting.SettingsChangeNotifier; public class PersistentSettings { diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java index 812b3d9254b..884c7d343de 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/platform/PersistentSettingsTest.java @@ -25,6 +25,7 @@ import org.sonar.api.config.Settings; import org.sonar.api.config.internal.MapSettings; import org.sonar.api.utils.System2; import org.sonar.db.DbTester; +import org.sonar.server.setting.SettingsChangeNotifier; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/projects/test-core-plugin/pom.xml b/server/sonar-server/src/test/projects/test-core-plugin/pom.xml deleted file mode 100644 index d3e86d6cf95..00000000000 --- a/server/sonar-server/src/test/projects/test-core-plugin/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - org.sonarsource.sonarqube.tests - test-core-plugin - 0.1-SNAPSHOT - sonar-plugin - Test Core Plugin - Fake core plugin used by tests - - - - org.codehaus.sonar - sonar-plugin-api - 4.5.4 - provided - - - - src - - - org.sonarsource.sonar-packaging-maven-plugin - sonar-packaging-maven-plugin - 1.15 - true - - core - CorePlugin - - - - - - diff --git a/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar b/server/sonar-server/src/test/projects/test-core-plugin/target/test-core-plugin-0.1-SNAPSHOT.jar deleted file mode 100644 index 831cc364b5cd7f44c195751bd6e940981e047b09..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2452 zcmWIWW@h1H00EDlG7m5VN^k;cU)K;vT~9wZ{Q#&k4hDCivb(a!O8FQW7`6ei2(mI? zM?X(D*WeI6U$@u^vH48~B5m(IfABxA%e>swx2C+q@bt2CE|1?{I#^gz*1DzjO#S{Q z$ys;5RsOD<(`)jo<=kZDsO3`14Z&jW)^}^QoUg5Nc^u#%qieO)HZq2#rZj5d#YBi$cnMq0-?Pl9 zr)bmtXS@G?zMZ(pRd!O?DXaL5mv?qe6pdn3UnzUfg;^-TL~OmjaAcBv*LKCE8(Z^x zwroEjIrs9-(p=ZLRi6v`dp3Q4llg1^)cc8#6=iZu+Uviqm)JIy@eb>*ORKK+Gip~J z6Lhu?dLa|`p^#CYCsyX^wl$&saE!875W~%5J!X`D44}fa=r@z!)_K33jo8< zIlm}1Ag44vGfyu$C$YFVHejRQVFMAH?U_zaUJ3yM%F(AUbVwc%Iw+#JWYN344NZYk z;hoJ7)+aC-eqgK-d1T4U^6=rj`@5~@zdgVHJ3oWE#fOB%+lTp_*mv`NlXzns=}~*` zg1rATp0G7}tj-foIK^B&-KvrQLut9^j1^O!7sq*B-tO#u|76!e|D@2a*L%*T6rM6T z)3UGP%AyrZv^w~XPku7b{=oi`=MK`&zes$OR8#_!*#-com6?uQTvN|b5(*`+l7UCi%zZJ z>x(}aCsoyaA+OCW#;IPnq1|`YmmHqx&s$8R^IzEh|GcYy&$adCs{>i@!@>_Unerp2 zzud&K)I4}%#Z;`1sW`tVU9UJlFR`dNzqBYh6~ZnoO-j`(Ni8lZ#$%WR>4t%f)J+D) zwr&A9y5XjCFx>Vj^+v}7b zNrdgJf`{Oij7t(5g1>kLOV8}}U8VB$`2Fepp3~ke`RZwHefsWP*%|lbwn=YcPF@{F z+aG(;y{B1MXokDox58sJ#=EYv=F~0w8hIwr=m677lU?ifiJsZtvNr5aM65L9%isQc zncf_*^7i!RalK>l^Hl5S#1qe)q))8&jrDT%)R)}R`!A#T0GLF7JD^sl@Z_sX3=w~0KQpnrf%dG!Ld>IeA^hXOSAwq|j&M#%U!0hAns>`5vnJE^xk6bA{!hMzyvU#W*=wG+$j{yH{LFt; zE%5h=UZ|aLZ>4plgQI8Hm0f&pV`;r#CZc*E} z;6iK13U2uee;jW0DJsmg^5purSG2tS^jbfOiLu87fAPoM?FkIo_P~iP+2Q@HtGg~r zTgd3nh{`|OGl%Kuwy>zO?SB_r-(UN|Cv{hk?#A%WMUP!t+5h~GtqPG0_B&L_=WqTb z^)IWXz~VV^N82^_1$Z+ui7?}?&ww5V0s)4%jvyMTc7tidUcZ49gTRtTbs!1XhE&@j zEQSO#dI=BK4mKejn7`4>dxUPxA`4W$L4W|m|NqOGknD$*b}+|dY6g{e2+db8H4`rV za2xIbGaDG7|Nkp8W4Mfv;aEyTm~Gh0Lzsn28tbWG8?A source code comply to an architectural model when it fully\n\tadheres to a set of architectural constraints. A constraint allows to\n\tdeny references between classes by pattern.

\n

You can for instance use this rule to :

\n
    \n\t
  • forbid access to **.web.** from **.dao.** classes
    • \n\t
  • forbid access to java.util.Vector, java.util.Hashtable and\n\t\tjava.util.Enumeration from any classes
    • \n\t
  • forbid access to java.sql.** from **.ui.** and **.web.**\n\t\tclasses
    • \n
", - "parentKey": null, - "repositoryKey": "squid", - "severity": "MAJOR", - "status": "READY", - "createdAt": "2013-12-11T13:48:00.799Z", - "updatedAt": "2013-12-13T17:26:35.767Z", - "params": [ - { - "key": "toClasses", - "type": "STRING", - "defaultValue": "", - "description": "Mandatory. Ex : java.util.Vector, java.util.Hashtable, java.util.Enumeration" - }, - { - "key": "fromClasses", - "type": "STRING", - "defaultValue": "", - "description": "Optional. If this property is not defined, all classes should adhere to this constraint. Ex : **.web.**" - } - ] -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json deleted file mode 100644 index 6fff4e43a57..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule25.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": 25, - "key": "DM_CONVERT_CASE", - "language": "java", - "name": "Internationalization - Consider using Locale parameterized version of invoked method", - "description": "

A String is being converted to upper or lowercase, using the platform's default encoding. This may\n result in improper conversions when used with international characters. Use the

\n
String.toUpperCase( Locale l )
String.toLowerCase( Locale l )
\n

versions instead.

", - "parentKey": null, - "repositoryKey": "findbugs", - "severity": "INFO", - "status": "READY", - "createdAt": "2013-12-04T10:24:09.000Z", - "updatedAt": "2013-12-12T15:19:59.000Z" -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json deleted file mode 100644 index 7dc6d03b585..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule719.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": 719, - "key": "com.puppycrawl.tools.checkstyle.checks.coding.DoubleCheckedLockingCheck", - "language": "java", - "name": "Double Checked Locking", - "description": null, - "parentKey": null, - "repositoryKey": "checkstyle", - "severity": "MAJOR", - "status": "READY", - "cardinality": "SINGLE", - "createdAt": "2013-07-04T07:38:05.543Z", - "updatedAt": "2013-03-27T08:52:40.370Z" -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json deleted file mode 100644 index ceecbbff6de..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule759.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "id": 759, - "key": "UnusedNullCheckInEquals", - "language": "java", - "name": "Unused Null Check In Equals", - "description": "After checking an object reference for null, you should invoke equals() on that object rather than passing it to another object's equals() method.", - "parentKey": null, - "repositoryKey": "pmd", - "severity": "MAJOR", - "status": "READY", - "createdAt": "2013-12-04T10:24:11.000Z", - "updatedAt": "2013-12-12T15:20:01.000Z" -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json deleted file mode 100644 index dc42767a299..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule860.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": 860, - "key": "Snippet", - "language": null, - "name": null, - "description": null, - "parentKey": null, - "repositoryKey": "squid", - "severity": "MAJOR", - "status": "REMOVED", - "cardinality": "MULTIPLE", - "createdAt": "2013-07-04T07:38:05.543Z", - "updatedAt": "2013-03-27T08:52:40.370Z" -} diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json b/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json deleted file mode 100644 index a8a2d311d71..00000000000 --- a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileRuleLookupTest/shared/rule944.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "id": 944, - "key": "S1125", - "language": "java", - "name": "Boolean expressions should not be compared to true or false", - "description": "

Boolean expressions should not be compared against boolean literals, as their value can be directly used.

The following code:

 if (booleanVariable == true) { /* ... */ } // Non-Compliant if (booleanVariable != true) { /* ... */ } // Non-Compliant

should be refactored into:

 if (booleanVariable) { /* ... */ } // Compliant if (!booleanVariable) { /* ... */ } // Compliant
", - "parentKey": null, - "repositoryKey": "squid", - "severity": "MAJOR", - "status": "READY", - "cardinality": "SINGLE", - "createdAt": "2013-07-26T07:40:51.977Z", - "updatedAt": "2014-01-10T15:38:27.386Z" -} diff --git a/server/sonar-webserver-common/build.gradle b/server/sonar-webserver-common/build.gradle index 56cf937d9e2..17637fc201a 100644 --- a/server/sonar-webserver-common/build.gradle +++ b/server/sonar-webserver-common/build.gradle @@ -4,6 +4,14 @@ sonarqube { } } +sourceSets { + test { + resources { + srcDirs += ['src/test/projects'] + } + } +} + configurations { tests @@ -19,6 +27,7 @@ dependencies { compile project(':sonar-core') compile project(':server:sonar-db-dao') compile project(':server:sonar-process') + compile project(':server:sonar-server-common') compile project(path: ':sonar-plugin-api', configuration: 'shadow') compile project(':sonar-plugin-api-impl') compile 'org.mindrot:jbcrypt' diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapper.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/app/ProcessCommandWrapperImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolder.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolder.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolder.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolder.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/app/RestartFlagHolderImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/package-info.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/favorite/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/app/package-info.java index 323232ae563..7170de2498d 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/favorite/package-info.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/app/package-info.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.favorite; +package org.sonar.server.app; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeature.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeature.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeature.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeature.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureExtension.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxy.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/branch/BranchFeatureProxyImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/branch/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/branch/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/branch/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/branch/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealth.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/ClusterHealth.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealth.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/health/ClusterHealth.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/Health.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/Health.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/Health.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/health/Health.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/HealthChecker.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/HealthChecker.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/HealthChecker.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/health/HealthChecker.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/health/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/health/package-info.java diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/SystemInfoWriter.java similarity index 96% rename from server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/platform/SystemInfoWriter.java index fd6726573b8..3a82f471f6a 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriter.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/SystemInfoWriter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +package org.sonar.server.platform; import org.sonar.api.utils.text.JsonWriter; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/package-info.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/settings/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/platform/package-info.java index 09bb2e5b403..71d187381a7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/package-info.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/platform/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.settings; +package org.sonar.server.platform; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPlugin.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/InstalledPlugin.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/InstalledPlugin.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/InstalledPlugin.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginDownloader.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/PluginDownloader.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginDownloader.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginFileSystem.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginFileSystem.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/PluginFileSystem.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginFileSystem.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/PluginUninstaller.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginUninstaller.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/PluginUninstaller.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/PluginUninstaller.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginJarExploder.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterClient.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/UpdateCenterMatrixFactory.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/WebServerExtensionInstaller.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/EditionBundledPlugins.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/edition/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/edition/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/edition/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/package-info.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/plugins/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/package-info.java index 2ef44accfd2..cc398bb88c6 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/package-info.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/plugins/package-info.java @@ -21,4 +21,3 @@ package org.sonar.server.plugins; import javax.annotation.ParametersAreNonnullByDefault; - diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListener.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListeners.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/project/ProjectLifeCycleListenersImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/RekeyedProject.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/RekeyedProject.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/project/RekeyedProject.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/project/RekeyedProject.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/Visibility.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/Visibility.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/project/Visibility.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/project/Visibility.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/project/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/project/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/project/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/project/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/ProjectsInWarning.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEvent.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListener.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListeners.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/Trigger.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/qualitygate/changeevent/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoader.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoader.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.java index eaada4f4db1..e261763e6f5 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoader.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings; +package org.sonar.server.setting; import java.util.Collections; import java.util.Map; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoaderImpl.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoaderImpl.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.java index b487038ab68..95e11242587 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectConfigurationLoaderImpl.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/ProjectConfigurationLoaderImpl.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings; +package org.sonar.server.setting; import java.util.List; import java.util.Map; @@ -30,7 +30,6 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDto; import org.sonar.db.property.PropertyDto; -import org.sonar.server.setting.ChildSettings; import static org.sonar.core.util.stream.MoreCollectors.uniqueIndex; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.java index 1ea0a48ec2d..de074ef5232 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/SettingsChangeNotifier.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/SettingsChangeNotifier.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform; +package org.sonar.server.setting; import com.google.common.annotations.VisibleForTesting; import org.sonar.api.config.GlobalPropertyChangeHandler; diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/package-info.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java rename to server/sonar-webserver-common/src/main/java/org/sonar/server/setting/package-info.java index a66df8906dd..e816bf4051c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/permission/package-info.java +++ b/server/sonar-webserver-common/src/main/java/org/sonar/server/setting/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.permission; +package org.sonar.server.setting; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/app/ProcessCommandWrapperImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureProxyImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/branch/BranchFeatureRule.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureRule.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/branch/BranchFeatureRule.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/branch/BranchFeatureRule.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/health/TestStandaloneHealthChecker.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginDownloaderTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginFileSystemTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/PluginUninstallerTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginJarExploderTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/ServerPluginRepositoryTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/TestPluginA.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestPluginA.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/TestPluginA.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestPluginA.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/TestProjectUtils.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestProjectUtils.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/TestProjectUtils.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/TestProjectUtils.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterClientTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterMatrixFactoryTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/UpdateCenterServlet.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/plugins/edition/EditionBundledPluginsTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/project/ProjectLifeCycleListenersImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/project/RekeyedProjectTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/project/RekeyedProjectTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/project/RekeyedProjectTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/project/RekeyedProjectTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventListenersImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/qualitygate/changeevent/QGChangeEventTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ProjectConfigurationLoaderImplTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ProjectConfigurationLoaderImplTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java index 60944a2a608..0fb88ee9b05 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ProjectConfigurationLoaderImplTest.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/ProjectConfigurationLoaderImplTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings; +package org.sonar.server.setting; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; diff --git a/server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.java index 973f8e73d64..577eda83519 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/platform/SettingsChangeNotifierTest.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/SettingsChangeNotifierTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform; +package org.sonar.server.setting; import org.junit.Test; import org.sonar.api.config.GlobalPropertyChangeHandler; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/TestProjectConfigurationLoader.java b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/settings/TestProjectConfigurationLoader.java rename to server/sonar-webserver-common/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.java index 36820604f60..e0c0b6d2854 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/TestProjectConfigurationLoader.java +++ b/server/sonar-webserver-common/src/test/java/org/sonar/server/setting/TestProjectConfigurationLoader.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings; +package org.sonar.server.setting; import java.util.HashMap; import java.util.Map; diff --git a/server/sonar-server/src/test/projects/.gitignore b/server/sonar-webserver-common/src/test/projects/.gitignore similarity index 100% rename from server/sonar-server/src/test/projects/.gitignore rename to server/sonar-webserver-common/src/test/projects/.gitignore diff --git a/server/sonar-server/src/test/projects/README.txt b/server/sonar-webserver-common/src/test/projects/README.txt similarity index 100% rename from server/sonar-server/src/test/projects/README.txt rename to server/sonar-webserver-common/src/test/projects/README.txt diff --git a/server/sonar-server/src/test/projects/fake-report-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/fake-report-plugin/pom.xml rename to server/sonar-webserver-common/src/test/projects/fake-report-plugin/pom.xml diff --git a/server/sonar-server/src/test/projects/fake-report-plugin/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/BasePlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/fake-report-plugin/src/BasePlugin.java rename to server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/BasePlugin.java diff --git a/server/sonar-server/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from server/sonar-server/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java rename to server/sonar-webserver-common/src/test/projects/fake-report-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/server/sonar-server/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/fake-report-plugin/target/fake-report-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/fake-sqale-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/fake-sqale-plugin/pom.xml rename to server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/pom.xml diff --git a/server/sonar-server/src/test/projects/fake-sqale-plugin/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/BasePlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/fake-sqale-plugin/src/BasePlugin.java rename to server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/BasePlugin.java diff --git a/server/sonar-server/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from server/sonar-server/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java rename to server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/server/sonar-server/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/fake-sqale-plugin/target/fake-sqale-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/fake-views-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/fake-views-plugin/pom.xml rename to server/sonar-webserver-common/src/test/projects/fake-views-plugin/pom.xml diff --git a/server/sonar-server/src/test/projects/fake-views-plugin/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/BasePlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/fake-views-plugin/src/BasePlugin.java rename to server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/BasePlugin.java diff --git a/server/sonar-server/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from server/sonar-server/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java rename to server/sonar-webserver-common/src/test/projects/fake-views-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/server/sonar-server/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/fake-views-plugin/target/fake-views-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/pom.xml b/server/sonar-webserver-common/src/test/projects/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/pom.xml rename to server/sonar-webserver-common/src/test/projects/pom.xml diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/test-base-plugin-v2/pom.xml rename to server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/pom.xml diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/BasePlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/test-base-plugin-v2/src/BasePlugin.java rename to server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/BasePlugin.java diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from server/sonar-server/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java rename to server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/test-base-plugin-v2/target/test-base-plugin-0.2-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-base-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-base-plugin/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/test-base-plugin/pom.xml rename to server/sonar-webserver-common/src/test/projects/test-base-plugin/pom.xml diff --git a/server/sonar-server/src/test/projects/test-base-plugin/src/BasePlugin.java b/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/BasePlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/test-base-plugin/src/BasePlugin.java rename to server/sonar-webserver-common/src/test/projects/test-base-plugin/src/BasePlugin.java diff --git a/server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java b/server/sonar-webserver-common/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java similarity index 100% rename from server/sonar-server/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java rename to server/sonar-webserver-common/src/test/projects/test-base-plugin/src/org/sonar/plugins/testbase/api/BaseApi.java diff --git a/server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/test-base-plugin/target/test-base-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/test-extend-plugin/pom.xml rename to server/sonar-webserver-common/src/test/projects/test-extend-plugin/pom.xml diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/src/ExtendPlugin.java b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/src/ExtendPlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/test-extend-plugin/src/ExtendPlugin.java rename to server/sonar-webserver-common/src/test/projects/test-extend-plugin/src/ExtendPlugin.java diff --git a/server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/test-extend-plugin/target/test-extend-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/test-libs-plugin/pom.xml rename to server/sonar-webserver-common/src/test/projects/test-libs-plugin/pom.xml diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/src/LibsPlugin.java b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/src/LibsPlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/test-libs-plugin/src/LibsPlugin.java rename to server/sonar-webserver-common/src/test/projects/test-libs-plugin/src/LibsPlugin.java diff --git a/server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/test-libs-plugin/target/test-libs-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-require-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-require-plugin/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/test-require-plugin/pom.xml rename to server/sonar-webserver-common/src/test/projects/test-require-plugin/pom.xml diff --git a/server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java b/server/sonar-webserver-common/src/test/projects/test-require-plugin/src/RequirePlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/test-require-plugin/src/RequirePlugin.java rename to server/sonar-webserver-common/src/test/projects/test-require-plugin/src/RequirePlugin.java diff --git a/server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/test-require-plugin/target/test-require-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/pom.xml similarity index 100% rename from server/sonar-server/src/test/projects/test-requirenew-plugin/pom.xml rename to server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/pom.xml diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java similarity index 100% rename from server/sonar-server/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java rename to server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/src/RequirePlugin.java diff --git a/server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar b/server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar similarity index 100% rename from server/sonar-server/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar rename to server/sonar-webserver-common/src/test/projects/test-requirenew-plugin/target/test-requirenew-plugin-0.1-SNAPSHOT.jar diff --git a/server/sonar-webserver-common/src/test/resources/logback-test.xml b/server/sonar-webserver-common/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..3e34b0f9fc8 --- /dev/null +++ b/server/sonar-webserver-common/src/test/resources/logback-test.xml @@ -0,0 +1,26 @@ + + + + + + + + %d{yyyy.MM.dd HH:mm:ss} %-5level %msg%n + + + + + + + + + + + + + + + + + + diff --git a/server/sonar-webserver-webapi/build.gradle b/server/sonar-webserver-webapi/build.gradle index f99c8246c6a..b5d66accd1c 100644 --- a/server/sonar-webserver-webapi/build.gradle +++ b/server/sonar-webserver-webapi/build.gradle @@ -14,12 +14,15 @@ dependencies { // please keep the list grouped by configuration and ordered by name compile 'com.google.guava:guava' + compile project(':server:sonar-ce-common') + compile project(':server:sonar-ce-task') compile project(':server:sonar-db-dao') compile project(':server:sonar-process') compile project(':server:sonar-server') compile project(':server:sonar-webserver-auth') compile project(':server:sonar-webserver-es') compile project(':server:sonar-webserver-ws') + compile project(':sonar-scanner-protocol') compileOnly 'com.google.code.findbugs:jsr305' compileOnly 'javax.servlet:javax.servlet-api' @@ -30,11 +33,14 @@ dependencies { testCompile 'com.google.code.findbugs:jsr305' testCompile 'com.h2database:h2' testCompile 'com.tngtech.java:junit-dataprovider' + testCompile 'com.squareup.okhttp3:mockwebserver' + testCompile 'javax.servlet:javax.servlet-api' testCompile 'org.mockito:mockito-core' testCompile project(':server:sonar-db-testing') testCompile project(path: ":server:sonar-server", configuration: "tests") testCompile project(path: ":server:sonar-server-common", configuration: "tests") testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests") + testCompile project(path: ":server:sonar-webserver-common", configuration: "tests") testCompile project(path: ":server:sonar-webserver-es", configuration: "tests") testCompile project(path: ":server:sonar-webserver-ws", configuration: "tests") testCompile project(':sonar-testing-harness') diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/CeModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/CeModule.java similarity index 88% rename from server/sonar-server/src/main/java/org/sonar/server/ce/CeModule.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/CeModule.java index c228b87ebd0..033bc5a9253 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ce/CeModule.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/CeModule.java @@ -21,7 +21,6 @@ package org.sonar.server.ce; import org.sonar.ce.queue.CeQueueImpl; import org.sonar.ce.task.log.CeTaskLogging; -import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor; import org.sonar.core.platform.Module; import org.sonar.server.ce.http.CeHttpClientImpl; import org.sonar.server.ce.queue.BranchSupport; @@ -36,9 +35,6 @@ public class CeModule extends Module { // Queue CeQueueImpl.class, BranchSupport.class, - ReportSubmitter.class, - - // Core tasks processors - ReportTaskProcessor.class); + ReportSubmitter.class); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/http/CeHttpClient.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClient.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/http/CeHttpClient.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClient.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/CeHttpClientImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/http/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/http/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/http/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/BranchSupport.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/BranchSupport.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/queue/BranchSupport.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/BranchSupport.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/BranchSupportDelegate.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/CeQueueCleaner.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/ReportSubmitter.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ce/queue/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ce/queue/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ce/queue/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentCleanerService.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/component/ComponentCleanerService.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentCleanerService.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentFinder.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/component/ComponentFinder.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentFinder.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentService.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/component/ComponentService.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentService.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentUpdater.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/component/ComponentUpdater.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ComponentUpdater.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/NewComponent.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/NewComponent.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/component/NewComponent.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/NewComponent.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/component/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/component/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/package-info.java diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java index 55fbe2b19ee..8e3143d01b6 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchAction.java @@ -54,8 +54,8 @@ import static java.util.Optional.ofNullable; import static java.util.stream.Collectors.toMap; import static org.sonar.core.util.stream.MoreCollectors.toHashSet; import static org.sonar.server.es.SearchOptions.MAX_LIMIT; -import static org.sonar.server.util.LanguageParamUtils.getExampleValue; -import static org.sonar.server.util.LanguageParamUtils.getOrderedLanguageKeys; +import static org.sonar.server.language.LanguageParamUtils.getExampleValue; +import static org.sonar.server.language.LanguageParamUtils.getOrderedLanguageKeys; import static org.sonar.server.ws.WsParameterBuilder.createQualifiersParameter; import static org.sonar.server.ws.WsParameterBuilder.QualifierParameterContext.newQualifierParameterContext; import static org.sonar.server.ws.WsUtils.writeProtobuf; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java index 5a5fc63057f..394ae51fb8f 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/component/ws/SearchProjectsAction.java @@ -67,7 +67,6 @@ import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.collect.ImmutableList.of; import static com.google.common.collect.Sets.newHashSet; -import static java.lang.String.format; import static java.util.Collections.emptyMap; import static java.util.Objects.requireNonNull; import static java.util.Optional.ofNullable; @@ -80,11 +79,11 @@ import static org.sonar.db.measure.ProjectMeasuresIndexerIterator.METRIC_KEYS; import static org.sonar.server.component.ws.ProjectMeasuresQueryFactory.IS_FAVORITE_CRITERION; import static org.sonar.server.component.ws.ProjectMeasuresQueryFactory.newProjectMeasuresQuery; import static org.sonar.server.component.ws.ProjectMeasuresQueryValidator.NON_METRIC_SORT_KEYS; +import static org.sonar.server.exceptions.NotFoundException.checkFound; +import static org.sonar.server.exceptions.NotFoundException.checkFoundWithOptional; import static org.sonar.server.measure.index.ProjectMeasuresIndex.SUPPORTED_FACETS; import static org.sonar.server.measure.index.ProjectMeasuresQuery.SORT_BY_LAST_ANALYSIS_DATE; import static org.sonar.server.measure.index.ProjectMeasuresQuery.SORT_BY_NAME; -import static org.sonar.server.exceptions.NotFoundException.checkFound; -import static org.sonar.server.exceptions.NotFoundException.checkFoundWithOptional; import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonarqube.ws.client.component.ComponentsWsParameters.ACTION_SEARCH_PROJECTS; import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_FILTER; diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteFinder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/FavoriteFinder.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteFinder.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/FavoriteFinder.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/FavoriteModule.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/favorite/FavoriteModule.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/FavoriteModule.java diff --git a/server/sonar-server-common/src/main/java/org/sonar/server/favorite/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/package-info.java similarity index 100% rename from server/sonar-server-common/src/main/java/org/sonar/server/favorite/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/favorite/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/AppNodeClusterCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/CeStatusNodeCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealthCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/ClusterHealthCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealthCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/ClusterHealthCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/ClusterHealthSubCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/DbConnectionNodeCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/EsStatusCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusClusterCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/EsStatusNodeCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/HealthCheckerImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthCheckerImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/HealthCheckerImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthCheckerImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/HealthReducer.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthReducer.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/HealthReducer.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthReducer.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/HealthStateRefresherExecutorServiceImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthModule.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthModule.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthModule.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/NodeHealthProviderImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/WebServerSafemodeNodeCheck.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/WebServerStatusNodeCheck.java diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/package-info.java new file mode 100644 index 00000000000..18ea762c56b --- /dev/null +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/health/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.health; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AbstractChangeTagsAction.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/Action.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/Action.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/Action.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/Action.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/ActionContext.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ActionContext.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/ActionContext.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ActionContext.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AddTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AddTagsAction.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/AddTagsAction.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AddTagsAction.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AssignAction.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/AssignAction.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/AssignAction.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/CommentAction.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/CommentAction.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/CommentAction.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueChangePostProcessor.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueChangePostProcessorImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssueFinder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueFinder.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/IssueFinder.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssueFinder.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssuesFinderSort.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/IssuesFinderSort.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/IssuesFinderSort.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/RemoveTagsAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/RemoveTagsAction.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/RemoveTagsAction.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/RemoveTagsAction.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/Result.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/Result.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/Result.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/Result.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/SetSeverityAction.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/SetSeverityAction.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/SetSeverityAction.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/SetTypeAction.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/SetTypeAction.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/SetTypeAction.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TransitionAction.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/TransitionAction.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TransitionAction.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/TransitionService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TransitionService.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/TransitionService.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/TransitionService.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/WebIssueStorage.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/WebIssueStorage.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/WebIssueStorage.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/issue/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/issue/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/package-info.java diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java index 2dce5f3200f..a46e5175c37 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/issue/ws/IssueWsModule.java @@ -23,14 +23,12 @@ import org.sonar.core.platform.Module; import org.sonar.server.issue.AvatarResolverImpl; import org.sonar.server.issue.IssueFieldsSetter; import org.sonar.server.issue.IssueFinder; -import org.sonar.server.issue.index.IssueQueryFactory; -import org.sonar.server.issue.WebIssueStorage; import org.sonar.server.issue.TransitionService; +import org.sonar.server.issue.WebIssueStorage; +import org.sonar.server.issue.index.IssueQueryFactory; import org.sonar.server.issue.workflow.FunctionExecutor; import org.sonar.server.issue.workflow.IssueWorkflow; import org.sonar.server.qualitygate.changeevent.QGChangeEventListenersImpl; -import org.sonar.server.settings.ProjectConfigurationLoaderImpl; -import org.sonar.server.webhook.WebhookQGChangeEventListener; public class IssueWsModule extends Module { @Override @@ -63,8 +61,6 @@ public class IssueWsModule extends Module { AuthorsAction.class, ChangelogAction.class, BulkChangeAction.class, - ProjectConfigurationLoaderImpl.class, - WebhookQGChangeEventListener.class, QGChangeEventListenersImpl.class); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/LanguageParamUtils.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/LanguageParamUtils.java index 3defde1bcc7..bddc1102875 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/util/LanguageParamUtils.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/LanguageParamUtils.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.util; +package org.sonar.server.language; import java.util.Arrays; import java.util.List; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/package-info.java new file mode 100644 index 00000000000..0898182de08 --- /dev/null +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/language/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.language; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueCounter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueCounter.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueCounter.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueCounter.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormula.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactory.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputer.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java index f46daa3255e..e6abc8b2b5c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureComputerImpl.java @@ -48,7 +48,7 @@ import org.sonar.server.measure.Rating; import org.sonar.server.qualitygate.EvaluatedQualityGate; import org.sonar.server.qualitygate.QualityGate; import org.sonar.server.qualitygate.changeevent.QGChangeEvent; -import org.sonar.server.settings.ProjectConfigurationLoader; +import org.sonar.server.setting.ProjectConfigurationLoader; import static com.google.common.base.Preconditions.checkState; import static java.util.Collections.emptyList; diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveMeasureModule.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputer.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/LiveQualityGateComputerImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/MeasureMatrix.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/measure/live/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/measure/live/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/measure/live/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/ApplyPermissionTemplateQuery.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolver.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/DefaultTemplatesResolverImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/GroupPermissionChange.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChange.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/GroupPermissionChange.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/GroupPermissionChanger.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionChange.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/PermissionChange.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionChange.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/PermissionTemplateService.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionTemplateService.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionUpdater.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/PermissionUpdater.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/PermissionUpdater.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChange.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChange.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChange.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChanger.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/permission/UserPermissionChanger.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/permission/UserPermissionChanger.java diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java index f9e94ea24b0..516cfd8e590 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/InfoAction.java @@ -24,6 +24,7 @@ import org.sonar.api.server.ws.Request; import org.sonar.api.server.ws.Response; import org.sonar.api.server.ws.WebService; import org.sonar.api.utils.text.JsonWriter; +import org.sonar.server.platform.SystemInfoWriter; import org.sonar.server.user.UserSession; /** diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateConditionsUpdater.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateConverter.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java similarity index 91% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java index 209fd855df4..d713e6014cd 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateModule.java @@ -28,8 +28,6 @@ public class QualityGateModule extends Module { QualityGateUpdater.class, QualityGateConditionsUpdater.class, QualityGateFinder.class, - QualityGateEvaluatorImpl.class, - ProjectsInWarningDaemon.class, - ProjectsInWarning.class); + QualityGateEvaluatorImpl.class); } } diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/QualityGateUpdater.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/RegisterQualityGates.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/ValidRatingMetrics.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualitygate/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/BulkChangeResult.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileBackuper.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileBackuperImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileComparison.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileCopier.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileExporters.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileFactory.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileFactoryImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileReset.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileResetImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRestoreSummary.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileResult.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRules.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileRulesImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileTree.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/QProfileTreeImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/RegisterQualityProfiles.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualityprofile/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/package-info.java diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java index 66d1217bdb6..0b5ccf1df15 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/CreateAction.java @@ -20,6 +20,7 @@ package org.sonar.server.qualityprofile.ws; import java.io.InputStream; +import javax.annotation.Nullable; import org.sonar.api.profiles.ProfileImporter; import org.sonar.api.resources.Languages; import org.sonar.api.server.ws.Request; @@ -38,12 +39,10 @@ import org.sonar.server.qualityprofile.index.ActiveRuleIndexer; import org.sonar.server.user.UserSession; import org.sonarqube.ws.Qualityprofiles.CreateWsResponse; -import javax.annotation.Nullable; - import static com.google.common.base.Preconditions.checkArgument; import static org.sonar.db.permission.OrganizationPermission.ADMINISTER_QUALITY_PROFILES; +import static org.sonar.server.language.LanguageParamUtils.getOrderedLanguageKeys; import static org.sonar.server.qualityprofile.ws.QProfileWsSupport.createOrganizationParam; -import static org.sonar.server.util.LanguageParamUtils.getOrderedLanguageKeys; import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.ACTION_CREATE; import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_LANGUAGE; @@ -86,7 +85,7 @@ public class CreateAction implements QProfileWsAction { NewAction create = controller.createAction(ACTION_CREATE) .setPost(true) .setDescription("Create a quality profile.
" + - "Requires to be logged in and the 'Administer Quality Profiles' permission.") + "Requires to be logged in and the 'Administer Quality Profiles' permission.") .setResponseExample(getClass().getResource("create-example.json")) .setSince("5.2") .setHandler(this); diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java index b7a47fcdfa6..110d2e8484f 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/ExportAction.java @@ -41,16 +41,16 @@ import org.sonar.db.DbClient; import org.sonar.db.DbSession; import org.sonar.db.organization.OrganizationDto; import org.sonar.db.qualityprofile.QProfileDto; +import org.sonar.server.language.LanguageParamUtils; import org.sonar.server.qualityprofile.QProfileBackuper; import org.sonar.server.qualityprofile.QProfileExporters; -import org.sonar.server.util.LanguageParamUtils; import org.sonarqube.ws.MediaTypes; import static java.nio.charset.StandardCharsets.UTF_8; import static org.sonar.core.util.Uuids.UUID_EXAMPLE_01; -import static org.sonar.server.qualityprofile.ws.QProfileWsSupport.createOrganizationParam; -import static org.sonar.server.exceptions.NotFoundException.checkFound; import static org.sonar.server.exceptions.BadRequestException.checkRequest; +import static org.sonar.server.exceptions.NotFoundException.checkFound; +import static org.sonar.server.qualityprofile.ws.QProfileWsSupport.createOrganizationParam; import static org.sonarqube.ws.client.component.ComponentsWsParameters.PARAM_ORGANIZATION; import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_KEY; import static org.sonarqube.ws.client.qualityprofile.QualityProfileWsParameters.PARAM_LANGUAGE; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java index 589298e48dc..27e7c9b27f6 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/qualityprofile/ws/SearchAction.java @@ -49,7 +49,7 @@ import org.sonar.db.user.UserDto; import org.sonar.server.component.ComponentFinder; import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.user.UserSession; -import org.sonar.server.util.LanguageParamUtils; +import org.sonar.server.language.LanguageParamUtils; import org.sonarqube.ws.Qualityprofiles.SearchWsResponse; import org.sonarqube.ws.Qualityprofiles.SearchWsResponse.QualityProfile; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/NewCustomRule.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/NewCustomRule.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/rule/NewCustomRule.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/NewCustomRule.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ReactivationException.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/rule/ReactivationException.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ReactivationException.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleCreator.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/rule/RuleCreator.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleCreator.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleTagHelper.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/rule/RuleTagHelper.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleTagHelper.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleUpdate.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdate.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleUpdate.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleUpdater.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/rule/RuleUpdater.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/RuleUpdater.java diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/package-info.java new file mode 100644 index 00000000000..09d28ba5169 --- /dev/null +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/package-info.java @@ -0,0 +1,22 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault package org.sonar.server.rule; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/EnumUtils.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/EnumUtils.java index 1a414a85a2d..ca947d51175 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/util/EnumUtils.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/EnumUtils.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.util; +package org.sonar.server.rule.ws; import java.util.ArrayList; import java.util.Collections; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java index 31db584f037..40349d60251 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/rule/ws/RuleQueryFactory.java @@ -34,6 +34,7 @@ import org.sonar.server.rule.index.RuleQuery; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.String.format; +import static org.sonar.server.rule.ws.EnumUtils.toEnums; import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_ACTIVATION; import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_ACTIVE_SEVERITIES; import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_AVAILABLE_SINCE; @@ -55,7 +56,6 @@ import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_STATUSES; import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_TAGS; import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_TEMPLATE_KEY; import static org.sonar.server.rule.ws.RulesWsParameters.PARAM_TYPES; -import static org.sonar.server.util.EnumUtils.toEnums; import static org.sonar.server.exceptions.NotFoundException.checkFound; import static org.sonar.server.exceptions.NotFoundException.checkFoundWithOptional; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java index f05bffcb860..c04e17871f1 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/setting/ws/SetAction.java @@ -53,12 +53,13 @@ import org.sonar.db.property.PropertyDto; import org.sonar.scanner.protocol.GsonHelper; import org.sonar.server.component.ComponentFinder; import org.sonar.server.exceptions.BadRequestException; -import org.sonar.server.platform.SettingsChangeNotifier; import org.sonar.server.setting.ws.SettingValidations.SettingData; +import org.sonar.server.setting.SettingsChangeNotifier; import org.sonar.server.user.UserSession; import static com.google.common.base.Preconditions.checkArgument; import static java.lang.String.format; +import static org.sonar.server.exceptions.BadRequestException.checkRequest; import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_BRANCH; import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_COMPONENT; import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_FIELD_VALUES; @@ -67,7 +68,6 @@ import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_PULL_REQUES import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_VALUE; import static org.sonar.server.setting.ws.SettingsWsParameters.PARAM_VALUES; import static org.sonar.server.ws.KeyExamples.KEY_PROJECT_EXAMPLE_001; -import static org.sonar.server.exceptions.BadRequestException.checkRequest; public class SetAction implements SettingsWsAction { private static final Collector COMMA_JOINER = Collectors.joining(","); diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/CharactersReader.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/source/CharactersReader.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/CharactersReader.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/DecorationDataHolder.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/source/DecorationDataHolder.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/DecorationDataHolder.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/HtmlSourceDecorator.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/HtmlTextDecorator.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/source/HtmlTextDecorator.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/HtmlTextDecorator.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/OpeningHtmlTag.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/source/OpeningHtmlTag.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/OpeningHtmlTag.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/SourceService.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/SourceService.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/source/SourceService.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/SourceService.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/source/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/source/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/source/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/text/Macro.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/Macro.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/text/Macro.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/Macro.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/MacroInterpreter.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/text/MacroInterpreter.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/MacroInterpreter.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/RuleMacro.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/text/RuleMacro.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/text/RuleMacro.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/DeprecatedViews.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/DeprecatedViews.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ui/DeprecatedViews.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/DeprecatedViews.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageDecorations.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ui/PageDecorations.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageDecorations.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageRepository.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageRepository.java index b3693678182..a09cfde3104 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/ui/PageRepository.java +++ b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/PageRepository.java @@ -20,6 +20,7 @@ package org.sonar.server.ui; import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.ImmutableList; import java.util.List; import java.util.stream.Stream; import javax.annotation.Nullable; @@ -82,7 +83,7 @@ public class PageRepository implements Startable { this.pluginRepository = pluginRepository; this.coreExtensionRepository = coreExtensionRepository; this.definitions = emptyList(); - this.corePageDefinitions = copyOf(corePageDefinitions); + this.corePageDefinitions = ImmutableList.copyOf(corePageDefinitions); } /** @@ -93,7 +94,7 @@ public class PageRepository implements Startable { this.pluginRepository = pluginRepository; this.coreExtensionRepository = coreExtensionRepository; this.definitions = copyOf(pageDefinitions); - this.corePageDefinitions = copyOf(corePageDefinitions); + this.corePageDefinitions = ImmutableList.copyOf(corePageDefinitions); } @Override diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/VersionFormatter.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/VersionFormatter.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ui/VersionFormatter.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/VersionFormatter.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/WebAnalyticsLoader.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/WebAnalyticsLoaderImpl.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ui/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/package-info.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/page/CorePageDefinition.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/ui/page/package-info.java b/server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/page/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/ui/page/package-info.java rename to server/sonar-webserver-webapi/src/main/java/org/sonar/server/ui/page/package-info.java diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java new file mode 100644 index 00000000000..18a1abfc2a8 --- /dev/null +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/CeModuleTest.java @@ -0,0 +1,38 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.ce; + +import org.junit.Test; +import org.sonar.core.platform.ComponentContainer; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER; + +public class CeModuleTest { + + @Test + public void verify_count_of_added_components() { + ComponentContainer container = new ComponentContainer(); + new CeModule().configure(container); + assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 5); + } + + +} diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/http/CeHttpClientTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/BranchReportSubmitterTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/BranchSupportTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/CeQueueCleanerTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ce/queue/ReportSubmitterTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentCleanerServiceTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentFinderTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/component/ComponentFinderTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentFinderTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentServiceTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentServiceTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentServiceUpdateKeyTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/ComponentUpdaterTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/NewComponentTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/component/NewComponentTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/NewComponentTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/component/TestComponentFinder.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/TestComponentFinder.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/component/TestComponentFinder.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/component/TestComponentFinder.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/favorite/FavoriteModuleTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/AppNodeClusterCheckTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/CeStatusNodeCheckTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/ClusterHealthTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/ClusterHealthTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/ClusterHealthTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/ClusterHealthTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/DbConnectionNodeCheckTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/EsStatusClusterCheckTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/EsStatusNodeCheckTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/HealthAssert.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthAssert.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/HealthAssert.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthAssert.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthCheckerImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/HealthTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/HealthTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/HealthTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/NodeHealthModuleTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/NodeHealthProviderImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/WebServerSafemodeNodeCheckTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/health/WebServerStatusNodeCheckTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ActionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/ActionTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ActionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/AddTagsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/AddTagsActionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/AddTagsActionTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/AddTagsActionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/AssignActionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/AssignActionTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/AssignActionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/CommentActionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/CommentActionTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/CommentActionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/IssueFinderTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/IssueFinderTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/IssueFinderTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/IssuesFinderSortTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RemoveTagsActionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ResultTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/ResultTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ResultTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RulesAggregation.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregation.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RulesAggregation.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RulesAggregationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/RulesAggregationTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/RulesAggregationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/SetSeverityActionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/SetTypeActionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/SetTypeActionTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/SetTypeActionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TestIssueChangePostProcessor.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TransitionActionTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/TransitionActionTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TransitionActionTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TransitionServiceTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/TransitionServiceTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/TransitionServiceTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/WebIssueStorageTest.java diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java index b9c68da85d3..25dd711e9dd 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/issue/ws/IssueWsModuleTest.java @@ -30,7 +30,7 @@ public class IssueWsModuleTest { public void verify_count_of_added_components() { ComponentContainer container = new ComponentContainer(); new IssueWsModule().configure(container); - assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 30); + assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 28); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/util/LanguageParamUtilsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/LanguageParamUtilsTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/util/LanguageParamUtilsTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/LanguageParamUtilsTest.java index ba47e982444..2af03837c8f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/util/LanguageParamUtilsTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/language/LanguageParamUtilsTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.util; +package org.sonar.server.language; import org.junit.Test; import org.sonar.api.resources.AbstractLanguage; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/IssueMetricFormulaFactoryImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java index df8fff10315..c3b7eb46d78 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureComputerImplTest.java @@ -55,8 +55,8 @@ import org.sonar.server.measure.Rating; import org.sonar.server.qualitygate.EvaluatedQualityGate; import org.sonar.server.qualitygate.QualityGate; import org.sonar.server.qualitygate.changeevent.QGChangeEvent; -import org.sonar.server.settings.ProjectConfigurationLoader; -import org.sonar.server.settings.TestProjectConfigurationLoader; +import org.sonar.server.setting.ProjectConfigurationLoader; +import org.sonar.server.setting.TestProjectConfigurationLoader; import static java.util.Arrays.asList; import static java.util.Collections.emptyList; diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveMeasureModuleTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/LiveQualityGateComputerImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/MeasureMatrixTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/measure/live/TestIssueMetricFormulaFactory.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java similarity index 93% rename from server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java index afa4a39fd03..41add6c83b4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/ApplyPermissionTemplateQueryTest.java @@ -47,7 +47,7 @@ public class ApplyPermissionTemplateQueryTest { expectedException.expect(BadRequestException.class); expectedException.expectMessage("Permission template is mandatory"); - ApplyPermissionTemplateQuery.create("", newArrayList("1", "2", "3")); + create("", newArrayList("1", "2", "3")); } @Test @@ -55,6 +55,6 @@ public class ApplyPermissionTemplateQueryTest { expectedException.expect(BadRequestException.class); expectedException.expectMessage("No project provided. Please provide at least one project."); - ApplyPermissionTemplateQuery.create("my_template_key", Collections.emptyList()); + create("my_template_key", Collections.emptyList()); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/DefaultTemplatesResolverRule.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/GroupPermissionChangerTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/PermissionTemplateServiceTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/permission/UserPermissionChangerTest.java diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java index b4d2eac3ed2..3a1cc765eec 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/InfoActionTest.java @@ -24,6 +24,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.utils.text.JsonWriter; import org.sonar.server.exceptions.ForbiddenException; +import org.sonar.server.platform.SystemInfoWriter; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.TestResponse; import org.sonar.server.ws.WsActionTester; @@ -38,7 +39,7 @@ public class InfoActionTest { @Rule public ExpectedException expectedException = ExpectedException.none(); - private SystemInfoWriter jsonWriter = new AbstractSystemInfoWriter(null) { + private SystemInfoWriter jsonWriter = new SystemInfoWriter() { @Override public void write(JsonWriter json) { json.prop("key", "value"); diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java index de93a9d8d1e..c9073795ab4 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemWsTest.java @@ -23,6 +23,7 @@ import org.junit.Test; import org.sonar.api.server.ws.WebService; import org.sonar.server.app.ProcessCommandWrapper; import org.sonar.server.app.RestartFlagHolder; +import org.sonar.server.platform.SystemInfoWriter; import org.sonar.server.platform.WebServer; import org.sonar.server.tester.AnonymousMockUserSession; import org.sonar.server.user.UserSession; @@ -36,7 +37,7 @@ public class SystemWsTest { public void define() { RestartAction action1 = new RestartAction(mock(UserSession.class), mock(ProcessCommandWrapper.class), mock(RestartFlagHolder.class), mock(WebServer.class)); - InfoAction action2 = new InfoAction(new AnonymousMockUserSession(), mock(AbstractSystemInfoWriter.class)); + InfoAction action2 = new InfoAction(new AnonymousMockUserSession(), mock(SystemInfoWriter.class)); SystemWs ws = new SystemWs(action1, action2); WebService.Context context = new WebService.Context(); diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateConditionsUpdaterTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateConverterTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java index db4417f0247..6e088176fdf 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateModuleTest.java @@ -30,6 +30,6 @@ public class QualityGateModuleTest { public void verify_count_of_added_components() { ComponentContainer container = new ComponentContainer(); new QualityGateModule().configure(container); - assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 6); + assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 4); } } diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java index 574903dd0e5..7e053f26a83 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/QualityGateUpdaterTest.java @@ -19,8 +19,6 @@ */ package org.sonar.server.qualitygate; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; @@ -32,6 +30,8 @@ import org.sonar.db.DbTester; import org.sonar.db.organization.OrganizationDto; import org.sonar.db.qualitygate.QualityGateDto; +import static org.assertj.core.api.Assertions.assertThat; + public class QualityGateUpdaterTest { static final String QGATE_NAME = "Default"; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualitygate/RegisterQualityGatesTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java index 6bf85ee8932..9e27015bc5f 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileBackuperImplTest.java @@ -219,7 +219,7 @@ public class QProfileBackuperImplTest { public void fail_to_restore_if_duplicate_rule() throws Exception { OrganizationDto organization = db.organizations().insert(); try { - String xml = Resources.toString(getClass().getResource("QProfileBackuperMediumTest/duplicates-xml-backup.xml"), UTF_8); + String xml = Resources.toString(getClass().getResource("QProfileBackuperTest/duplicates-xml-backup.xml"), UTF_8); underTest.restore(db.getSession(), new StringReader(xml), organization, null); fail(); } catch (IllegalArgumentException e) { diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileComparisonTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileCopierTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileExportersTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileFactoryImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileResetImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileRuleImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileRulesImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileTesting.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/QProfileTreeImplTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesNotificationTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/qualityprofile/RegisterQualityProfilesTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleCreatorTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/rule/RuleCreatorTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleCreatorTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleTagHelperTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/rule/RuleUpdaterTest.java diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java index 107cd5acc55..f548bbdbe01 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/setting/ws/SetActionTest.java @@ -57,7 +57,7 @@ import org.sonar.server.exceptions.NotFoundException; import org.sonar.server.l18n.I18nRule; import org.sonar.server.organization.DefaultOrganizationProvider; import org.sonar.server.organization.TestDefaultOrganizationProvider; -import org.sonar.server.platform.SettingsChangeNotifier; +import org.sonar.server.setting.SettingsChangeNotifier; import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.TestRequest; import org.sonar.server.ws.TestResponse; @@ -96,8 +96,8 @@ public class SetActionTest { private SettingsUpdater settingsUpdater = new SettingsUpdater(dbClient, definitions); private SettingValidations validations = new SettingValidations(definitions, dbClient, i18n); private DefaultOrganizationProvider defaultOrganizationProvider = TestDefaultOrganizationProvider.from(db); - private SetAction underTest = new SetAction(definitions, dbClient, componentFinder, userSession, settingsUpdater, settingsChangeNotifier, validations, - new SettingsWsSupport(defaultOrganizationProvider, userSession)); + private SetAction underTest = new SetAction(definitions, dbClient, componentFinder, userSession, settingsUpdater, + settingsChangeNotifier, validations, new SettingsWsSupport(defaultOrganizationProvider, userSession)); private WsActionTester ws = new WsActionTester(underTest); diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/DecorationDataHolderTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/HtmlSourceDecoratorTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/HtmlTextDecoratorTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/OpeningHtmlTagTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/SourceServiceTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/source/SourceServiceTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/source/SourceServiceTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/text/MacroInterpreterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/text/MacroInterpreterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/text/MacroInterpreterTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/DeprecatedViewsTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/PageDecorationsTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ui/PageDecorationsTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/PageDecorationsTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/PageRepositoryTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/PageRepositoryTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ui/PageRepositoryTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/PageRepositoryTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/VersionFormatterTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/VersionFormatterTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ui/VersionFormatterTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/VersionFormatterTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java rename to server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/WebAnalyticsLoaderImplTest.java diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java index 3ee9136afeb..f270f7e44f3 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/user/ws/SetHomepageActionTest.java @@ -34,7 +34,7 @@ import org.sonar.server.tester.UserSessionRule; import org.sonar.server.ws.TestResponse; import org.sonar.server.ws.WsActionTester; -import static org.apache.http.HttpStatus.SC_NO_CONTENT; +import static javax.servlet.http.HttpServletResponse.SC_NO_CONTENT; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.server.user.ws.SetHomepageAction.PARAM_COMPONENT; import static org.sonar.server.user.ws.SetHomepageAction.PARAM_TYPE; diff --git a/server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml b/server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperTest/duplicates-xml-backup.xml similarity index 100% rename from server/sonar-server/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperMediumTest/duplicates-xml-backup.xml rename to server/sonar-webserver-webapi/src/test/resources/org/sonar/server/qualityprofile/QProfileBackuperTest/duplicates-xml-backup.xml diff --git a/server/sonar-webserver/build.gradle b/server/sonar-webserver/build.gradle index 22528ec5f8a..29a0be4224c 100644 --- a/server/sonar-webserver/build.gradle +++ b/server/sonar-webserver/build.gradle @@ -12,15 +12,25 @@ dependencies { compile 'com.google.guava:guava' compile 'org.apache.tomcat.embed:tomcat-embed-core' compile project(':sonar-core') + compile project(':server:sonar-ce-task-projectanalysis') compile project(':server:sonar-process') compile project(':server:sonar-server') compile project(':server:sonar-webserver-webapi') compileOnly 'com.google.code.findbugs:jsr305' + testCompile 'org.apache.logging.log4j:log4j-api' + testCompile 'org.apache.logging.log4j:log4j-core' + testCompile 'com.h2database:h2' testCompile 'com.google.code.findbugs:jsr305' + testCompile 'com.tngtech.java:junit-dataprovider' + testCompile 'org.mockito:mockito-core' testCompile 'org.eclipse.jetty:jetty-server' testCompile 'org.eclipse.jetty:jetty-servlet' - testCompile 'org.mockito:mockito-core' + testCompile project(':server:sonar-db-testing') + testCompile project(path: ":server:sonar-server-common", configuration: "tests") + testCompile project(path: ":server:sonar-webserver-auth", configuration: "tests") + testCompile project(path: ":server:sonar-webserver-common", configuration: "tests") + testCompile project(path: ":server:sonar-webserver-es", configuration: "tests") testCompile project(':sonar-testing-harness') } diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.java similarity index 99% rename from server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java rename to server/sonar-webserver/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.java index 06b3bb4972b..27ae9fb83ff 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/ClusterSystemInfoWriter.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/ClusterSystemInfoWriter.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +package org.sonar.server.platform; import java.util.Collection; import org.sonar.api.utils.text.JsonWriter; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java similarity index 98% rename from server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java rename to server/sonar-webserver/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java index a883a75c548..36bf38e5aa1 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriter.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/StandaloneSystemInfoWriter.java @@ -17,14 +17,14 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +package org.sonar.server.platform; import java.util.List; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.server.ce.http.CeHttpClient; import org.sonar.core.util.stream.MoreCollectors; import org.sonar.process.systeminfo.SystemInfoSection; import org.sonar.process.systeminfo.protobuf.ProtobufSystemInfo; +import org.sonar.server.ce.http.CeHttpClient; import org.sonar.server.health.Health; import org.sonar.server.health.HealthChecker; import org.sonar.server.telemetry.TelemetryDataLoader; diff --git a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriterModule.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.java similarity index 97% rename from server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriterModule.java rename to server/sonar-webserver/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.java index 1da4de96524..e608a80755e 100644 --- a/server/sonar-webserver-webapi/src/main/java/org/sonar/server/platform/ws/SystemInfoWriterModule.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/SystemInfoWriterModule.java @@ -17,12 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +package org.sonar.server.platform; import org.sonar.core.platform.Module; import org.sonar.process.systeminfo.JvmPropertiesSection; import org.sonar.process.systeminfo.JvmStateSection; -import org.sonar.server.platform.WebServer; import org.sonar.server.platform.monitoring.DbConnectionSection; import org.sonar.server.platform.monitoring.DbSection; import org.sonar.server.platform.monitoring.EsIndexesSection; diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index e9cc2faca7c..c9d39d14d9d 100644 --- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -29,6 +29,7 @@ import org.sonar.api.rules.AnnotationRuleParser; import org.sonar.api.rules.XMLRuleParser; import org.sonar.api.server.rule.RulesDefinitionXmlLoader; import org.sonar.ce.task.projectanalysis.notification.ReportAnalysisFailureNotificationModule; +import org.sonar.ce.task.projectanalysis.taskprocessor.ReportTaskProcessor; import org.sonar.core.component.DefaultResourceTypes; import org.sonar.core.extension.CoreExtensionsInstaller; import org.sonar.core.platform.ComponentContainer; @@ -114,7 +115,7 @@ import org.sonar.server.permission.ws.PermissionsWsModule; import org.sonar.server.platform.BackendCleanup; import org.sonar.server.platform.ClusterVerification; import org.sonar.server.platform.PersistentSettings; -import org.sonar.server.platform.SettingsChangeNotifier; +import org.sonar.server.setting.SettingsChangeNotifier; import org.sonar.server.platform.WebCoreExtensionsInstaller; import org.sonar.server.platform.web.DeprecatedPropertiesWsFilter; import org.sonar.server.platform.web.WebServiceFilter; @@ -125,7 +126,7 @@ import org.sonar.server.platform.ws.HealthCheckerModule; import org.sonar.server.platform.ws.L10nWs; import org.sonar.server.platform.ws.ServerWs; import org.sonar.server.platform.ws.SystemWsModule; -import org.sonar.server.platform.ws.SystemInfoWriterModule; +import org.sonar.server.platform.SystemInfoWriterModule; import org.sonar.server.plugins.PluginDownloader; import org.sonar.server.plugins.PluginUninstaller; import org.sonar.server.plugins.ServerExtensionInstaller; @@ -145,6 +146,7 @@ import org.sonar.server.projectlink.ws.ProjectLinksModule; import org.sonar.server.projecttag.ws.ProjectTagsWsModule; import org.sonar.server.property.InternalPropertiesImpl; import org.sonar.server.property.ws.PropertiesWs; +import org.sonar.server.qualitygate.ProjectsInWarningModule; import org.sonar.server.qualitygate.QualityGateModule; import org.sonar.server.qualitygate.notification.QGChangeNotificationHandler; import org.sonar.server.qualitygate.ws.QualityGateWsModule; @@ -180,6 +182,7 @@ import org.sonar.server.rule.ws.RuleWsSupport; import org.sonar.server.rule.ws.RulesWs; import org.sonar.server.rule.ws.TagsAction; import org.sonar.server.setting.ws.SettingsWsModule; +import org.sonar.server.setting.ProjectConfigurationLoaderImpl; import org.sonar.server.source.ws.SourceWsModule; import org.sonar.server.startup.LogServerId; import org.sonar.server.telemetry.TelemetryClient; @@ -211,6 +214,7 @@ import org.sonar.server.view.index.ViewIndex; import org.sonar.server.view.index.ViewIndexDefinition; import org.sonar.server.view.index.ViewIndexer; import org.sonar.server.webhook.WebhookModule; +import org.sonar.server.webhook.WebhookQGChangeEventListener; import org.sonar.server.webhook.ws.WebhooksWsModule; import org.sonar.server.ws.WebServiceEngine; import org.sonar.server.ws.ws.WebServicesWsModule; @@ -326,6 +330,7 @@ public class PlatformLevel4 extends PlatformLevel { TimeMachineWs.class, QualityGateModule.class, + ProjectsInWarningModule.class, QualityGateWsModule.class, // web services @@ -447,6 +452,7 @@ public class PlatformLevel4 extends PlatformLevel { EmailsWsModule.class, // Settings + ProjectConfigurationLoaderImpl.class, PersistentSettings.class, PropertiesWs.class, org.sonar.server.property.ws.IndexAction.class, @@ -493,6 +499,7 @@ public class PlatformLevel4 extends PlatformLevel { ReportAnalysisFailureNotificationModule.class, CeModule.class, CeWsModule.class, + ReportTaskProcessor.class, // SonarSource editions PlatformEditionProvider.class, @@ -506,6 +513,7 @@ public class PlatformLevel4 extends PlatformLevel { RootWsModule.class, // webhooks + WebhookQGChangeEventListener.class, WebhookModule.class, WebhooksWsModule.class, diff --git a/server/sonar-server/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java rename to server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningDaemon.java diff --git a/server/sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java similarity index 76% rename from server/sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java rename to server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java index 29bc924ff25..e48974da9e4 100644 --- a/server/sonar-server/src/test/projects/test-core-plugin/src/CorePlugin.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/ProjectsInWarningModule.java @@ -17,14 +17,17 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import org.sonar.api.Plugin; +package org.sonar.server.qualitygate; -import java.util.Collections; -import java.util.List; +import org.sonar.core.platform.Module; -public class CorePlugin extends Plugin { - - public void define(Plugin.Context context) { +public class ProjectsInWarningModule extends Module { + @Override + protected void configureModule() { + add( + ProjectsInWarningDaemon.class, + ProjectsInWarning.class + ); } } diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java new file mode 100644 index 00000000000..4d247e4707e --- /dev/null +++ b/server/sonar-webserver/src/main/java/org/sonar/server/qualitygate/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.qualitygate; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java b/server/sonar-webserver/src/main/java/org/sonar/server/rule/RegisterRules.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/rule/RegisterRules.java rename to server/sonar-webserver/src/main/java/org/sonar/server/rule/RegisterRules.java diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java b/server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java new file mode 100644 index 00000000000..e8782b9c52d --- /dev/null +++ b/server/sonar-webserver/src/main/java/org/sonar/server/rule/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +@ParametersAreNonnullByDefault +package org.sonar.server.rule; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java b/server/sonar-webserver/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java rename to server/sonar-webserver/src/main/java/org/sonar/server/webhook/WebhookQGChangeEventListener.java diff --git a/server/sonar-server/src/main/java/org/sonar/server/webhook/package-info.java b/server/sonar-webserver/src/main/java/org/sonar/server/webhook/package-info.java similarity index 100% rename from server/sonar-server/src/main/java/org/sonar/server/webhook/package-info.java rename to server/sonar-webserver/src/main/java/org/sonar/server/webhook/package-info.java diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.java similarity index 99% rename from server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java rename to server/sonar-webserver/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.java index 777365d2b62..60820406733 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/ClusterSystemInfoWriterTest.java +++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/ClusterSystemInfoWriterTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +package org.sonar.server.platform; import java.io.StringWriter; import java.util.Collections; diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.java similarity index 99% rename from server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java rename to server/sonar-webserver/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.java index ad7e1edd45c..1213c87f39f 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/StandaloneSystemInfoWriterTest.java +++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/StandaloneSystemInfoWriterTest.java @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +package org.sonar.server.platform; import java.io.StringWriter; import java.util.Optional; diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemInfoWriterModuleTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.java similarity index 96% rename from server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemInfoWriterModuleTest.java rename to server/sonar-webserver/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.java index 664472ef744..a78a5efd40b 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/platform/ws/SystemInfoWriterModuleTest.java +++ b/server/sonar-webserver/src/test/java/org/sonar/server/platform/SystemInfoWriterModuleTest.java @@ -17,13 +17,12 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.platform.ws; +package org.sonar.server.platform; import java.util.Collection; import org.junit.Test; import org.picocontainer.ComponentAdapter; import org.sonar.core.platform.ComponentContainer; -import org.sonar.server.platform.WebServer; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; diff --git a/server/sonar-server/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java rename to server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningDaemonTest.java diff --git a/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java new file mode 100644 index 00000000000..112e10144d2 --- /dev/null +++ b/server/sonar-webserver/src/test/java/org/sonar/server/qualitygate/ProjectsInWarningModuleTest.java @@ -0,0 +1,37 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.server.qualitygate; + +import org.junit.Test; +import org.sonar.core.platform.ComponentContainer; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.sonar.core.platform.ComponentContainer.COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER; + +public class ProjectsInWarningModuleTest { + + @Test + public void verify_count_of_added_components() { + ComponentContainer container = new ComponentContainer(); + new ProjectsInWarningModule().configure(container); + assertThat(container.size()).isEqualTo(COMPONENTS_IN_EMPTY_COMPONENT_CONTAINER + 2); + } + +} diff --git a/server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/rule/RegisterRulesTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/rule/RegisterRulesTest.java rename to server/sonar-webserver/src/test/java/org/sonar/server/rule/RegisterRulesTest.java diff --git a/server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java b/server/sonar-webserver/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java similarity index 100% rename from server/sonar-server/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java rename to server/sonar-webserver/src/test/java/org/sonar/server/webhook/WebhookQGChangeEventListenerTest.java -- 2.39.5