Apache Solr open-source search software
Update Error Prone to v2.50.0 (#4847)
Solr Bot090f5b995c15
diff --git a/changelog/unreleased/PR#4847-update-error-prone-to-v2-50-0.yml b/changelog/unreleased/PR#4847-update-error-prone-to-v2-50-0.ymlnew file mode 100644index 00000000000..0b5f3ad02de--- /dev/null+++ b/changelog/unreleased/PR#4847-update-error-prone-to-v2-50-0.yml@@ -0,0 +1,7 @@+title: Update Error Prone to v2.50.0+type: dependency_update+authors:+- name: solrbot+links:+- name: PR#4847+ url: https://github.com/apache/solr/pull/4847diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 28e8ce7f7cf..7b66c5153e2 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -99,7 +99,7 @@ google-api-grpc-proto = "2.75.0"# @keep for version alignmentgoogle-autovalue = "1.11.1"google-cloud-bom = "0.268.0"-google-errorprone = "2.41.0"+google-errorprone = "2.50.0"# @keep for version alignmentgoogle-gson = "2.14.0"google-guava = "33.7.1-jre"diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradleindex 3ca5341ef0f..ce8618939cd 100644--- a/gradle/validation/error-prone.gradle+++ b/gradle/validation/error-prone.gradle@@ -456,7 +456,7 @@ allprojects {prj ->'-Xep:NonCanonicalType:WARN','-Xep:NonOverridingEquals:WARN',//'-Xep:NonFinalStaticField:WARN', // todo there are problems that should be fixed- '-Xep:NotJavadoc:WARN',+ // '-Xep:NotJavadoc:OFF', // we disagree; javadocs aren't purely for publishing'-Xep:NullOptional:WARN',// '-Xep:NullableConstructor:OFF', // we don't use this annotation'-Xep:NullableOptional:WARN',@@ -589,11 +589,12 @@ allprojects {prj ->}}-// Exclude generated OpenAPI sources in solrj from Error Prone checks.+// Exclude generated OpenAPI sources and the vendored noggit JSON parser (org.noggit, not our+// code/conventions) in solrj from Error Prone checks.configure(project(":solr:solrj")) {plugins.withId(libs.plugins.ltgt.errorprone.get().pluginId) {tasks.withType(JavaCompile) {- options.errorprone.excludedPaths = ".*/build/generated/.*"+ options.errorprone.excludedPaths = ".*/build/generated/.*|.*/org/noggit/.*"}}}@@ -606,3 +607,13 @@ configure(project(":solr:core")) {}}}++// Exclude vendored Tika sources (copied in to eliminate the Tika dependency) in+// solr:modules:extraction from Error Prone checks.+configure(project(":solr:modules:extraction")) {+ plugins.withId(libs.plugins.ltgt.errorprone.get().pluginId) {+ tasks.withType(JavaCompile) {+ options.errorprone.excludedPaths = ".*/org/apache/solr/handler/extraction/fromtika/.*"+ }+ }+}diff --git a/solr/api/gradle.lockfile b/solr/api/gradle.lockfileindex 12addaf6b82..21e4ad6f572 100644--- a/solr/api/gradle.lockfile+++ b/solr/api/gradle.lockfile@@ -21,11 +21,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/api/src/java/org/apache/solr/client/api/model/GetClusterCommandStatusResponse.java b/solr/api/src/java/org/apache/solr/client/api/model/GetClusterCommandStatusResponse.javaindex 6b96427cacd..c1b03cf5921 100644--- a/solr/api/src/java/org/apache/solr/client/api/model/GetClusterCommandStatusResponse.java+++ b/solr/api/src/java/org/apache/solr/client/api/model/GetClusterCommandStatusResponse.java@@ -54,7 +54,7 @@ public class GetClusterCommandStatusResponse extends SolrJerseyResponse {public static class CommandStatus implements ReflectWritable {@JsonProperty("state")@Schema(description = "Request state: submitted, running, completed, failed, or notfound.")- public State state;+ public RequestState state;@JsonProperty("msg")@Schema(description = "A message describing where the request was found, if at all.")@@ -65,7 +65,7 @@ public class GetClusterCommandStatusResponse extends SolrJerseyResponse {* org.apache.solr.client.solrj.response.RequestStatusState}'s constants and wire keys; kept as* a separate type here since this module (solr:api) cannot depend on solrj.*/- public enum State {+ public enum RequestState {SUBMITTED("submitted"),RUNNING("running"),COMPLETED("completed"),@@ -74,7 +74,7 @@ public class GetClusterCommandStatusResponse extends SolrJerseyResponse {private final String key;- State(String key) {+ RequestState(String key) {this.key = key;}@@ -84,8 +84,8 @@ public class GetClusterCommandStatusResponse extends SolrJerseyResponse {}@JsonCreator- public static State fromKey(String key) {- for (State state : values()) {+ public static RequestState fromKey(String key) {+ for (RequestState state : values()) {if (state.key.equalsIgnoreCase(key)) {return state;}diff --git a/solr/benchmark/gradle.lockfile b/solr/benchmark/gradle.lockfileindex 6efbf09d61f..7d537ba705b 100644--- a/solr/benchmark/gradle.lockfile+++ b/solr/benchmark/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/core/gradle.lockfile b/solr/core/gradle.lockfileindex 1ba057e6010..ae79bf6cb4c 100644--- a/solr/core/gradle.lockfile+++ b/solr/core/gradle.lockfile@@ -20,11 +20,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,jarValidationcom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/core/src/java/org/apache/solr/cli/ExportTool.java b/solr/core/src/java/org/apache/solr/cli/ExportTool.javaindex 9fb9a23e3d2..e377e37bc99 100644--- a/solr/core/src/java/org/apache/solr/cli/ExportTool.java+++ b/solr/core/src/java/org/apache/solr/cli/ExportTool.java@@ -594,6 +594,8 @@ public class ExportTool extends ToolBase {}}+ @SuppressWarnings(+ "ReferenceEquality") // EOFDOC is a unique sentinel; identity check is intentionalprivate void addConsumer(CountDownLatch consumerlatch) {consumerThreadpool.execute(() -> {diff --git a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.javaindex 3c4c152bdcf..9a8e249ca3c 100644--- a/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java+++ b/solr/core/src/java/org/apache/solr/cloud/DistributedClusterStateUpdater.java@@ -755,6 +755,8 @@ public class DistributedClusterStateUpdater {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // NO_OP is a unique sentinel; identity check is intentionalpublic void computeUpdates(ClusterState clusterState, SolrZkClient client) {boolean hasJsonUpdates = false;List<PerReplicaStatesOps> perReplicaStateOps = new ArrayList<>();@@ -912,6 +914,8 @@ public class DistributedClusterStateUpdater {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // NO_OP is a unique sentinel; identity check is intentionalpublic void computeUpdates(ClusterState clusterState, SolrZkClient client) {final DocCollection docCollection = clusterState.getCollectionOrNull(collectionName);Optional<ZkWriteCommand> result =diff --git a/solr/core/src/java/org/apache/solr/cloud/LockTree.java b/solr/core/src/java/org/apache/solr/cloud/LockTree.javaindex 6bb432abd8e..c99eae37e9c 100644--- a/solr/core/src/java/org/apache/solr/cloud/LockTree.java+++ b/solr/core/src/java/org/apache/solr/cloud/LockTree.java@@ -214,6 +214,8 @@ public class LockTree {return false;}+ @SuppressWarnings(+ "ReferenceEquality") // releasing only the exact lock instance held, by identityboolean unlock(LockImpl lockObject) {if (--refCount > 0) {return false;diff --git a/solr/core/src/java/org/apache/solr/cloud/Overseer.java b/solr/core/src/java/org/apache/solr/cloud/Overseer.javaindex cc8e65537c5..9d35afb7161 100644--- a/solr/core/src/java/org/apache/solr/cloud/Overseer.java+++ b/solr/core/src/java/org/apache/solr/cloud/Overseer.java@@ -782,9 +782,6 @@ public class Overseer implements SolrCloseable {assert ObjectReleaseTracker.track(this);}- /** Start {@link ClusterSingleton} plugins when we become the leader. */-- /** Stop {@link ClusterSingleton} plugins when we lose leadership. */public Stats getStats() {return stats;}diff --git a/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java b/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.javaindex a6998fe38cb..7458f3938d0 100644--- a/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java+++ b/solr/core/src/java/org/apache/solr/cloud/ReplicateFromLeader.java@@ -64,6 +64,9 @@ public class ReplicateFromLeader {* @param switchTransactionLog if true, ReplicationHandler will rotate the transaction log once* the replication is done*/+ @SuppressWarnings(+ "ReferenceEquality") // IndexFetchResult constants are singletons; identity check is+ // intentionalpublic void startReplication(boolean switchTransactionLog) {try (SolrCore core = cc.getCore(coreName)) {if (core == null) {diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.javaindex c787fdc80ce..b618d529f80 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CategoryRoutedAlias.java@@ -80,6 +80,8 @@ public class CategoryRoutedAlias extends RoutedAlias {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // Aliases is replaced wholesale, so identity means "possibly changed"public boolean updateParsedCollectionAliases(ZkStateReader zkStateReader, boolean contextualize) {final Aliases aliases =zkStateReader.getAliases(); // note: might be different from last requestdiff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.javaindex 0b2cb49678c..b752d098153 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/DimensionalRoutedAlias.java@@ -212,6 +212,8 @@ public class DimensionalRoutedAlias extends RoutedAlias {* @return A list of actions across the DRA.*/@Override+ @SuppressWarnings(+ "ReferenceEquality") // RoutedAlias dimension identity, not equality, is what matters hereprotected List<Action> calculateActions(String targetCol) {String[] routeValues = SEP_MATCHER.split(targetCol);// remove the alias name to avoid all manner of off by one errors...diff --git a/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java b/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.javaindex 8139956116e..4df16b611d2 100644--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java@@ -264,6 +264,8 @@ public class TimeRoutedAlias extends RoutedAlias {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // Aliases is replaced wholesale, so identity means "possibly changed"public boolean updateParsedCollectionAliases(ZkStateReader zkStateReader, boolean contextualize) {final Aliases aliases = zkStateReader.getAliases();if (this.parsedCollectionsAliases != aliases) {diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.javaindex 8059a2b16b6..1f12b9ad5f2 100644--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java@@ -129,6 +129,8 @@ public class ZkStateWriter {* a {@link org.apache.zookeeper.KeeperException.BadVersionException} this instance becomes* unusable and must be discarded*/+ @SuppressWarnings(+ "ReferenceEquality") // NO_OP is a unique sentinel; identity check is intentionalpublic ClusterState enqueueUpdate(ClusterState prevState, List<ZkWriteCommand> cmds, ZkWriteCallback callback)throws IllegalStateException, Exception {@@ -189,6 +191,8 @@ public class ZkStateWriter {return clusterState;}+ @SuppressWarnings(+ "ReferenceEquality") // NO_OP is a unique sentinel; identity check is intentionalprivate boolean isNoOps(List<ZkWriteCommand> cmds) {for (ZkWriteCommand cmd : cmds) {if (cmd != NO_OP) return false;@@ -229,6 +233,8 @@ public class ZkStateWriter {* @throws KeeperException if any ZooKeeper operation results in an error* @throws InterruptedException if the current thread is interrupted*/+ @SuppressWarnings(+ "ReferenceEquality") // detecting "same map instance passed back in" means "flush all"public ClusterState writePendingUpdates(Map<String, ZkWriteCommand> updates, boolean resetPendingUpdateCounters)throws IllegalStateException, KeeperException, InterruptedException {diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkWriteCommand.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkWriteCommand.javaindex f2d5466f760..a671aa3f749 100644--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkWriteCommand.java+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkWriteCommand.java@@ -49,6 +49,8 @@ public class ZkWriteCommand {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // NO_OP is a unique sentinel; identity check is intentionalpublic String toString() {return getClass().getSimpleName() + ": " + (this == NO_OP ? "no-op" : name + "=" + collection);}diff --git a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.javaindex 8b943b7dc79..c19cca57557 100644--- a/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java+++ b/solr/core/src/java/org/apache/solr/core/CachingDirectoryFactory.java@@ -223,6 +223,7 @@ public abstract class CachingDirectoryFactory extends DirectoryFactory {// be sure the method is called with the sync lock on this object// returns true if we closed the cacheValue, false if it will be closed later+ @SuppressWarnings("ReferenceEquality") // CacheValue identity, not equality, is what matters hereprivate boolean closeCacheValue(CacheValue cacheValue, Set<CacheValue> deferRemove) {log.debug("looking to close {} {}", cacheValue.path, cacheValue.closeEntries);List<CloseListener> listeners = closeListeners.remove(cacheValue.directory);@@ -300,6 +301,7 @@ public abstract class CachingDirectoryFactory extends DirectoryFactory {return vals.stream().sorted((a, b) -> b.path.compareTo(a.path)).collect(Collectors.toList());}+ @SuppressWarnings("ReferenceEquality") // CacheValue identity, not equality, is what matters hereprivate boolean maybeDeferClose(CacheValue maybeDefer) {assert maybeDefer.deleteOnClose;for (CacheValue maybeChildPath : byPathCache.values()) {@@ -381,6 +383,8 @@ public abstract class CachingDirectoryFactory extends DirectoryFactory {* java.lang.String, boolean)*/@Override+ @SuppressWarnings(+ "ReferenceEquality") // same instance back from filterDirectory means "unfiltered"public final Directory get(String path, DirContext dirContext, String rawLockType)throws IOException {String fullPath = normalize(path);diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.javaindex aeac54141dc..64916561070 100644--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java@@ -1444,6 +1444,7 @@ public class CoreContainer {return coreSorter;}+ @SuppressWarnings("ReferenceEquality") // SolrCore identity, not equality, is what matters hereprotected SolrCore registerCore(CoreDescriptor cd, SolrCore core, boolean registerInZk, boolean skipRecovery) {if (core == null) {diff --git a/solr/core/src/java/org/apache/solr/core/PluginBag.java b/solr/core/src/java/org/apache/solr/core/PluginBag.javaindex 30bb8435214..27c33f3d3a5 100644--- a/solr/core/src/java/org/apache/solr/core/PluginBag.java+++ b/solr/core/src/java/org/apache/solr/core/PluginBag.java@@ -229,7 +229,10 @@ public class PluginBag<T> implements AutoCloseable {return old == null ? null : old.get();}- @SuppressWarnings({"unchecked"})+ @SuppressWarnings({+ "unchecked",+ "ReferenceEquality" // detecting the same plugin instance re-registered vs. a real swap+ })public PluginHolder<T> put(String name, PluginHolder<T> plugin) {Boolean registerApi = null; // i.e. register for V2Boolean disableV1 = null; // i.e. do *not* register for v1diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex 3ee0813f914..86c67c4121c 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -2328,6 +2328,8 @@ public class SolrCore implements SolrInfoBean, Closeable {** <p>This method acquires openSearcherLock - do not call with searchLock held!*/+ @SuppressWarnings(+ "ReferenceEquality") // schema is only ever replaced wholesale, so identity is correct herepublic RefCounted<SolrIndexSearcher> openNewSearcher(boolean updateHandlerReopens, boolean realtime) {if (isClosed()) { // catch some errors quicker@@ -2544,6 +2546,8 @@ public class SolrCore implements SolrInfoBean, Closeable {* SolrIndexSearcher}.*/// TODO waitSearcher should be an AtomicReference or something that is a more clear API+ @SuppressWarnings(+ "ReferenceEquality") // SolrIndexSearcher identity, not equality, is what matters herepublic RefCounted<SolrIndexSearcher> getSearcher(boolean forceNew,boolean returnSearcher,@@ -2830,6 +2834,8 @@ public class SolrCore implements SolrInfoBean, Closeable {//// onDeckSearchers will also be decremented (it should have been incremented// as a result of opening a new searcher).+ @SuppressWarnings(+ "ReferenceEquality") // detecting re-registration of the exact same searcher holderprivate void registerSearcher(RefCounted<SolrIndexSearcher> newSearcherHolder) {synchronized (searcherLock) {try {diff --git a/solr/core/src/java/org/apache/solr/core/SolrPaths.java b/solr/core/src/java/org/apache/solr/core/SolrPaths.javaindex dc2c245eada..9a9262872b4 100644--- a/solr/core/src/java/org/apache/solr/core/SolrPaths.java+++ b/solr/core/src/java/org/apache/solr/core/SolrPaths.java@@ -123,6 +123,8 @@ public final class SolrPaths {* Adds an allowed path. Detects "_ALL_" which means all paths are allowed. Does not detect "*"* (not supported as a {@link Path} on Windows), see {@link #addPath(String)}.*/+ @SuppressWarnings(+ "ReferenceEquality") // ALL_PATHS is a unique sentinel; identity check is intentionalpublic AllowPathBuilder addPath(Path path) {if (path == null) {return this;diff --git a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.javaindex 206c7995e49..30d3503d7a9 100644--- a/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java+++ b/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java@@ -216,6 +216,8 @@ public class SolrResourceLoader** @param urls the URLs of files to add*/+ @SuppressWarnings(+ "ReferenceEquality") // ClassLoader has no value-equality; identity check is intentionalsynchronized void addToClassLoader(List<URL> urls) {URLClassLoader newLoader = addURLsToClassLoader(classLoader, urls);if (newLoader == classLoader) {@@ -483,6 +485,8 @@ public class SolrResourceLoader* @param subpackages the packages to be tried if the cname starts with solr.* @return the loaded class. An exception is thrown if it fails*/+ @SuppressWarnings(+ "ReferenceEquality") // detecting the default `packages` array vs. a caller-supplied onepublic <T> Class<? extends T> findClass(String cname, Class<T> expectedType, String... subpackages) {if (subpackages == null || subpackages.length == 0 || subpackages == packages) {@@ -694,6 +698,8 @@ public class SolrResourceLoader}}+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether the same SolrConfig instance is being re-associatedprotected final void setSolrConfig(SolrConfig config) {if (this.config != null && this.config != config) {throw new IllegalStateException("SolrConfig instance is already associated with this loader");@@ -701,6 +707,9 @@ public class SolrResourceLoaderthis.config = config;}+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether the same CoreContainer instance is being+ // re-associatedprotected final void setCoreContainer(CoreContainer coreContainer) {if (this.coreContainer != null && this.coreContainer != coreContainer) {throw new IllegalStateException(diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.javaindex 7e429de374e..21d9754a9fd 100644--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java@@ -480,6 +480,8 @@ public class ReplicationHandler extends RequestHandlerBaseprivate volatile IndexFetcher currentIndexFetcher;+ @SuppressWarnings(+ "ReferenceEquality") // detecting the shared pollingIndexFetcher vs. a one-off, by identitypublic IndexFetchResult doFetch(SolrParams solrParams, boolean forceReplication) {String leaderUrl = solrParams.get(LEADER_URL, null);if (!indexFetchLock.tryLock()) return IndexFetchResult.LOCK_OBTAIN_FAILED;@@ -1446,6 +1448,8 @@ public class ReplicationHandler extends RequestHandlerBase}@Override+ @SuppressWarnings(+ "ReferenceEquality") // detecting the shared pollingIndexFetcher vs. a one-offpublic void postClose(SolrCore core) {if (pollingIndexFetcher != null) {pollingIndexFetcher.destroy();diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.javaindex 494e3f89841..e1d02565b9b 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java@@ -464,6 +464,8 @@ public class CoreAdminHandler extends RequestHandlerBase implements PermissionNa}}+ @SuppressWarnings(+ "ReferenceEquality") // detecting a cache-computed instance vs. our own taskObjectprivate void addTask(TaskObject taskObject) {// Ensure task ID is not already in useTaskObject taskInCache =diff --git a/solr/core/src/java/org/apache/solr/handler/admin/IndexSizeEstimator.java b/solr/core/src/java/org/apache/solr/handler/admin/IndexSizeEstimator.javaindex 38eb8a464cf..96cc9be3a3b 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/IndexSizeEstimator.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/IndexSizeEstimator.java@@ -585,6 +585,8 @@ public class IndexSizeEstimator {}}+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether getMergeInstance() returned a new closeable cloneprivate void estimateStoredFields(Map<String, Object> result) throws IOException {log.info("- estimating stored fields...");Map<String, Map<String, Object>> stats = new HashMap<>();diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.javaindex 0e886bf1b22..353e096d294 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java@@ -315,6 +315,8 @@ public abstract class SecurityConfHandler extends RequestHandlerBaseapis.add(new ReqHandlerToApi(this, authcSpecProvider) {@Override+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether the plugin instance was reloadedpublic synchronized Map<String, JsonSchemaValidator> getCommandSchema() {// it is possible that the Authentication plugin is modified since the last call.// invalidate the cached commandSchema@@ -335,6 +337,8 @@ public abstract class SecurityConfHandler extends RequestHandlerBaseapis.add(new ApiBag.ReqHandlerToApi(this, authzSpecProvider) {@Override+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether the plugin instance was reloadedpublic synchronized Map<String, JsonSchemaValidator> getCommandSchema() {// it is possible that the Authorization plugin is modified since the last call.// invalidate cached commandSchemadiff --git a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoProvider.java b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoProvider.javaindex f9b39864156..f9accfe106b 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoProvider.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoProvider.java@@ -286,6 +286,8 @@ public class SystemInfoProvider {}/** Get Security Info */+ // Identity against the internal singleton is intentionally stricter than equals().+ @SuppressWarnings("ReferenceEquality")public NodeSystemResponse.Security getSecurityInfo() {NodeSystemResponse.Security info = new NodeSystemResponse.Security();diff --git a/solr/core/src/java/org/apache/solr/handler/admin/api/ClusterCommands.java b/solr/core/src/java/org/apache/solr/handler/admin/api/ClusterCommands.javaindex 792642dbe6c..60cc18e483e 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/api/ClusterCommands.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/api/ClusterCommands.java@@ -228,7 +228,7 @@ public class ClusterCommands extends AdminAPIBase implements ClusterCommandsApiprivate static void setStatus(GetClusterCommandStatusResponse response, RequestStatusState state, String requestId) {final CommandStatus status = new CommandStatus();- status.state = CommandStatus.State.valueOf(state.name());+ status.state = CommandStatus.RequestState.valueOf(state.name());status.msg = statusMessage(state, requestId);response.status = status;}diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.javaindex d251a7bfe4d..d221132c835 100644--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java@@ -643,6 +643,8 @@ public class RealTimeGetComponent extends SearchComponent {** @see #getInputDocumentFromTlog(SolrCore, BytesRef, AtomicLong, Set, Resolution)*/+ @SuppressWarnings(+ "ReferenceEquality") // DELETED is a unique sentinel; identity check is intentionalprivate static SolrInputDocument getInputDocumentFromTlog(SolrCore core,BytesRef idBytes,@@ -755,6 +757,8 @@ public class RealTimeGetComponent extends SearchComponent {* @param resolveStrategy {@link Resolution#DOC} or {@link Resolution#ROOT_WITH_CHILDREN}.* @see Resolution*/+ @SuppressWarnings(+ "ReferenceEquality") // DELETED is a unique sentinel; identity check is intentionalpublic static SolrInputDocument getInputDocument(SolrCore core,BytesRef idBytes,diff --git a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.javaindex aa85f9a69b4..e22356f5523 100644--- a/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java+++ b/solr/core/src/java/org/apache/solr/handler/component/ResponseBuilder.java@@ -191,6 +191,8 @@ public class ResponseBuilder {return -1;}+ @SuppressWarnings(+ "ReferenceEquality") // excluding "me" itself, by identity, from the other componentspublic void addRequest(SearchComponent me, ShardRequest sreq) {outgoing.add(sreq);if ((sreq.purpose & ShardRequest.PURPOSE_PRIVATE) == 0) {diff --git a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.javaindex 3e7a066841f..76f62bd7ca9 100644--- a/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java@@ -513,6 +513,9 @@ public class SearchHandler extends RequestHandlerBase}/** Distributed request processing (AKA coordinator). */+ @SuppressWarnings(+ "ReferenceEquality") // ShardRequest.ALL_SHARDS is a unique sentinel; identity check is+ // intentionalprotected void processComponentsDistrib(SolrQueryRequest req,SolrQueryResponse rsp,diff --git a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.javaindex 36f22d69cdc..3f8694a37ab 100644--- a/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java@@ -642,6 +642,8 @@ public class TermsComponent extends SearchComponent {}}+ @SuppressWarnings(+ "ReferenceEquality") // TermsEnum.EMPTY is a Lucene sentinel; identity check is intentionalprivate static void collectTermStates(IndexReaderContext topReaderContext, TermStates[] contextArray, Term[] queryTerms)throws IOException {diff --git a/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java b/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.javaindex 0c8b47003ae..23ad278d491 100644--- a/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java+++ b/solr/core/src/java/org/apache/solr/handler/loader/JavabinLoader.java@@ -141,6 +141,8 @@ public class JavabinLoader extends ContentStreamLoader {}}+ @SuppressWarnings(+ "ReferenceEquality") // END_OBJ is a unique sentinel; identity check is intentionalprivate void handleMultiStream(SolrQueryRequest req,SolrQueryResponse rsp,diff --git a/solr/core/src/java/org/apache/solr/handler/tagger/TagLL.java b/solr/core/src/java/org/apache/solr/handler/tagger/TagLL.javaindex a8f3682b479..1431c929f4a 100644--- a/solr/core/src/java/org/apache/solr/handler/tagger/TagLL.java+++ b/solr/core/src/java/org/apache/solr/handler/tagger/TagLL.java@@ -95,6 +95,8 @@ public class TagLL {* Removes this tag from the chain, connecting prevTag and nextTag. Does not modify "this"* object's pointers, so the caller can refer to nextTag after removing it.*/+ @SuppressWarnings(+ "ReferenceEquality") // linked-list node identity, not equality, is what matters herepublic void removeLL() {if (head[0] == this) head[0] = nextTag;if (prevTag != null) {@@ -105,6 +107,8 @@ public class TagLL {}}+ @SuppressWarnings(+ "ReferenceEquality") // linked-list node identity, not equality, is what matters herevoid addBeforeLL(TagLL tag) {assert tag.startOffset <= startOffset;if (prevTag != null) {diff --git a/solr/core/src/java/org/apache/solr/legacy/BBoxStrategy.java b/solr/core/src/java/org/apache/solr/legacy/BBoxStrategy.javaindex ccbb5b2f8fc..3de20dced77 100644--- a/solr/core/src/java/org/apache/solr/legacy/BBoxStrategy.java+++ b/solr/core/src/java/org/apache/solr/legacy/BBoxStrategy.java@@ -307,6 +307,9 @@ public class BBoxStrategy extends SpatialStrategy {// }@Override+ @SuppressWarnings(+ "ReferenceEquality") // SpatialOperation constants are singletons; identity check is+ // intentionalpublic Query makeQuery(SpatialArgs args) {Shape shape = args.getShape();if (!(shape instanceof Rectangle bbox))diff --git a/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.java b/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.javaindex 9cb3acc0b0c..f9779b30455 100644--- a/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.java+++ b/solr/core/src/java/org/apache/solr/logging/jul/JulWatcher.java@@ -84,6 +84,9 @@ public class JulWatcher extends LogWatcher<LogRecord> {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // java.util.logging.Logger has no equals() override; identity check is+ // intentionalpublic Collection<LoggerInfo> getAllLoggers() {LogManager manager = LogManager.getLogManager();diff --git a/solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.java b/solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.javaindex 51adcf2899b..ec659763989 100644--- a/solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.java+++ b/solr/core/src/java/org/apache/solr/logging/log4j2/Log4j2Watcher.java@@ -167,6 +167,8 @@ public class Log4j2Watcher extends LogWatcher<LogEvent> {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // fast-path identity check before the equals() fallback right after itpublic Collection<LoggerInfo> getAllLoggers() {Logger root = LogManager.getRootLogger();LoggerContext ctx = (LoggerContext) LogManager.getContext(false);diff --git a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongCounter.java b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongCounter.javaindex 15fc27b85c5..9dbd9f8d2ef 100644--- a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongCounter.java+++ b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongCounter.java@@ -27,6 +27,8 @@ public class DualRegistryAttributedLongCounter extends AttributedLongCounter {private final AttributedLongCounter nodeCounter;+ @SuppressWarnings(+ "ReferenceEquality") // sanity check that two distinct counter instances were passed inpublic DualRegistryAttributedLongCounter(LongCounter coreCounter,Attributes coreAttributes,diff --git a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongTimer.java b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongTimer.javaindex b42d869892c..c1707fffdef 100644--- a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongTimer.java+++ b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongTimer.java@@ -27,6 +27,8 @@ public class DualRegistryAttributedLongTimer extends AttributedLongTimer {private final AttributedLongTimer nodeTimer;+ @SuppressWarnings(+ "ReferenceEquality") // sanity check that two distinct histogram instances were passed inpublic DualRegistryAttributedLongTimer(LongHistogram coreHistogram,Attributes coreAttributes,diff --git a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongUpDownCounter.java b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongUpDownCounter.javaindex 6cf505fb54e..fc98805b168 100644--- a/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongUpDownCounter.java+++ b/solr/core/src/java/org/apache/solr/metrics/otel/instruments/DualRegistryAttributedLongUpDownCounter.java@@ -27,6 +27,8 @@ public class DualRegistryAttributedLongUpDownCounter extends AttributedLongUpDowprivate final AttributedLongUpDownCounter nodeUpDownCounter;+ @SuppressWarnings(+ "ReferenceEquality") // sanity check that two distinct counter instances were passed inpublic DualRegistryAttributedLongUpDownCounter(LongUpDownCounter coreUpDownCounter,Attributes coreAttributes,diff --git a/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java b/solr/core/src/java/org/apache/solr/pkg/PackageListeners.javaindex 7535bb2c7fe..ff57f4775fa 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackageListeners.java@@ -60,6 +60,8 @@ public class PackageListeners {}}+ @SuppressWarnings(+ "ReferenceEquality") // removing the exact registered listener instance, not an equal onepublic synchronized void removeListener(Listener listener) {Iterator<Reference<Listener>> it = listeners.iterator();while (it.hasNext()) {diff --git a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.javaindex 419cb033835..887b7b84dc1 100644--- a/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java+++ b/solr/core/src/java/org/apache/solr/pkg/PackagePluginHolder.java@@ -90,6 +90,8 @@ public class PackagePluginHolder<T> extends PluginBag.PluginHolder<T> {}}+ @SuppressWarnings(+ "ReferenceEquality") // detecting the same package Version instance, not just an equal oneprivate synchronized void reload(SolrPackageLoader.SolrPackage pkg, SolrCore core) {String lessThan = core.getSolrConfig().maxPackageVersion(info.pkgName);SolrPackageLoader.SolrPackage.Version newest = pkg.getLatest(lessThan);diff --git a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.javaindex 6809e99e936..065255811cd 100644--- a/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java+++ b/solr/core/src/java/org/apache/solr/response/TextResponseWriter.java@@ -109,6 +109,7 @@ public abstract class TextResponseWriter implements TextWriter {* NOTE: strict object equality check against {@link #rawReturnFields}; see javadocs for {@link* #NO_RAW_FIELDS}*/+ @SuppressWarnings("ReferenceEquality") // strict object identity is intentional, see javadoc aboveprotected final boolean shouldWriteRaw(String fname, ReturnFields returnFields) {return rawReturnFields == returnFields && rawFields.contains(fname);}diff --git a/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.javaindex b165b81e923..2c6b540e6ce 100644--- a/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java+++ b/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java@@ -62,6 +62,8 @@ public class RawValueTransformerFactory extends TransformerFactory}@Override+ @SuppressWarnings(+ "ReferenceEquality") // QueryResponseWriter identity, not equality, is what matters herepublic DocTransformer create(String display,SolrParams params,diff --git a/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java b/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.javaindex e2fe53cf4d5..43c707980f0 100644--- a/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java+++ b/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java@@ -143,6 +143,8 @@ public class ValueSourceAugmenter extends DocTransformer {IntObjectHashMap<Object> cachedValuesById;@Override+ @SuppressWarnings(+ "ReferenceEquality") // NULL_SENTINEL is a unique sentinel; identity check is intentionalpublic void transform(SolrDocument doc, int docid, DocIterationInfo docIterationInfo) {Object cacheValue = (cachedValuesById != null) ? cachedValuesById.get(docid) : null;if (cacheValue != null) {diff --git a/solr/core/src/java/org/apache/solr/schema/BBoxField.java b/solr/core/src/java/org/apache/solr/schema/BBoxField.javaindex 4b85573ad73..fbf0e051d03 100644--- a/solr/core/src/java/org/apache/solr/schema/BBoxField.java+++ b/solr/core/src/java/org/apache/solr/schema/BBoxField.java@@ -75,6 +75,7 @@ public class BBoxField extends AbstractSpatialFieldType<BBoxStrategy> implements}@Override+ @SuppressWarnings("ReferenceEquality") // FieldType identity, not equality, is what matters herepublic void inform(IndexSchema schema) {this.schema = schema;FieldType numberType = schema.getFieldTypeByName(numberTypeName);diff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.javaindex 3980483fb7e..066c35c3811 100644--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java@@ -2002,6 +2002,7 @@ public class IndexSchema {}/** Informs analyzers used by a fieldType. */+ @SuppressWarnings("ReferenceEquality") // ref comparison is correct here (vs. equals)private void informResourceLoaderAwareObjectsForFieldType(FieldType fieldType) {// must inform any sub-components used in the// tokenizer chain if they are ResourceLoaderAwarediff --git a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.javaindex 238666d7165..0a2d4fd38c8 100644--- a/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java+++ b/solr/core/src/java/org/apache/solr/schema/LatLonPointSpatialField.java@@ -157,6 +157,9 @@ public class LatLonPointSpatialField}@Override+ @SuppressWarnings(+ "ReferenceEquality") // SpatialOperation constants are singletons; identity check is+ // intentionalpublic Query makeQuery(SpatialArgs args) {if (args.getOperation() != SpatialOperation.Intersects) {throw new UnsupportedSpatialOperation(args.getOperation());diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java b/solr/core/src/java/org/apache/solr/schema/SchemaManager.javaindex 05efe512c21..131e701199e 100644--- a/solr/core/src/java/org/apache/solr/schema/SchemaManager.java+++ b/solr/core/src/java/org/apache/solr/schema/SchemaManager.java@@ -493,6 +493,8 @@ public class SchemaManager {}}+ @SuppressWarnings(+ "ReferenceEquality") // detecting a self-referencing exception cause loop, by identitypublic static String getErrorStr(Exception e) {StringBuilder sb = new StringBuilder();Throwable cause = e;diff --git a/solr/core/src/java/org/apache/solr/search/CaffeineCache.java b/solr/core/src/java/org/apache/solr/search/CaffeineCache.javaindex e43acb704cc..60ccc26c7aa 100644--- a/solr/core/src/java/org/apache/solr/search/CaffeineCache.java+++ b/solr/core/src/java/org/apache/solr/search/CaffeineCache.java@@ -271,6 +271,7 @@ public class CaffeineCache<K, V> extends SolrCacheBase}@Override+ @SuppressWarnings("ReferenceEquality") // intentional, see the comment below re: Caffeine behaviorpublic V put(K key, V val) {inserts.increment();V old = cache.asMap().put(key, val);diff --git a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.javaindex 044b9894d97..de683b204d5 100644--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java@@ -2997,7 +2997,11 @@ public class CollapsingQParserPlugin extends QParserPlugin {* Constructs an instance based on the (raw, un-rewritten) SortFields to be used, and an initial* number of expected groups (will grow as needed).*/- @SuppressWarnings({"rawtypes"})+ @SuppressWarnings({+ "rawtypes",+ "ReferenceEquality" // SortField.STRING_LAST is a Lucene sentinel; identity check is+ // intentional+ })public SortFieldsCompare(SortField[] sorts, int initNumGroups) {this.sorts = sorts;numClauses = sorts.length;@@ -3140,7 +3144,11 @@ public class CollapsingQParserPlugin extends QParserPlugin {* overwrites them (and returns true) if this document is the new group head in accordance with* the SortFields. (otherwise returns false)*/- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings({+ "unchecked",+ "rawtypes",+ "ReferenceEquality" // detecting whether the same DocValues instance is still in use+ })private boolean testAndSetGroupValues(Object[] values, int contextDoc) throws IOException {Object[] stash = new Object[numClauses];int lastCompare = 0;diff --git a/solr/core/src/java/org/apache/solr/search/DocValuesIteratorCache.java b/solr/core/src/java/org/apache/solr/search/DocValuesIteratorCache.javaindex eba8a731881..43167543744 100644--- a/solr/core/src/java/org/apache/solr/search/DocValuesIteratorCache.java+++ b/solr/core/src/java/org/apache/solr/search/DocValuesIteratorCache.java@@ -94,6 +94,7 @@ public class DocValuesIteratorCache {}}+ @SuppressWarnings("ReferenceEquality") // NONE is a unique sentinel; identity check is intentionalpublic FieldDocValuesSupplier getSupplier(String fieldName) {FieldDocValuesSupplier ret = getSupplier.apply(fieldName);return ret == NONE ? null : ret;diff --git a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.javaindex 4dd2745bf1e..809c0305be3 100644--- a/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java+++ b/solr/core/src/java/org/apache/solr/search/ExtendedDismaxQParser.java@@ -1488,6 +1488,7 @@ public class ExtendedDismaxQParser extends QParser {}}+ @SuppressWarnings("ReferenceEquality") // Analyzer identity, not equality, is what matters hereprivate Analyzer noStopwordFilterAnalyzer(String fieldName) {FieldType ft = parser.getReq().getSchema().getFieldType(fieldName);Analyzer qa = ft.getQueryAnalyzer();diff --git a/solr/core/src/java/org/apache/solr/search/GraphTermsQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/GraphTermsQParserPlugin.javaindex f7bfd3b7dc2..d898bdcce03 100644--- a/solr/core/src/java/org/apache/solr/search/GraphTermsQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/GraphTermsQParserPlugin.java@@ -211,6 +211,9 @@ public class GraphTermsQParserPlugin extends QParserPlugin {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // id is a unique marker Object created per non-clone construction, so+ // identity is the intended equality check (clones share it, independent instances don't)public boolean equals(Object other) {return sameClassAs(other) && id == ((GraphTermsQuery) other).id;}@@ -290,6 +293,8 @@ public class GraphTermsQParserPlugin extends QParserPlugin {};}+ @SuppressWarnings(+ "ReferenceEquality") // TermsEnum.EMPTY is a Lucene sentinel; identity check is intentionalprivate void collectTermStates(IndexReader reader,List<LeafReaderContext> leaves,diff --git a/solr/core/src/java/org/apache/solr/search/JoinQuery.java b/solr/core/src/java/org/apache/solr/search/JoinQuery.javaindex 09fb728e7f9..fd1d0e7bdfd 100644--- a/solr/core/src/java/org/apache/solr/search/JoinQuery.java+++ b/solr/core/src/java/org/apache/solr/search/JoinQuery.java@@ -105,6 +105,7 @@ class JoinQuery extends Query implements SolrSearcherRequirer {ResponseBuilder rb;ScoreMode scoreMode;+ @SuppressWarnings("ReferenceEquality") // SolrCore identity, not equality, is what matters herepublic JoinQueryWeight(SolrIndexSearcher searcher, ScoreMode scoreMode, float boost) {super(JoinQuery.this, boost);this.scoreMode = scoreMode;@@ -248,6 +249,8 @@ class JoinQuery extends Query implements SolrSearcherRequirer {return result;}+ @SuppressWarnings(+ "ReferenceEquality") // SolrIndexSearcher identity, not equality, is what matters herepublic DocSet getDocSetEnumerate() throws IOException {FixedBitSet resultBits = null;diff --git a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java b/solr/core/src/java/org/apache/solr/search/QueryResultKey.javaindex 671da8cda54..e76fb6e5716 100644--- a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java+++ b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java@@ -144,6 +144,7 @@ public final class QueryResultKey implements Accountable {** @return true if the lists of equivalent other then the ordering*/+ @SuppressWarnings("ReferenceEquality") // fast path: takes care of identity and null casesprivate static boolean unorderedCompare(List<Query> fqList1, List<Query> fqList2) {// Do fast version first, expecting that filters are usually in the same order//diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.javaindex e7786f71d3b..0a5c9c7d2ad 100644--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java@@ -965,6 +965,8 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIreturn new BitDocSet(bs, answer.size());}+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether makeBitDocSet had to allocate a new instancepublic BitDocSet getDocSetBits(Query q) throws IOException {DocSet answer = getDocSet(q);BitDocSet answerBits = makeBitDocSet(answer);diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessor.java b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessor.javaindex 2dca4a5a35b..13b93c66eab 100644--- a/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessor.java+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetFieldProcessor.java@@ -320,6 +320,7 @@ abstract class FacetFieldProcessor extends FacetProcessor<FacetField> {/*** Processes the collected data to finds the top slots, and composes it in the response NamedList.*/+ @SuppressWarnings("ReferenceEquality") // SlotAcc identity, not equality, is what matters hereSimpleOrderedMap<Object> findTopSlots(final int numSlots,final int slotCardinality,@@ -578,6 +579,7 @@ abstract class FacetFieldProcessor extends FacetProcessor<FacetField> {}/** Helper method used solely when looping over buckets to be returned in findTopSlots */+ @SuppressWarnings("ReferenceEquality") // SlotAcc identity, not equality, is what matters hereprivate void fillBucketFromSlot(SimpleOrderedMap<Object> target, Slot slot, SlotAcc resortAcc)throws IOException {final int slotOrd = slot.slot;@@ -846,6 +848,7 @@ abstract class FacetFieldProcessor extends FacetProcessor<FacetField> {}@Override+ @SuppressWarnings("ReferenceEquality") // SlotAcc identity, not equality, is what matters herepublic SlotAcc registerSweepingAccs(SweepingCountSlotAcc baseSweepingAcc) {final FacetFieldProcessor p = (FacetFieldProcessor) fcontext.processor;int j = 0;diff --git a/solr/core/src/java/org/apache/solr/search/facet/RelatednessAgg.java b/solr/core/src/java/org/apache/solr/search/facet/RelatednessAgg.javaindex f55690bbd55..d35f5f46dec 100644--- a/solr/core/src/java/org/apache/solr/search/facet/RelatednessAgg.java+++ b/solr/core/src/java/org/apache/solr/search/facet/RelatednessAgg.java@@ -138,6 +138,8 @@ public class RelatednessAgg extends AggValueSource {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // FacetContext identity, not equality, is what matters herepublic SlotAcc createSlotAcc(FacetContext fcontext, long numDocs, int numSlots)throws IOException {// TODO: Ideally this is where we should check fgQ/bgQ for 'null' and apply defaults...diff --git a/solr/core/src/java/org/apache/solr/search/facet/SlotAcc.java b/solr/core/src/java/org/apache/solr/search/facet/SlotAcc.javaindex ceba52b6fcb..904a489aab2 100644--- a/solr/core/src/java/org/apache/solr/search/facet/SlotAcc.java+++ b/solr/core/src/java/org/apache/solr/search/facet/SlotAcc.java@@ -226,6 +226,8 @@ public abstract class SlotAcc implements Closeable {return values;}+ @SuppressWarnings(+ "ReferenceEquality") // fast-path: values array is prefilled with defaultValue alreadypublic <T> T[] resize(T[] old, T defaultValue) {@SuppressWarnings({"unchecked"})T[] values = (T[]) Array.newInstance(old.getClass().getComponentType(), getNewSize());@@ -757,6 +759,7 @@ public abstract class SlotAcc implements Closeable {* @param toAcc - the replacement {@link SlotAcc}* @see SweepableSlotAcc#registerSweepingAccs(SweepingCountSlotAcc)*/+ @SuppressWarnings("ReferenceEquality") // SlotAcc identity, not equality, is what matters herepublic void registerMapping(SlotAcc fromAcc, SlotAcc toAcc) {assert fromAcc.key.equals(toAcc.key);output.add(toAcc);diff --git a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.javaindex 5ddd4705116..4da65e04bc8 100644--- a/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java+++ b/solr/core/src/java/org/apache/solr/search/facet/UnInvertedField.java@@ -633,6 +633,8 @@ public class UnInvertedField extends DocTermOrds {}// Returns null if not already populated+ @SuppressWarnings(+ "ReferenceEquality") // uifPlaceholder is a unique sentinel; identity check is intentionalpublic static UnInvertedField checkUnInvertedField(String field, SolrIndexSearcher searcher)throws IOException {SolrCache<String, UnInvertedField> cache = searcher.getFieldValueCache();diff --git a/solr/core/src/java/org/apache/solr/security/AllowListUrlChecker.java b/solr/core/src/java/org/apache/solr/security/AllowListUrlChecker.javaindex 039ce146f4d..5c85c4ee776 100644--- a/solr/core/src/java/org/apache/solr/security/AllowListUrlChecker.java+++ b/solr/core/src/java/org/apache/solr/security/AllowListUrlChecker.java@@ -160,6 +160,8 @@ public class AllowListUrlChecker {* Gets the set of live hosts urls (host:port) built from the set of live nodes. The set is cached* to be reused until the live nodes change.*/+ @SuppressWarnings(+ "ReferenceEquality") // live-nodes set is replaced wholesale, so identity means "unchanged"private Set<String> getLiveHostUrls(ClusterState clusterState) {if (clusterState == null) {return Set.of();diff --git a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.javaindex b069218ee48..6f378c18356 100644--- a/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java+++ b/solr/core/src/java/org/apache/solr/security/PKIAuthenticationPlugin.java@@ -366,6 +366,8 @@ public class PKIAuthenticationPlugin extends AuthenticationPluginlistenerFactory.setDelegate(() -> listener);}+ // Identity against the internal singleton is intentionally stricter than equals().+ @SuppressWarnings("ReferenceEquality")public boolean needsAuthorization(HttpServletRequest req) {return req.getUserPrincipal() != CLUSTER_MEMBER_NODE;}diff --git a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.javaindex cec6cf3346b..0002e917d46 100644--- a/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java+++ b/solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java@@ -433,6 +433,8 @@ public class HttpSolrCall {}/** This method processes the request. */+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether we're still at the outermost exception, by identitypublic Action call() throws IOException {if (cores == null) {diff --git a/solr/core/src/java/org/apache/solr/servlet/RequestRateLimiter.java b/solr/core/src/java/org/apache/solr/servlet/RequestRateLimiter.javaindex 0901a0e2873..bc4bba0ec18 100644--- a/solr/core/src/java/org/apache/solr/servlet/RequestRateLimiter.java+++ b/solr/core/src/java/org/apache/solr/servlet/RequestRateLimiter.java@@ -90,6 +90,8 @@ public class RequestRateLimiter {* Handles an incoming request. returns a metadata object representing the metadata for the* acquired slot, if acquired. If a slot is not acquired, returns a null metadata object.*/+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether the pools are the same shared Semaphore instancepublic SlotReservation handleRequest() throws InterruptedException {if (!rateLimiterConfig.isEnabled) {@@ -135,6 +137,8 @@ public class RequestRateLimiter {* @lucene.experimental -- Can cause slots to be blocked if a request borrows a slot and is itself* long lived.*/+ @SuppressWarnings(+ "ReferenceEquality") // detecting whether the pools are the same shared Semaphore instancepublic SlotReservation allowSlotBorrowing() throws InterruptedException {if (borrowableSlotsPool == null) {return null;diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.javaindex 42531d5fd4a..eb1a80773a7 100644--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java@@ -270,7 +270,11 @@ public class SolrRequestParsers {* @param charset to be used to decode resulting bytes after %-decoding* @param map place all parameters in this map*/- @SuppressWarnings({"fallthrough", "resource"})+ @SuppressWarnings({+ "fallthrough",+ "resource",+ "ReferenceEquality" // currentStream points at keyStream or valueStream; identity is the flag+ })static long parseFormDataContent(final InputStream postContent,final long maxLen,diff --git a/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java b/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.javaindex e031ade9938..dc67b47cb17 100644--- a/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java+++ b/solr/core/src/java/org/apache/solr/spelling/ConjunctionSolrSpellChecker.java@@ -45,6 +45,7 @@ public class ConjunctionSolrSpellChecker extends SolrSpellChecker {private List<SolrSpellChecker> checkers = new ArrayList<>();private boolean initialized = false;+ @SuppressWarnings("ReferenceEquality") // Analyzer identity, not equality, is what matters herepublic void addChecker(SolrSpellChecker checker) {if (initialized) {throw new IllegalStateException("Need to add checkers before calling init()");diff --git a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.javaindex 76183c7f5a5..76276228a86 100644--- a/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java+++ b/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java@@ -176,6 +176,7 @@ public class DirectUpdateHandler2 extends UpdateHandler}}+ @SuppressWarnings("ReferenceEquality") // UpdateLog identity, not equality, is what matters herepublic DirectUpdateHandler2(SolrCore core, UpdateHandler updateHandler) {super(core, updateHandler.getUpdateLog(), false);solrCoreState = core.getSolrCoreState();diff --git a/solr/core/src/java/org/apache/solr/update/MemOutputStream.java b/solr/core/src/java/org/apache/solr/update/MemOutputStream.javaindex 345d35bb193..6619a740d8d 100644--- a/solr/core/src/java/org/apache/solr/update/MemOutputStream.java+++ b/solr/core/src/java/org/apache/solr/update/MemOutputStream.java@@ -32,6 +32,9 @@ public class MemOutputStream extends FastOutputStream {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // arrays don't override equals(), so identity is the only real+ // comparisonpublic void flush(byte[] arr, int offset, int len) throws IOException {if (arr == buf && offset == 0 && len == buf.length) {buffers.add(buf); // steal the bufferdiff --git a/solr/core/src/java/org/apache/solr/update/PeerSync.java b/solr/core/src/java/org/apache/solr/update/PeerSync.javaindex 7d69b4de9c6..2552b898789 100644--- a/solr/core/src/java/org/apache/solr/update/PeerSync.java+++ b/solr/core/src/java/org/apache/solr/update/PeerSync.java@@ -455,6 +455,9 @@ public class PeerSync implements SolrMetricProducer {}}+ @SuppressWarnings(+ "ReferenceEquality") // MissedUpdatesRequest constants are singletons; identity check is+ // intentionalprivate boolean handleVersions(ShardResponse srsp) {// we retrieved the last N updates from the replica@SuppressWarnings({"unchecked"})@@ -861,6 +864,9 @@ public class PeerSync implements SolrMetricProducer {this.nUpdates = nUpdates;}+ @SuppressWarnings(+ "ReferenceEquality") // MissedUpdatesRequest constants are singletons; identity check is+ // intentionalpublic MissedUpdatesRequest find(List<Long> otherVersions, Object updateFrom) {otherVersions.sort(absComparator);if (debug) {diff --git a/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java b/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.javaindex 272e610718b..a77274e9f5e 100644--- a/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java+++ b/solr/core/src/java/org/apache/solr/update/PeerSyncWithLeader.java@@ -217,6 +217,9 @@ public class PeerSyncWithLeader implements SolrMetricProducer {}}+ @SuppressWarnings(+ "ReferenceEquality") // MissedUpdatesRequest constants are singletons; identity check is+ // intentionalprivate boolean doSync(List<Long> ourUpdates, long ourLowThreshold, long ourHighThreshold) {// get leader's recent versions and fingerprint// note: by getting leader's versions later, we guarantee that leader's versions always super@@ -246,6 +249,9 @@ public class PeerSyncWithLeader implements SolrMetricProducer {return false;}+ @SuppressWarnings(+ "ReferenceEquality") // MissedUpdatesRequest constants are singletons; identity check is+ // intentionalprivate MissedUpdatesRequest buildMissedUpdatesRequest(NamedList<Object> rsp) {// we retrieved the last N updates from the replica@SuppressWarnings({"unchecked"})@@ -430,6 +436,9 @@ public class PeerSyncWithLeader implements SolrMetricProducer {this.nUpdates = nUpdates;}+ @SuppressWarnings(+ "ReferenceEquality") // MissedUpdatesRequest constants are singletons; identity check is+ // intentionalpublic MissedUpdatesRequest find(List<Long> leaderVersions, Object updateFrom) {leaderVersions.sort(absComparator);log.debug("{} sorted versions from {} = {}", logPrefix, updateFrom, leaderVersions);diff --git a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.javaindex b35a9b3651f..70330b89c71 100644--- a/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java+++ b/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java@@ -196,6 +196,9 @@ public class SolrIndexConfig implements MapWriter {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // InfoStream.NO_OUTPUT is a Lucene sentinel; identity check is+ // intentionalpublic void writeMap(EntryWriter ew) throws IOException {ew.put("useCompoundFile", useCompoundFile).put("maxBufferedDocs", maxBufferedDocs)diff --git a/solr/core/src/java/org/apache/solr/update/UpdateLog.java b/solr/core/src/java/org/apache/solr/update/UpdateLog.javaindex 17fd8477b27..2b0f202a4bd 100644--- a/solr/core/src/java/org/apache/solr/update/UpdateLog.java+++ b/solr/core/src/java/org/apache/solr/update/UpdateLog.java@@ -734,6 +734,8 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {/* Takes over ownership of the log, keeping it until no longer neededand then decrementing its reference and dropping it.*/+ @SuppressWarnings(+ "ReferenceEquality") // TransactionLog identity, not equality, is what matters hereprotected synchronized void addOldLog(TransactionLog oldLog, boolean removeOld) {if (oldLog == null) return;@@ -1546,6 +1548,8 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {* @param commitVersion any updates that have version larger than the commitVersion will be copied* over*/+ @SuppressWarnings(+ "ReferenceEquality") // TransactionLog identity, not equality, is what matters herepublic void copyOverOldUpdates(long commitVersion, TransactionLog oldTlog) {copyOverOldUpdatesCounter.inc();@@ -1701,7 +1705,10 @@ public class UpdateLog implements PluginInfoInitialized, SolrMetricProducer {close(committed, false);}- @SuppressWarnings("try")+ @SuppressWarnings({+ "try",+ "ReferenceEquality" // TransactionLog identity, not equality, is what matters here+ })public void close(boolean committed, boolean deleteOnClose) {try (Closeable c = releaseTlogDir) {recoveryExecutor.shutdown(); // no new tasksdiff --git a/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.javaindex fb4a9de1d8a..b7436751a2e 100644--- a/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java@@ -74,6 +74,9 @@ public abstract class AllValuesOrNoneFieldMutatingUpdateProcessorprotected abstract Object mutateValue(final Object srcVal);@Override+ @SuppressWarnings(+ "ReferenceEquality") // *_SINGLETON constants are unique sentinels; identity check is+ // intentionalprotected final SolrInputField mutate(final SolrInputField srcField) {Collection<Object> vals = srcField.getValues();if (vals == null || vals.isEmpty()) return srcField;diff --git a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.javaindex 3cdb0706980..5bf1e6b77da 100644--- a/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java+++ b/solr/core/src/java/org/apache/solr/update/processor/AtomicUpdateDocumentMerger.java@@ -383,6 +383,9 @@ public class AtomicUpdateDocumentMerger {* false is returned. A false return indicates that this update can be re-tried as a full* atomic update. Returns true if the in-place update succeeds.*/+ @SuppressWarnings(+ "ReferenceEquality") // RealTimeGetComponent.DELETED is a unique sentinel; identity check is+ // intentionalpublic boolean doInPlaceUpdateMerge(AddUpdateCommand cmd, Set<String> updatedFields)throws IOException {SolrInputDocument inputDoc = cmd.getSolrInputDocument();diff --git a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.javaindex cbec1472649..7a6dbcde04d 100644--- a/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/DocBasedVersionConstraintsProcessor.java@@ -188,6 +188,8 @@ public class DocBasedVersionConstraintsProcessor extends UpdateRequestProcessor}}+ @SuppressWarnings(+ "ReferenceEquality") // DELETED is a unique sentinel; identity check is intentionalprivate DocFoundAndOldUserAndSolrVersions getOldUserVersionsFromFieldCache(BytesRef indexedDocId) {SolrInputDocument oldDoc =diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.javaindex 8593294b6f2..25b0d5a96fa 100644--- a/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldMutatingUpdateProcessor.java@@ -132,6 +132,9 @@ public abstract class FieldMutatingUpdateProcessor extends UpdateRequestProcesso* @return Either a new FieldNameSelector or one of the input selectors if the combination lends* itself to optimization.*/+ @SuppressWarnings(+ "ReferenceEquality") // SELECT_NO_FIELDS/SELECT_ALL_FIELDS are unique sentinels; identity+ // check is intentionalpublic static FieldNameSelector wrap(final FieldNameSelector includes, final FieldNameSelector excludes) {diff --git a/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java b/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.javaindex 1d81d6d84ed..4e41bb61f72 100644--- a/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java+++ b/solr/core/src/java/org/apache/solr/update/processor/FieldValueMutatingUpdateProcessor.java@@ -57,6 +57,9 @@ public abstract class FieldValueMutatingUpdateProcessor extends FieldMutatingUpdprotected abstract Object mutateValue(final Object src);@Override+ @SuppressWarnings(+ "ReferenceEquality") // DELETE_VALUE_SINGLETON is a unique sentinel; identity check is+ // intentionalprotected final SolrInputField mutate(final SolrInputField src) {Collection<Object> values = src.getValues();if (values == null) return src; // don't mutatediff --git a/solr/core/src/java/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.java b/solr/core/src/java/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.javaindex b93d2ef2527..59281eb4cb8 100644--- a/solr/core/src/java/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.java+++ b/solr/core/src/java/org/apache/solr/update/processor/SkipExistingDocumentsProcessorFactory.java@@ -191,6 +191,8 @@ public class SkipExistingDocumentsProcessorFactory extends UpdateRequestProcessoreturn this.skipUpdateIfMissing;}+ @SuppressWarnings(+ "ReferenceEquality") // DELETED is a unique sentinel; identity check is intentionalboolean doesDocumentExist(BytesRef indexedDocId) {assert null != indexedDocId;diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.javaindex 4ae2b55becb..c2f82da4989 100644--- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java+++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java@@ -1585,6 +1585,7 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {}@Test+ @SuppressWarnings("ReferenceEquality")public void testRandomGrouping() throws Exception {/** updateJ("{\"add\":{\"doc\":{\"id\":\"77\"}}}", params("commit","true"));@@ -1725,6 +1726,8 @@ public class TestGroupingSearch extends SolrTestCaseJ4 {// now sort the groups// if sort != group.sort, we need to find the max doc by "sort"+ // Identity check: groupComparator may deliberately be set to the same instance as+ // sortComparator above.if (groupComparator != sortComparator) {for (Grp grp : groups.values()) grp.setMaxDoc(sortComparator);}diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.javaindex 2e190f60f89..6b23340af58 100644--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java@@ -56,6 +56,7 @@ public class LeaderElectionIntegrationTest extends SolrCloudTestCase {}@Test+ @SuppressWarnings("ReferenceEquality")public void testSimpleSliceLeaderElection() throws Exception {String collection = "collection1";createCollection(collection);@@ -126,6 +127,7 @@ public class LeaderElectionIntegrationTest extends SolrCloudTestCase {// kill everyone but the first leader that should have reconnected by nowfor (JettySolrRunner jetty2 : cluster.getJettySolrRunners()) {+ // Identity check: skip the one instance we want to keep running.if (jetty != jetty2) {jetty2.stop();}diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.javaindex 101ee2a09b3..e581c574016 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestApiFramework.java@@ -278,12 +278,14 @@ public class TestApiFramework extends SolrTestCaseJ4 {return rsp;}+ @SuppressWarnings("ReferenceEquality")private SolrQueryResponse invoke(PluginBag<SolrRequestHandler> reqHandlers,String path,String fullPath,CoreContainer mockCC) {HashMap<String, String> parts = new HashMap<>();+ // Identity check: is reqHandlers the container's own handler bag, or a substitute?boolean containerHandlerLookup = mockCC.getRequestHandlers() == reqHandlers;path = path == null ? fullPath : path;Api api = null;diff --git a/solr/core/src/test/org/apache/solr/handler/admin/api/ClusterCommandsTest.java b/solr/core/src/test/org/apache/solr/handler/admin/api/ClusterCommandsTest.javaindex dc6857cfa28..ff05e70c010 100644--- a/solr/core/src/test/org/apache/solr/handler/admin/api/ClusterCommandsTest.java+++ b/solr/core/src/test/org/apache/solr/handler/admin/api/ClusterCommandsTest.java@@ -19,7 +19,7 @@ package org.apache.solr.handler.admin.api;import java.util.concurrent.TimeUnit;import org.apache.solr.client.api.model.DeleteClusterCommandStatusResponse;import org.apache.solr.client.api.model.GetClusterCommandStatusResponse;-import org.apache.solr.client.api.model.GetClusterCommandStatusResponse.CommandStatus.State;+import org.apache.solr.client.api.model.GetClusterCommandStatusResponse.CommandStatus.RequestState;import org.apache.solr.client.solrj.SolrClient;import org.apache.solr.client.solrj.request.ClusterApi;import org.apache.solr.client.solrj.request.CollectionAdminRequest;@@ -49,7 +49,7 @@ public class ClusterCommandsTest extends SolrCloudTestCase {assertNotNull(rsp);assertNull(rsp.error);- assertEquals(State.NOT_FOUND, rsp.status.state);+ assertEquals(RequestState.NOT_FOUND, rsp.status.state);assertEquals("Did not find [does-not-exist] in any tasks queue", rsp.status.msg);}@@ -61,7 +61,7 @@ public class ClusterCommandsTest extends SolrCloudTestCase {CollectionAdminRequest.createCollection(collection, "conf1", 1, 1).processAsync(client);GetClusterCommandStatusResponse getRsp = waitForCompleted(asyncId, client);- assertEquals(State.COMPLETED, getRsp.status.state);+ assertEquals(RequestState.COMPLETED, getRsp.status.state);assertEquals("found [" + asyncId + "] in completed tasks", getRsp.status.msg);assertTrue("completed create should include sub-responses from the original command",@@ -74,7 +74,7 @@ public class ClusterCommandsTest extends SolrCloudTestCase {GetClusterCommandStatusResponse afterDelete =new ClusterApi.GetClusterCommandStatus(asyncId).process(client);- assertEquals(State.NOT_FOUND, afterDelete.status.state);+ assertEquals(RequestState.NOT_FOUND, afterDelete.status.state);}@Test@@ -102,9 +102,11 @@ public class ClusterCommandsTest extends SolrCloudTestCase {assertEquals("successfully cleared stored collection api responses", flushRsp.status);assertEquals(- State.NOT_FOUND, new ClusterApi.GetClusterCommandStatus(id1).process(client).status.state);+ RequestState.NOT_FOUND,+ new ClusterApi.GetClusterCommandStatus(id1).process(client).status.state);assertEquals(- State.NOT_FOUND, new ClusterApi.GetClusterCommandStatus(id2).process(client).status.state);+ RequestState.NOT_FOUND,+ new ClusterApi.GetClusterCommandStatus(id2).process(client).status.state);}private static GetClusterCommandStatusResponse waitForCompleted(String id, SolrClient client)@@ -113,16 +115,16 @@ public class ClusterCommandsTest extends SolrCloudTestCase {long endTime = System.nanoTime() + TimeUnit.SECONDS.toNanos(MAX_WAIT_TIMEOUT);while (System.nanoTime() < endTime) {rsp = new ClusterApi.GetClusterCommandStatus(id).process(client);- State state = rsp.status.state;- assumeTrue("Error creating collection - skipping test", state != State.FAILED);- if (state == State.COMPLETED) {+ RequestState state = rsp.status.state;+ assumeTrue("Error creating collection - skipping test", state != RequestState.FAILED);+ if (state == RequestState.COMPLETED) {return rsp;}TimeUnit.SECONDS.sleep(1);}assumeTrue("Timed out waiting for async request " + id,- rsp != null && State.COMPLETED.equals(rsp.status.state));+ rsp != null && RequestState.COMPLETED.equals(rsp.status.state));return rsp;}}diff --git a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java b/solr/core/src/test/org/apache/solr/pkg/TestPackages.javaindex 597e2044544..b519e2c3d3a 100644--- a/solr/core/src/test/org/apache/solr/pkg/TestPackages.java+++ b/solr/core/src/test/org/apache/solr/pkg/TestPackages.java@@ -740,6 +740,7 @@ public class TestPackages extends SolrCloudTestCase {}@Test+ @SuppressWarnings("ReferenceEquality")public void testSchemaPlugins() throws Exception {String COLLECTION_NAME = "testSchemaLoadingColl";System.setProperty("managed.schema.mutable", "true");diff --git a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.javaindex e4cb2156890..4d79661b692 100644--- a/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java+++ b/solr/core/src/test/org/apache/solr/schema/TestManagedSchemaThreadSafety.java@@ -63,9 +63,11 @@ public class TestManagedSchemaThreadSafety extends SolrTestCaseJ4 {.withTimeout(ZK_CLIENT_TIMEOUT, TimeUnit.MILLISECONDS));}+ @SuppressWarnings("ReferenceEquality")boolean isSlowpoke() {Thread youKnow;if ((youKnow = slowpoke.get()) != null) {+ // Thread identity comparison is intentional (and Thread has no meaningful equals()).return youKnow == Thread.currentThread();} else {return slowpoke.compareAndSet(null, Thread.currentThread());diff --git a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.javaindex a061d6ea7b2..150efb6483c 100644--- a/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java+++ b/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java@@ -3784,6 +3784,7 @@ public class TestJsonFacets extends SolrTestCaseHS {* @param extraSubFacet if an extra sub facet should be included, this hits slightly diff code* paths*/+ @SuppressWarnings("ReferenceEquality")public void doTestPrelimSorting(final Client client, final boolean extraAgg, final boolean extraSubFacet) throws Exception {@@ -3799,6 +3800,7 @@ public class TestJsonFacets extends SolrTestCaseHS {// (which will affect some assertions)final SolrClient shardA = clients.get(0);final SolrClient shardB = clients.get(clients.size() - 1);+ // Identity check: same client instance means a single-node setup.final int numShardsWithData = (shardA == shardB) ? 1 : 2;// for simplicity, each foo_s "term" exists on each shard in the same number of docs as it'sdiff --git a/solr/core/src/test/org/apache/solr/search/function/AggValueSourceTest.java b/solr/core/src/test/org/apache/solr/search/function/AggValueSourceTest.javaindex 5946d4dc955..57099fcc6a6 100644--- a/solr/core/src/test/org/apache/solr/search/function/AggValueSourceTest.java+++ b/solr/core/src/test/org/apache/solr/search/function/AggValueSourceTest.java@@ -45,8 +45,10 @@ public class AggValueSourceTest extends SolrTestCase {}@Override+ @SuppressWarnings("ReferenceEquality")public SlotAcc createSlotAcc(FacetContext fcontext, long numDocs, int numSlots) {// check we can get access to the request and searcher, via the context+ // Identity check: verifying request and searcher share the exact same SolrCore instance.if (fcontext.getRequest().getCore() != fcontext.getSearcher().getCore()) {throw new IllegalStateException("Searcher and request out of sync");}diff --git a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.javaindex 3e9ee3b70b9..060d9d47c1b 100644--- a/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java+++ b/solr/core/src/test/org/apache/solr/uninverting/TestFieldCacheSortRandom.java@@ -351,7 +351,9 @@ public class TestFieldCacheSortRandom extends SolrTestCase {return sameClassAs(other) && equalsTo(getClass().cast(other));}+ @SuppressWarnings("ReferenceEquality")private boolean equalsTo(RandomQuery other) {+ // Consistent with hashCode(), which uses System.identityHashCode(docValues) below.return seed == other.seed && docValues == other.docValues && density == other.density;}diff --git a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.javaindex a5109562d0d..65b9541d4c2 100644--- a/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java+++ b/solr/core/src/test/org/apache/solr/update/TestInPlaceUpdatesStandalone.java@@ -1216,7 +1216,7 @@ public class TestInPlaceUpdatesStandalone extends SolrTestCaseJ4 {* TestInPlaceUpdatesStandalone#HARDCOMMIT} or {@link TestInPlaceUpdatesStandalone#SOFTCOMMIT}* sentinel objects.*/- @SuppressWarnings({"unchecked", "rawtypes"})+ @SuppressWarnings({"unchecked", "rawtypes", "ReferenceEquality"})public void checkReplay(final String valField, Object... commands) throws Exception {HashMap<Integer, DocInfo> model = new LinkedHashMap<>();diff --git a/solr/cross-dc-manager/gradle.lockfile b/solr/cross-dc-manager/gradle.lockfileindex 79e18051748..e7f4ddaafe5 100644--- a/solr/cross-dc-manager/gradle.lockfile+++ b/solr/cross-dc-manager/gradle.lockfile@@ -23,11 +23,11 @@ com.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessorcom.google.code.gson:gson:2.14.0=jarValidation,runtimeClasspath,runtimeLibs,testRuntimeClasspath-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/analysis-extras/gradle.lockfile b/solr/modules/analysis-extras/gradle.lockfileindex 235a8594be7..5d2073519d0 100644--- a/solr/modules/analysis-extras/gradle.lockfile+++ b/solr/modules/analysis-extras/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/clustering/gradle.lockfile b/solr/modules/clustering/gradle.lockfileindex 6805293d44a..1f48c17dc79 100644--- a/solr/modules/clustering/gradle.lockfile+++ b/solr/modules/clustering/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/cross-dc/gradle.lockfile b/solr/modules/cross-dc/gradle.lockfileindex c66f4b097fa..adc7fc8b678 100644--- a/solr/modules/cross-dc/gradle.lockfile+++ b/solr/modules/cross-dc/gradle.lockfile@@ -19,11 +19,11 @@ com.github.luben:zstd-jni:1.5.6-10=jarValidation,runtimeClasspath,runtimeLibs,tecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/cuvs/gradle.lockfile b/solr/modules/cuvs/gradle.lockfileindex e62d4f23979..9918580000a 100644--- a/solr/modules/cuvs/gradle.lockfile+++ b/solr/modules/cuvs/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/extraction/gradle.lockfile b/solr/modules/extraction/gradle.lockfileindex 40fd886cdca..be3c21c0149 100644--- a/solr/modules/extraction/gradle.lockfile+++ b/solr/modules/extraction/gradle.lockfile@@ -20,11 +20,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/gcs-repository/gradle.lockfile b/solr/modules/gcs-repository/gradle.lockfileindex ee670fe7324..049b7d689b4 100644--- a/solr/modules/gcs-repository/gradle.lockfile+++ b/solr/modules/gcs-repository/gradle.lockfile@@ -40,11 +40,11 @@ com.google.cloud:google-cloud-core:2.74.0=compileClasspath,jarValidation,runtimecom.google.cloud:google-cloud-nio:0.136.0=jarValidation,testCompileClasspath,testRuntimeClasspathcom.google.cloud:google-cloud-storage:2.72.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspathcom.google.code.gson:gson:2.14.0=compileClasspath,jarValidation,runtimeClasspath,runtimeLibs,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/jwt-auth/gradle.lockfile b/solr/modules/jwt-auth/gradle.lockfileindex acdb4e22107..4b2df65c7d9 100644--- a/solr/modules/jwt-auth/gradle.lockfile+++ b/solr/modules/jwt-auth/gradle.lockfile@@ -19,11 +19,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=jarValidation,testCompileClasspacom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/langid/gradle.lockfile b/solr/modules/langid/gradle.lockfileindex cb10126f629..f0fe7652bc3 100644--- a/solr/modules/langid/gradle.lockfile+++ b/solr/modules/langid/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/language-models/gradle.lockfile b/solr/modules/language-models/gradle.lockfileindex b710cb47830..30cff458954 100644--- a/solr/modules/language-models/gradle.lockfile+++ b/solr/modules/language-models/gradle.lockfile@@ -18,11 +18,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,jarValidationcom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/ltr/gradle.lockfile b/solr/modules/ltr/gradle.lockfileindex 69ec5ff7600..ebcb462a4b1 100644--- a/solr/modules/ltr/gradle.lockfile+++ b/solr/modules/ltr/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.javaindex 37362c80642..ae0f23a0d1f 100644--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.java+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/feature/SolrFeature.java@@ -135,6 +135,7 @@ public class SolrFeature extends Feature {public class SolrFeatureWeight extends FeatureWeight {private final Weight solrQueryWeight;+ @SuppressWarnings("ReferenceEquality")public SolrFeatureWeight(SolrIndexSearcher searcher,SolrQueryRequest request,@@ -189,6 +190,8 @@ public class SolrFeature extends Feature {}DocSet filtersDocSet = searcher.getDocSet(filterQueries); // execute+ // getDocSet() returns the live docs instance itself when there's nothing to filter;+ // identity comparison detects that no-op case.if (filtersDocSet != searcher.getLiveDocSet()) {filterDocSetQuery = filtersDocSet.makeQuery();}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 21cca228858..33945bb8074 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@@ -286,8 +286,10 @@ public abstract class LTRScoringModel implements Accountable {}}+ @SuppressWarnings("ReferenceEquality")public Explanation getNormalizerExplanation(Explanation e, int idx) {Normalizer n = norms.get(idx);+ // IdentityNormalizer.INSTANCE is a singleton; identity comparison is intentional.if (n != IdentityNormalizer.INSTANCE) {return n.explain(e);}diff --git a/solr/modules/opentelemetry/gradle.lockfile b/solr/modules/opentelemetry/gradle.lockfileindex 391274fdbfa..2b4ee796954 100644--- a/solr/modules/opentelemetry/gradle.lockfile+++ b/solr/modules/opentelemetry/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/s3-repository/gradle.lockfile b/solr/modules/s3-repository/gradle.lockfileindex 2184648585b..1381f8bdcbb 100644--- a/solr/modules/s3-repository/gradle.lockfile+++ b/solr/modules/s3-repository/gradle.lockfile@@ -21,11 +21,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/scripting/gradle.lockfile b/solr/modules/scripting/gradle.lockfileindex 22ad3c839cf..ec10baf4e8f 100644--- a/solr/modules/scripting/gradle.lockfile+++ b/solr/modules/scripting/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/sql/gradle.lockfile b/solr/modules/sql/gradle.lockfileindex 55b71dbbeee..82673614124 100644--- a/solr/modules/sql/gradle.lockfile+++ b/solr/modules/sql/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,runtimeLibs,solrPlatformLibs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrAggregate.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrAggregate.javaindex 293d63e787a..57ce4922fc6 100644--- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrAggregate.java+++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrAggregate.java@@ -55,6 +55,7 @@ class SolrAggregate extends Aggregate implements SolrRel {return String.format(Locale.ROOT, "%s(%s)", funcName, column);}+ @SuppressWarnings("ReferenceEquality")SolrAggregate(RelOptCluster cluster,RelTraitSet traitSet,@@ -64,6 +65,7 @@ class SolrAggregate extends Aggregate implements SolrRel {List<ImmutableBitSet> groupSets,List<AggregateCall> aggCalls) {super(cluster, traitSet, hints, child, groupSet, groupSets, aggCalls);+ // Conventions are singletons (see SolrRel.CONVENTION); identity comparison is intentional.assert getConvention() == SolrRel.CONVENTION;assert getConvention() == child.getConvention();}diff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.javaindex b8a326f6241..f168e3ad67a 100644--- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java+++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrFilter.java@@ -77,8 +77,10 @@ class SolrFilter extends Filter implements SolrRel {private final RexBuilder builder;+ @SuppressWarnings("ReferenceEquality")SolrFilter(RelOptCluster cluster, RelTraitSet traitSet, RelNode child, RexNode condition) {super(cluster, traitSet, child, condition);+ // Conventions are singletons (see SolrRel.CONVENTION); identity comparison is intentional.assert getConvention() == SolrRel.CONVENTION;assert getConvention() == child.getConvention();builder = child.getCluster().getRexBuilder();diff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrProject.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrProject.javaindex 87ac4633b8a..121f3536c2a 100644--- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrProject.java+++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrProject.java@@ -30,6 +30,7 @@ import org.apache.calcite.util.Pair;/** Implementation of {@link org.apache.calcite.rel.core.Project} relational expression in Solr. */class SolrProject extends Project implements SolrRel {+ @SuppressWarnings("ReferenceEquality")SolrProject(RelOptCluster cluster,RelTraitSet traitSet,@@ -37,6 +38,7 @@ class SolrProject extends Project implements SolrRel {List<? extends RexNode> projects,RelDataType rowType) {super(cluster, traitSet, input, projects, rowType);+ // Conventions are singletons (see SolrRel.CONVENTION); identity comparison is intentional.assert getConvention() == SolrRel.CONVENTION;assert getConvention() == input.getConvention();}diff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrSort.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrSort.javaindex f5fb75d9d48..2c0c3ed9d64 100644--- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrSort.java+++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrSort.java@@ -33,6 +33,7 @@ import org.apache.calcite.rex.RexNode;/** Implementation of {@link org.apache.calcite.rel.core.Sort} relational expression in Solr. */class SolrSort extends Sort implements SolrRel {+ @SuppressWarnings("ReferenceEquality")SolrSort(RelOptCluster cluster,RelTraitSet traitSet,@@ -42,6 +43,7 @@ class SolrSort extends Sort implements SolrRel {RexNode fetch) {super(cluster, traitSet, child, collation, offset, fetch);+ // Conventions are singletons (see SolrRel.CONVENTION); identity comparison is intentional.assert getConvention() == SolrRel.CONVENTION;assert getConvention() == child.getConvention();}diff --git a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrTableScan.java b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrTableScan.javaindex f2ae04e33fb..8217af20f0e 100644--- a/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrTableScan.java+++ b/solr/modules/sql/src/java/org/apache/solr/handler/sql/SolrTableScan.java@@ -44,6 +44,7 @@ class SolrTableScan extends TableScan implements SolrRel {* @param solrTable Solr table* @param projectRowType Fields and types to project; null to project raw row*/+ @SuppressWarnings("ReferenceEquality")SolrTableScan(RelOptCluster cluster,RelTraitSet traitSet,@@ -55,6 +56,7 @@ class SolrTableScan extends TableScan implements SolrRel {this.projectRowType = projectRowType;assert solrTable != null;+ // Conventions are singletons (see SolrRel.CONVENTION); identity comparison is intentional.assert getConvention() == SolrRel.CONVENTION;}diff --git a/solr/server/gradle.lockfile b/solr/server/gradle.lockfileindex b76e86b7a89..4086feee710 100644--- a/solr/server/gradle.lockfile+++ b/solr/server/gradle.lockfile@@ -16,11 +16,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessor-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessorcom.google.guava:guava:33.7.1-jre=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessorcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,runtimeClasspath,solrCore,testAnnotationProcessordiff --git a/solr/solr-ref-guide/gradle.lockfile b/solr/solr-ref-guide/gradle.lockfileindex c07281d16cd..110c44f1131 100644--- a/solr/solr-ref-guide/gradle.lockfile+++ b/solr/solr-ref-guide/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/solrj-jetty/gradle.lockfile b/solr/solrj-jetty/gradle.lockfileindex ab7a4556e4a..f73618cdef5 100644--- a/solr/solrj-jetty/gradle.lockfile+++ b/solr/solrj-jetty/gradle.lockfile@@ -18,11 +18,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,jarValidationcom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/solrj-streaming/gradle.lockfile b/solr/solrj-streaming/gradle.lockfileindex 9a3c0a9cba3..9c8038cd0e7 100644--- a/solr/solrj-streaming/gradle.lockfile+++ b/solr/solrj-streaming/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.javaindex 57f4f5da259..e8085508fe2 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java@@ -106,7 +106,7 @@ public class FieldComparator implements StreamComparator {* check only once - we can do that in the constructor of this class, create a lambda, and then execute* that lambda in the compare function. A bit of branch prediction savings right here.*/- @SuppressWarnings({"unchecked"})+ @SuppressWarnings({"unchecked", "ReferenceEquality"}) // fast path: same ref implies equalprivate void assignComparator() {if (ComparatorOrder.DESCENDING == order) {comparator =diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.javaindex 78ca78a9fdc..360e5897905 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eq/FieldEqualitor.java@@ -76,7 +76,7 @@ public class FieldEqualitor implements StreamEqualitor {}@Override- @SuppressWarnings({"unchecked"})+ @SuppressWarnings({"unchecked", "ReferenceEquality"}) // fast path: same ref implies equalpublic boolean test(Tuple leftTuple, Tuple rightTuple) {@SuppressWarnings({"rawtypes"})diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.javaindex 5209d29e4be..e49174bf241 100644--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JavabinTupleStreamParser.java@@ -43,6 +43,8 @@ public class JavabinTupleStreamParser extends JavaBinCodec implements TupleStreathis.fis = initRead(is);}+ @SuppressWarnings(+ "ReferenceEquality") // END_OBJ is a unique sentinel; identity check is intentionalprivate boolean readTillDocs() throws IOException {if (isObjectType(fis)) {if (tagByte == SOLRDOCLST) {@@ -177,7 +179,10 @@ public class JavabinTupleStreamParser extends JavaBinCodec implements TupleStrea}@Override- @SuppressWarnings({"unchecked"})+ @SuppressWarnings({+ "unchecked",+ "ReferenceEquality" // END_OBJ is a unique sentinel; identity check is intentional+ })public Map<String, Object> next() throws IOException {if (!atDocs) {atDocs = true;diff --git a/solr/solrj-zookeeper/gradle.lockfile b/solr/solrj-zookeeper/gradle.lockfileindex 3aa75d271f8..6bc5794cca5 100644--- a/solr/solrj-zookeeper/gradle.lockfile+++ b/solr/solrj-zookeeper/gradle.lockfile@@ -18,11 +18,11 @@ com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspathcom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.javaindex 7e416ec3ee7..980f39e6cab 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/cloud/ZkStateReader.java@@ -1263,6 +1263,8 @@ public class ZkStateReader implements SolrCloseable {}@Override+ @SuppressWarnings(+ "ReferenceEquality") // checking identity of the registered watcher, not equalitypublic void process(WatchedEvent event) {// session events are not change events, and do not remove the watcherif (EventType.None.equals(event.getType())) {@@ -2000,6 +2002,8 @@ public class ZkStateReader implements SolrCloseable {* modifications, giving up after 30 seconds with a SolrException. The caller should understand* it's possible the aliases has further changed if it examines it.*/+ @SuppressWarnings(+ "ReferenceEquality") // op.apply returning the same instance means "no change made"public void applyModificationAndExportToZk(UnaryOperator<Aliases> op) {// The current aliases hasn't been update()'ed yet -- which is impossible? Any way just// update it first.diff --git a/solr/solrj/gradle.lockfile b/solr/solrj/gradle.lockfileindex ef914c21dd0..075cdca0ea1 100644--- a/solr/solrj/gradle.lockfile+++ b/solr/solrj/gradle.lockfile@@ -18,11 +18,11 @@ com.github.stephenc.jcip:jcip-annotations:1.0-1=compileClasspath,jarValidationcom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateBaseSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateBaseSolrClient.javaindex 5baeaec60a9..50ab27f1dc4 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateBaseSolrClient.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/ConcurrentUpdateBaseSolrClient.java@@ -141,6 +141,8 @@ public abstract class ConcurrentUpdateBaseSolrClient extends SolrClient {return size() == 0;}+ @SuppressWarnings(+ "ReferenceEquality") // backdoorE is a unique sentinel; identity check is intentionalpublic E poll(long timeout, TimeUnit unit) throws InterruptedException {E e = queue.poll(timeout, unit);if (e == null) {diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java b/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.javaindex 5da32870e04..9f232e48b5f 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java@@ -218,6 +218,8 @@ public class JavaBinUpdateRequestCodec {return List.of(); // bogus; already processed}+ @SuppressWarnings(+ "ReferenceEquality") // END_OBJ is a unique sentinel; identity check is intentionalprivate void readDocs(DataInputInputStream fis) throws IOException {if (resultNamedList == null) resultNamedList = new NamedList<>();diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/response/ResponseParser.java b/solr/solrj/src/java/org/apache/solr/client/solrj/response/ResponseParser.javaindex 9884d8a1ef5..47dfdccedee 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/response/ResponseParser.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/response/ResponseParser.java@@ -34,6 +34,7 @@ public abstract class ResponseParser {assert validateContentTypes();}+ @SuppressWarnings("ReferenceEquality") // Use of == is intentional hereprivate boolean validateContentTypes() {Collection<String> contentTypes = getContentTypes();assert contentTypes == getContentTypes()diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/routing/RequestReplicaListTransformerGenerator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/routing/RequestReplicaListTransformerGenerator.javaindex 4071dd7527f..d3bfaf7eee6 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/routing/RequestReplicaListTransformerGenerator.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/routing/RequestReplicaListTransformerGenerator.java@@ -216,7 +216,7 @@ public class RequestReplicaListTransformerGenerator {if (log.isDebugEnabled()) {log.debug("Applied sorting preferences to replica list: {}",- choices.stream().map(T::toString).collect(Collectors.joining(",", "[", "]")));+ choices.stream().map(Object::toString).collect(Collectors.joining(",", "[", "]")));}}}diff --git a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.javaindex 39dac664d18..91e4da4a2bc 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java@@ -48,7 +48,7 @@ public class CommandOperation {public String getStr(String key, String def) {if (ROOT_OBJ.equals(key)) {Object obj = getRootPrimitive();- return obj == def ? null : String.valueOf(obj);+ return obj == null ? def : String.valueOf(obj);}Object o = getMapVal(key);return o == null ? def : String.valueOf(o);diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.javaindex 12f7f4cf4bb..f1db025fe4f 100644--- a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java+++ b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java@@ -826,6 +826,8 @@ public class JavaBinCodec implements PushWriter {}}+ @SuppressWarnings(+ "ReferenceEquality") // END_OBJ is a unique sentinel; identity check is intentionalpublic Map<Object, Object> readMapIter(DataInputInputStream dis) throws IOException {Map<Object, Object> m = newMap(-1);for (; ; ) {@@ -931,6 +933,8 @@ public class JavaBinCodec implements PushWriter {writeTag(END);}+ @SuppressWarnings(+ "ReferenceEquality") // END_OBJ is a unique sentinel; identity check is intentionalpublic List<Object> readIterator(DataInputInputStream fis) throws IOException {ArrayList<Object> l = new ArrayList<>();while (true) {@@ -1237,6 +1241,8 @@ public class JavaBinCodec implements PushWriter {daos.writeFloat(val);}+ @SuppressWarnings(+ "ReferenceEquality") // END_OBJ is a unique sentinel; identity check is intentionalpublic boolean writePrimitive(Object val) throws IOException {if (val == null) {daos.writeByte(NULL);diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestFastWriter.java b/solr/solrj/src/test/org/apache/solr/common/util/TestFastWriter.javaindex 382c2093c98..71a95f4912b 100644--- a/solr/solrj/src/test/org/apache/solr/common/util/TestFastWriter.java+++ b/solr/solrj/src/test/org/apache/solr/common/util/TestFastWriter.java@@ -33,7 +33,9 @@ class MemWriter extends FastWriter {}@Override+ @SuppressWarnings("ReferenceEquality")public void flush(char[] arr, int offset, int len) throws IOException {+ // Identity check: only steal the internal buffer when it's the exact same array instance.if (arr == buf && offset == 0 && len == buf.length) {buffers.add(buf); // steal the bufferbuf = new char[r.nextInt(9000) + 1];diff --git a/solr/test-framework/gradle.lockfile b/solr/test-framework/gradle.lockfileindex fe7a9b5ac07..309368d720e 100644--- a/solr/test-framework/gradle.lockfile+++ b/solr/test-framework/gradle.lockfile@@ -19,11 +19,11 @@ com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspathcom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,compileClasspath,errorprone,jarValidation,runtimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathdiff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.javaindex 219f5e19a03..ebb8f95c2c9 100644--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java@@ -905,6 +905,7 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {return null;}+ @SuppressWarnings("ReferenceEquality") // fast path: same ref implies equalpublic static String compare(Object a, Object b, int flags, Map<String, Integer> handle) {if (a == b) return null;if (a == null || b == null) return ":" + a + "!=" + b;diff --git a/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.javaindex 08df42a6c8f..88bb48b1b1a 100644--- a/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java+++ b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java@@ -215,6 +215,7 @@ class CollectionTester {return match();}+ @SuppressWarnings("ReferenceEquality") // fast path: same ref implies equalboolean match() {if (expected == val) {return true;diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.javaindex 141b6db0a7f..e77fa41fcad 100644--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java@@ -472,6 +472,8 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {randomizeNumericTypesProperties();}+ @SuppressWarnings(+ "ReferenceEquality") // detecting a self-referencing exception cause loop, by identitypublic static Throwable getWrappedException(Throwable e) {while (e != null && e.getCause() != e && e.getCause() != null) {e = e.getCause();@@ -2285,6 +2287,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {Files.copy(top.resolve("synonyms.txt"), subHome.resolve("synonyms.txt"));}+ @SuppressWarnings("ReferenceEquality") // fast path: same ref implies equalpublic boolean compareSolrDocument(Object expected, Object actual) {if (!(expected instanceof SolrDocument solrDocument1)@@ -2335,6 +2338,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {}}+ @SuppressWarnings("ReferenceEquality") // fast path: same ref implies equalpublic boolean compareSolrDocumentList(Object expected, Object actual) {if (!(expected instanceof SolrDocumentList list1)|| !(actual instanceof SolrDocumentList list2)) {@@ -2366,6 +2370,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {return true;}+ @SuppressWarnings("ReferenceEquality") // fast path: same ref implies equalpublic boolean compareSolrInputDocument(Object expected, Object actual) {if (!(expected instanceof SolrInputDocument sdoc1)@@ -2440,6 +2445,7 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {}}+ @SuppressWarnings("ReferenceEquality") // fast path: same ref implies equalpublic boolean assertSolrInputFieldEquals(Object expected, Object actual) {if (!(expected instanceof SolrInputField sif1) || !(actual instanceof SolrInputField sif2)) {return false;@@ -2557,6 +2563,8 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {return result;}+ @SuppressWarnings(+ "ReferenceEquality") // SolrIndexSearcher identity, not equality, is what matters hereprotected static void waitForWarming(SolrCore core) throws InterruptedException {RefCounted<SolrIndexSearcher> registeredSearcher = core.getRegisteredSearcher();RefCounted<SolrIndexSearcher> newestSearcher = core.getNewestSearcher(false);diff --git a/solr/test-framework/src/java/org/apache/solr/cluster/placement/Builders.java b/solr/test-framework/src/java/org/apache/solr/cluster/placement/Builders.javaindex 03cc9522838..f363239a565 100644--- a/solr/test-framework/src/java/org/apache/solr/cluster/placement/Builders.java+++ b/solr/test-framework/src/java/org/apache/solr/cluster/placement/Builders.java@@ -515,6 +515,8 @@ public class Builders {return this;}+ @SuppressWarnings(+ "ReferenceEquality") // ReplicaBuilder identity, not equality, is what matters herepublic Shard build(SolrCollection collection) {ClusterAbstractionsForTest.ShardImpl shard =new ClusterAbstractionsForTest.ShardImpl(shardName, collection, Shard.ShardState.ACTIVE);diff --git a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.javaindex aea83190d9f..ff8253853ff 100644--- a/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java+++ b/solr/test-framework/src/java/org/apache/solr/embedded/JettySolrRunner.java@@ -588,6 +588,8 @@ public class JettySolrRunner implements SolrBackend {* @param ioe An IOException that might wrap a BindException* @return A bind exception if present otherwise ioe*/+ @SuppressWarnings(+ "ReferenceEquality") // detecting a self-referencing exception cause loop, by identityException lookForBindException(IOException ioe) {Exception e = ioe;while (e.getCause() != null && !(e == e.getCause()) && !(e instanceof BindException)) {diff --git a/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java b/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.javaindex 89778e80ae9..d178473034a 100644--- a/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java+++ b/solr/test-framework/src/java/org/apache/solr/util/RevertDefaultThreadHandlerRule.java@@ -28,6 +28,8 @@ public final class RevertDefaultThreadHandlerRule implements TestRule {private static final AtomicBoolean applied = new AtomicBoolean();@Override+ @SuppressWarnings(+ "ReferenceEquality") // UncaughtExceptionHandler identity, not equality, is what matters herepublic Statement apply(Statement s, Description d) {return new StatementAdapter(s) {@Overridediff --git a/solr/webapp/gradle.lockfile b/solr/webapp/gradle.lockfileindex ca453a10dda..d0833bbe87a 100644--- a/solr/webapp/gradle.lockfile+++ b/solr/webapp/gradle.lockfile@@ -17,11 +17,11 @@ com.github.kevinstern:software-and-algorithms:1.0=annotationProcessor,errorpronecom.google.auto.service:auto-service-annotations:1.0.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto.value:auto-value-annotations:1.11.1=annotationProcessor,errorprone,testAnnotationProcessorcom.google.auto:auto-common:1.2.2=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_annotation:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_annotation:2.50.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.errorprone:error_prone_annotations:2.50.0=annotationProcessor,errorprone,jarValidation,solrCore,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath-com.google.errorprone:error_prone_check_api:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.errorprone:error_prone_core:2.41.0=annotationProcessor,errorprone,testAnnotationProcessor-com.google.googlejavaformat:google-java-format:1.27.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_check_api:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.errorprone:error_prone_core:2.50.0=annotationProcessor,errorprone,testAnnotationProcessor+com.google.googlejavaformat:google-java-format:1.35.0=annotationProcessor,errorprone,testAnnotationProcessorcom.google.guava:failureaccess:1.0.3=annotationProcessor,errorprone,jarValidation,solrCore,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:guava:33.7.1-jre=annotationProcessor,errorprone,jarValidation,solrCore,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspathcom.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,errorprone,jarValidation,solrCore,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath