use predefined functions to set http attributes

voldemort · Dec 31, 2011 · d50f090 · d50f090
1 parent de0f853
commit d50f090
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/src/java/voldemort/client/HttpStoreClientFactory.java b/src/java/voldemort/client/HttpStoreClientFactory.java
@@ -29,9 +29,9 @@
 import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
 import org.apache.http.impl.conn.SchemeRegistryFactory;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
 
 import voldemort.client.protocol.RequestFormatFactory;
 import voldemort.client.protocol.RequestFormatType;
@@ -71,15 +71,18 @@ public HttpStoreClientFactory(ClientConfig config) {
 
         this.httpClient = new DefaultHttpClient(mgr);
         HttpParams clientParams = this.httpClient.getParams();
-        clientParams.setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
+
+        HttpProtocolParams.setUserAgent(clientParams, VOLDEMORT_USER_AGENT);
+        HttpProtocolParams.setVersion(clientParams, HttpVersion.HTTP_1_1);
+
         HttpConnectionParams.setConnectionTimeout(clientParams,
                                                   config.getConnectionTimeout(TimeUnit.MILLISECONDS));
         HttpConnectionParams.setSoTimeout(clientParams,
                                           config.getSocketTimeout(TimeUnit.MILLISECONDS));
+        HttpConnectionParams.setStaleCheckingEnabled(clientParams, false);
+
         this.httpClient.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0, false));
         HttpClientParams.setCookiePolicy(clientParams, CookiePolicy.IGNORE_COOKIES);
-        clientParams.setParameter(CoreProtocolPNames.USER_AGENT, VOLDEMORT_USER_AGENT);
-        HttpConnectionParams.setStaleCheckingEnabled(clientParams, false);
 
         this.reroute = config.getRoutingTier().equals(RoutingTier.SERVER);
         this.requestFormatFactory = new RequestFormatFactory();

diff --git a/test/integration/voldemort/performance/HttpClientBench.java b/test/integration/voldemort/performance/HttpClientBench.java
@@ -28,10 +28,9 @@
 import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
 import org.apache.http.impl.conn.SchemeRegistryFactory;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.apache.http.params.CoreConnectionPNames;
-import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
 
 import voldemort.utils.VoldemortIOUtils;
 
@@ -86,15 +85,13 @@ private static HttpClient createClient() {
 
         HttpParams clientParams = httpClient.getParams();
 
-        clientParams.setBooleanParameter(CoreConnectionPNames.TCP_NODELAY, false);
-
-        clientParams.setIntParameter(CoreConnectionPNames.SOCKET_BUFFER_SIZE, 60000);
-        clientParams.setParameter(CoreProtocolPNames.USER_AGENT, VOLDEMORT_USER_AGENT);
+        HttpConnectionParams.setSocketBufferSize(clientParams, 60000);
+        HttpConnectionParams.setTcpNoDelay(clientParams, false);
+        HttpProtocolParams.setUserAgent(clientParams, VOLDEMORT_USER_AGENT);
+        HttpProtocolParams.setVersion(clientParams, HttpVersion.HTTP_1_1);
         // HostConfiguration hostConfig = new HostConfiguration();
         // hostConfig.setHost("localhost");
 
-        clientParams.setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
-
         HttpConnectionParams.setConnectionTimeout(clientParams, DEFAULT_CONNECTION_MANAGER_TIMEOUT);
         HttpConnectionParams.setSoTimeout(clientParams, 500);
         httpClient.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0, false));

diff --git a/test/integration/voldemort/performance/RemoteStoreComparisonTest.java b/test/integration/voldemort/performance/RemoteStoreComparisonTest.java
@@ -25,9 +25,9 @@
 import org.apache.http.impl.client.DefaultHttpRequestRetryHandler;
 import org.apache.http.impl.conn.SchemeRegistryFactory;
 import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
-import org.apache.http.params.CoreProtocolPNames;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
+import org.apache.http.params.HttpProtocolParams;
 
 import voldemort.ServerTestUtils;
 import voldemort.TestUtils;
@@ -168,8 +168,9 @@ public void doOperation(int i) {
         HttpParams clientParams = httpClient.getParams();
         httpClient.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0, false));
         HttpClientParams.setCookiePolicy(clientParams, CookiePolicy.IGNORE_COOKIES);
-        clientParams.setParameter(CoreProtocolPNames.USER_AGENT, "test-agent");
-        clientParams.setParameter(CoreProtocolPNames.PROTOCOL_VERSION, HttpVersion.HTTP_1_1);
+        HttpProtocolParams.setUserAgent(clientParams, "test-agent");
+        HttpProtocolParams.setVersion(clientParams, HttpVersion.HTTP_1_1);
+
         HttpConnectionParams.setConnectionTimeout(clientParams, 10000);
 
         connectionManager.setMaxTotal(numThreads);