[03/24] knox git commit: KNOX-738 - Remove references to deprecated httpclient class DefaultHttpClient

2017-09-08 Thread more 
KNOX-738 - Remove references to deprecated httpclient class DefaultHttpClient


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/f1bbea9b
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/f1bbea9b
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/f1bbea9b

Branch: refs/heads/KNOX-998-Package_Restructuring
Commit: f1bbea9b73d0e24454cf65a3c015b083f9247aa2
Parents: 8412952
Author: Colm O hEigeartaigh 
Authored: Thu Aug 31 10:33:35 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Aug 31 10:33:35 2017 +0100

--
 .../ha/dispatch/DefaultHaDispatchTest.java  |  7 ++--
 .../apache/hadoop/gateway/AuditLoggingTest.java | 13 ---
 .../apache/hadoop/gateway/TempletonDemo.java|  8 +++--
 .../gateway/rm/dispatch/RMHaDispatchTest.java   | 11 --
 .../hdfs/dispatch/WebHdfsHaDispatchTest.java|  7 ++--
 .../gateway/dispatch/DefaultDispatchTest.java   | 16 +++--
 .../hadoop/gateway/GatewayBasicFuncTest.java| 36 +---
 7 files changed, 67 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/knox/blob/f1bbea9b/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
--
diff --git 
a/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
 
b/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
index 0436532..bcb62f6 100644
--- 
a/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
+++ 
b/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
@@ -25,7 +25,8 @@ import 
org.apache.hadoop.gateway.ha.provider.impl.HaDescriptorFactory;
 import org.apache.hadoop.gateway.servlet.SynchronousServletOutputStreamAdapter;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.params.BasicHttpParams;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
@@ -88,7 +89,9 @@ public class DefaultHaDispatchTest {
 EasyMock.replay(filterConfig, servletContext, outboundRequest, 
inboundRequest, outboundResponse);
 Assert.assertEquals(uri1.toString(), provider.getActiveURL(serviceName));
 DefaultHaDispatch dispatch = new DefaultHaDispatch();
-dispatch.setHttpClient(new DefaultHttpClient());
+HttpClientBuilder builder = HttpClientBuilder.create();
+CloseableHttpClient client = builder.build();
+dispatch.setHttpClient(client);
 dispatch.setHaProvider(provider);
 dispatch.setServiceRole(serviceName);
 dispatch.init();

http://git-wip-us.apache.org/repos/asf/knox/blob/f1bbea9b/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java
--
diff --git 
a/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java 
b/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java
index a5893e6..6819d44 100644
--- 
a/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java
+++ 
b/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java
@@ -51,7 +51,8 @@ import org.apache.hadoop.gateway.config.GatewayConfig;
 import org.apache.hadoop.gateway.dispatch.DefaultDispatch;
 import org.apache.hadoop.gateway.i18n.resources.ResourcesFactory;
 import org.apache.hadoop.test.log.CollectAppender;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.log4j.spi.LoggingEvent;
 import org.easymock.EasyMock;
 import org.junit.After;
@@ -81,7 +82,7 @@ public class AuditLoggingTest {
   @Test
   /**
* Empty filter chain. Two events with same correlation ID are expected:
-   * 
+   *
* action=access request_type=uri outcome=unavailable
* action=access request_type=uri outcome=success message=Response status: 
404
*/
@@ -126,7 +127,7 @@ public class AuditLoggingTest {
   @Test
   /**
* One NoOp filter in chain. Single audit event with same with specified 
request URI is expected:
-   * 
+   *
* action=access request_type=uri outcome=unavailable
*/
   public void testNoopFilter() throws ServletException, IOException,
@@ -178,7 +179,7 @@ public class AuditLoggingTest {
   @Test
   /**
* Dispatching outbound request. Remote host is unreachable. Two log events 
is expected:
-

knox git commit: KNOX-738 - Remove references to deprecated httpclient class DefaultHttpClient

2017-08-31 Thread coheigea 
Repository: knox
Updated Branches:
  refs/heads/master 841295208 -> f1bbea9b7


KNOX-738 - Remove references to deprecated httpclient class DefaultHttpClient


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/f1bbea9b
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/f1bbea9b
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/f1bbea9b

Branch: refs/heads/master
Commit: f1bbea9b73d0e24454cf65a3c015b083f9247aa2
Parents: 8412952
Author: Colm O hEigeartaigh 
Authored: Thu Aug 31 10:33:35 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Aug 31 10:33:35 2017 +0100

--
 .../ha/dispatch/DefaultHaDispatchTest.java  |  7 ++--
 .../apache/hadoop/gateway/AuditLoggingTest.java | 13 ---
 .../apache/hadoop/gateway/TempletonDemo.java|  8 +++--
 .../gateway/rm/dispatch/RMHaDispatchTest.java   | 11 --
 .../hdfs/dispatch/WebHdfsHaDispatchTest.java|  7 ++--
 .../gateway/dispatch/DefaultDispatchTest.java   | 16 +++--
 .../hadoop/gateway/GatewayBasicFuncTest.java| 36 +---
 7 files changed, 67 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/knox/blob/f1bbea9b/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
--
diff --git 
a/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
 
b/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
index 0436532..bcb62f6 100644
--- 
a/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
+++ 
b/gateway-provider-ha/src/test/java/org/apache/hadoop/gateway/ha/dispatch/DefaultHaDispatchTest.java
@@ -25,7 +25,8 @@ import 
org.apache.hadoop.gateway.ha.provider.impl.HaDescriptorFactory;
 import org.apache.hadoop.gateway.servlet.SynchronousServletOutputStreamAdapter;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.http.params.BasicHttpParams;
 import org.easymock.EasyMock;
 import org.easymock.IAnswer;
@@ -88,7 +89,9 @@ public class DefaultHaDispatchTest {
 EasyMock.replay(filterConfig, servletContext, outboundRequest, 
inboundRequest, outboundResponse);
 Assert.assertEquals(uri1.toString(), provider.getActiveURL(serviceName));
 DefaultHaDispatch dispatch = new DefaultHaDispatch();
-dispatch.setHttpClient(new DefaultHttpClient());
+HttpClientBuilder builder = HttpClientBuilder.create();
+CloseableHttpClient client = builder.build();
+dispatch.setHttpClient(client);
 dispatch.setHaProvider(provider);
 dispatch.setServiceRole(serviceName);
 dispatch.init();

http://git-wip-us.apache.org/repos/asf/knox/blob/f1bbea9b/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java
--
diff --git 
a/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java 
b/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java
index a5893e6..6819d44 100644
--- 
a/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java
+++ 
b/gateway-server/src/test/java/org/apache/hadoop/gateway/AuditLoggingTest.java
@@ -51,7 +51,8 @@ import org.apache.hadoop.gateway.config.GatewayConfig;
 import org.apache.hadoop.gateway.dispatch.DefaultDispatch;
 import org.apache.hadoop.gateway.i18n.resources.ResourcesFactory;
 import org.apache.hadoop.test.log.CollectAppender;
-import org.apache.http.impl.client.DefaultHttpClient;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
 import org.apache.log4j.spi.LoggingEvent;
 import org.easymock.EasyMock;
 import org.junit.After;
@@ -81,7 +82,7 @@ public class AuditLoggingTest {
   @Test
   /**
* Empty filter chain. Two events with same correlation ID are expected:
-   * 
+   *
* action=access request_type=uri outcome=unavailable
* action=access request_type=uri outcome=success message=Response status: 
404
*/
@@ -126,7 +127,7 @@ public class AuditLoggingTest {
   @Test
   /**
* One NoOp filter in chain. Single audit event with same with specified 
request URI is expected:
-   * 
+   *
* action=access request_type=uri outcome=unavailable
*/
   public void testNoopFilter() throws ServletException, IOException,
@@ -178,7 +179,7 @@ public class AuditLoggingTest {
   @Test
   /**
* Dispatching outbound request.