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

indent

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-11-20 13:59:59 +01:00
parent b8599e2238
commit 4027a824c8
2 changed files with 6 additions and 7 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

@@ -36,6 +36,7 @@ package sonia.scm.client;
//~--- non-JDK imports -------------------------------------------------------- //~--- non-JDK imports --------------------------------------------------------
import sonia.scm.ModelObject; import sonia.scm.ModelObject;
import sonia.scm.url.UrlProvider;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
//~--- JDK imports ------------------------------------------------------------ //~--- JDK imports ------------------------------------------------------------
@@ -46,7 +47,6 @@ 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;
/** /**
* *
@@ -321,6 +321,5 @@ public abstract class AbstractClientHandler<T extends ModelObject>
/** Field description */ /** Field description */
private Class<T> itemClass; private Class<T> itemClass;
; ;
} }

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

@@ -42,6 +42,8 @@ import org.sonatype.spice.jersey.client.ahc.AhcHttpClient;
import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig; import org.sonatype.spice.jersey.client.ahc.config.DefaultAhcConfig;
import sonia.scm.ScmState; import sonia.scm.ScmState;
import sonia.scm.url.UrlProvider;
import sonia.scm.url.UrlProviderFactory;
import sonia.scm.util.AssertUtil; import sonia.scm.util.AssertUtil;
import sonia.scm.util.Util; import sonia.scm.util.Util;
@@ -52,8 +54,6 @@ 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;
/** /**
* *
@@ -116,7 +116,8 @@ 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);
} }
UrlProvider urlProvider = UrlProviderFactory.createUrlProvider(url, UrlProviderFactory.TYPE_RESTAPI_XML); 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;
@@ -142,8 +143,7 @@ public class JerseyClientProvider implements ScmClientProvider
else else
{ {
WebResource resource = ClientUtil.createResource(client, WebResource resource = ClientUtil.createResource(client,
urlProvider.getStateUrl(), urlProvider.getStateUrl(), enableLogging);
enableLogging);
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {