Author: olamy
Date: Tue May 22 22:53:38 2012
New Revision: 1341672
URL: http://svn.apache.org/viewvc?rev=1341672&view=rev
Log:
it must be possible to configure http provider used by async http client
Modified:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/providers/asynchttpclient/AsyncHttpClientDirectMemoryHttpClient.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AsyncHttpClientTest.java
Modified:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java?rev=1341672&r1=1341671&r2=1341672&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java
Tue May 22 22:53:38 2012
@@ -54,6 +54,12 @@ public class DirectMemoryClientConfigura
private String httpClientClassName =
DirectMemoryClientBuilder.DEFAULT_HTTP_CLIENT_INSTANCE;
+ /**
+ * http provider class for async http client
+ * default value is <code>NettyAsyncHttpProvider</code>
+ */
+ private String httpProviderClassName = null;
+
public DirectMemoryClientConfiguration()
{
// no op
@@ -170,6 +176,17 @@ public class DirectMemoryClientConfigura
return this;
}
+ public String getHttpProviderClassName()
+ {
+ return httpProviderClassName;
+ }
+
+ public DirectMemoryClientConfiguration setHttpProviderClassName( String
httpProviderClassName )
+ {
+ this.httpProviderClassName = httpProviderClassName;
+ return this;
+ }
+
@Override
public String toString()
{
Modified:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/providers/asynchttpclient/AsyncHttpClientDirectMemoryHttpClient.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/providers/asynchttpclient/AsyncHttpClientDirectMemoryHttpClient.java?rev=1341672&r1=1341671&r2=1341672&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/providers/asynchttpclient/AsyncHttpClientDirectMemoryHttpClient.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/providers/asynchttpclient/AsyncHttpClientDirectMemoryHttpClient.java
Tue May 22 22:53:38 2012
@@ -58,7 +58,11 @@ public class AsyncHttpClientDirectMemory
builder.setConnectionTimeoutInMs( (int)
configuration.getConnectionTimeOut() );
builder.setMaximumConnectionsTotal(
configuration.getMaxConcurentConnections() );
- asyncHttpClient = new AsyncHttpClient(
NettyAsyncHttpProvider.class.getName(), builder.build() );
+ String httpProviderClassName =
configuration.getHttpProviderClassName();
+
+ asyncHttpClient = new AsyncHttpClient(
+ httpProviderClassName != null ? httpProviderClassName :
NettyAsyncHttpProvider.class.getName(),
+ builder.build() );
}
Modified:
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AsyncHttpClientTest.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AsyncHttpClientTest.java?rev=1341672&r1=1341671&r2=1341672&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AsyncHttpClientTest.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AsyncHttpClientTest.java
Tue May 22 22:53:38 2012
@@ -57,6 +57,7 @@ public class AsyncHttpClientTest
JUnitCore core = new JUnitCore();
core.run( ServletWithClientBinaryTypeTest.class );
-
+ core.run( ServletWithClientTextPlainTypeTest.class );
+ core.run( ServletWithClientJsonTypeTest.class );
}
}
