Repository: knox Updated Branches: refs/heads/master 93a096a47 -> 8dc4495a7
KNOX-1454 - Enable checkstyle no wildcard imports rule Signed-off-by: Kevin Risden <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/8dc4495a Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/8dc4495a Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/8dc4495a Branch: refs/heads/master Commit: 8dc4495a77d9c56145265a52561a1504c3a5d9a9 Parents: 93a096a Author: Kevin Risden <[email protected]> Authored: Tue Sep 25 15:21:42 2018 -0400 Committer: Kevin Risden <[email protected]> Committed: Tue Sep 25 18:18:01 2018 -0400 ---------------------------------------------------------------------- .../gateway/shirorealm/KnoxLdapRealmTest.java | 4 +- .../gateway/shirorealm/KnoxPamRealmTest.java | 6 ++- .../provider/impl/AtlasZookeeperURLManager.java | 3 +- .../ha/provider/impl/DefaultHaProviderTest.java | 6 ++- .../provider/impl/HaDescriptorFactoryTest.java | 5 +- .../impl/InboundUrlFunctionProcessorTest.java | 21 ++++---- .../ServiceAddressFunctionProcessorTest.java | 5 +- .../impl/ServiceHostFunctionProcessorTest.java | 5 +- ...rviceMappedAddressFunctionProcessorTest.java | 5 +- .../ServiceMappedHostFunctionProcessorTest.java | 5 +- .../ServiceMappedUrlFunctionProcessorTest.java | 5 +- .../impl/ServicePathFunctionProcessorTest.java | 5 +- .../impl/ServicePortFunctionProcessorTest.java | 5 +- .../impl/ServiceRegistryFunctionsTest.java | 12 +++-- .../ServiceSchemeFunctionProcessorTest.java | 5 +- .../impl/ServiceUrlFunctionProcessorTest.java | 5 +- .../rewrite/impl/xml/XmlFilterReaderTest.java | 4 +- .../knox/gateway/filter/AclParserTest.java | 6 ++- .../pac4j/filter/Pac4jDispatcherFilter.java | 12 +++-- .../pac4j/filter/Pac4jIdentityAdapter.java | 7 ++- .../gateway/pac4j/MockHttpServletRequest.java | 6 ++- .../gateway/pac4j/MockHttpServletResponse.java | 3 +- .../knox/gateway/pac4j/Pac4jProviderTest.java | 15 ++++-- .../knox/gateway/shirorealm/KnoxPamRealm.java | 15 +++--- .../gateway/shirorealm/KnoxLdapRealmTest.java | 4 +- .../gateway/shirorealm/KnoxPamRealmTest.java | 9 ++-- .../knox/gateway/GatewayForwardingServlet.java | 16 +++--- .../knox/gateway/filter/SessionFilter.java | 3 +- .../knox/gateway/util/CredentialsProvider.java | 6 ++- .../apache/knox/gateway/AuditLoggingTest.java | 54 +++++++++++--------- .../apache/knox/gateway/GatewayFilterTest.java | 6 ++- .../knox/gateway/GatewayGlobalConfigTest.java | 5 +- .../PropertiesFileServiceDiscovery.java | 6 ++- .../util/ServiceDefinitionsLoaderTest.java | 4 +- .../admin/TopologyCollectionMarshaller.java | 4 +- .../service/admin/TopologyMarshaller.java | 22 ++++---- .../knox/gateway/hbase/HBaseDispatchTest.java | 8 +-- .../knoxtoken/TokenServiceResourceTest.java | 22 ++++---- .../topology/discovery/GatewayService.java | 6 ++- .../knox/gateway/topology/VersionTest.java | 3 +- .../knox/test/mock/MockRequestMatcher.java | 4 +- .../knox/gateway/GatewayCorrelationIdTest.java | 12 ++++- .../apache/knox/gateway/launcher/Launcher.java | 7 ++- .../gateway/util/urltemplate/ExpanderTest.java | 4 +- src/checkstyle/checker.xml | 3 +- 45 files changed, 252 insertions(+), 126 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java b/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java index 6ffa2cd..2c1fb87 100644 --- a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java +++ b/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java @@ -20,7 +20,9 @@ package org.apache.hadoop.gateway.shirorealm; import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class KnoxLdapRealmTest { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java b/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java index 0f1754f..e03051f 100644 --- a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java +++ b/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java @@ -24,9 +24,11 @@ import org.junit.Test; import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.UsernamePasswordToken; -import static org.junit.Assert.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; -import static org.easymock.EasyMock.*; public class KnoxPamRealmTest { @Test http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java ---------------------------------------------------------------------- diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java index 2412ed2..8d3ce38 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/AtlasZookeeperURLManager.java @@ -26,7 +26,8 @@ import org.apache.knox.gateway.ha.provider.impl.i18n.HaMessages; import org.apache.knox.gateway.i18n.messages.MessagesFactory; import java.nio.charset.Charset; -import java.util.*; +import java.util.ArrayList; +import java.util.List; public class AtlasZookeeperURLManager extends DefaultURLManager { private static final String DEFAULT_ZOOKEEPER_NAMESPACE = "/apache_atlas"; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java index 90c03e5..8be2a72 100644 --- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java +++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/DefaultHaProviderTest.java @@ -25,7 +25,11 @@ import java.util.ArrayList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isIn; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; public class DefaultHaProviderTest { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java index bf306e9..d2c0fbf 100644 --- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java +++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HaDescriptorFactoryTest.java @@ -20,7 +20,10 @@ package org.apache.knox.gateway.ha.provider.impl; import org.apache.knox.gateway.ha.provider.HaServiceConfig; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class HaDescriptorFactoryTest { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-inbound-query-param/src/test/java/org/apache/knox/gateway/inboundurl/impl/InboundUrlFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-inbound-query-param/src/test/java/org/apache/knox/gateway/inboundurl/impl/InboundUrlFunctionProcessorTest.java b/gateway-provider-rewrite-func-inbound-query-param/src/test/java/org/apache/knox/gateway/inboundurl/impl/InboundUrlFunctionProcessorTest.java index e3bf9f7..c0d3870 100644 --- a/gateway-provider-rewrite-func-inbound-query-param/src/test/java/org/apache/knox/gateway/inboundurl/impl/InboundUrlFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-inbound-query-param/src/test/java/org/apache/knox/gateway/inboundurl/impl/InboundUrlFunctionProcessorTest.java @@ -19,31 +19,34 @@ package org.apache.knox.gateway.inboundurl.impl; import com.google.common.collect.Lists; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteEnvironment; +import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteProcessor; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteRuleDescriptor; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteRulesDescriptor; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteRulesDescriptorFactory; +import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletContextListener; +import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletFilter; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriter; import org.apache.knox.gateway.filter.rewrite.ext.UrlRewriteActionRewriteDescriptorExt; -import org.apache.knox.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor; +import org.apache.knox.gateway.filter.rewrite.impl.UrlRewriteContextImpl; import org.apache.knox.gateway.filter.rewrite.impl.UrlRewriteResponse; -import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteProcessor; -import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletContextListener; -import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletFilter; +import org.apache.knox.gateway.filter.rewrite.spi.UrlRewriteFunctionProcessor; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.util.urltemplate.Parser; import org.apache.knox.gateway.util.urltemplate.Resolver; import org.apache.knox.gateway.util.urltemplate.Template; -import org.apache.knox.gateway.filter.rewrite.impl.UrlRewriteContextImpl; -import org.junit.Test; - -import java.util.*; - import org.easymock.EasyMock; +import org.junit.Test; import javax.servlet.FilterConfig; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.ServiceLoader; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java index 7de9ff8..d16d69c 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceAddressFunctionProcessorTest.java @@ -33,7 +33,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java index 5a95620..72d6b30 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceHostFunctionProcessorTest.java @@ -33,7 +33,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessorTest.java index 51d14ca..969a898 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedAddressFunctionProcessorTest.java @@ -36,7 +36,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessorTest.java index 7a7f072..37ff1d7 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessorTest.java @@ -36,7 +36,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessorTest.java index 78d5429..c0c712a 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedUrlFunctionProcessorTest.java @@ -36,7 +36,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java index 87ddfb1..bb40b12 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePathFunctionProcessorTest.java @@ -33,7 +33,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java index 76a0381..d39875e 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServicePortFunctionProcessorTest.java @@ -33,7 +33,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java index 47525bb..979cd9d 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceRegistryFunctionsTest.java @@ -17,6 +17,7 @@ */ package org.apache.knox.gateway.svcregfunc.impl; +import org.apache.http.auth.BasicUserPrincipal; import org.apache.knox.gateway.filter.AbstractGatewayFilter; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletContextListener; import org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletFilter; @@ -27,11 +28,10 @@ import org.apache.knox.test.TestUtils; import org.apache.knox.test.log.NoOpLogger; import org.apache.knox.test.mock.MockInteraction; import org.apache.knox.test.mock.MockServlet; -import org.apache.http.auth.BasicUserPrincipal; import org.easymock.EasyMock; +import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.servlet.FilterHolder; import org.eclipse.jetty.servlet.ServletHolder; -import org.eclipse.jetty.http.HttpTester; import org.eclipse.jetty.servlet.ServletTester; import org.eclipse.jetty.util.ArrayQueue; import org.eclipse.jetty.util.log.Log; @@ -39,7 +39,13 @@ import org.hamcrest.core.Is; import org.junit.Test; import javax.security.auth.Subject; -import javax.servlet.*; +import javax.servlet.DispatcherType; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.net.URISyntaxException; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java index 9c9affd..3710275 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceSchemeFunctionProcessorTest.java @@ -33,7 +33,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java index fde6ef8..255e4ed 100644 --- a/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java +++ b/gateway-provider-rewrite-func-service-registry/src/test/java/org/apache/knox/gateway/svcregfunc/impl/ServiceUrlFunctionProcessorTest.java @@ -36,7 +36,10 @@ import java.util.Arrays; import java.util.Iterator; import java.util.ServiceLoader; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.CoreMatchers.sameInstance; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java index 623a23f..3f939e7 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/xml/XmlFilterReaderTest.java @@ -62,7 +62,9 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.CoreMatchers.nullValue; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.fail; import static org.xmlmatchers.XmlMatchers.hasXPath; import static org.xmlmatchers.transform.XmlConverters.the; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java b/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java index c377a89..bd0cd87 100644 --- a/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java +++ b/gateway-provider-security-authz-acls/src/test/java/org/apache/knox/gateway/filter/AclParserTest.java @@ -17,10 +17,12 @@ */ package org.apache.knox.gateway.filter; -import static org.junit.Assert.*; - import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * @author larry * http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/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 34d7978..93ddfe0 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 @@ -22,11 +22,11 @@ import org.apache.knox.gateway.i18n.messages.MessagesFactory; import org.apache.knox.gateway.pac4j.Pac4jMessages; import org.apache.knox.gateway.pac4j.session.KnoxSessionStore; import org.apache.knox.gateway.services.GatewayServices; -import org.apache.knox.gateway.services.security.KeystoreService; -import org.apache.knox.gateway.services.security.MasterService; import org.apache.knox.gateway.services.security.AliasService; import org.apache.knox.gateway.services.security.AliasServiceException; import org.apache.knox.gateway.services.security.CryptoService; +import org.apache.knox.gateway.services.security.KeystoreService; +import org.apache.knox.gateway.services.security.MasterService; import org.pac4j.config.client.PropertiesConfigFactory; import org.pac4j.core.client.Client; import org.pac4j.core.config.Config; @@ -38,7 +38,13 @@ import org.pac4j.http.credentials.authenticator.test.SimpleTestUsernamePasswordA import org.pac4j.j2e.filter.CallbackFilter; import org.pac4j.j2e.filter.SecurityFilter; -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java index bc66003..6a612f7 100644 --- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java +++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java @@ -17,7 +17,12 @@ */ package org.apache.knox.gateway.pac4j.filter; -import org.apache.knox.gateway.audit.api.*; +import org.apache.knox.gateway.audit.api.Action; +import org.apache.knox.gateway.audit.api.ActionOutcome; +import org.apache.knox.gateway.audit.api.AuditService; +import org.apache.knox.gateway.audit.api.AuditServiceFactory; +import org.apache.knox.gateway.audit.api.Auditor; +import org.apache.knox.gateway.audit.api.ResourceType; import org.apache.knox.gateway.audit.log4j.audit.AuditConstants; import org.apache.knox.gateway.filter.AbstractGatewayFilter; import org.apache.knox.gateway.security.PrimaryPrincipal; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletRequest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletRequest.java b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletRequest.java index 18f4913..70bb4d0 100644 --- a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletRequest.java +++ b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletRequest.java @@ -17,12 +17,14 @@ */ package org.apache.knox.gateway.pac4j; -import javax.servlet.http.*; +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; import java.util.HashMap; import java.util.Map; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; public class MockHttpServletRequest extends HttpServletRequestWrapper { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java index 07dd255..3de88fc 100644 --- a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java +++ b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/MockHttpServletResponse.java @@ -21,14 +21,13 @@ package org.apache.knox.gateway.pac4j; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; - import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; public class MockHttpServletResponse extends HttpServletResponseWrapper { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/Pac4jProviderTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/Pac4jProviderTest.java b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/Pac4jProviderTest.java index e69c599..3b999cf 100644 --- a/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/Pac4jProviderTest.java +++ b/gateway-provider-security-pac4j/src/test/java/org/apache/knox/gateway/pac4j/Pac4jProviderTest.java @@ -31,14 +31,19 @@ import org.pac4j.core.client.Clients; import org.pac4j.core.context.Pac4jConstants; import org.pac4j.http.client.indirect.IndirectBasicAuthClient; -import javax.servlet.*; -import javax.servlet.http.*; - +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.http.Cookie; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.mockito.Mockito.*; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; /** * This class simulates a full authentication process using pac4j. http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java index 4e1deb3..589ecc4 100644 --- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java +++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/KnoxPamRealm.java @@ -19,35 +19,38 @@ package org.apache.knox.gateway.shirorealm; -import java.util.LinkedHashSet; -import java.util.Set; import org.apache.knox.gateway.GatewayMessages; import org.apache.knox.gateway.audit.api.Action; import org.apache.knox.gateway.audit.api.ActionOutcome; -import org.apache.knox.gateway.audit.api.ResourceType; import org.apache.knox.gateway.audit.api.AuditService; import org.apache.knox.gateway.audit.api.AuditServiceFactory; import org.apache.knox.gateway.audit.api.Auditor; +import org.apache.knox.gateway.audit.api.ResourceType; import org.apache.knox.gateway.audit.log4j.audit.AuditConstants; import org.apache.knox.gateway.i18n.messages.MessagesFactory; import org.apache.knox.gateway.shirorealm.impl.i18n.KnoxShiroMessages; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; - import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.SimpleAuthenticationInfo; import org.apache.shiro.authc.UsernamePasswordToken; +import org.apache.shiro.authc.credential.HashedCredentialsMatcher; import org.apache.shiro.authz.AuthorizationInfo; import org.apache.shiro.authz.SimpleAuthorizationInfo; +import org.apache.shiro.crypto.hash.DefaultHashService; +import org.apache.shiro.crypto.hash.Hash; +import org.apache.shiro.crypto.hash.HashRequest; +import org.apache.shiro.crypto.hash.HashService; import org.apache.shiro.realm.AuthorizingRealm; import org.apache.shiro.subject.PrincipalCollection; -import org.apache.shiro.authc.credential.HashedCredentialsMatcher; -import org.apache.shiro.crypto.hash.*; import org.jvnet.libpam.PAM; import org.jvnet.libpam.PAMException; import org.jvnet.libpam.UnixUser; +import java.util.LinkedHashSet; +import java.util.Set; + /** * A Unix-style * <a href="http://www.kernel.org/pub/linux/libs/pam/index.html";>PAM</a> http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java b/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java index 591dd7e..e1469ff 100644 --- a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java +++ b/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxLdapRealmTest.java @@ -20,7 +20,9 @@ package org.apache.knox.gateway.shirorealm; import org.junit.Test; -import static org.junit.Assert.*; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; public class KnoxLdapRealmTest { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxPamRealmTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxPamRealmTest.java b/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxPamRealmTest.java index 340bbc4..3cf317a 100644 --- a/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxPamRealmTest.java +++ b/gateway-provider-security-shiro/src/test/java/org/apache/knox/gateway/shirorealm/KnoxPamRealmTest.java @@ -19,14 +19,15 @@ package org.apache.knox.gateway.shirorealm; -import org.junit.Test; - import org.apache.shiro.authc.AuthenticationInfo; import org.apache.shiro.authc.UsernamePasswordToken; +import org.junit.Test; -import static org.junit.Assert.*; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.replay; +import static org.junit.Assert.assertTrue; import static org.junit.Assume.assumeTrue; -import static org.easymock.EasyMock.*; public class KnoxPamRealmTest { @Test http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java index 76e5deb..80aac55 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayForwardingServlet.java @@ -18,18 +18,22 @@ package org.apache.knox.gateway; import org.apache.knox.gateway.audit.api.ActionOutcome; +import org.apache.knox.gateway.audit.api.AuditService; +import org.apache.knox.gateway.audit.api.AuditServiceFactory; import org.apache.knox.gateway.audit.api.Auditor; import org.apache.knox.gateway.audit.api.ResourceType; import org.apache.knox.gateway.audit.log4j.audit.AuditConstants; -import org.apache.knox.gateway.audit.api.AuditService; -import org.apache.knox.gateway.audit.api.AuditServiceFactory; import org.apache.knox.gateway.i18n.messages.MessagesFactory; import org.apache.knox.gateway.i18n.resources.ResourcesFactory; -import java.io.*; - -import javax.servlet.*; -import javax.servlet.http.*; +import javax.servlet.RequestDispatcher; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; public class GatewayForwardingServlet extends HttpServlet{ http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-server/src/main/java/org/apache/knox/gateway/filter/SessionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/filter/SessionFilter.java b/gateway-server/src/main/java/org/apache/knox/gateway/filter/SessionFilter.java index e1a7e29..768d36b 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/filter/SessionFilter.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/filter/SessionFilter.java @@ -17,7 +17,8 @@ */ package org.apache.knox.gateway.filter; -import javax.servlet.*; +import javax.servlet.FilterChain; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java b/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java index 32beb55..a18856f 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/util/CredentialsProvider.java @@ -19,7 +19,11 @@ package org.apache.knox.gateway.util; import org.apache.http.auth.Credentials; -import javax.security.auth.callback.*; +import javax.security.auth.callback.Callback; +import javax.security.auth.callback.CallbackHandler; +import javax.security.auth.callback.NameCallback; +import javax.security.auth.callback.PasswordCallback; +import javax.security.auth.callback.UnsupportedCallbackException; import java.io.IOException; public class CredentialsProvider implements CallbackHandler { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/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 22bc308..0264250 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 @@ -17,29 +17,8 @@ */ package org.apache.knox.gateway; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.core.IsNull.notNullValue; -import static org.hamcrest.core.IsNull.nullValue; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.*; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.TimeUnit; - -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClientBuilder; import org.apache.knox.gateway.audit.api.Action; import org.apache.knox.gateway.audit.api.ActionOutcome; import org.apache.knox.gateway.audit.api.AuditContext; @@ -53,8 +32,6 @@ import org.apache.knox.gateway.config.GatewayConfig; import org.apache.knox.gateway.dispatch.DefaultDispatch; import org.apache.knox.gateway.i18n.resources.ResourcesFactory; import org.apache.knox.test.log.CollectAppender; -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; @@ -63,6 +40,33 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.hamcrest.core.IsNull.nullValue; +import static org.junit.Assert.fail; + public class AuditLoggingTest { private static Logger LOG = LoggerFactory.getLogger( AuditLoggingTest.class ); http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/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 b7f787a..75dd279 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 @@ -29,7 +29,11 @@ import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/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 1acf9d6..1611e95 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 @@ -30,7 +30,10 @@ import java.util.List; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.nullValue; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public class GatewayGlobalConfigTest { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-server/src/test/java/org/apache/knox/gateway/topology/discovery/test/extension/PropertiesFileServiceDiscovery.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/topology/discovery/test/extension/PropertiesFileServiceDiscovery.java b/gateway-server/src/test/java/org/apache/knox/gateway/topology/discovery/test/extension/PropertiesFileServiceDiscovery.java index eeb7dca..0c708ce 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/topology/discovery/test/extension/PropertiesFileServiceDiscovery.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/topology/discovery/test/extension/PropertiesFileServiceDiscovery.java @@ -25,7 +25,11 @@ import org.apache.knox.gateway.topology.discovery.ServiceDiscoveryConfig; import java.io.FileInputStream; import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; class PropertiesFileServiceDiscovery implements ServiceDiscovery { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-server/src/test/java/org/apache/knox/gateway/util/ServiceDefinitionsLoaderTest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/util/ServiceDefinitionsLoaderTest.java b/gateway-server/src/test/java/org/apache/knox/gateway/util/ServiceDefinitionsLoaderTest.java index 545e35f..03d7c81 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/util/ServiceDefinitionsLoaderTest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/util/ServiceDefinitionsLoaderTest.java @@ -25,7 +25,9 @@ import java.io.File; import java.net.URL; import java.util.Set; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; public class ServiceDefinitionsLoaderTest { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyCollectionMarshaller.java ---------------------------------------------------------------------- diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyCollectionMarshaller.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyCollectionMarshaller.java index 9e77b5c..0234967 100644 --- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyCollectionMarshaller.java +++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyCollectionMarshaller.java @@ -25,7 +25,9 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.*; +import javax.ws.rs.ext.MessageBodyWriter; +import javax.ws.rs.ext.Provider; +import javax.ws.rs.ext.Providers; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyMarshaller.java ---------------------------------------------------------------------- diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyMarshaller.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyMarshaller.java index dd95af9..31dcc3e 100644 --- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyMarshaller.java +++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologyMarshaller.java @@ -19,31 +19,33 @@ package org.apache.knox.gateway.service.admin; import org.apache.knox.gateway.service.admin.beans.Topology; - import org.eclipse.persistence.jaxb.JAXBContextProperties; import org.eclipse.persistence.jaxb.UnmarshallerProperties; -import java.io.*; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; - import javax.ws.rs.Consumes; import javax.ws.rs.Produces; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.*; +import javax.ws.rs.ext.MessageBodyReader; +import javax.ws.rs.ext.MessageBodyWriter; +import javax.ws.rs.ext.Provider; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.transform.stream.StreamSource; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; @Provider @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java b/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java index e5bae02..cbfa23b 100644 --- a/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java +++ b/gateway-service-hbase/src/test/java/org/apache/knox/gateway/hbase/HBaseDispatchTest.java @@ -17,9 +17,6 @@ */ package org.apache.knox.gateway.hbase; -import java.net.URI; -import javax.servlet.http.HttpServletRequest; - import org.apache.knox.gateway.dispatch.Dispatch; import org.apache.knox.test.TestUtils; import org.apache.knox.test.category.FastTests; @@ -28,8 +25,11 @@ import org.easymock.EasyMock; import org.junit.Test; import org.junit.experimental.categories.Category; +import javax.servlet.http.HttpServletRequest; +import java.net.URI; + import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; @Category( { UnitTests.class, FastTests.class } ) public class HBaseDispatchTest { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java b/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java index cd3f211..ee7b499 100644 --- a/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java +++ b/gateway-service-knoxtoken/src/test/java/org/apache/knox/gateway/service/knoxtoken/TokenServiceResourceTest.java @@ -17,33 +17,26 @@ */ package org.apache.knox.gateway.service.knoxtoken; +import com.nimbusds.jose.JWSSigner; +import com.nimbusds.jose.JWSVerifier; +import com.nimbusds.jose.crypto.RSASSASigner; +import com.nimbusds.jose.crypto.RSASSAVerifier; +import org.apache.knox.gateway.security.PrimaryPrincipal; import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.security.token.JWTokenAuthority; import org.apache.knox.gateway.services.security.token.TokenServiceException; import org.apache.knox.gateway.services.security.token.impl.JWT; import org.apache.knox.gateway.services.security.token.impl.JWTToken; -import org.apache.knox.gateway.security.PrimaryPrincipal; - import org.easymock.EasyMock; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import com.nimbusds.jose.JWSSigner; -import com.nimbusds.jose.JWSVerifier; -import com.nimbusds.jose.crypto.RSASSASigner; -import com.nimbusds.jose.crypto.RSASSAVerifier; - -import java.util.Map; - import javax.security.auth.Subject; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.ws.rs.core.Response; - -import static org.junit.Assert.*; - import java.io.PrintWriter; import java.io.StringWriter; import java.security.KeyPair; @@ -59,6 +52,11 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; /** * Some tests for the token service http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/discovery/GatewayService.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/discovery/GatewayService.java b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/discovery/GatewayService.java index f19a76b..9d97e2b 100644 --- a/gateway-spi/src/main/java/org/apache/knox/gateway/topology/discovery/GatewayService.java +++ b/gateway-spi/src/main/java/org/apache/knox/gateway/topology/discovery/GatewayService.java @@ -16,7 +16,11 @@ */ package org.apache.knox.gateway.topology.discovery; -import java.lang.annotation.*; +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * This annotation can be used to inject gateway services into a ServiceDiscovery implementation. http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-spi/src/test/java/org/apache/knox/gateway/topology/VersionTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/topology/VersionTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/topology/VersionTest.java index 2f18875..d1e44b3 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/topology/VersionTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/topology/VersionTest.java @@ -19,7 +19,8 @@ package org.apache.knox.gateway.topology; import org.junit.Test; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class VersionTest { http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java ---------------------------------------------------------------------- diff --git a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java index fc0a105..a7dddaf 100644 --- a/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java +++ b/gateway-test-utils/src/main/java/org/apache/knox/test/mock/MockRequestMatcher.java @@ -39,7 +39,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.xmlmatchers.XmlMatchers.isEquivalentTo; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java index b1b86fd..2d584e3 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayCorrelationIdTest.java @@ -38,8 +38,16 @@ import org.slf4j.LoggerFactory; import java.io.File; import java.io.FileOutputStream; import java.net.URL; -import java.util.*; -import java.util.concurrent.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import static io.restassured.RestAssured.given; import static org.apache.knox.test.TestUtils.LOG_ENTER; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java ---------------------------------------------------------------------- diff --git a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java index fc81d6d..8cf3b57 100644 --- a/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java +++ b/gateway-util-launcher/src/main/java/org/apache/knox/gateway/launcher/Launcher.java @@ -17,7 +17,12 @@ */ package org.apache.knox.gateway.launcher; -import java.io.*; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.UnsupportedEncodingException; import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.net.URLDecoder; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java index 60f6bbd..b66dfc4 100644 --- a/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java +++ b/gateway-util-urltemplate/src/test/java/org/apache/knox/gateway/util/urltemplate/ExpanderTest.java @@ -27,7 +27,9 @@ import java.net.URISyntaxException; import java.util.Arrays; import java.util.List; -import static org.hamcrest.CoreMatchers.*; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalToIgnoringCase; import static org.junit.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/knox/blob/8dc4495a/src/checkstyle/checker.xml ---------------------------------------------------------------------- diff --git a/src/checkstyle/checker.xml b/src/checkstyle/checker.xml index d23872b..7233473 100644 --- a/src/checkstyle/checker.xml +++ b/src/checkstyle/checker.xml @@ -72,7 +72,7 @@ limitations under the License. <module name="StringLiteralEquality"/> <!-- Don't declare multiple variables in the same statement --> <!--<module name="MultipleVariableDeclarations"/>--> - + <!-- Checks for imports --> <!-- See http://checkstyle.sf.net/config_import.html --> <module name="RedundantImport"/> @@ -82,5 +82,6 @@ limitations under the License. <property name="processJavadoc" value="true"/> </module> <module name="IllegalImport"/> + <module name="AvoidStarImport"/> </module> </module>
