Apache Solr open-source search software
SOLR-16427: Evaluate and fix errorprone rules - BadInstanceof
Kevin Risdeneb49adb6b8da
diff --git a/gradle/validation/error-prone.gradle b/gradle/validation/error-prone.gradleindex aa614c30c4e..55120ab2d0c 100644--- a/gradle/validation/error-prone.gradle+++ b/gradle/validation/error-prone.gradle@@ -78,7 +78,6 @@ allprojects { prj ->'-Xep:AmbiguousMethodReference:OFF','-Xep:ArgumentSelectionDefectChecker:OFF','-Xep:BadImport:OFF', // style preference that we don't want to enforce- '-Xep:BadInstanceof:OFF','-Xep:BadShiftAmount:OFF','-Xep:CanIgnoreReturnValueSuggester:OFF','-Xep:ClassCanBeStatic:OFF',diff --git a/solr/core/src/java/org/apache/solr/core/SolrCore.java b/solr/core/src/java/org/apache/solr/core/SolrCore.javaindex fd94f300368..ed2cdd55ab5 100644--- a/solr/core/src/java/org/apache/solr/core/SolrCore.java+++ b/solr/core/src/java/org/apache/solr/core/SolrCore.java@@ -1284,9 +1284,8 @@ public class SolrCore implements SolrInfoBean, Closeable {} else {newUpdateHandler = createUpdateHandler(updateHandlerClass, updateHandler);}- if (newUpdateHandler instanceof SolrMetricProducer) {- coreMetricManager.registerMetricProducer(- "updateHandler", (SolrMetricProducer) newUpdateHandler);+ if (newUpdateHandler != null) {+ coreMetricManager.registerMetricProducer("updateHandler", newUpdateHandler);}infoRegistry.put("updateHandler", newUpdateHandler);return newUpdateHandler;@@ -3427,9 +3426,8 @@ public class SolrCore implements SolrInfoBean, Closeable {public void registerInfoBean(String name, SolrInfoBean solrInfoBean) {infoRegistry.put(name, solrInfoBean);- if (solrInfoBean instanceof SolrMetricProducer) {- SolrMetricProducer producer = (SolrMetricProducer) solrInfoBean;- coreMetricManager.registerMetricProducer(name, producer);+ if (solrInfoBean != null) {+ coreMetricManager.registerMetricProducer(name, solrInfoBean);}}diff --git a/solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.java b/solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.javaindex 700115c2a1a..f1ade4059a5 100644--- a/solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.java+++ b/solr/core/src/test/org/apache/solr/cluster/placement/impl/PlacementPluginIntegrationTest.java@@ -467,9 +467,7 @@ public class PlacementPluginIntegrationTest extends SolrCloudTestCase {Optional<Double> indexSizeOpt =replicaMetrics.getReplicaMetric(ReplicaMetricImpl.INDEX_SIZE_GB);assertTrue("indexSize", indexSizeOpt.isPresent());- assertTrue(- "wrong type, expected Double but was " + indexSizeOpt.get().getClass(),- indexSizeOpt.get() instanceof Double);+ indexSizeOpt.get();assertTrue("indexSize should be > 0 but was " + indexSizeOpt.get(),indexSizeOpt.get() > 0);diff --git a/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java b/solr/core/src/test/org/apache/solr/core/PluginInfoTest.javaindex d57c650e967..538a0fca4a1 100644--- a/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java+++ b/solr/core/src/test/org/apache/solr/core/PluginInfoTest.java@@ -144,7 +144,6 @@ public class PluginInfoTest extends DOMUtilTestBase {assertNotNull(childInfo);PluginInfo notExistent = pi.getChild("doesnotExist");assertNull(notExistent);- assertTrue(childInfo instanceof PluginInfo);assertEquals(0, (int) (Integer) childInfo.initArgs.get("index"));Node node2 = getNode(configWithNoChildren, "plugin");PluginInfo pi2 = new PluginInfo(node2, "with No Children", false, false);@@ -160,7 +159,6 @@ public class PluginInfoTest extends DOMUtilTestBase {assertEquals(2, children.size());for (PluginInfo childInfo : children) {assertNotNull(childInfo);- assertTrue(childInfo instanceof PluginInfo);}}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.javaindex 4cfc86b1fbe..b04ac5e39c6 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingAnalyticsValueTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.analytics.value;-import java.util.Arrays;import java.util.Iterator;+import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.analytics.value.FillableTestValue.TestAnalyticsValue;import org.junit.Test;@@ -28,24 +28,23 @@ public class CastingAnalyticsValueTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestAnalyticsValue val = new TestAnalyticsValue();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setExists(false);- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue("Object").setExists(true);- Iterator<Object> values = Arrays.<Object>asList("Object").iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<Object> values = List.<Object>of("Object").iterator();+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.javaindex 73a43b34010..234cda56960 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueStreamTest.java@@ -28,24 +28,23 @@ public class CastingBooleanValueStreamTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestBooleanValueStream val = new TestBooleanValueStream();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setValues();- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(false, true, false);Iterator<String> values = Arrays.asList("false", "true", "false").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -53,25 +52,24 @@ public class CastingBooleanValueStreamTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestBooleanValueStream val = new TestBooleanValueStream();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setValues();- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(false, true, false);Iterator<Object> values =Arrays.<Object>asList(Boolean.FALSE, Boolean.TRUE, Boolean.FALSE).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.javaindex f881be35c8b..b0c1d5f8785 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingBooleanValueTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.analytics.value;-import java.util.Arrays;import java.util.Iterator;+import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.analytics.value.AnalyticsValueStream.ExpressionType;import org.apache.solr.analytics.value.FillableTestValue.TestBooleanValue;@@ -30,56 +30,49 @@ public class CastingBooleanValueTest extends SolrTestCaseJ4 {public void stringCastingTest() {TestBooleanValue val = new TestBooleanValue();- assertTrue(val instanceof StringValue);- StringValue casted = (StringValue) val;-val.setValue(false).setExists(true);- assertEquals("false", casted.getString());- assertTrue(casted.exists());+ assertEquals("false", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());val.setValue(true).setExists(true);- assertEquals("true", casted.getString());- assertTrue(casted.exists());+ assertEquals("true", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());}@Testpublic void objectCastingTest() {TestBooleanValue val = new TestBooleanValue();- assertTrue(val instanceof AnalyticsValue);- AnalyticsValue casted = (AnalyticsValue) val;-val.setValue(false).setExists(true);- assertEquals(Boolean.FALSE, casted.getObject());- assertTrue(casted.exists());+ assertEquals(Boolean.FALSE, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());val.setValue(true).setExists(true);- assertEquals(Boolean.TRUE, casted.getObject());- assertTrue(casted.exists());+ assertEquals(Boolean.TRUE, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());}@Testpublic void booleanStreamCastingTest() {TestBooleanValue val = new TestBooleanValue();- assertTrue(val instanceof BooleanValueStream);- BooleanValueStream casted = (BooleanValueStream) val;-// No valuesval.setExists(false);- casted.streamBooleans(- value -> {- fail("There should be no values to stream");- });+ ((BooleanValueStream) val)+ .streamBooleans(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(false).setExists(true);- Iterator<Boolean> values = Arrays.asList(false).iterator();- casted.streamBooleans(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<Boolean> values = List.of(false).iterator();+ ((BooleanValueStream) val)+ .streamBooleans(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -87,24 +80,23 @@ public class CastingBooleanValueTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestBooleanValue val = new TestBooleanValue();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setExists(false);- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(false).setExists(true);- Iterator<String> values = Arrays.asList("false").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<String> values = List.of("false").iterator();+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -112,24 +104,23 @@ public class CastingBooleanValueTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestBooleanValue val = new TestBooleanValue();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setExists(false);- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(false).setExists(true);- Iterator<Object> values = Arrays.<Object>asList(Boolean.FALSE).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<Object> values = List.<Object>of(Boolean.FALSE).iterator();+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueStreamTest.javaindex 77da84abc41..40566091956 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueStreamTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueStreamTest.java@@ -34,24 +34,23 @@ public class CastingDateValueStreamTest extends SolrTestCaseJ4 {Date date3 = Date.from(Instant.parse("2012-11-30T20:30:15Z"));TestDateValueStream val = new TestDateValueStream();- assertTrue(val instanceof DateValueStream);- DateValueStream casted = (DateValueStream) val;-// No valuesval.setValues();- casted.streamDates(- value -> {- fail("There should be no values to stream");- });+ ((DateValueStream) val)+ .streamDates(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues("1800-01-01T10:30:15Z", "1920-04-15T18:15:45Z", "2012-11-30T20:30:15Z");Iterator<Date> values = Arrays.asList(date1, date2, date3).iterator();- casted.streamDates(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next().toInstant(), value.toInstant());- });+ ((DateValueStream) val)+ .streamDates(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next().toInstant(), value.toInstant());+ });assertFalse(values.hasNext());}@@ -59,26 +58,25 @@ public class CastingDateValueStreamTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestDateValueStream val = new TestDateValueStream();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setValues();- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues("1800-01-01T10:30:15Z", "1920-04-15T18:15:45Z", "2012-11-30T20:30:15Z");Iterator<String> values =Arrays.asList("1800-01-01T10:30:15Z", "1920-04-15T18:15:45Z", "2012-11-30T20:30:15Z").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -89,24 +87,23 @@ public class CastingDateValueStreamTest extends SolrTestCaseJ4 {Date date3 = Date.from(Instant.parse("2012-11-30T20:30:15Z"));TestDateValueStream val = new TestDateValueStream();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setValues();- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues("1800-01-01T10:30:15Z", "1920-04-15T18:15:45Z", "2012-11-30T20:30:15Z");Iterator<Object> values = Arrays.<Object>asList(date1, date2, date3).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueTest.javaindex 734f534fab3..cc77d7ac7f5 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDateValueTest.java@@ -18,7 +18,6 @@ package org.apache.solr.analytics.value;import java.time.Instant;import java.time.format.DateTimeParseException;-import java.util.Arrays;import java.util.Date;import java.util.Iterator;import java.util.List;@@ -35,24 +34,18 @@ public class CastingDateValueTest extends SolrTestCaseJ4 {Date date = Date.from(Instant.parse("1800-01-01T10:30:15Z"));TestDateValue val = new TestDateValue();- assertTrue(val instanceof DateValue);- DateValue casted = (DateValue) val;-val.setValue("1800-01-01T10:30:15Z").setExists(true);- assertEquals(date.toInstant(), casted.getDate().toInstant());- assertTrue(casted.exists());+ assertEquals(date.toInstant(), ((DateValue) val).getDate().toInstant());+ assertTrue(((DateValue) val).exists());}@Testpublic void stringCastingTest() {TestDateValue val = new TestDateValue();- assertTrue(val instanceof StringValue);- StringValue casted = (StringValue) val;-val.setValue("1800-01-01T10:30:15Z").setExists(true);- assertEquals("1800-01-01T10:30:15Z", casted.getString());- assertTrue(casted.exists());+ assertEquals("1800-01-01T10:30:15Z", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());}@Test@@ -60,12 +53,9 @@ public class CastingDateValueTest extends SolrTestCaseJ4 {Date date = Date.from(Instant.parse("1800-01-01T10:30:15Z"));TestDateValue val = new TestDateValue();- assertTrue(val instanceof AnalyticsValue);- AnalyticsValue casted = (AnalyticsValue) val;-val.setValue("1800-01-01T10:30:15Z").setExists(true);- assertEquals(date.toInstant(), ((Date) casted.getObject()).toInstant());- assertTrue(casted.exists());+ assertEquals(date.toInstant(), ((Date) ((AnalyticsValue) val).getObject()).toInstant());+ assertTrue(((AnalyticsValue) val).exists());}@Test@@ -73,24 +63,23 @@ public class CastingDateValueTest extends SolrTestCaseJ4 {Date date = Date.from(Instant.parse("1800-01-01T10:30:15Z"));TestDateValue val = new TestDateValue();- assertTrue(val instanceof DateValueStream);- DateValueStream casted = (DateValueStream) val;-// No valuesval.setExists(false);- casted.streamDates(- value -> {- fail("There should be no values to stream");- });+ ((DateValueStream) val)+ .streamDates(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue("1800-01-01T10:30:15Z").setExists(true);- Iterator<Date> values = Arrays.asList(date).iterator();- casted.streamDates(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next().toInstant(), value.toInstant());- });+ Iterator<Date> values = List.of(date).iterator();+ ((DateValueStream) val)+ .streamDates(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next().toInstant(), value.toInstant());+ });assertFalse(values.hasNext());}@@ -98,24 +87,23 @@ public class CastingDateValueTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestDateValue val = new TestDateValue();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setExists(false);- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue("1800-01-01T10:30:15Z").setExists(true);- Iterator<String> values = Arrays.asList("1800-01-01T10:30:15Z").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<String> values = List.of("1800-01-01T10:30:15Z").iterator();+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -124,24 +112,23 @@ public class CastingDateValueTest extends SolrTestCaseJ4 {Date date = Date.from(Instant.parse("1800-01-01T10:30:15Z"));TestDateValue val = new TestDateValue();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setExists(false);- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue("1800-01-01T10:30:15Z").setExists(true);Iterator<Object> values = List.<Object>of(date).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.javaindex 578e164277c..a5fc2d9daa4 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueStreamTest.java@@ -28,24 +28,23 @@ public class CastingDoubleValueStreamTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestDoubleValueStream val = new TestDoubleValueStream();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setValues();- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20.0, -3.32, 42.5);Iterator<String> values = Arrays.asList("20.0", "-3.32", "42.5").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -53,24 +52,23 @@ public class CastingDoubleValueStreamTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestDoubleValueStream val = new TestDoubleValueStream();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setValues();- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20.0, -3.32, 42.5);Iterator<Object> values = Arrays.<Object>asList(20.0, -3.32, 42.5).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.javaindex d352ea8f021..d945e0502d6 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingDoubleValueTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.analytics.value;-import java.util.Arrays;import java.util.Iterator;+import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.analytics.value.AnalyticsValueStream.ExpressionType;import org.apache.solr.analytics.value.FillableTestValue.TestDoubleValue;@@ -30,56 +30,49 @@ public class CastingDoubleValueTest extends SolrTestCaseJ4 {public void stringCastingTest() {TestDoubleValue val = new TestDoubleValue();- assertTrue(val instanceof StringValue);- StringValue casted = (StringValue) val;-val.setValue(20.0).setExists(true);- assertEquals("20.0", casted.getString());- assertTrue(casted.exists());+ assertEquals("20.0", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());val.setValue(1234.0).setExists(true);- assertEquals("1234.0", casted.getString());- assertTrue(casted.exists());+ assertEquals("1234.0", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());}@Testpublic void objectCastingTest() {TestDoubleValue val = new TestDoubleValue();- assertTrue(val instanceof AnalyticsValue);- AnalyticsValue casted = (AnalyticsValue) val;-val.setValue(20.0).setExists(true);- assertEquals(20.0d, casted.getObject());- assertTrue(casted.exists());+ assertEquals(20.0d, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());val.setValue(1234.0).setExists(true);- assertEquals(1234.0d, casted.getObject());- assertTrue(casted.exists());+ assertEquals(1234.0d, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());}@Testpublic void doubleStreamCastingTest() {TestDoubleValue val = new TestDoubleValue();- assertTrue(val instanceof DoubleValueStream);- DoubleValueStream casted = (DoubleValueStream) val;-// No valuesval.setExists(false);- casted.streamDoubles(- value -> {- fail("There should be no values to stream");- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20.0).setExists(true);- Iterator<Double> values = Arrays.asList(20.0).iterator();- casted.streamDoubles(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ Iterator<Double> values = List.of(20.0).iterator();+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -87,24 +80,23 @@ public class CastingDoubleValueTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestDoubleValue val = new TestDoubleValue();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setExists(false);- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20.0).setExists(true);- Iterator<String> values = Arrays.asList("20.0").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<String> values = List.of("20.0").iterator();+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -112,24 +104,23 @@ public class CastingDoubleValueTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestDoubleValue val = new TestDoubleValue();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setExists(false);- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20.0).setExists(true);- Iterator<Object> values = Arrays.<Object>asList(20.0d).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<Object> values = List.<Object>of(20.0d).iterator();+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.javaindex 70e54148457..916ea101968 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueStreamTest.java@@ -28,24 +28,23 @@ public class CastingFloatValueStreamTest extends SolrTestCaseJ4 {public void doubleStreamCastingTest() {TestFloatValueStream val = new TestFloatValueStream();- assertTrue(val instanceof DoubleValueStream);- DoubleValueStream casted = (DoubleValueStream) val;-// No valuesval.setValues();- casted.streamDoubles(- value -> {- fail("There should be no values to stream");- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20F, -3.32F, 42.5F);Iterator<Double> values = Arrays.asList(20.0, -3.32, 42.5).iterator();- casted.streamDoubles(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -53,24 +52,23 @@ public class CastingFloatValueStreamTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestFloatValueStream val = new TestFloatValueStream();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setValues();- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20F, -3.32F, 42.5F);Iterator<String> values = Arrays.asList("20.0", "-3.32", "42.5").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -78,24 +76,23 @@ public class CastingFloatValueStreamTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestFloatValueStream val = new TestFloatValueStream();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setValues();- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20F, -3.32F, 42.5F);Iterator<Object> values = Arrays.<Object>asList(20F, -3.32F, 42.5F).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.javaindex e8e6e77f035..36c10f8616b 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingFloatValueTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.analytics.value;-import java.util.Arrays;import java.util.Iterator;+import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.analytics.value.AnalyticsValueStream.ExpressionType;import org.apache.solr.analytics.value.FillableTestValue.TestFloatValue;@@ -30,72 +30,62 @@ public class CastingFloatValueTest extends SolrTestCaseJ4 {public void doubleCastingTest() {TestFloatValue val = new TestFloatValue();- assertTrue(val instanceof DoubleValue);- DoubleValue casted = (DoubleValue) val;-val.setValue(20F).setExists(true);- assertEquals(20.0, casted.getDouble(), .00001);- assertTrue(casted.exists());+ assertEquals(20.0, ((DoubleValue) val).getDouble(), .00001);+ assertTrue(((DoubleValue) val).exists());val.setValue(1234F).setExists(true);- assertEquals(1234.0, casted.getDouble(), .00001);- assertTrue(casted.exists());+ assertEquals(1234.0, ((DoubleValue) val).getDouble(), .00001);+ assertTrue(((DoubleValue) val).exists());}@Testpublic void stringCastingTest() {TestFloatValue val = new TestFloatValue();- assertTrue(val instanceof StringValue);- StringValue casted = (StringValue) val;-val.setValue(20F).setExists(true);- assertEquals("20.0", casted.getString());- assertTrue(casted.exists());+ assertEquals("20.0", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());val.setValue(1234F).setExists(true);- assertEquals("1234.0", casted.getString());- assertTrue(casted.exists());+ assertEquals("1234.0", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());}@Testpublic void objectCastingTest() {TestFloatValue val = new TestFloatValue();- assertTrue(val instanceof AnalyticsValue);- AnalyticsValue casted = (AnalyticsValue) val;-val.setValue(20F).setExists(true);- assertEquals(20F, casted.getObject());- assertTrue(casted.exists());+ assertEquals(20F, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());val.setValue(1234F).setExists(true);- assertEquals(1234F, casted.getObject());- assertTrue(casted.exists());+ assertEquals(1234F, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());}@Testpublic void floatStreamCastingTest() {TestFloatValue val = new TestFloatValue();- assertTrue(val instanceof FloatValueStream);- FloatValueStream casted = (FloatValueStream) val;-// No valuesval.setExists(false);- casted.streamFloats(- value -> {- fail("There should be no values to stream");- });+ ((FloatValueStream) val)+ .streamFloats(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20F).setExists(true);- Iterator<Float> values = Arrays.asList(20F).iterator();- casted.streamFloats(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ Iterator<Float> values = List.of(20F).iterator();+ ((FloatValueStream) val)+ .streamFloats(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -103,24 +93,23 @@ public class CastingFloatValueTest extends SolrTestCaseJ4 {public void doubleStreamCastingTest() {TestFloatValue val = new TestFloatValue();- assertTrue(val instanceof DoubleValueStream);- DoubleValueStream casted = (DoubleValueStream) val;-// No valuesval.setExists(false);- casted.streamDoubles(- value -> {- fail("There should be no values to stream");- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20F).setExists(true);- Iterator<Double> values = Arrays.asList(20.0).iterator();- casted.streamDoubles(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ Iterator<Double> values = List.of(20.0).iterator();+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -128,24 +117,23 @@ public class CastingFloatValueTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestFloatValue val = new TestFloatValue();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setExists(false);- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20F).setExists(true);- Iterator<String> values = Arrays.asList("20.0").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<String> values = List.of("20.0").iterator();+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -153,24 +141,23 @@ public class CastingFloatValueTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestFloatValue val = new TestFloatValue();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setExists(false);- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20F).setExists(true);- Iterator<Object> values = Arrays.<Object>asList(20F).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<Object> values = List.<Object>of(20F).iterator();+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.javaindex 1319d341e75..1a4869df6c6 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueStreamTest.java@@ -28,24 +28,23 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {public void longStreamCastingTest() {TestIntValueStream val = new TestIntValueStream();- assertTrue(val instanceof LongValueStream);- LongValueStream casted = (LongValueStream) val;-// No valuesval.setValues();- casted.streamLongs(- value -> {- fail("There should be no values to stream");- });+ ((LongValueStream) val)+ .streamLongs(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20, -3, 42);Iterator<Long> values = Arrays.asList(20L, -3L, 42L).iterator();- casted.streamLongs(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next().longValue(), value);- });+ ((LongValueStream) val)+ .streamLongs(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next().longValue(), value);+ });assertFalse(values.hasNext());}@@ -53,24 +52,23 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {public void floatStreamCastingTest() {TestIntValueStream val = new TestIntValueStream();- assertTrue(val instanceof FloatValueStream);- FloatValueStream casted = (FloatValueStream) val;-// No valuesval.setValues();- casted.streamFloats(- value -> {- fail("There should be no values to stream");- });+ ((FloatValueStream) val)+ .streamFloats(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20, -3, 42);Iterator<Float> values = Arrays.asList(20F, -3F, 42F).iterator();- casted.streamFloats(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ ((FloatValueStream) val)+ .streamFloats(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -78,24 +76,23 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {public void doubleStreamCastingTest() {TestIntValueStream val = new TestIntValueStream();- assertTrue(val instanceof DoubleValueStream);- DoubleValueStream casted = (DoubleValueStream) val;-// No valuesval.setValues();- casted.streamDoubles(- value -> {- fail("There should be no values to stream");- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20, -3, 42);Iterator<Double> values = Arrays.asList(20.0, -3.0, 42.0).iterator();- casted.streamDoubles(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -103,24 +100,23 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestIntValueStream val = new TestIntValueStream();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setValues();- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20, -3, 42);Iterator<String> values = Arrays.asList("20", "-3", "42").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -128,24 +124,23 @@ public class CastingIntValueStreamTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestIntValueStream val = new TestIntValueStream();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setValues();- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20, -3, 42);Iterator<Object> values = Arrays.<Object>asList(20, -3, 42).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.javaindex 4f167306d31..db03dc8a1b4 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingIntValueTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.analytics.value;-import java.util.Arrays;import java.util.Iterator;+import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.analytics.value.AnalyticsValueStream.ExpressionType;import org.apache.solr.analytics.value.FillableTestValue.TestIntValue;@@ -30,104 +30,88 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {public void longCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof LongValue);- LongValue casted = (LongValue) val;-val.setValue(20).setExists(true);- assertEquals(20L, casted.getLong());- assertTrue(casted.exists());+ assertEquals(20L, ((LongValue) val).getLong());+ assertTrue(((LongValue) val).exists());val.setValue(1234).setExists(true);- assertEquals(1234L, casted.getLong());- assertTrue(casted.exists());+ assertEquals(1234L, ((LongValue) val).getLong());+ assertTrue(((LongValue) val).exists());}@Testpublic void floatCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof FloatValue);- FloatValue casted = (FloatValue) val;-val.setValue(20).setExists(true);- assertEquals(20F, casted.getFloat(), .00001);- assertTrue(casted.exists());+ assertEquals(20F, ((FloatValue) val).getFloat(), .00001);+ assertTrue(((FloatValue) val).exists());val.setValue(1234).setExists(true);- assertEquals(1234F, casted.getFloat(), .00001);- assertTrue(casted.exists());+ assertEquals(1234F, ((FloatValue) val).getFloat(), .00001);+ assertTrue(((FloatValue) val).exists());}@Testpublic void doubleCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof DoubleValue);- DoubleValue casted = (DoubleValue) val;-val.setValue(20).setExists(true);- assertEquals(20.0, casted.getDouble(), .00001);- assertTrue(casted.exists());+ assertEquals(20.0, ((DoubleValue) val).getDouble(), .00001);+ assertTrue(((DoubleValue) val).exists());val.setValue(1234).setExists(true);- assertEquals(1234.0, casted.getDouble(), .00001);- assertTrue(casted.exists());+ assertEquals(1234.0, ((DoubleValue) val).getDouble(), .00001);+ assertTrue(((DoubleValue) val).exists());}@Testpublic void stringCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof StringValue);- StringValue casted = (StringValue) val;-val.setValue(20).setExists(true);- assertEquals("20", casted.getString());- assertTrue(casted.exists());+ assertEquals("20", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());val.setValue(1234).setExists(true);- assertEquals("1234", casted.getString());- assertTrue(casted.exists());+ assertEquals("1234", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());}@Testpublic void objectCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof AnalyticsValue);- AnalyticsValue casted = (AnalyticsValue) val;-val.setValue(20).setExists(true);- assertEquals(20, casted.getObject());- assertTrue(casted.exists());+ assertEquals(20, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());val.setValue(1234).setExists(true);- assertEquals(1234, casted.getObject());- assertTrue(casted.exists());+ assertEquals(1234, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());}@Testpublic void intStreamCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof IntValueStream);- IntValueStream casted = (IntValueStream) val;-// No valuesval.setExists(false);- casted.streamInts(- value -> {- fail("There should be no values to stream");- });+ ((IntValueStream) val)+ .streamInts(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20).setExists(true);- Iterator<Integer> values = Arrays.asList(20).iterator();- casted.streamInts(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next().intValue(), value);- });+ Iterator<Integer> values = List.of(20).iterator();+ ((IntValueStream) val)+ .streamInts(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next().intValue(), value);+ });assertFalse(values.hasNext());}@@ -135,24 +119,23 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {public void longStreamCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof LongValueStream);- LongValueStream casted = (LongValueStream) val;-// No valuesval.setExists(false);- casted.streamLongs(- value -> {- fail("There should be no values to stream");- });+ ((LongValueStream) val)+ .streamLongs(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20).setExists(true);- Iterator<Long> values = Arrays.asList(20L).iterator();- casted.streamLongs(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next().longValue(), value);- });+ Iterator<Long> values = List.of(20L).iterator();+ ((LongValueStream) val)+ .streamLongs(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next().longValue(), value);+ });assertFalse(values.hasNext());}@@ -160,24 +143,23 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {public void floatStreamCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof FloatValueStream);- FloatValueStream casted = (FloatValueStream) val;-// No valuesval.setExists(false);- casted.streamFloats(- value -> {- fail("There should be no values to stream");- });+ ((FloatValueStream) val)+ .streamFloats(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20).setExists(true);- Iterator<Float> values = Arrays.asList(20F).iterator();- casted.streamFloats(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ Iterator<Float> values = List.of(20F).iterator();+ ((FloatValueStream) val)+ .streamFloats(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -185,24 +167,23 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {public void doubleStreamCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof DoubleValueStream);- DoubleValueStream casted = (DoubleValueStream) val;-// No valuesval.setExists(false);- casted.streamDoubles(- value -> {- fail("There should be no values to stream");- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20).setExists(true);- Iterator<Double> values = Arrays.asList(20.0).iterator();- casted.streamDoubles(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ Iterator<Double> values = List.of(20.0).iterator();+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -210,24 +191,23 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setExists(false);- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20).setExists(true);- Iterator<String> values = Arrays.asList("20").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<String> values = List.of("20").iterator();+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -235,24 +215,23 @@ public class CastingIntValueTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestIntValue val = new TestIntValue();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setExists(false);- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20).setExists(true);- Iterator<Object> values = Arrays.<Object>asList(20).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<Object> values = List.<Object>of(20).iterator();+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.javaindex 150d0d7d444..6595c9564e9 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueStreamTest.java@@ -28,24 +28,23 @@ public class CastingLongValueStreamTest extends SolrTestCaseJ4 {public void doubleStreamCastingTest() {TestLongValueStream val = new TestLongValueStream();- assertTrue(val instanceof DoubleValueStream);- DoubleValueStream casted = (DoubleValueStream) val;-// No valuesval.setValues();- casted.streamDoubles(- value -> {- fail("There should be no values to stream");- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20L, -3L, 42L);Iterator<Double> values = Arrays.asList(20.0, -3.0, 42.0).iterator();- casted.streamDoubles(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -53,24 +52,23 @@ public class CastingLongValueStreamTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestLongValueStream val = new TestLongValueStream();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setValues();- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20L, -3L, 42L);Iterator<String> values = Arrays.asList("20", "-3", "42").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -78,24 +76,23 @@ public class CastingLongValueStreamTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestLongValueStream val = new TestLongValueStream();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setValues();- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues(20L, -3L, 42L);Iterator<Object> values = Arrays.<Object>asList(20L, -3L, 42L).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.javaindex 21b576cef91..07fd5fda2c5 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingLongValueTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.analytics.value;-import java.util.Arrays;import java.util.Iterator;+import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.analytics.value.AnalyticsValueStream.ExpressionType;import org.apache.solr.analytics.value.FillableTestValue.TestLongValue;@@ -30,72 +30,62 @@ public class CastingLongValueTest extends SolrTestCaseJ4 {public void doubleCastingTest() {TestLongValue val = new TestLongValue();- assertTrue(val instanceof DoubleValue);- DoubleValue casted = (DoubleValue) val;-val.setValue(20L).setExists(true);- assertEquals(20.0, casted.getDouble(), .00001);- assertTrue(casted.exists());+ assertEquals(20.0, ((DoubleValue) val).getDouble(), .00001);+ assertTrue(((DoubleValue) val).exists());val.setValue(1234L).setExists(true);- assertEquals(1234.0, casted.getDouble(), .00001);- assertTrue(casted.exists());+ assertEquals(1234.0, ((DoubleValue) val).getDouble(), .00001);+ assertTrue(((DoubleValue) val).exists());}@Testpublic void stringCastingTest() {TestLongValue val = new TestLongValue();- assertTrue(val instanceof StringValue);- StringValue casted = (StringValue) val;-val.setValue(20L).setExists(true);- assertEquals("20", casted.getString());- assertTrue(casted.exists());+ assertEquals("20", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());val.setValue(1234L).setExists(true);- assertEquals("1234", casted.getString());- assertTrue(casted.exists());+ assertEquals("1234", ((StringValue) val).getString());+ assertTrue(((StringValue) val).exists());}@Testpublic void objectCastingTest() {TestLongValue val = new TestLongValue();- assertTrue(val instanceof AnalyticsValue);- AnalyticsValue casted = (AnalyticsValue) val;-val.setValue(20L).setExists(true);- assertEquals(20L, casted.getObject());- assertTrue(casted.exists());+ assertEquals(20L, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());val.setValue(1234L).setExists(true);- assertEquals(1234L, casted.getObject());- assertTrue(casted.exists());+ assertEquals(1234L, ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());}@Testpublic void longStreamCastingTest() {TestLongValue val = new TestLongValue();- assertTrue(val instanceof LongValueStream);- LongValueStream casted = (LongValueStream) val;-// No valuesval.setExists(false);- casted.streamLongs(- value -> {- fail("There should be no values to stream");- });+ ((LongValueStream) val)+ .streamLongs(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20L).setExists(true);- Iterator<Long> values = Arrays.asList(20L).iterator();- casted.streamLongs(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next().longValue(), value);- });+ Iterator<Long> values = List.of(20L).iterator();+ ((LongValueStream) val)+ .streamLongs(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next().longValue(), value);+ });assertFalse(values.hasNext());}@@ -103,24 +93,23 @@ public class CastingLongValueTest extends SolrTestCaseJ4 {public void doubleStreamCastingTest() {TestLongValue val = new TestLongValue();- assertTrue(val instanceof DoubleValueStream);- DoubleValueStream casted = (DoubleValueStream) val;-// No valuesval.setExists(false);- casted.streamDoubles(- value -> {- fail("There should be no values to stream");- });+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20L).setExists(true);- Iterator<Double> values = Arrays.asList(20.0).iterator();- casted.streamDoubles(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value, .00001);- });+ Iterator<Double> values = List.of(20.0).iterator();+ ((DoubleValueStream) val)+ .streamDoubles(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value, .00001);+ });assertFalse(values.hasNext());}@@ -128,24 +117,23 @@ public class CastingLongValueTest extends SolrTestCaseJ4 {public void stringStreamCastingTest() {TestLongValue val = new TestLongValue();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setExists(false);- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20L).setExists(true);- Iterator<String> values = Arrays.asList("20").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<String> values = List.of("20").iterator();+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -153,24 +141,23 @@ public class CastingLongValueTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestLongValue val = new TestLongValue();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setExists(false);- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue(20L).setExists(true);- Iterator<Object> values = Arrays.<Object>asList(20L).iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<Object> values = List.<Object>of(20L).iterator();+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.javaindex aadba5f3cfc..744ab96febb 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueStreamTest.java@@ -28,24 +28,23 @@ public class CastingStringValueStreamTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestStringValueStream val = new TestStringValueStream();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setValues();- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValues("abc", "def", "ghi");Iterator<Object> values = Arrays.<Object>asList("abc", "def", "ghi").iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.java b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.javaindex a9cc98e94ec..66bce7df991 100644--- a/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.java+++ b/solr/modules/analytics/src/test/org/apache/solr/analytics/value/CastingStringValueTest.java@@ -16,8 +16,8 @@*/package org.apache.solr.analytics.value;-import java.util.Arrays;import java.util.Iterator;+import java.util.List;import org.apache.solr.SolrTestCaseJ4;import org.apache.solr.analytics.value.AnalyticsValueStream.ExpressionType;import org.apache.solr.analytics.value.FillableTestValue.TestStringValue;@@ -30,40 +30,36 @@ public class CastingStringValueTest extends SolrTestCaseJ4 {public void objectCastingTest() {TestStringValue val = new TestStringValue();- assertTrue(val instanceof AnalyticsValue);- AnalyticsValue casted = (AnalyticsValue) val;-val.setValue("string 1").setExists(true);- assertEquals("string 1", casted.getObject());- assertTrue(casted.exists());+ assertEquals("string 1", ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());val.setValue("abc").setExists(true);- assertEquals("abc", casted.getObject());- assertTrue(casted.exists());+ assertEquals("abc", ((AnalyticsValue) val).getObject());+ assertTrue(((AnalyticsValue) val).exists());}@Testpublic void stringStreamCastingTest() {TestStringValue val = new TestStringValue();- assertTrue(val instanceof StringValueStream);- StringValueStream casted = (StringValueStream) val;-// No valuesval.setExists(false);- casted.streamStrings(- value -> {- fail("There should be no values to stream");- });+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue("abcd").setExists(true);- Iterator<String> values = Arrays.asList("abcd").iterator();- casted.streamStrings(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<String> values = List.of("abcd").iterator();+ ((StringValueStream) val)+ .streamStrings(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}@@ -71,24 +67,23 @@ public class CastingStringValueTest extends SolrTestCaseJ4 {public void objectStreamCastingTest() {TestStringValue val = new TestStringValue();- assertTrue(val instanceof AnalyticsValueStream);- AnalyticsValueStream casted = (AnalyticsValueStream) val;-// No valuesval.setExists(false);- casted.streamObjects(- value -> {- fail("There should be no values to stream");- });+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ fail("There should be no values to stream");+ });// Multiple Valuesval.setValue("abcd").setExists(true);- Iterator<Object> values = Arrays.<Object>asList("abcd").iterator();- casted.streamObjects(- value -> {- assertTrue(values.hasNext());- assertEquals(values.next(), value);- });+ Iterator<Object> values = List.<Object>of("abcd").iterator();+ ((AnalyticsValueStream) val)+ .streamObjects(+ value -> {+ assertTrue(values.hasNext());+ assertEquals(values.next(), value);+ });assertFalse(values.hasNext());}diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.javaindex 23d97e4181e..84fae239296 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/comp/MultipleFieldComparator.java@@ -25,7 +25,6 @@ import java.util.UUID;import org.apache.solr.client.solrj.io.Tuple;import org.apache.solr.client.solrj.io.stream.expr.Explanation;import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType;-import org.apache.solr.client.solrj.io.stream.expr.Expressible;import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionParameter;import org.apache.solr.client.solrj.io.stream.expr.StreamExpressionValue;import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;@@ -74,11 +73,11 @@ public class MultipleFieldComparator implements StreamComparator {public StreamExpressionParameter toExpression(StreamFactory factory) throws IOException {StringBuilder sb = new StringBuilder();for (StreamComparator comp : comps) {- if (comp instanceof Expressible) {+ if (comp != null) {if (sb.length() > 0) {sb.append(",");}- sb.append(((Expressible) comp).toExpression(factory));+ sb.append(comp.toExpression(factory));} else {throw new IOException("This MultiComp contains a non-expressible comparator - it cannot be converted to an expression");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.javaindex 883c276bdc2..40ac74bf073 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eq/MultipleFieldEqualitor.java@@ -96,17 +96,15 @@ public class MultipleFieldEqualitor implements StreamEqualitor {if (null == base) {return false;}- if (base instanceof StreamComparator) {- MultipleFieldComparator baseComps = (MultipleFieldComparator) base;+ MultipleFieldComparator baseComps = (MultipleFieldComparator) base;- if (baseComps.getComps().length >= eqs.length) {- for (int idx = 0; idx < eqs.length; ++idx) {- if (!eqs[idx].isDerivedFrom(baseComps.getComps()[idx])) {- return false;- }+ if (baseComps.getComps().length >= eqs.length) {+ for (int idx = 0; idx < eqs.length; ++idx) {+ if (!eqs[idx].isDerivedFrom(baseComps.getComps()[idx])) {+ return false;}- return true;}+ return true;}return false;diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ExponentialMovingAverageEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ExponentialMovingAverageEvaluator.javaindex ac9cd3750a7..b91867af306 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ExponentialMovingAverageEvaluator.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/ExponentialMovingAverageEvaluator.java@@ -56,7 +56,7 @@ public class ExponentialMovingAverageEvaluator extends RecursiveNumericEvaluatorNumber window = (Number) values[1];Number alpha;if (2 == values.length) {- if (!(observations instanceof List<?>)) {+ if (observations == null) {throw new IOException(String.format(Locale.ROOT,@@ -72,7 +72,7 @@ public class ExponentialMovingAverageEvaluator extends RecursiveNumericEvaluatortoExpression(constructingFactory),observations.size()));}- if (!(window instanceof Number)) {+ if (window == null) {throw new IOException(String.format(Locale.ROOT,@@ -93,7 +93,7 @@ public class ExponentialMovingAverageEvaluator extends RecursiveNumericEvaluatorif (3 == values.length) {alpha = (Number) values[2];- if (!(alpha instanceof Number)) {+ if (alpha == null) {throw new IOException(String.format(Locale.ROOT,diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TimeDifferencingEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TimeDifferencingEvaluator.javaindex 8bcfd9c208e..110ced40345 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TimeDifferencingEvaluator.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TimeDifferencingEvaluator.java@@ -59,14 +59,6 @@ public class TimeDifferencingEvaluator extends RecursiveObjectEvaluator implemenNumber lagValue = 1;if (1 == values.length) {- if (!(timeseriesValues instanceof List<?>)) {- throw new IOException(- String.format(- Locale.ROOT,- "Invalid expression %s - found type %s for the first value, expecting a List",- toExpression(constructingFactory),- values[0].getClass().getSimpleName()));- }if (!(timeseriesValues.size() > 1)) {throw new IOException(String.format(@@ -78,7 +70,7 @@ public class TimeDifferencingEvaluator extends RecursiveObjectEvaluator implemen}if (2 == values.length) {lagValue = (Number) values[1];- if (!(lagValue instanceof Number)) {+ if (lagValue == null) {throw new IOException(String.format(Locale.ROOT,@@ -114,7 +106,7 @@ public class TimeDifferencingEvaluator extends RecursiveObjectEvaluator implemenif (2 == values.length) {lagValue = (Number) values[1];- if (!(lagValue instanceof Number)) {+ if (lagValue == null) {throw new IOException(String.format(Locale.ROOT,diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.javaindex fe543a2d396..b6e78b9e37c 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/graph/GatherNodesStream.java@@ -388,8 +388,7 @@ public class GatherNodesStream extends TupleStream implements Expressible {Set<Map.Entry<String, String>> entries = queryParams.entrySet();// parametersfor (Map.Entry<String, String> param : entries) {- assert param.getKey() instanceof String && param.getValue() instanceof String- : "Bad types passed";+ assert param.getKey() != null && param.getValue() != null : "Bad types passed";String value = param.getValue().toString();// SOLR-8409: This is a special case where the params contain a " characterdiff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.javaindex 3c6ff68703f..e8764da3461 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java@@ -117,7 +117,7 @@ public class ComplementStream extends TupleStream implements Expressible {if (includeStreams) {// streams- if (streamA instanceof Expressible) {+ if (streamA != null) {expression.addParameter(((Expressible) streamA).toExpression(factory));} else {throw new IOException(diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.javaindex 3de48f678ad..834b69d1b7c 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/HavingStream.java@@ -112,7 +112,7 @@ public class HavingStream extends TupleStream implements Expressible {expression.addParameter("<stream>");}- if (evaluator instanceof Expressible) {+ if (evaluator != null) {expression.addParameter(evaluator.toExpression(factory));} else {throw new IOException(diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.javaindex bea9ef01634..61692a9486d 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java@@ -117,7 +117,7 @@ public class IntersectStream extends TupleStream implements Expressible {if (includeStreams) {// streams- if (streamA instanceof Expressible) {+ if (streamA != null) {expression.addParameter(((Expressible) streamA).toExpression(factory));} else {throw new IOException(diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.javaindex 320a0850e71..c281e270265 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JoinStream.java@@ -121,9 +121,8 @@ public abstract class JoinStream extends TupleStream implements Expressible {}// on- if (eq instanceof Expressible) {- expression.addParameter(- new StreamExpressionNamedParameter("on", ((Expressible) eq).toExpression(factory)));+ if (eq != null) {+ expression.addParameter(new StreamExpressionNamedParameter("on", eq.toExpression(factory)));} else {throw new IOException("This JoinStream contains a non-expressible equalitor - it cannot be converted to an expression");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PriorityStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PriorityStream.javaindex e5cbd6e9b5e..c9d034d4003 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PriorityStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/PriorityStream.java@@ -93,14 +93,14 @@ public class PriorityStream extends TupleStream implements Expressible {// streamif (includeStreams) {- if (highPriorityTasks instanceof Expressible) {+ if (highPriorityTasks != null) {expression.addParameter(((Expressible) highPriorityTasks).toExpression(factory));} else {throw new IOException("The SchedulerStream contains a non-expressible TupleStream - it cannot be converted to an expression");}- if (tasks instanceof Expressible) {+ if (tasks != null) {expression.addParameter(((Expressible) tasks).toExpression(factory));} else {throw new IOException(diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.javaindex 285ee8a69be..460fd2e5d50 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/ReducerStream.java@@ -169,15 +169,14 @@ public class ReducerStream extends TupleStream implements Expressible {}// over- if (eq instanceof Expressible) {- expression.addParameter(- new StreamExpressionNamedParameter("by", ((Expressible) eq).toExpression(factory)));+ if (eq != null) {+ expression.addParameter(new StreamExpressionNamedParameter("by", eq.toExpression(factory)));} else {throw new IOException("This ReducerStream contains a non-expressible comparator - it cannot be converted to an expression");}- if (op instanceof Expressible) {+ if (op != null) {expression.addParameter(op.toExpression(factory));} else {throw new IOException(diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.javaindex 4960006ce2f..e8ae880bd2e 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/SortStream.java@@ -143,10 +143,9 @@ public class SortStream extends TupleStream implements Expressible {}// by- if (comparator instanceof Expressible) {+ if (comparator != null) {expression.addParameter(- new StreamExpressionNamedParameter(- "by", ((Expressible) comparator).toExpression(factory)));+ new StreamExpressionNamedParameter("by", comparator.toExpression(factory)));} else {throw new IOException("This SortStream contains a non-expressible equalitor - it cannot be converted to an expression");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.javaindex e8d29eef7bf..704f35d5297 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UniqueStream.java@@ -127,10 +127,9 @@ public class UniqueStream extends TupleStream implements Expressible {}// over- if (originalEqualitor instanceof Expressible) {+ if (originalEqualitor != null) {expression.addParameter(- new StreamExpressionNamedParameter(- "over", ((Expressible) originalEqualitor).toExpression(factory)));+ new StreamExpressionNamedParameter("over", originalEqualitor.toExpression(factory)));} else {throw new IOException("This UniqueStream contains a non-expressible equalitor - it cannot be converted to an expression");diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.javaindex 6dc1ab475e7..03188e24005 100644--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java@@ -185,7 +185,7 @@ public class UpdateStream extends TupleStream implements Expressible {new StreamExpressionNamedParameter("batchSize", Integer.toString(updateBatchSize)));if (includeStreams) {- if (tupleSource instanceof Expressible) {+ if (tupleSource != null) {expression.addParameter(((Expressible) tupleSource).toExpression(factory));} else {throw new IOException(diff --git a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.javaindex eafc86e516f..e538ff44651 100644--- a/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java+++ b/solr/solrj/src/test/org/apache/solr/common/SolrDocumentTest.java@@ -247,12 +247,9 @@ public class SolrDocumentTest extends SolrTestCase {}public void testMapInterface() {- SolrDocument doc = new SolrDocument();- assertTrue(doc instanceof Map);assertTrue(Map.class.isAssignableFrom(SolrDocument.class));SolrInputDocument indoc = new SolrInputDocument();- assertTrue(indoc instanceof Map);assertTrue(Map.class.isAssignableFrom(indoc.getClass()));}}