From c0178e27e5b0a7166d99113e8e6d0c69ce6880da Mon Sep 17 00:00:00 2001
From: Greg Akins <gregory.akins@icf.com>
Date: Wed, 28 Aug 2024 14:47:31 -0400
Subject: [PATCH] MAT-6463: Updating CqFramework version and bumping artifact
 version

---
 pom.xml                                          |  6 +++---
 .../cql_elm_translator/utils/cql/CQLTools.java   | 10 ++++++----
 .../utils/cql/parsing/Cql2ElmListener.java       | 16 +++++++---------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8e28194..5165c3b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>gov.cms.madie</groupId>
 	<artifactId>madie-translator-commons</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.2-SNAPSHOT</version>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java.version>17</java.version>
@@ -12,10 +12,10 @@
 		<maven.compiler.target>17</maven.compiler.target>
 		<mockito.version>5.12.0</mockito.version>
 		<slf4j.version>2.0.13</slf4j.version>
-		<cqframework.version>3.3.2</cqframework.version>
+		<cqframework.version>3.14.0</cqframework.version>
 		<spotify.fmt.version>2.21.1</spotify.fmt.version>
 		<lombok.version>1.18.24</lombok.version>
-		<madie.rest.commons.version>0.0.4-SNAPSHOT</madie.rest.commons.version>
+		<madie.rest.commons.version>0.0.7-SNAPSHOT</madie.rest.commons.version>
 		<hamcrest.version>3.0-rc1</hamcrest.version>
 		<jaxb.api.version>2.3.1</jaxb.api.version>
 		<spring.test.version>6.1.11</spring.test.version>
diff --git a/src/main/java/gov/cms/madie/cql_elm_translator/utils/cql/CQLTools.java b/src/main/java/gov/cms/madie/cql_elm_translator/utils/cql/CQLTools.java
index 096f65d..6fa74ab 100644
--- a/src/main/java/gov/cms/madie/cql_elm_translator/utils/cql/CQLTools.java
+++ b/src/main/java/gov/cms/madie/cql_elm_translator/utils/cql/CQLTools.java
@@ -14,7 +14,8 @@
 import org.cqframework.cql.cql2elm.CqlTranslator;
 import org.cqframework.cql.cql2elm.LibraryBuilder;
 import org.cqframework.cql.cql2elm.model.CompiledLibrary;
-import org.cqframework.cql.cql2elm.preprocessor.CqlPreprocessorVisitor;
+import org.cqframework.cql.cql2elm.preprocessor.CqlPreprocessorElmCommonVisitor;
+import org.cqframework.cql.elm.IdObjectFactory;
 import org.cqframework.cql.gen.cqlLexer;
 import org.cqframework.cql.gen.cqlParser;
 import org.hl7.elm.r1.ExpressionDef;
@@ -134,9 +135,10 @@ public void generate() throws IOException {
                 || usingProperties.getLibraryType()
                     == "QICore"); // <-- BADDDDD!!!! Defaults to fhir
 
-    CqlPreprocessorVisitor preprocessor =
-        new CqlPreprocessorVisitor(
-            new LibraryBuilder(translationResource.getLibraryManager()), tokens);
+    CqlPreprocessorElmCommonVisitor preprocessor =
+        new CqlPreprocessorElmCommonVisitor(
+            new LibraryBuilder(translationResource.getLibraryManager(), new IdObjectFactory()),
+            tokens);
 
     preprocessor.visit(tree);
     ParseTreeWalker walker = new ParseTreeWalker();
diff --git a/src/main/java/gov/cms/madie/cql_elm_translator/utils/cql/parsing/Cql2ElmListener.java b/src/main/java/gov/cms/madie/cql_elm_translator/utils/cql/parsing/Cql2ElmListener.java
index 544d4c3..3d17f5f 100644
--- a/src/main/java/gov/cms/madie/cql_elm_translator/utils/cql/parsing/Cql2ElmListener.java
+++ b/src/main/java/gov/cms/madie/cql_elm_translator/utils/cql/parsing/Cql2ElmListener.java
@@ -24,7 +24,9 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.cqframework.cql.cql2elm.LibraryBuilder;
 import org.cqframework.cql.cql2elm.model.CompiledLibrary;
-import org.cqframework.cql.cql2elm.preprocessor.CqlPreprocessorVisitor;
+import org.cqframework.cql.cql2elm.preprocessor.CqlPreprocessorElmCommonVisitor;
+
+import org.cqframework.cql.elm.IdObjectFactory;
 import org.cqframework.cql.gen.cqlBaseListener;
 import org.cqframework.cql.gen.cqlLexer;
 import org.cqframework.cql.gen.cqlParser;
@@ -40,7 +42,6 @@
 import org.cqframework.cql.gen.cqlParser.WhereClauseContext;
 import org.cqframework.cql.gen.cqlParser.WithClauseContext;
 import org.cqframework.cql.gen.cqlParser.WithoutClauseContext;
-import org.cqframework.cql.cql2elm.CqlCompilerOptions;
 import org.hl7.elm.r1.CodeDef;
 import org.hl7.elm.r1.CodeSystemDef;
 import org.hl7.elm.r1.Element;
@@ -688,13 +689,10 @@ private void parseChildLibraries(IncludeDef def) throws IOException {
     TranslationResource translationResource =
         TranslationResource.getInstance(true); // <-- BADDDDD!!!! Defaults to fhir
 
-    // Add CqlCompilerOptions from LibraryManager to prevent NPE while walking through CQL
-    LibraryBuilder libraryBuilder = new LibraryBuilder(translationResource.getLibraryManager());
-    // MAT-7300: change signature level to overloads
-    CqlCompilerOptions options = translationResource.getLibraryManager().getCqlCompilerOptions();
-    options.setSignatureLevel(LibraryBuilder.SignatureLevel.Overloads);
-    libraryBuilder.setCompilerOptions(options);
-    CqlPreprocessorVisitor preprocessor = new CqlPreprocessorVisitor(libraryBuilder, tokens);
+    CqlPreprocessorElmCommonVisitor preprocessor =
+        new CqlPreprocessorElmCommonVisitor(
+            new LibraryBuilder(translationResource.getLibraryManager(), new IdObjectFactory()),
+            tokens);
     preprocessor.visit(tree);
     ParseTreeWalker walker = new ParseTreeWalker();
     walker.walk(listener, tree);