use type in OrderKey

Signed-off-by: Stefan Bischof <[email protected]>

Author: stbischof

common/src/main/java/org/eclipse/daanse/olap/fun/FunUtil.java

@@ -39,6 +39,9 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import org.eclipse.daanse.mdx.model.api.expression.operation.OperationAtom;
 import org.eclipse.daanse.olap.api.CatalogReader;
 import org.eclipse.daanse.olap.api.DataType;
@@ -100,6 +103,8 @@
  */
 public class FunUtil extends Util {
 
+  private static final Logger LOGGER = LoggerFactory.getLogger(FunUtil.class);
+
   public static final NullMember NullMember = new NullMember();
 
 
@@ -481,8 +486,8 @@ public static int compareValues( Object value0, Object value1 ) {
         ( (Number) value1 ).doubleValue() );
     } else if ( value0 instanceof Date date) {
       return date.compareTo( (Date) value1 );
-    } else if ( value0 instanceof OrderKey orderKey) {
-      return orderKey.compareTo( value1 );
+    } else if ( value0 instanceof OrderKey orderKey && value1 instanceof OrderKey orderKeyOther) {
+      return orderKey.compareTo( orderKeyOther);
     } else {
       throw Util.newInternal( "cannot compare " + value0 );
     }
@@ -940,8 +945,8 @@ public static SetWrapper[] evaluateSet(
         DoubleCalc calc = calcs[ i ];
         SetWrapper retval = retvals[ i ];
         Double o = calc.evaluate( evaluator );
-        if(o==null) {
-        	System.out.println(calc);
+        if (o == null) {
+          LOGGER.debug("Calc evaluated to null: {}", calc);
         }
         if ( o == FunUtil.DOUBLE_NULL) {
           retval.nullCount++;
@@ -1673,7 +1678,7 @@ private static Member getCorrespondingMember(
 
 
   public static class SetWrapper {
-    public List v = new ArrayList();
+    public List<Object> v = new ArrayList<>();
     public int errorCount = 0;
     public int nullCount = 0;
 
@@ -1700,16 +1705,16 @@ public static class SetWrapper {
    * Nulls compare last, exceptions (including the
    * object which indicates the the cell is not in the cache yet) next, then numbers and strings are compared by value.
    */
-  public static class DescendingValueComparator implements Comparator {
+  public static class DescendingValueComparator implements Comparator<Object> {
     /**
      * The singleton.
      */
     public static final DescendingValueComparator instance =
       new DescendingValueComparator();
 
     @Override
-	public int compare( Object o1, Object o2 ) {
-      return -FunUtil.compareValues( o1, o2 );
+    public int compare(Object o1, Object o2) {
+      return -FunUtil.compareValues(o1, o2);
     }
   }
 

common/src/main/java/org/eclipse/daanse/olap/fun/sort/OrderKey.java

@@ -29,37 +29,35 @@
 
 import org.eclipse.daanse.olap.api.element.Member;
 
+public class OrderKey implements Comparable<OrderKey> {
 
-public class OrderKey implements Comparable {
-  final Member member;
+    final Member member;
 
-  public OrderKey( Member member ) {
-    super();
-    this.member = member;
-  }
-
-  @Override
-public int compareTo( Object o ) {
-    assert o instanceof OrderKey;
-    OrderKey other = (OrderKey) o;
-    Member otherMember = other.member;
-    final boolean thisCalculated = this.member.isCalculatedInQuery();
-    final boolean otherCalculated = otherMember.isCalculatedInQuery();
-    if ( thisCalculated ) {
-      if ( !otherCalculated ) {
-        return 1;
-      }
-    } else {
-      if ( otherCalculated ) {
-        return -1;
-      }
+    public OrderKey(Member member) {
+        this.member = member;
     }
-    final Comparable thisKey = this.member.getOrderKey();
-    final Comparable otherKey = otherMember.getOrderKey();
-    if ( ( thisKey != null ) && ( otherKey != null ) ) {
-      return thisKey.compareTo( otherKey );
-    } else {
-      return this.member.compareTo( otherMember );
+
+    @Override
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    public int compareTo(OrderKey other) {
+        Member otherMember = other.member;
+        final boolean thisCalculated = this.member.isCalculatedInQuery();
+        final boolean otherCalculated = otherMember.isCalculatedInQuery();
+        if (thisCalculated) {
+            if (!otherCalculated) {
+                return 1;
+            }
+        } else {
+            if (otherCalculated) {
+                return -1;
+            }
+        }
+        final Comparable thisKey = this.member.getOrderKey();
+        final Comparable otherKey = otherMember.getOrderKey();
+        if ((thisKey != null) && (otherKey != null)) {
+            return thisKey.compareTo(otherKey);
+        } else {
+            return this.member.compareTo(otherMember);
+        }
     }
-  }
 }

common/src/main/java/org/eclipse/daanse/olap/fun/sort/Sorter.java

@@ -328,9 +328,8 @@ public static TupleList sortTuples(
       tupleArrayList = tupleList;
     }
 
-    @SuppressWarnings( { "unchecked" } )
-    List<Member>[] tuples =
-      tupleArrayList.toArray( new List[ tupleArrayList.size() ] );
+    @SuppressWarnings("unchecked")
+    List<Member>[] tuples = tupleArrayList.toArray(List[]::new);
     final DelegatingTupleList result =
       new DelegatingTupleList(
         tupleIterable.getArity(),
@@ -645,8 +644,8 @@ public static int compareValues( Object value0, Object value1 ) {
       return ( (Date) value0 ).compareTo( (Date) value1 );
     } else if ( value0 instanceof LocalDateTime ) {
         return ( (LocalDateTime) value0 ).compareTo( (LocalDateTime) value1 );
-    } else if ( value0 instanceof OrderKey ) {
-      return ( (OrderKey) value0 ).compareTo( value1 );
+    } else if ( value0 instanceof OrderKey orderKey0 && value0 instanceof OrderKey orderKey1 ) {
+      return orderKey0.compareTo( orderKey1);
     } else {
       throw newInternal( "cannot compare " + value0 );
     }