Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-15 09:46:16 +01:00
Code Issues Packages Projects Releases Activity

use UrlProvider instead of deprecated ScmUrlProvider

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-11-20 13:57:58 +01:00
parent a0a9e2a303
commit b8599e2238
9 changed files with 32 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/AbstractClientHandler.java
View File

@@ -46,6 +46,7 @@ import com.sun.jersey.api.client.GenericType;
import com.sun.jersey.api.client.WebResource; import com.sun.jersey.api.client.WebResource;
import java.util.List; import java.util.List;
import sonia.scm.url.UrlProvider;
/** /**
* *
@@ -316,7 +317,7 @@ public abstract class AbstractClientHandler<T extends ModelObject>
protected JerseyClientSession session; protected JerseyClientSession session;
/** Field description */ /** Field description */
protected ScmUrlProvider urlProvider; protected UrlProvider urlProvider;
/** Field description */ /** Field description */
private Class<T> itemClass; private Class<T> itemClass;

8
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientChangesetHandler.java
View File

@@ -80,8 +80,8 @@ public class JerseyClientChangesetHandler implements ClientChangesetHandler
{ {
ChangesetPagingResult result = null; ChangesetPagingResult result = null;
String url = String url =
session.getUrlProvider().getRepositoryChangesetUrl(repository.getId(), session.getUrlProvider().getRepositoryUrlProvider().getChangesetUrl(
start, limit); repository.getId(), start, limit);
WebResource resource = session.getClient().resource(url); WebResource resource = session.getClient().resource(url);
ClientResponse response = null; ClientResponse response = null;
@@ -121,8 +121,8 @@ public class JerseyClientChangesetHandler implements ClientChangesetHandler
{ {
ChangesetPagingResult result = null; ChangesetPagingResult result = null;
String url = String url =
session.getUrlProvider().getRepositoryChangesetUrl(repository.getId(), session.getUrlProvider().getRepositoryUrlProvider().getChangesetUrl(
path, revision, start, limit); repository.getId(), path, revision, start, limit);
WebResource resource = session.getClient().resource(url); WebResource resource = session.getClient().resource(url);
ClientResponse response = null; ClientResponse response = null;

8
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java
View File

@@ -52,6 +52,8 @@ import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.core.util.MultivaluedMapImpl; import com.sun.jersey.core.util.MultivaluedMapImpl;
import javax.ws.rs.core.MultivaluedMap; 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); 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(); DefaultAhcConfig config = new DefaultAhcConfig();
AhcHttpClient client = AhcHttpClient.create(config); AhcHttpClient client = AhcHttpClient.create(config);
ClientResponse response = null; ClientResponse response = null;
@@ -122,7 +124,7 @@ public class JerseyClientProvider implements ScmClientProvider
if (Util.isNotEmpty(username) && Util.isNotEmpty(password)) if (Util.isNotEmpty(username) && Util.isNotEmpty(password))
{ {
WebResource resource = ClientUtil.createResource(client, WebResource resource = ClientUtil.createResource(client,
urlProvider.getAuthenticationLoginUrl(), urlProvider.getAuthenticationUrl(),
enableLogging); enableLogging);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
@@ -140,7 +142,7 @@ public class JerseyClientProvider implements ScmClientProvider
else else
{ {
WebResource resource = ClientUtil.createResource(client, WebResource resource = ClientUtil.createResource(client,
urlProvider.getAuthenticationUrl(), urlProvider.getStateUrl(),
enableLogging); enableLogging);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())

14
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientRepositoryBrowser.java
View File

@@ -91,8 +91,8 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser
{ {
List<BlameLine> blameLines = null; List<BlameLine> blameLines = null;
String url = String url =
session.getUrlProvider().getBlameUrl(repository.getId(), path, session.getUrlProvider().getRepositoryUrlProvider().getBlameUrl(
revision); repository.getId(), path, revision);
WebResource resource = session.getClient().resource(url); WebResource resource = session.getClient().resource(url);
ClientResponse response = null; ClientResponse response = null;
@@ -134,8 +134,8 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser
{ {
InputStream input = null; InputStream input = null;
String url = String url =
session.getUrlProvider().getRepositoryContentUrl(repository.getId(), session.getUrlProvider().getRepositoryUrlProvider().getContentUrl(
path, revision); repository.getId(), path, revision);
WebResource resource = session.getClient().resource(url); WebResource resource = session.getClient().resource(url);
ClientResponse response = null; ClientResponse response = null;
@@ -171,8 +171,8 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser
{ {
List<FileObjectWrapper> files = null; List<FileObjectWrapper> files = null;
String url = String url =
session.getUrlProvider().getRepositoryBrowseUrl(repository.getId(), path, session.getUrlProvider().getRepositoryUrlProvider().getBrowseUrl(
revision); repository.getId(), path, revision);
WebResource resource = session.getClient().resource(url); WebResource resource = session.getClient().resource(url);
ClientResponse response = null; ClientResponse response = null;
@@ -219,7 +219,7 @@ public class JerseyClientRepositoryBrowser implements ClientRepositoryBrowser
@Override @Override
public List<FileObjectWrapper> getFiles(String revision) public List<FileObjectWrapper> getFiles(String revision)
{ {
return getFiles(revision, ""); return getFiles(revision, Util.EMPTY_STRING);
} }
//~--- fields --------------------------------------------------------------- //~--- fields ---------------------------------------------------------------

7
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientSession.java
View File

@@ -39,6 +39,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.ScmState; import sonia.scm.ScmState;
import sonia.scm.url.UrlProvider;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -65,7 +66,7 @@ public class JerseyClientSession implements ScmClientSession
* @param urlProvider * @param urlProvider
* @param state * @param state
*/ */
public JerseyClientSession(Client client, ScmUrlProvider urlProvider, public JerseyClientSession(Client client, UrlProvider urlProvider,
ScmState state) ScmState state)
{ {
this.client = client; this.client = client;
@@ -146,7 +147,7 @@ public class JerseyClientSession implements ScmClientSession
* *
* @return * @return
*/ */
public ScmUrlProvider getUrlProvider() public UrlProvider getUrlProvider()
{ {
return urlProvider; return urlProvider;
} }
@@ -172,5 +173,5 @@ public class JerseyClientSession implements ScmClientSession
private ScmState state; private ScmState state;
/** Field description */ /** Field description */
private ScmUrlProvider urlProvider; private UrlProvider urlProvider;
} }

4
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyGroupClientHandler.java
View File

@@ -105,7 +105,7 @@ public class JerseyGroupClientHandler extends AbstractClientHandler<Group>
@Override @Override
protected String getItemUrl(String itemId) protected String getItemUrl(String itemId)
{ {
return urlProvider.getGroupUrl(itemId); return urlProvider.getGroupUrlProvider().getDetailUrl(itemId);
} }
/** /**
@@ -117,6 +117,6 @@ public class JerseyGroupClientHandler extends AbstractClientHandler<Group>
@Override @Override
protected String getItemsUrl() protected String getItemsUrl()
{ {
return urlProvider.getGroupsUrl(); return urlProvider.getGroupUrlProvider().getAllUrl();
} }
} }

4
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyRepositoryClientHandler.java
View File

@@ -160,7 +160,7 @@ public class JerseyRepositoryClientHandler
@Override @Override
protected String getItemUrl(String itemId) protected String getItemUrl(String itemId)
{ {
return urlProvider.getRepositoryUrl(itemId); return urlProvider.getRepositoryUrlProvider().getDetailUrl(itemId);
} }
/** /**
@@ -172,6 +172,6 @@ public class JerseyRepositoryClientHandler
@Override @Override
protected String getItemsUrl() protected String getItemsUrl()
{ {
return urlProvider.getRepositoriesUrl(); return urlProvider.getRepositoryUrlProvider().getAllUrl();
} }
} }

4
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyUserClientHandler.java
View File

@@ -105,7 +105,7 @@ public class JerseyUserClientHandler extends AbstractClientHandler<User>
@Override @Override
protected String getItemUrl(String itemId) protected String getItemUrl(String itemId)
{ {
return urlProvider.getUserUrl(itemId); return urlProvider.getUserUrlProvider().getDetailUrl(itemId);
} }
/** /**
@@ -117,6 +117,6 @@ public class JerseyUserClientHandler extends AbstractClientHandler<User>
@Override @Override
protected String getItemsUrl() protected String getItemsUrl()
{ {
return urlProvider.getUsersUrl(); return urlProvider.getUserUrlProvider().getAllUrl();
} }
} }

7
scm-clients/scm-client-impl/src/test/java/sonia/scm/client/it/ClientTestUtil.java
View File

@@ -40,6 +40,7 @@ import sonia.scm.client.JerseyClientProvider;
import sonia.scm.client.JerseyClientSession; import sonia.scm.client.JerseyClientSession;
import sonia.scm.client.ScmUrlProvider; import sonia.scm.client.ScmUrlProvider;
import sonia.scm.config.ScmConfiguration; import sonia.scm.config.ScmConfiguration;
import sonia.scm.url.UrlProvider;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -124,10 +125,10 @@ public class ClientTestUtil
public static void setAnonymousAccess(boolean access) public static void setAnonymousAccess(boolean access)
{ {
JerseyClientSession adminSession = createAdminSession(); JerseyClientSession adminSession = createAdminSession();
ScmUrlProvider up = adminSession.getUrlProvider(); UrlProvider up = adminSession.getUrlProvider();
Client client = adminSession.getClient(); Client client = adminSession.getClient();
WebResource resource = ClientUtil.createResource(client, WebResource resource = ClientUtil.createResource(client, up.getConfigUrl(),
up.getResourceUrl("config"), REQUEST_LOGGING); REQUEST_LOGGING);
ScmConfiguration config = resource.get(ScmConfiguration.class); ScmConfiguration config = resource.get(ScmConfiguration.class);
config.setAnonymousAccessEnabled(access); config.setAnonymousAccessEnabled(access);