You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by kr...@apache.org on 2022/10/28 15:21:43 UTC
[solr] 02/12: SOLR-16427: Evaluate and fix errorprone rules - EqualsUnsafeCast
This is an automated email from the ASF dual-hosted git repository.
krisden pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
commit db8d0e155adf667314d20f24e4963488d7343dcf
Author: Kevin Risden <kr...@apache.org>
AuthorDate: Tue Oct 25 13:41:34 2022 -0400
SOLR-16427: Evaluate and fix errorprone rules - EqualsUnsafeCast
---
gradle/validation/error-prone.gradle | 1 -
solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java | 1 +
solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java | 1 +
3 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index 3f4d437fdd0..f4192b29f61 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -83,7 +83,6 @@ allprojects { prj ->
'-Xep:ComplexBooleanConstant:OFF',
'-Xep:DoubleCheckedLocking:OFF',
'-Xep:EmptyCatch:OFF',
- '-Xep:EqualsUnsafeCast:OFF',
'-Xep:Finally:OFF',
'-Xep:FutureReturnValueIgnored:OFF',
'-Xep:IdentityBinaryExpression:OFF',
diff --git a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
index 7257e1f6290..05ba7cd7cb8 100644
--- a/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
+++ b/solr/core/src/test/org/apache/solr/handler/tagger/TaggerTestCase.java
@@ -242,6 +242,7 @@ public abstract class TaggerTestCase extends SolrTestCaseJ4 {
@Override
public boolean equals(Object obj) {
+ if (!(obj instanceof TestTag)) return false;
TestTag that = (TestTag) obj;
return new EqualsBuilder()
.append(this.startOffset, that.startOffset)
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java
index 43ad387c767..a4766ebf477 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/HashKey.java
@@ -48,6 +48,7 @@ public class HashKey implements Serializable {
@Override
public boolean equals(Object o) {
+ if (!(o instanceof HashKey)) return false;
HashKey h = (HashKey) o;
for (int i = 0; i < parts.length; i++) {
if (!parts[i].equals(h.parts[i])) {