[incubator-kie-issues-1752] TCK failure-Lambda function returns null

kie-dmn/kie-dmn-core/src/main/java/org/kie/dmn/core/compiler/alphanetbased/TableCellParser.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -24,13 +24,12 @@
 import org.kie.dmn.api.core.DMNType;
 import org.kie.dmn.core.impl.DMNModelImpl;
 import org.kie.dmn.feel.lang.Type;
+import org.kie.dmn.feel.util.BuiltInTypeUtils;
 import org.kie.dmn.model.api.DecisionRule;
 import org.kie.dmn.model.api.DecisionTable;
 import org.kie.dmn.model.api.InputClause;
 import org.kie.dmn.model.api.LiteralExpression;
 
-import static org.kie.dmn.feel.lang.types.BuiltInType.determineTypeFromName;
-
 public class TableCellParser {
     TableCell.TableCellFactory tableCellFactory;
 
@@ -55,9 +54,9 @@ public TableCells parseCells(DecisionTable decisionTable, DTQNameToTypeResolver
                 final String columnName = column.getInputExpression().getText();
                 final Type columnType = resolver.resolve(column.getInputExpression().getTypeRef());
                 TableCell cell = tableCellFactory.createInputCell(tableIndex,
-                                                                  input,
-                                                                  columnName,
-                                                                  columnType);
+                        input,
+                        columnName,
+                        columnType);
 
 
                 tableCells.add(cell);
@@ -87,13 +86,13 @@ private void parseColumnDefinition(String decisionTableName, List<InputClause> c
         for (int columnIndex = 0, columnsSize = columns.size(); columnIndex < columnsSize; columnIndex++) {
             InputClause column = columns.get(columnIndex);
 
-            Type type = determineTypeFromName(column.getInputExpression().getTypeRef() != null ? column.getInputExpression().getTypeRef().getLocalPart() : null);
+            Type type = BuiltInTypeUtils.determineTypeFromName(column.getInputExpression().getTypeRef() != null ? column.getInputExpression().getTypeRef().getLocalPart() : null);
 
             tableCells.addColumnCell(columnIndex, tableCellFactory.createColumnDefinition(columnIndex,
-                                                                       decisionTableName,
-                                                                       column.getInputExpression().getText(),
-                                                                       column.getInputValues(),
-                                                                                          type));
+                    decisionTableName,
+                    column.getInputExpression().getText(),
+                    column.getInputValues(),
+                    type));
         }
     }
 

kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/Type.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information

kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/RangeNode.java

@@ -29,24 +29,29 @@
 import org.kie.dmn.feel.runtime.Range;
 import org.kie.dmn.feel.runtime.impl.RangeImpl;
 import org.kie.dmn.feel.runtime.impl.UndefinedValueComparable;
+import org.kie.dmn.feel.util.BuiltInTypeUtils;
 import org.kie.dmn.feel.util.Msg;
 
 public class RangeNode
         extends BaseNode {
 
     public enum IntervalBoundary {
         OPEN, CLOSED;
+
         public static IntervalBoundary low(String input) {
             switch (input) {
-                case "[": return CLOSED;
+                case "[":
+                    return CLOSED;
                 case "]":
                 default:
-                        return OPEN;
+                    return OPEN;
             }
         }
+
         public static IntervalBoundary high(String input) {
             switch (input) {
-                case "]": return CLOSED;
+                case "]":
+                    return CLOSED;
                 case "[":
                 default:
                     return OPEN;
@@ -56,11 +61,11 @@ public static IntervalBoundary high(String input) {
 
     private IntervalBoundary lowerBound;
     private IntervalBoundary upperBound;
-    private BaseNode         start;
-    private BaseNode         end;
+    private BaseNode start;
+    private BaseNode end;
 
     public RangeNode(ParserRuleContext ctx, IntervalBoundary lowerBound, BaseNode start, BaseNode end, IntervalBoundary upperBound) {
-        super( ctx );
+        super(ctx);
         this.lowerBound = lowerBound;
         this.upperBound = upperBound;
         this.start = start;
@@ -109,30 +114,30 @@ public void setEnd(BaseNode end) {
 
     @Override
     public Range evaluate(EvaluationContext ctx) {
-        Object s = start.evaluate( ctx );
-        Object e = end.evaluate( ctx );
+        Object s = start.evaluate(ctx);
+        Object e = end.evaluate(ctx);
         if (s == null || e == null) {
             return null;
         }
-        
-        Type sType = BuiltInType.determineTypeFromInstance(s);
-        Type eType = BuiltInType.determineTypeFromInstance(e);
+
+        Type sType = BuiltInTypeUtils.determineTypeFromInstance(s);
+        Type eType = BuiltInTypeUtils.determineTypeFromInstance(e);
         boolean withUndefined = s instanceof UndefinedValueComparable || e instanceof UndefinedValueComparable;
         if (s != null && e != null &&
                 !withUndefined &&
                 sType != eType &&
                 !s.getClass().isAssignableFrom(e.getClass())) {
-            ctx.notifyEvt( astEvent(Severity.ERROR, Msg.createMessage(Msg.X_TYPE_INCOMPATIBLE_WITH_Y_TYPE, "Start", "End")));
+            ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.X_TYPE_INCOMPATIBLE_WITH_Y_TYPE, "Start", "End")));
             return null;
         }
 
-        Comparable start = s instanceof UndefinedValueComparable ? (Comparable) s : convertToComparable(ctx, s );
-        Comparable end = e instanceof UndefinedValueComparable ? (Comparable) e : convertToComparable( ctx, e );
+        Comparable start = s instanceof UndefinedValueComparable ? (Comparable) s : convertToComparable(ctx, s);
+        Comparable end = e instanceof UndefinedValueComparable ? (Comparable) e : convertToComparable(ctx, e);
         return isDescendingRange(start, end) ? null :
-        new RangeImpl( lowerBound==IntervalBoundary.OPEN ? Range.RangeBoundary.OPEN : Range.RangeBoundary.CLOSED,
-                              start,
-                              end,
-                              upperBound==IntervalBoundary.OPEN ? Range.RangeBoundary.OPEN : Range.RangeBoundary.CLOSED );
+                new RangeImpl(lowerBound == IntervalBoundary.OPEN ? Range.RangeBoundary.OPEN : Range.RangeBoundary.CLOSED,
+                        start,
+                        end,
+                        upperBound == IntervalBoundary.OPEN ? Range.RangeBoundary.OPEN : Range.RangeBoundary.CLOSED);
     }
 
     static boolean isDescendingRange(Comparable start, Comparable end) {
@@ -145,11 +150,11 @@ private Comparable convertToComparable(EvaluationContext ctx, Object s) {
             start = null;
         } else if (s instanceof Comparable) {
             start = (Comparable) s;
-        } else if( s instanceof Period ) {
+        } else if (s instanceof Period) {
             // period has special semantics
-            start = new ComparablePeriod( (Period) s );
+            start = new ComparablePeriod((Period) s);
         } else {
-            ctx.notifyEvt( astEvent(Severity.ERROR, Msg.createMessage(Msg.INCOMPATIBLE_TYPE_FOR_RANGE, s.getClass().getSimpleName() )));
+            ctx.notifyEvt(astEvent(Severity.ERROR, Msg.createMessage(Msg.INCOMPATIBLE_TYPE_FOR_RANGE, s.getClass().getSimpleName())));
             start = null;
         }
         return start;
@@ -162,7 +167,7 @@ public Type getResultType() {
 
     @Override
     public ASTNode[] getChildrenNode() {
-        return new ASTNode[] { start, end };
+        return new ASTNode[]{start, end};
     }
 
     @Override

kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/TypeNode.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,7 +7,7 @@
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
  *
- *   http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -21,7 +21,7 @@
 import org.antlr.v4.runtime.ParserRuleContext;
 import org.kie.dmn.feel.lang.EvaluationContext;
 import org.kie.dmn.feel.lang.Type;
-import org.kie.dmn.feel.lang.types.BuiltInType;
+import org.kie.dmn.feel.util.BuiltInTypeUtils;
 
 public abstract class TypeNode
         extends BaseNode {
@@ -31,12 +31,12 @@ public TypeNode() {
     }
 
     public TypeNode(ParserRuleContext ctx) {
-        super( ctx );
+        super(ctx);
     }
 
     @Override
     public Type evaluate(EvaluationContext ctx) {
-        return BuiltInType.determineTypeFromName( getText() );
+        return BuiltInTypeUtils.determineTypeFromName(getText());
     }
 
     @Override

kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/lang/types/BuiltInType.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -18,33 +18,17 @@
  */
 package org.kie.dmn.feel.lang.types;
 
-import java.time.Duration;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.ZonedDateTime;
-import java.time.chrono.ChronoPeriod;
-import java.time.temporal.ChronoField;
-import java.time.temporal.Temporal;
-import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalQueries;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
 import org.kie.dmn.api.feel.runtime.events.FEELEvent;
 import org.kie.dmn.feel.lang.SimpleType;
 import org.kie.dmn.feel.lang.Type;
 import org.kie.dmn.feel.marshaller.FEELStringMarshaller;
-import org.kie.dmn.feel.runtime.FEELFunction;
-import org.kie.dmn.feel.runtime.Range;
-import org.kie.dmn.feel.runtime.UnaryTest;
-import org.kie.dmn.feel.runtime.custom.ZoneTime;
+import org.kie.dmn.feel.util.BuiltInTypeUtils;
 
 public enum BuiltInType implements SimpleType {
 
@@ -67,7 +51,7 @@ public enum BuiltInType implements SimpleType {
 
     BuiltInType(String... names) {
         this.names = names;
-        this.symbols = Arrays.asList(names).stream().map(n -> new BuiltInTypeSymbol(n, this)).collect(Collectors.toList());
+        this.symbols = Arrays.stream(names).map(n -> new BuiltInTypeSymbol(n, this)).collect(Collectors.toList());
     }
 
     public String getName() {
@@ -79,13 +63,13 @@ public String[] getNames() {
     }
 
     public Object fromString(String value) {
-        return FEELStringMarshaller.INSTANCE.unmarshall( this, value );
+        return FEELStringMarshaller.INSTANCE.unmarshall(this, value);
     }
 
     public String toString(Object value) {
-        return FEELStringMarshaller.INSTANCE.marshall( value );
+        return FEELStringMarshaller.INSTANCE.marshall(value);
     }
-    
+
     public static <T> Function<FEELEvent, T> justNull() {
         // TODO we should add the EventListener here somehow?
         return t -> null;
@@ -98,88 +82,19 @@ public Collection<BuiltInTypeSymbol> getSymbols() {
     @Override
     public String toString() {
         return "Type{ " +
-               names[0] +
-               " }";
-    }
-
-    public static Type determineTypeFromName( String name ) {
-        if( name == null ) {
-            return UNKNOWN;
-        }
-        for( BuiltInType t : BuiltInType.values() ) {
-            for( String n : t.getNames() ) {
-                if( n.equals( name ) ) {
-                    return t;
-                }
-            }
-        }
-        return UNKNOWN;
-    }
-
-    public static Type determineTypeFromInstance( Object o ) {
-        if( o == null ) {
-            return UNKNOWN;
-        } else if( o instanceof Number ) {
-            return NUMBER;
-        } else if( o instanceof String ) {
-            return STRING;
-        } else if( o instanceof LocalDate ) {
-            return DATE;
-        } else if( o instanceof LocalTime || o instanceof OffsetTime || o instanceof ZoneTime) {
-            return TIME;
-        } else if( o instanceof ZonedDateTime || o instanceof OffsetDateTime || o instanceof LocalDateTime ) {
-            return DATE_TIME;
-        } else if (o instanceof Duration || o instanceof ChronoPeriod) {
-            return DURATION;
-        } else if( o instanceof Boolean ) {
-            return BOOLEAN;
-        } else if( o instanceof UnaryTest ) {
-            return UNARY_TEST;
-        } else if( o instanceof Range ) {
-            return RANGE;
-        } else if( o instanceof FEELFunction ) {
-            return FUNCTION;
-        } else if( o instanceof List ) {
-            return LIST;
-        } else if( o instanceof Map ) {
-            return CONTEXT;
-        } else if (o instanceof TemporalAccessor) {
-            // last, determine if it's a FEEL time with TZ
-            TemporalAccessor ta = (TemporalAccessor) o;
-            if (!(ta instanceof Temporal) && ta.isSupported(ChronoField.HOUR_OF_DAY) 
-                    && ta.isSupported(ChronoField.MINUTE_OF_HOUR) && ta.isSupported(ChronoField.SECOND_OF_MINUTE) 
-                    && ta.query(TemporalQueries.zone()) != null) {
-                return TIME;
-            }
-        }
-        return UNKNOWN;
-    }
-
-    public static boolean isInstanceOf( Object o, Type t ) {
-        if ( o == null ) {
-            return false; // See FEEL specifications Table 49.
-        }
-        if ( t == UNKNOWN ) {
-            return true;
-        }
-        return determineTypeFromInstance( o ) == t;
-    }
-
-    public static boolean isInstanceOf( Object o, String name ) {
-        return determineTypeFromInstance( o ) == determineTypeFromName( name );
+                names[0] +
+                " }";
     }
 
     @Override
     public boolean isInstanceOf(Object o) {
-        return isInstanceOf(o, this);
+        return BuiltInTypeUtils.isInstanceOf(o, this);
     }
 
     @Override
     public boolean isAssignableValue(Object value) {
-        if ( value == null ) {
-            return true; // a null-value can be assigned to any type.
-        }
-        return isInstanceOf(value, this);
+        // a null-value can be assigned to any type.
+        return value == null || isInstanceOf(value);
     }
 
     @Override