[incubator-kie-issues#1344] Refactoring/reorganizing Functions (#6005)

* [incubator-kie-issues#1344] Rrefactoring/reorganizing Functions * [incubator-kie-issues#1344] Fixed as per PR suggestion * [incubator-kie-issues#1344] Hiding constructors from functions, that are singleton by design * [incubator-kie-issues#1344] Fixing tests --------- Co-authored-by: Gabriele-Cardosi <[email protected]>
apache · Jul 1, 2024 · c69dc49 · c69dc49
1 parent 4d5262a
commit c69dc49
Show file tree

Hide file tree

Showing 173 changed files with 2,265 additions and 2,688 deletions.
diff --git a/...ain/java/org/drools/scenariosimulation/backend/expression/DMNFeelExpressionEvaluator.java b/...ain/java/org/drools/scenariosimulation/backend/expression/DMNFeelExpressionEvaluator.java
@@ -51,7 +51,7 @@
 public class DMNFeelExpressionEvaluator extends AbstractExpressionEvaluator {
 
     private final ClassLoader classLoader;
-    private final CodeFunction codeFunction = new CodeFunction();
+    private final CodeFunction codeFunction = CodeFunction.INSTANCE;
 
     public DMNFeelExpressionEvaluator(ClassLoader classLoader) {
         this.classLoader = classLoader;

diff --git a/.../kie-dmn-core/src/main/java/org/kie/dmn/core/internal/utils/DynamicDMNContextBuilder.java b/.../kie-dmn-core/src/main/java/org/kie/dmn/core/internal/utils/DynamicDMNContextBuilder.java
@@ -182,19 +182,19 @@ private Object getAsFEELBuiltinType(Object value, DMNType resultType) {
                 case UNKNOWN:
                     return value;
                 case DATE:
-                    return new DateFunction().invoke((String) value).getOrElseThrow(FailedConversionException::new);
+                    return DateFunction.INSTANCE.invoke((String) value).getOrElseThrow(FailedConversionException::new);
                 case TIME:
-                    return new TimeFunction().invoke((String) value).getOrElseThrow(FailedConversionException::new);
+                    return TimeFunction.INSTANCE.invoke((String) value).getOrElseThrow(FailedConversionException::new);
                 case DATE_TIME:
-                    return new DateAndTimeFunction().invoke((String) value).getOrElseThrow(FailedConversionException::new);
+                    return DateAndTimeFunction.INSTANCE.invoke((String) value).getOrElseThrow(FailedConversionException::new);
                 case BOOLEAN:
                     return value;
                 case NUMBER:
                     return NumberEvalHelper.getBigDecimalOrNull(value);
                 case STRING:
                     return value;
                 case DURATION:
-                    return new DurationFunction().invoke((String) value).getOrElseThrow(FailedConversionException::new);
+                    return DurationFunction.INSTANCE.invoke((String) value).getOrElseThrow(FailedConversionException::new);
                 default:
                     throw new IllegalArgumentException();
             }

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/FEEL.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/FEEL.java
@@ -148,7 +148,7 @@ static FEEL newInstance(ClassLoader cl, List<FEELProfile> profiles) {
      * Evaluates the given compiled FEEL expression using the
      * given EvaluationContext, and returns the result
      *
-     * @param expression a FEEL expression
+     * @param expr a FEEL expression
      * @param ctx the EvaluationContext to be used for defining
      *            input variables and additional feel event listeners
      *            contextual to this method call

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/ASTCompilerHelper.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/codegen/feel11/ASTCompilerHelper.java
@@ -452,12 +452,7 @@ public BlockStmt add(TemporalConstantNode n) {
             Class fnClass = fn.getClass();
             ClassOrInterfaceType fn_CT = parseClassOrInterfaceType(fnClass.getCanonicalName());
             Expression fn_N = new NameExpr(fnClass.getCanonicalName());
-            if (fnClass.getPackageName().equals(EXTENDED_FUNCTION_PACKAGE)) {
-                addVariableDeclaratorWithWithFieldAccess(fn_CT, INSTANCE_S, fn_N);
-            } else {
-                addVariableDeclaratorWithObjectCreation(fn_CT,
-                                                        NodeList.nodeList());
-            }
+            addVariableDeclaratorWithWithFieldAccess(fn_CT, INSTANCE_S, fn_N);
             fnVariableNameExpression = new NameExpr(lastVariableName.get());
         } else {
             fnVariableNameExpression = new NullLiteralExpr();

diff --git a/...-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/visitor/ASTTemporalConstantVisitor.java b/...-dmn-feel/src/main/java/org/kie/dmn/feel/lang/ast/visitor/ASTTemporalConstantVisitor.java
@@ -70,8 +70,7 @@ public class ASTTemporalConstantVisitor extends DefaultedVisitor<ASTNode> {
                                                                          DateAndTimeFunction.INSTANCE,
                                                                          DurationFunction.INSTANCE,
                                                                          org.kie.dmn.feel.runtime.functions.extended.TimeFunction.INSTANCE,
-                                                                         org.kie.dmn.feel.runtime.functions.extended.DateFunction.INSTANCE,
-                                                                         org.kie.dmn.feel.runtime.functions.extended.DurationFunction.INSTANCE);
+                                                                         org.kie.dmn.feel.runtime.functions.extended.DateFunction.INSTANCE);
     public static final Set<String> TEMPORAL_FNS_NAMES = TEMPORAL_FNS.stream().map(FEELFunction::getName).collect(Collectors.toSet());
 
     public ASTTemporalConstantVisitor(CompilerContext ctx) {
@@ -200,10 +199,6 @@ private TemporalConstantNode buildTCNodeForDuration(FunctionInvocationNode n, FE
                 FEELFnResult<TemporalAmount> invoke = DurationFunction.INSTANCE.invoke(p0);
                 return invoke.cata(e -> null,
                                    v -> new TemporalConstantNode(n, v, DurationFunction.INSTANCE, Collections.singletonList(p0)));
-            } else if (fn == org.kie.dmn.feel.runtime.functions.extended.DurationFunction.INSTANCE) {
-                FEELFnResult<TemporalAmount> invoke = org.kie.dmn.feel.runtime.functions.extended.DurationFunction.INSTANCE.invoke(p0);
-                return invoke.cata(e -> null,
-                                   v -> new TemporalConstantNode(n, v, org.kie.dmn.feel.runtime.functions.extended.DurationFunction.INSTANCE, Collections.singletonList(p0)));
             }
         }
         return null;

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/Range.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/Range.java
@@ -20,7 +20,7 @@
 
 public interface Range {
 
-    static enum RangeBoundary {
+    enum RangeBoundary {
         OPEN, CLOSED;
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/AbsFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/AbsFunction.java
@@ -30,7 +30,7 @@ public class AbsFunction
         extends BaseFEELFunction {
     public static final AbsFunction INSTANCE = new AbsFunction();
 
-    AbsFunction() {
+    private AbsFunction() {
         super( "abs" );
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/AllFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/AllFunction.java
@@ -20,6 +20,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
 
@@ -28,7 +29,7 @@ public class AllFunction
 
     public static final AllFunction INSTANCE = new AllFunction();
 
-    public AllFunction() {
+    private AllFunction() {
         super( "all" );
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/AnyFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/AnyFunction.java
@@ -20,6 +20,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
 
@@ -28,7 +29,7 @@ public class AnyFunction
 
     public static final AnyFunction INSTANCE = new AnyFunction();
 
-    public AnyFunction() {
+    private AnyFunction() {
         super( "any" );
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/AppendFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/AppendFunction.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
 
@@ -30,7 +31,7 @@ public class AppendFunction
 
     public static final AppendFunction INSTANCE = new AppendFunction();
 
-    public AppendFunction() {
+    private AppendFunction() {
         super( "append" );
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/BuiltInFunctions.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/BuiltInFunctions.java
@@ -119,7 +119,20 @@ public class BuiltInFunctions {
             OverlapsAfterFunction.INSTANCE,
             MeetsFunction.INSTANCE,
             MetByFunction.INSTANCE,
-            ListReplaceFunction.INSTANCE
+            ListReplaceFunction.INSTANCE,
+            StringJoinFunction.INSTANCE,
+
+            NowFunction.INSTANCE,
+            TodayFunction.INSTANCE,
+            ContextPutFunction.INSTANCE,
+            ContextMergeFunction.INSTANCE,
+            ContextFunction.INSTANCE,
+            RoundUpFunction.INSTANCE,
+            RoundDownFunction.INSTANCE,
+            RoundHalfUpFunction.INSTANCE,
+            RoundHalfDownFunction.INSTANCE,
+
+            RangeFunction.INSTANCE,
     };
 
     public static FEELFunction[] getFunctions() {

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/CeilingFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/CeilingFunction.java
@@ -23,14 +23,13 @@
 
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
-import org.kie.dmn.feel.runtime.functions.FEELFnResult;
 
 public class CeilingFunction
         extends BaseFEELFunction {
 
     public static final CeilingFunction INSTANCE = new CeilingFunction();
 
-    public CeilingFunction() {
+    private CeilingFunction() {
         super( "ceiling" );
     }
 

diff --git a/...mn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/ConcatenateFunction.java b/...mn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/ConcatenateFunction.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
 
@@ -29,7 +30,7 @@ public class ConcatenateFunction
 
     public static final ConcatenateFunction INSTANCE = new ConcatenateFunction();
 
-    public ConcatenateFunction() {
+    private ConcatenateFunction() {
         super( "concatenate" );
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/ContainsFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/ContainsFunction.java
@@ -26,7 +26,7 @@ public class ContainsFunction
 
     public static final ContainsFunction INSTANCE = new ContainsFunction();
 
-    public ContainsFunction() {
+    private ContainsFunction() {
         super( "contains" );
     }
 

diff --git a/...e/functions/extended/ContextFunction.java → ...el/runtime/functions/ContextFunction.java b/...e/functions/extended/ContextFunction.java → ...el/runtime/functions/ContextFunction.java
@@ -16,28 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.kie.dmn.feel.runtime.functions.extended;
+package org.kie.dmn.feel.runtime.functions;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.kie.dmn.api.feel.runtime.events.FEELEvent;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
-import org.kie.dmn.feel.runtime.functions.BaseFEELFunction;
-import org.kie.dmn.feel.runtime.functions.FEELFnResult;
-import org.kie.dmn.feel.runtime.functions.ParameterName;
 
-/**
- * Proposal DMN14-187
- * Experimental for DMN14-183, an inverse of `get entries()`
- * See also: DMN14-181, DMN14-182
- */
+
 public class ContextFunction extends BaseFEELFunction {
 
     public static final ContextFunction INSTANCE = new ContextFunction();
 
-    public ContextFunction() {
+    private ContextFunction() {
         super("context");
     }
 

diff --git a/...ctions/extended/ContextMergeFunction.java → ...ntime/functions/ContextMergeFunction.java b/...ctions/extended/ContextMergeFunction.java → ...ntime/functions/ContextMergeFunction.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.kie.dmn.feel.runtime.functions.extended;
+package org.kie.dmn.feel.runtime.functions;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -25,20 +25,12 @@
 
 import org.kie.dmn.api.feel.runtime.events.FEELEvent;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
-import org.kie.dmn.feel.runtime.functions.BaseFEELFunction;
-import org.kie.dmn.feel.runtime.functions.FEELFnResult;
-import org.kie.dmn.feel.runtime.functions.ParameterName;
 
-/**
- * Proposal DMN14-187
- * Experimental for DMN14-182
- * See also: DMN14-181, DMN14-183
- */
 public class ContextMergeFunction extends BaseFEELFunction {
 
     public static final ContextMergeFunction INSTANCE = new ContextMergeFunction();
 
-    public ContextMergeFunction() {
+    private ContextMergeFunction() {
         super("context merge");
     }
 

diff --git a/...unctions/extended/ContextPutFunction.java → ...runtime/functions/ContextPutFunction.java b/...unctions/extended/ContextPutFunction.java → ...runtime/functions/ContextPutFunction.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.kie.dmn.feel.runtime.functions.extended;
+package org.kie.dmn.feel.runtime.functions;
 
 import java.util.HashMap;
 import java.util.List;
@@ -27,20 +27,13 @@
 import org.kie.dmn.feel.lang.types.BuiltInType;
 import org.kie.dmn.feel.lang.types.impl.ImmutableFPAWrappingPOJO;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
-import org.kie.dmn.feel.runtime.functions.BaseFEELFunction;
-import org.kie.dmn.feel.runtime.functions.FEELFnResult;
-import org.kie.dmn.feel.runtime.functions.ParameterName;
 
-/**
- * Proposal DMN14-187
- * Experimental for DMN14-181
- * See also: DMN14-182, DMN14-183
- */
+
 public class ContextPutFunction extends BaseFEELFunction {
 
     public static final ContextPutFunction INSTANCE = new ContextPutFunction();
 
-    public ContextPutFunction() {
+    private ContextPutFunction() {
         super("context put");
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/CountFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/CountFunction.java
@@ -24,14 +24,13 @@
 
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
-import org.kie.dmn.feel.runtime.functions.FEELFnResult;
 
 public class CountFunction
         extends BaseFEELFunction {
 
     public static final CountFunction INSTANCE = new CountFunction();
 
-    public CountFunction() {
+    private CountFunction() {
         super( "count" );
     }
 

diff --git a/...mn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DateAndTimeFunction.java b/...mn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DateAndTimeFunction.java
@@ -57,7 +57,7 @@ public class DateAndTimeFunction
                                                                  .toFormatter();
     }
 
-    public DateAndTimeFunction() {
+    private DateAndTimeFunction() {
         super(FEELConversionFunctionNames.DATE_AND_TIME);
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DateFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DateFunction.java
@@ -51,7 +51,7 @@ public class DateFunction
                                                   .withResolverStyle(ResolverStyle.STRICT);
     }
 
-    public DateFunction() {
+    protected DateFunction() {
         super(FEELConversionFunctionNames.DATE);
     }
 
@@ -66,7 +66,7 @@ public FEELFnResult<TemporalAccessor> invoke(@ParameterName( "from" ) String val
         try {
             return FEELFnResult.ofResult(LocalDate.from(FEEL_DATE.parse(val)));
         } catch (DateTimeException e) {
-            return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "date", e));
+            return manageDateTimeException(e, val);
         }
     }
 
@@ -99,4 +99,8 @@ public FEELFnResult<TemporalAccessor> invoke(@ParameterName( "from" ) TemporalAc
             return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "from", "date-parsing exception", e));
         }
     }
+
+    protected FEELFnResult<TemporalAccessor> manageDateTimeException(DateTimeException e, String val) {
+        return FEELFnResult.ofError(new InvalidParametersEvent(Severity.ERROR, "date", e));
+    }
 }
diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DayOfWeekFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DayOfWeekFunction.java
@@ -29,7 +29,7 @@
 public class DayOfWeekFunction extends BaseFEELFunction {
     public static final DayOfWeekFunction INSTANCE = new DayOfWeekFunction();
 
-    DayOfWeekFunction() {
+    private DayOfWeekFunction() {
         super("day of week");
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DayOfYearFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DayOfYearFunction.java
@@ -29,7 +29,7 @@
 public class DayOfYearFunction extends BaseFEELFunction {
     public static final DayOfYearFunction INSTANCE = new DayOfYearFunction();
 
-    DayOfYearFunction() {
+    private DayOfYearFunction() {
         super("day of year");
     }
 

diff --git a/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DecimalFunction.java b/kie-dmn/kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DecimalFunction.java
@@ -23,14 +23,13 @@
 
 import org.kie.dmn.api.feel.runtime.events.FEELEvent.Severity;
 import org.kie.dmn.feel.runtime.events.InvalidParametersEvent;
-import org.kie.dmn.feel.runtime.functions.FEELFnResult;
 
 public class DecimalFunction
         extends BaseFEELFunction {
 
     public static final DecimalFunction INSTANCE = new DecimalFunction();
 
-    public DecimalFunction() {
+    private DecimalFunction() {
         super( "decimal" );
     }
 

diff --git a/.../kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DecisionTableFunction.java b/.../kie-dmn-feel/src/main/java/org/kie/dmn/feel/runtime/functions/DecisionTableFunction.java
@@ -50,7 +50,7 @@ public class DecisionTableFunction
 
     private static final Logger LOG = LoggerFactory.getLogger( DecisionTableFunction.class );
 
-    public DecisionTableFunction() {
+    private DecisionTableFunction() {
         super( "decision table" );
     }