Sort ^() throws ClassCastException with mixed Integer/Double values #97

Author: aeberhart

src/main/java/com/dashjoin/jsonata/Jsonata.java

@@ -1391,7 +1391,7 @@ else if (aa.getClass().isAssignableFrom(bb.getClass()) ||
                 if(aa.equals(bb)) {
                     // both the same - move on to next term
                     continue;
-                } else if (((Comparable)aa).compareTo(bb)<0) {
+                } else if (Utils.compareTo(aa, bb)<0) {
                     comp = -1;
                 } else {
                     comp = 1;

src/main/java/com/dashjoin/jsonata/Utils.java

@@ -275,4 +275,16 @@ static Map mapOf(String key, Object value) {
         map.put(key, value);
         return map;
     }
+    
+    /**
+     * called from Jsonata.compare() - aa and bb are either both strings or numbers
+     * for numbers, compare doubleValue to avoid cast error when int is compared to double
+     */
+    @SuppressWarnings("unchecked")
+    static int compareTo(Object aa, Object bb) {
+        if (aa instanceof String)
+            return ((Comparable)aa).compareTo(bb);
+        else
+            return Double.compare(((Number)aa).doubleValue(), ((Number)bb).doubleValue());
+    }
 }

src/test/java/com/dashjoin/jsonata/ArrayTest.java

@@ -75,4 +75,12 @@ public void testWildcardFilter() {
     var expression2 = jsonata("**[value.Product = 'Product1']");
     Assertions.assertEquals(value1, expression2.evaluate(data));
   }
+  
+  @Test
+  public void testSortTypes() {
+    var e = jsonata("[{'value': 5.9}, {'value': 8}] ^(<value).value");
+    Assertions.assertEquals(List.of(5.9, 8), e.evaluate(null));
+    e = jsonata("[{'value': 'b'}, {'value': 'a'}] ^(<value).value");
+    Assertions.assertEquals(List.of("a", "b"), e.evaluate(null));
+  }
 }