Skip to content

Fix EvaluationContextImpl constructor compilation errors #295

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Rikkola wants to merge 1 commit into from
Closed

Fix EvaluationContextImpl constructor compilation errors #295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*

# Maven Shade Plugin generated files
dependency-reduced-pom.xml

# Eclipse, Netbeans and IntelliJ files
/.*
!.gitignore
Expand Down
4 changes: 3 additions & 1 deletion ...t/drools-benchmarks/src/main/java/org/drools/benchmarks/dmn/ast/AbstractASTBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@
package org.drools.benchmarks.dmn.ast;

import org.antlr.v4.runtime.tree.ParseTree;
import org.kie.dmn.api.core.DMNVersion;
import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.Type;
import org.kie.dmn.feel.lang.ast.BaseNode;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.parser.feel11.ASTBuilderVisitor;
import org.kie.dmn.feel.parser.feel11.FEELParser;
import org.kie.dmn.feel.parser.feel11.FEEL_1_1Parser;
Expand Down Expand Up @@ -66,7 +68,7 @@ public Object evaluateBaseNodeBenchmark() {

private static EvaluationContext newEmptyEvaluationContext() {
// Defaulting FEELDialect to FEEL
return new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, FEELDialect.FEEL);
return new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
}

private static BaseNode getBaseNode(String baseNodeExpression) {
Expand Down
6 changes: 5 additions & 1 deletion ...nchmarks/src/main/java/org/drools/benchmarks/dmn/feel/EvaluationContextImplBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@

import java.util.concurrent.TimeUnit;

import org.kie.dmn.api.core.DMNVersion;
import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.Benchmark;
import org.openjdk.jmh.annotations.BenchmarkMode;
import org.openjdk.jmh.annotations.Measurement;
Expand All @@ -44,7 +48,7 @@ public class EvaluationContextImplBenchmark {

@Setup()
public void setupFEEL() {
context = new EvaluationContextImpl(this.getClass().getClassLoader(), null, null);
context = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
context.enterFrame();
context.enterFrame();
context.enterFrame();
Expand Down
5 changes: 4 additions & 1 deletion ...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELAddExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;
import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.AddExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +50,7 @@ public class FEELAddExecutorBenchmark {
@Setup
public void setup() {
executor = AddExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getObjectArray(argsType);
}

Expand Down
5 changes: 4 additions & 1 deletion ...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELAndExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;
import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.AndExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +50,7 @@ public class FEELAndExecutorBenchmark {
@Setup
public void setup() {
executor = AndExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getBooleanArray(args);
}

Expand Down
6 changes: 5 additions & 1 deletion ...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELDivExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;

import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.DivExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +51,7 @@ public class FEELDivExecutorBenchmark {
@Setup
public void setup() {
executor = DivExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getObjectArray(args);
}

Expand Down
5 changes: 4 additions & 1 deletion .../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELEqExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;
import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.EqExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +50,7 @@ public class FEELEqExecutorBenchmark {
@Setup
public void setup() {
executor = EqExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getBooleanArray(args);
}

Expand Down
6 changes: 5 additions & 1 deletion .../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELGtExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;

import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.GtExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +51,7 @@ public class FEELGtExecutorBenchmark {
@Setup
public void setup() {
executor = GtExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getBooleanArray(args);
}

Expand Down
6 changes: 5 additions & 1 deletion ...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELGteExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;

import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.GteExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +51,7 @@ public class FEELGteExecutorBenchmark {
@Setup
public void setup() {
executor = GteExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getBooleanArray(args);
}

Expand Down
6 changes: 5 additions & 1 deletion .../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELLtExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;

import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.LtExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +51,7 @@ public class FEELLtExecutorBenchmark {
@Setup
public void setup() {
executor = LtExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getBooleanArray(args);
}

Expand Down
6 changes: 5 additions & 1 deletion ...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELLteExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;

import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.LteExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +51,7 @@ public class FEELLteExecutorBenchmark {
@Setup
public void setup() {
executor = LteExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getBooleanArray(args);
}

Expand Down
5 changes: 4 additions & 1 deletion ...rc/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELMultExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;
import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.MultExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +50,7 @@ public class FEELMultExecutorBenchmark {
@Setup
public void setup() {
executor = MultExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getObjectArray(args);
}

Expand Down
6 changes: 5 additions & 1 deletion .../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELNeExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;

import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.NeExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +51,7 @@ public class FEELNeExecutorBenchmark {
@Setup
public void setup() {
executor = NeExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getBooleanArray(args);
}

Expand Down
6 changes: 5 additions & 1 deletion .../src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELOrExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;

import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.OrExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +51,7 @@ public class FEELOrExecutorBenchmark {
@Setup
public void setup() {
executor = OrExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getBooleanArray(args);
}

Expand Down
6 changes: 5 additions & 1 deletion ...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELPowExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,13 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;

import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.PowExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +51,7 @@ public class FEELPowExecutorBenchmark {
@Setup
public void setup() {
executor = PowExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getObjectArray(argsType);
}

Expand Down
5 changes: 4 additions & 1 deletion ...src/main/java/org/drools/benchmarks/dmn/feel/infixexecutors/FEELSubExecutorBenchmark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
*/
package org.drools.benchmarks.dmn.feel.infixexecutors;

import org.kie.dmn.api.core.DMNVersion;
import org.kie.dmn.feel.lang.EvaluationContext;
import org.kie.dmn.feel.lang.FEELDialect;
import org.kie.dmn.feel.lang.ast.infixexecutors.SubExecutor;
import org.kie.dmn.feel.lang.impl.EvaluationContextImpl;
import org.kie.dmn.feel.lang.impl.FEELEventListenersManager;
import org.kie.dmn.feel.util.ClassLoaderUtil;
import org.openjdk.jmh.annotations.*;

Expand All @@ -47,7 +50,7 @@ public class FEELSubExecutorBenchmark {
@Setup
public void setup() {
executor = SubExecutor.instance();
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), null, null);
ctx = new EvaluationContextImpl(ClassLoaderUtil.findDefaultClassLoader(), new FEELEventListenersManager(), FEELDialect.FEEL, DMNVersion.V1_5);
values = getObjectArray(argsType);
}

Expand Down