You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2018/01/08 20:22:09 UTC
[1/4] lucene-solr:branch_7x: SOLR-11809: QueryComponent.prepare rq
parsing could fail under SOLR 7.2.0 - fix: QueryComponent's rq parameter
parsing no longer considers the defType parameter. (Christine Poerschke and
David Smiley in response to bug report
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 9f3d7ef16 -> 8e30b2a8a
SOLR-11809: QueryComponent.prepare rq parsing could fail under SOLR 7.2.0 - fix:
QueryComponent's rq parameter parsing no longer considers the defType parameter.
(Christine Poerschke and David Smiley in response to bug report/analysis from Dariusz Wojtas and Diego Ceccarelli)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/64374777
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/64374777
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/64374777
Branch: refs/heads/branch_7x
Commit: 6437477706b818e2c77f7e3a93ab1b2725f0563e
Parents: 9f3d7ef
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jan 8 19:44:05 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jan 8 20:07:42 2018 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 7 ++++
.../solr/handler/component/QueryComponent.java | 2 +-
.../solr/search/TestReRankQParserPlugin.java | 41 ++++++++++++++++++++
3 files changed, 49 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/64374777/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d06bfeb..2d676eb 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -40,6 +40,8 @@ Upgrade Notes
* SOLR-11798: The top-level <highlighting> syntax in solrconfig.xml is now formally
deprecated in favour of <searchComponent> equivalent syntax. See also SOLR-1696.
+* SOLR-11809: QueryComponent's rq parameter parsing no longer considers the defType parameter.
+
New Features
----------------------
* SOLR-11285: Simulation framework for autoscaling. (ab)
@@ -111,6 +113,11 @@ Bug Fixes
* SOLR-11771: Overseer can never process some last messages (Cao Manh Dat)
+* SOLR-11809: QueryComponent.prepare rq parsing could fail under SOLR 7.2.0 - fix:
+ QueryComponent's rq parameter parsing no longer considers the defType parameter.
+ (Christine Poerschke and David Smiley in response to bug report/analysis
+ from Dariusz Wojtas and Diego Ceccarelli)
+
================== 7.2.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/64374777/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index f27b386..ec3c79b 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -167,7 +167,7 @@ public class QueryComponent extends SearchComponent
String rankQueryString = rb.req.getParams().get(CommonParams.RQ);
if(rankQueryString != null) {
- QParser rqparser = QParser.getParser(rankQueryString, defType, req);
+ QParser rqparser = QParser.getParser(rankQueryString, req);
Query rq = rqparser.getQuery();
if(rq instanceof RankQuery) {
RankQuery rankQuery = (RankQuery)rq;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/64374777/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
index 0fd1a4a..93673d2 100644
--- a/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
+++ b/solr/core/src/test/org/apache/solr/search/TestReRankQParserPlugin.java
@@ -605,4 +605,45 @@ public class TestReRankQParserPlugin extends SolrTestCaseJ4 {
}
}
+ @Test
+ public void testReRankQueriesWithDefType() throws Exception {
+
+ assertU(delQ("*:*"));
+ assertU(commit());
+
+ final String[] doc1 = {"id","1"};
+ assertU(adoc(doc1));
+ assertU(commit());
+ final String[] doc2 = {"id","2"};
+ assertU(adoc(doc2));
+ assertU(commit());
+
+ final String preferredDocId;
+ final String lessPreferrredDocId;
+ if (random().nextBoolean()) {
+ preferredDocId = "1";
+ lessPreferrredDocId = "2";
+ } else {
+ preferredDocId = "2";
+ lessPreferrredDocId = "1";
+ }
+
+ for (final String defType : new String[] {
+ null,
+ LuceneQParserPlugin.NAME,
+ ExtendedDismaxQParserPlugin.NAME
+ }) {
+ final ModifiableSolrParams params = new ModifiableSolrParams();
+ params.add("rq", "{!"+ReRankQParserPlugin.NAME+" "+ReRankQParserPlugin.RERANK_QUERY+"=id:"+preferredDocId+"}");
+ params.add("q", "*:*");
+ if (defType != null) {
+ params.add(QueryParsing.DEFTYPE, defType);
+ }
+ assertQ(req(params), "*[count(//doc)=2]",
+ "//result/doc[1]/str[@name='id'][.='"+preferredDocId+"']",
+ "//result/doc[2]/str[@name='id'][.='"+lessPreferrredDocId+"']"
+ );
+ }
+ }
+
}
[4/4] lucene-solr:branch_7x: Revert "SOLR-10783: add (partial)
package-info.java to fix precommit"
Posted by cp...@apache.org.
Revert "SOLR-10783: add (partial) package-info.java to fix precommit"
This reverts commit a63c5675bbbd45604025b72149250cee8bb8a254.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8e30b2a8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8e30b2a8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8e30b2a8
Branch: refs/heads/branch_7x
Commit: 8e30b2a8acbb26543b307ff0838be680bb9cc5eb
Parents: 88bcf22
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jan 8 20:20:20 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jan 8 20:20:20 2018 +0000
----------------------------------------------------------------------
.../configuration/providers/package-info.java | 23 --------------------
1 file changed, 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8e30b2a8/solr/core/src/java/org/apache/solr/util/configuration/providers/package-info.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/configuration/providers/package-info.java b/solr/core/src/java/org/apache/solr/util/configuration/providers/package-info.java
deleted file mode 100644
index 7b5e8f8..0000000
--- a/solr/core/src/java/org/apache/solr/util/configuration/providers/package-info.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * TODO
- */
-package org.apache.solr.util.configuration.providers;
-
-
[2/4] lucene-solr:branch_7x: LUCENE-8115: remove
unnecessary-on-its-own {@inheritDoc} annotations.
Posted by cp...@apache.org.
LUCENE-8115: remove unnecessary-on-its-own {@inheritDoc} annotations.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e10f5d2c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e10f5d2c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e10f5d2c
Branch: refs/heads/branch_7x
Commit: e10f5d2cfbf7f2fe3419ee28904b412595f8f2b4
Parents: 6437477
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jan 8 19:45:19 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jan 8 20:07:54 2018 +0000
----------------------------------------------------------------------
.../analysis/commongrams/CommonGramsFilter.java | 3 -
.../commongrams/CommonGramsQueryFilter.java | 3 -
.../miscellaneous/FingerprintFilter.java | 3 -
.../miscellaneous/HyphenatedWordsFilter.java | 6 --
.../RemoveDuplicatesTokenFilter.java | 6 --
.../ja/JapaneseIterationMarkCharFilter.java | 6 --
.../lucene/classification/BM25NBClassifier.java | 9 ---
.../BooleanPerceptronClassifier.java | 9 ---
.../classification/KNearestFuzzyClassifier.java | 9 ---
.../KNearestNeighborClassifier.java | 9 ---
.../SimpleNaiveBayesClassifier.java | 9 ---
.../KNearestNeighborDocumentClassifier.java | 9 ---
.../SimpleNaiveBayesDocumentClassifier.java | 9 ---
.../handler/DocumentAnalysisRequestHandler.java | 3 -
.../handler/FieldAnalysisRequestHandler.java | 3 -
.../handler/component/StatsValuesFactory.java | 60 --------------------
.../java/org/apache/solr/search/Grouping.java | 51 -----------------
.../SearchGroupsRequestFactory.java | 3 -
.../TopGroupsShardRequestFactory.java | 3 -
.../SearchGroupShardResponseProcessor.java | 3 -
.../StoredFieldsShardResponseProcessor.java | 3 -
.../TopGroupsShardResponseProcessor.java | 3 -
.../SearchGroupsResultTransformer.java | 6 --
.../TopGroupsResultTransformer.java | 6 --
.../GroupedEndResultTransformer.java | 3 -
.../MainEndResultTransformer.java | 3 -
.../SimpleEndResultTransformer.java | 3 -
.../solrj/request/DocumentAnalysisRequest.java | 3 -
.../solrj/request/FieldAnalysisRequest.java | 3 -
.../response/DocumentAnalysisResponse.java | 3 -
.../solrj/response/FieldAnalysisResponse.java | 3 -
.../solrj/response/schema/SchemaResponse.java | 39 -------------
32 files changed, 294 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
index c01e263..f32b8c0 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsFilter.java
@@ -123,9 +123,6 @@ public final class CommonGramsFilter extends TokenFilter {
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void reset() throws IOException {
super.reset();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
index 9307e7b..e8c98b7 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/commongrams/CommonGramsQueryFilter.java
@@ -62,9 +62,6 @@ public final class CommonGramsQueryFilter extends TokenFilter {
super(input);
}
- /**
- * {@inheritDoc}
- */
@Override
public void reset() throws IOException {
super.reset();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java
index 7cbd6f8..dfe06c8 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/FingerprintFilter.java
@@ -204,9 +204,6 @@ public class FingerprintFilter extends TokenFilter {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void reset() throws IOException {
super.reset();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
index 6c53aa3..ff5d311 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/HyphenatedWordsFilter.java
@@ -71,9 +71,6 @@ public final class HyphenatedWordsFilter extends TokenFilter {
super(in);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean incrementToken() throws IOException {
while (!exhausted && input.incrementToken()) {
@@ -112,9 +109,6 @@ public final class HyphenatedWordsFilter extends TokenFilter {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void reset() throws IOException {
super.reset();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java
index 457087c..69a7759 100644
--- a/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java
+++ b/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/RemoveDuplicatesTokenFilter.java
@@ -43,9 +43,6 @@ public final class RemoveDuplicatesTokenFilter extends TokenFilter {
super(in);
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean incrementToken() throws IOException {
while (input.incrementToken()) {
@@ -71,9 +68,6 @@ public final class RemoveDuplicatesTokenFilter extends TokenFilter {
return false;
}
- /**
- * {@inheritDoc}
- */
@Override
public void reset() throws IOException {
super.reset();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java
----------------------------------------------------------------------
diff --git a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java
index 4f768b7..7e1d7a1 100644
--- a/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java
+++ b/lucene/analysis/kuromoji/src/java/org/apache/lucene/analysis/ja/JapaneseIterationMarkCharFilter.java
@@ -166,9 +166,6 @@ public class JapaneseIterationMarkCharFilter extends CharFilter {
buffer.reset(input);
}
- /**
- * {@inheritDoc}
- */
@Override
public int read(char[] buffer, int offset, int length) throws IOException {
int read = 0;
@@ -185,9 +182,6 @@ public class JapaneseIterationMarkCharFilter extends CharFilter {
return read == 0 ? -1 : read;
}
- /**
- * {@inheritDoc}
- */
@Override
public int read() throws IOException {
int ic = buffer.get(bufferPosition);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
index 1a74416..f03fc53 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/BM25NBClassifier.java
@@ -99,17 +99,11 @@ public class BM25NBClassifier implements Classifier<BytesRef> {
this.query = query;
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassificationResult<BytesRef> assignClass(String inputDocument) throws IOException {
return assignClassNormalizedList(inputDocument).get(0);
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(String text) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignClassNormalizedList(text);
@@ -117,9 +111,6 @@ public class BM25NBClassifier implements Classifier<BytesRef> {
return assignedClasses;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(String text, int max) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignClassNormalizedList(text);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java
index 928c036..394d15f 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/BooleanPerceptronClassifier.java
@@ -195,9 +195,6 @@ public class BooleanPerceptronClassifier implements Classifier<Boolean> {
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassificationResult<Boolean> assignClass(String text)
throws IOException {
@@ -220,18 +217,12 @@ public class BooleanPerceptronClassifier implements Classifier<Boolean> {
return new ClassificationResult<>(output >= bias, score);
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<Boolean>> getClasses(String text)
throws IOException {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<Boolean>> getClasses(String text, int max)
throws IOException {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
index cbd241b..4679fcd 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/KNearestFuzzyClassifier.java
@@ -103,9 +103,6 @@ public class KNearestFuzzyClassifier implements Classifier<BytesRef> {
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassificationResult<BytesRef> assignClass(String text) throws IOException {
TopDocs knnResults = knnSearch(text);
@@ -121,9 +118,6 @@ public class KNearestFuzzyClassifier implements Classifier<BytesRef> {
return assignedClass;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(String text) throws IOException {
TopDocs knnResults = knnSearch(text);
@@ -132,9 +126,6 @@ public class KNearestFuzzyClassifier implements Classifier<BytesRef> {
return assignedClasses;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(String text, int max) throws IOException {
TopDocs knnResults = knnSearch(text);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
index f0391f4..3d6a675 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/KNearestNeighborClassifier.java
@@ -119,9 +119,6 @@ public class KNearestNeighborClassifier implements Classifier<BytesRef> {
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassificationResult<BytesRef> assignClass(String text) throws IOException {
return classifyFromTopDocs(knnSearch(text));
@@ -143,9 +140,6 @@ public class KNearestNeighborClassifier implements Classifier<BytesRef> {
return assignedClass;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(String text) throws IOException {
TopDocs knnResults = knnSearch(text);
@@ -154,9 +148,6 @@ public class KNearestNeighborClassifier implements Classifier<BytesRef> {
return assignedClasses;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(String text, int max) throws IOException {
TopDocs knnResults = knnSearch(text);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
index 3509df5..a154649 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/SimpleNaiveBayesClassifier.java
@@ -98,9 +98,6 @@ public class SimpleNaiveBayesClassifier implements Classifier<BytesRef> {
this.query = query;
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassificationResult<BytesRef> assignClass(String inputDocument) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignClassNormalizedList(inputDocument);
@@ -115,9 +112,6 @@ public class SimpleNaiveBayesClassifier implements Classifier<BytesRef> {
return assignedClass;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(String text) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignClassNormalizedList(text);
@@ -125,9 +119,6 @@ public class SimpleNaiveBayesClassifier implements Classifier<BytesRef> {
return assignedClasses;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(String text, int max) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignClassNormalizedList(text);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java
index d687722..39684ee 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/document/KNearestNeighborDocumentClassifier.java
@@ -72,17 +72,11 @@ public class KNearestNeighborDocumentClassifier extends KNearestNeighborClassifi
this.field2analyzer = field2analyzer;
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassificationResult<BytesRef> assignClass(Document document) throws IOException {
return classifyFromTopDocs(knnSearch(document));
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(Document document) throws IOException {
TopDocs knnResults = knnSearch(document);
@@ -91,9 +85,6 @@ public class KNearestNeighborDocumentClassifier extends KNearestNeighborClassifi
return assignedClasses;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(Document document, int max) throws IOException {
TopDocs knnResults = knnSearch(document);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java
----------------------------------------------------------------------
diff --git a/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java b/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java
index 6bc8573..f640590 100644
--- a/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java
+++ b/lucene/classification/src/java/org/apache/lucene/classification/document/SimpleNaiveBayesDocumentClassifier.java
@@ -71,9 +71,6 @@ public class SimpleNaiveBayesDocumentClassifier extends SimpleNaiveBayesClassifi
this.field2analyzer = field2analyzer;
}
- /**
- * {@inheritDoc}
- */
@Override
public ClassificationResult<BytesRef> assignClass(Document document) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignNormClasses(document);
@@ -88,9 +85,6 @@ public class SimpleNaiveBayesDocumentClassifier extends SimpleNaiveBayesClassifi
return assignedClass;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(Document document) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignNormClasses(document);
@@ -98,9 +92,6 @@ public class SimpleNaiveBayesDocumentClassifier extends SimpleNaiveBayesClassifi
return assignedClasses;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<ClassificationResult<BytesRef>> getClasses(Document document, int max) throws IOException {
List<ClassificationResult<BytesRef>> assignedClasses = assignNormClasses(document);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
index fd568df..7f67981 100644
--- a/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java
@@ -108,9 +108,6 @@ public class DocumentAnalysisRequestHandler extends AnalysisRequestHandlerBase {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected NamedList doAnalysis(SolrQueryRequest req) throws Exception {
DocumentAnalysisRequest analysisRequest = resolveAnalysisRequest(req);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
index 7c16606..a7e1ab9 100644
--- a/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java
@@ -91,9 +91,6 @@ import java.util.Set;
*/
public class FieldAnalysisRequestHandler extends AnalysisRequestHandlerBase {
- /**
- * {@inheritDoc}
- */
@Override
protected NamedList doAnalysis(SolrQueryRequest req) throws Exception {
FieldAnalysisRequest analysisRequest = resolveAnalysisRequest(req);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
index 752846c..04bd5f4 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
@@ -198,9 +198,6 @@ abstract class AbstractStatsValues<T> implements StatsValues {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accumulate(NamedList stv) {
if (computeCount) {
@@ -260,9 +257,6 @@ abstract class AbstractStatsValues<T> implements StatsValues {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void accumulate(BytesRef value, int count) {
if (null == ft) {
@@ -298,9 +292,6 @@ abstract class AbstractStatsValues<T> implements StatsValues {
updateTypeSpecificStats(value, count);
}
- /**
- * {@inheritDoc}
- */
@Override
public void missing() {
if (computeMissing) {
@@ -308,25 +299,16 @@ abstract class AbstractStatsValues<T> implements StatsValues {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void addMissing(int count) {
missing += count;
}
- /**
- * {@inheritDoc}
- */
@Override
public void addFacet(String facetName, Map<String, StatsValues> facetValues) {
facets.put(facetName, facetValues);
}
- /**
- * {@inheritDoc}
- */
@Override
public NamedList<?> getStatsValues() {
NamedList<Object> res = new SimpleOrderedMap<>();
@@ -377,9 +359,6 @@ abstract class AbstractStatsValues<T> implements StatsValues {
return res;
}
- /**
- * {@inheritDoc}
- */
public void setNextReader(LeafReaderContext ctx) throws IOException {
if (valueSource == null) {
// first time we've collected local values, get the right ValueSource
@@ -503,9 +482,6 @@ class NumericStatsValues extends AbstractStatsValues<Number> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void updateTypeSpecificStats(NamedList stv) {
if (computeSum) {
@@ -522,9 +498,6 @@ class NumericStatsValues extends AbstractStatsValues<Number> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void updateTypeSpecificStats(Number v, int count) {
double value = v.doubleValue();
@@ -539,9 +512,6 @@ class NumericStatsValues extends AbstractStatsValues<Number> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateMinMax(Number min, Number max) {
// we always use the double values, because that way the response Object class is
@@ -645,9 +615,6 @@ class EnumStatsValues extends AbstractStatsValues<EnumFieldValue> {
return hasher.hashInt(v.toInt().intValue()).asLong();
}
- /**
- * {@inheritDoc}
- */
@Override
public void accumulate(int docID) throws IOException {
if (values.exists(docID)) {
@@ -660,9 +627,6 @@ class EnumStatsValues extends AbstractStatsValues<EnumFieldValue> {
}
}
- /**
- * {@inheritDoc}
- */
protected void updateMinMax(EnumFieldValue min, EnumFieldValue max) {
if (computeMin) { // nested if to encourage JIT to optimize aware final var?
if (null != min) {
@@ -680,17 +644,11 @@ class EnumStatsValues extends AbstractStatsValues<EnumFieldValue> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateTypeSpecificStats(NamedList stv) {
// No type specific stats
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateTypeSpecificStats(EnumFieldValue value, int count) {
// No type specific stats
@@ -737,9 +695,6 @@ class DateStatsValues extends AbstractStatsValues<Date> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateTypeSpecificStats(NamedList stv) {
if (computeSum) {
@@ -750,9 +705,6 @@ class DateStatsValues extends AbstractStatsValues<Date> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void updateTypeSpecificStats(Date v, int count) {
long value = v.getTime();
@@ -764,9 +716,6 @@ class DateStatsValues extends AbstractStatsValues<Date> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateMinMax(Date min, Date max) {
if (computeMin) { // nested if to encourage JIT to optimize aware final var?
@@ -846,25 +795,16 @@ class StringStatsValues extends AbstractStatsValues<String> {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateTypeSpecificStats(NamedList stv) {
// No type specific stats
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateTypeSpecificStats(String value, int count) {
// No type specific stats
}
- /**
- * {@inheritDoc}
- */
@Override
protected void updateMinMax(String min, String max) {
if (computeMin) { // nested if to encourage JIT to optimize aware final var?
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/Grouping.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/Grouping.java b/solr/core/src/java/org/apache/solr/search/Grouping.java
index 2214a04..4500464 100644
--- a/solr/core/src/java/org/apache/solr/search/Grouping.java
+++ b/solr/core/src/java/org/apache/solr/search/Grouping.java
@@ -706,17 +706,11 @@ public class Grouping {
TotalHitCountCollector fallBackCollector;
Collection<SearchGroup<BytesRef>> topGroups;
- /**
- * {@inheritDoc}
- */
@Override
protected void prepare() throws IOException {
actualGroupsToFind = getMax(offset, numGroups, maxDoc);
}
- /**
- * {@inheritDoc}
- */
@Override
protected Collector createFirstPassCollector() throws IOException {
// Ok we don't want groups, but do want a total count
@@ -730,9 +724,6 @@ public class Grouping {
return firstPass;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Collector createSecondPassCollector() throws IOException {
if (actualGroupsToFind <= 0) {
@@ -767,18 +758,12 @@ public class Grouping {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public AllGroupHeadsCollector<?> createAllGroupCollector() throws IOException {
Sort sortWithinGroup = withinGroupSort != null ? withinGroupSort : Sort.RELEVANCE;
return AllGroupHeadsCollector.newCollector(new TermGroupSelector(groupBy), sortWithinGroup);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void finish() throws IOException {
result = secondPass != null ? secondPass.getTopGroups(0) : null;
@@ -826,9 +811,6 @@ public class Grouping {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMatches() {
if (result == null && fallBackCollector == null) {
@@ -838,9 +820,6 @@ public class Grouping {
return result != null ? result.totalHitCount : fallBackCollector.getTotalHits();
}
- /**
- * {@inheritDoc}
- */
@Override
protected Integer getNumberOfGroups() {
return allGroupsCollector == null ? null : allGroupsCollector.getGroupCount();
@@ -857,17 +836,11 @@ public class Grouping {
TopDocsCollector topCollector;
FilterCollector collector;
- /**
- * {@inheritDoc}
- */
@Override
protected void prepare() throws IOException {
actualGroupsToFind = getMax(offset, numGroups, maxDoc);
}
- /**
- * {@inheritDoc}
- */
@Override
protected Collector createFirstPassCollector() throws IOException {
DocSet groupFilt = searcher.getDocSet(query);
@@ -885,9 +858,6 @@ public class Grouping {
}
}
- /**
- * {@inheritDoc}
- */
@Override
protected void finish() throws IOException {
TopDocsCollector topDocsCollector = (TopDocsCollector) collector.getDelegate();
@@ -901,9 +871,6 @@ public class Grouping {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMatches() {
return collector.getMatches();
@@ -929,9 +896,6 @@ public class Grouping {
AllGroupsCollector<MutableValue> allGroupsCollector;
Collection<SearchGroup<MutableValue>> topGroups;
- /**
- * {@inheritDoc}
- */
@Override
protected void prepare() throws IOException {
context = ValueSource.newContext(searcher);
@@ -939,9 +903,6 @@ public class Grouping {
actualGroupsToFind = getMax(offset, numGroups, maxDoc);
}
- /**
- * {@inheritDoc}
- */
@Override
protected Collector createFirstPassCollector() throws IOException {
// Ok we don't want groups, but do want a total count
@@ -955,9 +916,6 @@ public class Grouping {
return firstPass;
}
- /**
- * {@inheritDoc}
- */
@Override
protected Collector createSecondPassCollector() throws IOException {
if (actualGroupsToFind <= 0) {
@@ -998,9 +956,6 @@ public class Grouping {
return AllGroupHeadsCollector.newCollector(newSelector(), sortWithinGroup);
}
- /**
- * {@inheritDoc}
- */
@Override
protected void finish() throws IOException {
result = secondPass != null ? secondPass.getTopGroups(0) : null;
@@ -1034,9 +989,6 @@ public class Grouping {
}
}
- /**
- * {@inheritDoc}
- */
@Override
public int getMatches() {
if (result == null && fallBackCollector == null) {
@@ -1046,9 +998,6 @@ public class Grouping {
return result != null ? result.totalHitCount : fallBackCollector.getTotalHits();
}
- /**
- * {@inheritDoc}
- */
@Override
protected Integer getNumberOfGroups() {
return allGroupsCollector == null ? null : allGroupsCollector.getGroupCount();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java
index 0cc5ea7..30dc5c5 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/SearchGroupsRequestFactory.java
@@ -32,9 +32,6 @@ import org.apache.solr.search.grouping.distributed.ShardRequestFactory;
*/
public class SearchGroupsRequestFactory implements ShardRequestFactory {
- /**
- * {@inheritDoc}
- */
@Override
public ShardRequest[] constructRequest(ResponseBuilder rb) {
ShardRequest sreq = new ShardRequest();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java
index 5067c51..57776d9 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/TopGroupsShardRequestFactory.java
@@ -48,9 +48,6 @@ public class TopGroupsShardRequestFactory implements ShardRequestFactory {
*/
public static final String GROUP_NULL_VALUE = "" + ReverseStringFilter.START_OF_HEADING_MARKER;
- /**
- * {@inheritDoc}
- */
@Override
public ShardRequest[] constructRequest(ResponseBuilder rb) {
// If we have a group.query we need to query all shards... Or we move this to the group first phase queries
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
index 18896e0..cc1c87d 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
@@ -47,9 +47,6 @@ import org.apache.solr.search.grouping.distributed.shardresultserializer.SearchG
*/
public class SearchGroupShardResponseProcessor implements ShardResponseProcessor {
- /**
- * {@inheritDoc}
- */
@Override
public void process(ResponseBuilder rb, ShardRequest shardRequest) {
SortSpec groupSortSpec = rb.getGroupingSpec().getGroupSortSpec();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java
index dcb3c61..734a0e0 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/StoredFieldsShardResponseProcessor.java
@@ -31,9 +31,6 @@ import org.apache.solr.search.grouping.distributed.ShardResponseProcessor;
*/
public class StoredFieldsShardResponseProcessor implements ShardResponseProcessor {
- /**
- * {@inheritDoc}
- */
@Override
public void process(ResponseBuilder rb, ShardRequest shardRequest) {
boolean returnScores = (rb.getFieldFlags() & SolrIndexSearcher.GET_SCORES) != 0;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
index 231e9bd..cf02580 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/TopGroupsShardResponseProcessor.java
@@ -49,9 +49,6 @@ import org.apache.solr.search.grouping.distributed.shardresultserializer.TopGrou
*/
public class TopGroupsShardResponseProcessor implements ShardResponseProcessor {
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void process(ResponseBuilder rb, ShardRequest shardRequest) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
index 77dfcef..b424670 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
@@ -45,9 +45,6 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
this.searcher = searcher;
}
- /**
- * {@inheritDoc}
- */
@Override
public NamedList transform(List<Command> data) throws IOException {
final NamedList<NamedList> result = new NamedList<>(data.size());
@@ -73,9 +70,6 @@ public class SearchGroupsResultTransformer implements ShardResultTransformer<Lis
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
public Map<String, SearchGroupsFieldCommandResult> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort withinGroupSort, String shard) {
final Map<String, SearchGroupsFieldCommandResult> result = new HashMap<>(shardResponse.size());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
index 457814c..8d2b3dc 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
@@ -63,9 +63,6 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
this.rb = rb;
}
- /**
- * {@inheritDoc}
- */
@Override
public NamedList transform(List<Command> data) throws IOException {
NamedList<NamedList> result = new NamedList<>();
@@ -88,9 +85,6 @@ public class TopGroupsResultTransformer implements ShardResultTransformer<List<C
return result;
}
- /**
- * {@inheritDoc}
- */
@Override
public Map<String, ?> transformToNative(NamedList<NamedList> shardResponse, Sort groupSort, Sort withinGroupSort, String shard) {
Map<String, Object> result = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
index de2dee4..b060590 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/GroupedEndResultTransformer.java
@@ -44,9 +44,6 @@ public class GroupedEndResultTransformer implements EndResultTransformer {
this.searcher = searcher;
}
- /**
- * {@inheritDoc}
- */
@Override
public void transform(Map<String, ?> result, ResponseBuilder rb, SolrDocumentSource solrDocumentSource) {
NamedList<Object> commands = new SimpleOrderedMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java
index 630aa63..3e11abc 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/MainEndResultTransformer.java
@@ -31,9 +31,6 @@ import java.util.Map;
*/
public class MainEndResultTransformer implements EndResultTransformer {
- /**
- * {@inheritDoc}
- */
@Override
public void transform(Map<String, ?> result, ResponseBuilder rb, SolrDocumentSource solrDocumentSource) {
Object value = result.get(rb.getGroupingSpec().getFields()[0]);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java
index 8d11674..593f84f 100644
--- a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/SimpleEndResultTransformer.java
@@ -32,9 +32,6 @@ import java.util.Map;
*/
public class SimpleEndResultTransformer implements EndResultTransformer {
- /**
- * {@inheritDoc}
- */
@Override
public void transform(Map<String, ?> result, ResponseBuilder rb, SolrDocumentSource solrDocumentSource) {
NamedList<Object> commands = new SimpleOrderedMap<>();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java
index 82ef54d..be985e1 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/DocumentAnalysisRequest.java
@@ -89,9 +89,6 @@ public class DocumentAnalysisRequest extends SolrRequest<DocumentAnalysisRespons
return new DocumentAnalysisResponse();
}
- /**
- * {@inheritDoc}
- */
@Override
public ModifiableSolrParams getParams() {
ModifiableSolrParams params = new ModifiableSolrParams();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
index 9c4993e..aeea9e0 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/FieldAnalysisRequest.java
@@ -68,9 +68,6 @@ public class FieldAnalysisRequest extends SolrRequest<FieldAnalysisResponse> {
return new FieldAnalysisResponse();
}
- /**
- * {@inheritDoc}
- */
@Override
public SolrParams getParams() {
ModifiableSolrParams params = new ModifiableSolrParams();
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
index 42c20e9..231199d 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/DocumentAnalysisResponse.java
@@ -34,9 +34,6 @@ public class DocumentAnalysisResponse extends AnalysisResponseBase implements It
private final Map<String, DocumentAnalysis> documentAnalysisByKey = new HashMap<>();
- /**
- * {@inheritDoc}
- */
@Override
public void setResponse(NamedList<Object> response) {
super.setResponse(response);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java
index 3a9a193..533885b 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/FieldAnalysisResponse.java
@@ -34,9 +34,6 @@ public class FieldAnalysisResponse extends AnalysisResponseBase {
private Map<String, Analysis> analysisByFieldTypeName = new HashMap<>();
private Map<String, Analysis> analysisByFieldName = new HashMap<>();
- /**
- * {@inheritDoc}
- */
@Override
public void setResponse(NamedList<Object> response) {
super.setResponse(response);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e10f5d2c/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java
index 5b24695..50a715c 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/schema/SchemaResponse.java
@@ -227,9 +227,6 @@ public class SchemaResponse extends SolrResponseBase {
return fieldTypeRepresentations;
}
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -246,9 +243,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class SchemaNameResponse extends SolrResponseBase {
private String schemaName;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -266,9 +260,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class SchemaVersionResponse extends SolrResponseBase {
private float schemaVersion;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -286,9 +277,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class FieldResponse extends SolrResponseBase {
Map<String, Object> field = new LinkedHashMap<>();
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -307,9 +295,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class FieldsResponse extends SolrResponseBase {
List<Map<String, Object>> fields;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -326,9 +311,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class DynamicFieldResponse extends SolrResponseBase {
Map<String, Object> dynamicField = new LinkedHashMap<>();
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -347,9 +329,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class DynamicFieldsResponse extends SolrResponseBase {
List<Map<String, Object>> dynamicFields;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -366,9 +345,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class UniqueKeyResponse extends SolrResponseBase {
private String uniqueKey;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -385,9 +361,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class GlobalSimilarityResponse extends SolrResponseBase {
Map<String, Object> similarity;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -405,9 +378,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class CopyFieldsResponse extends SolrResponseBase {
List<Map<String, Object>> copyFields;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -424,9 +394,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class FieldTypeResponse extends SolrResponseBase {
private FieldTypeRepresentation fieldType;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -445,9 +412,6 @@ public class SchemaResponse extends SolrResponseBase {
public static class FieldTypesResponse extends SolrResponseBase {
List<FieldTypeRepresentation> fieldTypes;
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
@@ -462,9 +426,6 @@ public class SchemaResponse extends SolrResponseBase {
}
public static class UpdateResponse extends SolrResponseBase {
- /**
- * {@inheritDoc}
- */
@Override
@SuppressWarnings("unchecked")
public void setResponse(NamedList<Object> response) {
[3/4] lucene-solr:branch_7x: LUCENE-8115: fail precommit on
unnecessary-on-its-own {@inheritDoc} annotations.
Posted by cp...@apache.org.
LUCENE-8115: fail precommit on unnecessary-on-its-own {@inheritDoc} annotations.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/88bcf22c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/88bcf22c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/88bcf22c
Branch: refs/heads/branch_7x
Commit: 88bcf22cca630aa2b409c59105682421d66e8232
Parents: e10f5d2
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jan 8 19:46:22 2018 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jan 8 20:08:06 2018 +0000
----------------------------------------------------------------------
build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/88bcf22c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9db8312..78e0295 100755
--- a/build.xml
+++ b/build.xml
@@ -145,6 +145,7 @@
(~$/(?i)\bno(n|)commit\b/$) : 'nocommit',
(~$/\bTOOD:/$) : 'TOOD instead TODO',
(~$/\t/$) : 'tabs instead spaces',
+ (~$/\Q/**\E((?:\s)|(?:\*))*\Q{@inheritDoc}\E((?:\s)|(?:\*))*\Q*/\E/$) : '{@inheritDoc} on its own is unnecessary',
(~$/\$$(?:LastChanged)?Date\b/$) : 'svn keyword',
(~$/\$$(?:(?:LastChanged)?Revision|Rev)\b/$) : 'svn keyword',
(~$/\$$(?:LastChangedBy|Author)\b/$) : 'svn keyword',