Update to CQL 3.6.0, prep for release 3.1.0

pom.xml

@@ -5,15 +5,15 @@
 
     <groupId>org.opencds.cqf</groupId>
     <artifactId>tooling-parent</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0</version>
 
     <packaging>pom</packaging>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <cql.version>3.5.1</cql.version>
-        <hapi.version>6.10.0</hapi.version>
+        <cql.version>3.6.0</cql.version>
+        <hapi.version>6.10.2</hapi.version>
         <core.version>6.1.2.2</core.version>
         <spring-boot.version>2.1.5.RELEASE</spring-boot.version>
         <slf4j.version>2.0.5</slf4j.version>

scripts/deploy.sh

@@ -24,7 +24,7 @@ fi
 # Import maven settings
 cp .travis.settings.xml $HOME/.m2/settings.xml
 
-CMD="mvn deploy -DskipTests=true -Dmaven.test.skip=true -B"
+CMD="./mvnw deploy -DskipTests=true -Dmaven.test.skip=true -B"
 
 # Import signing key and publish a release on a tag
 if [[ ! -z "$TRAVIS_TAG" ]]

scripts/install.sh

@@ -4,4 +4,4 @@
 set -euxo pipefail
 bash -n "$0"
 
-mvn install -U -DskipTests=true -Dmaven.javadoc.skip=true -B -V
+./mvnw install -U -DskipTests=true -Dmaven.javadoc.skip=true -B -V

scripts/maintenance.sh

@@ -4,4 +4,4 @@
 set -euxo pipefail
 bash -n "$0"
 
-mvn versions:update-properties versions:use-releases versions:use-latest-releases -Dexcludes=com.github.ben-manes.caffeine:caffeine:jar:\*,org.slf4j:\*,org.glassfish.jaxb:\*,com.sun.istack:\*,com.sun.xml.fastinfoset:\*,net.sf.jopt-simple:\*,ch.qos.logback:\*
+./mvnw versions:update-properties versions:use-releases versions:use-latest-releases -Dexcludes=com.github.ben-manes.caffeine:caffeine:jar:\*,org.slf4j:\*,org.glassfish.jaxb:\*,com.sun.istack:\*,com.sun.xml.fastinfoset:\*,net.sf.jopt-simple:\*,ch.qos.logback:\*

scripts/setversion.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 
 # usage ./scripts/setversion.sh N.N.N (or N.N.N-SNAPSHOT)
-mvn versions:set -DnewVersion=$1
+./mvnw versions:set -DnewVersion=$1

tooling-cli/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>org.opencds.cqf</groupId>
         <artifactId>tooling-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
 
     <artifactId>tooling-cli</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <description>CQF Tooling CLI</description>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.opencds.cqf</groupId>
             <artifactId>tooling</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+            <version>3.1.0</version>
         </dependency>
 
         <dependency>

tooling-ui/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>org.opencds.cqf</groupId>
         <artifactId>tooling-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
 
     <artifactId>tooling-ui</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <description>CQF Tooling UI</description>
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.opencds.cqf</groupId>
             <artifactId>tooling</artifactId>
-            <version>3.1.0-SNAPSHOT</version>
+            <version>3.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>

tooling/pom.xml

@@ -6,11 +6,11 @@
     <parent>
         <groupId>org.opencds.cqf</groupId>
         <artifactId>tooling-parent</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.0</version>
     </parent>
 
     <artifactId>tooling</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.0</version>
     <packaging>jar</packaging>
 
     <dependencies>

tooling/src/main/java/org/opencds/cqf/tooling/cql_generation/context/ElmContext.java

@@ -7,11 +7,10 @@
 import java.util.Stack;
 
 import org.apache.commons.lang3.tuple.Pair;
-import org.cqframework.cql.cql2elm.CqlCompilerOptions;
-import org.cqframework.cql.cql2elm.CqlTranslatorOptions;
 import org.cqframework.cql.cql2elm.LibraryBuilder;
 import org.cqframework.cql.cql2elm.LibraryManager;
 import org.cqframework.cql.cql2elm.ModelManager;
+import org.cqframework.cql.elm.IdObjectFactory;
 import org.fhir.ucum.UcumEssenceService;
 import org.fhir.ucum.UcumException;
 import org.fhir.ucum.UcumService;
@@ -60,8 +59,7 @@ public void newLibraryBuilder(Pair<VersionedIdentifier, ContextDef> libraryInfo)
             UcumService ucumService = new UcumEssenceService(
                     UcumEssenceService.class.getResourceAsStream("/ucum-essence.xml"));
             libraryManager.setUcumService(ucumService);
-            this.libraryBuilder = new LibraryBuilder(libraryManager);
-            this.libraryBuilder.setCompilerOptions(CqlCompilerOptions.defaultOptions());
+            this.libraryBuilder = new LibraryBuilder(libraryManager, new IdObjectFactory());
             this.libraryBuilder.setLibraryIdentifier(libraryInfo.getLeft());
             this.libraryBuilder.getModel(new UsingDef().withUri(modelBuilder.getModelUri())
                     .withLocalIdentifier(modelBuilder.getModelIdentifier()).withVersion(modelBuilder.getModelVersion()));

tooling/src/main/java/org/opencds/cqf/tooling/cql_generation/drool/visitor/ElmToCqlVisitor.java

@@ -4,7 +4,7 @@
 import java.util.Stack;
 import java.util.stream.Collectors;
 
-import org.cqframework.cql.elm.visiting.ElmBaseLibraryVisitor;
+import org.cqframework.cql.elm.visiting.BaseElmLibraryVisitor;
 import org.hl7.elm.r1.*;
 import org.hl7.elm.r1.Library.Statements;
 import org.opencds.cqf.tooling.cql_generation.context.ElmContext;
@@ -19,7 +19,7 @@
  * @author Joshua Reynolds
  * @since 2021-04-05
  */
-public class ElmToCqlVisitor extends ElmBaseLibraryVisitor<Void, ElmContext> {
+public class ElmToCqlVisitor extends BaseElmLibraryVisitor<Void, ElmContext> {
     private static final Logger logger = LoggerFactory.getLogger(ElmToCqlVisitor.class);
     private boolean useSpaces = true;
 
@@ -864,7 +864,7 @@ public Void visitQuery(Query query, ElmContext context) {
                 query.getRelationship().stream().forEach(relationship -> visitRelationshipClause(relationship, context));
             }
             if (query.getWhere() != null) {
-                visitWhereClause(query.getWhere(), context);
+                visitExpression(query.getWhere(), context);
             }
             if (query.getReturn() != null) {
                 visitReturnClause(query.getReturn(), context);
@@ -961,27 +961,6 @@ public Void visitLetClause(LetClause let, ElmContext context) {
         return null;
     }
 
-    /**
-     * Visit WhereClause. This method will be called for
-     * WhereClause expression nodes.
-     *
-     * @param where     the Expression
-     * @param context the context passed to the visitor
-     * @return the visitor result
-     */
-    @Override
-    public Void visitWhereClause(Expression where, ElmContext context) {
-        try {
-            enterClause();
-            output.append("where");
-            visitElement(where, context);
-            return null;
-        }
-        finally {
-            exitClause();
-        }
-    }
-
     /**
      * Visit ReturnClause. This method will be called for
      * every node in the tree that is a ReturnClause.