From b8599e22388acd52d7d50c85a819685563d989c4 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 20 Nov 2011 13:57:58 +0100 Subject: [PATCH] use UrlProvider instead of deprecated ScmUrlProvider --- .../sonia/scm/client/AbstractClientHandler.java | 3 ++- .../scm/client/JerseyClientChangesetHandler.java | 8 ++++---- .../sonia/scm/client/JerseyClientProvider.java | 8 +++++--- .../scm/client/JerseyClientRepositoryBrowser.java | 14 +++++++------- .../java/sonia/scm/client/JerseyClientSession.java | 7 ++++--- .../sonia/scm/client/JerseyGroupClientHandler.java | 4 ++-- .../scm/client/JerseyRepositoryClientHandler.java | 4 ++-- .../sonia/scm/client/JerseyUserClientHandler.java | 4 ++-- .../java/sonia/scm/client/it/ClientTestUtil.java | 7 ++++--- 9 files changed, 32 insertions(+), 27 deletions(-) diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java index eb4d8a9f15..6deabafb18 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java @@ -46,6 +46,7 @@ import com.sun.jersey.api.client.GenericType; import com.sun.jersey.api.client.WebResource; import java.util.List; +import sonia.scm.url.UrlProvider; /** * @@ -316,7 +317,7 @@ public abstract class AbstractClientHandler protected JerseyClientSession session; /** Field description */ - protected ScmUrlProvider urlProvider; + protected UrlProvider urlProvider; /** Field description */ private Class itemClass; diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientChangesetHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientChangesetHandler.java index f9f7e8beaa..2fffb5afe3 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientChangesetHandler.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientChangesetHandler.java @@ -80,8 +80,8 @@ public class JerseyClientChangesetHandler implements ClientChangesetHandler { ChangesetPagingResult result = null; String url = - session.getUrlProvider().getRepositoryChangesetUrl(repository.getId(), - start, limit); + session.getUrlProvider().getRepositoryUrlProvider().getChangesetUrl( + repository.getId(), start, limit); WebResource resource = session.getClient().resource(url); ClientResponse response = null; @@ -121,8 +121,8 @@ public class JerseyClientChangesetHandler implements ClientChangesetHandler { ChangesetPagingResult result = null; String url = - session.getUrlProvider().getRepositoryChangesetUrl(repository.getId(), - path, revision, start, limit); + session.getUrlProvider().getRepositoryUrlProvider().getChangesetUrl( + repository.getId(), path, revision, start, limit); WebResource resource = session.getClient().resource(url); ClientResponse response = null; diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java index 0b99b03edf..14c8e6f3e5 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java @@ -52,6 +52,8 @@ import com.sun.jersey.api.client.WebResource; import com.sun.jersey.core.util.MultivaluedMapImpl; import javax.ws.rs.core.MultivaluedMap; +import sonia.scm.url.UrlProvider; +import sonia.scm.url.UrlProviderFactory; /** * @@ -114,7 +116,7 @@ public class JerseyClientProvider implements ScmClientProvider logger.info("create new session for {} with username {}", url, user); } - ScmUrlProvider urlProvider = new ScmUrlProvider(url); + UrlProvider urlProvider = UrlProviderFactory.createUrlProvider(url, UrlProviderFactory.TYPE_RESTAPI_XML); DefaultAhcConfig config = new DefaultAhcConfig(); AhcHttpClient client = AhcHttpClient.create(config); ClientResponse response = null; @@ -122,7 +124,7 @@ public class JerseyClientProvider implements ScmClientProvider if (Util.isNotEmpty(username) && Util.isNotEmpty(password)) { WebResource resource = ClientUtil.createResource(client, - urlProvider.getAuthenticationLoginUrl(), + urlProvider.getAuthenticationUrl(), enableLogging); if (logger.isDebugEnabled()) @@ -140,7 +142,7 @@ public class JerseyClientProvider implements ScmClientProvider else { WebResource resource = ClientUtil.createResource(client, - urlProvider.getAuthenticationUrl(), + urlProvider.getStateUrl(), enableLogging); if (logger.isDebugEnabled()) diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java index 985748f0ab..571c30f7db 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java @@ -91,8 +91,8 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser { List blameLines = null; String url = - session.getUrlProvider().getBlameUrl(repository.getId(), path, - revision); + session.getUrlProvider().getRepositoryUrlProvider().getBlameUrl( + repository.getId(), path, revision); WebResource resource = session.getClient().resource(url); ClientResponse response = null; @@ -134,8 +134,8 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser { InputStream input = null; String url = - session.getUrlProvider().getRepositoryContentUrl(repository.getId(), - path, revision); + session.getUrlProvider().getRepositoryUrlProvider().getContentUrl( + repository.getId(), path, revision); WebResource resource = session.getClient().resource(url); ClientResponse response = null; @@ -171,8 +171,8 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser { List files = null; String url = - session.getUrlProvider().getRepositoryBrowseUrl(repository.getId(), path, - revision); + session.getUrlProvider().getRepositoryUrlProvider().getBrowseUrl( + repository.getId(), path, revision); WebResource resource = session.getClient().resource(url); ClientResponse response = null; @@ -219,7 +219,7 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser @Override public List getFiles(String revision) { - return getFiles(revision, ""); + return getFiles(revision, Util.EMPTY_STRING); } //~--- fields --------------------------------------------------------------- diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java index c9ea432b31..7e662bc938 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java @@ -39,6 +39,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import sonia.scm.ScmState; +import sonia.scm.url.UrlProvider; //~--- JDK imports ------------------------------------------------------------ @@ -65,7 +66,7 @@ public class JerseyClientSession implements ScmClientSession * @param urlProvider * @param state */ - public JerseyClientSession(Client client, ScmUrlProvider urlProvider, + public JerseyClientSession(Client client, UrlProvider urlProvider, ScmState state) { this.client = client; @@ -146,7 +147,7 @@ public class JerseyClientSession implements ScmClientSession * * @return */ - public ScmUrlProvider getUrlProvider() + public UrlProvider getUrlProvider() { return urlProvider; } @@ -172,5 +173,5 @@ public class JerseyClientSession implements ScmClientSession private ScmState state; /** Field description */ - private ScmUrlProvider urlProvider; + private UrlProvider urlProvider; } diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyGroupClientHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyGroupClientHandler.java index 5f3969ffc7..0c22798279 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyGroupClientHandler.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyGroupClientHandler.java @@ -105,7 +105,7 @@ public class JerseyGroupClientHandler extends AbstractClientHandler @Override protected String getItemUrl(String itemId) { - return urlProvider.getGroupUrl(itemId); + return urlProvider.getGroupUrlProvider().getDetailUrl(itemId); } /** @@ -117,6 +117,6 @@ public class JerseyGroupClientHandler extends AbstractClientHandler @Override protected String getItemsUrl() { - return urlProvider.getGroupsUrl(); + return urlProvider.getGroupUrlProvider().getAllUrl(); } } diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java index 6309a5b245..4d0efd2869 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java @@ -160,7 +160,7 @@ public class JerseyRepositoryClientHandler @Override protected String getItemUrl(String itemId) { - return urlProvider.getRepositoryUrl(itemId); + return urlProvider.getRepositoryUrlProvider().getDetailUrl(itemId); } /** @@ -172,6 +172,6 @@ public class JerseyRepositoryClientHandler @Override protected String getItemsUrl() { - return urlProvider.getRepositoriesUrl(); + return urlProvider.getRepositoryUrlProvider().getAllUrl(); } } diff --git a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyUserClientHandler.java b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyUserClientHandler.java index c28d3eda70..a353434379 100644 --- a/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyUserClientHandler.java +++ b/scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyUserClientHandler.java @@ -105,7 +105,7 @@ public class JerseyUserClientHandler extends AbstractClientHandler @Override protected String getItemUrl(String itemId) { - return urlProvider.getUserUrl(itemId); + return urlProvider.getUserUrlProvider().getDetailUrl(itemId); } /** @@ -117,6 +117,6 @@ public class JerseyUserClientHandler extends AbstractClientHandler @Override protected String getItemsUrl() { - return urlProvider.getUsersUrl(); + return urlProvider.getUserUrlProvider().getAllUrl(); } } diff --git a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/ClientTestUtil.java b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/ClientTestUtil.java index fc0e47805e..b2efca3439 100644 --- a/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/ClientTestUtil.java +++ b/scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/ClientTestUtil.java @@ -40,6 +40,7 @@ import sonia.scm.client.JerseyClientProvider; import sonia.scm.client.JerseyClientSession; import sonia.scm.client.ScmUrlProvider; import sonia.scm.config.ScmConfiguration; +import sonia.scm.url.UrlProvider; //~--- JDK imports ------------------------------------------------------------ @@ -124,10 +125,10 @@ public class ClientTestUtil public static void setAnonymousAccess(boolean access) { JerseyClientSession adminSession = createAdminSession(); - ScmUrlProvider up = adminSession.getUrlProvider(); + UrlProvider up = adminSession.getUrlProvider(); Client client = adminSession.getClient(); - WebResource resource = ClientUtil.createResource(client, - up.getResourceUrl("config"), REQUEST_LOGGING); + WebResource resource = ClientUtil.createResource(client, up.getConfigUrl(), + REQUEST_LOGGING); ScmConfiguration config = resource.get(ScmConfiguration.class); config.setAnonymousAccessEnabled(access);