Repository: knox Updated Branches: refs/heads/master 86babd32d -> 8e51af317
KNOX-1625 - Cleanup cast and type arguments 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/8e51af31 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/8e51af31 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/8e51af31 Branch: refs/heads/master Commit: 8e51af3175a04bb6721e608c156577bca561548a Parents: 86babd3 Author: Kevin Risden <kris...@apache.org> Authored: Mon Nov 26 14:13:55 2018 -0500 Committer: Kevin Risden <kris...@apache.org> Committed: Mon Nov 26 15:29:30 2018 -0500 ---------------------------------------------------------------------- .../jersey/JerseyDeploymentContributorTest.java | 10 +-- .../encrypturi/impl/DecryptUriProcessor.java | 2 +- .../impl/EncryptDecryptUriProcessorTest.java | 5 +- .../EncryptUriDeploymentContributorTest.java | 5 +- .../SecureQueryDecryptProcessor.java | 2 +- .../SecureQueryEncryptProcessor.java | 2 +- .../SecureQueryDeploymentContributorTest.java | 5 +- .../SecureQueryEncryptDecryptProcessorTest.java | 9 ++- .../UrlRewriteFunctionDescriptorFactory.java | 2 +- .../impl/UrlRewriteRulesDescriptorImpl.java | 10 +-- .../spi/UrlRewriteFlowDescriptorBase.java | 4 +- .../api/UrlRewriteServletEnvironmentTest.java | 2 +- .../jwt/filter/AbstractJWTFilter.java | 2 +- .../jwt/filter/AccessTokenFederationFilter.java | 2 +- .../filter/JWTAccessTokenAssertionFilter.java | 4 +- .../jwt/filter/JWTAuthCodeAssertionFilter.java | 4 +- .../jwt/filter/JWTFederationFilter.java | 2 +- .../pac4j/filter/Pac4jDispatcherFilter.java | 8 +-- .../filter/ShiroSubjectIdentityAdapter.java | 2 +- .../shirorealm/KnoxLdapContextFactory.java | 2 +- .../impl/ShiroDeploymentContributorTest.java | 5 +- .../impl/DefaultServiceRegistryService.java | 2 +- .../topology/impl/DefaultTopologyService.java | 4 +- .../apache/knox/gateway/AuditLoggingTest.java | 6 +- .../apache/knox/gateway/GatewayFilterTest.java | 8 +-- .../gateway/GatewayForwardingServletTest.java | 12 ++-- .../knox/gateway/GatewayGlobalConfigTest.java | 8 +-- .../knox/gateway/jetty/JettyPathMapTest.java | 18 ++--- .../impl/DefaultTokenAuthorityServiceTest.java | 72 ++++++++++---------- .../topology/DefaultTopologyServiceTest.java | 4 +- .../service/knoxtoken/TokenResource.java | 2 +- .../security/impl/X509CertificateUtil.java | 2 +- .../security/token/impl/JWTTokenTest.java | 4 +- .../deploy/DeploymentFactoryFuncTest.java | 40 +++++------ .../org/apache/knox/gateway/util/JsonUtils.java | 2 +- .../knox/gateway/audit/AuditServiceTest.java | 14 ++-- .../impl/DefaultConfigurationInjector.java | 2 +- .../gateway/util/urltemplate/MatcherTest.java | 4 +- .../gateway/util/urltemplate/RewriterTest.java | 2 +- 39 files changed, 143 insertions(+), 152 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java b/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java index 9a1bea5..0aa1356 100644 --- a/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java +++ b/gateway-provider-jersey/src/test/java/org/apache/knox/gateway/jersey/JerseyDeploymentContributorTest.java @@ -83,11 +83,11 @@ public class JerseyDeploymentContributorTest { EasyMock.expect( context.getTopology() ).andReturn( topology ).anyTimes(); EasyMock.expect( context.getGatewayDescriptor() ).andReturn( descriptor ).anyTimes(); context.contributeFilter( - EasyMock.<Service> isA( Service.class ), - EasyMock.<ResourceDescriptor> isA( ResourceDescriptor.class ), - EasyMock.<String> isA( String.class ), - EasyMock.<String> isA( String.class ), - EasyMock.<List> isA( List.class ) ); + EasyMock.isA( Service.class ), + EasyMock.isA( ResourceDescriptor.class ), + EasyMock.isA( String.class ), + EasyMock.isA( String.class ), + EasyMock.isA( List.class ) ); EasyMock.expectLastCall().andDelegateTo( new MockDeploymentContext( context, providerContributor, provider ) ).anyTimes(); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/impl/DecryptUriProcessor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/impl/DecryptUriProcessor.java b/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/impl/DecryptUriProcessor.java index e5679a3..c1c749e 100644 --- a/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/impl/DecryptUriProcessor.java +++ b/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/impl/DecryptUriProcessor.java @@ -52,7 +52,7 @@ public class DecryptUriProcessor public void initialize( UrlRewriteEnvironment environment, DecryptUriDescriptor descriptor ) throws Exception { clusterName = environment.getAttribute( GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE ); GatewayServices services = environment.getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE); - cryptoService = (CryptoService) services.getService(GatewayServices.CRYPTO_SERVICE); + cryptoService = services.getService(GatewayServices.CRYPTO_SERVICE); param = descriptor.getParam(); } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/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 410290e..2ee3c22 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 @@ -26,7 +26,6 @@ import org.apache.knox.gateway.filter.rewrite.spi.UrlRewriteStepProcessor; import org.apache.knox.gateway.filter.rewrite.spi.UrlRewriteStepStatus; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.security.AliasService; -import org.apache.knox.gateway.services.security.CryptoService; import org.apache.knox.gateway.services.security.impl.DefaultCryptoService; import org.easymock.Capture; import org.easymock.EasyMock; @@ -83,8 +82,8 @@ public class EncryptDecryptUriProcessorTest { AliasService as = EasyMock.createNiceMock( AliasService.class ); String secret = "asdf"; EasyMock.expect( as.getPasswordFromAliasForCluster( clusterName, passwordAlias ) ).andReturn( secret.toCharArray() ).anyTimes(); - CryptoService cryptoService = new DefaultCryptoService(); - ((DefaultCryptoService)cryptoService).setAliasService( as ); + DefaultCryptoService cryptoService = new DefaultCryptoService(); + cryptoService.setAliasService( as ); GatewayServices gatewayServices = EasyMock.createNiceMock( GatewayServices.class ); EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService ); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptUriDeploymentContributorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptUriDeploymentContributorTest.java b/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptUriDeploymentContributorTest.java index 3b24b22..09c373b 100644 --- a/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptUriDeploymentContributorTest.java +++ b/gateway-provider-rewrite-step-encrypt-uri/src/test/java/org/apache/knox/gateway/encrypturi/impl/EncryptUriDeploymentContributorTest.java @@ -22,7 +22,6 @@ import org.apache.knox.gateway.deploy.ProviderDeploymentContributor; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteEnvironment; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.security.AliasService; -import org.apache.knox.gateway.services.security.CryptoService; import org.apache.knox.gateway.services.security.impl.DefaultCryptoService; import org.apache.knox.gateway.topology.Provider; import org.apache.knox.gateway.topology.Topology; @@ -74,8 +73,8 @@ public class EncryptUriDeploymentContributorTest { EasyMock.replay( context ); AliasService as = EasyMock.createNiceMock( AliasService.class ); - CryptoService cryptoService = new DefaultCryptoService(); - ((DefaultCryptoService) cryptoService).setAliasService( as ); + DefaultCryptoService cryptoService = new DefaultCryptoService(); + cryptoService.setAliasService( as ); GatewayServices gatewayServices = EasyMock.createNiceMock( GatewayServices.class ); EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService ).anyTimes(); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java index 2b421e4..6845dd2 100644 --- a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java +++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryDecryptProcessor.java @@ -51,7 +51,7 @@ public class SecureQueryDecryptProcessor implements @Override public void initialize( UrlRewriteEnvironment environment, SecureQueryDecryptDescriptor descriptor ) throws Exception { encryptor = new ConfigurableEncryptor("encryptQueryString"); - encryptor.init((GatewayConfig)environment.getAttribute(GatewayConfig.GATEWAY_CONFIG_ATTRIBUTE)); + encryptor.init(environment.getAttribute(GatewayConfig.GATEWAY_CONFIG_ATTRIBUTE)); } @Override http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryEncryptProcessor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryEncryptProcessor.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryEncryptProcessor.java index 8da2944..7dd976f 100644 --- a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryEncryptProcessor.java +++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryEncryptProcessor.java @@ -47,7 +47,7 @@ public class SecureQueryEncryptProcessor @Override public void initialize( UrlRewriteEnvironment environment, SecureQueryEncryptDescriptor descriptor ) throws Exception { encryptor = new ConfigurableEncryptor("encryptQueryString"); - encryptor.init((GatewayConfig)environment.getAttribute(GatewayConfig.GATEWAY_CONFIG_ATTRIBUTE)); + encryptor.init(environment.getAttribute(GatewayConfig.GATEWAY_CONFIG_ATTRIBUTE)); } @Override http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java index 68e3877..298e8f2 100644 --- a/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java +++ b/gateway-provider-rewrite-step-secure-query/src/test/java/org/apache/knox/gateway/securequery/SecureQueryDeploymentContributorTest.java @@ -21,7 +21,6 @@ import org.apache.knox.gateway.deploy.DeploymentContext; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteEnvironment; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.security.AliasService; -import org.apache.knox.gateway.services.security.CryptoService; import org.apache.knox.gateway.services.security.impl.DefaultCryptoService; import org.apache.knox.gateway.topology.Provider; import org.apache.knox.gateway.topology.Topology; @@ -62,8 +61,8 @@ public class SecureQueryDeploymentContributorTest { EasyMock.replay( context ); AliasService as = EasyMock.createNiceMock( AliasService.class ); - CryptoService cryptoService = new DefaultCryptoService(); - ((DefaultCryptoService)cryptoService).setAliasService(as); + DefaultCryptoService cryptoService = new DefaultCryptoService(); + cryptoService.setAliasService(as); GatewayServices gatewayServices = EasyMock.createNiceMock( GatewayServices.class ); EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService ).anyTimes(); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/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 d04e9c9..a0c850e 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 @@ -21,7 +21,6 @@ import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteEnvironment; import org.apache.knox.gateway.filter.rewrite.spi.UrlRewriteContext; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.security.AliasService; -import org.apache.knox.gateway.services.security.CryptoService; import org.apache.knox.gateway.services.security.impl.DefaultCryptoService; import org.apache.knox.gateway.util.urltemplate.Params; import org.apache.knox.gateway.util.urltemplate.Parser; @@ -53,8 +52,8 @@ public class SecureQueryEncryptDecryptProcessorTest { AliasService as = EasyMock.createNiceMock( AliasService.class ); String secret = "sdkjfhsdkjfhsdfs"; EasyMock.expect( as.getPasswordFromAliasForCluster("test-cluster-name", "encryptQueryString")).andReturn( secret.toCharArray() ).anyTimes(); - CryptoService cryptoService = new DefaultCryptoService(); - ((DefaultCryptoService)cryptoService).setAliasService(as); + DefaultCryptoService cryptoService = new DefaultCryptoService(); + cryptoService.setAliasService(as); GatewayServices gatewayServices = EasyMock.createNiceMock( GatewayServices.class ); EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService ); @@ -120,8 +119,8 @@ public class SecureQueryEncryptDecryptProcessorTest { AliasService as = EasyMock.createNiceMock( AliasService.class ); String secret = "sdkjfhsdkjfhsdfs"; EasyMock.expect( as.getPasswordFromAliasForCluster("test-cluster-name", "encryptQueryString")).andReturn( secret.toCharArray() ).anyTimes(); - CryptoService cryptoService = new DefaultCryptoService(); - ((DefaultCryptoService)cryptoService).setAliasService(as); + DefaultCryptoService cryptoService = new DefaultCryptoService(); + cryptoService.setAliasService(as); GatewayServices gatewayServices = EasyMock.createNiceMock( GatewayServices.class ); EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService ); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFunctionDescriptorFactory.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFunctionDescriptorFactory.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFunctionDescriptorFactory.java index eef4598..15b81dd 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFunctionDescriptorFactory.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteFunctionDescriptorFactory.java @@ -25,7 +25,7 @@ import java.util.Set; public abstract class UrlRewriteFunctionDescriptorFactory { private static Map<String,Class<? extends UrlRewriteFunctionDescriptor>> MAP - = (Map<String, Class<? extends UrlRewriteFunctionDescriptor>>)loadDescriptors(); + = loadDescriptors(); private UrlRewriteFunctionDescriptorFactory() { } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java index c570b27..33afb45 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/impl/UrlRewriteRulesDescriptorImpl.java @@ -88,21 +88,21 @@ public class UrlRewriteRulesDescriptorImpl implements UrlRewriteRulesDescriptor @SuppressWarnings("unchecked") public <T extends UrlRewriteFunctionDescriptor<?>> T getFunction( String name ) { T descriptor = (T)funcMap.get( name ); - return (T)descriptor; + return descriptor; } @Override @SuppressWarnings("unchecked") public <T extends UrlRewriteFunctionDescriptor<?>> T addFunction( String name ) { - T descriptor = (T)newFunction( name ); + T descriptor = newFunction( name ); addFunction( descriptor ); - return (T)descriptor; + return descriptor; } @SuppressWarnings("unchecked") protected <T extends UrlRewriteFunctionDescriptor<?>> T newFunction( String name ) { - T descriptor = (T)UrlRewriteFunctionDescriptorFactory.create( name ); - return (T)descriptor; + T descriptor = UrlRewriteFunctionDescriptorFactory.create( name ); + return descriptor; } protected void addFunction( UrlRewriteFunctionDescriptor descriptor ) { http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java index ef0044d..fd63798 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/spi/UrlRewriteFlowDescriptorBase.java @@ -108,9 +108,9 @@ public abstract class UrlRewriteFlowDescriptorBase<T> extends UrlRewriteStepDesc @SuppressWarnings( "unchecked" ) @Override public <T extends UrlRewriteStepDescriptor<?>> T addStep( String type ) { - T step = (T)UrlRewriteStepDescriptorFactory.create( type ); + T step = UrlRewriteStepDescriptorFactory.create( type ); steps.add( step ); - return (T)step; + return step; } } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletEnvironmentTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletEnvironmentTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletEnvironmentTest.java index 8ab5e92..f53f80b 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletEnvironmentTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletEnvironmentTest.java @@ -45,7 +45,7 @@ public class UrlRewriteServletEnvironmentTest { EasyMock.expect( context.getAttribute( "test-attribute-name" ) ).andReturn( "test-attribute-value" ).anyTimes(); EasyMock.replay( context ); UrlRewriteServletEnvironment env = new UrlRewriteServletEnvironment( context ); - assertThat( (String)env.getAttribute( "test-attribute-name" ), is( "test-attribute-value" ) ); + assertThat(env.getAttribute( "test-attribute-name" ), is( "test-attribute-value" ) ); } @Test http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java index 6857906..7639a11 100644 --- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java +++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AbstractJWTFilter.java @@ -104,7 +104,7 @@ public abstract class AbstractJWTFilter implements Filter { if (context != null) { GatewayServices services = (GatewayServices) context.getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE); if (services != null) { - authority = (JWTokenAuthority) services.getService(GatewayServices.TOKEN_SERVICE); + authority = services.getService(GatewayServices.TOKEN_SERVICE); } } } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java index 0a0bc37..fb413bf 100644 --- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java +++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/AccessTokenFederationFilter.java @@ -52,7 +52,7 @@ public class AccessTokenFederationFilter implements Filter { @Override public void init( FilterConfig filterConfig ) throws ServletException { GatewayServices services = (GatewayServices) filterConfig.getServletContext().getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE); - authority = (JWTokenAuthority) services.getService(GatewayServices.TOKEN_SERVICE); + authority = services.getService(GatewayServices.TOKEN_SERVICE); } @Override http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java index f26c61b..3af06be 100644 --- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java +++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAccessTokenAssertionFilter.java @@ -64,8 +64,8 @@ public class JWTAccessTokenAssertionFilter extends AbstractIdentityAssertionFilt validity = Long.parseLong(validityStr); GatewayServices services = (GatewayServices) filterConfig.getServletContext().getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE); - authority = (JWTokenAuthority) services.getService(GatewayServices.TOKEN_SERVICE); - sr = (ServiceRegistry) services.getService(GatewayServices.SERVICE_REGISTRY_SERVICE); + authority = services.getService(GatewayServices.TOKEN_SERVICE); + sr = services.getService(GatewayServices.SERVICE_REGISTRY_SERVICE); } @Override http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java index c6abc9c..d7f0dcf 100644 --- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java +++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTAuthCodeAssertionFilter.java @@ -53,8 +53,8 @@ public class JWTAuthCodeAssertionFilter extends AbstractIdentityAssertionFilter // validity = Long.parseLong(validityStr); GatewayServices services = (GatewayServices) filterConfig.getServletContext().getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE); - authority = (JWTokenAuthority) services.getService(GatewayServices.TOKEN_SERVICE); - sr = (ServiceRegistry) services.getService(GatewayServices.SERVICE_REGISTRY_SERVICE); + authority = services.getService(GatewayServices.TOKEN_SERVICE); + sr = services.getService(GatewayServices.SERVICE_REGISTRY_SERVICE); } @Override http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java index 2aa6f1c..4624caa 100644 --- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java +++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/filter/JWTFederationFilter.java @@ -82,7 +82,7 @@ public class JWTFederationFilter extends AbstractJWTFilter { } else { // check for query param - wireToken = ((HttpServletRequest) request).getParameter(paramName); + wireToken = request.getParameter(paramName); } if (wireToken != null) { http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java index daad32f..516dc5d 100644 --- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java +++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jDispatcherFilter.java @@ -99,10 +99,10 @@ public class Pac4jDispatcherFilter implements Filter { GatewayServices services = (GatewayServices) context.getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE); clusterName = (String) context.getAttribute(GatewayServices.GATEWAY_CLUSTER_ATTRIBUTE); if (services != null) { - keystoreService = (KeystoreService) services.getService(GatewayServices.KEYSTORE_SERVICE); - cryptoService = (CryptoService) services.getService(GatewayServices.CRYPTO_SERVICE); - aliasService = (AliasService) services.getService(GatewayServices.ALIAS_SERVICE); - masterService = (MasterService) services.getService("MasterService"); + keystoreService = services.getService(GatewayServices.KEYSTORE_SERVICE); + cryptoService = services.getService(GatewayServices.CRYPTO_SERVICE); + aliasService = services.getService(GatewayServices.ALIAS_SERVICE); + masterService = services.getService("MasterService"); } } // crypto service, alias service and cluster name are mandatory http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java index b318091..94211c4 100644 --- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java +++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/filter/ShiroSubjectIdentityAdapter.java @@ -100,7 +100,7 @@ public class ShiroSubjectIdentityAdapter implements Filter { throw new IllegalStateException("Unable to determine authenticated user from Shiro, please check that your Knox Shiro configuration is correct"); } - final String principal = (String) shiroSubject.getPrincipal().toString(); + final String principal = shiroSubject.getPrincipal().toString(); HashSet emptySet = new HashSet(); Set<Principal> principals = new HashSet<>(); Principal p = new PrimaryPrincipal(principal); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java index 30c38cc..1cbc102 100644 --- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java +++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxLdapContextFactory.java @@ -89,7 +89,7 @@ public class KnoxLdapContextFactory extends JndiLdapContextFactory { String aliasName = systemPass; GatewayServices services = GatewayServer.getGatewayServices(); - AliasService aliasService = (AliasService)services.getService(GatewayServices.ALIAS_SERVICE); + AliasService aliasService = services.getService(GatewayServices.ALIAS_SERVICE); String clusterName = getClusterName(); //System.err.println("FACTORY systempass 30: " + systemPass); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributorTest.java b/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributorTest.java index d619cd4..454afb4 100644 --- a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributorTest.java +++ b/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributorTest.java @@ -21,7 +21,6 @@ import org.apache.knox.gateway.deploy.DeploymentContext; import org.apache.knox.gateway.deploy.ProviderDeploymentContributor; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.security.AliasService; -import org.apache.knox.gateway.services.security.CryptoService; import org.apache.knox.gateway.services.security.impl.DefaultCryptoService; import org.apache.knox.gateway.topology.Provider; import org.apache.knox.gateway.topology.Topology; @@ -78,8 +77,8 @@ public class ShiroDeploymentContributorTest { EasyMock.replay( context ); AliasService as = EasyMock.createNiceMock( AliasService.class ); - CryptoService cryptoService = new DefaultCryptoService(); - ((DefaultCryptoService)cryptoService).setAliasService( as ); + DefaultCryptoService cryptoService = new DefaultCryptoService(); + cryptoService.setAliasService( as ); GatewayServices gatewayServices = EasyMock.createNiceMock( GatewayServices.class ); EasyMock.expect( gatewayServices.getService( GatewayServices.CRYPTO_SERVICE ) ).andReturn( cryptoService ).anyTimes(); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java index 6ae4778..5777ac7 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/registry/impl/DefaultServiceRegistryService.java @@ -128,7 +128,7 @@ public class DefaultServiceRegistryService implements ServiceRegistry, Service { try { // write JSON to a file - json = mapper.writeValueAsString((Object)registry); + json = mapper.writeValueAsString(registry); } catch ( JsonProcessingException e ) { e.printStackTrace(); //TODO: I18N http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java index 01d2c51..2b54c3c 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/topology/impl/DefaultTopologyService.java @@ -882,9 +882,7 @@ public class DefaultTopologyService if (!refs.contains(descriptorName)) { // Need to check if descriptor had previously referenced another provider config, so it can be removed for (List<String> descs : providerConfigReferences.values()) { - if (descs.contains(descriptorName)) { - descs.remove(descriptorName); - } + descs.remove(descriptorName); } // Add the current reference relationship http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java index cd8ca7e..300dffd 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/AuditLoggingTest.java @@ -273,9 +273,9 @@ public class AuditLoggingTest { assertThat( ac, notNullValue() ); assertThat( ac.getRemoteIp(), is( ADDRESS ) ); assertThat( ac.getRemoteHostname(), is( HOST ) ); - assertThat( (String) event.getMDC( AuditConstants.MDC_SERVICE_KEY ), is( AuditConstants.KNOX_SERVICE_NAME ) ); - assertThat( (String) event.getMDC( AuditConstants.MDC_COMPONENT_KEY ), is( AuditConstants.KNOX_COMPONENT_NAME ) ); - assertThat( (String) event.getLoggerName(), is( AuditConstants.DEFAULT_AUDITOR_NAME ) ); + assertThat(event.getMDC( AuditConstants.MDC_SERVICE_KEY ), is( AuditConstants.KNOX_SERVICE_NAME ) ); + assertThat(event.getMDC( AuditConstants.MDC_COMPONENT_KEY ), is( AuditConstants.KNOX_COMPONENT_NAME ) ); + assertThat(event.getLoggerName(), is( AuditConstants.DEFAULT_AUDITOR_NAME ) ); verifyValue( (String) event.getMDC( AuditConstants.MDC_RESOURCE_NAME_KEY ), resourceName ); verifyValue( (String) event.getMDC( AuditConstants.MDC_RESOURCE_TYPE_KEY ), resourceType ); verifyValue( (String) event.getMDC( AuditConstants.MDC_ACTION_KEY ), action ); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java index 1d15874..853cb1b 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFilterTest.java @@ -133,7 +133,7 @@ public class GatewayFilterTest { this.role = request.getAttribute( AbstractGatewayFilter.TARGET_SERVICE_ROLE ); Topology topology = (Topology)request.getServletContext().getAttribute( "org.apache.knox.gateway.topology" ); if (topology != null) { - this.defaultServicePath = (String) topology.getDefaultServicePath(); + this.defaultServicePath = topology.getDefaultServicePath(); url = new String(request.getRequestURL()); } } @@ -173,7 +173,7 @@ public class GatewayFilterTest { gateway.doFilter( request, response ); gateway.destroy(); - assertThat( (String)filter.role, is( "test-role" ) ); + assertThat(filter.role, is( "test-role" ) ); } @@ -214,8 +214,8 @@ public class GatewayFilterTest { gateway.doFilter( request, response ); gateway.destroy(); - assertThat( (String)filter.defaultServicePath, is( "test-role" ) ); - assertThat( (String)filter.url, is("http://host:8443/gateway/sandbox/test-role/test-path/test-resource";)); + assertThat(filter.defaultServicePath, is( "test-role" ) ); + assertThat(filter.url, is("http://host:8443/gateway/sandbox/test-role/test-path/test-resource";)); } } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java index c3c3a10..ec4d26e 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayForwardingServletTest.java @@ -35,11 +35,11 @@ public class GatewayForwardingServletTest { @Test public void testRedirectDefaults() throws ServletException, IOException { IMocksControl mockControl = EasyMock.createControl(); - ServletConfig config = (ServletConfig)mockControl.createMock(ServletConfig.class); - ServletContext context = (ServletContext)mockControl.createMock(ServletContext.class); - HttpServletRequest request = (HttpServletRequest)mockControl.createMock(HttpServletRequest.class); - HttpServletResponse response = (HttpServletResponse)mockControl.createMock(HttpServletResponse.class); - RequestDispatcher dispatcher = (RequestDispatcher)mockControl.createMock(RequestDispatcher.class); + ServletConfig config = mockControl.createMock(ServletConfig.class); + ServletContext context = mockControl.createMock(ServletContext.class); + HttpServletRequest request = mockControl.createMock(HttpServletRequest.class); + HttpServletResponse response = mockControl.createMock(HttpServletResponse.class); + RequestDispatcher dispatcher = mockControl.createMock(RequestDispatcher.class); // setup expectations EasyMock.expect(config.getServletName()).andStubReturn("default"); EasyMock.expect(config.getServletContext()).andStubReturn(context); @@ -53,7 +53,7 @@ public class GatewayForwardingServletTest { dispatcher.forward(request, response); EasyMock.expectLastCall().once(); // logging - context.log((String)EasyMock.anyObject()); + context.log(EasyMock.anyObject()); EasyMock.expectLastCall().anyTimes(); // run the test mockControl.replay(); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java index 439b69e..62891a2 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayGlobalConfigTest.java @@ -83,19 +83,19 @@ public class GatewayGlobalConfigTest { @Test( timeout = TestUtils.SHORT_TIMEOUT ) public void testDefaultTopologyName() { - GatewayConfig config = new GatewayConfigImpl(); + GatewayConfigImpl config = new GatewayConfigImpl(); assertThat( config.getDefaultTopologyName(), is( nullValue() ) ); - ((GatewayConfigImpl)config).set("default.app.topology.name", "test-topo-name" ); + config.set("default.app.topology.name", "test-topo-name" ); assertThat( config.getDefaultTopologyName(), is( "test-topo-name" ) ); } @Test( timeout = TestUtils.SHORT_TIMEOUT ) public void testDefaultAppRedirectPath() { - GatewayConfig config = new GatewayConfigImpl(); + GatewayConfigImpl config = new GatewayConfigImpl(); assertThat( config.getDefaultAppRedirectPath(), nullValue() ); - ((GatewayConfigImpl)config).set("default.app.topology.name", "test-topo-name" ); + config.set("default.app.topology.name", "test-topo-name" ); assertThat( config.getDefaultAppRedirectPath(), is("/gateway/test-topo-name") ); } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/test/java/org/apache/knox/gateway/jetty/JettyPathMapTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/JettyPathMapTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/jetty/JettyPathMapTest.java index e5d4d44..3de8b44 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/jetty/JettyPathMapTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/jetty/JettyPathMapTest.java @@ -32,32 +32,32 @@ public class JettyPathMapTest { map = new PathMap(); map.put( "/path", "/path" ); - assertThat( (String)map.match("/path"), is("/path") ); + assertThat(map.match("/path"), is("/path") ); map = new PathMap(); map.put( "/path", "/path" ); map.put( "/path/", "/path/" ); - assertThat( (String)map.match("/path"), is("/path") ); - assertThat( (String)map.match("/path/"), is("/path/") ); + assertThat(map.match("/path"), is("/path") ); + assertThat(map.match("/path/"), is("/path/") ); map = new PathMap(); map.put( "/path/*", "/path/*" ); map.put( "/path", "/path" ); map.put( "/path/", "/path/" ); - assertThat( (String)map.match("/path"), is("/path") ); - assertThat( (String)map.match("/path/"), is("/path/") ); - assertThat( (String)map.match("/path/sub"), is("/path/*") ); + assertThat(map.match("/path"), is("/path") ); + assertThat(map.match("/path/"), is("/path/") ); + assertThat(map.match("/path/sub"), is("/path/*") ); map = new PathMap(); map.put( "/path", "/path" ); map.put( "/path/", "/path/" ); map.put( "/path/*", "/path/*" ); - assertThat( (String)map.match( "/path/sub" ), is("/path/*") ); + assertThat(map.match( "/path/sub" ), is("/path/*") ); // Here the addition of the * path "overwrites" the exact matches. // Above this worked if the /path and /path/ were added after /path/*. - assertThat( (String)map.match("/path"), is("/path") ); - assertThat( (String)map.match("/path/"), is("/path/") ); + assertThat(map.match("/path"), is("/path") ); + assertThat(map.match("/path/"), is("/path/") ); } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityServiceTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityServiceTest.java index a51c79f..e778a7d 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityServiceTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityServiceTest.java @@ -25,10 +25,8 @@ import java.util.HashMap; import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.services.security.AliasService; -import org.apache.knox.gateway.services.security.KeystoreService; import org.apache.knox.gateway.services.security.MasterService; import org.apache.knox.gateway.services.security.impl.DefaultKeystoreService; -import org.apache.knox.gateway.services.security.token.JWTokenAuthority; import org.apache.knox.gateway.services.security.token.impl.JWT; import org.apache.knox.gateway.services.security.token.TokenServiceException; @@ -64,16 +62,16 @@ public class DefaultTokenAuthorityServiceTest extends org.junit.Assert { EasyMock.replay(principal, config, ms, as); - KeystoreService ks = new DefaultKeystoreService(); - ((DefaultKeystoreService)ks).setMasterService(ms); + DefaultKeystoreService ks = new DefaultKeystoreService(); + ks.setMasterService(ms); - ((DefaultKeystoreService)ks).init(config, new HashMap<String, String>()); + ks.init(config, new HashMap<String, String>()); - JWTokenAuthority ta = new DefaultTokenAuthorityService(); - ((DefaultTokenAuthorityService)ta).setAliasService(as); - ((DefaultTokenAuthorityService)ta).setKeystoreService(ks); + DefaultTokenAuthorityService ta = new DefaultTokenAuthorityService(); + ta.setAliasService(as); + ta.setKeystoreService(ks); - ((DefaultTokenAuthorityService)ta).init(config, new HashMap<String, String>()); + ta.init(config, new HashMap<String, String>()); JWT token = ta.issueToken(principal, "RS256"); assertEquals("KNOXSSO", token.getIssuer()); @@ -106,16 +104,16 @@ public class DefaultTokenAuthorityServiceTest extends org.junit.Assert { EasyMock.replay(principal, config, ms, as); - KeystoreService ks = new DefaultKeystoreService(); - ((DefaultKeystoreService)ks).setMasterService(ms); + DefaultKeystoreService ks = new DefaultKeystoreService(); + ks.setMasterService(ms); - ((DefaultKeystoreService)ks).init(config, new HashMap<String, String>()); + ks.init(config, new HashMap<String, String>()); - JWTokenAuthority ta = new DefaultTokenAuthorityService(); - ((DefaultTokenAuthorityService)ta).setAliasService(as); - ((DefaultTokenAuthorityService)ta).setKeystoreService(ks); + DefaultTokenAuthorityService ta = new DefaultTokenAuthorityService(); + ta.setAliasService(as); + ta.setKeystoreService(ks); - ((DefaultTokenAuthorityService)ta).init(config, new HashMap<String, String>()); + ta.init(config, new HashMap<String, String>()); JWT token = ta.issueToken(principal, "https://login.example.com";, "RS256"); assertEquals("KNOXSSO", token.getIssuer()); @@ -149,16 +147,16 @@ public class DefaultTokenAuthorityServiceTest extends org.junit.Assert { EasyMock.replay(principal, config, ms, as); - KeystoreService ks = new DefaultKeystoreService(); - ((DefaultKeystoreService)ks).setMasterService(ms); + DefaultKeystoreService ks = new DefaultKeystoreService(); + ks.setMasterService(ms); - ((DefaultKeystoreService)ks).init(config, new HashMap<String, String>()); + ks.init(config, new HashMap<String, String>()); - JWTokenAuthority ta = new DefaultTokenAuthorityService(); - ((DefaultTokenAuthorityService)ta).setAliasService(as); - ((DefaultTokenAuthorityService)ta).setKeystoreService(ks); + DefaultTokenAuthorityService ta = new DefaultTokenAuthorityService(); + ta.setAliasService(as); + ta.setKeystoreService(ks); - ((DefaultTokenAuthorityService)ta).init(config, new HashMap<String, String>()); + ta.init(config, new HashMap<String, String>()); JWT token = ta.issueToken(principal, null, "RS256"); assertEquals("KNOXSSO", token.getIssuer()); @@ -191,16 +189,16 @@ public class DefaultTokenAuthorityServiceTest extends org.junit.Assert { EasyMock.replay(principal, config, ms, as); - KeystoreService ks = new DefaultKeystoreService(); - ((DefaultKeystoreService)ks).setMasterService(ms); + DefaultKeystoreService ks = new DefaultKeystoreService(); + ks.setMasterService(ms); - ((DefaultKeystoreService)ks).init(config, new HashMap<String, String>()); + ks.init(config, new HashMap<String, String>()); - JWTokenAuthority ta = new DefaultTokenAuthorityService(); - ((DefaultTokenAuthorityService)ta).setAliasService(as); - ((DefaultTokenAuthorityService)ta).setKeystoreService(ks); + DefaultTokenAuthorityService ta = new DefaultTokenAuthorityService(); + ta.setAliasService(as); + ta.setKeystoreService(ks); - ((DefaultTokenAuthorityService)ta).init(config, new HashMap<String, String>()); + ta.init(config, new HashMap<String, String>()); JWT token = ta.issueToken(principal, "RS512"); assertEquals("KNOXSSO", token.getIssuer()); @@ -234,16 +232,16 @@ public class DefaultTokenAuthorityServiceTest extends org.junit.Assert { EasyMock.replay(principal, config, ms, as); - KeystoreService ks = new DefaultKeystoreService(); - ((DefaultKeystoreService)ks).setMasterService(ms); + DefaultKeystoreService ks = new DefaultKeystoreService(); + ks.setMasterService(ms); - ((DefaultKeystoreService)ks).init(config, new HashMap<String, String>()); + ks.init(config, new HashMap<String, String>()); - JWTokenAuthority ta = new DefaultTokenAuthorityService(); - ((DefaultTokenAuthorityService)ta).setAliasService(as); - ((DefaultTokenAuthorityService)ta).setKeystoreService(ks); + DefaultTokenAuthorityService ta = new DefaultTokenAuthorityService(); + ta.setAliasService(as); + ta.setKeystoreService(ks); - ((DefaultTokenAuthorityService)ta).init(config, new HashMap<String, String>()); + ta.init(config, new HashMap<String, String>()); try { ta.issueToken(principal, "none"); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java index 1eeb148..30c5ed6 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/services/topology/DefaultTopologyServiceTest.java @@ -206,7 +206,7 @@ public class DefaultTopologyServiceTest { TestTopologyListener topoListener = new TestTopologyListener(); FileAlterationMonitor monitor = new FileAlterationMonitor(Long.MAX_VALUE); - TopologyService provider = new DefaultTopologyService(); + DefaultTopologyService provider = new DefaultTopologyService(); Map<String, String> c = new HashMap<>(); GatewayConfig config = EasyMock.createNiceMock(GatewayConfig.class); @@ -226,7 +226,7 @@ public class DefaultTopologyServiceTest { new DefaultTopologyService.DescriptorsMonitor(config, topologyDir, aliasService); // Listener to simulate the topologies directory monitor, to notice when a topology has been deleted - provider.addTopologyChangeListener(new TestTopologyDeleteListener((DefaultTopologyService)provider)); + provider.addTopologyChangeListener(new TestTopologyDeleteListener(provider)); // Write out the referenced provider config first File provCfgFile = createFile(sharedProvidersDir, http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java ---------------------------------------------------------------------- diff --git a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java index 24e441c..983b616 100644 --- a/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java +++ b/gateway-service-knoxtoken/src/main/java/org/apache/knox/gateway/service/knoxtoken/TokenResource.java @@ -161,7 +161,7 @@ public class TokenResource { .getAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE); JWTokenAuthority ts = services.getService(GatewayServices.TOKEN_SERVICE); - Principal p = ((HttpServletRequest)request).getUserPrincipal(); + Principal p = request.getUserPrincipal(); long expires = getExpiry(); try { http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java index ab57f8a..19d0dd0 100644 --- a/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java +++ b/gateway-spi/src/main/java/org/apache/knox/gateway/services/security/impl/X509CertificateUtil.java @@ -143,7 +143,7 @@ public class X509CertificateUtil { Field v3IntField = certInfoObject0.getClass() .getDeclaredField("V3"); v3IntField.setAccessible(true); - int fValue = (int) v3IntField.getInt(certInfoObject0); + int fValue = v3IntField.getInt(certInfoObject0); Object certificateVersionObject = certificateVersionConstr .newInstance(fValue); methodSET.invoke(certInfoObject, getSetField(certInfoObject, "VERSION"), http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java index 0eb70c6..cb1c113 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/services/security/token/impl/JWTTokenTest.java @@ -182,7 +182,7 @@ public class JWTTokenTest extends org.junit.Assert { assertTrue(token.getSignaturePayload().length > 0); // Verify the signature - JWSVerifier verifier = new RSASSAVerifier((RSAPublicKey) publicKey); + JWSVerifier verifier = new RSASSAVerifier(publicKey); assertTrue(token.verify(verifier)); } @@ -206,7 +206,7 @@ public class JWTTokenTest extends org.junit.Assert { assertTrue(token.getSignaturePayload().length > 0); // Verify the signature - JWSVerifier verifier = new RSASSAVerifier((RSAPublicKey) publicKey); + JWSVerifier verifier = new RSASSAVerifier(publicKey); assertTrue(token.verify(verifier)); } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java index 16761e7..c619742 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java @@ -78,12 +78,12 @@ public class DeploymentFactoryFuncTest { @Test( timeout = MEDIUM_TIMEOUT ) public void testGenericProviderDeploymentContributor() throws ParserConfigurationException, SAXException, IOException, TransformerException { LOG_ENTER(); - GatewayConfig config = new GatewayTestConfig(); + GatewayTestConfig config = new GatewayTestConfig(); File targetDir = new File( System.getProperty( "user.dir" ), "target" ); File gatewayDir = new File( targetDir, "gateway-home-" + UUID.randomUUID() ); gatewayDir.mkdirs(); - ((GatewayTestConfig) config).setGatewayHomeDir( gatewayDir.getAbsolutePath() ); + config.setGatewayHomeDir( gatewayDir.getAbsolutePath() ); File deployDir = new File( config.getGatewayDeploymentDir() ); deployDir.mkdirs(); @@ -150,11 +150,11 @@ public class DeploymentFactoryFuncTest { @Test( timeout = LONG_TIMEOUT ) public void testInvalidGenericProviderDeploymentContributor() throws ParserConfigurationException, SAXException, IOException, TransformerException { LOG_ENTER(); - GatewayConfig config = new GatewayTestConfig(); + GatewayTestConfig config = new GatewayTestConfig(); File targetDir = new File( System.getProperty( "user.dir" ), "target" ); File gatewayDir = new File( targetDir, "gateway-home-" + UUID.randomUUID() ); gatewayDir.mkdirs(); - ((GatewayTestConfig) config).setGatewayHomeDir( gatewayDir.getAbsolutePath() ); + config.setGatewayHomeDir( gatewayDir.getAbsolutePath() ); File deployDir = new File( config.getGatewayDeploymentDir() ); deployDir.mkdirs(); @@ -206,13 +206,13 @@ public class DeploymentFactoryFuncTest { @Test( timeout = MEDIUM_TIMEOUT ) public void testSimpleTopology() throws IOException, SAXException, ParserConfigurationException, URISyntaxException, TransformerException { LOG_ENTER(); - GatewayConfig config = new GatewayTestConfig(); + GatewayTestConfig config = new GatewayTestConfig(); //Testing without x-forwarded headers filter - ((GatewayTestConfig)config).setXForwardedEnabled(false); + config.setXForwardedEnabled(false); File targetDir = new File( System.getProperty( "user.dir" ), "target" ); File gatewayDir = new File( targetDir, "gateway-home-" + UUID.randomUUID() ); gatewayDir.mkdirs(); - ((GatewayTestConfig) config).setGatewayHomeDir( gatewayDir.getAbsolutePath() ); + config.setGatewayHomeDir( gatewayDir.getAbsolutePath() ); File deployDir = new File( config.getGatewayDeploymentDir() ); deployDir.mkdirs(); @@ -329,11 +329,11 @@ public class DeploymentFactoryFuncTest { @Test( timeout = LONG_TIMEOUT ) public void testWebXmlGeneration() throws IOException, SAXException, ParserConfigurationException, URISyntaxException { LOG_ENTER(); - GatewayConfig config = new GatewayTestConfig(); + GatewayTestConfig config = new GatewayTestConfig(); File targetDir = new File(System.getProperty("user.dir"), "target"); File gatewayDir = new File(targetDir, "gateway-home-" + UUID.randomUUID()); gatewayDir.mkdirs(); - ((GatewayTestConfig) config).setGatewayHomeDir(gatewayDir.getAbsolutePath()); + config.setGatewayHomeDir(gatewayDir.getAbsolutePath()); File deployDir = new File(config.getGatewayDeploymentDir()); deployDir.mkdirs(); @@ -409,11 +409,11 @@ public class DeploymentFactoryFuncTest { @Test( timeout = LONG_TIMEOUT ) public void testDeploymentWithServiceParams() throws Exception { LOG_ENTER(); - GatewayConfig config = new GatewayTestConfig(); + GatewayTestConfig config = new GatewayTestConfig(); File targetDir = new File(System.getProperty("user.dir"), "target"); File gatewayDir = new File(targetDir, "gateway-home-" + UUID.randomUUID()); gatewayDir.mkdirs(); - ((GatewayTestConfig) config).setGatewayHomeDir(gatewayDir.getAbsolutePath()); + config.setGatewayHomeDir(gatewayDir.getAbsolutePath()); File deployDir = new File(config.getGatewayDeploymentDir()); deployDir.mkdirs(); @@ -499,17 +499,17 @@ public class DeploymentFactoryFuncTest { @Test( timeout = MEDIUM_TIMEOUT ) public void testDeploymentWithApplication() throws Exception { LOG_ENTER(); - GatewayConfig config = new GatewayTestConfig(); + GatewayTestConfig config = new GatewayTestConfig(); File targetDir = new File(System.getProperty("user.dir"), "target"); File gatewayDir = new File(targetDir, "gateway-home-" + UUID.randomUUID()); gatewayDir.mkdirs(); - ((GatewayTestConfig) config).setGatewayHomeDir(gatewayDir.getAbsolutePath()); + config.setGatewayHomeDir(gatewayDir.getAbsolutePath()); File deployDir = new File(config.getGatewayDeploymentDir()); deployDir.mkdirs(); URL serviceUrl = TestUtils.getResourceUrl( DeploymentFactoryFuncTest.class, "test-apps/minimal-test-app/service.xml" ); File serviceFile = new File( serviceUrl.toURI() ); File appsDir = serviceFile.getParentFile().getParentFile(); - ((GatewayTestConfig)config).setGatewayApplicationsDir(appsDir.getAbsolutePath()); + config.setGatewayApplicationsDir(appsDir.getAbsolutePath()); DefaultGatewayServices srvcs = new DefaultGatewayServices(); Map<String, String> options = new HashMap<>(); @@ -557,17 +557,17 @@ public class DeploymentFactoryFuncTest { @Test( timeout = MEDIUM_TIMEOUT ) public void testDeploymentWithServicesAndApplications() throws Exception { LOG_ENTER(); - GatewayConfig config = new GatewayTestConfig(); + GatewayTestConfig config = new GatewayTestConfig(); File targetDir = new File(System.getProperty("user.dir"), "target"); File gatewayDir = new File(targetDir, "gateway-home-" + UUID.randomUUID()); gatewayDir.mkdirs(); - ((GatewayTestConfig) config).setGatewayHomeDir(gatewayDir.getAbsolutePath()); + config.setGatewayHomeDir(gatewayDir.getAbsolutePath()); File deployDir = new File(config.getGatewayDeploymentDir()); deployDir.mkdirs(); URL serviceUrl = TestUtils.getResourceUrl( DeploymentFactoryFuncTest.class, "test-apps/minimal-test-app/service.xml" ); File serviceFile = new File( serviceUrl.toURI() ); File appsDir = serviceFile.getParentFile().getParentFile(); - ((GatewayTestConfig)config).setGatewayApplicationsDir(appsDir.getAbsolutePath()); + config.setGatewayApplicationsDir(appsDir.getAbsolutePath()); DefaultGatewayServices srvcs = new DefaultGatewayServices(); Map<String, String> options = new HashMap<>(); @@ -643,12 +643,12 @@ public class DeploymentFactoryFuncTest { @Test( timeout = MEDIUM_TIMEOUT ) public void testServiceAnonAuth() throws IOException, SAXException, ParserConfigurationException, URISyntaxException, TransformerException { LOG_ENTER(); - final GatewayConfig config = new GatewayTestConfig(); - ((GatewayTestConfig)config).setXForwardedEnabled(false); + final GatewayTestConfig config = new GatewayTestConfig(); + config.setXForwardedEnabled(false); final File targetDir = new File( System.getProperty( "user.dir" ), "target" ); final File gatewayDir = new File( targetDir, "gateway-home-" + UUID.randomUUID() ); gatewayDir.mkdirs(); - ((GatewayTestConfig) config).setGatewayHomeDir( gatewayDir.getAbsolutePath() ); + config.setGatewayHomeDir( gatewayDir.getAbsolutePath() ); final File deployDir = new File( config.getGatewayDeploymentDir() ); deployDir.mkdirs(); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java index cd9065a..e8cf934 100644 --- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java +++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/JsonUtils.java @@ -42,7 +42,7 @@ public class JsonUtils { try { // write JSON to a file - json = mapper.writeValueAsString((Object)map); + json = mapper.writeValueAsString(map); } catch ( JsonProcessingException e ) { LOG.failedToSerializeMapToJSON( map, e ); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java index 6a68e52..ea94102 100644 --- a/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java +++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/audit/AuditServiceTest.java @@ -107,13 +107,13 @@ public class AuditServiceTest { LoggingEvent event = iterator.next(); checkLogEventContexts( event, cc, ac ); - assertThat( (String)event.getMDC( AuditConstants.MDC_ACTION_KEY ), is( "action" + counter ) ); - assertThat( (String)event.getMDC( AuditConstants.MDC_RESOURCE_NAME_KEY ), is( "resource" + counter ) ); - assertThat( (String)event.getMDC( AuditConstants.MDC_RESOURCE_TYPE_KEY ), is( "resource type" + counter ) ); - assertThat( (String)event.getMDC( AuditConstants.MDC_OUTCOME_KEY ), is( "outcome" + counter ) ); - assertThat( (String)event.getMDC( AuditConstants.MDC_SERVICE_KEY ), is( AuditConstants.KNOX_SERVICE_NAME ) ); - assertThat( (String)event.getMDC( AuditConstants.MDC_COMPONENT_KEY ), is( AuditConstants.KNOX_COMPONENT_NAME ) ); - assertThat( (String)event.getRenderedMessage(), is( "message" + counter ) ); + assertThat(event.getMDC( AuditConstants.MDC_ACTION_KEY ), is( "action" + counter ) ); + assertThat(event.getMDC( AuditConstants.MDC_RESOURCE_NAME_KEY ), is( "resource" + counter ) ); + assertThat(event.getMDC( AuditConstants.MDC_RESOURCE_TYPE_KEY ), is( "resource type" + counter ) ); + assertThat(event.getMDC( AuditConstants.MDC_OUTCOME_KEY ), is( "outcome" + counter ) ); + assertThat(event.getMDC( AuditConstants.MDC_SERVICE_KEY ), is( AuditConstants.KNOX_SERVICE_NAME ) ); + assertThat(event.getMDC( AuditConstants.MDC_COMPONENT_KEY ), is( AuditConstants.KNOX_COMPONENT_NAME ) ); + assertThat(event.getRenderedMessage(), is( "message" + counter ) ); counter++; } http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java ---------------------------------------------------------------------- diff --git a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java index 522d0d2..e1ef56e 100755 --- a/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java +++ b/gateway-util-configinjector/src/main/java/org/apache/knox/gateway/config/impl/DefaultConfigurationInjector.java @@ -200,7 +200,7 @@ public class DefaultConfigurationInjector implements ConfigurationInjector { if( tags != null ) { for( Annotation tag : tags ) { if( tag != null && tag instanceof Alias ) { - Alias aliasTag = Alias.class.cast( tag ); + Alias aliasTag = (Alias) tag; String aliasValue = aliasTag.value().trim(); if( aliasValue.length() > 0 ) { name = aliasValue; http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java index 0e8941f..cc37da7 100644 --- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java +++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/MatcherTest.java @@ -830,7 +830,7 @@ public class MatcherTest { input = Parser.parseLiteral( "http://localhost:53221/gateway/cluster/webhdfs/v1/tmp/GatewayWebHdfsFuncTest/testBasicHdfsUseCase/dir?user.name=hdfs&op=MKDIRS"; ); match = stringMatcher.match( input ); assertThat( match.getValue(), notNullValue() ); - assertThat( (String)match.getValue(), is( "test-value-B" ) ); + assertThat(match.getValue(), is( "test-value-B" ) ); } @@ -990,7 +990,7 @@ public class MatcherTest { match = matcher.match( input ); assertThat( match, notNullValue() ); - assertThat( (String)match.getValue(), is( "test-value" ) ); + assertThat(match.getValue(), is( "test-value" ) ); template = Parser.parseTemplate( "http://host:42/root/webhdfs/v1/{path=**}?{**}"; ); URI expandedUri = Expander.expand( template, match.getParams(), null ); http://git-wip-us.apache.org/repos/asf/knox/blob/8e51af31/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java index e8ea0b5..5431193 100644 --- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java +++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/RewriterTest.java @@ -401,7 +401,7 @@ public class RewriterTest { if( request != null ) { String[] array = request.getParameterValues( name ); if( array != null ) { - values = (List<String>)Arrays.asList( array ); + values = Arrays.asList( array ); return values; } }
