Apache Solr open-source search software
Correct the JDK-17 offending javadocs
Uwe Schindlerdf5d0f33d571
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LambdaFunction.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LambdaFunction.javaindex ff72becc6b6..13e198450e8 100644--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LambdaFunction.java+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/function/mapping/LambdaFunction.java@@ -136,7 +136,6 @@ public class LambdaFunction {* <br>* The inputs can be either {@code func(single,multi)} or {@code func(multi,single)}.* </ul>- * <p>** @param name name for the function* @param lambda the function to be applied to every value: {@code (boolean,boolean) -> boolean}@@ -233,7 +232,6 @@ public class LambdaFunction {* <br>* The inputs can be either {@code func(single,multi)} or {@code func(multi,single)}.* </ul>- * <p>** @param name name for the function* @param lambda the function to be applied to every value: {@code (integer,integer) -> integer}@@ -330,7 +328,6 @@ public class LambdaFunction {* <br>* The inputs can be either {@code func(single,multi)} or {@code func(multi,single)}.* </ul>- * <p>** @param name name for the function* @param lambda the function to be applied to every value: {@code (long,long) -> long}@@ -427,7 +424,6 @@ public class LambdaFunction {* <br>* The inputs can be either {@code func(single,multi)} or {@code func(multi,single)}.* </ul>- * <p>** @param name name for the function* @param lambda the function to be applied to every value: {@code (float,float) -> float}@@ -524,7 +520,6 @@ public class LambdaFunction {* <br>* The inputs can be either {@code func(single,multi)} or {@code func(multi,single)}.* </ul>- * <p>** @param name name for the function* @param lambda the function to be applied to every value: {@code (double,double) -> double}@@ -729,7 +724,6 @@ public class LambdaFunction {* <br>* The inputs can be either {@code func(single,multi)} or {@code func(multi,single)}.* </ul>- * <p>** @param name name for the function* @param lambda the function to be applied to every value: {@code (String,String) -> String}diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex 56a6c67cfdb..be89bf64ac8 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -2226,7 +2226,6 @@ public final class SolrCore implements SolrInfoBean, Closeable {* then it is filled in with a Future that will return after the searcher is registered. The Future may be set to* <code>null</code> in which case the SolrIndexSearcher created has already been registered at the time* this method returned.- * <p>** @param forceNew if true, force the open of a new index searcher regardless if there is already one open.* @param returnSearcher if true, returns a {@link SolrIndexSearcher} holder with the refcount already incremented.diff --git a/solr/core/src/java/org/apache/solr/search/DocListAndSet.java b/solr/core/src/java/org/apache/solr/search/DocListAndSet.javaindex 8d8ba4fdd14..b8ab579aec2 100644--- a/solr/core/src/java/org/apache/solr/search/DocListAndSet.java+++ b/solr/core/src/java/org/apache/solr/search/DocListAndSet.java@@ -25,8 +25,6 @@ package org.apache.solr.search;* have been retrieved or inserted into a cache and should be considered shared.* <p>* Oh, if only java had "out" parameters or multiple return args...- * <p>- *** @since solr 0.9*/diff --git a/solr/core/src/java/org/apache/solr/search/ReturnFields.java b/solr/core/src/java/org/apache/solr/search/ReturnFields.javaindex dcfbcd63fb1..9266a945413 100644--- a/solr/core/src/java/org/apache/solr/search/ReturnFields.java+++ b/solr/core/src/java/org/apache/solr/search/ReturnFields.java@@ -54,14 +54,12 @@ public abstract class ReturnFields {/*** The requested field names (includes pseudo fields)- * <p>* @return Set of field names or <code>null</code> (all fields).*/public abstract Set<String> getRequestedFieldNames();/*** The explicitly requested field names (includes pseudo fields)- * <p>* @return Set of explicitly requested field names or <code>null</code> (no explict)*/public abstract Set<String> getExplicitlyRequestedFieldNames();diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.javaindex 9a5ac707ce8..ae3ba08e8bb 100644--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java@@ -1177,7 +1177,6 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI* Returns the set of document ids matching both the query and the filter. This method is cache-aware and attempts to* retrieve the answer from the cache if possible. If the answer was not cached, it may have been inserted into the* cache as a result of this call.- * <p>** @param filter* may be nulldiff --git a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.javaindex 60e1e95f38f..0bdf9f46c11 100644--- a/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java+++ b/solr/core/src/java/org/apache/solr/search/function/distance/GeohashHaversineFunction.java@@ -35,7 +35,6 @@ import java.util.Map;** <p>* Ex: ghhsin(ValueSource, ValueSource, radius)- * <p>** @see org.apache.solr.search.function.distance.HaversineFunction for more details on the implementation*diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.javaindex e6d3d69f05c..8454ee1bac3 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java@@ -650,7 +650,6 @@ public class SolrQuery extends ModifiableSolrParams* If the field is already used for sorting, the order* of the existing field is modified; otherwise, it is* added to the end.- * <p>* @return the modified SolrQuery object, for easy chaining* @since 4.2*/