From 0060a276f7fbfd4d317158f490144b3b230746b3 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Mon, 10 May 2010 10:09:29 +0000
Subject: [PATCH] LMS-1527 Use the HttpInvokerUtils support class.
SVN: 15865
---
.../dss/rpc/client/DssServiceRpcFactory.java | 31 +++----------------
1 file changed, 5 insertions(+), 26 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/DssServiceRpcFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/DssServiceRpcFactory.java
index 2acce1abf71..dce530b55a0 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/DssServiceRpcFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/DssServiceRpcFactory.java
@@ -21,19 +21,13 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.net.InetSocketAddress;
import java.util.List;
-import org.apache.commons.lang.time.DateUtils;
-import org.springframework.remoting.httpinvoker.CommonsHttpInvokerRequestExecutor;
-
-import com.marathon.util.spring.StreamSupportingHttpInvokerProxyFactoryBean;
-
import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
import ch.systemsx.cisd.common.ssl.SslCertificateHelper;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.RpcServiceInterfaceDTO;
import ch.systemsx.cisd.openbis.dss.rpc.shared.IRpcService;
import ch.systemsx.cisd.openbis.dss.rpc.shared.IRpcServiceNameServer;
+import ch.systemsx.cisd.openbis.dss.rpc.shared.RpcServiceInterfaceDTO;
/**
* Client-side factory for DssServiceRpc objects.
@@ -65,8 +59,8 @@ public class DssServiceRpcFactory implements IDssServiceRpcFactory
return nameServer.getSupportedInterfaces();
}
- public <T extends IRpcService> T getService(RpcServiceInterfaceDTO iface,
- Class<T> ifaceClazz, String serverURL, boolean getServerCertificateFromServer)
+ public <T extends IRpcService> T getService(RpcServiceInterfaceDTO iface, Class<T> ifaceClazz,
+ String serverURL, boolean getServerCertificateFromServer)
throws IncompatibleAPIVersionsException
{
String serviceURL = serverURL + iface.getInterfaceUrlSuffix();
@@ -136,25 +130,10 @@ class ServiceProxyBuilder<T extends IRpcService>
return service;
}
- // TODO 2010-04-21, Tomasz Pylak: refactor to use
- // HttpInvokerUtils.createStreamSupportingServiceStub()
private T getRawServiceProxy()
{
- final StreamSupportingHttpInvokerProxyFactoryBean httpInvokerProxy =
- new StreamSupportingHttpInvokerProxyFactoryBean();
- httpInvokerProxy.setServiceUrl(serviceURL);
- httpInvokerProxy.setServiceInterface(clazz);
- ((CommonsHttpInvokerRequestExecutor) httpInvokerProxy.getHttpInvokerRequestExecutor())
- .setReadTimeout((int) DateUtils.MILLIS_PER_MINUTE * serverTimeoutMin);
- final InetSocketAddress proxyAddressOrNull = HttpInvokerUtils.tryFindProxy(serviceURL);
- if (proxyAddressOrNull != null)
- {
- ((CommonsHttpInvokerRequestExecutor) httpInvokerProxy.getHttpInvokerRequestExecutor())
- .getHttpClient().getHostConfiguration().setProxy(
- proxyAddressOrNull.getHostName(), proxyAddressOrNull.getPort());
- }
- httpInvokerProxy.afterPropertiesSet();
- return (T) httpInvokerProxy.getObject();
+ return (T) HttpInvokerUtils.createStreamSupportingServiceStub(clazz, serviceURL,
+ serverTimeoutMin);
}
private T wrapProxyInServiceInvocationHandler(T service)
--
GitLab