Repository: knox Updated Branches: refs/heads/master baa43294f -> 93a096a47
KNOX-1453 - Enable checkstyle no unused 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/93a096a4 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/93a096a4 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/93a096a4 Branch: refs/heads/master Commit: 93a096a4726d048e7485d85170707457ee54b026 Parents: baa4329 Author: Kevin Risden <[email protected]> Authored: Tue Sep 25 15:09:28 2018 -0400 Committer: Kevin Risden <[email protected]> Committed: Tue Sep 25 18:12:34 2018 -0400 ---------------------------------------------------------------------- .../gateway/rm/dispatch/RMHaDispatch.java | 2 - .../gateway/shirorealm/KnoxLdapRealm.java | 1 - .../impl/HBaseZookeeperURLManagerTest.java | 3 - .../filter/RegexIdentityAssertionFilter.java | 1 - .../hostmap/impl/HostmapFunctionProcessor.java | 1 - .../ServiceMappedHostFunctionProcessor.java | 1 - .../UrlRewriteServletContextListenerTest.java | 2 - .../rewrite/impl/json/JsonFilterReaderTest.java | 1 - .../rewrite/impl/xml/XmlFilterReaderTest.java | 2 - .../federation/DefaultValidatorTest.java | 1 - .../provider/federation/IPValidatorTest.java | 1 - .../provider/federation/PreAuthServiceTest.java | 1 - .../builder/BeanPropertyTopologyBuilder.java | 1 - .../knox/gateway/util/CredentialsProvider.java | 1 - .../service/admin/TopologiesResource.java | 1 - .../knoxtoken/TokenServiceResourceTest.java | 1 - .../config/remote/zk/CuratorClientService.java | 2 - ...teConfigurationRegistryConfigParserTest.java | 2 - ...moteConfigurationRegistryJAASConfigTest.java | 1 - .../gateway/rm/dispatch/RMUI2HaDispatch.java | 6 -- .../knox/gateway/config/GatewayConfig.java | 1 - .../dispatch/GatewayDispatchFilterTest.java | 1 - .../apache/knox/gateway/GatewayUIFuncTest.java | 65 -------------------- .../org/apache/knox/gateway/util/HttpUtils.java | 1 - .../apache/knox/gateway/util/MimeTypeMap.java | 2 - .../java/org/apache/knox/gateway/util/Urls.java | 2 - .../apache/knox/gateway/util/JsonUtilsTest.java | 1 - src/checkstyle/checker.xml | 10 +++ 28 files changed, 10 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java index d36c263..51a02ac 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java @@ -2,8 +2,6 @@ package org.apache.hadoop.gateway.rm.dispatch; import org.apache.knox.gateway.ha.provider.HaProvider; -import javax.servlet.ServletException; - /** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java ---------------------------------------------------------------------- diff --git a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java index 46a07c0..85ab1d2 100644 --- a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java +++ b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java @@ -9,7 +9,6 @@ import org.apache.shiro.subject.PrincipalCollection; import javax.naming.NamingException; import javax.naming.ldap.LdapContext; -import java.util.Map; /** * Licensed to the Apache Software Foundation (ASF) under one or more http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java index a4166f4..57192b3 100644 --- a/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java +++ b/gateway-provider-ha/src/test/java/org/apache/knox/gateway/ha/provider/impl/HBaseZookeeperURLManagerTest.java @@ -18,9 +18,6 @@ package org.apache.knox.gateway.ha.provider.impl; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java b/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java index 3c9cf11..6e202ba 100644 --- a/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java +++ b/gateway-provider-identity-assertion-regex/src/main/java/org/apache/knox/gateway/identityasserter/regex/filter/RegexIdentityAssertionFilter.java @@ -27,7 +27,6 @@ import org.apache.knox.gateway.security.principal.PrincipalMappingException; import java.util.Map; import java.util.StringTokenizer; import java.util.TreeMap; -import java.lang.Boolean; public class RegexIdentityAssertionFilter extends CommonIdentityAssertionFilter { http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java index 7fe9eef..b6e6919 100644 --- a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java +++ b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java @@ -25,7 +25,6 @@ import org.apache.knox.gateway.services.GatewayServices; import org.apache.knox.gateway.services.hostmap.FileBasedHostMapper; import org.apache.knox.gateway.services.hostmap.HostMapper; import org.apache.knox.gateway.services.hostmap.HostMapperService; -import org.apache.knox.gateway.filter.rewrite.api.UrlRewriter; import java.net.URL; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java index e12dc62..961c31d 100644 --- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java +++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java @@ -27,7 +27,6 @@ import org.apache.knox.gateway.svcregfunc.api.ServiceMappedHostFunctionDescripto import org.apache.knox.gateway.util.urltemplate.Host; import org.apache.knox.gateway.util.urltemplate.Parser; import org.apache.knox.gateway.util.urltemplate.Template; -import org.apache.knox.gateway.filter.rewrite.api.UrlRewriter; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java index db65e35..51c284b 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/api/UrlRewriteServletContextListenerTest.java @@ -31,8 +31,6 @@ import javax.servlet.DispatcherType; import java.net.URL; import java.util.EnumSet; -import static org.junit.Assert.fail; - public class UrlRewriteServletContextListenerTest { private ServletTester server; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java index ad55aeb..439966e 100644 --- a/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java +++ b/gateway-provider-rewrite/src/test/java/org/apache/knox/gateway/filter/rewrite/impl/json/JsonFilterReaderTest.java @@ -36,7 +36,6 @@ import java.nio.charset.Charset; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.contains; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/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 5aa5cce..623a23f 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 @@ -63,8 +63,6 @@ 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.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/93a096a4/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/DefaultValidatorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/DefaultValidatorTest.java b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/DefaultValidatorTest.java index 0480e40..32fa869 100644 --- a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/DefaultValidatorTest.java +++ b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/DefaultValidatorTest.java @@ -17,7 +17,6 @@ */ package org.apache.knox.gateway.provider.federation; -import junit.framework.TestCase; import org.apache.knox.gateway.preauth.filter.DefaultValidator; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java index 2617bcf..a42b8dc 100644 --- a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java +++ b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/IPValidatorTest.java @@ -17,7 +17,6 @@ */ package org.apache.knox.gateway.provider.federation; -import junit.framework.TestCase; import org.apache.knox.gateway.preauth.filter.IPValidator; import org.apache.knox.gateway.preauth.filter.PreAuthValidationException; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java index f42a8a3..5ec85ce 100644 --- a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java +++ b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java @@ -17,7 +17,6 @@ */ package org.apache.knox.gateway.provider.federation; -import junit.framework.TestCase; import org.apache.knox.gateway.preauth.filter.DefaultValidator; import org.apache.knox.gateway.preauth.filter.IPValidator; import org.apache.knox.gateway.preauth.filter.PreAuthService; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java index 11016b0..afeade0 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/topology/builder/BeanPropertyTopologyBuilder.java @@ -19,7 +19,6 @@ package org.apache.knox.gateway.topology.builder; import java.util.ArrayList; import java.util.List; -import org.apache.knox.gateway.service.definition.CustomDispatch; import org.apache.knox.gateway.topology.Application; import org.apache.knox.gateway.topology.Provider; import org.apache.knox.gateway.topology.Service; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/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 2b644f1..32beb55 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 @@ -18,7 +18,6 @@ package org.apache.knox.gateway.util; import org.apache.http.auth.Credentials; -import org.apache.http.auth.UsernamePasswordCredentials; import javax.security.auth.callback.*; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java ---------------------------------------------------------------------- diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java index 81e0c75..9360004 100644 --- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java +++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/TopologiesResource.java @@ -53,7 +53,6 @@ import java.net.URISyntaxException; import java.net.URLDecoder; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.List; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/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 61f5d4a..cd3f211 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,7 +17,6 @@ */ package org.apache.knox.gateway.service.knoxtoken; -import org.apache.knox.gateway.service.knoxtoken.TokenResource; 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; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java ---------------------------------------------------------------------- diff --git a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java b/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java index b97a2c6..4058cd9 100644 --- a/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java +++ b/gateway-service-remoteconfig/src/main/java/org/apache/knox/gateway/service/config/remote/zk/CuratorClientService.java @@ -45,8 +45,6 @@ import org.apache.zookeeper.data.Stat; import java.nio.charset.Charset; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistryConfigParserTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistryConfigParserTest.java b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistryConfigParserTest.java index 1ff5dec..b05ee86 100644 --- a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistryConfigParserTest.java +++ b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/config/RemoteConfigurationRegistryConfigParserTest.java @@ -29,8 +29,6 @@ import java.util.Map; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.apache.knox.gateway.service.config.remote.util.RemoteRegistryConfigTestUtils.*; - public class RemoteConfigurationRegistryConfigParserTest { @Test http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java ---------------------------------------------------------------------- diff --git a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java index 7a123f4..02d24a3 100644 --- a/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java +++ b/gateway-service-remoteconfig/src/test/java/org/apache/knox/gateway/service/config/remote/zk/RemoteConfigurationRegistryJAASConfigTest.java @@ -17,7 +17,6 @@ package org.apache.knox.gateway.service.config.remote.zk; import org.apache.knox.gateway.service.config.remote.RemoteConfigurationRegistryConfig; -import org.apache.knox.gateway.service.config.remote.zk.RemoteConfigurationRegistryJAASConfig; import org.apache.knox.gateway.services.security.AliasService; import org.easymock.EasyMock; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java ---------------------------------------------------------------------- diff --git a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java index 61e05b7..ab3a3fe 100644 --- a/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java +++ b/gateway-service-rm/src/main/java/org/apache/knox/gateway/rm/dispatch/RMUI2HaDispatch.java @@ -16,14 +16,8 @@ */ package org.apache.knox.gateway.rm.dispatch; -import java.io.IOException; - import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.http.HttpResponse; -import org.apache.http.client.methods.HttpUriRequest; import org.apache.knox.gateway.config.Configure; import org.apache.knox.gateway.ha.provider.HaProvider; import org.apache.knox.gateway.ha.provider.HaServiceConfig; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java b/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java index 7cce80d..c537b0b 100644 --- a/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java +++ b/gateway-spi/src/main/java/org/apache/knox/gateway/config/GatewayConfig.java @@ -19,7 +19,6 @@ package org.apache.knox.gateway.config; import java.net.InetSocketAddress; import java.net.UnknownHostException; -import java.util.ArrayList; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java index b5c3047..02f6fa1 100644 --- a/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java +++ b/gateway-spi/src/test/java/org/apache/knox/gateway/dispatch/GatewayDispatchFilterTest.java @@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.lang.reflect.Method; -import java.net.InetAddress; import java.net.URLEncoder; import java.util.Arrays; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-test/src/test/java/org/apache/knox/gateway/GatewayUIFuncTest.java ---------------------------------------------------------------------- diff --git a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayUIFuncTest.java b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayUIFuncTest.java index 59dfb23..4832ebd 100644 --- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayUIFuncTest.java +++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayUIFuncTest.java @@ -17,69 +17,17 @@ */ package org.apache.knox.gateway; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileFilter; -import java.io.FileNotFoundException; import java.io.IOException; -import java.io.PrintStream; -import java.io.StringWriter; -import java.net.InetAddress; -import java.net.InetSocketAddress; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; import java.nio.charset.Charset; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import javax.ws.rs.core.MediaType; import com.mycila.xmltool.XMLDoc; import com.mycila.xmltool.XMLTag; -import io.restassured.RestAssured; -import io.restassured.http.ContentType; -import io.restassured.http.Cookie; -import io.restassured.http.Header; -import io.restassured.path.json.JsonPath; -import io.restassured.response.Response; -import io.restassured.specification.ResponseSpecification; -import org.apache.commons.io.filefilter.WildcardFileFilter; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.http.HttpHost; -import org.apache.http.HttpResponse; import org.apache.http.HttpStatus; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.AuthCache; -import org.apache.http.client.CredentialsProvider; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.protocol.HttpClientContext; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.auth.BasicScheme; -import org.apache.http.impl.client.BasicAuthCache; -import org.apache.http.impl.client.BasicCredentialsProvider; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; -import org.apache.knox.gateway.util.KnoxCLI; import org.apache.knox.test.TestUtils; import org.apache.knox.test.category.MediumTests; import org.apache.knox.test.category.VerifyTest; -import org.apache.knox.test.mock.MockRequestMatcher; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.apache.velocity.runtime.RuntimeConstants; -import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; -import org.hamcrest.CoreMatchers; -import org.hamcrest.Matcher; -import org.hamcrest.MatcherAssert; -import org.hamcrest.Matchers; import org.junit.After; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -89,19 +37,6 @@ import org.slf4j.LoggerFactory; import static io.restassured.RestAssured.given; import static org.apache.knox.test.TestUtils.LOG_ENTER; import static org.apache.knox.test.TestUtils.LOG_EXIT; -import static org.hamcrest.CoreMatchers.anyOf; -import static org.hamcrest.CoreMatchers.either; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.text.IsEmptyString.isEmptyString; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.xmlmatchers.XmlMatchers.isEquivalentTo; -import static org.xmlmatchers.transform.XmlConverters.the; -import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs; @Category( { VerifyTest.class, MediumTests.class } ) public class GatewayUIFuncTest { http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java index 8dc264b..725de12 100644 --- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java +++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/HttpUtils.java @@ -18,7 +18,6 @@ package org.apache.knox.gateway.util; import java.io.UnsupportedEncodingException; -import java.net.URL; import java.net.URLDecoder; import java.util.ArrayList; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-util-common/src/main/java/org/apache/knox/gateway/util/MimeTypeMap.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/MimeTypeMap.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/MimeTypeMap.java index 704187c..85d2e43 100644 --- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/MimeTypeMap.java +++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/MimeTypeMap.java @@ -19,10 +19,8 @@ package org.apache.knox.gateway.util; import javax.activation.MimeType; import javax.activation.MimeTypeParseException; -import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.Set; public class MimeTypeMap<V> { http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java index 54cff6b..addd9d4 100644 --- a/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java +++ b/gateway-util-common/src/main/java/org/apache/knox/gateway/util/Urls.java @@ -19,8 +19,6 @@ package org.apache.knox.gateway.util; import java.io.UnsupportedEncodingException; import java.net.MalformedURLException; -import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java ---------------------------------------------------------------------- diff --git a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java index 7c2cdf6..0338dc9 100644 --- a/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java +++ b/gateway-util-common/src/test/java/org/apache/knox/gateway/util/JsonUtilsTest.java @@ -23,7 +23,6 @@ import org.junit.Test; import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; public class JsonUtilsTest extends org.junit.Assert { String expiresIn = "\"expires_in\":\"1364487943100\""; http://git-wip-us.apache.org/repos/asf/knox/blob/93a096a4/src/checkstyle/checker.xml ---------------------------------------------------------------------- diff --git a/src/checkstyle/checker.xml b/src/checkstyle/checker.xml index a25a2eb..d23872b 100644 --- a/src/checkstyle/checker.xml +++ b/src/checkstyle/checker.xml @@ -72,5 +72,15 @@ 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"/> + <!-- Import should be explicit, and only from pure java packages. + But we allow imports that are only used in javadoc. --> + <module name="UnusedImports"> + <property name="processJavadoc" value="true"/> + </module> + <module name="IllegalImport"/> </module> </module>
