Apache Solr open-source search software
SOLR-16049: Upgrade to spotless 6.3.0
Kevin Risden07943e87fb76
diff --git a/build.gradle b/build.gradleindex 83461c7e643..4d8b7333396 100644--- a/build.gradle+++ b/build.gradle@@ -26,7 +26,7 @@ plugins {id 'de.thetaphi.forbiddenapis' version '3.2' apply falseid "de.undercouch.download" version "4.0.2" apply falseid "net.ltgt.errorprone" version "2.0.2" apply false- id 'com.diffplug.spotless' version "5.14.3" apply false+ id 'com.diffplug.spotless' version "6.3.0" apply false}apply from: file('gradle/globals.gradle')diff --git a/gradle/validation/spotless.gradle b/gradle/validation/spotless.gradleindex 820ae453771..cfc765e70d6 100644--- a/gradle/validation/spotless.gradle+++ b/gradle/validation/spotless.gradle@@ -37,7 +37,7 @@ configure(project(":solr").subprojects) { prj ->lineEndings 'UNIX'endWithNewline()- googleJavaFormat('1.11.0')+ googleJavaFormat('1.14.0')// Apply to all Java sourcestarget "src/**/*.java"diff --git a/solr/modules/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java b/solr/modules/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.javaindex f67c7d902e2..755723c4308 100644--- a/solr/modules/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java+++ b/solr/modules/analysis-extras/src/java/org/apache/solr/update/processor/OpenNLPExtractNamedEntitiesUpdateProcessorFactory.java@@ -199,7 +199,9 @@ public class OpenNLPExtractNamedEntitiesUpdateProcessorFactory extends UpdateReq* @see #pattern*/private String dest = null;- /** @see #dest */+ /**+ * @see #dest+ */private Pattern pattern = null;protected final FieldNameSelector getSourceSelector() {diff --git a/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.javaindex 3d7b11e24fc..09ed102b224 100644--- a/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java+++ b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/ClusteringComponent.java@@ -495,7 +495,9 @@ public class ClusteringComponent extends SearchComponent implements SolrCoreAwarreturn engine;}- /** @return A map of initialized clustering engines, exposed for tests only. */+ /**+ * @return A map of initialized clustering engines, exposed for tests only.+ */Set<String> getEngineNames() {return engines.keySet();}diff --git a/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineParameters.java b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineParameters.javaindex 18d72b59be2..a825c5209b2 100644--- a/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineParameters.java+++ b/solr/modules/clustering/src/java/org/apache/solr/handler/clustering/EngineParameters.java@@ -33,70 +33,114 @@ public final class EngineParameters implements Cloneable {/** Common prefix for configuration of engine settings. */private static final String PARAM_PREFIX = "clustering.";- /** @see #algorithmName() */+ /**+ * @see #algorithmName()+ */public static final String PARAM_ALGORITHM = PARAM_PREFIX + "algorithm";- /** @see #maxLabels() */+ /**+ * @see #maxLabels()+ */public static final String PARAM_MAX_LABELS = PARAM_PREFIX + "maxLabels";- /** @see #includeSubclusters() */+ /**+ * @see #includeSubclusters()+ */public static final String PARAM_INCLUDE_SUBCLUSTERS = PARAM_PREFIX + "includeSubclusters";- /** @see #includeOtherTopics() */+ /**+ * @see #includeOtherTopics()+ */public static final String PARAM_INCLUDE_OTHER_TOPICS = PARAM_PREFIX + "includeOtherTopics";- /** @see #language() */+ /**+ * @see #language()+ */public static final String PARAM_LANGUAGE = PARAM_PREFIX + "language";- /** @see #languageField() */+ /**+ * @see #languageField()+ */public static final String PARAM_LANGUAGE_FIELD = PARAM_PREFIX + "languageField";- /** @see #resources() */+ /**+ * @see #resources()+ */public static final String PARAM_RESOURCES = PARAM_PREFIX + "resources";- /** @see #fields() */+ /**+ * @see #fields()+ */public static final String PARAM_FIELDS = PARAM_PREFIX + "fields";- /** @see #preferQueryContext() */+ /**+ * @see #preferQueryContext()+ */public static final String PARAM_PREFER_QUERY_CONTEXT = PARAM_PREFIX + "preferQueryContext";- /** @see #contextSize() */+ /**+ * @see #contextSize()+ */public static final String PARAM_CONTEXT_SIZE = PARAM_PREFIX + "contextSize";- /** @see #contextCount() */+ /**+ * @see #contextCount()+ */public static final String PARAM_CONTEXT_COUNT = PARAM_PREFIX + "contextCount";- /** @see #PARAM_MAX_LABELS */+ /**+ * @see #PARAM_MAX_LABELS+ */private int maxLabels = Integer.MAX_VALUE;- /** @see #PARAM_INCLUDE_SUBCLUSTERS */+ /**+ * @see #PARAM_INCLUDE_SUBCLUSTERS+ */private boolean includeSubclusters = true;- /** @see #PARAM_INCLUDE_OTHER_TOPICS */+ /**+ * @see #PARAM_INCLUDE_OTHER_TOPICS+ */private boolean includeOtherTopics = true;- /** @see #PARAM_ALGORITHM */+ /**+ * @see #PARAM_ALGORITHM+ */private String algorithmName;- /** @see #PARAM_RESOURCES */+ /**+ * @see #PARAM_RESOURCES+ */private String resources;- /** @see #PARAM_LANGUAGE */+ /**+ * @see #PARAM_LANGUAGE+ */private String language = "English";- /** @see #PARAM_LANGUAGE_FIELD */+ /**+ * @see #PARAM_LANGUAGE_FIELD+ */private String languageField;- /** @see #PARAM_PREFER_QUERY_CONTEXT */+ /**+ * @see #PARAM_PREFER_QUERY_CONTEXT+ */private boolean preferQueryContext;- /** @see #PARAM_CONTEXT_SIZE */+ /**+ * @see #PARAM_CONTEXT_SIZE+ */private int contextSize = 80 * 4;- /** @see #PARAM_CONTEXT_COUNT */+ /**+ * @see #PARAM_CONTEXT_COUNT+ */private int contextCount = 3;- /** @see #PARAM_FIELDS */+ /**+ * @see #PARAM_FIELDS+ */private LinkedHashSet<String> fields = new LinkedHashSet<>();/** Non-engine configuration parameters (algorithm parameters). */@@ -167,7 +211,9 @@ public final class EngineParameters implements Cloneable {return this;}- /** @return Maximum number of returned cluster labels (even if the algorithm returns more). */+ /**+ * @return Maximum number of returned cluster labels (even if the algorithm returns more).+ */int maxLabels() {return maxLabels;}@@ -196,7 +242,9 @@ public final class EngineParameters implements Cloneable {return algorithmName;}- /** @return Return Solr component-configuration relative language resources path. */+ /**+ * @return Return Solr component-configuration relative language resources path.+ */String resources() {return resources;}diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/snapshots/SolrSnapshotsTool.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/snapshots/SolrSnapshotsTool.javaindex 8369e386de3..c7c822685fb 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/snapshots/SolrSnapshotsTool.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/snapshots/SolrSnapshotsTool.java@@ -233,7 +233,9 @@ public class SolrSnapshotsTool implements Closeable, CLIO {}}- /** @param pathPrefix optional */+ /**+ * @param pathPrefix optional+ */public Map<String, List<String>> getIndexFilesPathForSnapshot(String collectionName, String snapshotName, String pathPrefix)throws SolrServerException, IOException {@@ -301,7 +303,9 @@ public class SolrSnapshotsTool implements Closeable, CLIO {return result;}- /** @param pathPrefix optional */+ /**+ * @param pathPrefix optional+ */public void buildCopyListings(String collectionName, String snapshotName, String localFsPath, String pathPrefix)throws SolrServerException, IOException {@@ -326,7 +330,9 @@ public class SolrSnapshotsTool implements Closeable, CLIO {resp.getStatus() == 0, "The request failed. The status code is " + resp.getStatus());}- /** @param pathPrefix optional */+ /**+ * @param pathPrefix optional+ */public void prepareForExport(String collectionName,String snapshotName,diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/HdfsFileWriter.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/HdfsFileWriter.javaindex b03542bf0be..4d326030f24 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/HdfsFileWriter.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/HdfsFileWriter.java@@ -27,7 +27,9 @@ import org.apache.hadoop.fs.Path;import org.apache.hadoop.fs.permission.FsPermission;import org.apache.lucene.store.OutputStreamIndexOutput;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class HdfsFileWriter extends OutputStreamIndexOutput {public static final String HDFS_SYNC_BLOCK = "solr.hdfs.sync.block";diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCache.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCache.javaindex 0b7a5f4d188..1cf033e2acc 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCache.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCache.java@@ -25,7 +25,9 @@ import java.util.List;import java.util.concurrent.CopyOnWriteArrayList;import java.util.concurrent.atomic.AtomicInteger;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class BlockCache {public static final int _128M = 134217728;diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCacheKey.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCacheKey.javaindex b8fa68c2026..29f061dbfb2 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCacheKey.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCacheKey.java@@ -16,7 +16,9 @@*/package org.apache.solr.hdfs.store.blockcache;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class BlockCacheKey implements Cloneable {private long block;diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCacheLocation.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCacheLocation.javaindex 22ab1bea9fe..a7f8ad5fa3d 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCacheLocation.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockCacheLocation.java@@ -19,7 +19,9 @@ package org.apache.solr.hdfs.store.blockcache;import java.util.concurrent.atomic.AtomicBoolean;import org.apache.solr.common.util.SuppressForbidden;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class BlockCacheLocation {private int block;diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockDirectory.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockDirectory.javaindex f29cf302046..51e7877c656 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockDirectory.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockDirectory.java@@ -33,7 +33,9 @@ import org.apache.solr.hdfs.store.HdfsDirectory;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class BlockDirectory extends FilterDirectory implements ShutdownAwareDirectory {private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockDirectoryCache.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockDirectoryCache.javaindex 05810182769..85a1cf48d6c 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockDirectoryCache.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockDirectoryCache.java@@ -23,7 +23,9 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.atomic.AtomicInteger;import org.apache.solr.hdfs.store.blockcache.BlockCache.OnRelease;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class BlockDirectoryCache implements Cache {private final BlockCache blockCache;private final AtomicInteger counter = new AtomicInteger();diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockLocks.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockLocks.javaindex e387d42c27a..ced5460d3b0 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockLocks.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BlockLocks.java@@ -19,7 +19,9 @@ package org.apache.solr.hdfs.store.blockcache;import java.util.concurrent.atomic.AtomicLongArray;import org.apache.lucene.util.LongBitSet;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class BlockLocks {private AtomicLongArray bits;diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BufferStore.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BufferStore.javaindex 25c205f916b..37a384c9f19 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BufferStore.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/BufferStore.java@@ -22,7 +22,9 @@ import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.ConcurrentMap;import java.util.concurrent.atomic.AtomicLong;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class BufferStore implements Store {private static final Store EMPTY =diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/Cache.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/Cache.javaindex eeef8b7e2bc..c04f6ee1f11 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/Cache.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/Cache.java@@ -16,7 +16,9 @@*/package org.apache.solr.hdfs.store.blockcache;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public interface Cache {/**diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/CustomBufferedIndexInput.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/CustomBufferedIndexInput.javaindex a3b6356905b..70be91e7f70 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/CustomBufferedIndexInput.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/CustomBufferedIndexInput.java@@ -22,7 +22,9 @@ import org.apache.lucene.store.BufferedIndexInput;import org.apache.lucene.store.IndexInput;import org.apache.lucene.store.IndexOutput;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public abstract class CustomBufferedIndexInput extends IndexInput {public static final int BUFFER_SIZE =diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/ReusedBufferedIndexOutput.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/ReusedBufferedIndexOutput.javaindex f6a7203c365..d93972967f9 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/ReusedBufferedIndexOutput.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/ReusedBufferedIndexOutput.java@@ -19,7 +19,9 @@ package org.apache.solr.hdfs.store.blockcache;import java.io.IOException;import org.apache.lucene.store.IndexOutput;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public abstract class ReusedBufferedIndexOutput extends IndexOutput {public static final int BUFFER_SIZE = 1024;diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/Store.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/Store.javaindex 6a1a3f592f9..ceb8441ea80 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/Store.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/store/blockcache/Store.java@@ -16,7 +16,9 @@*/package org.apache.solr.hdfs.store.blockcache;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public interface Store {byte[] takeBuffer(int bufferSize);diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/update/HdfsUpdateLog.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/update/HdfsUpdateLog.javaindex 1ca680c7fe3..19c6a13fcc5 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/update/HdfsUpdateLog.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/update/HdfsUpdateLog.java@@ -46,7 +46,9 @@ import org.apache.solr.update.VersionInfo;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-/** @lucene.experimental */+/**+ * @lucene.experimental+ */public class HdfsUpdateLog extends UpdateLog {private final Object fsLock = new Object();diff --git a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/util/HdfsRecoverLeaseFileSystemUtils.java b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/util/HdfsRecoverLeaseFileSystemUtils.javaindex 9cae569a997..b0bd7960bff 100644--- a/solr/modules/hdfs/src/java/org/apache/solr/hdfs/util/HdfsRecoverLeaseFileSystemUtils.java+++ b/solr/modules/hdfs/src/java/org/apache/solr/hdfs/util/HdfsRecoverLeaseFileSystemUtils.java@@ -184,7 +184,9 @@ public class HdfsRecoverLeaseFileSystemUtils {return recovered;}- /** @return Detail to append to any log message around lease recovering. */+ /**+ * @return Detail to append to any log message around lease recovering.+ */private static String getLogMessageDetail(final int nbAttempt, final Path p, final long startWaiting) {return "attempt="diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/Feature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/Feature.javaindex da6b1ad8035..f07f624f3f1 100644--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/Feature.java+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/Feature.java@@ -192,12 +192,16 @@ public abstract class Feature extends Query implements Accountable {return true;}- /** @return the name */+ /**+ * @return the name+ */public String getName() {return name;}- /** @return the id */+ /**+ * @return the id+ */public int getIndex() {return index;}diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.javaindex 2f57bf50bd2..48a98112970 100644--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.java+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/model/LTRScoringModel.java@@ -168,17 +168,23 @@ public abstract class LTRScoringModel implements Accountable {}}- /** @return the norms */+ /**+ * @return the norms+ */public List<Normalizer> getNorms() {return norms;}- /** @return the name */+ /**+ * @return the name+ */public String getName() {return name;}- /** @return the features */+ /**+ * @return the features+ */public List<Feature> getFeatures() {return features;}diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.javaindex 9b5594bbe0b..8abb53a10c1 100644--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java@@ -184,7 +184,9 @@ public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {private FeatureLogger featureLogger;private boolean docsWereNotReranked;- /** @param name Name of the field to be added in a document representing the feature vectors */+ /**+ * @param name Name of the field to be added in a document representing the feature vectors+ */public FeatureTransformer(String name,SolrParams localparams,