From 73de207201f43b1d8d3f3623dd12dd0ae2f9605c Mon Sep 17 00:00:00 2001 From: jbernste Date: Wed, 3 Aug 2016 11:38:48 -0400 Subject: [PATCH] SOLR-9252: Pre-commit fixes --- .../java/org/apache/solr/search/IGainTermsQParserPlugin.java | 5 +++-- .../solr/search/TextLogisticRegressionQParserPlugin.java | 4 ++-- .../solr/client/solrj/io/ClassificationEvaluation.java | 4 ++-- .../solr/client/solrj/io/stream/FeaturesSelectionStream.java | 4 ++-- .../apache/solr/client/solrj/io/stream/TextLogitStream.java | 5 ++--- .../solr/client/solrj/io/stream/StreamExpressionTest.java | 5 ----- 6 files changed, 11 insertions(+), 16 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java index 6c99813029b..ee8cf67a6e4 100644 --- a/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,9 @@ package org.apache.solr.search; * limitations under the License. */ +package org.apache.solr.search; + + import java.io.IOException; import java.util.TreeSet; diff --git a/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java index e8fbaf66aa0..0ca9f723f32 100644 --- a/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java +++ b/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java @@ -1,5 +1,3 @@ -package org.apache.solr.search; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.search; * limitations under the License. */ +package org.apache.solr.search; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java index 470f985e312..f1b0bf98bda 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.io; * limitations under the License. */ +package org.apache.solr.client.solrj.io; + import java.util.HashMap; import java.util.Map; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java index 007e3d8a88c..e9949da145c 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.io.stream; * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java index f49168f560b..ac4550b716b 100644 --- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java +++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java @@ -1,5 +1,3 @@ -package org.apache.solr.client.solrj.io.stream; - /* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with @@ -17,6 +15,8 @@ package org.apache.solr.client.solrj.io.stream; * limitations under the License. */ +package org.apache.solr.client.solrj.io.stream; + import java.io.IOException; import java.util.ArrayList; import java.util.Collection; @@ -34,7 +34,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import org.apache.solr.client.solrj.SolrRequest; -import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.impl.CloudSolrClient; import org.apache.solr.client.solrj.impl.HttpSolrClient; import org.apache.solr.client.solrj.io.ClassificationEvaluation; diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java index 74e7fb1b819..7c3a3a6e0c0 100644 --- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java +++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java @@ -16,18 +16,13 @@ */ package org.apache.solr.client.solrj.io.stream; -import java.io.BufferedReader; import java.io.IOException; -import java.io.InputStreamReader; import java.util.ArrayList; import java.util.Collections; -import java.util.Enumeration; import java.util.HashSet; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.zip.ZipEntry; -import java.util.zip.ZipFile; import org.apache.lucene.util.LuceneTestCase; import org.apache.lucene.util.LuceneTestCase.Slow;