diff options
44 files changed, 96 insertions, 68 deletions
diff --git a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/plugins/xoo/rules/XooRuleDefinitions.java b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/plugins/xoo/rules/XooRuleDefinitions.java index 8b628604345..ba60b4bbbdc 100644 --- a/plugins/sonar-xoo-plugin/src/main/java/org/sonar/plugins/xoo/rules/XooRuleDefinitions.java +++ b/plugins/sonar-xoo-plugin/src/main/java/org/sonar/plugins/xoo/rules/XooRuleDefinitions.java @@ -19,8 +19,8 @@ */ package org.sonar.plugins.xoo.rules; -import org.sonar.api.rule.RuleDefinitions; -import org.sonar.api.rule.RuleParamType; +import org.sonar.api.server.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleParamType; import org.sonar.plugins.xoo.base.XooConstants; import org.sonar.plugins.xoo.base.XooRuleKeys; diff --git a/plugins/sonar-xoo-plugin/src/test/java/org/sonar/plugins/xoo/rules/XooRuleDefinitionsTest.java b/plugins/sonar-xoo-plugin/src/test/java/org/sonar/plugins/xoo/rules/XooRuleDefinitionsTest.java index 5b77d0de4ec..5ca6394ab1f 100644 --- a/plugins/sonar-xoo-plugin/src/test/java/org/sonar/plugins/xoo/rules/XooRuleDefinitionsTest.java +++ b/plugins/sonar-xoo-plugin/src/test/java/org/sonar/plugins/xoo/rules/XooRuleDefinitionsTest.java @@ -20,8 +20,8 @@ package org.sonar.plugins.xoo.rules; import org.junit.Test; -import org.sonar.api.rule.RuleDefinitions; -import org.sonar.api.rule.RuleDefinitions.Repository; +import org.sonar.api.server.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitions.Repository; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleDefinitions.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitions.java index 85bb7bddec6..253e234a754 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleDefinitions.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitions.java @@ -17,12 +17,13 @@ * 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.api.rule; +package org.sonar.api.server.rule; import com.google.common.collect.*; import org.apache.commons.lang.StringUtils; import org.slf4j.LoggerFactory; import org.sonar.api.ServerExtension; +import org.sonar.api.rule.Severity; import javax.annotation.CheckForNull; import javax.annotation.Nullable; @@ -325,7 +326,7 @@ public interface RuleDefinitions extends ServerExtension { } /** - * @see org.sonar.api.rule.RuleTagFormat + * @see RuleTagFormat */ public NewRule addTags(String... list) { for (String tag : list) { @@ -336,7 +337,7 @@ public interface RuleDefinitions extends ServerExtension { } /** - * @see org.sonar.api.rule.RuleTagFormat + * @see RuleTagFormat */ public NewRule setTags(String... list) { tags.clear(); @@ -442,7 +443,7 @@ public interface RuleDefinitions extends ServerExtension { } /** - * @see org.sonar.api.rule.RuleDefinitions.NewRule#setMetadata(String) + * @see RuleDefinitions.NewRule#setMetadata(String) */ @CheckForNull public String metadata() { diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleDefinitionsFromAnnotations.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitionsFromAnnotations.java index 94a8f5bf5ca..fbc8c237175 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleDefinitionsFromAnnotations.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitionsFromAnnotations.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.api.rule; +package org.sonar.api.server.rule; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Function; @@ -36,7 +36,7 @@ import java.util.List; /** * Read definitions of rules based on the annotations provided by sonar-check-api. * </p> - * It is internally used by {@link org.sonar.api.rule.RuleDefinitions} and can't be directly + * It is internally used by {@link RuleDefinitions} and can't be directly * used by plugins. * * @since 4.2 diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleDefinitionsFromXml.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitionsFromXml.java index b53904cceff..a035baf870b 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleDefinitionsFromXml.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleDefinitionsFromXml.java @@ -17,13 +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.api.rule; +package org.sonar.api.server.rule; import com.google.common.io.Closeables; import org.apache.commons.lang.StringUtils; import org.codehaus.staxmate.SMInputFactory; import org.codehaus.staxmate.in.SMHierarchicCursor; import org.codehaus.staxmate.in.SMInputCursor; +import org.sonar.api.rule.Severity; import org.sonar.check.Cardinality; import javax.xml.stream.XMLInputFactory; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleParamType.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleParamType.java index 8b9b4fe8eb0..917484512f3 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleParamType.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleParamType.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.api.rule; +package org.sonar.api.server.rule; import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleTagFormat.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleTagFormat.java index 998a31950d8..987b5f15f4d 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/rule/RuleTagFormat.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/RuleTagFormat.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.api.rule; +package org.sonar.api.server.rule; import org.apache.commons.lang.StringUtils; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/package-info.java new file mode 100644 index 00000000000..de7f1332fa1 --- /dev/null +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/rule/package-info.java @@ -0,0 +1,23 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2013 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube 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. + * + * SonarQube 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.api.server.rule; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/Request.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.java index 0aac4f12665..327c0557ba0 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/Request.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Request.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.api.web.ws; +package org.sonar.api.server.ws; import javax.annotation.CheckForNull; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/RequestHandler.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/RequestHandler.java index c7cc37ad1a2..48f76926b81 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/RequestHandler.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/RequestHandler.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.api.web.ws; +package org.sonar.api.server.ws; import org.sonar.api.ServerExtension; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/Response.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Response.java index 6bcb3e75443..59209cbee40 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/Response.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/Response.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.api.web.ws; +package org.sonar.api.server.ws; import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.utils.text.XmlWriter; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/SimpleRequest.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/SimpleRequest.java index 5a89ca46dd6..9840b8abdcb 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/SimpleRequest.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/SimpleRequest.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.api.web.ws; +package org.sonar.api.server.ws; import com.google.common.collect.Maps; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/SimpleResponse.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/SimpleResponse.java index 0e70a571657..c6ae01d17b9 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/SimpleResponse.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/SimpleResponse.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.api.web.ws; +package org.sonar.api.server.ws; import org.apache.commons.io.Charsets; import org.sonar.api.utils.text.JsonWriter; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/WebService.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.java index 0b8c680891e..94758d46d77 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/WebService.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/WebService.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.api.web.ws; +package org.sonar.api.server.ws; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/package-info.java b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/package-info.java index b5fcdf6e8d1..0e1d131890e 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/web/ws/package-info.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/server/ws/package-info.java @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ @ParametersAreNonnullByDefault -package org.sonar.api.web.ws; +package org.sonar.api.server.ws; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleDefinitionsFromAnnotationsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsFromAnnotationsTest.java index e3007ccbbb1..f07d99866f2 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleDefinitionsFromAnnotationsTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsFromAnnotationsTest.java @@ -17,11 +17,15 @@ * 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.api.rule; +package org.sonar.api.server.rule; import org.junit.Ignore; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.api.rule.Severity; +import org.sonar.api.server.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitionsFromAnnotations; +import org.sonar.api.server.rule.RuleParamType; import org.sonar.check.Priority; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleDefinitionsFromXmlTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest.java index 97fa34fa4e1..a9e71d8eee7 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleDefinitionsFromXmlTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest.java @@ -17,11 +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.api.rule; +package org.sonar.api.server.rule; import com.google.common.base.Charsets; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.sonar.api.rule.Severity; import java.io.InputStreamReader; import java.io.Reader; @@ -45,7 +46,7 @@ public class RuleDefinitionsFromXmlTest { @Test public void should_parse_xml() throws Exception { - InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/sonar/api/rule/RuleDefinitionsFromXmlTest/rules.xml"), Charsets.UTF_8.name()); + InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/rules.xml"), Charsets.UTF_8.name()); RuleDefinitions.Repository repository = load(reader); assertThat(repository.rules()).hasSize(2); @@ -94,7 +95,7 @@ public class RuleDefinitionsFromXmlTest { @Test public void test_utf8_encoding() throws UnsupportedEncodingException { - InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/sonar/api/rule/RuleDefinitionsFromXmlTest/utf8.xml"), Charsets.UTF_8.name()); + InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/utf8.xml"), Charsets.UTF_8.name()); RuleDefinitions.Repository repository = load(reader); assertThat(repository.rules()).hasSize(1); @@ -109,7 +110,7 @@ public class RuleDefinitionsFromXmlTest { @Test public void should_support_deprecated_format() throws UnsupportedEncodingException { // the deprecated format uses some attributes instead of nodes - InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/sonar/api/rule/RuleDefinitionsFromXmlTest/deprecated.xml"), Charsets.UTF_8.name()); + InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/deprecated.xml"), Charsets.UTF_8.name()); RuleDefinitions.Repository repository = load(reader); assertThat(repository.rules()).hasSize(1); diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleDefinitionsTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsTest.java index 9245e4163c3..88a5ca34a0f 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleDefinitionsTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleDefinitionsTest.java @@ -17,9 +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.api.rule; +package org.sonar.api.server.rule; import org.junit.Test; +import org.sonar.api.rule.Severity; +import org.sonar.api.server.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleParamType; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleParamTypeTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleParamTypeTest.java index 0df7557487e..2b7558a201d 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleParamTypeTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleParamTypeTest.java @@ -17,10 +17,10 @@ * 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.api.rule; +package org.sonar.api.server.rule; import org.junit.Test; -import org.sonar.api.PropertyType; +import org.sonar.api.server.rule.RuleParamType; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleTagFormatTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleTagFormatTest.java index 3197d4eca16..735f3f3c4df 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/rule/RuleTagFormatTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/rule/RuleTagFormatTest.java @@ -17,9 +17,10 @@ * 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.api.rule; +package org.sonar.api.server.rule; import org.junit.Test; +import org.sonar.api.server.rule.RuleTagFormat; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/web/ws/SimpleRequestTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/SimpleRequestTest.java index b6120c5cc39..d9e5bcafa38 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/web/ws/SimpleRequestTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/SimpleRequestTest.java @@ -17,12 +17,10 @@ * 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.api.web.ws; +package org.sonar.api.server.ws; import com.google.common.collect.ImmutableMap; import org.junit.Test; -import org.sonar.api.web.ws.Request; -import org.sonar.api.web.ws.SimpleRequest; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-plugin-api/src/test/java/org/sonar/api/web/ws/WebServiceTest.java b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/WebServiceTest.java index 0485597ee18..d962f6b4779 100644 --- a/sonar-plugin-api/src/test/java/org/sonar/api/web/ws/WebServiceTest.java +++ b/sonar-plugin-api/src/test/java/org/sonar/api/server/ws/WebServiceTest.java @@ -17,13 +17,9 @@ * 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.api.web.ws; +package org.sonar.api.server.ws; import org.junit.Test; -import org.sonar.api.web.ws.Request; -import org.sonar.api.web.ws.RequestHandler; -import org.sonar.api.web.ws.Response; -import org.sonar.api.web.ws.WebService; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/rule/RuleDefinitionsFromXmlTest/deprecated.xml b/sonar-plugin-api/src/test/resources/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/deprecated.xml index 2938ea70377..2938ea70377 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/rule/RuleDefinitionsFromXmlTest/deprecated.xml +++ b/sonar-plugin-api/src/test/resources/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/deprecated.xml diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/rule/RuleDefinitionsFromXmlTest/rules.xml b/sonar-plugin-api/src/test/resources/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/rules.xml index 6be8619b93f..6be8619b93f 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/rule/RuleDefinitionsFromXmlTest/rules.xml +++ b/sonar-plugin-api/src/test/resources/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/rules.xml diff --git a/sonar-plugin-api/src/test/resources/org/sonar/api/rule/RuleDefinitionsFromXmlTest/utf8.xml b/sonar-plugin-api/src/test/resources/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/utf8.xml index 6197e030057..6197e030057 100644 --- a/sonar-plugin-api/src/test/resources/org/sonar/api/rule/RuleDefinitionsFromXmlTest/utf8.xml +++ b/sonar-plugin-api/src/test/resources/org/sonar/api/server/rule/RuleDefinitionsFromXmlTest/utf8.xml diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java index 497aa1bf371..f35dfc24f85 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileActiveRuleOperations.java @@ -26,7 +26,7 @@ import org.apache.ibatis.session.SqlSession; import org.elasticsearch.common.base.Predicate; import org.elasticsearch.common.collect.Iterables; import org.sonar.api.ServerComponent; -import org.sonar.api.rule.RuleParamType; +import org.sonar.api.server.rule.RuleParamType; import org.sonar.api.rule.Severity; import org.sonar.api.rules.RulePriority; import org.sonar.api.utils.System2; diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRule.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRule.java index 67dcd03c4bf..1b22e99c01f 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRule.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRule.java @@ -23,7 +23,7 @@ import org.apache.commons.lang.builder.ReflectionToStringBuilder; import org.elasticsearch.common.collect.Lists; import org.elasticsearch.common.collect.Maps; import org.elasticsearch.common.joda.time.format.ISODateTimeFormat; -import org.sonar.api.rule.RuleParamType; +import org.sonar.api.server.rule.RuleParamType; import org.sonar.check.Cardinality; import org.sonar.server.rule.ActiveRuleDocument; import org.sonar.server.rule.RuleDocument; diff --git a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleParam.java b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleParam.java index 36285357f0f..f46d52e3907 100644 --- a/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleParam.java +++ b/sonar-server/src/main/java/org/sonar/server/qualityprofile/QProfileRuleParam.java @@ -20,7 +20,7 @@ package org.sonar.server.qualityprofile; import org.apache.commons.lang.builder.ReflectionToStringBuilder; -import org.sonar.api.rule.RuleParamType; +import org.sonar.api.server.rule.RuleParamType; import javax.annotation.CheckForNull; import javax.annotation.Nullable; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java b/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java index d8d373e639f..6ec08b88d2e 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/DeprecatedRuleDefinitions.java @@ -20,8 +20,8 @@ package org.sonar.server.rule; import org.apache.commons.lang.StringUtils; -import org.sonar.api.rule.RuleDefinitions; -import org.sonar.api.rule.RuleParamType; +import org.sonar.api.server.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleParamType; import org.sonar.api.rules.RuleParam; import org.sonar.api.rules.RuleRepository; import org.sonar.check.Cardinality; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java index a9f1bc71b77..9cfe6da71a5 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleDefinitionsLoader.java @@ -20,7 +20,7 @@ package org.sonar.server.rule; import org.sonar.api.ServerComponent; -import org.sonar.api.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitions; /** * Loads all instances of RuleDefinitions and initializes RuleRepositories. Used at server startup. diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java index dca8898555e..56501c76cb1 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRegistration.java @@ -26,7 +26,7 @@ import org.apache.ibatis.session.SqlSession; import org.picocontainer.Startable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.sonar.api.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitions; import org.sonar.api.rule.RuleKey; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java index 8a4882fc91a..ee71287ff67 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleRepositories.java @@ -24,7 +24,7 @@ import com.google.common.collect.ImmutableSetMultimap; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.SetMultimap; import org.sonar.api.ServerComponent; -import org.sonar.api.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitions; import javax.annotation.CheckForNull; import java.util.Collection; diff --git a/sonar-server/src/main/java/org/sonar/server/rule/RuleWebService.java b/sonar-server/src/main/java/org/sonar/server/rule/RuleWebService.java index e40c69a89b3..de35e668469 100644 --- a/sonar-server/src/main/java/org/sonar/server/rule/RuleWebService.java +++ b/sonar-server/src/main/java/org/sonar/server/rule/RuleWebService.java @@ -19,10 +19,10 @@ */ package org.sonar.server.rule; -import org.sonar.api.web.ws.Request; -import org.sonar.api.web.ws.RequestHandler; -import org.sonar.api.web.ws.Response; -import org.sonar.api.web.ws.WebService; +import org.sonar.api.server.ws.Request; +import org.sonar.api.server.ws.RequestHandler; +import org.sonar.api.server.ws.Response; +import org.sonar.api.server.ws.WebService; public class RuleWebService implements WebService { diff --git a/sonar-server/src/main/java/org/sonar/server/ws/ListingWebService.java b/sonar-server/src/main/java/org/sonar/server/ws/ListingWebService.java index 9d5afcbc995..407d1dcc762 100644 --- a/sonar-server/src/main/java/org/sonar/server/ws/ListingWebService.java +++ b/sonar-server/src/main/java/org/sonar/server/ws/ListingWebService.java @@ -20,10 +20,10 @@ package org.sonar.server.ws; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.api.web.ws.Request; -import org.sonar.api.web.ws.RequestHandler; -import org.sonar.api.web.ws.Response; -import org.sonar.api.web.ws.WebService; +import org.sonar.api.server.ws.Request; +import org.sonar.api.server.ws.RequestHandler; +import org.sonar.api.server.ws.Response; +import org.sonar.api.server.ws.WebService; import java.util.List; diff --git a/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java b/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java index e38e53975b3..d8c62790c92 100644 --- a/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java +++ b/sonar-server/src/main/java/org/sonar/server/ws/ServletRequest.java @@ -19,7 +19,7 @@ */ package org.sonar.server.ws; -import org.sonar.api.web.ws.Request; +import org.sonar.api.server.ws.Request; import javax.servlet.http.HttpServletRequest; diff --git a/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java b/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java index 97c03a98989..448bf213b6f 100644 --- a/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java +++ b/sonar-server/src/main/java/org/sonar/server/ws/ServletResponse.java @@ -21,7 +21,7 @@ package org.sonar.server.ws; import org.sonar.api.utils.text.JsonWriter; import org.sonar.api.utils.text.XmlWriter; -import org.sonar.api.web.ws.Response; +import org.sonar.api.server.ws.Response; import javax.servlet.http.HttpServletResponse; import java.io.IOException; diff --git a/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java b/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java index 84037f4e460..b1556e57094 100644 --- a/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java +++ b/sonar-server/src/main/java/org/sonar/server/ws/WebServiceEngine.java @@ -22,9 +22,9 @@ package org.sonar.server.ws; import org.picocontainer.Startable; import org.sonar.api.ServerComponent; import org.sonar.api.utils.text.JsonWriter; -import org.sonar.api.web.ws.Request; -import org.sonar.api.web.ws.Response; -import org.sonar.api.web.ws.WebService; +import org.sonar.api.server.ws.Request; +import org.sonar.api.server.ws.Response; +import org.sonar.api.server.ws.WebService; import javax.servlet.http.HttpServletResponse; import java.util.List; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java b/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java index ff92599b5ce..d44951a21a1 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/DeprecatedRuleDefinitionsTest.java @@ -20,7 +20,7 @@ package org.sonar.server.rule; import org.junit.Test; -import org.sonar.api.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitions; import org.sonar.api.rule.Severity; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RulePriority; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java index 8433bce0713..3743c6991fd 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleDefinitionsLoaderTest.java @@ -20,7 +20,7 @@ package org.sonar.server.rule; import org.junit.Test; -import org.sonar.api.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitions; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java index 4975e8476d3..6bb253002c3 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRegistrationTest.java @@ -22,7 +22,7 @@ package org.sonar.server.rule; import org.junit.Before; import org.junit.Test; -import org.sonar.api.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitions; import org.sonar.api.rule.Severity; import org.sonar.core.persistence.AbstractDaoTestCase; import org.sonar.core.persistence.MyBatis; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java index 3113e1a5f41..5d2fcff8d0b 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleRepositoriesTest.java @@ -20,7 +20,7 @@ package org.sonar.server.rule; import org.junit.Test; -import org.sonar.api.rule.RuleDefinitions; +import org.sonar.api.server.rule.RuleDefinitions; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-server/src/test/java/org/sonar/server/rule/RuleWebServiceTest.java b/sonar-server/src/test/java/org/sonar/server/rule/RuleWebServiceTest.java index 0700df79516..69e9c4bdc5d 100644 --- a/sonar-server/src/test/java/org/sonar/server/rule/RuleWebServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/rule/RuleWebServiceTest.java @@ -22,10 +22,10 @@ package org.sonar.server.rule; import org.apache.commons.io.IOUtils; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; -import org.sonar.api.web.ws.RequestHandler; -import org.sonar.api.web.ws.SimpleRequest; -import org.sonar.api.web.ws.SimpleResponse; -import org.sonar.api.web.ws.WebService; +import org.sonar.api.server.ws.RequestHandler; +import org.sonar.api.server.ws.SimpleRequest; +import org.sonar.api.server.ws.SimpleResponse; +import org.sonar.api.server.ws.WebService; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-server/src/test/java/org/sonar/server/ws/ListingWebServiceTest.java b/sonar-server/src/test/java/org/sonar/server/ws/ListingWebServiceTest.java index 95227dd8dc6..915f2edca5d 100644 --- a/sonar-server/src/test/java/org/sonar/server/ws/ListingWebServiceTest.java +++ b/sonar-server/src/test/java/org/sonar/server/ws/ListingWebServiceTest.java @@ -22,7 +22,7 @@ package org.sonar.server.ws; import org.apache.commons.io.IOUtils; import org.junit.Test; import org.skyscreamer.jsonassert.JSONAssert; -import org.sonar.api.web.ws.*; +import org.sonar.api.server.ws.*; import static org.fest.assertions.Assertions.assertThat; diff --git a/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java b/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java index 5565f7e1598..727f07d2627 100644 --- a/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java +++ b/sonar-server/src/test/java/org/sonar/server/ws/WebServiceEngineTest.java @@ -22,7 +22,7 @@ package org.sonar.server.ws; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.sonar.api.web.ws.*; +import org.sonar.api.server.ws.*; import static org.fest.assertions.Assertions.assertThat; |