diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c4c5d9956..6e6669201 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,28 +26,7 @@ In order to verify that you don't break anything, you should build the whole pro ## Building the Project from Source -You can build the project with [SBT](http://www.scala-sbt.org) or [Maven](http://maven.apache.org). Both build files should be kept in sync. - -### Using SBT - -In the root directory: - -Run all tests with -``` -sbt test -``` - -Or only for one module (e.g. engine) with -``` -sbt engine/test -``` - -Build the JAR files with -``` -sbt assembly -``` - -### Using Maven +You can build the project with [Maven](http://maven.apache.org). In the root directory: diff --git a/feel-engine/assembly-complete.xml b/assembly-complete.xml similarity index 100% rename from feel-engine/assembly-complete.xml rename to assembly-complete.xml diff --git a/build.sbt b/build.sbt deleted file mode 100644 index 3d6c41fd9..000000000 --- a/build.sbt +++ /dev/null @@ -1,99 +0,0 @@ -val shared = Seq( - organization := "org.camunda.bpm.extension.feel.scala", - version := "1.9.0-SNAPSHOT", - scalaVersion := "2.13.0", - resolvers += Resolver.mavenLocal, - resolvers += Classpaths.typesafeReleases, - resolvers += "camunda-bpm-nexus" at "https://app.camunda.com/nexus/content/groups/public", - scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature") -) - -val commonDependencies = Seq( - "org.slf4j" % "slf4j-api" % "1.7.25", - "junit" % "junit" % "4.11" % "test", - "org.scalatest" % "scalatest_2.13" % "3.0.8" % "test", - "org.apache.logging.log4j" % "log4j-api" % "2.9.0" % "test", - "org.apache.logging.log4j" % "log4j-core" % "2.9.0" % "test", - "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.9.0" % "test" -) - -val camundaVersion = "7.11.0" - -lazy val root = (project in file(".")) - .settings(shared) - .aggregate(engine, factory, plugin, camundaSpin, examples) - -lazy val engine = (project in file("feel-engine")) - .enablePlugins(AssemblyPlugin) - .settings( - shared, - name := "feel-engine", - description := "FEEL engine", - libraryDependencies ++= commonDependencies, - libraryDependencies ++= Seq( - "org.scala-lang.modules" % "scala-parser-combinators_2.13" % "1.1.2" - ), - assemblyJarName in assembly := s"${name.value}-${version.value}-complete.jar" - ) - -lazy val factory = (project in file("feel-engine-factory")) - .enablePlugins(AssemblyPlugin) - .settings( - shared, - name := "feel-engine-factory", - description := "FEEL engine factory", - libraryDependencies ++= commonDependencies, - libraryDependencies ++= Seq( - "org.camunda.bpm.dmn" % "camunda-engine-feel-api" % camundaVersion % "provided", - "org.camunda.bpm.dmn" % "camunda-engine-dmn" % camundaVersion % "provided", - "joda-time" % "joda-time" % "2.1" - ), - assemblyJarName in assembly := s"${name.value}-${version.value}-complete.jar" - ) - .dependsOn(engine % "test->test;compile->compile") - -lazy val plugin = (project in file("feel-engine-plugin")) - .enablePlugins(AssemblyPlugin) - .settings( - shared, - name := "feel-engine-plugin", - description := "FEEL engine plugin", - libraryDependencies ++= commonDependencies, - libraryDependencies ++= Seq( - "org.camunda.bpm" % "camunda-engine" % camundaVersion % "provided", - "com.h2database" % "h2" % "1.4.193" % "test" - ), - assemblyJarName in assembly := s"${name.value}-${version.value}-complete.jar" - ) - .dependsOn( - factory % "test->test;compile->compile", - engine % "test->test;compile->compile" - ) - -lazy val camundaSpin = (project in file("feel-camunda-spin")) .enablePlugins(AssemblyPlugin) - .settings( - shared, - name := "feel-camunda-spin", - description := "FEEL engine - Camunda Spin Integration", - libraryDependencies ++= commonDependencies, - libraryDependencies ++= Seq( - "org.camunda.spin" % "camunda-spin-core" % "1.5.0" % "provided", - "org.camunda.spin" % "camunda-spin-dataformat-all" % "1.5.0" % "test" - ) - ) - .dependsOn(engine % "test->test;compile->compile") - -lazy val examples = (project in file("examples")) - .settings( - shared, - name := "feel-engine-plugin", - description := "FEEL engine plugin", - libraryDependencies ++= commonDependencies, - libraryDependencies ++= Seq( - "org.camunda.bpm.dmn" % "camunda-engine-dmn" % camundaVersion % "test" - ) - ) - .dependsOn( - factory % "test->test;compile->compile", - engine % "test->test;compile->compile" - ) diff --git a/examples/pom.xml b/examples/pom.xml deleted file mode 100644 index aa78b2abe..000000000 --- a/examples/pom.xml +++ /dev/null @@ -1,118 +0,0 @@ - - 4.0.0 - - org.camunda.feel - feel-engine-examples - 0.0.1-SNAPSHOT - - FEEL Engine Examples - - - 1.8 - 1.11.0-SNAPSHOT - 3.0.8 - 2.9.0 - 2.13.0 - 2.13.0 - 3.1 - - - - - - org.camunda.feel - feel-engine - ${version.feel-engine} - - - - org.scalatest - scalatest_2.13 - ${version.scalatest} - test - - - - org.apache.logging.log4j - log4j-api - ${version.log4j} - test - - - - org.apache.logging.log4j - log4j-core - ${version.log4j} - test - - - - org.apache.logging.log4j - log4j-slf4j-impl - ${version.log4j} - test - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${plugin.version.compiler} - - ${version.java} - ${version.java} - - - - net.alchim31.maven - scala-maven-plugin - 3.2.1 - - ${scala.binary.version} - ${scala.version} - - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - scala-doc - package - - doc-jar - - - - - - org.scalatest - scalatest-maven-plugin - 1.0 - - - test - - test - - - - - - - - diff --git a/examples/project/build.properties b/examples/project/build.properties deleted file mode 100644 index 64317fdae..000000000 --- a/examples/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=0.13.15 diff --git a/examples/project/plugins.sbt b/examples/project/plugins.sbt deleted file mode 100644 index bedfbbf44..000000000 --- a/examples/project/plugins.sbt +++ /dev/null @@ -1 +0,0 @@ -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") \ No newline at end of file diff --git a/examples/src/main/java/org/camunda/feel/example/spi/CustomJavaFunctionProvider.java b/examples/src/main/java/org/camunda/feel/example/spi/CustomJavaFunctionProvider.java deleted file mode 100644 index e7183ddf0..000000000 --- a/examples/src/main/java/org/camunda/feel/example/spi/CustomJavaFunctionProvider.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH - * under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright - * ownership. Camunda licenses this file to you under the Apache License, - * Version 2.0; 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.camunda.feel.example.spi; - -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; - -import org.camunda.feel.syntaxtree.ValNumber; -import org.camunda.feel.context.JavaFunction; -import org.camunda.feel.context.JavaFunctionProvider; -import scala.math.BigDecimal; - -public class CustomJavaFunctionProvider extends JavaFunctionProvider { - - private static final Map functions = new HashMap<>(); - - static { - - final JavaFunction function = new JavaFunction(Arrays.asList("x"), args -> { - final ValNumber arg = (ValNumber) args.get(0); - - int x = arg.value().intValue(); - - return new ValNumber(BigDecimal.valueOf(x - 1)); - }); - - functions.put("bar", function); - } - - @Override - public Optional resolveFunction(String functionName) { - return Optional.ofNullable(functions.get(functionName)); - } - - @Override - public Collection getFunctionNames() { - return functions.keySet(); - } -} diff --git a/examples/src/main/java/org/camunda/feel/example/spi/CustomJavaValueMapper.java b/examples/src/main/java/org/camunda/feel/example/spi/CustomJavaValueMapper.java deleted file mode 100644 index a302bed0a..000000000 --- a/examples/src/main/java/org/camunda/feel/example/spi/CustomJavaValueMapper.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH - * under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright - * ownership. Camunda licenses this file to you under the Apache License, - * Version 2.0; 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.camunda.feel.example.spi; - -import java.util.Optional; -import java.util.function.Function; - -import org.camunda.feel.syntaxtree.Val; -import org.camunda.feel.syntaxtree.ValNumber; -import org.camunda.feel.syntaxtree.ValString; -import org.camunda.feel.valuemapper.JavaCustomValueMapper; - -public class CustomJavaValueMapper extends JavaCustomValueMapper { - - @Override - public Optional toValue(Object x, Function innerValueMapper) { - if (x instanceof Custom) { - final Custom c = (Custom) x; - return Optional.of(new ValString(c.getName())); - - } else { - return Optional.empty(); - } - } - - @Override - public Optional unpackValue(Val value, Function innerValueMapper) { - if (value instanceof ValNumber) { - final ValNumber number = (ValNumber) value; - return Optional.of(number.value().doubleValue()); // map BigDecimal to Double - - } else { - return Optional.empty(); - } - } - - @Override - public int priority() { - return 1; - } - - interface Custom { - - String getName(); - } -} diff --git a/examples/src/main/scala/org/camunda/feel/example/spi/CustomScalaFunctionProvider.scala b/examples/src/main/scala/org/camunda/feel/example/spi/CustomScalaFunctionProvider.scala deleted file mode 100644 index 454121573..000000000 --- a/examples/src/main/scala/org/camunda/feel/example/spi/CustomScalaFunctionProvider.scala +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH - * under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright - * ownership. Camunda licenses this file to you under the Apache License, - * Version 2.0; 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.camunda.feel.example.spi - -import org.camunda.feel.context.CustomFunctionProvider -import org.camunda.feel.syntaxtree.{ValFunction, ValNumber} - -import scala.math.BigDecimal.int2bigDecimal - -class CustomScalaFunctionProvider extends CustomFunctionProvider { - - def getFunction(name: String): Option[ValFunction] = - functions.get(name) - - override def functionNames: Iterable[String] = functions.keys - - val functions: Map[String, ValFunction] = Map( - "foo" -> ValFunction( - params = List("x"), - invoke = { case List(ValNumber(x)) => ValNumber(x + 1) } - ), - "pi" -> ValFunction( - params = List(), - invoke = _ => 3.14159, - ) - ) - -} diff --git a/examples/src/test/java/org/camunda/feel/example/FeelEngineJavaTest.java b/examples/src/test/java/org/camunda/feel/example/FeelEngineJavaTest.java deleted file mode 100644 index 6a9e4fb09..000000000 --- a/examples/src/test/java/org/camunda/feel/example/FeelEngineJavaTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH - * under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright - * ownership. Camunda licenses this file to you under the Apache License, - * Version 2.0; 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.camunda.feel.example; - -import java.util.Collections; -import java.util.Map; - -import org.camunda.feel.FeelEngine; -import org.camunda.feel.impl.SpiServiceLoader; -import scala.util.Either; - -public class FeelEngineJavaTest { - - public static void main(String[] args) { - - final FeelEngine engine = - new FeelEngine.Builder() - .valueMapper(SpiServiceLoader.loadValueMapper()) - .functionProvider(SpiServiceLoader.loadFunctionProvider()) - .build(); - - final Map variables = Collections.singletonMap("x", 2); - final Either result = engine.evalExpression("x + 1", variables); - - if (result.isRight()) { - final Object value = result.right().get(); - System.out.println("result is " + value); - } else { - final FeelEngine.Failure failure = result.left().get(); - throw new RuntimeException(failure.message()); - } - - } - -} diff --git a/examples/src/test/resources/META-INF/services/org.camunda.feel.context.CustomFunctionProvider b/examples/src/test/resources/META-INF/services/org.camunda.feel.context.CustomFunctionProvider deleted file mode 100644 index 5801c2738..000000000 --- a/examples/src/test/resources/META-INF/services/org.camunda.feel.context.CustomFunctionProvider +++ /dev/null @@ -1,2 +0,0 @@ -org.camunda.feel.example.spi.CustomScalaFunctionProvider -org.camunda.feel.example.spi.CustomJavaFunctionProvider \ No newline at end of file diff --git a/examples/src/test/scala/org/camunda/feel/example/FunctionProviderTest.scala b/examples/src/test/scala/org/camunda/feel/example/FunctionProviderTest.scala deleted file mode 100644 index a90b27814..000000000 --- a/examples/src/test/scala/org/camunda/feel/example/FunctionProviderTest.scala +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH - * under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright - * ownership. Camunda licenses this file to you under the Apache License, - * Version 2.0; 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.camunda.feel.example - -import org.camunda.feel.FeelEngine -import org.camunda.feel.context.Context.EmptyContext -import org.camunda.feel.impl.SpiServiceLoader -import org.scalatest.{FlatSpec, Matchers} - -class FunctionProviderTest - extends FlatSpec - with Matchers { - - val feelEngine = new FeelEngine(SpiServiceLoader.loadFunctionProvider, - SpiServiceLoader.loadValueMapper) - - "The FEEL Engine" should "invoke a custom scala function with input variable" in { - - val result = feelEngine.evalExpression("foo(count)", Map("count" -> 2)) - - result should be(Right(3)) - } - - it should "invoke a custom java function with input variable" in { - - val result = feelEngine.evalExpression("bar(count)", Map("count" -> 3)) - - result should be(Right(2)) - } - - it should "invoke a custom scala function" in { - - val result = feelEngine.evalExpression("pi()", context = EmptyContext) - - result should be(Right(3.14159)) - } - -} diff --git a/examples/src/test/scala/org/camunda/feel/example/spec/Context.scala b/examples/src/test/scala/org/camunda/feel/example/spec/Context.scala deleted file mode 100644 index 19ca41f23..000000000 --- a/examples/src/test/scala/org/camunda/feel/example/spec/Context.scala +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH - * under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright - * ownership. Camunda licenses this file to you under the Apache License, - * Version 2.0; 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.camunda.feel.example.spec - -import java.time.LocalDate - -object Context { - - case class Applicant(maritalStatus: String, monthly: BalanceSummary) - - case class BalanceSummary(income: Int, repayments: Int, expenses: Int) - - case class CreditHistoryRecord(record_date: LocalDate, - event: String, - weight: Int) - -} diff --git a/examples/src/test/scala/org/camunda/feel/example/spec/SpecExampleTest.scala b/examples/src/test/scala/org/camunda/feel/example/spec/SpecExampleTest.scala deleted file mode 100644 index f6fc6dfb0..000000000 --- a/examples/src/test/scala/org/camunda/feel/example/spec/SpecExampleTest.scala +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH - * under one or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information regarding copyright - * ownership. Camunda licenses this file to you under the Apache License, - * Version 2.0; 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 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.camunda.feel.example.spec - -import java.time.LocalDate - -import org.camunda.feel.FeelEngine -import org.camunda.feel.example.spec.Context.{Applicant, BalanceSummary, CreditHistoryRecord} -import org.camunda.feel.impl.SpiServiceLoader -import org.scalatest.{FlatSpec, Matchers} - -class SpecExampleTest extends FlatSpec with Matchers { - - val feelEngine = new FeelEngine(SpiServiceLoader.loadFunctionProvider, - SpiServiceLoader.loadValueMapper) - - val context = Map( - "applicant" -> Applicant( - maritalStatus = "M", - monthly = BalanceSummary( - income = 10000, - repayments = 2500, - expenses = 3000 - ) - ), - "credit_history" -> List( - CreditHistoryRecord( - record_date = LocalDate.parse("2008-03-12"), - event = "home mortgage", - weight = 100 - ), - CreditHistoryRecord( - record_date = LocalDate.parse("2011-04-01"), - event = "foreclosure warning", - weight = 150 - ) - ) - ) - - "The applicant" should "have a yearly income of 120000" in { - - val result = - feelEngine.evalExpression("applicant.monthly.income * 12", context) - - result should be(Right(120000)) - } - - it should "have a valid marital status" in { - - val result = - feelEngine.evalExpression("applicant.maritalStatus in (\"M\",\"S\")", - context) - - result should be(Right(true)) - } - - it should "have a total expense of 5500" in { - - val result = feelEngine.evalExpression( - "sum( [applicant.monthly.repayments, applicant.monthly.expenses] )", - context) - - result should be(Right(5500)) - } - - "The credit history" should "have a total weight of 150" in { - - val result = feelEngine.evalExpression( - "sum( credit_history[record_date > date(\"2011-01-01\")].weight )", - context) - - result should be(Right(150)) - } - - it should "contains no bankruptcy" in { - - val result = feelEngine.evalExpression( - "some ch in credit_history satisfies ch.event = \"bankruptcy\"", - context) - - result should be(Right(false)) - } - -} diff --git a/feel-engine/pom.xml b/feel-engine/pom.xml deleted file mode 100644 index 62f30b2c4..000000000 --- a/feel-engine/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - 4.0.0 - - - org.camunda.feel - feel-scala-root - 1.12.0-SNAPSHOT - - - feel-engine - - FEEL Scala Engine - - - - org.scala-lang.modules - scala-parser-combinators_2.13 - - - - org.slf4j - slf4j-api - - - - org.scalatest - scalatest_2.13 - test - - - - org.apache.logging.log4j - log4j-api - test - - - - org.apache.logging.log4j - log4j-core - test - - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - - - - - - - maven-assembly-plugin - 3.3.0 - - - assembly-complete.xml - - - - - make-assembly - package - - single - - - - - - org.scalatest - scalatest-maven-plugin - - - test - - test - - - - - - - - diff --git a/feel-engine/src/test/resources/log4j2.xml b/feel-engine/src/test/resources/log4j2.xml deleted file mode 100644 index fc43e97ef..000000000 --- a/feel-engine/src/test/resources/log4j2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 9359a8a84..f725bf9ca 100644 --- a/pom.xml +++ b/pom.xml @@ -1,243 +1,306 @@ - - 4.0.0 - - org.camunda.feel - feel-scala-root - 1.12.0-SNAPSHOT - pom - - - org.camunda - camunda-release-parent - 3.3 - - - - FEEL Scala Root - - - 1.8 - 2.13.0 - 2.13.0 - 2.9.0 - UTF-8 - ${encoding} - ${encoding} - - - - feel-engine - - - - - - - org.scala-lang.modules - scala-parser-combinators_2.13 - 1.1.2 - - - - org.scalatest - scalatest_2.13 - 3.0.8 - - - - org.slf4j - slf4j-api - 1.7.25 - - - - org.apache.logging.log4j - log4j-api - ${version.log4j} - - - - org.apache.logging.log4j - log4j-core - ${version.log4j} - - - - org.apache.logging.log4j - log4j-slf4j-impl - ${version.log4j} - - - - com.h2database - h2 - 1.4.193 - - - - - - clean install + + 4.0.0 - + + org.camunda + camunda-release-parent + 3.3 + + - - net.alchim31.maven - scala-maven-plugin - 4.3.1 - - ${scala.binary.version} - ${scala.version} - - - - scala-compile-first - process-resources - - add-source - compile - - - - scala-test-compile - process-test-resources - - testCompile - - - - scala-doc - package - - doc-jar - - - - + org.camunda.feel + feel-scala + 1.12.0-SNAPSHOT + FEEL Scala Engine - - org.apache.maven.plugins - maven-surefire-plugin - 2.7 - - true - - + + 1.8 + 2.13.0 + 2.13.0 + 2.9.0 + UTF-8 + ${encoding} + ${encoding} + - - org.scalatest - scalatest-maven-plugin - 1.0 - - ${project.build.directory}/surefire-reports - . - TestSuite.txt - - + + + + + org.scala-lang.modules + scala-parser-combinators_2.13 + 1.1.2 + + + org.scalatest + scalatest_2.13 + 3.0.8 + + + + org.slf4j + slf4j-api + 1.7.25 + + + + org.apache.logging.log4j + log4j-api + ${version.log4j} + + + + org.apache.logging.log4j + log4j-core + ${version.log4j} + + + + org.apache.logging.log4j + log4j-slf4j-impl + ${version.log4j} + + + + com.h2database + h2 + 1.4.193 + + + + + + + org.scala-lang.modules + scala-parser-combinators_2.13 + + + + org.slf4j + slf4j-api + + + + org.scalatest + scalatest_2.13 + test + + + + org.apache.logging.log4j + log4j-api + test + + + + org.apache.logging.log4j + log4j-core + test + + + + org.apache.logging.log4j + log4j-slf4j-impl + test + + + + + + clean install + + + + + net.alchim31.maven + scala-maven-plugin + 4.3.1 + + ${scala.binary.version} + ${scala.version} + + + + scala-compile-first + process-resources + + add-source + compile + + + + scala-test-compile + process-test-resources + + testCompile + + + + scala-doc + package + + doc-jar + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.7 + + true + + + + + org.scalatest + scalatest-maven-plugin + 1.0 + + ${project.build.directory}/surefire-reports + . + TestSuite.txt + + + + test + + test + + + + + + + maven-assembly-plugin + 3.3.0 + + + assembly-complete.xml + + + + + make-assembly + package + + single + + + + + + + org.antipathy + mvn-scalafmt_2.12 + 0.7_1.5.1 + + --diff + + + + validate + + format + + + + + + + + + + + + license-header-check + + 3.0 + + Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH + under one or more contributor license agreements. See the NOTICE file + distributed with this work for additional information regarding copyright + ownership. Camunda licenses this file to you under the Apache License, + Version 2.0; 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 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + + + + - org.antipathy - mvn-scalafmt_2.12 - 0.7_1.5.1 + com.mycila + license-maven-plugin + ${plugin.version.license} - --diff + false + + **/*.scala + **/*.java + + + SLASHSTAR_STYLE + SLASHSTAR_STYLE + - validate + add-license-header + compile format + + + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + + + + + scm:git:git@github.com:camunda/feel-scala.git + scm:git:git@github.com:camunda/feel-scala.git + scm:git:git@github.com:camunda/feel-scala.git + 1.1.0 + - - - - - - - license-header-check - - 3.0 - - Copyright Camunda Services GmbH and/or licensed to Camunda Services GmbH - under one or more contributor license agreements. See the NOTICE file - distributed with this work for additional information regarding copyright - ownership. Camunda licenses this file to you under the Apache License, - Version 2.0; 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 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - - - com.mycila - license-maven-plugin - ${plugin.version.license} - - false - - **/*.scala - **/*.java - - - SLASHSTAR_STYLE - SLASHSTAR_STYLE - - - - - add-license-header - compile - - format - - - - - - - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - - - - - scm:git:git@github.com:camunda/feel-scala.git - scm:git:git@github.com:camunda/feel-scala.git - scm:git:git@github.com:camunda/feel-scala.git - 1.1.0 - - - - - camunda-nexus - camunda bpm community extensions - https://app.camunda.com/nexus/content/repositories/camunda-bpm-community-extensions - - - camunda-nexus - camunda bpm community extensions snapshots - https://app.camunda.com/nexus/content/repositories/camunda-bpm-community-extensions-snapshots - - true - - + + + camunda-nexus + camunda bpm community extensions + https://app.camunda.com/nexus/content/repositories/camunda-bpm-community-extensions + + + camunda-nexus + camunda bpm community extensions snapshots + + https://app.camunda.com/nexus/content/repositories/camunda-bpm-community-extensions-snapshots + + + true + + diff --git a/project/build.properties b/project/build.properties deleted file mode 100644 index 72f902892..000000000 --- a/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.2.7 diff --git a/project/plugins.sbt b/project/plugins.sbt deleted file mode 100644 index e1977d668..000000000 --- a/project/plugins.sbt +++ /dev/null @@ -1,5 +0,0 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.7") - -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "5.2.4") - -addSbtPlugin("com.geirsson" % "sbt-scalafmt" % "1.5.1") diff --git a/feel-engine/src/main/java/org/camunda/feel/context/JavaFunction.java b/src/main/java/org/camunda/feel/context/JavaFunction.java similarity index 100% rename from feel-engine/src/main/java/org/camunda/feel/context/JavaFunction.java rename to src/main/java/org/camunda/feel/context/JavaFunction.java diff --git a/feel-engine/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory b/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory similarity index 100% rename from feel-engine/src/main/resources/META-INF/services/javax.script.ScriptEngineFactory rename to src/main/resources/META-INF/services/javax.script.ScriptEngineFactory diff --git a/feel-engine/src/main/scala/org/camunda/feel/FeelEngine.scala b/src/main/scala/org/camunda/feel/FeelEngine.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/FeelEngine.scala rename to src/main/scala/org/camunda/feel/FeelEngine.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/context/Context.scala b/src/main/scala/org/camunda/feel/context/Context.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/context/Context.scala rename to src/main/scala/org/camunda/feel/context/Context.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/context/CustomContext.scala b/src/main/scala/org/camunda/feel/context/CustomContext.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/context/CustomContext.scala rename to src/main/scala/org/camunda/feel/context/CustomContext.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/context/CustomFunctionProvider.scala b/src/main/scala/org/camunda/feel/context/CustomFunctionProvider.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/context/CustomFunctionProvider.scala rename to src/main/scala/org/camunda/feel/context/CustomFunctionProvider.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/context/FunctionProvider.scala b/src/main/scala/org/camunda/feel/context/FunctionProvider.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/context/FunctionProvider.scala rename to src/main/scala/org/camunda/feel/context/FunctionProvider.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/context/JavaFunctionProvider.scala b/src/main/scala/org/camunda/feel/context/JavaFunctionProvider.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/context/JavaFunctionProvider.scala rename to src/main/scala/org/camunda/feel/context/JavaFunctionProvider.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/context/VariableProvider.scala b/src/main/scala/org/camunda/feel/context/VariableProvider.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/context/VariableProvider.scala rename to src/main/scala/org/camunda/feel/context/VariableProvider.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/DefaultValueMapper.scala b/src/main/scala/org/camunda/feel/impl/DefaultValueMapper.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/DefaultValueMapper.scala rename to src/main/scala/org/camunda/feel/impl/DefaultValueMapper.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/JavaValueMapper.scala b/src/main/scala/org/camunda/feel/impl/JavaValueMapper.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/JavaValueMapper.scala rename to src/main/scala/org/camunda/feel/impl/JavaValueMapper.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/SpiServiceLoader.scala b/src/main/scala/org/camunda/feel/impl/SpiServiceLoader.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/SpiServiceLoader.scala rename to src/main/scala/org/camunda/feel/impl/SpiServiceLoader.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/BuiltinFunctions.scala b/src/main/scala/org/camunda/feel/impl/interpreter/BuiltinFunctions.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/BuiltinFunctions.scala rename to src/main/scala/org/camunda/feel/impl/interpreter/BuiltinFunctions.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/EvalContext.scala b/src/main/scala/org/camunda/feel/impl/interpreter/EvalContext.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/EvalContext.scala rename to src/main/scala/org/camunda/feel/impl/interpreter/EvalContext.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/FeelInterpreter.scala b/src/main/scala/org/camunda/feel/impl/interpreter/FeelInterpreter.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/FeelInterpreter.scala rename to src/main/scala/org/camunda/feel/impl/interpreter/FeelInterpreter.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/JavaClassMapper.scala b/src/main/scala/org/camunda/feel/impl/interpreter/JavaClassMapper.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/JavaClassMapper.scala rename to src/main/scala/org/camunda/feel/impl/interpreter/JavaClassMapper.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/ObjectContext.scala b/src/main/scala/org/camunda/feel/impl/interpreter/ObjectContext.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/interpreter/ObjectContext.scala rename to src/main/scala/org/camunda/feel/impl/interpreter/ObjectContext.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/parser/ExpressionValidator.scala b/src/main/scala/org/camunda/feel/impl/parser/ExpressionValidator.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/parser/ExpressionValidator.scala rename to src/main/scala/org/camunda/feel/impl/parser/ExpressionValidator.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/parser/FeelParser.scala b/src/main/scala/org/camunda/feel/impl/parser/FeelParser.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/parser/FeelParser.scala rename to src/main/scala/org/camunda/feel/impl/parser/FeelParser.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/script/CompiledFeelScript.scala b/src/main/scala/org/camunda/feel/impl/script/CompiledFeelScript.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/script/CompiledFeelScript.scala rename to src/main/scala/org/camunda/feel/impl/script/CompiledFeelScript.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelExpressionScriptEngine.scala b/src/main/scala/org/camunda/feel/impl/script/FeelExpressionScriptEngine.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelExpressionScriptEngine.scala rename to src/main/scala/org/camunda/feel/impl/script/FeelExpressionScriptEngine.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelScriptEngine.scala b/src/main/scala/org/camunda/feel/impl/script/FeelScriptEngine.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelScriptEngine.scala rename to src/main/scala/org/camunda/feel/impl/script/FeelScriptEngine.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelScriptEngineFactory.scala b/src/main/scala/org/camunda/feel/impl/script/FeelScriptEngineFactory.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelScriptEngineFactory.scala rename to src/main/scala/org/camunda/feel/impl/script/FeelScriptEngineFactory.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelUnaryTestsScriptEngine.scala b/src/main/scala/org/camunda/feel/impl/script/FeelUnaryTestsScriptEngine.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelUnaryTestsScriptEngine.scala rename to src/main/scala/org/camunda/feel/impl/script/FeelUnaryTestsScriptEngine.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelUnaryTestsScriptEngineFactory.scala b/src/main/scala/org/camunda/feel/impl/script/FeelUnaryTestsScriptEngineFactory.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/impl/script/FeelUnaryTestsScriptEngineFactory.scala rename to src/main/scala/org/camunda/feel/impl/script/FeelUnaryTestsScriptEngineFactory.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/syntaxtree/Exp.scala b/src/main/scala/org/camunda/feel/syntaxtree/Exp.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/syntaxtree/Exp.scala rename to src/main/scala/org/camunda/feel/syntaxtree/Exp.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/syntaxtree/FunctionParameters.scala b/src/main/scala/org/camunda/feel/syntaxtree/FunctionParameters.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/syntaxtree/FunctionParameters.scala rename to src/main/scala/org/camunda/feel/syntaxtree/FunctionParameters.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/syntaxtree/IntervalBoundary.scala b/src/main/scala/org/camunda/feel/syntaxtree/IntervalBoundary.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/syntaxtree/IntervalBoundary.scala rename to src/main/scala/org/camunda/feel/syntaxtree/IntervalBoundary.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/syntaxtree/ParsedExpression.scala b/src/main/scala/org/camunda/feel/syntaxtree/ParsedExpression.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/syntaxtree/ParsedExpression.scala rename to src/main/scala/org/camunda/feel/syntaxtree/ParsedExpression.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/syntaxtree/Val.scala b/src/main/scala/org/camunda/feel/syntaxtree/Val.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/syntaxtree/Val.scala rename to src/main/scala/org/camunda/feel/syntaxtree/Val.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/syntaxtree/ZonedTime.scala b/src/main/scala/org/camunda/feel/syntaxtree/ZonedTime.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/syntaxtree/ZonedTime.scala rename to src/main/scala/org/camunda/feel/syntaxtree/ZonedTime.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/valuemapper/CustomValueMapper.scala b/src/main/scala/org/camunda/feel/valuemapper/CustomValueMapper.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/valuemapper/CustomValueMapper.scala rename to src/main/scala/org/camunda/feel/valuemapper/CustomValueMapper.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/valuemapper/JavaCustomValueMapper.scala b/src/main/scala/org/camunda/feel/valuemapper/JavaCustomValueMapper.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/valuemapper/JavaCustomValueMapper.scala rename to src/main/scala/org/camunda/feel/valuemapper/JavaCustomValueMapper.scala diff --git a/feel-engine/src/main/scala/org/camunda/feel/valuemapper/ValueMapper.scala b/src/main/scala/org/camunda/feel/valuemapper/ValueMapper.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/feel/valuemapper/ValueMapper.scala rename to src/main/scala/org/camunda/feel/valuemapper/ValueMapper.scala diff --git a/feel-engine/src/main/scala/org/camunda/package.scala b/src/main/scala/org/camunda/package.scala similarity index 100% rename from feel-engine/src/main/scala/org/camunda/package.scala rename to src/main/scala/org/camunda/package.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/context/SimpleTestJavaFunctionProvider.java b/src/test/java/org/camunda/feel/context/SimpleTestJavaFunctionProvider.java similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/context/SimpleTestJavaFunctionProvider.java rename to src/test/java/org/camunda/feel/context/SimpleTestJavaFunctionProvider.java diff --git a/feel-engine/src/test/scala/org/camunda/feel/valuemapper/SimpleTestPojo.java b/src/test/java/org/camunda/feel/valuemapper/SimpleTestPojo.java similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/valuemapper/SimpleTestPojo.java rename to src/test/java/org/camunda/feel/valuemapper/SimpleTestPojo.java diff --git a/feel-engine/src/test/resources/META-INF/services/org.camunda.feel.context.CustomFunctionProvider b/src/test/resources/META-INF/services/org.camunda.feel.context.CustomFunctionProvider similarity index 100% rename from feel-engine/src/test/resources/META-INF/services/org.camunda.feel.context.CustomFunctionProvider rename to src/test/resources/META-INF/services/org.camunda.feel.context.CustomFunctionProvider diff --git a/feel-engine/src/test/resources/META-INF/services/org.camunda.feel.valuemapper.CustomValueMapper b/src/test/resources/META-INF/services/org.camunda.feel.valuemapper.CustomValueMapper similarity index 100% rename from feel-engine/src/test/resources/META-INF/services/org.camunda.feel.valuemapper.CustomValueMapper rename to src/test/resources/META-INF/services/org.camunda.feel.valuemapper.CustomValueMapper diff --git a/examples/src/test/resources/log4j2.xml b/src/test/resources/log4j2.xml similarity index 100% rename from examples/src/test/resources/log4j2.xml rename to src/test/resources/log4j2.xml diff --git a/feel-engine/src/test/scala/org/camunda/feel/ExternalFunctionsConfigurationTest.scala b/src/test/scala/org/camunda/feel/ExternalFunctionsConfigurationTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/ExternalFunctionsConfigurationTest.scala rename to src/test/scala/org/camunda/feel/ExternalFunctionsConfigurationTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/FeelEngineTest.scala b/src/test/scala/org/camunda/feel/FeelEngineTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/FeelEngineTest.scala rename to src/test/scala/org/camunda/feel/FeelEngineTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/FeelExamplesTest.scala b/src/test/scala/org/camunda/feel/SpecExampleTest.scala similarity index 96% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/FeelExamplesTest.scala rename to src/test/scala/org/camunda/feel/SpecExampleTest.scala index fab4137ee..5af56020e 100644 --- a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/FeelExamplesTest.scala +++ b/src/test/scala/org/camunda/feel/SpecExampleTest.scala @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.camunda.feel.interpreter.impl +package org.camunda.feel +import org.camunda.feel.interpreter.impl.FeelIntegrationTest import org.camunda.feel.syntaxtree._ import org.scalatest.{FlatSpec, Matchers} -class FeelExamplesTest extends FlatSpec with Matchers with FeelIntegrationTest { +class SpecExampleTest extends FlatSpec with Matchers with FeelIntegrationTest { val context: Val = eval( """ diff --git a/feel-engine/src/test/scala/org/camunda/feel/context/JavaCustomFunctionTest.scala b/src/test/scala/org/camunda/feel/context/JavaCustomFunctionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/context/JavaCustomFunctionTest.scala rename to src/test/scala/org/camunda/feel/context/JavaCustomFunctionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/script/ScriptEngineFactoryTest.scala b/src/test/scala/org/camunda/feel/impl/script/ScriptEngineFactoryTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/script/ScriptEngineFactoryTest.scala rename to src/test/scala/org/camunda/feel/impl/script/ScriptEngineFactoryTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/script/ScriptEngineManagerTest.scala b/src/test/scala/org/camunda/feel/impl/script/ScriptEngineManagerTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/script/ScriptEngineManagerTest.scala rename to src/test/scala/org/camunda/feel/impl/script/ScriptEngineManagerTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/script/ScriptEngineTest.scala b/src/test/scala/org/camunda/feel/impl/script/ScriptEngineTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/script/ScriptEngineTest.scala rename to src/test/scala/org/camunda/feel/impl/script/ScriptEngineTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/script/UnaryTestsScriptEngineTest.scala b/src/test/scala/org/camunda/feel/impl/script/UnaryTestsScriptEngineTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/script/UnaryTestsScriptEngineTest.scala rename to src/test/scala/org/camunda/feel/impl/script/UnaryTestsScriptEngineTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/spi/AnotherFunctionProvider.scala b/src/test/scala/org/camunda/feel/impl/spi/AnotherFunctionProvider.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/spi/AnotherFunctionProvider.scala rename to src/test/scala/org/camunda/feel/impl/spi/AnotherFunctionProvider.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/spi/CustomContextTest.scala b/src/test/scala/org/camunda/feel/impl/spi/CustomContextTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/spi/CustomContextTest.scala rename to src/test/scala/org/camunda/feel/impl/spi/CustomContextTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/spi/CustomValueMapperTest.scala b/src/test/scala/org/camunda/feel/impl/spi/CustomValueMapperTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/spi/CustomValueMapperTest.scala rename to src/test/scala/org/camunda/feel/impl/spi/CustomValueMapperTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/spi/JavaValueMapperTest.scala b/src/test/scala/org/camunda/feel/impl/spi/JavaValueMapperTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/spi/JavaValueMapperTest.scala rename to src/test/scala/org/camunda/feel/impl/spi/JavaValueMapperTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/spi/SimpleTestContext.scala b/src/test/scala/org/camunda/feel/impl/spi/SimpleTestContext.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/spi/SimpleTestContext.scala rename to src/test/scala/org/camunda/feel/impl/spi/SimpleTestContext.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/spi/TestFunctionProvider.scala b/src/test/scala/org/camunda/feel/impl/spi/TestFunctionProvider.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/spi/TestFunctionProvider.scala rename to src/test/scala/org/camunda/feel/impl/spi/TestFunctionProvider.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/impl/spi/TestValueMapper.scala b/src/test/scala/org/camunda/feel/impl/spi/TestValueMapper.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/impl/spi/TestValueMapper.scala rename to src/test/scala/org/camunda/feel/impl/spi/TestValueMapper.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/DateTimeDurationPropertiesTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/DateTimeDurationPropertiesTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/DateTimeDurationPropertiesTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/DateTimeDurationPropertiesTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/DefaultValueMapperTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/DefaultValueMapperTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/DefaultValueMapperTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/DefaultValueMapperTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/FeelIntegrationTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/FeelIntegrationTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/FeelIntegrationTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/FeelIntegrationTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterBeanExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterBeanExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterBeanExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterBeanExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterBooleanExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterBooleanExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterBooleanExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterBooleanExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterContextExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterContextExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterContextExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterContextExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterDateTimeExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterDateTimeExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterDateTimeExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterDateTimeExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterFunctionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterFunctionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterFunctionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterFunctionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterListExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterListExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterListExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterListExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterLiteralExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterLiteralExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterLiteralExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterLiteralExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterNumberExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterNumberExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterNumberExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterNumberExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterStringExpressionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterStringExpressionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterStringExpressionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterStringExpressionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterUnaryTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterUnaryTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/InterpreterUnaryTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/InterpreterUnaryTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinContextFunctionsTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinContextFunctionsTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinContextFunctionsTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinContextFunctionsTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinConversionFunctionsTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinConversionFunctionsTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinConversionFunctionsTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinConversionFunctionsTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinFunctionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinFunctionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinFunctionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinFunctionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinListFunctionsTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinListFunctionsTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinListFunctionsTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinListFunctionsTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinNumberFunctionTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinNumberFunctionTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinNumberFunctionTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinNumberFunctionTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinStringFunctionsTest.scala b/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinStringFunctionsTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinStringFunctionsTest.scala rename to src/test/scala/org/camunda/feel/interpreter/impl/builtin/BuiltinStringFunctionsTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/valuemapper/BuiltinValueMapperInputTest.scala b/src/test/scala/org/camunda/feel/valuemapper/BuiltinValueMapperInputTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/valuemapper/BuiltinValueMapperInputTest.scala rename to src/test/scala/org/camunda/feel/valuemapper/BuiltinValueMapperInputTest.scala diff --git a/feel-engine/src/test/scala/org/camunda/feel/valuemapper/BultinValueMapperOutputTest.scala b/src/test/scala/org/camunda/feel/valuemapper/BultinValueMapperOutputTest.scala similarity index 100% rename from feel-engine/src/test/scala/org/camunda/feel/valuemapper/BultinValueMapperOutputTest.scala rename to src/test/scala/org/camunda/feel/valuemapper/BultinValueMapperOutputTest.scala