Apache Solr open-source search software
SOLR-16427: Evaluate and fix errorprone rules - ReferenceEquality
Kevin Risden7994a6e76716
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradleindex fa61cabb918..24e830b51f6 100644--- a/gradle/validation/error-prone.gradle+++ b/gradle/validation/error-prone.gradle@@ -107,7 +107,6 @@ allprojects { prj ->'-Xep:ObjectToString:OFF','-Xep:ObjectsHashCodePrimitive:OFF','-Xep:OperatorPrecedence:OFF',- '-Xep:ReferenceEquality:OFF','-Xep:ReturnValueIgnored:OFF','-Xep:SameNameButDifferent:OFF','-Xep:ShortCircuitBoolean:OFF',diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.javaindex c6d9c59c568..bd74baf4c1f 100644--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java@@ -800,7 +800,7 @@ public class ZkController implements Closeable {// if this replica is not a leader, it will be put in recovery state by the leaderString leader = cd.getCloudDescriptor().getCoreNodeName();- if (shard.getReplica(leader) != shard.getLeader()) return;+ if (!Objects.equals(shard.getReplica(leader), shard.getLeader())) return;Set<String> liveNodes = getClusterState().getLiveNodes();int numActiveReplicas =diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.javaindex bca57ccb169..01514af713b 100644--- a/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/SliceMutator.java@@ -160,7 +160,7 @@ public class SliceMutator {ZkCoreNodeProps.getCoreUrl(replica.getBaseUrl(), replica.getStr(ZkStateReader.CORE_NAME_PROP));- if (replica == oldLeader && !coreURL.equals(leaderUrl)) {+ if (replica.equals(oldLeader) && !coreURL.equals(leaderUrl)) {replica = ReplicaMutator.unsetLeader(replica);} else if (coreURL.equals(leaderUrl)) {newLeader = replica = ReplicaMutator.setLeader(replica);diff --git a/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.javaindex 645add25791..8089372713e 100644--- a/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java+++ b/solr/core/src/java/org/apache/solr/core/IndexDeletionPolicyWrapper.java@@ -24,6 +24,7 @@ import java.util.Collections;import java.util.Comparator;import java.util.List;import java.util.Map;+import java.util.Objects;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeUnit;import java.util.concurrent.atomic.AtomicInteger;@@ -473,7 +474,7 @@ public final class IndexDeletionPolicyWrapper extends IndexDeletionPolicy {assert (list.isEmpty() || null != latestCommit) : "Code flaw: How is latestCommit not set yet?";assert (null == latestCommit || !latestCommit.isDeleted()): "Code flaw: How did the latestCommit get set but deleted?";- assert (list.isEmpty() || latestCommit == list.get(list.size() - 1).delegate)+ assert (list.isEmpty() || Objects.equals(latestCommit, list.get(list.size() - 1).delegate)): "Code flaw, updateLatestCommit() should have already been called";final Map<Long, IndexCommit> map = new ConcurrentHashMap<>();diff --git a/solr/core/src/java/org/apache/solr/core/SolrConfig.java b/solr/core/src/java/org/apache/solr/core/SolrConfig.javaindex eb1f82e401a..a3be18156c5 100644--- a/solr/core/src/java/org/apache/solr/core/SolrConfig.java+++ b/solr/core/src/java/org/apache/solr/core/SolrConfig.java@@ -417,7 +417,7 @@ public class SolrConfig implements MapSerializable {pe);}- if (version == Version.LATEST && !versionWarningAlreadyLogged.getAndSet(true)) {+ if (Objects.equals(version, Version.LATEST) && !versionWarningAlreadyLogged.getAndSet(true)) {log.warn("You should not use LATEST as luceneMatchVersion property: "+ "if you use this setting, and then Solr upgrades to a newer release of Lucene, "diff --git a/solr/core/src/java/org/apache/solr/core/SolrCores.java b/solr/core/src/java/org/apache/solr/core/SolrCores.javaindex 36847bf83db..bc868568889 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCores.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCores.java@@ -334,7 +334,7 @@ class SolrCores {if (core == null) {core = getTransientCacheHandler().getCore(name);}- if (core != null && coreId != null && coreId != core.uniqueId) return null;+ if (core != null && coreId != null && !coreId.equals(core.uniqueId)) return null;if (core != null && incRefCount) {core.open();diff --git a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.javaindex d2b3eac9a2f..b430094a1ed 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java@@ -597,7 +597,7 @@ public class LukeRequestHandler extends RequestHandlerBase {if (f.getDefaultValue() != null) {field.add("default", f.getDefaultValue());}- if (f == uniqueField) {+ if (f.equals(uniqueField)) {field.add("uniqueKey", true);}if (ft.getIndexAnalyzer().getPositionIncrementGap(f.getName()) != 0) {diff --git a/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java b/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.javaindex c743b27824b..646b19e2dc2 100644--- a/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java+++ b/solr/core/src/java/org/apache/solr/handler/admin/SplitOp.java@@ -27,6 +27,7 @@ import java.util.Arrays;import java.util.Collection;import java.util.List;import java.util.Map;+import java.util.Objects;import java.util.TreeMap;import org.apache.lucene.index.MultiTerms;import org.apache.lucene.index.Terms;@@ -596,7 +597,7 @@ class SplitOp implements CoreAdminHandler.CoreAdminOp {// The middle should never be the last, since that means that we won't actually do a split.// Minimising the error (above) should already ensure this never happens.- assert middle != last;+ assert !Objects.equals(middle, last);// Make sure to include the shard's current range in the new ranges so we don't create useless// empty shards.diff --git a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.javaindex f687edf878d..6c74cd49740 100644--- a/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java@@ -331,7 +331,7 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore@VisibleForTestingElevationProvider getElevationProvider(IndexReader reader, SolrCore core) {synchronized (LOCK) {- if (cacheElevationProvider != null && cacheIndexReader.get() == reader) {+ if (cacheElevationProvider != null && Objects.equals(cacheIndexReader.get(), reader)) {return cacheElevationProvider; // cache hit !}diff --git a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.javaindex 8edb9b13006..a73ed06238f 100644--- a/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java+++ b/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java@@ -727,7 +727,7 @@ public class DefaultSolrHighlighter extends SolrHighlighter implements PluginInf// If the tokenStream is right from the term vectors, then CachingTokenFilter is// unnecessary. It should be okay if OffsetLimit won't get applied in this case.final TokenStream tempTokenStream;- if (tstream != tvStream) {+ if (!tstream.equals(tvStream)) {if (maxCharsToAnalyze >= thisText.length()) {tempTokenStream = new CachingTokenFilter(tstream);} else {diff --git a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.javaindex e8b8478fa8d..410b59efceb 100644--- a/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java+++ b/solr/core/src/java/org/apache/solr/parser/SolrQueryParserBase.java@@ -27,6 +27,7 @@ import java.util.HashMap;import java.util.Iterator;import java.util.List;import java.util.Map;+import java.util.Objects;import java.util.stream.Collectors;import org.apache.lucene.analysis.Analyzer;import org.apache.lucene.analysis.TokenFilterFactory;@@ -729,7 +730,7 @@ public abstract class SolrQueryParserBase extends QueryBuilder {RawQuery rawq = (RawQuery) subq;// only look up fmap and type info on a field change- if (sfield != rawq.sfield) {+ if (!Objects.equals(sfield, rawq.sfield)) {sfield = rawq.sfield;fieldValues = fmap.get(sfield);// If this field isn't indexed, or if it is indexed and we want to use TermsQuery, thendiff --git a/solr/core/src/java/org/apache/solr/query/FilterQuery.java b/solr/core/src/java/org/apache/solr/query/FilterQuery.javaindex ce495832ae4..9039bc1f083 100644--- a/solr/core/src/java/org/apache/solr/query/FilterQuery.java+++ b/solr/core/src/java/org/apache/solr/query/FilterQuery.java@@ -107,7 +107,7 @@ public class FilterQuery extends ExtendedQueryBase {@Overridepublic Query rewrite(IndexReader reader) throws IOException {Query newQ = q.rewrite(reader);- if (newQ != q) {+ if (!newQ.equals(q)) {return new FilterQuery(newQ);} else {return this;diff --git a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.javaindex fa460c71546..7451e4f7acd 100644--- a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java+++ b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java@@ -19,6 +19,7 @@ package org.apache.solr.query;import java.io.IOException;import java.util.ArrayList;import java.util.List;+import java.util.Objects;import org.apache.lucene.index.BaseTermsEnum;import org.apache.lucene.index.ImpactsEnum;import org.apache.lucene.index.IndexReader;@@ -121,10 +122,8 @@ public final class SolrRangeQuery extends ExtendedQueryBase implements DocSetProreturn (this.flags == other.flags)&& (this.field.equals(other.field))- && (this.lower == other.lower- || (this.lower != null && other.lower != null && this.lower.equals(other.lower)))- && (this.upper == other.upper- || (this.upper != null && other.upper != null && this.upper.equals(other.upper)));+ && (Objects.equals(this.lower, other.lower))+ && (Objects.equals(this.upper, other.upper));}@Overridediff --git a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java b/solr/core/src/java/org/apache/solr/schema/IndexSchema.javaindex cc11fdbf14e..74dfb7684e9 100644--- a/solr/core/src/java/org/apache/solr/schema/IndexSchema.java+++ b/solr/core/src/java/org/apache/solr/schema/IndexSchema.java@@ -639,7 +639,7 @@ public class IndexSchema {}// Unless the uniqueKeyField is marked 'required=false' then make sure it exists- if (Boolean.FALSE != explicitRequiredProp.get(uniqueKeyFieldName)) {+ if (!Boolean.FALSE.equals(explicitRequiredProp.get(uniqueKeyFieldName))) {uniqueKeyField.required = true;requiredFields.add(uniqueKeyField);}diff --git a/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java b/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.javaindex f37e2372e4a..f0ac6ed41e6 100644--- a/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java+++ b/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java@@ -77,7 +77,7 @@ public abstract class AbstractReRankQuery extends RankQuery {@Overridepublic Query rewrite(IndexReader reader) throws IOException {Query q = mainQuery.rewrite(reader);- if (q != mainQuery) {+ if (!q.equals(mainQuery)) {return rewrite(q);}return super.rewrite(reader);diff --git a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.javaindex 16c3393786a..e43f229d8a5 100644--- a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java+++ b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java@@ -96,7 +96,7 @@ public class ExportQParserPlugin extends QParserPlugin {@Overridepublic Query rewrite(IndexReader reader) throws IOException {Query q = mainQuery.rewrite(reader);- if (q == mainQuery) {+ if (q.equals(mainQuery)) {return super.rewrite(reader);} else {return clone().wrap(q);diff --git a/solr/core/src/java/org/apache/solr/search/MatchCostQuery.java b/solr/core/src/java/org/apache/solr/search/MatchCostQuery.javaindex fe7160f473e..d1a4656a88c 100644--- a/solr/core/src/java/org/apache/solr/search/MatchCostQuery.java+++ b/solr/core/src/java/org/apache/solr/search/MatchCostQuery.java@@ -68,7 +68,7 @@ public class MatchCostQuery extends Query {@Overridepublic Query rewrite(IndexReader reader) throws IOException {final Query rewrite = delegate.rewrite(reader);- if (delegate == rewrite) {+ if (delegate.equals(rewrite)) {return this; // unchanged}return new MatchCostQuery(rewrite, matchCost);diff --git a/solr/core/src/java/org/apache/solr/search/QueryUtils.java b/solr/core/src/java/org/apache/solr/search/QueryUtils.javaindex 2709d9d6b7a..0e43d3baac8 100644--- a/solr/core/src/java/org/apache/solr/search/QueryUtils.java+++ b/solr/core/src/java/org/apache/solr/search/QueryUtils.java@@ -97,14 +97,14 @@ public class QueryUtils {BoostQuery bq = (BoostQuery) q;Query subQ = bq.getQuery();Query absSubQ = getAbs(subQ);- if (absSubQ == subQ) return q;+ if (absSubQ.equals(subQ)) return q;return new BoostQuery(absSubQ, bq.getBoost());}if (q instanceof WrappedQuery) {Query subQ = ((WrappedQuery) q).getWrappedQuery();Query absSubQ = getAbs(subQ);- if (absSubQ == subQ) return q;+ if (absSubQ.equals(subQ)) return q;return new WrappedQuery(absSubQ);}diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.javaindex 86d5f549e3c..631ebdd0109 100644--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java@@ -30,6 +30,7 @@ import java.util.Date;import java.util.HashMap;import java.util.List;import java.util.Map;+import java.util.Objects;import java.util.Set;import java.util.concurrent.ConcurrentHashMap;import java.util.concurrent.TimeUnit;@@ -523,7 +524,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI@Overridepublic final DirectoryReader getIndexReader() {- assert reader == super.getIndexReader();+ assert Objects.equals(reader, super.getIndexReader());return reader;}@@ -1191,7 +1192,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIQuery posQuery = QueryUtils.getAbs(q);sets[end] = getPositiveDocSet(posQuery);// Negative query if absolute value different from original- if (q == posQuery) {+ if (Objects.equals(q, posQuery)) {neg[end] = false;// keep track of the smallest positive set.// This optimization is only worth it if size() is cached, which it would@@ -1401,7 +1402,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI// Get the absolute value (positive version) of this query. If we// get back the same reference, we know it's positive.Query absQ = QueryUtils.getAbs(query);- boolean positive = absQ == query;+ boolean positive = Objects.equals(absQ, query);DocSet absAnswer = getAndCacheDocSet(absQ);@@ -2322,7 +2323,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI// Negative query if absolute value different from originalQuery absQ = QueryUtils.getAbs(a);DocSet positiveA = getPositiveDocSet(absQ);- return a == absQ ? b.intersectionSize(positiveA) : b.andNotSize(positiveA);+ return Objects.equals(a, absQ) ? b.intersectionSize(positiveA) : b.andNotSize(positiveA);} else {// If there isn't a cache, then do a single filtered queryTotalHitCountCollector collector = new TotalHitCountCollector();@@ -2368,11 +2369,11 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrIDocSet positiveB = getPositiveDocSet(absB);// Negative query if absolute value different from original- if (a == absA) {- if (b == absB) return positiveA.intersectionSize(positiveB);+ if (Objects.equals(a, absA)) {+ if (Objects.equals(b, absB)) return positiveA.intersectionSize(positiveB);return positiveA.andNotSize(positiveB);}- if (b == absB) return positiveB.andNotSize(positiveA);+ if (Objects.equals(b, absB)) return positiveB.andNotSize(positiveA);// if both negative, we need to create a temp DocSet since we// don't have a counting method that takes three.diff --git a/solr/core/src/java/org/apache/solr/search/SortSpecParsing.java b/solr/core/src/java/org/apache/solr/search/SortSpecParsing.javaindex e05aa4dee42..cb2da219f25 100644--- a/solr/core/src/java/org/apache/solr/search/SortSpecParsing.java+++ b/solr/core/src/java/org/apache/solr/search/SortSpecParsing.java@@ -213,7 +213,7 @@ public class SortSpecParsing {}// normalize a sort on score desc to null- if (sorts.size() == 1 && sorts.get(0) == SortField.FIELD_SCORE) {+ if (sorts.size() == 1 && SortField.FIELD_SCORE.equals(sorts.get(0))) {return newEmptySortSpec();}diff --git a/solr/core/src/java/org/apache/solr/uninverting/FieldCacheImpl.java b/solr/core/src/java/org/apache/solr/uninverting/FieldCacheImpl.javaindex 717b67e60e1..c4d193b79f5 100644--- a/solr/core/src/java/org/apache/solr/uninverting/FieldCacheImpl.java+++ b/solr/core/src/java/org/apache/solr/uninverting/FieldCacheImpl.java@@ -1261,7 +1261,7 @@ public class FieldCacheImpl implements FieldCache {public SortedSetDocValues getDocTermOrds(LeafReader reader, String field, BytesRef prefix)throws IOException {// not a general purpose filtering mechanism...- assert prefix == null || prefix == INT32_TERM_PREFIX || prefix == INT64_TERM_PREFIX;+ assert prefix == null || INT32_TERM_PREFIX.equals(prefix) || INT64_TERM_PREFIX.equals(prefix);SortedSetDocValues dv = reader.getSortedSetDocValues(field);if (dv != null) {diff --git a/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java b/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.javaindex 4edb1919fb1..ce6489f9083 100644--- a/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java+++ b/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java@@ -56,7 +56,7 @@ final class DeleteByQueryWrapper extends Query {@Overridepublic Query rewrite(IndexReader reader) throws IOException {Query rewritten = in.rewrite(reader);- if (rewritten != in) {+ if (!rewritten.equals(in)) {return new DeleteByQueryWrapper(rewritten, schema);} else {return super.rewrite(reader);diff --git a/solr/core/src/java/org/apache/solr/util/DOMConfigNode.java b/solr/core/src/java/org/apache/solr/util/DOMConfigNode.javaindex 31d84bc05cc..f7a47b5cc93 100644--- a/solr/core/src/java/org/apache/solr/util/DOMConfigNode.java+++ b/solr/core/src/java/org/apache/solr/util/DOMConfigNode.java@@ -82,7 +82,7 @@ public class DOMConfigNode implements ConfigNode {Node item = nlst.item(i);if (item.getNodeType() != Node.ELEMENT_NODE) continue;Boolean toContinue = fun.apply(new DOMConfigNode(item));- if (Boolean.FALSE == toContinue) break;+ if (Boolean.FALSE.equals(toContinue)) break;}}diff --git a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.javaindex 16b9705622d..03be4223440 100644--- a/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ChaosMonkeyShardSplitTest.java@@ -125,7 +125,7 @@ public class ChaosMonkeyShardSplitTest extends ShardSplitTest {// SolrQuery("*:*")).getResults().getNumFound();// Wait until new leader is elected- while (deadJetty == leaderJetty) {+ while (deadJetty.equals(leaderJetty)) {updateMappingsFromZk(this.jettys, this.clients);leaderJetty = shardToLeaderJetty.get("shard1");}diff --git a/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java b/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.javaindex 4e071f7974f..b90554e625f 100644--- a/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/MissingSegmentRecoveryTest.java@@ -69,7 +69,7 @@ public class MissingSegmentRecoveryTest extends SolrCloudTestCase {DocCollection state = getCollectionState(collection);leader = state.getLeader("shard1");- replica = getRandomReplica(state.getSlice("shard1"), (r) -> leader != r);+ replica = getRandomReplica(state.getSlice("shard1"), (r) -> !leader.equals(r));}@Afterdiff --git a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.javaindex 8cc54a9e25d..6722e1bfd32 100644--- a/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java+++ b/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java@@ -258,7 +258,7 @@ public class ShardRoutingTest extends AbstractFullDistribZkTestBase {CloudJettyRunner leader = shardToLeaderJetty.get(bucket1);CloudJettyRunner replica = null;for (CloudJettyRunner r : runners) {- if (r != leader) replica = r;+ if (!r.equals(leader)) replica = r;}long nStart = getNumRequests();diff --git a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.javaindex 45586dd4858..6bf85bd7aaf 100644--- a/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java+++ b/solr/core/src/test/org/apache/solr/cloud/TestTlogReplica.java@@ -28,6 +28,7 @@ import java.util.HashMap;import java.util.List;import java.util.Locale;import java.util.Map;+import java.util.Objects;import java.util.concurrent.Semaphore;import java.util.concurrent.TimeUnit;import java.util.stream.Collectors;@@ -774,7 +775,7 @@ public class TestTlogReplica extends SolrCloudTestCase {Slice slice = docCollection.getSlices().iterator().next();Replica newLeader = null;for (Replica replica : slice.getReplicas()) {- if (slice.getLeader() == replica) continue;+ if (Objects.equals(slice.getLeader(), replica)) continue;newLeader = replica;break;}@@ -1114,9 +1115,9 @@ public class TestTlogReplica extends SolrCloudTestCase {CloudDescriptor cloudDescriptor = solrCore.getCoreDescriptor().getCloudDescriptor();Slice slice = docCollection.getSlice(cloudDescriptor.getShardId());Replica replica = docCollection.getReplica(cloudDescriptor.getCoreNodeName());- if (slice.getLeader().equals(replica) && isLeader) {+ if (Objects.equals(slice.getLeader(), replica) && isLeader) {rs.add(solrCore);- } else if (!slice.getLeader().equals(replica) && !isLeader) {+ } else if (!Objects.equals(slice.getLeader(), replica) && !isLeader) {rs.add(solrCore);}}@@ -1151,9 +1152,9 @@ public class TestTlogReplica extends SolrCloudTestCase {CloudDescriptor cloudDescriptor = solrCore.getCoreDescriptor().getCloudDescriptor();Slice slice = docCollection.getSlice(cloudDescriptor.getShardId());Replica replica = docCollection.getReplica(cloudDescriptor.getCoreNodeName());- if (slice.getLeader() == replica && isLeader) {+ if (Objects.equals(slice.getLeader(), replica) && isLeader) {rs.add(solrRunner);- } else if (slice.getLeader() != replica && !isLeader) {+ } else if (!Objects.equals(slice.getLeader(), replica) && !isLeader) {rs.add(solrRunner);}}diff --git a/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java b/solr/core/src/test/org/apache/solr/core/CoreSorterTest.javaindex 9eca696f0e0..5e7458a6196 100644--- a/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java+++ b/solr/core/src/test/org/apache/solr/core/CoreSorterTest.java@@ -192,7 +192,7 @@ public class CoreSorterTest extends SolrTestCaseJ4 {CountsForEachShard lastCounts = null;for (CoreDescriptor resultDesc : resultDescs) {CountsForEachShard counts = myDescsToCounts.get(resultDesc);- if (counts != lastCounts) {+ if (!counts.equals(lastCounts)) {resultCounts.add(counts);}lastCounts = counts;diff --git a/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.javaindex 75efcb3b508..cf0be9581d3 100644--- a/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java+++ b/solr/core/src/test/org/apache/solr/core/TestSolrDeletionPolicy1.java@@ -70,7 +70,7 @@ public class TestSolrDeletionPolicy1 extends SolrTestCaseJ4 {Map<Long, IndexCommit> commits = delPolicy.getCommits();IndexCommit latest = delPolicy.getLatestCommit();for (Long gen : commits.keySet()) {- if (commits.get(gen) == latest) continue;+ if (commits.get(gen).equals(latest)) continue;assertEquals(1, commits.get(gen).getSegmentCount());}}diff --git a/solr/modules/hdfs/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java b/solr/modules/hdfs/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.javaindex cd13a814b63..3961fc29641 100644--- a/solr/modules/hdfs/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java+++ b/solr/modules/hdfs/src/test/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java@@ -61,6 +61,7 @@ import java.util.Collections;import java.util.Comparator;import java.util.Iterator;import java.util.List;+import java.util.Objects;import java.util.Queue;import java.util.Scanner;import java.util.concurrent.ConcurrentLinkedQueue;@@ -538,7 +539,7 @@ public class BlockPoolSlice {}ReplicaInfo tmpReplicaInfo = volumeMap.addAndGet(bpid, newReplica);- ReplicaInfo oldReplica = (tmpReplicaInfo == newReplica) ? null+ ReplicaInfo oldReplica = (tmpReplicaInfo.equals(newReplica)) ? null: tmpReplicaInfo;if (oldReplica != null) {// We have multiple replicas of the same block so decide which one@@ -640,7 +641,7 @@ public class BlockPoolSlice {final ReplicaInfo replicaToDelete =selectReplicaToDelete(replica1, replica2);final ReplicaInfo replicaToKeep =- (replicaToDelete != replica1) ? replica1 : replica2;+ (!Objects.equals(replicaToDelete, replica1)) ? replica1 : replica2;// Update volumeMap and delete the replicavolumeMap.add(bpid, replicaToKeep);if (replicaToDelete != null) {@@ -673,7 +674,7 @@ public class BlockPoolSlice {replicaToKeep = replica1;}- replicaToDelete = (replicaToKeep == replica1) ? replica2 : replica1;+ replicaToDelete = (replicaToKeep.equals(replica1)) ? replica2 : replica1;if (LOG.isDebugEnabled()) {LOG.debug("resolveDuplicateReplicas decide to keep {}. Will try to delete {}", replicaToKeep, replicaToDelete);diff --git a/solr/solrj-zookeeper/src/java/org/apache/solr/common/LazySolrCluster.java b/solr/solrj-zookeeper/src/java/org/apache/solr/common/LazySolrCluster.javaindex 295018a3372..811a0b4e2e8 100644--- a/solr/solrj-zookeeper/src/java/org/apache/solr/common/LazySolrCluster.java+++ b/solr/solrj-zookeeper/src/java/org/apache/solr/common/LazySolrCluster.java@@ -188,7 +188,7 @@ public class LazySolrCluster implements SolrCluster {return null;}SolrCollectionImpl existing = cached.get(key);- if (existing == null || existing.coll != c) {+ if (existing == null || !Objects.equals(existing.coll, c)) {cached.put(key, existing = new SolrCollectionImpl(c, zkStateReader));}return existing;diff --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 2110e4a63c9..7e2c626431c 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@@ -30,6 +30,7 @@ import java.util.LinkedHashMap;import java.util.List;import java.util.Map;import java.util.Map.Entry;+import java.util.Objects;import java.util.Set;import java.util.SortedSet;import java.util.TreeSet;@@ -352,7 +353,7 @@ public class ZkStateReader implements SolrCloseable {}}}- stateHasChanged.set(oldState != watch.currentState);+ stateHasChanged.set(!Objects.equals(oldState, watch.currentState));return watch;});diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.javaindex 1f2ba6965ed..b3c7c4be31c 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractFullDistribZkTestBase.java@@ -974,7 +974,7 @@ public abstract class AbstractFullDistribZkTestBase extends AbstractDistribZkTeslist = new ArrayList<>();shardToJetty.put(slice.getName(), list);}- boolean isLeader = slice.getLeader() == replica;+ boolean isLeader = Objects.equals(slice.getLeader(), replica);CloudJettyRunner cjr = new CloudJettyRunner();cjr.jetty = jetty;cjr.info = replica;diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.javaindex 7c8c696fa8a..2982a81f2c1 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractRecoveryZkTestBase.java@@ -98,7 +98,7 @@ public abstract class AbstractRecoveryZkTestBase extends SolrCloudTestCase {// bring shard replica downDocCollection state = getCollectionState(collection);Replica leader = state.getLeader("shard1");- Replica replica = getRandomReplica(state.getSlice("shard1"), (r) -> leader != r);+ Replica replica = getRandomReplica(state.getSlice("shard1"), (r) -> !leader.equals(r));JettySolrRunner jetty = cluster.getReplicaJetty(replica);jetty.stop();diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.javaindex 17f03224525..1b00e68b396 100644--- a/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java+++ b/solr/test-framework/src/java/org/apache/solr/cloud/AbstractSyncSliceTestBase.java@@ -144,7 +144,7 @@ public abstract class AbstractSyncSliceTestBase extends AbstractFullDistribZkTesCloudJettyRunner deadJetty = leaderJetty;// let's get the latest leader- while (deadJetty == leaderJetty) {+ while (deadJetty.equals(leaderJetty)) {updateMappingsFromZk(this.jettys, this.clients);leaderJetty = shardToLeaderJetty.get("shard1");}