Author: olamy
Date: Thu Apr 26 16:51:38 2012
New Revision: 1330957
URL: http://svn.apache.org/viewvc?rev=1330957&view=rev
Log:
add more fluent builder
Modified:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientBuilder.java
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/HttpClientDirectMemoryHttpClient.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
Modified:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientBuilder.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientBuilder.java?rev=1330957&r1=1330956&r2=1330957&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientBuilder.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientBuilder.java
Thu Apr 26 16:51:38 2012
@@ -18,7 +18,9 @@ package org.apache.directmemory.server.c
* under the License.
*/
+import org.apache.directmemory.serialization.Serializer;
import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.ExchangeType;
/**
* @author Olivier Lamy
@@ -50,6 +52,61 @@ public class DirectMemoryClientBuilder
return new DirectMemoryClientBuilder( configuration );
}
+ public DirectMemoryClientBuilder toHost( String host )
+ {
+ this.configuration.setHost( host );
+ return this;
+ }
+
+ public DirectMemoryClientBuilder onPort( int port )
+ {
+ this.configuration.setPort( port );
+ return this;
+ }
+
+ public DirectMemoryClientBuilder toHttpPath( String HttpPath )
+ {
+ this.configuration.setHttpPath( HttpPath );
+ return this;
+ }
+
+ public DirectMemoryClientBuilder withMaxConcurentConnections( int
maxConcurentConnections )
+ {
+ this.configuration.setMaxConcurentConnections( maxConcurentConnections
);
+ return this;
+ }
+
+ public DirectMemoryClientBuilder withConnectionTimeOut( long
connectionTimeOut )
+ {
+ this.configuration.setConnectionTimeOut( connectionTimeOut );
+ return this;
+ }
+
+ public DirectMemoryClientBuilder withReadTimeOut( long readTimeOut )
+ {
+ this.configuration.setReadTimeOut( readTimeOut );
+ return this;
+ }
+
+
+ public DirectMemoryClientBuilder forExchangeType( ExchangeType
exchangeType )
+ {
+ this.configuration.setExchangeType( exchangeType );
+ return this;
+ }
+
+ public DirectMemoryClientBuilder withSerializer( Serializer serializer )
+ {
+ this.configuration.setSerializer( serializer );
+ return this;
+ }
+
+ public DirectMemoryClientBuilder withHttpClientClassName( String
HttpClientClassName )
+ {
+ this.configuration.setHttpClientClassName( HttpClientClassName );
+ return this;
+ }
+
public DirectMemoryClient buildClient()
throws DirectMemoryException
{
@@ -57,6 +114,7 @@ public class DirectMemoryClientBuilder
return new DefaultDirectMemoryClient( this.configuration,
buildDirectMemoryHttpClient() );
}
+
protected DirectMemoryHttpClient buildDirectMemoryHttpClient()
{
try
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=1330957&r1=1330956&r2=1330957&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
Thu Apr 26 16:51:38 2012
@@ -42,7 +42,7 @@ public class DirectMemoryClientConfigura
private String httpPath;
- private int maxConcurentConnection = DEFAULT_MAX_CONCURRENT_CONNECTION;
+ private int maxConcurentConnections = DEFAULT_MAX_CONCURRENT_CONNECTION;
private long connectionTimeOut = DEFAULT_CONNECTION_TIME_OUT;
@@ -93,14 +93,14 @@ public class DirectMemoryClientConfigura
}
- public int getMaxConcurentConnection()
+ public int getMaxConcurentConnections()
{
- return maxConcurentConnection;
+ return maxConcurentConnections;
}
- public DirectMemoryClientConfiguration setMaxConcurentConnection( int
maxConcurentConnection )
+ public DirectMemoryClientConfiguration setMaxConcurentConnections( int
maxConcurentConnections )
{
- this.maxConcurentConnection = maxConcurentConnection;
+ this.maxConcurentConnections = maxConcurentConnections;
return this;
}
@@ -178,7 +178,7 @@ public class DirectMemoryClientConfigura
sb.append( ", host='" ).append( host ).append( '\'' );
sb.append( ", port=" ).append( port );
sb.append( ", httpPath='" ).append( httpPath ).append( '\'' );
- sb.append( ", maxConcurentConnection=" ).append(
maxConcurentConnection );
+ sb.append( ", maxConcurentConnections=" ).append(
maxConcurentConnections );
sb.append( ", connectionTimeOut=" ).append( connectionTimeOut );
sb.append( ", readTimeOut=" ).append( readTimeOut );
sb.append( ", exchangeType=" ).append( exchangeType );
Modified:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java?rev=1330957&r1=1330956&r2=1330957&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java
Thu Apr 26 16:51:38 2012
@@ -65,7 +65,7 @@ public class HttpClientDirectMemoryHttpC
{
this.configuration = configuration;
ThreadSafeClientConnManager threadSafeClientConnManager = new
ThreadSafeClientConnManager();
- threadSafeClientConnManager.setDefaultMaxPerRoute(
configuration.getMaxConcurentConnection() );
+ threadSafeClientConnManager.setDefaultMaxPerRoute(
configuration.getMaxConcurentConnections() );
this.httpClient = new DefaultHttpClient( threadSafeClientConnManager );
}
Modified:
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java?rev=1330957&r1=1330956&r2=1330957&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
Thu Apr 26 16:51:38 2012
@@ -82,6 +82,17 @@ public abstract class AbstractServletWit
.setExchangeType( getExchangeType() );
client = DirectMemoryClientBuilder.newBuilder( configuration
).buildClient();
+
+ // or
+
+ client = DirectMemoryClientBuilder.newBuilder()
+ .toHost( "localhost" )
+ .onPort( port )
+ .toHttpPath( "/direct-memory/DirectMemoryServlet" )
+ .withSerializer( SerializerFactory.createNewSerializer() )
+ .forExchangeType( getExchangeType() )
+ .buildClient();
+
// END SNIPPET: client-configuration
for ( int i = 0; i < 1000000; i++ )
