From dc080ba936f22f60ddd8de75e9deedd9899f9428 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Vilain Date: Tue, 16 Jul 2013 17:07:03 +0200 Subject: [PATCH] Moved non-exposed implementation classes to internal package --- .../src/main/java/org/sonar/wsclient/SonarClient.java | 4 ++-- .../permissions/{ => internal}/DefaultPermissionClient.java | 4 +++- .../src/main/java/org/sonar/wsclient/user/UserQuery.java | 2 +- .../wsclient/user/{ => internal}/DefaultUserClient.java | 6 +++++- .../src/test/java/org/sonar/wsclient/SonarClientTest.java | 4 ++-- .../wsclient/permissions/DefaultPermissionClientTest.java | 1 + .../java/org/sonar/wsclient/user/DefaultUserClientTest.java | 1 + 7 files changed, 15 insertions(+), 7 deletions(-) rename sonar-ws-client/src/main/java/org/sonar/wsclient/permissions/{ => internal}/DefaultPermissionClient.java (91%) rename sonar-ws-client/src/main/java/org/sonar/wsclient/user/{ => internal}/DefaultUserClient.java (93%) diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/SonarClient.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/SonarClient.java index f0bf2e077bf..830dce49eae 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/SonarClient.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/SonarClient.java @@ -24,10 +24,10 @@ import org.sonar.wsclient.issue.ActionPlanClient; import org.sonar.wsclient.issue.IssueClient; import org.sonar.wsclient.issue.internal.DefaultActionPlanClient; import org.sonar.wsclient.issue.internal.DefaultIssueClient; -import org.sonar.wsclient.permissions.DefaultPermissionClient; import org.sonar.wsclient.permissions.PermissionClient; -import org.sonar.wsclient.user.DefaultUserClient; +import org.sonar.wsclient.permissions.internal.DefaultPermissionClient; import org.sonar.wsclient.user.UserClient; +import org.sonar.wsclient.user.internal.DefaultUserClient; import javax.annotation.Nullable; diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/permissions/DefaultPermissionClient.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/permissions/internal/DefaultPermissionClient.java similarity index 91% rename from sonar-ws-client/src/main/java/org/sonar/wsclient/permissions/DefaultPermissionClient.java rename to sonar-ws-client/src/main/java/org/sonar/wsclient/permissions/internal/DefaultPermissionClient.java index 9bb4a6fcaa2..18b568b1847 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/permissions/DefaultPermissionClient.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/permissions/internal/DefaultPermissionClient.java @@ -18,9 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -package org.sonar.wsclient.permissions; +package org.sonar.wsclient.permissions.internal; import org.sonar.wsclient.internal.HttpRequestFactory; +import org.sonar.wsclient.permissions.PermissionClient; +import org.sonar.wsclient.permissions.PermissionParameters; public class DefaultPermissionClient implements PermissionClient { diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/user/UserQuery.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/user/UserQuery.java index 5060a2fee2a..2c0b2f53264 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/user/UserQuery.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/user/UserQuery.java @@ -58,7 +58,7 @@ public class UserQuery { return this; } - Map urlParams() { + public Map urlParams() { return params; } } diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/user/DefaultUserClient.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/user/internal/DefaultUserClient.java similarity index 93% rename from sonar-ws-client/src/main/java/org/sonar/wsclient/user/DefaultUserClient.java rename to sonar-ws-client/src/main/java/org/sonar/wsclient/user/internal/DefaultUserClient.java index 676676d0985..5b4fd891a2d 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/user/DefaultUserClient.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/user/internal/DefaultUserClient.java @@ -17,10 +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.wsclient.user; +package org.sonar.wsclient.user.internal; import org.json.simple.JSONValue; import org.sonar.wsclient.internal.HttpRequestFactory; +import org.sonar.wsclient.user.User; +import org.sonar.wsclient.user.UserClient; +import org.sonar.wsclient.user.UserParameters; +import org.sonar.wsclient.user.UserQuery; import java.util.ArrayList; import java.util.HashMap; diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/SonarClientTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/SonarClientTest.java index 667b6b9a1db..eab25a50d34 100644 --- a/sonar-ws-client/src/test/java/org/sonar/wsclient/SonarClientTest.java +++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/SonarClientTest.java @@ -22,8 +22,8 @@ package org.sonar.wsclient; import org.junit.Test; import org.sonar.wsclient.issue.internal.DefaultActionPlanClient; import org.sonar.wsclient.issue.internal.DefaultIssueClient; -import org.sonar.wsclient.permissions.DefaultPermissionClient; -import org.sonar.wsclient.user.DefaultUserClient; +import org.sonar.wsclient.permissions.internal.DefaultPermissionClient; +import org.sonar.wsclient.user.internal.DefaultUserClient; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/permissions/DefaultPermissionClientTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/permissions/DefaultPermissionClientTest.java index b3a6a572f72..cfff8516dde 100644 --- a/sonar-ws-client/src/test/java/org/sonar/wsclient/permissions/DefaultPermissionClientTest.java +++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/permissions/DefaultPermissionClientTest.java @@ -25,6 +25,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.wsclient.MockHttpServerInterceptor; import org.sonar.wsclient.internal.HttpRequestFactory; +import org.sonar.wsclient.permissions.internal.DefaultPermissionClient; import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.MapAssert.entry; diff --git a/sonar-ws-client/src/test/java/org/sonar/wsclient/user/DefaultUserClientTest.java b/sonar-ws-client/src/test/java/org/sonar/wsclient/user/DefaultUserClientTest.java index 7056a2d32e7..18dbd05c55d 100644 --- a/sonar-ws-client/src/test/java/org/sonar/wsclient/user/DefaultUserClientTest.java +++ b/sonar-ws-client/src/test/java/org/sonar/wsclient/user/DefaultUserClientTest.java @@ -24,6 +24,7 @@ import org.junit.Rule; import org.junit.Test; import org.sonar.wsclient.MockHttpServerInterceptor; import org.sonar.wsclient.internal.HttpRequestFactory; +import org.sonar.wsclient.user.internal.DefaultUserClient; import java.util.Arrays; import java.util.List; -- 2.39.5