lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbern...@apache.org
Subject [3/3] lucene-solr:branch_6x: SOLR-9252: Pre-commit fixes
Date Wed, 03 Aug 2016 18:14:42 GMT
SOLR-9252: Pre-commit fixes


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/728b4fbc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/728b4fbc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/728b4fbc

Branch: refs/heads/branch_6x
Commit: 728b4fbcdcf3682b2b1d571d088c0fbb78850606
Parents: e38d6d5
Author: jbernste <jbernste@apache.org>
Authored: Wed Aug 3 11:38:48 2016 -0400
Committer: jbernste <jbernste@apache.org>
Committed: Wed Aug 3 13:37:26 2016 -0400

----------------------------------------------------------------------
 .../java/org/apache/solr/search/IGainTermsQParserPlugin.java    | 5 +++--
 .../apache/solr/search/TextLogisticRegressionQParserPlugin.java | 4 ++--
 .../apache/solr/client/solrj/io/ClassificationEvaluation.java   | 4 ++--
 .../solr/client/solrj/io/stream/FeaturesSelectionStream.java    | 4 ++--
 .../org/apache/solr/client/solrj/io/stream/TextLogitStream.java | 5 ++---
 .../solr/client/solrj/io/stream/StreamExpressionTest.java       | 5 -----
 6 files changed, 11 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/728b4fbc/solr/core/src/java/org/apache/solr/search/IGainTermsQParserPlugin.java
----------------------------------------------------------------------
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 6c99813..ee8cf67 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;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/728b4fbc/solr/core/src/java/org/apache/solr/search/TextLogisticRegressionQParserPlugin.java
----------------------------------------------------------------------
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 e8fbaf6..0ca9f72 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;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/728b4fbc/solr/solrj/src/java/org/apache/solr/client/solrj/io/ClassificationEvaluation.java
----------------------------------------------------------------------
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 470f985..f1b0bf9 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;
 

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/728b4fbc/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
----------------------------------------------------------------------
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 007e3d8..e9949da 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;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/728b4fbc/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
----------------------------------------------------------------------
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 f49168f..ac4550b 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;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/728b4fbc/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamExpressionTest.java
----------------------------------------------------------------------
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 74e7fb1..7c3a3a6 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;


Mime
View raw message