From 6e1540023e1ef42bfd754c3661bfc873627f6a25 Mon Sep 17 00:00:00 2001 From: Julien Lancelot Date: Wed, 31 Aug 2016 10:20:24 +0200 Subject: [PATCH] Rename package org.sonar.server.settings.ws to org.sonar.server.setting.ws --- .../org/sonar/ce/container/ComputeEngineContainerImpl.java | 2 +- .../projectanalysis/component/SettingsRepositoryImpl.java | 2 +- .../sonar/server/platform/platformlevel/PlatformLevel4.java | 4 ++-- .../server/{settings => setting}/ProjectSettingsFactory.java | 2 +- .../org/sonar/server/{settings => setting}/package-info.java | 2 +- .../{settings => setting}/ws/ListDefinitionsAction.java | 4 ++-- .../server/{settings => setting}/ws/PropertySetExtractor.java | 2 +- .../sonar/server/{settings => setting}/ws/ResetAction.java | 4 ++-- .../org/sonar/server/{settings => setting}/ws/SetAction.java | 2 +- .../org/sonar/server/{settings => setting}/ws/Setting.java | 2 +- .../sonar/server/{settings => setting}/ws/SettingsFinder.java | 4 ++-- .../server/{settings => setting}/ws/SettingsUpdater.java | 4 ++-- .../org/sonar/server/{settings => setting}/ws/SettingsWs.java | 2 +- .../server/{settings => setting}/ws/SettingsWsAction.java | 2 +- .../ws/SettingsWsComponentParameters.java | 2 +- .../server/{settings => setting}/ws/SettingsWsModule.java | 2 +- .../sonar/server/{settings => setting}/ws/ValuesAction.java | 4 ++-- .../sonar/server/{settings => setting}/ws/package-info.java | 2 +- .../{settings => setting}/ws/list_definitions-example.json | 0 .../sonar/server/{settings => setting}/ws/values-example.json | 0 .../projectanalysis/component/SettingsRepositoryTest.java | 2 +- .../{settings => setting}/ProjectSettingsFactoryTest.java | 2 +- .../{settings => setting}/ws/ListDefinitionsActionTest.java | 2 +- .../server/{settings => setting}/ws/ResetActionTest.java | 2 +- .../sonar/server/{settings => setting}/ws/SetActionTest.java | 2 +- .../server/{settings => setting}/ws/SettingsFinderTest.java | 2 +- .../server/{settings => setting}/ws/SettingsUpdaterTest.java | 2 +- .../server/{settings => setting}/ws/SettingsWsModuleTest.java | 2 +- .../server/{settings => setting}/ws/ValuesActionTest.java | 2 +- 29 files changed, 33 insertions(+), 33 deletions(-) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ProjectSettingsFactory.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/package-info.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/ListDefinitionsAction.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/PropertySetExtractor.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/ResetAction.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/SetAction.java (99%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/Setting.java (99%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/SettingsFinder.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/SettingsUpdater.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/SettingsWs.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/SettingsWsAction.java (96%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/SettingsWsComponentParameters.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/SettingsWsModule.java (97%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/ValuesAction.java (98%) rename server/sonar-server/src/main/java/org/sonar/server/{settings => setting}/ws/package-info.java (96%) rename server/sonar-server/src/main/resources/org/sonar/server/{settings => setting}/ws/list_definitions-example.json (100%) rename server/sonar-server/src/main/resources/org/sonar/server/{settings => setting}/ws/values-example.json (100%) rename server/sonar-server/src/test/java/org/sonar/server/{settings => setting}/ProjectSettingsFactoryTest.java (98%) rename server/sonar-server/src/test/java/org/sonar/server/{settings => setting}/ws/ListDefinitionsActionTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{settings => setting}/ws/ResetActionTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{settings => setting}/ws/SetActionTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{settings => setting}/ws/SettingsFinderTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{settings => setting}/ws/SettingsUpdaterTest.java (99%) rename server/sonar-server/src/test/java/org/sonar/server/{settings => setting}/ws/SettingsWsModuleTest.java (97%) rename server/sonar-server/src/test/java/org/sonar/server/{settings => setting}/ws/ValuesActionTest.java (99%) diff --git a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java index 3bca9c88431..4d4df269eea 100644 --- a/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java +++ b/server/sonar-ce/src/main/java/org/sonar/ce/container/ComputeEngineContainerImpl.java @@ -130,7 +130,7 @@ import org.sonar.server.rule.RuleRepositories; import org.sonar.server.rule.index.RuleIndex; import org.sonar.server.rule.index.RuleIndexer; import org.sonar.server.search.EsSearchModule; -import org.sonar.server.settings.ProjectSettingsFactory; +import org.sonar.server.setting.ProjectSettingsFactory; import org.sonar.server.startup.LogServerId; import org.sonar.server.test.index.TestIndexer; import org.sonar.server.user.DefaultUserFinder; diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryImpl.java index ec0829d5983..4ca83d404e1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryImpl.java @@ -22,7 +22,7 @@ package org.sonar.server.computation.task.projectanalysis.component; import java.util.Collection; import java.util.Map; import org.sonar.api.config.Settings; -import org.sonar.server.settings.ProjectSettingsFactory; +import org.sonar.server.setting.ProjectSettingsFactory; import org.sonar.server.util.cache.CacheLoader; import org.sonar.server.util.cache.MemoryCache; diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java index 829b1bb9fab..fa0fcc45238 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/platformlevel/PlatformLevel4.java @@ -233,8 +233,8 @@ import org.sonar.server.rule.ws.RuleMapper; import org.sonar.server.rule.ws.RuleQueryFactory; import org.sonar.server.rule.ws.RulesWs; import org.sonar.server.rule.ws.TagsAction; -import org.sonar.server.settings.ProjectSettingsFactory; -import org.sonar.server.settings.ws.SettingsWsModule; +import org.sonar.server.setting.ProjectSettingsFactory; +import org.sonar.server.setting.ws.SettingsWsModule; import org.sonar.server.source.HtmlSourceDecorator; import org.sonar.server.source.SourceService; import org.sonar.server.source.ws.HashAction; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectSettingsFactory.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ProjectSettingsFactory.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ProjectSettingsFactory.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ProjectSettingsFactory.java index fe9c4e60c53..b1667da281f 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ProjectSettingsFactory.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ProjectSettingsFactory.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 org.sonar.api.ce.ComputeEngineSide; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/setting/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-server/src/main/java/org/sonar/server/setting/package-info.java index f24dcdd32dc..6a2adce37aa 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/package-info.java +++ b/server/sonar-server/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.settings; +package org.sonar.server.setting; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/ListDefinitionsAction.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/ListDefinitionsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.java index bead98328b8..56ba6df717a 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/ListDefinitionsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ListDefinitionsAction.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.ws; +package org.sonar.server.setting.ws; import java.util.List; import java.util.Optional; @@ -41,7 +41,7 @@ import org.sonarqube.ws.client.setting.ListDefinitionsRequest; import static org.elasticsearch.common.Strings.isNullOrEmpty; import static org.sonar.server.component.ComponentFinder.ParamNames.ID_AND_KEY; -import static org.sonar.server.settings.ws.SettingsWsComponentParameters.addComponentParameters; +import static org.sonar.server.setting.ws.SettingsWsComponentParameters.addComponentParameters; import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonarqube.ws.client.setting.SettingsWsParameters.ACTION_LIST_DEFINITIONS; import static org.sonarqube.ws.client.setting.SettingsWsParameters.PARAM_COMPONENT_ID; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/PropertySetExtractor.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/PropertySetExtractor.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java index 2e27c1da45b..2932a8ef86c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/PropertySetExtractor.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/PropertySetExtractor.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import com.google.common.base.Splitter; import java.util.HashSet; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/ResetAction.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/ResetAction.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java index 3c24e053d7b..7f588b24c26 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/ResetAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ResetAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import java.util.Optional; import org.sonar.api.config.PropertyDefinition; @@ -35,7 +35,7 @@ import org.sonar.server.component.ComponentFinder; import org.sonar.server.user.UserSession; import org.sonarqube.ws.client.setting.ResetRequest; -import static org.sonar.server.settings.ws.SettingsWsComponentParameters.addComponentParameters; +import static org.sonar.server.setting.ws.SettingsWsComponentParameters.addComponentParameters; import static org.sonarqube.ws.client.ce.CeWsParameters.PARAM_COMPONENT_KEY; import static org.sonarqube.ws.client.setting.SettingsWsParameters.ACTION_RESET; import static org.sonarqube.ws.client.setting.SettingsWsParameters.PARAM_COMPONENT_ID; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SetAction.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/SetAction.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java index 629c520de22..9c0762a28db 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SetAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SetAction.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/Setting.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java similarity index 99% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/Setting.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java index 757fe4ca325..aa01116f7de 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/Setting.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/Setting.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import com.google.common.base.Splitter; import com.google.common.collect.ImmutableTable; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsFinder.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsFinder.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsFinder.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsFinder.java index 11c5011310f..7f8dab875b3 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsFinder.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsFinder.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import com.google.common.base.Splitter; import com.google.common.collect.Multimap; @@ -37,7 +37,7 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.property.PropertyDto; import static org.sonar.api.PropertyType.PROPERTY_SET; -import static org.sonar.server.settings.ws.PropertySetExtractor.extractPropertySetKeys; +import static org.sonar.server.setting.ws.PropertySetExtractor.extractPropertySetKeys; public class SettingsFinder { diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsUpdater.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsUpdater.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java index 270913f362b..c88893e38c7 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsUpdater.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsUpdater.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import java.util.Optional; import java.util.Set; @@ -30,7 +30,7 @@ import org.sonar.db.DbSession; import org.sonar.db.component.ComponentDto; import org.sonar.db.property.PropertyDto; -import static org.sonar.server.settings.ws.PropertySetExtractor.extractPropertySetKeys; +import static org.sonar.server.setting.ws.PropertySetExtractor.extractPropertySetKeys; public class SettingsUpdater { diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWs.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWs.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.java index 546e8c7db8e..ee5908e3c1c 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWs.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWs.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.ws; +package org.sonar.server.setting.ws; import org.sonar.api.server.ws.WebService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsAction.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsAction.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.java index 63b8724eded..68a673b1383 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsAction.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.ws; +package org.sonar.server.setting.ws; import org.sonar.server.ws.WsAction; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsComponentParameters.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsComponentParameters.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsComponentParameters.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsComponentParameters.java index 6251ce9cbbf..728cd71bfba 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsComponentParameters.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsComponentParameters.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.ws; +package org.sonar.server.setting.ws; import org.sonar.api.server.ws.WebService; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsModule.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java similarity index 97% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsModule.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.java index 5a1caa02652..0b1a2ae9806 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/SettingsWsModule.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/SettingsWsModule.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.ws; +package org.sonar.server.setting.ws; import org.sonar.core.platform.Module; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/ValuesAction.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java similarity index 98% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/ValuesAction.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.java index 0e853bbcdea..50d645315a0 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/ValuesAction.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/ValuesAction.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.ws; +package org.sonar.server.setting.ws; import com.google.common.base.Splitter; import java.util.ArrayList; @@ -50,7 +50,7 @@ import static java.lang.String.format; import static org.elasticsearch.common.Strings.isNullOrEmpty; import static org.sonar.api.PropertyType.PROPERTY_SET; import static org.sonar.server.component.ComponentFinder.ParamNames.ID_AND_KEY; -import static org.sonar.server.settings.ws.SettingsWsComponentParameters.addComponentParameters; +import static org.sonar.server.setting.ws.SettingsWsComponentParameters.addComponentParameters; import static org.sonar.server.ws.WsUtils.writeProtobuf; import static org.sonarqube.ws.client.setting.SettingsWsParameters.ACTION_VALUES; import static org.sonarqube.ws.client.setting.SettingsWsParameters.PARAM_COMPONENT_ID; diff --git a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java similarity index 96% rename from server/sonar-server/src/main/java/org/sonar/server/settings/ws/package-info.java rename to server/sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java index c144acaebf8..68f0dfeb112 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/settings/ws/package-info.java +++ b/server/sonar-server/src/main/java/org/sonar/server/setting/ws/package-info.java @@ -18,6 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/server/sonar-server/src/main/resources/org/sonar/server/settings/ws/list_definitions-example.json b/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json similarity index 100% rename from server/sonar-server/src/main/resources/org/sonar/server/settings/ws/list_definitions-example.json rename to server/sonar-server/src/main/resources/org/sonar/server/setting/ws/list_definitions-example.json diff --git a/server/sonar-server/src/main/resources/org/sonar/server/settings/ws/values-example.json b/server/sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json similarity index 100% rename from server/sonar-server/src/main/resources/org/sonar/server/settings/ws/values-example.json rename to server/sonar-server/src/main/resources/org/sonar/server/setting/ws/values-example.json diff --git a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryTest.java index 7ac0c490f36..12a97c0b66b 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/computation/task/projectanalysis/component/SettingsRepositoryTest.java @@ -32,7 +32,7 @@ import org.sonar.db.component.ComponentDto; import org.sonar.db.component.ComponentTesting; import org.sonar.db.property.PropertiesDao; import org.sonar.db.property.PropertyDto; -import org.sonar.server.settings.ProjectSettingsFactory; +import org.sonar.server.setting.ProjectSettingsFactory; import static org.assertj.core.api.Assertions.assertThat; import static org.sonar.server.computation.task.projectanalysis.component.Component.Type.PROJECT; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ProjectSettingsFactoryTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.java similarity index 98% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ProjectSettingsFactoryTest.java rename to server/sonar-server/src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.java index 7f6fed937eb..0724455f957 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ProjectSettingsFactoryTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ProjectSettingsFactoryTest.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 org.junit.Test; import org.sonar.api.config.Settings; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/ListDefinitionsActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ws/ListDefinitionsActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java index 4df81639a10..c1bfd55fda4 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/ListDefinitionsActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ListDefinitionsActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import java.io.IOException; import javax.annotation.Nullable; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/ResetActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ws/ResetActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java index 1663cee0eaf..70a1e4f29c2 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/ResetActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ResetActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import javax.annotation.Nullable; import org.junit.Before; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/SetActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ws/SetActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java index 1e7352643d8..22217d45598 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/SetActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SetActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import com.google.common.collect.ImmutableMap; import com.google.gson.Gson; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsFinderTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsFinderTest.java rename to server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java index b11d4a79864..f70a47fddb5 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsFinderTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsFinderTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Multimap; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsUpdaterTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsUpdaterTest.java rename to server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java index 7ac5c0f4e9b..372691634cc 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsUpdaterTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsUpdaterTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import org.junit.Before; import org.junit.Rule; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsWsModuleTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java similarity index 97% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsWsModuleTest.java rename to server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.java index 18a54cfd494..54d0a4b2abb 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/SettingsWsModuleTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/SettingsWsModuleTest.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.ws; +package org.sonar.server.setting.ws; import org.junit.Test; import org.sonar.core.platform.ComponentContainer; diff --git a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/ValuesActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java similarity index 99% rename from server/sonar-server/src/test/java/org/sonar/server/settings/ws/ValuesActionTest.java rename to server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java index 83f8591b936..323b007c72a 100644 --- a/server/sonar-server/src/test/java/org/sonar/server/settings/ws/ValuesActionTest.java +++ b/server/sonar-server/src/test/java/org/sonar/server/setting/ws/ValuesActionTest.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.server.settings.ws; +package org.sonar.server.setting.ws; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; -- 2.39.5