[01/12] knox git commit: KNOX-1038 - Replace deprecated rest-assured "content" call with "body"

[more]

Repository: knox
Updated Branches:
  refs/heads/KNOX-998-Package_Restructuring f4a4355d4 -> 416ee7c15


KNOX-1038 - Replace deprecated rest-assured "content" call with "body"


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

Branch: refs/heads/KNOX-998-Package_Restructuring
Commit: aac2054c83399669a7084dbb8452013f7e3b532c
Parents: e2e1251
Author: Colm O hEigeartaigh 
Authored: Thu Sep 14 10:12:58 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Sep 14 10:12:58 2017 +0100

--
 .../gateway/GatewayAdminTopologyFuncTest.java   |   2 -
 .../hadoop/gateway/GatewayBasicFuncTest.java| 125 +--
 .../hadoop/gateway/GatewayHealthFuncTest.java   |   2 +-
 .../GatewayLdapDynamicGroupFuncTest.java|   2 +-
 .../gateway/GatewayLdapPosixGroupFuncTest.java  |   9 --
 .../GatewayPortMappingDisableFeatureTest.java   |   2 +-
 .../gateway/GatewayPortMappingFuncTest.java |   2 +-
 .../apache/hadoop/gateway/Knox242FuncTest.java  |   2 +-
 .../hadoop/gateway/WebHdfsHaFuncTest.java   |  10 +-
 9 files changed, 69 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/knox/blob/aac2054c/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
--
diff --git 
a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
 
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
index 3a5cd84..2efddff 100644
--- 
a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
+++ 
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
@@ -795,6 +795,4 @@ public class GatewayAdminTopologyFuncTest {
 LOG_EXIT();
   }
 
-  private static final String CLASS = 
GatewayAdminTopologyFuncTest.class.getCanonicalName();
-
 }

http://git-wip-us.apache.org/repos/asf/knox/blob/aac2054c/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
--
diff --git 
a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
 
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
index cbe12a8..472270c 100644
--- 
a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
+++ 
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
@@ -314,7 +314,7 @@ public class GatewayBasicFuncTest {
 //.log().all()
 .statusCode( HttpStatus.SC_OK )
 .contentType( "application/json" )
-.content( "boolean", is( true ) )
+.body( "boolean", is( true ) )
 .when().put( driver.getUrl( "WEBHDFS" ) + "/v1" + root + "/dir" 
).getDetailedCookie( "JSESSIONID" );
 assertThat( cookie.isSecured(), is( true ) );
 assertThat( cookie.isHttpOnly(), is( true ) );
@@ -373,9 +373,6 @@ public class GatewayBasicFuncTest {
 String root = "/tmp/GatewayBasicFuncTest/testBasicOutboundHeaderUseCase";
 String username = "hdfs";
 String password = "hdfs-password";
-InetSocketAddress gatewayAddress = driver.gateway.getAddresses()[0];
-String gatewayHostName = gatewayAddress.getHostName();
-String gatewayAddrName = 
InetAddress.getByName(gatewayHostName).getHostAddress();
 
 driver.getMock( "WEBHDFS" )
 .expect()
@@ -412,7 +409,6 @@ public class GatewayBasicFuncTest {
 String root = "/tmp/GatewayBasicFuncTest/testHdfsTildeUseCase";
 String username = "hdfs";
 String password = "hdfs-password";
-InetSocketAddress gatewayAddress = driver.gateway.getAddresses()[0];
 
 // Attempt to delete the test directory in case a previous run failed.
 // Ignore any result.
@@ -462,7 +458,7 @@ public class GatewayBasicFuncTest {
   //.log().all();
   .statusCode( HttpStatus.SC_OK )
   .contentType( "application/json" )
-  .content( "boolean", is( true ) )
+  .body( "boolean", is( true ) )
   .when().put( driver.getUrl( "WEBHDFS" ) + "/v1/~/dir" );
   driver.assertComplete();
 } finally {
@@ -535,7 +531,7 @@ public class GatewayBasicFuncTest {
 //.log().all();
 .statusCode( HttpStatus.SC_OK )
 .contentType( "application/json" )
-.content( "boolean", is( true ) )
+.body( "boolean", is( true ) )
 .when().put( driver.getUrl( "WEBHDFS" ) + "/v1" + root + "/dir" );
 driver.assertComplete();
 
@@ -557,7 +553,7 @@ public class GatewayBasicFuncTest {
 .expect()
  

knox git commit: KNOX-1038 - Replace deprecated rest-assured "content" call with "body"

[coheigea]

Repository: knox
Updated Branches:
  refs/heads/master e2e125146 -> aac2054c8


KNOX-1038 - Replace deprecated rest-assured "content" call with "body"


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

Branch: refs/heads/master
Commit: aac2054c83399669a7084dbb8452013f7e3b532c
Parents: e2e1251
Author: Colm O hEigeartaigh 
Authored: Thu Sep 14 10:12:58 2017 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Sep 14 10:12:58 2017 +0100

--
 .../gateway/GatewayAdminTopologyFuncTest.java   |   2 -
 .../hadoop/gateway/GatewayBasicFuncTest.java| 125 +--
 .../hadoop/gateway/GatewayHealthFuncTest.java   |   2 +-
 .../GatewayLdapDynamicGroupFuncTest.java|   2 +-
 .../gateway/GatewayLdapPosixGroupFuncTest.java  |   9 --
 .../GatewayPortMappingDisableFeatureTest.java   |   2 +-
 .../gateway/GatewayPortMappingFuncTest.java |   2 +-
 .../apache/hadoop/gateway/Knox242FuncTest.java  |   2 +-
 .../hadoop/gateway/WebHdfsHaFuncTest.java   |  10 +-
 9 files changed, 69 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/knox/blob/aac2054c/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
--
diff --git 
a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
 
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
index 3a5cd84..2efddff 100644
--- 
a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
+++ 
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminTopologyFuncTest.java
@@ -795,6 +795,4 @@ public class GatewayAdminTopologyFuncTest {
 LOG_EXIT();
   }
 
-  private static final String CLASS = 
GatewayAdminTopologyFuncTest.class.getCanonicalName();
-
 }

http://git-wip-us.apache.org/repos/asf/knox/blob/aac2054c/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
--
diff --git 
a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
 
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
index cbe12a8..472270c 100644
--- 
a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
+++ 
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
@@ -314,7 +314,7 @@ public class GatewayBasicFuncTest {
 //.log().all()
 .statusCode( HttpStatus.SC_OK )
 .contentType( "application/json" )
-.content( "boolean", is( true ) )
+.body( "boolean", is( true ) )
 .when().put( driver.getUrl( "WEBHDFS" ) + "/v1" + root + "/dir" 
).getDetailedCookie( "JSESSIONID" );
 assertThat( cookie.isSecured(), is( true ) );
 assertThat( cookie.isHttpOnly(), is( true ) );
@@ -373,9 +373,6 @@ public class GatewayBasicFuncTest {
 String root = "/tmp/GatewayBasicFuncTest/testBasicOutboundHeaderUseCase";
 String username = "hdfs";
 String password = "hdfs-password";
-InetSocketAddress gatewayAddress = driver.gateway.getAddresses()[0];
-String gatewayHostName = gatewayAddress.getHostName();
-String gatewayAddrName = 
InetAddress.getByName(gatewayHostName).getHostAddress();
 
 driver.getMock( "WEBHDFS" )
 .expect()
@@ -412,7 +409,6 @@ public class GatewayBasicFuncTest {
 String root = "/tmp/GatewayBasicFuncTest/testHdfsTildeUseCase";
 String username = "hdfs";
 String password = "hdfs-password";
-InetSocketAddress gatewayAddress = driver.gateway.getAddresses()[0];
 
 // Attempt to delete the test directory in case a previous run failed.
 // Ignore any result.
@@ -462,7 +458,7 @@ public class GatewayBasicFuncTest {
   //.log().all();
   .statusCode( HttpStatus.SC_OK )
   .contentType( "application/json" )
-  .content( "boolean", is( true ) )
+  .body( "boolean", is( true ) )
   .when().put( driver.getUrl( "WEBHDFS" ) + "/v1/~/dir" );
   driver.assertComplete();
 } finally {
@@ -535,7 +531,7 @@ public class GatewayBasicFuncTest {
 //.log().all();
 .statusCode( HttpStatus.SC_OK )
 .contentType( "application/json" )
-.content( "boolean", is( true ) )
+.body( "boolean", is( true ) )
 .when().put( driver.getUrl( "WEBHDFS" ) + "/v1" + root + "/dir" );
 driver.assertComplete();
 
@@ -557,7 +553,7 @@ public class GatewayBasicFuncTest {
 .expect()
 //.log().ifError()
 .statusCode(