SONAR-7300 Move api/properties WS to package property

30 files changed, 9 insertions, 10 deletions

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 6fe456ddf41..a03956b1af4 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
@@ -42,7 +42,6 @@ import org.sonar.server.component.DefaultComponentFinder;
 import org.sonar.server.component.DefaultRubyComponentService;
 import org.sonar.server.component.es.ProjectsEsModule;
 import org.sonar.server.component.ws.ComponentsWsModule;
-import org.sonar.server.config.ws.PropertiesWs;
 import org.sonar.server.debt.DebtModelBackup;
 import org.sonar.server.debt.DebtModelPluginRepository;
 import org.sonar.server.debt.DebtModelService;
@@ -134,6 +133,7 @@ import org.sonar.server.project.ws.ProjectsWsModule;
 import org.sonar.server.projectanalysis.ProjectAnalysisModule;
 import org.sonar.server.projectlink.ws.ProjectLinksModule;
 import org.sonar.server.property.InternalPropertiesImpl;
+import org.sonar.server.property.ws.PropertiesWs;
 import org.sonar.server.qualitygate.QualityGateModule;
 import org.sonar.server.qualityprofile.QProfileBackuper;
 import org.sonar.server.qualityprofile.QProfileComparison;
@@ -445,7 +445,7 @@ public class PlatformLevel4 extends PlatformLevel {
       // Settings
       PersistentSettings.class,
       PropertiesWs.class,
-      org.sonar.server.config.ws.IndexAction.class,
+      org.sonar.server.property.ws.IndexAction.class,
       SettingsWsModule.class,
 
       // Licences
diff --git a/server/sonar-server/src/main/java/org/sonar/server/config/ws/IndexAction.java b/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java
index 67bce460b1d..4d171d72446 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/config/ws/IndexAction.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/property/ws/IndexAction.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.config.ws;
+package org.sonar.server.property.ws;
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Multimap;
diff --git a/server/sonar-server/src/main/java/org/sonar/server/config/ws/PropertiesWs.java b/server/sonar-server/src/main/java/org/sonar/server/property/ws/PropertiesWs.java
index 3870bff9e62..7db24ea5abc 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/config/ws/PropertiesWs.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/property/ws/PropertiesWs.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.config.ws;
+package org.sonar.server.property.ws;
 
 import org.sonar.api.server.ws.WebService;
 
diff --git a/server/sonar-server/src/main/java/org/sonar/server/config/ws/package-info.java b/server/sonar-server/src/main/java/org/sonar/server/property/ws/package-info.java
index c890c5246d2..843eeaaced0 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/config/ws/package-info.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/property/ws/package-info.java
@@ -18,7 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.server.config.ws;
+package org.sonar.server.property.ws;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedRestWebServiceFilter.java b/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedRestWebServiceFilter.java
index 2ffd0e5fd73..dd774f623a9 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedRestWebServiceFilter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/DeprecatedRestWebServiceFilter.java
@@ -30,9 +30,9 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.sonar.api.web.ServletFilter;
-import org.sonar.server.config.ws.IndexAction;
+import org.sonar.server.property.ws.IndexAction;
 
-import static org.sonar.server.config.ws.PropertiesWs.CONTROLLER_PROPERTIES;
+import static org.sonar.server.property.ws.PropertiesWs.CONTROLLER_PROPERTIES;
 
 /**
  * This filter is used to execute some deprecated Java WS, that were using REST
diff --git a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java
index 028c5c1760f..7d1f78da028 100644
--- a/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java
+++ b/server/sonar-server/src/main/java/org/sonar/server/ws/WebServiceFilter.java
@@ -32,7 +32,7 @@ import org.sonar.api.server.ws.RailsHandler;
 import org.sonar.api.server.ws.WebService;
 import org.sonar.api.web.ServletFilter;
 
-import static org.sonar.server.config.ws.PropertiesWs.CONTROLLER_PROPERTIES;
+import static org.sonar.server.property.ws.PropertiesWs.CONTROLLER_PROPERTIES;
 
 /**
  * This filter is used to execute Java WS.
diff --git a/server/sonar-server/src/main/resources/org/sonar/server/config/ws/index-example.json b/server/sonar-server/src/main/resources/org/sonar/server/property/ws/index-example.json
index 9574238f574..9574238f574 100644
--- a/server/sonar-server/src/main/resources/org/sonar/server/config/ws/index-example.json
+++ b/server/sonar-server/src/main/resources/org/sonar/server/property/ws/index-example.json
diff --git a/server/sonar-server/src/test/java/org/sonar/server/config/ws/IndexActionTest.java b/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java
index 1aba7354382..e5a6530b255 100644
--- a/server/sonar-server/src/test/java/org/sonar/server/config/ws/IndexActionTest.java
+++ b/server/sonar-server/src/test/java/org/sonar/server/property/ws/IndexActionTest.java
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.sonar.server.config.ws;
+package org.sonar.server.property.ws;
 
 import com.google.common.collect.ImmutableMap;
 import java.net.URL;
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json
index d98b4c40613..d98b4c40613 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_fail_when_user_has_not_project_browse_permission.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json
index 1475b5a81e6..1475b5a81e6 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_in_property_set_when_not_authenticated.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json
index d98b4c40613..d98b4c40613 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/does_not_returned_secured_and_license_settings_when_not_authenticated.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/empty.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json
index 0d4f101c7a3..0d4f101c7a3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/empty.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/empty.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json
index 12d2fd7c1a2..12d2fd7c1a2 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_project_settings_when_component_and_no_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json
index 96409e92995..96409e92995 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_all_settings_when_no_component_and_no_key.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_default_values.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json
index 4647a4e42ba..4647a4e42ba 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_default_values.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_default_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_global_values.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json
index 0869d171522..0869d171522 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_global_values.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_global_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_inherited_values_on_global_setting.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json
index 815c45955ff..815c45955ff 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_inherited_values_on_global_setting.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_global_setting.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_inherited_values_on_module.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json
index 15a3ae5fb4c..15a3ae5fb4c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_inherited_values_on_module.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_inherited_values_on_module.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json
index e40076cc580..e40076cc580 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_license_with_hash_settings_when_authenticated_but_not_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_module_values.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json
index 5486106db4f..5486106db4f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_module_values.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_module_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_multi_value_with_coma.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json
index 8411a36aea3..8411a36aea3 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_multi_value_with_coma.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_value_with_coma.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_multi_values.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json
index ce4fcb99c7f..ce4fcb99c7f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_multi_values.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_multi_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json
index d98b4c40613..d98b4c40613 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_only_one_setting_when_key_is_provided.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_project_values.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json
index 5486106db4f..5486106db4f 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_project_values.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_project_values.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_property_set.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json
index 327d187331c..327d187331c 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_property_set.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_property_set.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json
index 3da8aaba675..3da8aaba675 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_in_property_set_when_system_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json
index 29261a0ea24..29261a0ea24 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_project_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json
index 29261a0ea24..29261a0ea24 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_secured_and_license_settings_when_system_admin.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_simple_value.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json
index d98b4c40613..d98b4c40613 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_simple_value.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_simple_value.json
diff --git a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_values_even_if_no_property_definition.json b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json
index c3d4ba19dd4..c3d4ba19dd4 100644
--- a/server/sonar-server/src/test/resources/org/sonar/server/config/ws/IndexActionTest/return_values_even_if_no_property_definition.json
+++ b/server/sonar-server/src/test/resources/org/sonar/server/property/ws/IndexActionTest/return_values_even_if_no_property_definition.json