Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B25A6200B11 for ; Mon, 13 Jun 2016 15:46:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B108D160A3C; Mon, 13 Jun 2016 13:46:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 73A49160A1A for ; Mon, 13 Jun 2016 15:46:41 +0200 (CEST) Received: (qmail 19664 invoked by uid 500); 13 Jun 2016 13:46:40 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 19655 invoked by uid 99); 13 Jun 2016 13:46:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Jun 2016 13:46:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 724A4DFC7E; Mon, 13 Jun 2016 13:46:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jpountz@apache.org To: commits@lucene.apache.org Message-Id: <8ae0e9c292494202841ac5ab8e8c9885@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: lucene-solr:branch_6x: LUCENE-7319: Remove more unused imports so that precommit passes. Date: Mon, 13 Jun 2016 13:46:40 +0000 (UTC) archived-at: Mon, 13 Jun 2016 13:46:42 -0000 Repository: lucene-solr Updated Branches: refs/heads/branch_6x 061f68802 -> 6d1bb1407 LUCENE-7319: Remove more unused imports so that precommit passes. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6d1bb140 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6d1bb140 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6d1bb140 Branch: refs/heads/branch_6x Commit: 6d1bb14077b7f5ab4c79b0dbaff2e71ea8dd64e2 Parents: 061f688 Author: Adrien Grand Authored: Mon Jun 13 15:45:54 2016 +0200 Committer: Adrien Grand Committed: Mon Jun 13 15:45:54 2016 +0200 ---------------------------------------------------------------------- .../client/solrj/embedded/JettySolrRunner.java | 1 - .../handler/component/IterativeMergeStrategy.java | 3 --- .../solr/handler/component/QueryComponent.java | 1 - .../org/apache/solr/index/SortingMergePolicy.java | 2 -- .../apache/solr/security/AuthenticationPlugin.java | 3 --- .../org/apache/solr/security/KerberosPlugin.java | 1 - .../org/apache/solr/update/UpdateShardHandler.java | 1 - .../src/java/org/apache/solr/util/SolrCLI.java | 1 - .../apache/solr/cloud/TestCloudDeleteByQuery.java | 6 ------ .../solr/cloud/TestMiniSolrCloudClusterSSL.java | 2 -- .../cloud/TestTolerantUpdateProcessorCloud.java | 2 -- .../TestTolerantUpdateProcessorRandomCloud.java | 17 ----------------- .../solr/cloud/overseer/ZkStateReaderTest.java | 1 - .../solr/search/AnalyticsMergeStrategyTest.java | 1 - .../security/PKIAuthenticationIntegrationTest.java | 2 -- .../client/solrj/impl/HttpClientConfigurer.java | 5 ----- .../solr/client/solrj/impl/LBHttpSolrClient.java | 1 - .../solr/client/solrj/SolrExceptionTest.java | 1 - .../solr/client/solrj/impl/HttpClientUtilTest.java | 5 ----- .../java/org/apache/solr/SolrJettyTestBase.java | 1 - .../java/org/apache/solr/util/SSLTestConfig.java | 2 -- 21 files changed, 59 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java index 88ea567..90fbb67 100644 --- a/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java @@ -35,7 +35,6 @@ import java.util.LinkedList; import java.util.Map; import java.util.Properties; import java.util.Random; -import java.util.SortedMap; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java b/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java index 34f6ed3..2138948 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java +++ b/solr/core/src/java/org/apache/solr/handler/component/IterativeMergeStrategy.java @@ -20,13 +20,10 @@ import java.lang.invoke.MethodHandles; import java.util.concurrent.Callable; import java.util.concurrent.Future; import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.List; import java.util.ArrayList; -import org.apache.lucene.util.NamedThreadFactory; import org.apache.solr.client.solrj.SolrRequest; -import org.apache.solr.client.solrj.impl.HttpClientConfigurer; import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.impl.HttpSolrClient.Builder; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java index 58da1e9..cad71d8 100644 --- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java +++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java @@ -41,7 +41,6 @@ import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.LeafFieldComparator; import org.apache.lucene.search.MatchNoDocsQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.Scorer; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/java/org/apache/solr/index/SortingMergePolicy.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/index/SortingMergePolicy.java b/solr/core/src/java/org/apache/solr/index/SortingMergePolicy.java index e9265a7..2837329 100644 --- a/solr/core/src/java/org/apache/solr/index/SortingMergePolicy.java +++ b/solr/core/src/java/org/apache/solr/index/SortingMergePolicy.java @@ -16,8 +16,6 @@ */ package org.apache.solr.index; -import java.io.IOException; - import org.apache.lucene.index.MergePolicy; import org.apache.lucene.index.MergePolicyWrapper; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java index b310893..105f307 100644 --- a/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/AuthenticationPlugin.java @@ -22,15 +22,12 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; -import javax.servlet.http.HttpServletResponse; import java.io.Closeable; import java.io.IOException; -import java.nio.file.attribute.UserPrincipal; import java.security.Principal; import java.util.Map; import org.apache.http.auth.BasicUserPrincipal; -import org.apache.solr.client.solrj.impl.HttpClientConfigurer; /** * http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java b/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java index ad7f29b..0cea477 100644 --- a/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java +++ b/solr/core/src/java/org/apache/solr/security/KerberosPlugin.java @@ -45,7 +45,6 @@ import javax.servlet.descriptor.JspConfigDescriptor; import org.apache.commons.collections.iterators.IteratorEnumeration; import org.apache.solr.client.solrj.impl.HttpClientConfigurer; import org.apache.solr.client.solrj.impl.Krb5HttpClientConfigurer; -import org.apache.solr.cloud.ZkController; import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.core.CoreContainer; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java index 3859e2e..97104d9 100644 --- a/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java +++ b/solr/core/src/java/org/apache/solr/update/UpdateShardHandler.java @@ -30,7 +30,6 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.ExecutorUtil; import org.apache.solr.common.util.IOUtils; import org.apache.solr.common.util.SolrjNamedThreadFactory; -import org.apache.solr.core.NodeConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/java/org/apache/solr/util/SolrCLI.java ---------------------------------------------------------------------- diff --git a/solr/core/src/java/org/apache/solr/util/SolrCLI.java b/solr/core/src/java/org/apache/solr/util/SolrCLI.java index e1949e0..23186a7 100644 --- a/solr/core/src/java/org/apache/solr/util/SolrCLI.java +++ b/solr/core/src/java/org/apache/solr/util/SolrCLI.java @@ -35,7 +35,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Enumeration; import java.util.HashMap; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java index 987f2f1..0a9dcd0 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudDeleteByQuery.java @@ -16,18 +16,13 @@ */ package org.apache.solr.cloud; -import java.io.File; import java.lang.invoke.MethodHandles; import java.net.URL; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; -import java.util.HashSet; -import java.util.List; import java.util.Map; -import java.util.Set; import org.apache.solr.cloud.SolrCloudTestCase; import org.apache.solr.client.solrj.SolrClient; @@ -47,7 +42,6 @@ import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; -import org.apache.solr.common.util.SimpleOrderedMap; import org.junit.Before; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java index 164ce6b..a011162 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestMiniSolrCloudClusterSSL.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.io.File; import java.io.IOException; -import java.net.SocketException; import javax.net.ssl.SSLContext; @@ -34,7 +33,6 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.client.solrj.impl.HttpClientConfigurer; import org.apache.solr.client.solrj.request.CoreAdminRequest; -import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.params.CoreAdminParams.CoreAdminAction; import org.apache.solr.util.SSLTestConfig; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java index c3b1b06..f2064eb 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorCloud.java @@ -49,9 +49,7 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; -import org.apache.solr.util.RevertDefaultThreadHandlerRule; -import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java index 8f87507..85474f9 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestTolerantUpdateProcessorRandomCloud.java @@ -20,14 +20,11 @@ import java.io.File; import java.lang.invoke.MethodHandles; import java.net.URL; import java.util.ArrayList; -import java.util.Arrays; import java.util.BitSet; import java.util.HashMap; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Random; -import java.util.Set; import org.apache.lucene.util.TestUtil; import org.apache.solr.SolrTestCaseJ4.SuppressSSL; @@ -41,32 +38,18 @@ import static org.apache.solr.cloud.TestTolerantUpdateProcessorCloud.update; import static org.apache.solr.cloud.TestTolerantUpdateProcessorCloud.ExpectedErr; import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.embedded.JettySolrRunner; -import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.request.UpdateRequest; import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.client.solrj.response.UpdateResponse; import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_PARAM; -import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_NEXT; import static org.apache.solr.common.params.CursorMarkParams.CURSOR_MARK_START; import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputField; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.ToleratedUpdateError; -import org.apache.solr.common.ToleratedUpdateError.CmdType; -import org.apache.solr.common.cloud.ClusterState; -import org.apache.solr.common.cloud.Replica; -import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.ZkStateReader; -import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; -import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.util.SimpleOrderedMap; -import org.apache.solr.util.RevertDefaultThreadHandlerRule; -import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java index ddfda9d..ad51614 100644 --- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java +++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateReaderTest.java @@ -33,7 +33,6 @@ import org.apache.solr.common.cloud.Slice; import org.apache.solr.common.cloud.SolrZkClient; import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.util.Utils; -import org.apache.zookeeper.KeeperException; public class ZkStateReaderTest extends SolrTestCaseJ4 { http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java b/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java index ed33182..a9dd0e5 100644 --- a/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java +++ b/solr/core/src/test/org/apache/solr/search/AnalyticsMergeStrategyTest.java @@ -16,7 +16,6 @@ */ package org.apache.solr.search; -import org.apache.lucene.util.Constants; import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.client.solrj.response.QueryResponse; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java index 26aee07..30fe933 100644 --- a/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java +++ b/solr/core/src/test/org/apache/solr/security/PKIAuthenticationIntegrationTest.java @@ -31,8 +31,6 @@ import org.apache.solr.cloud.AbstractFullDistribZkTestBase; import org.apache.solr.common.cloud.ZkStateReader; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.Utils; -import org.apache.solr.request.LocalSolrQueryRequest; -import org.apache.zookeeper.CreateMode; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java ---------------------------------------------------------------------- diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java index 0f97bd0..de81642 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java @@ -16,13 +16,8 @@ */ package org.apache.solr.client.solrj.impl; -import org.apache.http.HttpRequest; -import org.apache.http.HttpRequestInterceptor; import org.apache.http.conn.ssl.SSLSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.protocol.HttpContext; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.params.SolrParams; /** http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java ---------------------------------------------------------------------- diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java index 0b83969..55b0a8a 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrClient.java @@ -26,7 +26,6 @@ import java.net.URL; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java ---------------------------------------------------------------------- diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java index 6af6f73..dd46d78 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java @@ -21,7 +21,6 @@ import static org.apache.solr.SolrTestCaseJ4.getHttpSolrClient; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.impl.HttpClientUtil; -import org.apache.solr.client.solrj.impl.HttpSolrClient; /** * http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java ---------------------------------------------------------------------- diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java index ba8b8f4..9fa2b0b 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java @@ -16,10 +16,6 @@ */ package org.apache.solr.client.solrj.impl; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; @@ -40,7 +36,6 @@ import org.apache.http.impl.conn.PoolingClientConnectionManager; import org.apache.http.params.HttpConnectionParams; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SolrParams; -import org.apache.solr.util.SSLTestConfig; import org.junit.Test; import org.junit.Assume; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java ---------------------------------------------------------------------- diff --git a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java index b5d1b98..f70c24d 100644 --- a/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrJettyTestBase.java @@ -22,7 +22,6 @@ import org.apache.solr.client.solrj.SolrClient; import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; import org.apache.solr.client.solrj.embedded.JettyConfig; import org.apache.solr.client.solrj.embedded.JettySolrRunner; -import org.apache.solr.client.solrj.impl.HttpClientUtil; import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.util.ExternalPaths; import org.eclipse.jetty.servlet.ServletHolder; http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6d1bb140/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java ---------------------------------------------------------------------- diff --git a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java index 7f6ab2e..09039bc 100644 --- a/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java +++ b/solr/test-framework/src/java/org/apache/solr/util/SSLTestConfig.java @@ -31,8 +31,6 @@ import java.net.MalformedURLException; import org.apache.http.conn.scheme.Scheme; import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.conn.socket.ConnectionSocketFactory; -import org.apache.http.conn.socket.PlainConnectionSocketFactory; import org.apache.http.conn.ssl.SSLConnectionSocketFactory; import org.apache.http.conn.ssl.SSLContexts; import org.apache.http.conn.ssl.SSLContextBuilder;