From 1797d02dd6fa9af6ece0006426e186f2316954fc Mon Sep 17 00:00:00 2001 From: Victor Garcia Date: Thu, 7 Sep 2023 12:25:15 +0200 Subject: [PATCH] Move to KMP structure --- .gitignore | 2 + pom.xml => .hiddenpom/pom.xml | 0 build.gradle.kts | 56 ++++ gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle.kts | 12 + .../hisp/dhis/lib/expression/Expression.java | 0 .../lib/expression/ast/AggregationType.java | 0 .../lib/expression/ast/BinaryOperator.java | 0 .../lib/expression/ast/DataItemModifier.java | 0 .../lib/expression/ast/NamedFunction.java | 0 .../dhis/lib/expression/ast/NamedValue.java | 0 .../hisp/dhis/lib/expression/ast/Node.java | 0 .../lib/expression/ast/NodeAnnotations.java | 0 .../dhis/lib/expression/ast/NodeType.java | 0 .../hisp/dhis/lib/expression/ast/Nodes.java | 0 .../dhis/lib/expression/ast/Position.java | 0 .../lib/expression/ast/ProgramVariable.java | 0 .../lib/expression/ast/ReportingRateType.java | 0 .../org/hisp/dhis/lib/expression/ast/Tag.java | 0 .../hisp/dhis/lib/expression/ast/Typed.java | 0 .../lib/expression/ast/UnaryOperator.java | 0 .../dhis/lib/expression/ast/VariableType.java | 0 .../dhis/lib/expression/ast/package-info.java | 0 .../lib/expression/eval/DescribeConsumer.java | 0 .../dhis/lib/expression/eval/Evaluate.java | 0 .../lib/expression/eval/EvaluateFunction.java | 0 .../lib/expression/eval/NodeInterpreter.java | 0 .../lib/expression/eval/NodeValidator.java | 0 .../dhis/lib/expression/eval/NodeVisitor.java | 0 .../expression/eval/TypeCheckingConsumer.java | 0 .../lib/expression/eval/ValidateConsumer.java | 0 .../eval/ValueTypeVariableValue.java | 0 .../lib/expression/eval/package-info.java | 0 .../lib/expression/math/AggregateMath.java | 0 .../dhis/lib/expression/math/GS1Elements.java | 0 .../lib/expression/math/GS1Formatter.java | 0 .../hisp/dhis/lib/expression/math/ZScore.java | 0 .../dhis/lib/expression/math/ZScoreTable.java | 0 .../lib/expression/math/package-info.java | 0 .../dhis/lib/expression/spi/DataItem.java | 0 .../dhis/lib/expression/spi/DataItemType.java | 0 .../lib/expression/spi/ExpressionData.java | 0 .../expression/spi/ExpressionFunctions.java | 0 .../org/hisp/dhis/lib/expression/spi/ID.java | 0 .../spi/IllegalExpressionException.java | 0 .../hisp/dhis/lib/expression/spi/Issue.java | 0 .../hisp/dhis/lib/expression/spi/Issues.java | 0 .../lib/expression/spi/ParseException.java | 0 .../lib/expression/spi/QueryModifiers.java | 0 .../dhis/lib/expression/spi/ValueType.java | 0 .../dhis/lib/expression/spi/Variable.java | 0 .../lib/expression/spi/VariableValue.java | 0 .../dhis/lib/expression/spi/package-info.java | 0 .../dhis/lib/expression/syntax/Chars.java | 0 .../hisp/dhis/lib/expression/syntax/Expr.java | 0 .../expression/syntax/ExpressionGrammar.java | 0 .../dhis/lib/expression/syntax/Fragment.java | 0 .../expression/syntax/FragmentContext.java | 0 .../dhis/lib/expression/syntax/Literals.java | 0 .../lib/expression/syntax/ParseContext.java | 0 .../dhis/lib/expression/syntax/Parser.java | 0 .../dhis/lib/expression/syntax/Terminal.java | 0 .../lib/expression/syntax/package-info.java | 0 .../AggregateFunctionsExpressionTest.java | 0 .../expression/AnnotatedExpressionTest.java | 0 .../lib/expression/CommentExpressionTest.java | 0 .../lib/expression/CompareExpressionTest.java | 0 .../expression/DataItemExpressionTest.java | 0 .../DataItemModifierExpressionTest.java | 0 .../expression/DescriptionExpressionTest.java | 0 .../expression/FunctionsExpressionTest.java | 0 .../lib/expression/LogicalExpressionTest.java | 0 .../lib/expression/MathExpressionTest.java | 0 .../ProgramRuleVariableExpressionTest.java | 0 .../expression/RuleEngineValidationTest.java | 0 .../expression/RuleFunctionAddDaysTest.java | 0 .../lib/expression/RuleFunctionCeilTest.java | 0 ...uleFunctionExtractDataMatrixValueTest.java | 0 .../expression/RuleFunctionHasValueTest.java | 0 .../lib/expression/StringExpressionTest.java | 0 .../UnaryOperatorExpressionTest.java | 0 .../lib/expression/ValidExpressionTest.java | 0 .../expression/VariableExpressionTest.java | 0 .../VariableModifierExpressionTest.java | 0 .../lib/expression/ast/ValueTypeTest.java | 0 .../lib/expression/math/GS1FormatterTest.java | 0 .../util/BinaryOperatorExpressionTest.java | 0 .../expression/util/RuleVariableValue.java | 0 .../hisp/dhis/lib/expression/util/TNode.java | 0 91 files changed, 417 insertions(+) rename pom.xml => .hiddenpom/pom.xml (100%) create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/Expression.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/AggregationType.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/BinaryOperator.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/DataItemModifier.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/NamedFunction.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/NamedValue.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/Node.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/NodeAnnotations.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/NodeType.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/Nodes.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/Position.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/ProgramVariable.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/ReportingRateType.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/Tag.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/Typed.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/UnaryOperator.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/VariableType.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/ast/package-info.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/DescribeConsumer.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/Evaluate.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/EvaluateFunction.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/NodeInterpreter.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/NodeValidator.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/NodeVisitor.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/TypeCheckingConsumer.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/ValidateConsumer.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/ValueTypeVariableValue.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/eval/package-info.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/math/AggregateMath.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/math/GS1Elements.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/math/GS1Formatter.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/math/ZScore.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/math/ZScoreTable.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/math/package-info.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/DataItem.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/DataItemType.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/ExpressionData.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/ExpressionFunctions.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/ID.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/IllegalExpressionException.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/Issue.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/Issues.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/ParseException.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/QueryModifiers.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/ValueType.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/Variable.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/VariableValue.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/spi/package-info.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/Chars.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/Expr.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/Fragment.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/FragmentContext.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/Literals.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/ParseContext.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/Parser.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/Terminal.java (100%) rename src/{main => jvmMain}/java/org/hisp/dhis/lib/expression/syntax/package-info.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/AggregateFunctionsExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/AnnotatedExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/CommentExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/CompareExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/DataItemExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/DataItemModifierExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/DescriptionExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/FunctionsExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/LogicalExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/MathExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/ProgramRuleVariableExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/RuleEngineValidationTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/RuleFunctionAddDaysTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/RuleFunctionCeilTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/RuleFunctionExtractDataMatrixValueTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/RuleFunctionHasValueTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/StringExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/UnaryOperatorExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/ValidExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/VariableExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/VariableModifierExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/ast/ValueTypeTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/math/GS1FormatterTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/util/BinaryOperatorExpressionTest.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/util/RuleVariableValue.java (100%) rename src/{test => jvmTest}/java/org/hisp/dhis/lib/expression/util/TNode.java (100%) diff --git a/.gitignore b/.gitignore index a773065..ab9038a 100644 --- a/.gitignore +++ b/.gitignore @@ -23,4 +23,6 @@ hs_err_pid* .idea/ +.gradle/ target/ +build/ diff --git a/pom.xml b/.hiddenpom/pom.xml similarity index 100% rename from pom.xml rename to .hiddenpom/pom.xml diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..83e5c37 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,56 @@ +group = "org.hisp.dhis.lib.expression" +version = "1.1.0-SNAPSHOT" + +plugins { + kotlin("multiplatform") version "1.9.0" + id("io.freefair.lombok") version "8.3" + `maven-publish` +} + +repositories { + mavenCentral() +} + +kotlin { + jvm { + jvmToolchain(17) + withJava() + testRuns.named("test") { + executionTask.configure { + useJUnitPlatform() + } + } + } + js { + nodejs() + useEsModules() + binaries.library() + } + val hostOs = System.getProperty("os.name") + val isArm64 = System.getProperty("os.arch") == "aarch64" + val isMingwX64 = hostOs.startsWith("Windows") + val nativeTarget = when { + hostOs == "Mac OS X" && isArm64 -> macosArm64("native") + hostOs == "Mac OS X" && !isArm64 -> macosX64("native") + hostOs == "Linux" && isArm64 -> linuxArm64("native") + hostOs == "Linux" && !isArm64 -> linuxX64("native") + isMingwX64 -> mingwX64("native") + else -> throw GradleException("Host OS is not supported in Kotlin/Native.") + } + + + sourceSets { + val commonMain by getting + val commonTest by getting { + dependencies { + implementation(kotlin("test")) + } + } + val jvmMain by getting + val jvmTest by getting + val jsMain by getting + val jsTest by getting + val nativeMain by getting + val nativeTest by getting + } +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..62f495d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..fcb6fca --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..c82b298 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,12 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" +} + +rootProject.name = "expression-parser" diff --git a/src/main/java/org/hisp/dhis/lib/expression/Expression.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/Expression.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/Expression.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/Expression.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/AggregationType.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/AggregationType.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/AggregationType.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/AggregationType.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/BinaryOperator.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/BinaryOperator.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/BinaryOperator.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/BinaryOperator.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/DataItemModifier.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/DataItemModifier.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/DataItemModifier.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/DataItemModifier.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/NamedFunction.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/NamedFunction.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/NamedFunction.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/NamedFunction.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/NamedValue.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/NamedValue.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/NamedValue.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/NamedValue.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/Node.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Node.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/Node.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Node.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/NodeAnnotations.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/NodeAnnotations.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/NodeAnnotations.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/NodeAnnotations.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/NodeType.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/NodeType.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/NodeType.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/NodeType.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/Nodes.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Nodes.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/Nodes.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Nodes.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/Position.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Position.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/Position.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Position.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/ProgramVariable.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/ProgramVariable.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/ProgramVariable.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/ProgramVariable.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/ReportingRateType.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/ReportingRateType.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/ReportingRateType.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/ReportingRateType.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/Tag.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Tag.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/Tag.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Tag.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/Typed.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Typed.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/Typed.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/Typed.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/UnaryOperator.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/UnaryOperator.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/UnaryOperator.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/UnaryOperator.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/VariableType.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/VariableType.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/VariableType.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/VariableType.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/ast/package-info.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/ast/package-info.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/ast/package-info.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/ast/package-info.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/DescribeConsumer.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/DescribeConsumer.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/DescribeConsumer.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/DescribeConsumer.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/Evaluate.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/Evaluate.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/Evaluate.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/Evaluate.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/EvaluateFunction.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/EvaluateFunction.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/EvaluateFunction.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/EvaluateFunction.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/NodeInterpreter.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/NodeInterpreter.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/NodeInterpreter.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/NodeInterpreter.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/NodeValidator.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/NodeValidator.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/NodeValidator.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/NodeValidator.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/NodeVisitor.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/NodeVisitor.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/NodeVisitor.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/NodeVisitor.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/TypeCheckingConsumer.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/TypeCheckingConsumer.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/TypeCheckingConsumer.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/TypeCheckingConsumer.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/ValidateConsumer.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/ValidateConsumer.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/ValidateConsumer.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/ValidateConsumer.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/ValueTypeVariableValue.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/ValueTypeVariableValue.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/ValueTypeVariableValue.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/ValueTypeVariableValue.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/eval/package-info.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/eval/package-info.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/eval/package-info.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/eval/package-info.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/math/AggregateMath.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/math/AggregateMath.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/math/AggregateMath.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/math/AggregateMath.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/math/GS1Elements.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/math/GS1Elements.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/math/GS1Elements.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/math/GS1Elements.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/math/GS1Formatter.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/math/GS1Formatter.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/math/GS1Formatter.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/math/GS1Formatter.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/math/ZScore.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/math/ZScore.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/math/ZScore.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/math/ZScore.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/math/ZScoreTable.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/math/ZScoreTable.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/math/ZScoreTable.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/math/ZScoreTable.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/math/package-info.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/math/package-info.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/math/package-info.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/math/package-info.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/DataItem.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/DataItem.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/DataItem.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/DataItem.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/DataItemType.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/DataItemType.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/DataItemType.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/DataItemType.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/ExpressionData.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ExpressionData.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/ExpressionData.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ExpressionData.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/ExpressionFunctions.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ExpressionFunctions.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/ExpressionFunctions.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ExpressionFunctions.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/ID.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ID.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/ID.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ID.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/IllegalExpressionException.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/IllegalExpressionException.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/IllegalExpressionException.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/IllegalExpressionException.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/Issue.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/Issue.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/Issue.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/Issue.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/Issues.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/Issues.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/Issues.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/Issues.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/ParseException.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ParseException.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/ParseException.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ParseException.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/QueryModifiers.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/QueryModifiers.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/QueryModifiers.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/QueryModifiers.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/ValueType.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ValueType.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/ValueType.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/ValueType.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/Variable.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/Variable.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/Variable.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/Variable.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/VariableValue.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/VariableValue.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/VariableValue.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/VariableValue.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/spi/package-info.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/spi/package-info.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/spi/package-info.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/spi/package-info.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/Chars.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Chars.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/Chars.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Chars.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/Expr.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Expr.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/Expr.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Expr.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/ExpressionGrammar.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/Fragment.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Fragment.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/Fragment.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Fragment.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/FragmentContext.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/FragmentContext.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/FragmentContext.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/FragmentContext.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/Literals.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Literals.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/Literals.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Literals.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/ParseContext.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/ParseContext.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/ParseContext.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/ParseContext.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/Parser.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Parser.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/Parser.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Parser.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/Terminal.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Terminal.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/Terminal.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/Terminal.java diff --git a/src/main/java/org/hisp/dhis/lib/expression/syntax/package-info.java b/src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/package-info.java similarity index 100% rename from src/main/java/org/hisp/dhis/lib/expression/syntax/package-info.java rename to src/jvmMain/java/org/hisp/dhis/lib/expression/syntax/package-info.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/AggregateFunctionsExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/AggregateFunctionsExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/AggregateFunctionsExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/AggregateFunctionsExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/AnnotatedExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/AnnotatedExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/AnnotatedExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/AnnotatedExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/CommentExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/CommentExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/CommentExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/CommentExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/CompareExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/CompareExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/CompareExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/CompareExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/DataItemExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/DataItemExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/DataItemExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/DataItemExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/DataItemModifierExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/DataItemModifierExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/DataItemModifierExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/DataItemModifierExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/DescriptionExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/DescriptionExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/DescriptionExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/DescriptionExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/FunctionsExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/FunctionsExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/FunctionsExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/FunctionsExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/LogicalExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/LogicalExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/LogicalExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/LogicalExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/MathExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/MathExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/MathExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/MathExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/ProgramRuleVariableExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/ProgramRuleVariableExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/ProgramRuleVariableExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/ProgramRuleVariableExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/RuleEngineValidationTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/RuleEngineValidationTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/RuleEngineValidationTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/RuleEngineValidationTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/RuleFunctionAddDaysTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/RuleFunctionAddDaysTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/RuleFunctionAddDaysTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/RuleFunctionAddDaysTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/RuleFunctionCeilTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/RuleFunctionCeilTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/RuleFunctionCeilTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/RuleFunctionCeilTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/RuleFunctionExtractDataMatrixValueTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/RuleFunctionExtractDataMatrixValueTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/RuleFunctionExtractDataMatrixValueTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/RuleFunctionExtractDataMatrixValueTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/RuleFunctionHasValueTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/RuleFunctionHasValueTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/RuleFunctionHasValueTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/RuleFunctionHasValueTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/StringExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/StringExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/StringExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/StringExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/UnaryOperatorExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/UnaryOperatorExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/UnaryOperatorExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/UnaryOperatorExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/ValidExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/ValidExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/ValidExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/ValidExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/VariableExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/VariableExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/VariableExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/VariableExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/VariableModifierExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/VariableModifierExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/VariableModifierExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/VariableModifierExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/ast/ValueTypeTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/ast/ValueTypeTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/ast/ValueTypeTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/ast/ValueTypeTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/math/GS1FormatterTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/math/GS1FormatterTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/math/GS1FormatterTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/math/GS1FormatterTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/util/BinaryOperatorExpressionTest.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/util/BinaryOperatorExpressionTest.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/util/BinaryOperatorExpressionTest.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/util/BinaryOperatorExpressionTest.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/util/RuleVariableValue.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/util/RuleVariableValue.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/util/RuleVariableValue.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/util/RuleVariableValue.java diff --git a/src/test/java/org/hisp/dhis/lib/expression/util/TNode.java b/src/jvmTest/java/org/hisp/dhis/lib/expression/util/TNode.java similarity index 100% rename from src/test/java/org/hisp/dhis/lib/expression/util/TNode.java rename to src/jvmTest/java/org/hisp/dhis/lib/expression/util/TNode.java