This is an automated email from the ASF dual-hosted git repository. noble pushed a commit to branch branch_9x in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push: new ea1fcb1203c SOLR-17588: fix compile error ea1fcb1203c is described below commit ea1fcb1203cb16752d1fc829080c2cdb5bcf1394 Author: noblepaul <noble.p...@gmail.com> AuthorDate: Thu Jan 9 14:38:50 2025 +1100 SOLR-17588: fix compile error --- .../org/apache/solr/common/util/JavaBinCodec.java | 24 ++++++++--------- .../apache/solr/common/util/TestJavaBinCodec.java | 31 ++++++++++------------ 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java index 04c8512e614..f9a4278b03c 100644 --- a/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java +++ b/solr/solrj/src/java/org/apache/solr/common/util/JavaBinCodec.java @@ -441,28 +441,28 @@ public class JavaBinCodec implements PushWriter { writeBoolean(((AtomicBoolean) val).get()); return true; } - if (val instanceof float[] ff) { - writeFloatArr(ff); + if (val instanceof float[]) { + writeFloatArr((float[]) val); return true; } - if (val instanceof int[] ii) { - writeIntArr(ii); + if (val instanceof int[]) { + writeIntArr((int[]) val); return true; } - if (val instanceof long[] ll) { - writeLongArr(ll); + if (val instanceof long[]) { + writeLongArr((long[]) val); return true; } - if (val instanceof double[] dd) { - writeDoubleArr(dd); + if (val instanceof double[]) { + writeDoubleArr((double[]) val); return true; } - if (val instanceof short[] ss) { - writeShortArr(ss); + if (val instanceof short[]) { + writeShortArr((short[]) val); return true; } - if (val instanceof boolean[] bb) { - writeBoolArr(bb); + if (val instanceof boolean[]) { + writeBoolArr((boolean[]) val); return true; } return false; diff --git a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java index 12e3dbb9db9..59d4bb2d9c7 100644 --- a/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java +++ b/solr/solrj/src/test/org/apache/solr/common/util/TestJavaBinCodec.java @@ -239,23 +239,20 @@ public class TestJavaBinCodec extends SolrTestCaseJ4 { } else if (unmarshalledObj.get(i) instanceof SolrInputField && matchObj.get(i) instanceof SolrInputField) { assertTrue(assertSolrInputFieldEquals(unmarshalledObj.get(i), matchObj.get(i))); - } else if (unmarshalledObj.get(i) instanceof float[] a - && matchObj.get(i) instanceof float[] e) { - assertArrayEquals(e, a, 0.000000f); - } else if (unmarshalledObj.get(i) instanceof double[] a - && matchObj.get(i) instanceof double[] e) { - assertArrayEquals(e, a, 0.000000d); - } else if (unmarshalledObj.get(i) instanceof long[] a - && matchObj.get(i) instanceof long[] e) { - assertArrayEquals(e, a); - } else if (unmarshalledObj.get(i) instanceof int[] a && matchObj.get(i) instanceof int[] e) { - assertArrayEquals(e, a); - } else if (unmarshalledObj.get(i) instanceof short[] a - && matchObj.get(i) instanceof short[] e) { - assertArrayEquals(e, a); - } else if (unmarshalledObj.get(i) instanceof boolean[] a - && matchObj.get(i) instanceof boolean[] e) { - assertArrayEquals(e, a); + } else if (unmarshalledObj.get(i) instanceof float[] && matchObj.get(i) instanceof float[]) { + assertArrayEquals((float[]) matchObj.get(i), (float[]) unmarshalledObj.get(i), 0.000000f); + } else if (unmarshalledObj.get(i) instanceof double[] + && matchObj.get(i) instanceof double[]) { + assertArrayEquals((double[]) matchObj.get(i), (double[]) unmarshalledObj.get(i), 0.000000d); + } else if (unmarshalledObj.get(i) instanceof long[] && matchObj.get(i) instanceof long[]) { + assertArrayEquals((long[]) matchObj.get(i), (long[]) unmarshalledObj.get(i)); + } else if (unmarshalledObj.get(i) instanceof int[] && matchObj.get(i) instanceof int[]) { + assertArrayEquals((int[]) matchObj.get(i), (int[]) unmarshalledObj.get(i)); + } else if (unmarshalledObj.get(i) instanceof short[] && matchObj.get(i) instanceof short[]) { + assertArrayEquals((short[]) matchObj.get(i), (short[]) unmarshalledObj.get(i)); + } else if (unmarshalledObj.get(i) instanceof boolean[] + && matchObj.get(i) instanceof boolean[]) { + assertArrayEquals((boolean[]) matchObj.get(i), (boolean[]) unmarshalledObj.get(i)); } else { assertEquals(unmarshalledObj.get(i), matchObj.get(i)); }