Index: solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java =================================================================== --- solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java (revision 1052896) +++ solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java (working copy) @@ -19,9 +19,7 @@ import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; -import static org.junit.Assert.*; - /** * */ Index: solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java =================================================================== --- solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java (revision 1052896) +++ solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/ClusteringComponentTest.java (working copy) @@ -29,8 +29,6 @@ import org.apache.solr.request.SolrRequestHandler; import org.junit.Test; -import static org.junit.Assert.*; - /** * * Index: solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java =================================================================== --- solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java (revision 1052896) +++ solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java (working copy) @@ -42,8 +42,6 @@ import java.util.List; import java.util.Map; -import static org.junit.Assert.*; - /** * */ Index: solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/ClusteringComponent.java =================================================================== --- solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/ClusteringComponent.java (revision 1052896) +++ solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/ClusteringComponent.java (working copy) @@ -24,14 +24,10 @@ import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.handler.clustering.carrot2.CarrotClusteringEngine; -import org.apache.solr.handler.clustering.carrot2.CarrotParams; import org.apache.solr.handler.component.ResponseBuilder; import org.apache.solr.handler.component.SearchComponent; import org.apache.solr.handler.component.ShardRequest; -import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.search.DocListAndSet; -import org.apache.solr.search.SolrIndexSearcher; -import org.apache.solr.util.SolrPluginUtils; import org.apache.solr.util.plugin.SolrCoreAware; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java =================================================================== --- solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java (revision 1052896) +++ solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/DocumentClusteringEngine.java (working copy) @@ -18,10 +18,7 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.common.params.SolrParams; -import org.apache.solr.core.SolrCore; -import org.apache.solr.search.DocList; import org.apache.solr.search.DocSet; -import org.apache.lucene.search.Query; /** Index: solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java =================================================================== --- solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java (revision 1052896) +++ solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/CarrotParams.java (working copy) @@ -3,7 +3,6 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; -import org.apache.solr.common.params.HighlightParams; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java =================================================================== --- solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java (revision 1052896) +++ solr/contrib/extraction/src/test/java/org/apache/solr/handler/ExtractingRequestHandlerTest.java (working copy) @@ -31,11 +31,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.List; import java.util.ArrayList; -import java.util.Locale; import java.io.File; Index: solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java =================================================================== --- solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java (revision 1052896) +++ solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/ExtractingRequestHandler.java (working copy) @@ -28,7 +28,6 @@ import org.apache.solr.handler.ContentStreamHandlerBase; import org.apache.solr.handler.ContentStreamLoader; import org.apache.tika.config.TikaConfig; -import org.apache.tika.exception.TikaException; import org.apache.tika.mime.MimeTypeException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java =================================================================== --- solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java (revision 1052896) +++ solr/contrib/extraction/src/main/java/org/apache/solr/handler/extraction/SolrContentHandler.java (working copy) @@ -17,7 +17,6 @@ package org.apache.solr.handler.extraction; -import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.DateUtil; Index: solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java =================================================================== --- solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java (revision 1052896) +++ solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/SolrWriter.java (working copy) @@ -26,8 +26,6 @@ import org.slf4j.LoggerFactory; import java.io.*; -import java.text.ParseException; -import java.util.Date; import java.util.Properties; /** Index: solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java =================================================================== --- solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java (revision 1052896) +++ solr/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/HttpDataSource.java (working copy) @@ -16,17 +16,6 @@ */ package org.apache.solr.handler.dataimport; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.URL; -import java.net.URLConnection; -import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - /** *

* A data source implementation which can be used to read character files using Index: solr/src/test/org/apache/solr/TestTrie.java =================================================================== --- solr/src/test/org/apache/solr/TestTrie.java (revision 1052896) +++ solr/src/test/org/apache/solr/TestTrie.java (working copy) @@ -22,12 +22,9 @@ import org.apache.solr.schema.TrieField; import org.apache.solr.util.DateMathParser; import org.junit.After; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.text.SimpleDateFormat; import java.util.Locale; import java.util.TimeZone; Index: solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java =================================================================== --- solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (working copy) @@ -43,8 +43,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - public class SolrRequestParserTest extends SolrTestCaseJ4 { @BeforeClass Index: solr/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java =================================================================== --- solr/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java (revision 1052896) +++ solr/src/test/org/apache/solr/servlet/CacheHeaderTestBase.java (working copy) @@ -22,16 +22,10 @@ import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.httpclient.methods.HeadMethod; import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.solr.client.solrj.SolrExampleTestBase; import org.apache.solr.client.solrj.SolrJettyTestBase; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.embedded.JettySolrRunner; import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer; import org.junit.Test; -import static junit.framework.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - public abstract class CacheHeaderTestBase extends SolrJettyTestBase { protected HttpMethodBase getSelectMethod(String method) { Index: solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java =================================================================== --- solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java (working copy) @@ -24,9 +24,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import static junit.framework.Assert.*; - /** * A test case for the several HTTP cache headers emitted by Solr */ Index: solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java =================================================================== --- solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/servlet/CacheHeaderTest.java (working copy) @@ -29,8 +29,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static junit.framework.Assert.*; - /** * A test case for the several HTTP cache headers emitted by Solr */ Index: solr/src/test/org/apache/solr/JSONTestUtil.java =================================================================== --- solr/src/test/org/apache/solr/JSONTestUtil.java (revision 1052896) +++ solr/src/test/org/apache/solr/JSONTestUtil.java (working copy) @@ -17,14 +17,10 @@ package org.apache.solr; -import org.apache.noggit.JSONParser; import org.apache.noggit.ObjectBuilder; import org.apache.solr.common.util.StrUtils; -import java.io.StringReader; import java.util.*; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class JSONTestUtil { Index: solr/src/test/org/apache/solr/MinimalSchemaTest.java =================================================================== --- solr/src/test/org/apache/solr/MinimalSchemaTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/MinimalSchemaTest.java (working copy) @@ -20,8 +20,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.Set; /** Index: solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java =================================================================== --- solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java (working copy) @@ -22,8 +22,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.Map; /** Index: solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java =================================================================== --- solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/AlternateDirectoryTest.java (working copy) @@ -21,7 +21,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; import org.junit.Test; Index: solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java =================================================================== --- solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/TestSolrDeletionPolicy2.java (working copy) @@ -17,7 +17,6 @@ package org.apache.solr.core; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.util.AbstractSolrTestCase; import org.junit.BeforeClass; import org.junit.Test; Index: solr/src/test/org/apache/solr/core/TestConfig.java =================================================================== --- solr/src/test/org/apache/solr/core/TestConfig.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/TestConfig.java (working copy) @@ -21,18 +21,13 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.handler.admin.ShowFileRequestHandler; import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.search.SolrIndexReader; -import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.update.DirectUpdateHandler2; import org.apache.solr.update.SolrIndexConfig; -import org.apache.solr.util.RefCounted; import org.junit.BeforeClass; import org.junit.Test; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import static org.junit.Assert.*; - import javax.xml.xpath.XPathConstants; import java.io.IOException; import java.io.InputStream; Index: solr/src/test/org/apache/solr/core/TestQuerySenderListener.java =================================================================== --- solr/src/test/org/apache/solr/core/TestQuerySenderListener.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/TestQuerySenderListener.java (working copy) @@ -24,7 +24,6 @@ import org.apache.lucene.store.Directory; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; public class TestQuerySenderListener extends SolrTestCaseJ4 { Index: solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java =================================================================== --- solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/TestJmxMonitoredMap.java (working copy) @@ -20,8 +20,6 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrConfig.JmxConfiguration; import org.junit.After; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; Index: solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java =================================================================== --- solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/IndexReaderFactoryTest.java (working copy) @@ -16,12 +16,8 @@ * limitations under the License. */ -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.store.Directory; import org.apache.solr.util.AbstractSolrTestCase; -import java.io.IOException; - public class IndexReaderFactoryTest extends AbstractSolrTestCase { public String getSchemaFile() { Index: solr/src/test/org/apache/solr/core/SOLR749Test.java =================================================================== --- solr/src/test/org/apache/solr/core/SOLR749Test.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/SOLR749Test.java (working copy) @@ -17,7 +17,6 @@ */ import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.util.AbstractSolrTestCase; import org.apache.solr.search.QParserPlugin; import org.apache.solr.search.FooQParserPlugin; import org.apache.solr.search.ValueSourceParser; Index: solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java =================================================================== --- solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/TestArbitraryIndexDir.java (working copy) @@ -30,7 +30,6 @@ import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; import org.apache.lucene.util.Version; import org.apache.solr.common.SolrException; import org.apache.solr.util.AbstractSolrTestCase; Index: solr/src/test/org/apache/solr/core/SolrCoreTest.java =================================================================== --- solr/src/test/org/apache/solr/core/SolrCoreTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/SolrCoreTest.java (working copy) @@ -25,7 +25,6 @@ import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.util.plugin.SolrCoreAware; -import org.junit.BeforeClass; import org.junit.Test; import java.util.concurrent.*; Index: solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java =================================================================== --- solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/core/RAMDirectoryFactoryTest.java (working copy) @@ -18,12 +18,8 @@ package org.apache.solr.core; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.RAMDirectory; import org.apache.lucene.util.LuceneTestCase; -import org.easymock.EasyMock; - import java.io.IOException; -import java.io.File; /** * Test-case for RAMDirectoryFactory Index: solr/src/test/org/apache/solr/SolrTestCaseJ4.java =================================================================== --- solr/src/test/org/apache/solr/SolrTestCaseJ4.java (revision 1052896) +++ solr/src/test/org/apache/solr/SolrTestCaseJ4.java (working copy) @@ -51,9 +51,6 @@ import java.io.StringWriter; import java.util.*; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - /** * A junit4 Solr test harness that extends LuceneTestCaseJ4. * Unlike AbstractSolrTestCase, a new core is not created for each test method. Index: solr/src/test/org/apache/solr/response/TestCSVResponseWriter.java =================================================================== --- solr/src/test/org/apache/solr/response/TestCSVResponseWriter.java (revision 1052896) +++ solr/src/test/org/apache/solr/response/TestCSVResponseWriter.java (working copy) @@ -27,10 +27,6 @@ import java.io.StringWriter; -import static org.junit.Assert.*; - -import static org.junit.Assert.assertEquals; - public class TestCSVResponseWriter extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { Index: solr/src/test/org/apache/solr/search/SpatialFilterTest.java =================================================================== --- solr/src/test/org/apache/solr/search/SpatialFilterTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/search/SpatialFilterTest.java (working copy) @@ -20,7 +20,6 @@ import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.assertTrue; /** Index: solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java =================================================================== --- solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java (working copy) @@ -23,8 +23,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * * Index: solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java =================================================================== --- solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java (revision 1052896) +++ solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java (working copy) @@ -23,8 +23,6 @@ import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; import org.junit.Test; -import org.junit.internal.runners.statements.Fail; - import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.io.Writer; @@ -33,8 +31,6 @@ import java.util.List; import java.util.Random; -import static org.junit.Assert.assertTrue; - /** * Tests some basic functionality of Solr while demonstrating good * Best Practices for using AbstractSolrTestCase Index: solr/src/test/org/apache/solr/search/TestRangeQuery.java =================================================================== --- solr/src/test/org/apache/solr/search/TestRangeQuery.java (revision 1052896) +++ solr/src/test/org/apache/solr/search/TestRangeQuery.java (working copy) @@ -24,12 +24,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.*; -import junit.framework.TestCase; - public class TestRangeQuery extends SolrTestCaseJ4 { @BeforeClass Index: solr/src/test/org/apache/solr/search/TestSearchPerf.java =================================================================== --- solr/src/test/org/apache/solr/search/TestSearchPerf.java (revision 1052896) +++ solr/src/test/org/apache/solr/search/TestSearchPerf.java (working copy) @@ -25,7 +25,6 @@ import org.apache.solr.update.processor.UpdateRequestProcessorChain; import org.apache.solr.update.processor.UpdateRequestProcessor; import org.apache.solr.update.AddUpdateCommand; -import org.apache.solr.common.params.UpdateParams; import org.apache.solr.common.SolrInputDocument; import java.util.*; Index: solr/src/test/org/apache/solr/search/TestSolrQueryParser.java =================================================================== --- solr/src/test/org/apache/solr/search/TestSolrQueryParser.java (revision 1052896) +++ solr/src/test/org/apache/solr/search/TestSolrQueryParser.java (working copy) @@ -18,7 +18,6 @@ import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; -import org.junit.After; import org.junit.Test; Index: solr/src/test/org/apache/solr/search/QueryParsingTest.java =================================================================== --- solr/src/test/org/apache/solr/search/QueryParsingTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/search/QueryParsingTest.java (working copy) @@ -25,8 +25,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * * Index: solr/src/test/org/apache/solr/BasicFunctionalityTest.java =================================================================== --- solr/src/test/org/apache/solr/BasicFunctionalityTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/BasicFunctionalityTest.java (working copy) @@ -17,10 +17,6 @@ package org.apache.solr; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.StringWriter; Index: solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java =================================================================== --- solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/DisMaxRequestHandlerTest.java (working copy) @@ -23,8 +23,6 @@ import java.util.regex.Pattern; -import static org.junit.Assert.*; - /** * Tests some basic functionality of the DisMaxRequestHandler */ Index: solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java (working copy) @@ -39,10 +39,8 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - public class QueryElevationComponentTest extends SolrTestCaseJ4 { @BeforeClass Index: solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java (working copy) @@ -1,7 +1,6 @@ package org.apache.solr.handler.component; import org.apache.solr.BaseDistributedSearchTestCase; -import org.junit.Test; /** * Test for TermsComponent distributed querying Index: solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/component/SpellCheckComponentTest.java (working copy) @@ -29,10 +29,7 @@ import org.apache.solr.spelling.AbstractLuceneSpellChecker; import org.junit.BeforeClass; import org.junit.Test; - -import static org.junit.Assert.*; - /** * @since solr 1.3 */ Index: solr/src/test/org/apache/solr/handler/component/StatsComponentTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/component/StatsComponentTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/component/StatsComponentTest.java (working copy) @@ -16,18 +16,8 @@ * limitations under the License. */ -import org.apache.solr.common.params.CommonParams; -import org.apache.solr.common.params.MapSolrParams; -import org.apache.solr.common.params.StatsParams; -import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.core.SolrCore; -import org.apache.solr.request.LocalSolrQueryRequest; -import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.util.AbstractSolrTestCase; -import java.util.HashMap; -import java.util.Map; - /** * Statistics Component Test */ Index: solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/component/DistributedSpellCheckComponentTest.java (working copy) @@ -1,11 +1,8 @@ package org.apache.solr.handler.component; -import java.io.File; - import org.apache.solr.BaseDistributedSearchTestCase; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.common.params.ModifiableSolrParams; -import org.apache.solr.util.AbstractSolrTestCase; /** * Test for SpellCheckComponent's distributed querying Index: solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/component/TermVectorComponentTest.java (working copy) @@ -5,16 +5,11 @@ import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.TermVectorParams; -import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.util.SimpleOrderedMap; -import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.HashMap; import java.util.ArrayList; import java.util.Arrays; Index: solr/src/test/org/apache/solr/handler/component/TermsComponentTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/component/TermsComponentTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/component/TermsComponentTest.java (working copy) @@ -24,9 +24,6 @@ import java.util.regex.Pattern; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; - /** * * Index: solr/src/test/org/apache/solr/handler/TestCSVLoader.java =================================================================== --- solr/src/test/org/apache/solr/handler/TestCSVLoader.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/TestCSVLoader.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr.handler; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.util.AbstractSolrTestCase; import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.common.util.ContentStream; import org.apache.solr.common.util.ContentStreamBase; Index: solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java =================================================================== --- solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/AnalysisRequestHandlerTestBase.java (working copy) @@ -20,8 +20,6 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.util.NamedList; -import static org.junit.Assert.*; - /** * A base class for all analysis request handler tests. * Index: solr/src/test/org/apache/solr/handler/TestReplicationHandler.java =================================================================== --- solr/src/test/org/apache/solr/handler/TestReplicationHandler.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/TestReplicationHandler.java (working copy) @@ -37,12 +37,9 @@ import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.util.AbstractSolrTestCase; import org.junit.AfterClass; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.io.*; import java.net.URL; Index: solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/DocumentAnalysisRequestHandlerTest.java (working copy) @@ -30,8 +30,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.ArrayList; import java.util.List; Index: solr/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/MoreLikeThisHandlerTest.java (working copy) @@ -18,9 +18,6 @@ package org.apache.solr.handler; import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.params.*; import org.apache.solr.common.util.ContentStream; @@ -30,7 +27,6 @@ import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.response.SolrQueryResponse; -import org.apache.solr.util.AbstractSolrTestCase; import org.junit.BeforeClass; import org.junit.Test; Index: solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java =================================================================== --- solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/handler/FieldAnalysisRequestHandlerTest.java (working copy) @@ -30,8 +30,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.List; /** Index: solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java =================================================================== --- solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (working copy) @@ -27,8 +27,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.io.File; import java.util.Date; import java.util.Map; Index: solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java =================================================================== --- solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java (working copy) @@ -16,8 +16,6 @@ * limitations under the License. */ -import static org.junit.Assert.*; - import java.util.LinkedHashMap; import java.util.Map; Index: solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java =================================================================== --- solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (working copy) @@ -16,8 +16,6 @@ */ package org.apache.solr.spelling; -import static org.junit.Assert.*; - import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.document.Document; @@ -31,11 +29,9 @@ import org.apache.lucene.search.spell.SuggestWord; import org.apache.lucene.search.spell.SuggestWordFrequencyComparator; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; -import org.apache.solr.handler.component.SearchComponent; import org.apache.solr.handler.component.SpellCheckComponent; import org.apache.solr.util.RefCounted; import org.apache.solr.search.SolrIndexSearcher; Index: solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java =================================================================== --- solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java (working copy) @@ -16,10 +16,6 @@ * limitations under the License. */ -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - import java.util.HashSet; import java.util.List; import java.util.Set; Index: solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java =================================================================== --- solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (working copy) @@ -37,8 +37,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * */ Index: solr/src/test/org/apache/solr/update/DocumentBuilderTest.java =================================================================== --- solr/src/test/org/apache/solr/update/DocumentBuilderTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/update/DocumentBuilderTest.java (working copy) @@ -26,8 +26,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * * Index: solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java =================================================================== --- solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (working copy) @@ -36,8 +36,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * * Index: solr/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java =================================================================== --- solr/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java (revision 1052896) +++ solr/src/test/org/apache/solr/analysis/TestTrimFilterFactory.java (working copy) @@ -17,21 +17,12 @@ package org.apache.solr.analysis; -import java.io.IOException; import java.io.StringReader; -import java.util.Collection; import java.util.HashMap; import java.util.Map; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.KeywordTokenizer; -import org.apache.lucene.analysis.tokenattributes.FlagsAttribute; -import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; -import org.apache.lucene.analysis.tokenattributes.PayloadAttribute; -import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; -import org.apache.lucene.analysis.tokenattributes.TypeAttribute; /** * Simple tests to ensure this factory is working Index: solr/src/test/org/apache/solr/analysis/TestRussianFilters.java =================================================================== --- solr/src/test/org/apache/solr/analysis/TestRussianFilters.java (revision 1052896) +++ solr/src/test/org/apache/solr/analysis/TestRussianFilters.java (working copy) @@ -20,7 +20,6 @@ import java.io.Reader; import java.io.StringReader; -import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; /** Index: solr/src/test/org/apache/solr/common/util/TestFastInputStream.java =================================================================== --- solr/src/test/org/apache/solr/common/util/TestFastInputStream.java (revision 1052896) +++ solr/src/test/org/apache/solr/common/util/TestFastInputStream.java (working copy) @@ -16,8 +16,6 @@ */ package org.apache.solr.common.util; -import static org.junit.Assert.assertEquals; - import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; Index: solr/src/test/org/apache/solr/request/SimpleFacetsTest.java =================================================================== --- solr/src/test/org/apache/solr/request/SimpleFacetsTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/request/SimpleFacetsTest.java (working copy) @@ -19,7 +19,6 @@ import org.apache.solr.SolrTestCaseJ4; import org.junit.BeforeClass; -import org.junit.After; import org.junit.Test; import java.util.ArrayList; Index: solr/src/test/org/apache/solr/request/TestFaceting.java =================================================================== --- solr/src/test/org/apache/solr/request/TestFaceting.java (revision 1052896) +++ solr/src/test/org/apache/solr/request/TestFaceting.java (working copy) @@ -23,8 +23,6 @@ import org.junit.After; import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.Locale; import java.util.Random; Index: solr/src/test/org/apache/solr/request/JSONWriterTest.java =================================================================== --- solr/src/test/org/apache/solr/request/JSONWriterTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/request/JSONWriterTest.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr.request; import java.io.IOException; -import java.io.Writer; import java.io.StringWriter; import org.apache.solr.SolrTestCaseJ4; @@ -32,8 +31,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** Test some aspects of JSON/python writer output (very incomplete) * */ Index: solr/src/test/org/apache/solr/TestDistributedSearch.java =================================================================== --- solr/src/test/org/apache/solr/TestDistributedSearch.java (revision 1052896) +++ solr/src/test/org/apache/solr/TestDistributedSearch.java (working copy) @@ -17,9 +17,6 @@ package org.apache.solr; -import junit.framework.TestCase; - -import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.common.params.CommonParams; /** Index: solr/src/test/org/apache/solr/ConvertedLegacyTest.java =================================================================== --- solr/src/test/org/apache/solr/ConvertedLegacyTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/ConvertedLegacyTest.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr; import org.apache.solr.request.*; -import org.apache.solr.util.*; import org.junit.BeforeClass; import org.junit.Test; Index: solr/src/test/org/apache/solr/TestGroupingSearch.java =================================================================== --- solr/src/test/org/apache/solr/TestGroupingSearch.java (revision 1052896) +++ solr/src/test/org/apache/solr/TestGroupingSearch.java (working copy) @@ -22,7 +22,6 @@ import org.apache.noggit.ObjectBuilder; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.schema.IndexSchema; -import org.apache.solr.schema.SchemaField; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; Index: solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java =================================================================== --- solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/schema/BadIndexSchemaTest.java (working copy) @@ -22,10 +22,6 @@ import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.core.SolrConfig; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import org.junit.Before; import org.junit.Test; public class BadIndexSchemaTest extends SolrTestCaseJ4 { Index: solr/src/test/org/apache/solr/schema/DateFieldTest.java =================================================================== --- solr/src/test/org/apache/solr/schema/DateFieldTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/schema/DateFieldTest.java (working copy) @@ -20,15 +20,10 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.schema.DateField; import org.apache.solr.util.DateMathParser; -import org.apache.lucene.document.Fieldable; - import java.util.Date; import java.util.TimeZone; import java.util.Locale; -import java.text.DateFormat; -import junit.framework.TestCase; - public class DateFieldTest extends LuceneTestCase { public static TimeZone UTC = TimeZone.getTimeZone("UTC"); protected DateField f = null; Index: solr/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java =================================================================== --- solr/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java (working copy) @@ -20,7 +20,6 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.SolrCore; import org.apache.solr.schema.SchemaField; -import org.apache.solr.util.AbstractSolrTestCase; import org.junit.BeforeClass; import org.junit.Test; Index: solr/src/test/org/apache/solr/schema/PolyFieldTest.java =================================================================== --- solr/src/test/org/apache/solr/schema/PolyFieldTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/schema/PolyFieldTest.java (working copy) @@ -20,10 +20,6 @@ import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.search.Query; -import org.apache.lucene.spatial.tier.CartesianPolyFilterBuilder; -import org.apache.lucene.spatial.tier.Shape; -import org.apache.lucene.spatial.tier.projections.CartesianTierPlotter; -import org.apache.lucene.spatial.tier.projections.SinusoidalProjector; import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.core.SolrCore; import org.apache.solr.common.SolrException; @@ -31,11 +27,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; -import java.util.List; - - /** * Test a whole slew of things related to PolyFields */ Index: solr/src/test/org/apache/solr/schema/RequiredFieldsTest.java =================================================================== --- solr/src/test/org/apache/solr/schema/RequiredFieldsTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/schema/RequiredFieldsTest.java (working copy) @@ -24,8 +24,6 @@ import org.apache.solr.schema.SchemaField; import org.junit.BeforeClass; import org.junit.Test; - -import static org.junit.Assert.*; /** * */ Index: solr/src/test/org/apache/solr/schema/IndexSchemaTest.java =================================================================== --- solr/src/test/org/apache/solr/schema/IndexSchemaTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/schema/IndexSchemaTest.java (working copy) @@ -31,9 +31,7 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - public class IndexSchemaTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { Index: solr/src/test/org/apache/solr/schema/TestBinaryField.java =================================================================== --- solr/src/test/org/apache/solr/schema/TestBinaryField.java (revision 1052896) +++ solr/src/test/org/apache/solr/schema/TestBinaryField.java (working copy) @@ -16,8 +16,6 @@ */ package org.apache.solr.schema; -import junit.framework.TestCase; - import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.beans.Field; @@ -27,7 +25,6 @@ import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.util.AbstractSolrTestCase; import org.apache.commons.io.FileUtils; import java.nio.ByteBuffer; Index: solr/src/test/org/apache/solr/schema/CopyFieldTest.java =================================================================== --- solr/src/test/org/apache/solr/schema/CopyFieldTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/schema/CopyFieldTest.java (working copy) @@ -29,8 +29,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * This is a simple test to make sure the CopyField works. * It uses its own special schema file. Index: solr/src/test/org/apache/solr/SampleTest.java =================================================================== --- solr/src/test/org/apache/solr/SampleTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/SampleTest.java (working copy) @@ -22,8 +22,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * This is an example of how to write a JUnit tests for Solr using the * SolrTestCaseJ4 Index: solr/src/test/org/apache/solr/cloud/ZkControllerTest.java =================================================================== --- solr/src/test/org/apache/solr/cloud/ZkControllerTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/cloud/ZkControllerTest.java (working copy) @@ -33,7 +33,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; public class ZkControllerTest extends SolrTestCaseJ4 { Index: solr/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java =================================================================== --- solr/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/highlight/FastVectorHighlighterTest.java (working copy) @@ -17,9 +17,6 @@ package org.apache.solr.highlight; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - import java.util.HashMap; import org.apache.solr.SolrTestCaseJ4; Index: solr/src/test/org/apache/solr/highlight/HighlighterTest.java =================================================================== --- solr/src/test/org/apache/solr/highlight/HighlighterTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/highlight/HighlighterTest.java (working copy) @@ -18,11 +18,9 @@ package org.apache.solr.highlight; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.solr.SolrTestCaseJ4; -import org.apache.solr.core.SolrCore; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.util.*; import org.apache.solr.common.params.HighlightParams; @@ -30,9 +28,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - -import java.io.IOException; import java.io.StringReader; import java.util.Arrays; import java.util.HashMap; Index: solr/src/test/org/apache/solr/OutputWriterTest.java =================================================================== --- solr/src/test/org/apache/solr/OutputWriterTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/OutputWriterTest.java (working copy) @@ -27,8 +27,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** Tests the ability to configure multiple query output writers, and select those * at query time. * Index: solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java =================================================================== --- solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java (working copy) @@ -20,12 +20,8 @@ import org.apache.solr.SolrTestCaseJ4; import org.apache.solr.util.SolrPluginUtils; import org.apache.solr.util.SolrPluginUtils.DisjunctionMaxQueryParser; -import org.apache.solr.core.SolrCore; import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.search.DocList; -import org.apache.solr.search.DocSlice; -import org.apache.solr.response.SolrQueryResponse; -import org.apache.solr.common.util.*; import org.apache.solr.common.SolrDocument; import org.apache.solr.common.SolrDocumentList; @@ -41,8 +37,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.List; import java.util.Map; import java.util.HashMap; Index: solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/SolrExampleBinaryTest.java (working copy) @@ -22,7 +22,6 @@ import org.apache.solr.client.solrj.impl.BinaryRequestWriter; import org.apache.solr.client.solrj.impl.BinaryResponseParser; import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer; -import org.apache.solr.client.solrj.impl.StreamingUpdateSolrServer; import org.junit.BeforeClass; Index: solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/beans/TestDocumentObjectBinder.java (working copy) @@ -25,7 +25,6 @@ import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.SolrInputField; import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.util.Hash; import org.apache.solr.common.util.NamedList; import org.junit.Assert; Index: solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeJettyTest.java (working copy) @@ -18,8 +18,6 @@ package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.LargeVolumeTestBase; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer; import org.junit.BeforeClass; public class LargeVolumeJettyTest extends LargeVolumeTestBase { Index: solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleEmbeddedTest.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.SolrExampleTests; -import org.apache.solr.client.solrj.SolrServer; import org.junit.BeforeClass; /** Index: solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeBinaryJettyTest.java (working copy) @@ -17,9 +17,6 @@ package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.LargeVolumeTestBase; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.impl.BinaryRequestWriter; -import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer; import org.junit.BeforeClass; /** Index: solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/embedded/SolrExampleJettyTest.java (working copy) @@ -18,10 +18,7 @@ package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.SolrExampleTests; -import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer; -import org.apache.solr.core.SolrCore; -import org.apache.solr.schema.SchemaField; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; Index: solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/embedded/LargeVolumeEmbeddedTest.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr.client.solrj.embedded; import org.apache.solr.client.solrj.LargeVolumeTestBase; -import org.apache.solr.client.solrj.SolrServer; import org.junit.BeforeClass; public class LargeVolumeEmbeddedTest extends LargeVolumeTestBase { Index: solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/LargeVolumeTestBase.java (working copy) @@ -26,8 +26,6 @@ import org.apache.solr.common.SolrInputDocument; import org.junit.Test; -import static org.junit.Assert.*; - /** * @version $Id$ * @since solr 1.3 Index: solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/response/DocumentAnalysisResponseTest.java (working copy) @@ -19,8 +19,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.common.util.NamedList; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; import org.junit.Test; import java.util.ArrayList; Index: solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/response/QueryResponseTest.java (working copy) @@ -17,8 +17,6 @@ package org.apache.solr.client.solrj.response; -import java.io.InputStream; -import java.io.InputStreamReader; import java.io.FileReader; import junit.framework.Assert; @@ -27,7 +25,6 @@ import org.apache.solr.client.solrj.impl.XMLResponseParser; import org.apache.solr.common.util.NamedList; import org.junit.Test; -import static org.junit.Assert.assertTrue; /** * Simple test for Date facet support in QueryResponse Index: solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/response/FieldAnalysisResponseTest.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.common.util.NamedList; -import static org.junit.Assert.*; import org.junit.Test; import java.util.ArrayList; Index: solr/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/response/TermsResponseTest.java (working copy) @@ -21,11 +21,8 @@ import org.apache.solr.client.solrj.SolrJettyTestBase; import org.apache.solr.client.solrj.SolrQuery; -import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.client.solrj.SolrExampleTestBase; import org.apache.solr.client.solrj.request.QueryRequest; -import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; import org.apache.solr.client.solrj.response.TermsResponse.Term; import org.junit.BeforeClass; import org.junit.Test; Index: solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/response/AnlysisResponseBaseTest.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.common.util.NamedList; -import static org.junit.Assert.*; import org.junit.Test; import java.util.ArrayList; Index: solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/response/TestSpellCheckResponse.java (working copy) @@ -24,26 +24,12 @@ import org.apache.solr.client.solrj.response.SpellCheckResponse.Correction; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.CommonParams; -import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.params.SpellingParams; -import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.util.SimpleOrderedMap; -import org.apache.solr.core.SolrCore; -import org.apache.solr.handler.component.SearchComponent; -import org.apache.solr.handler.component.SpellCheckComponent; -import org.apache.solr.request.LocalSolrQueryRequest; -import org.apache.solr.request.SolrRequestHandler; -import org.apache.solr.response.SolrQueryResponse; import org.junit.BeforeClass; import org.junit.Test; import java.util.List; -import static org.junit.Assert.fail; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - /** * Test for SpellCheckComponent's response in Solrj * Index: solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/SolrExampleTests.java (working copy) @@ -48,8 +48,6 @@ import org.apache.solr.common.params.FacetParams; import org.junit.Test; -import static org.junit.Assert.*; - /** * This should include tests against the example solr config * Index: solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/TestBatchUpdate.java (working copy) @@ -28,8 +28,6 @@ import java.io.IOException; import java.util.Iterator; -import static org.junit.Assert.assertEquals; - /** * Test for SOLR-1038 * Index: solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java =================================================================== --- solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/client/solrj/SolrExceptionTest.java (working copy) @@ -17,15 +17,11 @@ package org.apache.solr.client.solrj; -import java.net.UnknownHostException; - import org.apache.lucene.util.LuceneTestCase; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.solr.client.solrj.impl.CommonsHttpSolrServer; -import org.apache.solr.client.solrj.response.QueryResponse; -import org.apache.solr.common.SolrException; /** * Index: solr/src/test/org/apache/solr/SolrInfoMBeanTest.java =================================================================== --- solr/src/test/org/apache/solr/SolrInfoMBeanTest.java (revision 1052896) +++ solr/src/test/org/apache/solr/SolrInfoMBeanTest.java (working copy) @@ -16,7 +16,6 @@ */ package org.apache.solr; -import org.apache.lucene.util.LuceneTestCase; import org.apache.solr.core.SolrInfoMBean; import org.apache.solr.handler.StandardRequestHandler; import org.apache.solr.handler.admin.LukeRequestHandler; @@ -25,8 +24,6 @@ import org.apache.solr.highlight.DefaultSolrHighlighter; import org.apache.solr.search.LRUCache; import org.junit.BeforeClass; -import org.junit.Ignore; - import java.io.File; import java.net.URL; import java.util.ArrayList; Index: solr/src/java/org/apache/solr/schema/BCDLongField.java =================================================================== --- solr/src/java/org/apache/solr/schema/BCDLongField.java (revision 1052896) +++ solr/src/java/org/apache/solr/schema/BCDLongField.java (working copy) @@ -18,8 +18,6 @@ package org.apache.solr.schema; import org.apache.lucene.document.Fieldable; - -import java.io.IOException; /** * @version $Id$ */ Index: solr/src/java/org/apache/solr/schema/BCDStrField.java =================================================================== --- solr/src/java/org/apache/solr/schema/BCDStrField.java (revision 1052896) +++ solr/src/java/org/apache/solr/schema/BCDStrField.java (working copy) @@ -18,8 +18,6 @@ package org.apache.solr.schema; import org.apache.lucene.document.Fieldable; - -import java.io.IOException; /** * @version $Id$ */ Index: solr/src/java/org/apache/solr/schema/SpatialQueryable.java =================================================================== --- solr/src/java/org/apache/solr/schema/SpatialQueryable.java (revision 1052896) +++ solr/src/java/org/apache/solr/schema/SpatialQueryable.java (working copy) @@ -17,7 +17,6 @@ */ -import org.apache.lucene.search.Filter; import org.apache.lucene.search.Query; import org.apache.solr.search.QParser; import org.apache.solr.search.SpatialOptions; Index: solr/src/java/org/apache/solr/schema/CoordinateFieldType.java =================================================================== --- solr/src/java/org/apache/solr/schema/CoordinateFieldType.java (revision 1052896) +++ solr/src/java/org/apache/solr/schema/CoordinateFieldType.java (working copy) @@ -17,21 +17,6 @@ package org.apache.solr.schema; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.TermQuery; -import org.apache.lucene.index.Term; -import org.apache.solr.search.QParser; -import org.apache.solr.search.function.ValueSource; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.params.SolrParams; -import org.apache.solr.common.params.MapSolrParams; - -import java.util.Map; -import java.util.List; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; - /** * A CoordinateFieldType is the base class for {@link org.apache.solr.schema.FieldType}s that have semantics * related to items in a coordinate system. Index: solr/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java =================================================================== --- solr/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java (revision 1052896) +++ solr/src/java/org/apache/solr/update/processor/SignatureUpdateProcessorFactory.java (working copy) @@ -33,11 +33,7 @@ import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.AddUpdateCommand; -import org.apache.solr.update.CommitUpdateCommand; -import org.apache.solr.update.DeleteUpdateCommand; -import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.core.SolrCore; -import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.SchemaField; import org.apache.solr.util.plugin.SolrCoreAware; Index: solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java =================================================================== --- solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java (revision 1052896) +++ solr/src/java/org/apache/solr/update/processor/Lookup3Signature.java (working copy) @@ -16,12 +16,6 @@ * limitations under the License. */ -import java.io.UnsupportedEncodingException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.solr.common.util.Hash; public class Lookup3Signature extends Signature { Index: solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java =================================================================== --- solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java (revision 1052896) +++ solr/src/java/org/apache/solr/update/DirectUpdateHandler2.java (working copy) @@ -20,7 +20,6 @@ package org.apache.solr.update; -import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; Index: solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java (revision 1052896) +++ solr/src/java/org/apache/solr/analysis/ClassicTokenizerFactory.java (working copy) @@ -20,8 +20,6 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.standard.ClassicTokenizer; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.analysis.standard.StandardTokenizer; - import java.io.Reader; import java.util.Map; Index: solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java =================================================================== --- solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java (revision 1052896) +++ solr/src/java/org/apache/solr/analysis/PhoneticFilterFactory.java (working copy) @@ -31,7 +31,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.phonetic.PhoneticFilter; import org.apache.solr.common.SolrException; -import org.apache.solr.common.util.StrUtils; /** * Create tokens based on phonetic encoders Index: solr/src/java/org/apache/solr/search/FieldQParserPlugin.java =================================================================== --- solr/src/java/org/apache/solr/search/FieldQParserPlugin.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/FieldQParserPlugin.java (working copy) @@ -16,25 +16,15 @@ */ package org.apache.solr.search; -import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.Token; -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.*; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.SolrException; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.schema.FieldType; -import org.apache.solr.schema.TextField; import org.apache.solr.schema.SchemaField; -import java.io.IOException; -import java.io.StringReader; -import java.util.ArrayList; - /** * Create a field query from the input value, applying text analysis and constructing a phrase query if appropriate. *
Other parameters: f, the field Index: solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java =================================================================== --- solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/LuceneQueryOptimizer.java (working copy) @@ -24,7 +24,6 @@ import org.apache.lucene.search.*; import java.util.LinkedHashMap; -import java.util.List; import java.util.Map; import java.io.IOException; Index: solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/DoubleFieldSource.java (working copy) @@ -19,11 +19,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.util.Bits; -import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.cache.DoubleValuesCreator; -import org.apache.lucene.search.cache.FloatValuesCreator; import org.apache.lucene.search.cache.CachedArray.DoubleValues; -import org.apache.lucene.search.cache.CachedArray.FloatValues; import org.apache.solr.search.MutableValue; import org.apache.solr.search.MutableValueDouble; Index: solr/src/java/org/apache/solr/search/function/ShortFieldSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/ShortFieldSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/ShortFieldSource.java (working copy) @@ -16,11 +16,7 @@ * limitations under the License. */ -import org.apache.lucene.search.FieldCache; -import org.apache.lucene.search.cache.FloatValuesCreator; import org.apache.lucene.search.cache.ShortValuesCreator; -import org.apache.lucene.search.cache.CachedArray.FloatValues; -import org.apache.lucene.search.cache.CachedArray.LongValues; import org.apache.lucene.search.cache.CachedArray.ShortValues; import org.apache.lucene.index.IndexReader; Index: solr/src/java/org/apache/solr/search/function/FileFloatSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/FileFloatSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/FileFloatSource.java (working copy) @@ -21,7 +21,6 @@ import org.apache.lucene.index.TermsEnum; import org.apache.lucene.index.MultiFields; import org.apache.lucene.util.StringHelper; -import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; import org.apache.solr.core.SolrCore; import org.apache.solr.schema.SchemaField; Index: solr/src/java/org/apache/solr/search/function/ByteFieldSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/ByteFieldSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/ByteFieldSource.java (working copy) @@ -17,12 +17,8 @@ */ import org.apache.lucene.index.IndexReader; -import org.apache.lucene.search.FieldCache; import org.apache.lucene.search.cache.ByteValuesCreator; -import org.apache.lucene.search.cache.LongValuesCreator; import org.apache.lucene.search.cache.CachedArray.ByteValues; -import org.apache.lucene.search.cache.CachedArray.DoubleValues; -import org.apache.lucene.search.cache.CachedArray.LongValues; import java.io.IOException; import java.util.Map; @@ -86,4 +82,4 @@ }; } -} \ No newline at end of file +} Index: solr/src/java/org/apache/solr/search/function/ValueSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/ValueSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/ValueSource.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr.search.function; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.search.Explanation; import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.FieldComparatorSource; import org.apache.lucene.search.Scorer; Index: solr/src/java/org/apache/solr/search/function/SumFloatFunction.java =================================================================== --- solr/src/java/org/apache/solr/search/function/SumFloatFunction.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/SumFloatFunction.java (working copy) @@ -17,13 +17,6 @@ package org.apache.solr.search.function; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.search.Searcher; - -import java.io.IOException; -import java.util.Arrays; -import java.util.Map; - /** * SumFloatFunction returns the sum of it's components. */ Index: solr/src/java/org/apache/solr/search/function/PowFloatFunction.java =================================================================== --- solr/src/java/org/apache/solr/search/function/PowFloatFunction.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/PowFloatFunction.java (working copy) @@ -17,10 +17,6 @@ package org.apache.solr.search.function; -import org.apache.lucene.index.IndexReader; - -import java.io.IOException; - /** Function to raise the base "a" to the power "b" */ public class PowFloatFunction extends DualFloatFunction { Index: solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/TermFreqValueSource.java (working copy) @@ -19,8 +19,6 @@ import org.apache.lucene.index.*; import org.apache.lucene.search.DocIdSetIterator; -import org.apache.lucene.search.Searcher; -import org.apache.lucene.search.Similarity; import org.apache.lucene.util.BytesRef; import org.apache.solr.common.SolrException; Index: solr/src/java/org/apache/solr/search/function/OrdFieldSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/OrdFieldSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/OrdFieldSource.java (working copy) @@ -20,7 +20,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.solr.search.MutableValue; import org.apache.solr.search.MutableValueInt; -import org.apache.solr.util.NumberUtils; import java.io.IOException; import java.util.Map; Index: solr/src/java/org/apache/solr/search/function/IntFieldSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/IntFieldSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/IntFieldSource.java (working copy) @@ -21,11 +21,7 @@ import org.apache.lucene.util.Bits; import org.apache.solr.search.MutableValueInt; import org.apache.solr.search.MutableValue; -import org.apache.lucene.search.FieldCache; -import org.apache.lucene.search.cache.FloatValuesCreator; import org.apache.lucene.search.cache.IntValuesCreator; -import org.apache.lucene.search.cache.CachedArray.DoubleValues; -import org.apache.lucene.search.cache.CachedArray.FloatValues; import org.apache.lucene.search.cache.CachedArray.IntValues; import java.io.IOException; Index: solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java =================================================================== --- solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/ValueSourceRangeFilter.java (working copy) @@ -17,7 +17,6 @@ package org.apache.solr.search.function; -import org.apache.lucene.search.Filter; import org.apache.lucene.search.DocIdSet; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.Searcher; Index: solr/src/java/org/apache/solr/search/function/IDFValueSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/IDFValueSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/IDFValueSource.java (working copy) @@ -18,12 +18,9 @@ package org.apache.solr.search.function; import org.apache.lucene.index.*; -import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.search.Searcher; import org.apache.lucene.search.Similarity; import org.apache.lucene.util.BytesRef; -import org.apache.solr.common.SolrException; -import org.apache.solr.search.SolrIndexReader; import org.apache.solr.util.ByteUtils; import java.io.IOException; Index: solr/src/java/org/apache/solr/search/function/ConstNumberSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/ConstNumberSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/ConstNumberSource.java (working copy) @@ -17,11 +17,6 @@ package org.apache.solr.search.function; -import org.apache.lucene.index.IndexReader; - -import java.io.IOException; -import java.util.Map; - /** * ConstNumberSource is the base class for all constant numbers */ Index: solr/src/java/org/apache/solr/search/function/NormValueSource.java =================================================================== --- solr/src/java/org/apache/solr/search/function/NormValueSource.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/function/NormValueSource.java (working copy) @@ -20,8 +20,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.Searcher; import org.apache.lucene.search.Similarity; -import org.apache.solr.search.SolrIndexReader; - import java.io.IOException; import java.util.Map; Index: solr/src/java/org/apache/solr/search/QueryResultKey.java =================================================================== --- solr/src/java/org/apache/solr/search/QueryResultKey.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/QueryResultKey.java (working copy) @@ -17,13 +17,9 @@ package org.apache.solr.search; -import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.Query; import org.apache.lucene.search.Sort; import org.apache.lucene.search.SortField; -import org.apache.solr.common.SolrException.ErrorCode; -import org.apache.solr.common.SolrException; - import java.io.IOException; import java.util.List; Index: solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java =================================================================== --- solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/FunctionRangeQParserPlugin.java (working copy) @@ -18,8 +18,6 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.Query; -import org.apache.lucene.search.ConstantScoreQuery; -import org.apache.lucene.search.Filter; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.request.SolrQueryRequest; Index: solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java =================================================================== --- solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/ExtendedDismaxQParserPlugin.java (working copy) @@ -27,7 +27,6 @@ import org.apache.lucene.search.*; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; -import org.apache.solr.common.SolrException; import org.apache.solr.common.params.DefaultSolrParams; import org.apache.solr.common.params.DisMaxParams; import org.apache.solr.common.params.SolrParams; Index: solr/src/java/org/apache/solr/search/QueryParsing.java =================================================================== --- solr/src/java/org/apache/solr/search/QueryParsing.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/QueryParsing.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.index.Term; import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.queryParser.QueryParser.Operator; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; @@ -44,14 +43,11 @@ import org.apache.solr.schema.SchemaField; import org.apache.solr.search.function.FunctionQuery; import org.apache.solr.search.function.QueryValueSource; -import org.apache.solr.search.function.ValueSource; - import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.regex.Pattern; /** * Collection of static utilities useful for query parsing. Index: solr/src/java/org/apache/solr/search/NestedQParserPlugin.java =================================================================== --- solr/src/java/org/apache/solr/search/NestedQParserPlugin.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/NestedQParserPlugin.java (working copy) @@ -21,9 +21,6 @@ import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.search.function.BoostedQuery; -import org.apache.solr.search.function.FunctionQuery; -import org.apache.solr.search.function.QueryValueSource; import org.apache.solr.search.function.ValueSource; /** Index: solr/src/java/org/apache/solr/search/SpatialFilterQParser.java =================================================================== --- solr/src/java/org/apache/solr/search/SpatialFilterQParser.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/SpatialFilterQParser.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.spatial.geometry.DistanceUnits; import org.apache.lucene.spatial.DistanceUtils; import org.apache.solr.common.SolrException; -import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.params.SpatialParams; import org.apache.solr.request.SolrQueryRequest; Index: solr/src/java/org/apache/solr/search/SolrIndexSearcher.java =================================================================== --- solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/SolrIndexSearcher.java (working copy) @@ -35,7 +35,6 @@ import org.apache.solr.request.UnInvertedField; import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.SchemaField; -import org.apache.solr.search.function.ValueSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java =================================================================== --- solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/LuceneQParserPlugin.java (working copy) @@ -17,7 +17,6 @@ package org.apache.solr.search; import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.queryParser.QueryParser; import org.apache.lucene.search.Query; import org.apache.lucene.search.Sort; import org.apache.solr.common.SolrException; Index: solr/src/java/org/apache/solr/search/SolrCacheBase.java =================================================================== --- solr/src/java/org/apache/solr/search/SolrCacheBase.java (revision 1052896) +++ solr/src/java/org/apache/solr/search/SolrCacheBase.java (working copy) @@ -17,16 +17,6 @@ package org.apache.solr.search; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.util.NamedList; -import org.apache.solr.common.util.SimpleOrderedMap; -import org.apache.solr.core.SolrCore; - -import java.util.*; -import java.util.concurrent.atomic.AtomicLong; -import java.io.IOException; -import java.net.URL; - /** * Common base class of reusable functionality for SolrCaches */ Index: solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java =================================================================== --- solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (revision 1052896) +++ solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (working copy) @@ -29,7 +29,6 @@ import org.apache.lucene.analysis.CachingTokenFilter; -import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.TokenFilter; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.tokenattributes.OffsetAttribute; @@ -50,7 +49,6 @@ import org.apache.solr.core.PluginInfo; import org.apache.solr.core.SolrCore; import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.schema.FieldType; import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.SchemaField; import org.apache.solr.search.DocIterator; Index: solr/src/java/org/apache/solr/highlight/SolrHighlighter.java =================================================================== --- solr/src/java/org/apache/solr/highlight/SolrHighlighter.java (revision 1052896) +++ solr/src/java/org/apache/solr/highlight/SolrHighlighter.java (working copy) @@ -19,7 +19,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; Index: solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java =================================================================== --- solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java (revision 1052896) +++ solr/src/java/org/apache/solr/core/StandardIndexReaderFactory.java (working copy) @@ -20,7 +20,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.store.Directory; -import org.apache.solr.common.util.NamedList; /** * Default IndexReaderFactory implementation. Returns a standard Lucene Index: solr/src/java/org/apache/solr/core/Config.java =================================================================== --- solr/src/java/org/apache/solr/core/Config.java (revision 1052896) +++ solr/src/java/org/apache/solr/core/Config.java (working copy) @@ -33,9 +33,6 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import java.util.Map; -import java.util.LinkedHashMap; -import java.util.Collections; import java.util.concurrent.atomic.AtomicBoolean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: solr/src/java/org/apache/solr/core/RefCntRamDirectory.java =================================================================== --- solr/src/java/org/apache/solr/core/RefCntRamDirectory.java (revision 1052896) +++ solr/src/java/org/apache/solr/core/RefCntRamDirectory.java (working copy) @@ -3,7 +3,6 @@ import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.lucene.index.IndexFileNameFilter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; Index: solr/src/java/org/apache/solr/core/SolrEventListener.java =================================================================== --- solr/src/java/org/apache/solr/core/SolrEventListener.java (revision 1052896) +++ solr/src/java/org/apache/solr/core/SolrEventListener.java (working copy) @@ -17,7 +17,6 @@ package org.apache.solr.core; -import org.apache.solr.common.util.NamedList; import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.util.plugin.NamedListInitializedPlugin; Index: solr/src/java/org/apache/solr/core/SolrCore.java =================================================================== --- solr/src/java/org/apache/solr/core/SolrCore.java (revision 1052896) +++ solr/src/java/org/apache/solr/core/SolrCore.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.search.BooleanQuery; import org.apache.lucene.store.Directory; import org.apache.solr.common.SolrException; -import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.CommonParams.EchoParamStyle; import org.apache.solr.common.params.SolrParams; @@ -31,7 +30,6 @@ import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.handler.admin.ShowFileRequestHandler; import org.apache.solr.handler.component.*; -import org.apache.solr.highlight.DefaultSolrHighlighter; import org.apache.solr.highlight.SolrHighlighter; import org.apache.solr.request.*; import org.apache.solr.response.*; Index: solr/src/java/org/apache/solr/request/SimpleFacets.java =================================================================== --- solr/src/java/org/apache/solr/request/SimpleFacets.java (revision 1052896) +++ solr/src/java/org/apache/solr/request/SimpleFacets.java (working copy) @@ -38,7 +38,6 @@ import org.apache.solr.common.util.StrUtils; import org.apache.solr.core.SolrCore; import org.apache.solr.schema.*; -import org.apache.solr.schema.TrieField.TrieTypes; import org.apache.solr.search.*; import org.apache.solr.util.BoundedTreeSet; import org.apache.solr.util.ByteUtils; Index: solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java =================================================================== --- solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java (revision 1052896) +++ solr/src/java/org/apache/solr/request/SolrQueryRequestBase.java (working copy) @@ -20,8 +20,6 @@ import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.util.RefCounted; import org.apache.solr.schema.IndexSchema; -import org.apache.solr.common.SolrException; -import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.ContentStream; import org.apache.solr.core.SolrCore; Index: solr/src/java/org/apache/solr/request/SolrQueryRequest.java =================================================================== --- solr/src/java/org/apache/solr/request/SolrQueryRequest.java (revision 1052896) +++ solr/src/java/org/apache/solr/request/SolrQueryRequest.java (working copy) @@ -19,7 +19,6 @@ import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.schema.IndexSchema; -import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.ContentStream; import org.apache.solr.core.SolrCore; Index: solr/src/java/org/apache/solr/handler/StandardRequestHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/StandardRequestHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/StandardRequestHandler.java (working copy) @@ -17,7 +17,6 @@ package org.apache.solr.handler; -import org.apache.solr.common.util.NamedList; import org.apache.solr.handler.component.*; import java.net.MalformedURLException; Index: solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (working copy) @@ -42,9 +42,7 @@ import java.io.File; import java.io.IOException; -import java.util.ArrayList; import java.util.Date; -import java.util.Set; /** * @version $Id$ Index: solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (working copy) @@ -36,7 +36,6 @@ import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrResourceLoader; import org.apache.solr.handler.RequestHandlerBase; -import org.apache.solr.handler.RequestHandlerUtils; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.RawResponseWriter; import org.apache.solr.response.SolrQueryResponse; Index: solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java (working copy) @@ -26,7 +26,6 @@ import org.apache.solr.core.SolrCore; import org.apache.solr.core.SolrInfoMBean; import org.apache.solr.handler.RequestHandlerBase; -import org.apache.solr.handler.RequestHandlerUtils; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; Index: solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java (working copy) @@ -25,7 +25,6 @@ import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.handler.RequestHandlerBase; -import org.apache.solr.handler.RequestHandlerUtils; import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.response.SolrQueryResponse; Index: solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (working copy) @@ -8,11 +8,9 @@ import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.response.SolrQueryResponse; -import java.util.Date; import java.util.Set; import java.util.Map; import java.util.HashSet; -import java.util.HashMap; /** * A request handler that provides info about all Index: solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java (working copy) @@ -20,7 +20,6 @@ import java.io.BufferedReader; import java.io.DataInputStream; import java.io.File; -import java.io.StringWriter; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; import java.lang.management.RuntimeMXBean; @@ -35,7 +34,6 @@ import org.apache.lucene.LucenePackage; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; -import org.apache.solr.common.util.XML; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.RequestHandlerBase; import org.apache.solr.request.SolrQueryRequest; Index: solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java (working copy) @@ -18,14 +18,11 @@ package org.apache.solr.handler; import org.apache.solr.common.SolrException; -import org.apache.solr.common.params.MapSolrParams; -import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.XML; import org.apache.solr.core.SolrCore; import org.apache.solr.request.LocalSolrQueryRequest; import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.update.processor.UpdateRequestProcessor; import org.apache.solr.update.processor.UpdateRequestProcessorChain; Index: solr/src/java/org/apache/solr/handler/RequestHandlerBase.java =================================================================== --- solr/src/java/org/apache/solr/handler/RequestHandlerBase.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/RequestHandlerBase.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr.handler; import org.apache.solr.common.SolrException; -import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; @@ -27,7 +26,6 @@ import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse; -import org.apache.solr.search.DocSet; import org.apache.solr.util.SolrPluginUtils; import org.apache.lucene.queryParser.ParseException; Index: solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/component/QueryElevationComponent.java (working copy) @@ -30,7 +30,6 @@ import java.util.Map; import java.util.WeakHashMap; -import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.QueryElevationParams; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Index: solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/component/SpellCheckComponent.java (working copy) @@ -23,11 +23,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.lucene.search.spell.LevensteinDistance; -import org.apache.lucene.search.spell.SpellChecker; import org.apache.lucene.search.spell.StringDistance; import org.apache.lucene.search.spell.SuggestWord; import org.apache.lucene.search.spell.SuggestWordQueue; -import org.apache.lucene.util.PriorityQueue; import org.apache.solr.client.solrj.response.SpellCheckResponse; import org.apache.solr.common.params.ModifiableSolrParams; import org.slf4j.Logger; Index: solr/src/java/org/apache/solr/handler/component/SearchHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/SearchHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/component/SearchHandler.java (working copy) @@ -54,7 +54,6 @@ import org.apache.solr.common.params.ShardParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.RTimer; -import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.common.util.StrUtils; import org.apache.solr.core.SolrCore; import org.apache.solr.handler.RequestHandlerBase; Index: solr/src/java/org/apache/solr/handler/component/PivotFacetHelper.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/PivotFacetHelper.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/component/PivotFacetHelper.java (working copy) @@ -32,9 +32,6 @@ import org.apache.solr.schema.FieldType; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.document.Field; -import org.apache.lucene.document.Field.Index; -import org.apache.lucene.document.Field.Store; import org.apache.lucene.index.Term; import java.io.IOException; Index: solr/src/java/org/apache/solr/handler/component/TermsComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/TermsComponent.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/component/TermsComponent.java (working copy) @@ -18,7 +18,6 @@ import org.apache.lucene.index.*; import org.apache.lucene.util.BytesRef; -import org.apache.lucene.util.StringHelper; import org.apache.noggit.CharArr; import org.apache.solr.common.SolrException; import org.apache.solr.common.params.*; Index: solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/component/TermVectorComponent.java (working copy) @@ -1,7 +1,6 @@ package org.apache.solr.handler.component; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.Fieldable; import org.apache.lucene.document.SetBasedFieldSelector; import org.apache.lucene.index.IndexReader; @@ -30,15 +29,12 @@ import java.io.IOException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: solr/src/java/org/apache/solr/handler/component/SearchComponent.java =================================================================== --- solr/src/java/org/apache/solr/handler/component/SearchComponent.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/component/SearchComponent.java (working copy) @@ -20,12 +20,9 @@ import java.io.IOException; import java.net.URL; -import org.apache.lucene.queryParser.ParseException; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.SimpleOrderedMap; import org.apache.solr.core.SolrInfoMBean; -import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.response.SolrQueryResponse; import org.apache.solr.util.plugin.NamedListInitializedPlugin; /** Index: solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java =================================================================== --- solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (revision 1052896) +++ solr/src/java/org/apache/solr/handler/MoreLikeThisHandler.java (working copy) @@ -24,11 +24,9 @@ import java.util.ArrayList; import java.util.Comparator; -import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.regex.Pattern; import org.apache.lucene.document.Document; Index: solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java =================================================================== --- solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java (revision 1052896) +++ solr/src/java/org/apache/solr/spelling/SolrSpellChecker.java (working copy) @@ -17,14 +17,11 @@ */ import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.Token; -import org.apache.lucene.index.IndexReader; import org.apache.solr.common.util.NamedList; import org.apache.solr.core.SolrCore; import org.apache.solr.search.SolrIndexSearcher; import java.io.IOException; -import java.util.Collection; /** Index: solr/src/java/org/apache/solr/spelling/SpellCheckCollator.java =================================================================== --- solr/src/java/org/apache/solr/spelling/SpellCheckCollator.java (revision 1052896) +++ solr/src/java/org/apache/solr/spelling/SpellCheckCollator.java (working copy) @@ -21,16 +21,13 @@ import java.util.List; import org.apache.lucene.analysis.Token; -import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.params.ModifiableSolrParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.handler.component.QueryComponent; import org.apache.solr.handler.component.ResponseBuilder; import org.apache.solr.handler.component.SearchComponent; -import org.apache.solr.handler.component.SearchHandler; import org.apache.solr.request.LocalSolrQueryRequest; -import org.apache.solr.request.SolrQueryRequestBase; import org.apache.solr.response.SolrQueryResponse; import org.mortbay.log.Log; import org.slf4j.Logger; Index: solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java =================================================================== --- solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java (revision 1052896) +++ solr/src/java/org/apache/solr/spelling/AbstractLuceneSpellChecker.java (working copy) @@ -21,7 +21,6 @@ import java.io.File; import java.io.IOException; import java.util.Arrays; -import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; Index: solr/src/java/org/apache/solr/util/TestHarness.java =================================================================== --- solr/src/java/org/apache/solr/util/TestHarness.java (revision 1052896) +++ solr/src/java/org/apache/solr/util/TestHarness.java (working copy) @@ -38,7 +38,6 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathExpressionException; @@ -49,10 +48,7 @@ import java.io.StringReader; import java.io.StringWriter; import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.HashMap; -import java.util.List; import java.util.Map; Index: solr/src/java/org/apache/solr/util/DateMathParser.java =================================================================== --- solr/src/java/org/apache/solr/util/DateMathParser.java (revision 1052896) +++ solr/src/java/org/apache/solr/util/DateMathParser.java (working copy) @@ -17,7 +17,6 @@ package org.apache.solr.util; -import org.apache.solr.request.SolrQueryRequest; import org.apache.solr.request.SolrRequestInfo; import java.util.Date; Index: solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java =================================================================== --- solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (revision 1052896) +++ solr/src/java/org/apache/solr/util/plugin/AbstractPluginLoader.java (working copy) @@ -27,7 +27,6 @@ import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.common.util.DOMUtil; import org.apache.solr.core.SolrConfig; -import org.apache.solr.core.SolrResourceLoader; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Index: solr/src/java/org/apache/solr/util/SolrPluginUtils.java =================================================================== --- solr/src/java/org/apache/solr/util/SolrPluginUtils.java (revision 1052896) +++ solr/src/java/org/apache/solr/util/SolrPluginUtils.java (working copy) @@ -41,9 +41,6 @@ import org.apache.solr.schema.SchemaField; import org.apache.solr.search.*; import org.apache.solr.update.DocumentBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.IOException; import java.util.*; import java.util.regex.Pattern; Index: solr/src/java/org/apache/solr/response/TextResponseWriter.java =================================================================== --- solr/src/java/org/apache/solr/response/TextResponseWriter.java (revision 1052896) +++ solr/src/java/org/apache/solr/response/TextResponseWriter.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr.response; import org.apache.lucene.document.Document; -import org.apache.solr.common.params.CommonParams; import org.apache.solr.common.util.NamedList; import org.apache.solr.common.util.FastWriter; import org.apache.solr.common.SolrDocument; Index: solr/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java =================================================================== --- solr/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java (revision 1052896) +++ solr/src/java/org/apache/solr/response/BinaryQueryResponseWriter.java (working copy) @@ -17,7 +17,6 @@ */ -import java.io.Writer; import java.io.OutputStream; import java.io.IOException; Index: solr/src/java/org/apache/solr/response/XMLWriter.java =================================================================== --- solr/src/java/org/apache/solr/response/XMLWriter.java (revision 1052896) +++ solr/src/java/org/apache/solr/response/XMLWriter.java (working copy) @@ -27,7 +27,6 @@ import org.apache.solr.search.DocList; import org.apache.solr.search.DocIterator; import org.apache.solr.search.DocSet; -import org.apache.solr.schema.IndexSchema; import org.apache.solr.schema.SchemaField; import org.apache.solr.schema.TextField; Index: solr/src/common/org/apache/solr/common/util/DateUtil.java =================================================================== --- solr/src/common/org/apache/solr/common/util/DateUtil.java (revision 1052896) +++ solr/src/common/org/apache/solr/common/util/DateUtil.java (working copy) @@ -17,7 +17,6 @@ */ import java.io.IOException; -import java.io.Writer; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; Index: solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java =================================================================== --- solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (revision 1052896) +++ solr/src/solrj/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java (working copy) @@ -18,7 +18,6 @@ import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; -import org.apache.commons.httpclient.DefaultMethodRetryHandler; import org.apache.commons.httpclient.DefaultHttpMethodRetryHandler; import org.apache.commons.httpclient.params.HttpMethodParams; import org.apache.solr.client.solrj.*; @@ -32,7 +31,6 @@ import java.net.URL; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.locks.ReentrantLock; import java.util.*; /** Index: solr/src/solrj/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java =================================================================== --- solr/src/solrj/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java (revision 1052896) +++ solr/src/solrj/org/apache/solr/client/solrj/request/ContentStreamUpdateRequest.java (working copy) @@ -17,12 +17,6 @@ */ -import org.apache.solr.client.solrj.SolrRequest; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.response.UpdateResponse; -import org.apache.solr.common.params.ModifiableSolrParams; -import org.apache.solr.common.params.SolrParams; import org.apache.solr.common.util.ContentStream; import org.apache.solr.common.util.ContentStreamBase; Index: solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java =================================================================== --- solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java (revision 1052896) +++ solr/src/solrj/org/apache/solr/client/solrj/request/UpdateRequest.java (working copy) @@ -25,10 +25,6 @@ import java.util.List; import java.util.Iterator; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.SolrRequest; -import org.apache.solr.client.solrj.response.UpdateResponse; import org.apache.solr.client.solrj.util.ClientUtils; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.ModifiableSolrParams; Index: solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java =================================================================== --- solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java (revision 1052896) +++ solr/src/solrj/org/apache/solr/client/solrj/response/UpdateResponse.java (working copy) @@ -17,9 +17,7 @@ package org.apache.solr.client.solrj.response; -import org.apache.solr.common.util.NamedList; - /** * TODO -- mostly a stub until we have a defined output format * Index: solr/src/solrj/org/apache/solr/client/solrj/response/PivotField.java =================================================================== --- solr/src/solrj/org/apache/solr/client/solrj/response/PivotField.java (revision 1052896) +++ solr/src/solrj/org/apache/solr/client/solrj/response/PivotField.java (working copy) @@ -18,7 +18,6 @@ package org.apache.solr.client.solrj.response; import java.io.PrintStream; -import java.io.PrintWriter; import java.io.Serializable; import java.util.List; Index: solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java =================================================================== --- solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java (revision 1052896) +++ solr/src/solrj/org/apache/solr/client/solrj/response/SolrPingResponse.java (working copy) @@ -17,8 +17,6 @@ package org.apache.solr.client.solrj.response; -import org.apache.solr.common.util.NamedList; - /** * * @version $Id$ Index: solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java =================================================================== --- solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (revision 1052896) +++ solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (working copy) @@ -35,7 +35,6 @@ import org.apache.solr.common.SolrException.ErrorCode; import org.apache.solr.search.SolrIndexSearcher; import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.request.SolrRequestHandler; import org.apache.solr.response.SolrQueryResponse; import org.apache.commons.codec.binary.Base64; Index: solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java =================================================================== --- solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (revision 1052896) +++ solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (working copy) @@ -30,7 +30,6 @@ import org.mortbay.jetty.Handler; import org.mortbay.jetty.Server; import org.mortbay.jetty.bio.SocketConnector; -import org.mortbay.jetty.nio.SelectChannelConnector; import org.mortbay.jetty.servlet.Context; import org.mortbay.jetty.servlet.FilterHolder; import org.mortbay.jetty.servlet.HashSessionIdManager; Index: modules/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java =================================================================== --- modules/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java (revision 1052896) +++ modules/analysis/smartcn/src/test/org/apache/lucene/analysis/cn/smart/TestSmartChineseAnalyzer.java (working copy) @@ -17,15 +17,8 @@ package org.apache.lucene.analysis.cn.smart; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.Reader; -import java.io.UnsupportedEncodingException; -import java.util.Date; - import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.util.Version; public class TestSmartChineseAnalyzer extends BaseTokenStreamTestCase { Index: modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java (revision 1052896) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/commongrams/CommonGramsFilterTest.java (working copy) @@ -19,8 +19,6 @@ import java.io.Reader; import java.io.StringReader; import java.util.Arrays; -import java.util.Set; - import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.TokenFilter; Index: modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java (revision 1052896) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/compound/TestCompoundWordTokenFilter.java (working copy) @@ -17,7 +17,6 @@ * limitations under the License. */ -import java.io.Reader; import java.io.StringReader; import org.xml.sax.InputSource; Index: modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (revision 1052896) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLimitTokenCountAnalyzer.java (working copy) @@ -24,7 +24,6 @@ import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; import org.apache.lucene.analysis.standard.StandardAnalyzer; -import org.apache.lucene.util.Version; public class TestLimitTokenCountAnalyzer extends BaseTokenStreamTestCase { Index: modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java =================================================================== --- modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (revision 1052896) +++ modules/analysis/common/src/test/org/apache/lucene/analysis/cz/TestCzechAnalyzer.java (working copy) @@ -17,11 +17,7 @@ * limitations under the License. */ -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; - import org.apache.lucene.analysis.BaseTokenStreamTestCase; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.util.CharArraySet; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java (working copy) @@ -10,7 +10,6 @@ package org.apache.lucene.analysis.commongrams; import java.io.IOException; -import java.util.Arrays; import java.util.Set; import org.apache.lucene.analysis.TokenFilter; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/compound/hyphenation/PatternParser.java (working copy) @@ -29,7 +29,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.StringReader; import java.net.MalformedURLException; import java.util.ArrayList; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/core/StopAnalyzer.java (working copy) @@ -26,10 +26,8 @@ import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.CharArraySet; -import org.apache.lucene.analysis.util.ReusableAnalyzerBase; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; import org.apache.lucene.analysis.util.WordlistLoader; -import org.apache.lucene.analysis.util.ReusableAnalyzerBase.TokenStreamComponents; import org.apache.lucene.util.Version; /** Filters {@link LetterTokenizer} with {@link LowerCaseFilter} and {@link StopFilter}. Index: modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java (working copy) @@ -26,7 +26,6 @@ */ -import java.io.Reader; import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchStemFilter.java (working copy) @@ -25,9 +25,6 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import java.io.IOException; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; /** * A {@link TokenFilter} that stems french words. Index: modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/fr/FrenchAnalyzer.java (working copy) @@ -32,13 +32,9 @@ import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.util.Version; -import java.io.File; import java.io.IOException; import java.io.Reader; import java.util.Arrays; -import java.util.HashSet; -import java.util.Collections; -import java.util.Map; import java.util.Set; /** Index: modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/nl/DutchAnalyzer.java (working copy) @@ -38,7 +38,6 @@ import java.io.Reader; import java.util.Collections; import java.util.HashMap; -import java.util.HashSet; import java.util.Set; import java.util.Map; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/ar/ArabicAnalyzer.java (working copy) @@ -17,10 +17,8 @@ * limitations under the License. */ -import java.io.File; import java.io.IOException; import java.io.Reader; -import java.util.Hashtable; import java.util.Set; import org.apache.lucene.analysis.Analyzer; @@ -30,7 +28,6 @@ import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.util.CharArraySet; import org.apache.lucene.analysis.util.StopwordAnalyzerBase; -import org.apache.lucene.analysis.util.WordlistLoader; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.util.Version; Index: modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java =================================================================== --- modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java (revision 1052896) +++ modules/analysis/common/src/java/org/apache/lucene/analysis/cz/CzechAnalyzer.java (working copy) @@ -32,8 +32,6 @@ import org.apache.lucene.util.Version; import java.io.*; -import java.util.Collections; -import java.util.HashSet; import java.util.Set; /** Index: modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java =================================================================== --- modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java (revision 1052896) +++ modules/analysis/stempel/src/java/org/apache/lucene/analysis/pl/PolishAnalyzer.java (working copy) @@ -18,7 +18,6 @@ */ import java.io.IOException; -import java.io.InputStream; import java.io.Reader; import java.util.Set; Index: lucene/src/test/org/apache/lucene/analysis/MockTokenizer.java =================================================================== --- lucene/src/test/org/apache/lucene/analysis/MockTokenizer.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/analysis/MockTokenizer.java (working copy) @@ -21,7 +21,6 @@ import java.io.Reader; import org.apache.lucene.util.Version; -import org.apache.lucene.util.AttributeSource.AttributeFactory; import org.apache.lucene.util.automaton.CharacterRunAutomaton; import org.apache.lucene.util.automaton.RegExp; Index: lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java =================================================================== --- lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/analysis/tokenattributes/TestCharTermAttributeImpl.java (working copy) @@ -23,7 +23,6 @@ import java.util.Formatter; import java.util.Locale; import java.util.regex.Pattern; -import java.util.Random; public class TestCharTermAttributeImpl extends LuceneTestCase { Index: lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.LogMergePolicy; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.SlowMultiReaderWrapper; Index: lucene/src/test/org/apache/lucene/search/TestSort.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSort.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestSort.java (working copy) @@ -25,7 +25,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Locale; -import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; @@ -37,7 +36,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.LogMergePolicy; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.util.BytesRef; Index: lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestMultiTermConstantScore.java (working copy) @@ -29,8 +29,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.io.IOException; import java.text.Collator; import java.util.Locale; Index: lucene/src/test/org/apache/lucene/search/TestDocIdSet.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestDocIdSet.java (working copy) @@ -25,7 +25,6 @@ import junit.framework.Assert; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; import org.apache.lucene.index.IndexReader; Index: lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java =================================================================== --- lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/MultiCollectorTest.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import static org.junit.Assert.*; - import java.io.IOException; import org.apache.lucene.index.IndexReader; Index: lucene/src/test/org/apache/lucene/search/spans/TestBasics.java =================================================================== --- lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/spans/TestBasics.java (working copy) @@ -48,8 +48,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * Tests basic search capabilities. * Index: lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestMultiSearcher.java (working copy) @@ -18,7 +18,6 @@ */ import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; Index: lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestSubScorerFreqs.java (working copy) @@ -31,8 +31,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; -import static org.junit.Assert.*; - public class TestSubScorerFreqs extends LuceneTestCase { private static Directory dir; Index: lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestQueryWrapperFilter.java (working copy) @@ -18,7 +18,6 @@ */ import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; import org.apache.lucene.index.IndexReader; Index: lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/BaseTestRangeFilter.java (working copy) @@ -33,8 +33,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - public class BaseTestRangeFilter extends LuceneTestCase { public static final boolean F = false; Index: lucene/src/test/org/apache/lucene/search/TestBoolean2.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestBoolean2.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestBoolean2.java (working copy) @@ -37,8 +37,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** Test BooleanQuery2 against BooleanQuery by overriding the standard query parser. * This also tests the scoring order of BooleanQuery. */ Index: lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java =================================================================== --- lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/function/TestOrdValues.java (working copy) @@ -20,7 +20,6 @@ import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; import org.apache.lucene.search.*; -import static org.junit.Assert.*; import org.junit.Test; /** Index: lucene/src/test/org/apache/lucene/search/function/TestDocValues.java =================================================================== --- lucene/src/test/org/apache/lucene/search/function/TestDocValues.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/function/TestDocValues.java (working copy) @@ -19,8 +19,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * DocValues TestCase Index: lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/function/TestFieldScoreQuery.java (working copy) @@ -26,7 +26,6 @@ import org.apache.lucene.search.ScoreDoc; import org.apache.lucene.search.TopDocs; import org.junit.Test; -import static org.junit.Assert.*; /** * Test FieldScoreQuery search. Index: lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java =================================================================== --- lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/function/TestCustomScoreQuery.java (working copy) @@ -21,9 +21,6 @@ import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.search.*; import org.junit.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.util.HashMap; import java.util.Map; Index: lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestCachingSpanFilter.java (working copy) @@ -23,7 +23,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.LogMergePolicy; import org.apache.lucene.index.RandomIndexWriter; import org.apache.lucene.index.SerialMergeScheduler; import org.apache.lucene.index.Term; Index: lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestFieldCacheRangeFilter.java (working copy) @@ -29,8 +29,6 @@ import org.apache.lucene.store.Directory; import org.junit.Test; -import static org.junit.Assert.*; - /** * A basic 'positive' Unit test class for the FieldCacheRangeFilter class. * Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java (working copy) @@ -36,7 +36,6 @@ import org.junit.Test; import org.junit.AfterClass; import org.junit.BeforeClass; -import static org.junit.Assert.*; public class TestNumericRangeQuery32 extends LuceneTestCase { // distance of entries Index: lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java (working copy) @@ -33,7 +33,6 @@ import org.junit.Test; import org.junit.AfterClass; import org.junit.BeforeClass; -import static org.junit.Assert.*; public class TestNumericRangeQuery64 extends LuceneTestCase { // distance of entries Index: lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java =================================================================== --- lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/search/TestTermRangeFilter.java (working copy) @@ -29,8 +29,6 @@ import org.apache.lucene.store.Directory; import org.junit.Test; -import static org.junit.Assert.*; - /** * A basic 'positive' Unit test class for the TermRangeFilter class. * Index: lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestSnapshotDeletionPolicy.java (working copy) @@ -1,17 +1,13 @@ package org.apache.lucene.index; -import static org.junit.Assert.*; - import java.util.Collection; import java.util.Map; import java.util.Random; -import java.io.File; import java.io.IOException; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; import org.apache.lucene.store.IndexInput; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexCommit; @@ -21,7 +17,6 @@ import org.apache.lucene.index.SnapshotDeletionPolicy; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.ThreadInterruptedException; -import org.apache.lucene.util._TestUtil; import org.junit.Test; // Index: lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestParallelTermEnum.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; import org.apache.lucene.store.Directory; Index: lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestNoMergePolicy.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import static org.junit.Assert.*; - import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; Index: lucene/src/test/org/apache/lucene/index/TestIsCurrent.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestIsCurrent.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestIsCurrent.java (working copy) @@ -18,13 +18,11 @@ */ import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; import org.apache.lucene.util.*; import org.apache.lucene.store.*; -import static org.junit.Assert.*; import org.junit.Test; import java.io.IOException; Index: lucene/src/test/org/apache/lucene/index/TestRollback.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestRollback.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestRollback.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; import org.apache.lucene.store.Directory; Index: lucene/src/test/org/apache/lucene/index/TestNoMergeScheduler.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestNoMergeScheduler.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestNoMergeScheduler.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import static org.junit.Assert.*; - import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; Index: lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestPersistentSnapshotDeletionPolicy.java (working copy) @@ -17,8 +17,6 @@ * the License. */ -import static org.junit.Assert.*; - import java.io.IOException; import java.util.Map; import java.util.Map.Entry; Index: lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestIndexWriterConfig.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import static org.junit.Assert.*; - import java.io.IOException; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -32,7 +30,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.DefaultSimilarity; import org.apache.lucene.search.Similarity; -import org.apache.lucene.store.Directory; import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; Index: lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestThreadedOptimize.java (working copy) @@ -21,16 +21,13 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexWriterConfig.OpenMode; -import org.apache.lucene.util._TestUtil; import org.apache.lucene.util.English; import org.apache.lucene.util.LuceneTestCase; -import java.io.File; import java.util.Random; public class TestThreadedOptimize extends LuceneTestCase { Index: lucene/src/test/org/apache/lucene/index/TestByteSlices.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestByteSlices.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestByteSlices.java (working copy) @@ -14,8 +14,6 @@ * limitations under the License. */ -import java.util.concurrent.locks.ReentrantLock; - import org.apache.lucene.util.ByteBlockPool; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.RecyclingByteBlockAllocator; Index: lucene/src/test/org/apache/lucene/index/TestNRTThreads.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestNRTThreads.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestNRTThreads.java (working copy) @@ -45,9 +45,6 @@ import org.apache.lucene.util._TestUtil; import org.junit.Test; -import static org.junit.Assert.*; -import static org.junit.Assume.*; - // TODO // - mix in optimize, addIndexes // - randomoly mix in non-congruent docs Index: lucene/src/test/org/apache/lucene/index/TestIndexCommit.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestIndexCommit.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestIndexCommit.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import static org.junit.Assert.*; - import java.io.IOException; import java.util.Collection; import java.util.Map; Index: lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestNoDeletionPolicy.java (working copy) @@ -17,17 +17,12 @@ * limitations under the License. */ -import static org.junit.Assert.*; - import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; -import java.util.Random; - import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; import org.apache.lucene.store.Directory; Index: lucene/src/test/org/apache/lucene/index/TestStressIndexing.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestStressIndexing.java (working copy) @@ -23,8 +23,6 @@ import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.*; -import java.io.File; - public class TestStressIndexing extends LuceneTestCase { private static abstract class TimedThread extends Thread { volatile boolean failed; Index: lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java =================================================================== --- lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/codecs/preflex/TestSurrogates.java (working copy) @@ -27,7 +27,6 @@ import java.util.*; import java.io.IOException; -import static org.junit.Assert.*; import org.junit.Test; public class TestSurrogates extends LuceneTestCase { Index: lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java =================================================================== --- lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/index/TestParallelReaderEmptyIndex.java (working copy) @@ -25,7 +25,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.Field; import org.apache.lucene.document.Field.Index; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.Field.TermVector; Index: lucene/src/test/org/apache/lucene/store/TestCopyBytes.java =================================================================== --- lucene/src/test/org/apache/lucene/store/TestCopyBytes.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/store/TestCopyBytes.java (working copy) @@ -22,7 +22,6 @@ import org.apache.lucene.util._TestUtil; import org.junit.Test; -import static org.junit.Assert.*; public class TestCopyBytes extends LuceneTestCase { Index: lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java =================================================================== --- lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/store/TestFileSwitchDirectory.java (working copy) @@ -26,7 +26,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.LogMergePolicy; import org.apache.lucene.index.TestIndexWriterReader; import org.apache.lucene.util.LuceneTestCase; Index: lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java =================================================================== --- lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java (working copy) @@ -32,7 +32,6 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.LogMergePolicy; import org.apache.lucene.index.Term; import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.search.IndexSearcher; Index: lucene/src/test/org/apache/lucene/util/TestSetOnce.java =================================================================== --- lucene/src/test/org/apache/lucene/util/TestSetOnce.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/util/TestSetOnce.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import static org.junit.Assert.*; - import java.util.Random; import org.apache.lucene.util.SetOnce.AlreadySetException; Index: lucene/src/test/org/apache/lucene/util/TestCharacterUtils.java =================================================================== --- lucene/src/test/org/apache/lucene/util/TestCharacterUtils.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/util/TestCharacterUtils.java (working copy) @@ -17,9 +17,6 @@ * limitations under the License. */ -import static org.junit.Assert.*; -import static org.apache.lucene.util.LuceneTestCase.TEST_VERSION_CURRENT; - import java.io.IOException; import java.io.Reader; import java.io.StringReader; Index: lucene/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java =================================================================== --- lucene/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java (revision 1052896) +++ lucene/src/test/org/apache/lucene/util/TestRecyclingByteBlockAllocator.java (working copy) @@ -2,11 +2,8 @@ import java.util.ArrayList; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.ReentrantLock; - import org.junit.Before; import org.junit.Test; Index: lucene/src/java/org/apache/lucene/queryParser/QueryParser.java =================================================================== --- lucene/src/java/org/apache/lucene/queryParser/QueryParser.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/queryParser/QueryParser.java (working copy) @@ -1,41 +1,18 @@ /* Generated By:JavaCC: Do not edit this line. QueryParser.java */ package org.apache.lucene.queryParser; -import java.io.IOException; import java.io.StringReader; -import java.text.Collator; -import java.text.DateFormat; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CachingTokenFilter; -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.document.DateTools; -import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.FuzzyQuery; -import org.apache.lucene.search.MultiTermQuery; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.MultiPhraseQuery; -import org.apache.lucene.search.PhraseQuery; -import org.apache.lucene.search.PrefixQuery; -import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.WildcardQuery; -import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; -import org.apache.lucene.util.VirtualMethod; /** * This class is generated by JavaCC. The most important method is @@ -500,12 +477,6 @@ finally { jj_save(0, xla); } } - private boolean jj_3R_3() { - if (jj_scan_token(STAR)) return true; - if (jj_scan_token(COLON)) return true; - return false; - } - private boolean jj_3R_2() { if (jj_scan_token(TERM)) return true; if (jj_scan_token(COLON)) return true; @@ -522,6 +493,12 @@ return false; } + private boolean jj_3R_3() { + if (jj_scan_token(STAR)) return true; + if (jj_scan_token(COLON)) return true; + return false; + } + /** Generated Token Manager. */ public QueryParserTokenManager token_source; /** Current token. */ Index: lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj =================================================================== --- lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj (revision 1052896) +++ lucene/src/java/org/apache/lucene/queryParser/QueryParser.jj (working copy) @@ -25,41 +25,18 @@ package org.apache.lucene.queryParser; -import java.io.IOException; import java.io.StringReader; -import java.text.Collator; -import java.text.DateFormat; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CachingTokenFilter; -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.document.DateTools; -import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.FuzzyQuery; -import org.apache.lucene.search.MultiTermQuery; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.MultiPhraseQuery; -import org.apache.lucene.search.PhraseQuery; -import org.apache.lucene.search.PrefixQuery; -import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.WildcardQuery; -import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; -import org.apache.lucene.util.VirtualMethod; /** * This class is generated by JavaCC. The most important method is Index: lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java =================================================================== --- lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/queryParser/QueryParserBase.java (working copy) @@ -36,7 +36,7 @@ import org.apache.lucene.util.Version; /** This class is overridden by QueryParser in QueryParser.jj - * and acts to eparate the majority of the Java code from the .jj grammar file. + * and acts to separate the majority of the Java code from the .jj grammar file. */ public abstract class QueryParserBase { Index: lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java =================================================================== --- lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/queryParser/QueryParserTokenManager.java (working copy) @@ -1,39 +1,16 @@ /* Generated By:JavaCC: Do not edit this line. QueryParserTokenManager.java */ package org.apache.lucene.queryParser; -import java.io.IOException; import java.io.StringReader; -import java.text.Collator; -import java.text.DateFormat; import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import org.apache.lucene.analysis.CachingTokenFilter; -import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.PositionIncrementAttribute; -import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.document.DateTools; -import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause; -import org.apache.lucene.search.BooleanQuery; -import org.apache.lucene.search.FuzzyQuery; -import org.apache.lucene.search.MultiTermQuery; -import org.apache.lucene.search.MatchAllDocsQuery; -import org.apache.lucene.search.MultiPhraseQuery; -import org.apache.lucene.search.PhraseQuery; -import org.apache.lucene.search.PrefixQuery; -import org.apache.lucene.search.RegexpQuery; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermRangeQuery; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.WildcardQuery; -import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.Version; -import org.apache.lucene.util.VirtualMethod; /** Token Manager. */ public class QueryParserTokenManager implements QueryParserConstants Index: lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java =================================================================== --- lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeImpl; -import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.NumericUtils; import org.apache.lucene.document.NumericField; // for javadocs Index: lucene/src/java/org/apache/lucene/search/ScoringRewrite.java =================================================================== --- lucene/src/java/org/apache/lucene/search/ScoringRewrite.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/ScoringRewrite.java (working copy) @@ -18,21 +18,12 @@ */ import java.io.IOException; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.PriorityQueue; -import java.util.Comparator; - import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermsEnum; import org.apache.lucene.search.MultiTermQuery.RewriteMethod; import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.AttributeSource; import org.apache.lucene.util.ByteBlockPool; import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.BytesRefHash; Index: lucene/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java =================================================================== --- lucene/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/payloads/AveragePayloadFunction.java (working copy) @@ -1,6 +1,5 @@ package org.apache.lucene.search.payloads; -import java.io.IOException; import org.apache.lucene.search.Explanation; /** * Licensed to the Apache Software Foundation (ASF) under one or more Index: lucene/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java =================================================================== --- lucene/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/spans/SpanNearPayloadCheckQuery.java (working copy) @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; -import java.util.Iterator; /** Index: lucene/src/java/org/apache/lucene/search/PhraseScorer.java =================================================================== --- lucene/src/java/org/apache/lucene/search/PhraseScorer.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/PhraseScorer.java (working copy) @@ -19,8 +19,6 @@ import java.io.IOException; -import org.apache.lucene.search.BooleanClause.Occur; - /** Expert: Scoring functionality for phrase queries. *
A document is considered matching if it contains the phrase-query terms * at "valid" positions. What "valid positions" are Index: lucene/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttributeImpl.java =================================================================== --- lucene/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttributeImpl.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/MaxNonCompetitiveBoostAttributeImpl.java (working copy) @@ -17,7 +17,6 @@ * limitations under the License. */ -import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeImpl; import org.apache.lucene.util.BytesRef; Index: lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/TermCollectingRewrite.java (working copy) @@ -18,7 +18,6 @@ */ import java.io.IOException; -import java.io.Serializable; import java.util.ArrayList; import java.util.List; import java.util.Comparator; Index: lucene/src/java/org/apache/lucene/search/QueryTermVector.java =================================================================== --- lucene/src/java/org/apache/lucene/search/QueryTermVector.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/QueryTermVector.java (working copy) @@ -28,7 +28,6 @@ import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.TokenStream; -import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute; import org.apache.lucene.index.TermFreqVector; import org.apache.lucene.util.ArrayUtil; Index: lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java =================================================================== --- lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/ExactPhraseScorer.java (working copy) @@ -21,7 +21,6 @@ import java.util.Arrays; import org.apache.lucene.index.*; -import org.apache.lucene.search.BooleanClause.Occur; final class ExactPhraseScorer extends Scorer { private final byte[] norms; Index: lucene/src/java/org/apache/lucene/search/TermScorer.java =================================================================== --- lucene/src/java/org/apache/lucene/search/TermScorer.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/TermScorer.java (working copy) @@ -20,7 +20,6 @@ import java.io.IOException; import org.apache.lucene.index.DocsEnum; -import org.apache.lucene.search.BooleanClause.Occur; /** Expert: A Scorer for documents matching a Term. */ Index: lucene/src/java/org/apache/lucene/search/BoostAttributeImpl.java =================================================================== --- lucene/src/java/org/apache/lucene/search/BoostAttributeImpl.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/search/BoostAttributeImpl.java (working copy) @@ -17,7 +17,6 @@ * limitations under the License. */ -import org.apache.lucene.util.Attribute; import org.apache.lucene.util.AttributeImpl; /** Implementation class for {@link BoostAttribute}. Index: lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java =================================================================== --- lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java (working copy) @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.HashSet; Index: lucene/src/java/org/apache/lucene/store/DataInput.java =================================================================== --- lucene/src/java/org/apache/lucene/store/DataInput.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/store/DataInput.java (working copy) @@ -21,9 +21,6 @@ import java.util.HashMap; import java.util.Map; -import org.apache.lucene.util.ArrayUtil; -import org.apache.lucene.util.RamUsageEstimator; - /** * Abstract base class for performing read operations of Lucene's low-level * data types. Index: lucene/src/java/org/apache/lucene/store/FSDirectory.java =================================================================== --- lucene/src/java/org/apache/lucene/store/FSDirectory.java (revision 1052896) +++ lucene/src/java/org/apache/lucene/store/FSDirectory.java (working copy) @@ -26,7 +26,6 @@ import java.security.NoSuchAlgorithmException; import java.util.Collection; -import java.util.Collections; import static java.util.Collections.synchronizedSet; import java.util.HashSet; import java.util.Set; Index: lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java =================================================================== --- lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java (revision 1052896) +++ lucene/contrib/queryparser/src/java/org/apache/lucene/queryParser/standard/processors/LowercaseExpandedTermsQueryNodeProcessor.java (working copy) @@ -21,7 +21,6 @@ import org.apache.lucene.queryParser.core.QueryNodeException; import org.apache.lucene.queryParser.core.config.QueryConfigHandler; -import org.apache.lucene.queryParser.core.nodes.FieldQueryNode; import org.apache.lucene.queryParser.core.nodes.FuzzyQueryNode; import org.apache.lucene.queryParser.core.nodes.ParametricQueryNode; import org.apache.lucene.queryParser.core.nodes.QueryNode; Index: lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java =================================================================== --- lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java (revision 1052896) +++ lucene/contrib/wordnet/src/test/org/apache/lucene/wordnet/TestSynonymTokenFilter.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.Reader; @@ -27,8 +25,6 @@ import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.BaseTokenStreamTestCase; -import org.apache.lucene.analysis.core.LowerCaseFilter; -import org.apache.lucene.analysis.core.WhitespaceTokenizer; public class TestSynonymTokenFilter extends BaseTokenStreamTestCase { final String testFile = "testSynonyms.txt"; Index: lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java =================================================================== --- lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (revision 1052896) +++ lucene/contrib/demo/src/java/org/apache/lucene/demo/SearchFiles.java (working copy) @@ -20,7 +20,6 @@ import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.Date; Index: lucene/contrib/demo/src/java/org/apache/lucene/demo/FileDocument.java =================================================================== --- lucene/contrib/demo/src/java/org/apache/lucene/demo/FileDocument.java (revision 1052896) +++ lucene/contrib/demo/src/java/org/apache/lucene/demo/FileDocument.java (working copy) @@ -19,7 +19,6 @@ import java.io.File; import java.io.FileInputStream; -import java.io.FileReader; import java.io.InputStreamReader; import org.apache.lucene.document.DateTools; Index: lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java =================================================================== --- lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java (revision 1052896) +++ lucene/contrib/instantiated/src/test/org/apache/lucene/store/instantiated/TestEmptyIndex.java (working copy) @@ -18,8 +18,6 @@ import java.io.IOException; import java.util.Arrays; -import java.util.Random; - import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; Index: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java =================================================================== --- lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java (revision 1052896) +++ lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedIndexWriter.java (working copy) @@ -39,7 +39,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Fieldable; import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.Term; import org.apache.lucene.index.TermVectorOffsetInfo; import org.apache.lucene.search.Similarity; Index: lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java =================================================================== --- lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java (revision 1052896) +++ lucene/contrib/instantiated/src/java/org/apache/lucene/store/instantiated/InstantiatedDocsAndPositionsEnum.java (working copy) @@ -19,7 +19,6 @@ import org.apache.lucene.index.DocsAndPositionsEnum; import org.apache.lucene.util.Bits; import org.apache.lucene.util.BytesRef; -import java.util.Arrays; public class InstantiatedDocsAndPositionsEnum extends DocsAndPositionsEnum { private int upto; Index: lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java =================================================================== --- lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java (revision 1052896) +++ lucene/contrib/benchmark/src/test/org/apache/lucene/benchmark/byTask/tasks/CreateIndexTaskTest.java (working copy) @@ -19,20 +19,15 @@ import java.io.ByteArrayOutputStream; import java.io.File; -import java.io.IOException; import java.io.PrintStream; import java.util.Properties; import org.apache.lucene.benchmark.BenchmarkTestCase; import org.apache.lucene.benchmark.byTask.PerfRunData; import org.apache.lucene.benchmark.byTask.utils.Config; -import org.apache.lucene.index.CorruptIndexException; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig.OpenMode; import org.apache.lucene.index.NoDeletionPolicy; import org.apache.lucene.index.NoMergePolicy; import org.apache.lucene.index.NoMergeScheduler; -import org.apache.lucene.store.LockObtainFailedException; import org.apache.lucene.util.Version; Index: lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java =================================================================== --- lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java (revision 1052896) +++ lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchWithCollectorTask.java (working copy) @@ -22,8 +22,6 @@ import org.apache.lucene.search.Collector; import org.apache.lucene.search.TopScoreDocCollector; -import java.io.IOException; - /** * Does search w/ a custom collector */ Index: lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java =================================================================== --- lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java (revision 1052896) +++ lucene/contrib/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DemoHTMLParser.java (working copy) @@ -19,7 +19,6 @@ import java.io.IOException; import java.io.Reader; -import java.io.StringReader; import java.text.DateFormat; import java.text.ParseException; import java.util.Date; Index: lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java =================================================================== --- lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java (revision 1052896) +++ lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteCachingWrapperFilter.java (working copy) @@ -31,8 +31,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - /** * Tests that the index is cached on the searcher side of things. */ Index: lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java =================================================================== --- lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java (revision 1052896) +++ lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSort.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import static org.junit.Assert.assertEquals; - import java.io.IOException; import java.util.HashMap; import java.util.Iterator; @@ -30,7 +28,6 @@ import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.LogMergePolicy; import org.apache.lucene.index.Term; import org.apache.lucene.store.Directory; import org.apache.lucene.util.BytesRef; Index: lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java =================================================================== --- lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java (revision 1052896) +++ lucene/contrib/remote/src/test/org/apache/lucene/search/TestRemoteSearchable.java (working copy) @@ -26,8 +26,6 @@ import org.junit.BeforeClass; import org.junit.Test; -import static org.junit.Assert.*; - import java.util.Collections; import java.util.Set; import java.util.HashSet; Index: lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java =================================================================== --- lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (revision 1052896) +++ lucene/contrib/misc/src/test/org/apache/lucene/misc/TestHighFreqTerms.java (working copy) @@ -17,8 +17,6 @@ * limitations under the License. */ -import java.util.Random; - import org.apache.lucene.index.IndexReader; import org.apache.lucene.index.IndexWriter; import org.apache.lucene.util.BytesRef; Index: lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/TestDistanceUnits.java =================================================================== --- lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/TestDistanceUnits.java (revision 1052896) +++ lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geometry/TestDistanceUnits.java (working copy) @@ -1,7 +1,5 @@ package org.apache.lucene.spatial.geometry; -import static junit.framework.Assert.*; - import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; Index: lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/TestGeoHashUtils.java =================================================================== --- lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/TestGeoHashUtils.java (revision 1052896) +++ lucene/contrib/spatial/src/test/org/apache/lucene/spatial/geohash/TestGeoHashUtils.java (working copy) @@ -17,8 +17,6 @@ package org.apache.lucene.spatial.geohash; -import static junit.framework.Assert.*; - import org.apache.lucene.util.LuceneTestCase; import org.junit.Test; Index: lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SuggestWord.java =================================================================== --- lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SuggestWord.java (revision 1052896) +++ lucene/contrib/spellchecker/src/java/org/apache/lucene/search/spell/SuggestWord.java (working copy) @@ -1,8 +1,6 @@ package org.apache.lucene.search.spell; -import java.util.Comparator; - /** * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with Index: lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java =================================================================== --- lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (revision 1052896) +++ lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java (working copy) @@ -18,8 +18,6 @@ */ import java.util.HashSet; -import java.util.Random; - import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.index.IndexReader;