Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16427: Evaluate and fix errorprone rules - OperatorPrecedence

Kevin Risdene45be355e2b0
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradle
index ea0f5b6534e..6c505aea73a 100644
--- a/gradle/validation/error-prone.gradle
+++ b/gradle/validation/error-prone.gradle
@@ -62,8 +62,6 @@ allprojects { prj ->
options.errorprone.disableWarningsInGeneratedCode = true
options.errorprone.errorproneArgs = [
- '-Xep:InlineMeSuggester:OFF', // We don't use this annotation
-
// bug patterns related to our tests
'-Xep:ExtendingJUnitAssert:OFF', // we inherit from LuceneTestCase which extends Assert
'-Xep:UseCorrectAssertInTests:OFF', // and this is a consequence of the above
@@ -85,6 +83,7 @@ allprojects { prj ->
'-Xep:IdentityBinaryExpression:OFF',
'-Xep:InconsistentCapitalization:OFF',
'-Xep:InlineFormatString:OFF', // this introduces redundancy in format strings
+ '-Xep:InlineMeSuggester:OFF', // We don't use this annotation
'-Xep:InputStreamSlowMultibyteRead:OFF',
'-Xep:InvalidBlockTag:OFF', // this is needed for tags like lucene.internal
'-Xep:JavaUtilDate:OFF',
@@ -95,7 +94,6 @@ allprojects { prj ->
'-Xep:NonAtomicVolatileUpdate:OFF',
'-Xep:NonCanonicalType:OFF',
'-Xep:ObjectToString:OFF',
- '-Xep:OperatorPrecedence:OFF',
'-Xep:ReturnValueIgnored:OFF',
'-Xep:SameNameButDifferent:OFF',
'-Xep:ShortCircuitBoolean:OFF',
diff --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.java
index 62eed0f39be..9d36e1461ec 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
@@ -332,7 +332,7 @@ public class DimensionalRoutedAlias extends RoutedAlias {
// dimensions with an implicit order need to start from their initial configuration
// and count up to maintain order in the alias collection list with respect to that
// dimension
- if (matchesAllHigherDims && !ordered || matchesAllHigherDims && matchesAllLowerDims) {
+ if ((matchesAllHigherDims && !ordered) || (matchesAllHigherDims && matchesAllLowerDims)) {
view.add("" + getSeparatorPrefix(dimensions.get(index)) + split[index + 1]);
}
}
diff --git a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
index 2db476e2e6c..141389f4e63 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java
@@ -1497,7 +1497,7 @@ public class FacetComponent extends SearchComponent {
// the largest possible missing term is (initialMincount - 1) if we received
// less than the number requested.
- if (numRequested < 0 || numRequested != 0 && numReceived < numRequested) {
+ if (numRequested < 0 || (numRequested != 0 && numReceived < numRequested)) {
last = Math.max(0, initialMincount - 1);
}
diff --git a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
index 7451e4f7acd..412e88dbf09 100644
--- a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
+++ b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
@@ -280,7 +280,7 @@ public final class SolrRangeQuery extends ExtendedQueryBase implements DocSetPro
if (upper != null) {
int cmp = curr.compareTo(upper);
- if (cmp < 0 || cmp == 0 && includeUpper()) {
+ if (cmp < 0 || (cmp == 0 && includeUpper())) {
return curr;
} else {
curr = null;
diff --git a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
index 72e0c783e2d..a742dce3990 100644
--- a/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
+++ b/solr/core/src/java/org/apache/solr/schema/ManagedIndexSchema.java
@@ -378,7 +378,8 @@ public final class ManagedIndexSchema extends IndexSchema {
try (HttpSolrClient solr = new HttpSolrClient.Builder(coreUrl).build()) {
// eventually, this loop will get killed by the ExecutorService's timeout
while (remoteVersion == -1
- || remoteVersion < expectedZkVersion && !zkController.getCoreContainer().isShutDown()) {
+ || (remoteVersion < expectedZkVersion
+ && !zkController.getCoreContainer().isShutDown())) {
try {
HttpSolrClient.HttpUriRequestResponse mrr = solr.httpUriRequest(this);
NamedList<Object> zkversionResp = mrr.future.get();
diff --git a/solr/core/src/java/org/apache/solr/search/FunctionQParser.java b/solr/core/src/java/org/apache/solr/search/FunctionQParser.java
index 03492cd5324..bce14e20011 100644
--- a/solr/core/src/java/org/apache/solr/search/FunctionQParser.java
+++ b/solr/core/src/java/org/apache/solr/search/FunctionQParser.java
@@ -351,7 +351,7 @@ public class FunctionQParser extends QParser {
ValueSource valueSource;
int ch = sp.peek();
- if (ch >= '0' && ch <= '9' || ch == '.' || ch == '+' || ch == '-') {
+ if ((ch >= '0' && ch <= '9') || ch == '.' || ch == '+' || ch == '-') {
Number num = sp.getNumber();
if (num instanceof Long) {
valueSource = new ValueSourceParser.LongConstValueSource(num.longValue());
diff --git a/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java b/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java
index 0b13e21570a..7d0583ce63a 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrReturnFields.java
@@ -166,7 +166,7 @@ public class SolrReturnFields extends ReturnFields {
private void parseFieldList(String[] fl, SolrQueryRequest req) {
_wantsScore = false;
_wantsAllFields = false;
- if (fl == null || fl.length == 0 || fl.length == 1 && fl[0].length() == 0) {
+ if (fl == null || fl.length == 0 || (fl.length == 1 && fl[0].length() == 0)) {
_wantsAllFields = true;
return;
}
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.java
index f0f867fadfd..528f7a0ba1f 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
@@ -738,7 +738,7 @@ abstract class FacetFieldProcessor extends FacetProcessor<FacetField> {
protected void processStats(
SimpleOrderedMap<Object> bucket, Query bucketQ, DocSet docs, long docCount)
throws IOException {
- if (docCount == 0 && !freq.processEmpty || freq.getFacetStats().size() == 0) {
+ if ((docCount == 0 && !freq.processEmpty) || freq.getFacetStats().size() == 0) {
bucket.add("count", docCount);
return;
}
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java b/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java
index 5ecef816cee..1280071eeb8 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetProcessor.java
@@ -310,7 +310,7 @@ public abstract class FacetProcessor<T extends FacetRequest> {
protected void processStats(
SimpleOrderedMap<Object> bucket, Query bucketQ, DocSet docs, long docCount)
throws IOException {
- if (docCount == 0 && !freq.processEmpty || freq.getFacetStats().size() == 0) {
+ if ((docCount == 0 && !freq.processEmpty) || freq.getFacetStats().size() == 0) {
bucket.add("count", docCount);
return;
}
diff --git a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
index bb7af635fef..07b67bf21da 100644
--- a/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
+++ b/solr/core/src/java/org/apache/solr/search/facet/FacetRequestSortedMerger.java
@@ -271,8 +271,7 @@ abstract class FacetRequestSortedMerger<FacetRequestT extends FacetRequestSorted
for (FacetBucket bucket : bucketList) {
if (numBucketsToCheck-- <= 0) break;
// if this bucket is missing,
- assert thisMissing == false
- || thisMissing == true && mcontext.getShardFlag(bucket.bucketNumber) == false;
+ assert !thisMissing || !mcontext.getShardFlag(bucket.bucketNumber);
boolean saw = !thisMissing && mcontext.getShardFlag(bucket.bucketNumber);
if (!saw && !returnedAllBuckets) {
// we didn't see the bucket for this shard, and it's possible that the shard has it
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 74d29a84969..0a4135226a1 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@ -841,7 +841,7 @@ public class SolrRequestParsers {
boolean schemaRestPath = false;
int idx = uri.indexOf("/schema");
- if (idx >= 0 && uri.endsWith("/schema") || uri.contains("/schema/")) {
+ if ((idx >= 0 && uri.endsWith("/schema")) || uri.contains("/schema/")) {
schemaRestPath = true;
}
diff --git a/solr/core/src/java/org/apache/solr/util/NumberUtils.java b/solr/core/src/java/org/apache/solr/util/NumberUtils.java
index d33bb07b60b..9dde593b53e 100644
--- a/solr/core/src/java/org/apache/solr/util/NumberUtils.java
+++ b/solr/core/src/java/org/apache/solr/util/NumberUtils.java
@@ -205,6 +205,6 @@ public class NumberUtils {
public static int bytesToInt(byte[] bytes) {
if (bytes == null) return 0;
assert bytes.length == 4;
- return bytes[0] << 24 | (bytes[1] & 255) << 16 | (bytes[2] & 255) << 8 | bytes[3] & 255;
+ return bytes[0] << 24 | (bytes[1] & 255) << 16 | (bytes[2] & 255) << 8 | (bytes[3] & 255);
}
}
diff --git a/solr/core/src/java/org/apache/solr/util/hll/BitVector.java b/solr/core/src/java/org/apache/solr/util/hll/BitVector.java
index 4e85cf4bdcb..0aa08e05c75 100644
--- a/solr/core/src/java/org/apache/solr/util/hll/BitVector.java
+++ b/solr/core/src/java/org/apache/solr/util/hll/BitVector.java
@@ -103,7 +103,7 @@ class BitVector implements Cloneable {
return ((words[firstWordIndex] >>> bitRemainder) & registerMask);
/* else -- register spans words */
return (words[firstWordIndex] >>> bitRemainder) /*no need to mask since at top of word*/
- | (words[secondWordIndex] << (BITS_PER_WORD - bitRemainder)) & registerMask;
+ | ((words[secondWordIndex] << (BITS_PER_WORD - bitRemainder)) & registerMask);
}
/**
@@ -222,7 +222,7 @@ class BitVector implements Cloneable {
else /*register spans words*/
registerValue =
(words[firstWordIndex] >>> bitRemainder) /*no need to mask since at top of word*/
- | (words[secondWordIndex] << (BITS_PER_WORD - bitRemainder)) & registerMask;
+ | ((words[secondWordIndex] << (BITS_PER_WORD - bitRemainder)) & registerMask);
// determine which is the larger and update as necessary
if (value > registerValue) {
diff --git a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
index d16ecacce5a..1cca0d6666e 100644
--- a/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestStressInPlaceUpdates.java
@@ -245,8 +245,9 @@ public class TestStressInPlaceUpdates extends AbstractFullDistribZkTestBase {
info.version,
returnedVersion);
} catch (RuntimeException e) {
- if (e.getMessage() != null && e.getMessage().contains("version conflict")
- || e.getMessage() != null && e.getMessage().contains("Conflict")) {
+ if (e.getMessage() != null
+ && (e.getMessage().contains("version conflict")
+ || e.getMessage().contains("Conflict"))) {
// It's okay for a leader to reject a concurrent request
log.warn("Conflict during {}, rejected id={}, {}", delType, id, e);
returnedVersion = null;
@@ -300,8 +301,9 @@ public class TestStressInPlaceUpdates extends AbstractFullDistribZkTestBase {
returnedVersion);
} catch (RuntimeException e) {
- if (e.getMessage() != null && e.getMessage().contains("version conflict")
- || e.getMessage() != null && e.getMessage().contains("Conflict")) {
+ if (e.getMessage() != null
+ && (e.getMessage().contains("version conflict")
+ || e.getMessage().contains("Conflict"))) {
// It's okay for a leader to reject a concurrent request
log.warn("Conflict during full update, rejected id={}, {}", id, e);
returnedVersion = null;
@@ -331,8 +333,9 @@ public class TestStressInPlaceUpdates extends AbstractFullDistribZkTestBase {
val2,
returnedVersion);
} catch (RuntimeException e) {
- if (e.getMessage() != null && e.getMessage().contains("version conflict")
- || e.getMessage() != null && e.getMessage().contains("Conflict")) {
+ if (e.getMessage() != null
+ && (e.getMessage().contains("version conflict")
+ || e.getMessage().contains("Conflict"))) {
// It's okay for a leader to reject a concurrent request
log.warn("Conflict during partial update, rejected id={}, {}", id, e);
} else if (e.getMessage() != null
diff --git a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
index d181008e9c1..2cb739107d0 100644
--- a/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/component/DistributedTermsComponentTest.java
@@ -186,7 +186,7 @@ public class DistributedTermsComponentTest extends BaseDistributedSearchTestCase
if (Stream.of(q).noneMatch(s -> s.equals("terms.list"))) {
// SOLR-9243 doesn't support max/min count
for (int i = 0; i < q.length; i += 2) {
- if (q[i].equals("terms.sort") && q[i + 1].equals("index") || rarely()) {
+ if ((q[i].equals("terms.sort") && q[i + 1].equals("index")) || rarely()) {
List<Object> params = new ArrayList<>(Arrays.asList(q));
if (usually()) {
params.add("terms.mincount");
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
index f1ce167cbed..05974520dcc 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
@@ -1110,11 +1110,11 @@ public class DocValuesTest extends SolrTestCaseJ4 {
long minSortable = toSortableLong.get(i).apply(minVal);
long maxSortable = toSortableLong.get(i).apply(maxVal);
- if ((minInclusive && minSortable <= valSortable
- || !minInclusive && minSortable < valSortable
+ if (((minInclusive && minSortable <= valSortable)
+ || (!minInclusive && minSortable < valSortable)
|| (min.equals("*") && Objects.equals(val, negativeInfinity[i])))
- && (maxInclusive && maxSortable >= valSortable
- || !maxInclusive && maxSortable > valSortable
+ && ((maxInclusive && maxSortable >= valSortable)
+ || (!maxInclusive && maxSortable > valSortable)
|| (max.equals("*") && Objects.equals(val, positiveInfinity[i])))) {
counter++;
tests.add("//result/doc[" + counter + "]/str[@name='id'][.=" + (k + 1) + "]");
diff --git a/solr/core/src/test/org/apache/solr/search/TestDocSet.java b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
index fa0362fad4b..8e69dafa911 100644
--- a/solr/core/src/test/org/apache/solr/search/TestDocSet.java
+++ b/solr/core/src/test/org/apache/solr/search/TestDocSet.java
@@ -62,7 +62,7 @@ public class TestDocSet extends SolrTestCase {
// test the DocSetCollector
@SuppressWarnings("BadShiftAmount")
public void collect(DocSet set, int maxDoc) {
- int smallSetSize = maxDoc >> 64 + 3;
+ int smallSetSize = maxDoc >> (64 + 3);
if (set.size() > 1) {
if (random().nextBoolean()) {
smallSetSize = set.size() + random().nextInt(3) - 1; // test the bounds around smallSetSize
diff --git a/solr/core/src/test/org/apache/solr/search/TestSort.java b/solr/core/src/test/org/apache/solr/search/TestSort.java
index 2fc26a5b69f..7bb29329f23 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSort.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSort.java
@@ -314,9 +314,11 @@ public class TestSort extends SolrTestCaseJ4 {
Sort sort = new Sort(sfields.toArray(new SortField[sfields.size()]));
final String nullRep =
- luceneSort || sortMissingFirst && !reverse || sortMissingLast && reverse ? "" : "zzz";
+ luceneSort || (sortMissingFirst && !reverse) || (sortMissingLast && reverse)
+ ? ""
+ : "zzz";
final String nullRep2 =
- luceneSort2 || sortMissingFirst2 && !reverse2 || sortMissingLast2 && reverse2
+ luceneSort2 || (sortMissingFirst2 && !reverse2) || (sortMissingLast2 && reverse2)
? ""
: "zzz";
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
index d088e0819a7..c85c8061d35 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBSolrClient.java
@@ -664,7 +664,7 @@ public abstract class LBSolrClient extends SolrClient {
}
if (wrapper.standard == false
- || justFailed != null && justFailed.containsKey(wrapper.getBaseUrl())) continue;
+ || (justFailed != null && justFailed.containsKey(wrapper.getBaseUrl()))) continue;
try {
++numServersTried;
request.setBasePath(wrapper.baseUrl);
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java b/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java
index 3cfe43a56c8..dd0b6669195 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/CompositeIdRouter.java
@@ -338,7 +338,7 @@ public class CompositeIdRouter extends HashBasedRouter {
int upperBound;
if (triLevel) {
- lowerBound = hashes[0] & masks[0] | hashes[1] & masks[1];
+ lowerBound = (hashes[0] & masks[0]) | (hashes[1] & masks[1]);
upperBound = lowerBound | masks[2];
} else {
lowerBound = hashes[0] & masks[0];
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
index c75e84a1d86..a3229a45639 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
@@ -183,7 +183,7 @@ public class JsonRecordReader {
}
private boolean hasParentRecord() {
- return isRecord || parent != null && parent.hasParentRecord();
+ return isRecord || (parent != null && parent.hasParentRecord());
}
private boolean isMyChildARecord() {
diff --git a/solr/solrj/src/java/org/noggit/JSONParser.java b/solr/solrj/src/java/org/noggit/JSONParser.java
index 82a7b539202..9ae474728d1 100644
--- a/solr/solrj/src/java/org/noggit/JSONParser.java
+++ b/solr/solrj/src/java/org/noggit/JSONParser.java
@@ -783,8 +783,8 @@ public class JSONParser {
throw err("Single quoted strings not allowed");
}
} else {
- if (isName && (flags & ALLOW_UNQUOTED_KEYS) == 0
- || !isName && (flags & ALLOW_UNQUOTED_STRING_VALUES) == 0
+ if ((isName && (flags & ALLOW_UNQUOTED_KEYS) == 0)
+ || (!isName && (flags & ALLOW_UNQUOTED_STRING_VALUES) == 0)
|| eof) {
if (isName) {
throw err("Expected quoted string");
diff --git a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
index d4d8be41023..94681feae78 100644
--- a/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/BaseDistributedSearchTestCase.java
@@ -1036,9 +1036,9 @@ public abstract class BaseDistributedSearchTestCase extends SolrTestCaseJ4 {
if ((flags & FUZZY) != 0) {
if ((a instanceof Double && b instanceof Double)) {
- double aaa = ((Double) a).doubleValue();
- double bbb = ((Double) b).doubleValue();
- if (aaa == bbb || ((Double) a).isNaN() && ((Double) b).isNaN()) {
+ double aaa = (Double) a;
+ double bbb = (Double) b;
+ if (aaa == bbb || (((Double) a).isNaN() && ((Double) b).isNaN())) {
return null;
}
if ((aaa == 0.0) || (bbb == 0.0)) {
diff --git a/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java
index 649664829f9..029ba3bfbb8 100644
--- a/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java
+++ b/solr/test-framework/src/java/org/apache/solr/JSONTestUtil.java
@@ -241,8 +241,8 @@ class CollectionTester {
}
// make an exception for some numerics
- if ((expected instanceof Integer && val instanceof Long
- || expected instanceof Long && val instanceof Integer)
+ if (((expected instanceof Integer && val instanceof Long)
+ || (expected instanceof Long && val instanceof Integer))
&& ((Number) expected).longValue() == ((Number) val).longValue()) {
return true;
} else if ((expected instanceof Double || expected instanceof Float)