Repository: knox Updated Branches: refs/heads/master 4889be64e -> ff41f5656
KNOX-1512 - Replace deprecated EasyMock new Capture() calls Signed-off-by: Kevin Risden <kris...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/ff41f565 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/ff41f565 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/ff41f565 Branch: refs/heads/master Commit: ff41f56567ced9e1768cc9b31cc0422f43191250 Parents: 4889be6 Author: Kevin Risden <kris...@apache.org> Authored: Thu Oct 4 15:11:14 2018 -0400 Committer: Kevin Risden <kris...@apache.org> Committed: Thu Oct 4 15:41:56 2018 -0400 ---------------------------------------------------------------------- .../encrypturi/impl/EncryptDecryptUriProcessorTest.java | 4 ++-- .../gateway/securequery/SecureQueryDecodeProcessorTest.java | 4 ++-- .../gateway/securequery/SecureQueryEncodeProcessorTest.java | 2 +- .../securequery/SecureQueryEncryptDecryptProcessorTest.java | 8 ++++---- .../filter/rewrite/impl/CookieScopeResponseWrapperTest.java | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/ff41f565/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptDecryptUriProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptDecryptUriProcessorTest.java b/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptDecryptUriProcessorTest.java index 8a28dd1..410290e 100644 --- a/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptDecryptUriProcessorTest.java +++ b/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptDecryptUriProcessorTest.java @@ -99,7 +99,7 @@ public class EncryptDecryptUriProcessorTest { EasyMock.expect( encContext.getParameters() ).andReturn( hostPortParams ); - Capture<EncryptStepContextParams> encodedValue = new Capture<EncryptStepContextParams>(); + Capture<EncryptStepContextParams> encodedValue = Capture.newInstance(); encContext.addParameters( EasyMock.capture( encodedValue ) ); EasyMock.replay( gatewayServices, as, encEnvironment, encContext ); @@ -136,7 +136,7 @@ public class EncryptDecryptUriProcessorTest { encryptedParams.addParam( "foo1", Arrays.asList( "test" ) ); EasyMock.expect( decContext.getParameters() ).andReturn( encryptedParams ); - Capture<EncryptStepContextParams> decodedValue = new Capture<EncryptStepContextParams>(); + Capture<EncryptStepContextParams> decodedValue = Capture.newInstance(); decContext.addParameters( EasyMock.capture( decodedValue ) ); EasyMock.replay( gatewayServices, as, decEnvironment, decContext ); http://git-wip-us.apache.org/repos/asf/knox/blob/ff41f565/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDecodeProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDecodeProcessorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDecodeProcessorTest.java index 322930d..ccc13c6 100644 --- a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDecodeProcessorTest.java +++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDecodeProcessorTest.java @@ -64,7 +64,7 @@ public class SecureQueryDecodeProcessorTest { UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class ); EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate ); - Capture<Template> outTemplate = new Capture<Template>(); + Capture<Template> outTemplate = Capture.newInstance(); context.setCurrentUrl( EasyMock.capture( outTemplate ) ); EasyMock.replay( context ); @@ -104,7 +104,7 @@ public class SecureQueryDecodeProcessorTest { UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class ); EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate ); - Capture<Template> outTemplate = new Capture<Template>(); + Capture<Template> outTemplate = Capture.newInstance(); context.setCurrentUrl( EasyMock.capture( outTemplate ) ); EasyMock.replay( context ); http://git-wip-us.apache.org/repos/asf/knox/blob/ff41f565/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java index d54df98..41979d9 100644 --- a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java +++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncodeProcessorTest.java @@ -54,7 +54,7 @@ public class SecureQueryEncodeProcessorTest { Template inTemplate = Parser.parseLiteral( "http://host:0/root/path?query"; ); UrlRewriteContext context = EasyMock.createNiceMock( UrlRewriteContext.class ); EasyMock.expect( context.getCurrentUrl() ).andReturn( inTemplate ); - Capture<Template> outTemplate = new Capture<Template>(); + Capture<Template> outTemplate = Capture.newInstance(); context.setCurrentUrl( EasyMock.capture( outTemplate ) ); EasyMock.replay( environment, context ); http://git-wip-us.apache.org/repos/asf/knox/blob/ff41f565/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java index 33f0495..d04e9c9 100644 --- a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java +++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryEncryptDecryptProcessorTest.java @@ -63,7 +63,7 @@ public class SecureQueryEncryptDecryptProcessorTest { EasyMock.expect( encEnvironment.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster-name" ).anyTimes(); UrlRewriteContext encContext = EasyMock.createNiceMock( UrlRewriteContext.class ); EasyMock.expect( encContext.getCurrentUrl() ).andReturn( origTemplate ); - Capture<Template> encTemplate = new Capture<Template>(); + Capture<Template> encTemplate = Capture.newInstance(); encContext.setCurrentUrl( EasyMock.capture( encTemplate ) ); EasyMock.replay( gatewayServices, as, encEnvironment, encContext ); @@ -93,7 +93,7 @@ public class SecureQueryEncryptDecryptProcessorTest { UrlRewriteContext decContext = EasyMock.createNiceMock( UrlRewriteContext.class ); EasyMock.expect( decContext.getCurrentUrl() ).andReturn( encTemplate.getValue() ); EasyMock.expect( decContext.getParameters() ).andReturn( decParams ); - Capture<Template> decTemplate = new Capture<Template>(); + Capture<Template> decTemplate = Capture.newInstance(); decContext.setCurrentUrl( EasyMock.capture( decTemplate ) ); EasyMock.replay( gatewayServices, as, decEnvironment, decParams, decContext ); @@ -130,7 +130,7 @@ public class SecureQueryEncryptDecryptProcessorTest { EasyMock.expect( encEnvironment.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ) ).andReturn( "test-cluster-name" ).anyTimes(); UrlRewriteContext encContext = EasyMock.createNiceMock( UrlRewriteContext.class ); EasyMock.expect( encContext.getCurrentUrl() ).andReturn( origTemplate ); - Capture<Template> encTemplate = new Capture<Template>(); + Capture<Template> encTemplate = Capture.newInstance(); encContext.setCurrentUrl( EasyMock.capture( encTemplate ) ); EasyMock.replay( gatewayServices, as, encEnvironment, encContext ); @@ -160,7 +160,7 @@ public class SecureQueryEncryptDecryptProcessorTest { UrlRewriteContext decContext = EasyMock.createNiceMock( UrlRewriteContext.class ); EasyMock.expect( decContext.getCurrentUrl() ).andReturn( encTemplate.getValue() ); EasyMock.expect( decContext.getParameters() ).andReturn( decParams ); - Capture<Template> decTemplate = new Capture<Template>(); + Capture<Template> decTemplate = Capture.newInstance(); decContext.setCurrentUrl( EasyMock.capture( decTemplate ) ); SecureQueryDecryptDescriptor descriptor1 = new SecureQueryDecryptDescriptor(); SecureQueryDecryptProcessor decProcessor = http://git-wip-us.apache.org/repos/asf/knox/blob/ff41f565/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/CookieScopeResponseWrapperTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/CookieScopeResponseWrapperTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/CookieScopeResponseWrapperTest.java index b44cef2..caa9b70 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/CookieScopeResponseWrapperTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/CookieScopeResponseWrapperTest.java @@ -37,8 +37,8 @@ public class CookieScopeResponseWrapperTest extends EasyMockSupport { @Before public void init(){ mock = EasyMock.createNiceMock(HttpServletResponse.class); - captureKey = new Capture<>(); - captureValue = new Capture<>(); + captureKey = Capture.newInstance(); + captureValue = Capture.newInstance(); mock.addHeader( EasyMock.capture(captureKey), EasyMock.capture(captureValue)); EasyMock.replay(mock); }
