add support for v4 CQL

core/pom.xml

@@ -3,7 +3,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opencds.cqf.cql.ls</groupId>
     <artifactId>cql-ls-core</artifactId>
     <packaging>jar</packaging>
     <name>CQL Language Server Core</name>
@@ -21,6 +20,16 @@
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-jdk8</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 </project>

core/src/main/java/org/opencds/cqf/cql/ls/core/utility/Converters.java

@@ -0,0 +1,36 @@
+package org.opencds.cqf.cql.ls.core.utility;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import kotlinx.io.Buffer;
+import kotlinx.io.Source;
+
+public class Converters {
+
+    public static String inputStreamToString(InputStream inputStream) throws IOException {
+        StringBuilder resultStringBuilder = new StringBuilder();
+        try (BufferedReader br = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8))) {
+            String line;
+            while ((line = br.readLine()) != null) {
+                if (!resultStringBuilder.isEmpty()) resultStringBuilder.append("\n"); // Append newline if needed
+                resultStringBuilder.append(line);
+            }
+        }
+        return resultStringBuilder.toString();
+    }
+
+    public static Source stringToSource(String text) {
+        Buffer buffer = new Buffer();
+        // Write the string to the buffer using a specific character encoding
+        buffer.write(text.getBytes(), 0, text.length());
+        // Return the buffer as a Source
+        return buffer;
+    }
+
+    public static Source inputStreamToSource(InputStream inputStream) throws IOException {
+        return stringToSource(inputStreamToString(inputStream));
+    }
+}

core/src/test/java/org/opencds/cqf/cql/ls/core/utility/ConvertersTest.java

@@ -0,0 +1,69 @@
+package org.opencds.cqf.cql.ls.core.utility;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import org.junit.jupiter.api.Test;
+
+public class ConvertersTest {
+
+    @Test
+    void should_returnString_when_inputStreamExists() {
+        var expected = "The quick brown fox jumps over the lazy dog";
+        try {
+            var actual =
+                    Converters.inputStreamToString(new ByteArrayInputStream(expected.getBytes(StandardCharsets.UTF_8)));
+            assertEquals(actual, expected);
+        } catch (IOException e) {
+            fail("Unexpected exception thrown. {}", e);
+        }
+    }
+
+    @Test
+    void should_returnStringWithLineBreaks_when_inputStreamHasLineBreaksExists() {
+        var expected = "the first day in spring –\n" + "a wind from the ocean\n" + "but no ocean in sight";
+        try {
+            var actual =
+                    Converters.inputStreamToString(new ByteArrayInputStream(expected.getBytes(StandardCharsets.UTF_8)));
+            assertEquals(actual, expected);
+        } catch (IOException e) {
+            fail("Unexpected exception thrown. {}", e);
+        }
+    }
+
+    @Test
+    void should_throwIOException_when_inputStreamToStringHasAnIOError() throws IOException {
+        InputStream inputStream = mock(InputStream.class);
+        when(inputStream.read()).thenThrow(new IOException("Simulated failure"));
+        assertThrows(IOException.class, () -> Converters.inputStreamToString(inputStream));
+    }
+
+    @Test
+    void should_returnSource_when_stringExists() {
+        var expected = Converters.stringToSource("The quick brown fox jumps over the lazy dog");
+        assertNotNull(expected);
+    }
+
+    @Test
+    void should_returnSource_when_inputStreamExists() {
+        try {
+            var expected = Converters.inputStreamToSource(new ByteArrayInputStream(
+                    "The quick brown fox jumps over the lazy dog".getBytes(StandardCharsets.UTF_8)));
+            assertNotNull(expected);
+        } catch (IOException e) {
+            fail("Unexpected exception thrown. {}", e);
+        }
+    }
+
+    @Test
+    void should_throwIOException_when_inputStreamToSourceCalledWithNull() throws IOException {
+        InputStream inputStream = mock(InputStream.class);
+        when(inputStream.read()).thenThrow(new IOException("Simulated failure"));
+        assertThrows(IOException.class, () -> Converters.inputStreamToSource(inputStream));
+    }
+}

debug/server/pom.xml

@@ -20,7 +20,17 @@
         <dependency>
             <groupId>org.opencds.cqf.cql.ls</groupId>
             <artifactId>cql-ls-core</artifactId>
-            <version>3.9.0-SNAPSHOT</version>
+            <version>${project.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-jdk8</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.eclipse.lsp4j</groupId>

debug/service/pom.xml

@@ -20,17 +20,15 @@
         <dependency>
             <groupId>org.opencds.cqf.cql.debug</groupId>
             <artifactId>cql-debug-server</artifactId>
-            <version>3.9.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
-            <version>${spring.boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-logging</artifactId>
-            <version>${spring.boot.version}</version>
         </dependency>
     </dependencies>
     <build>

ls/server/pom.xml

@@ -3,7 +3,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.opencds.cqf.cql.ls</groupId>
     <artifactId>cql-ls-server</artifactId>
     <packaging>jar</packaging>
     <name>CQL Language Server - Server Component</name>
@@ -21,8 +20,9 @@
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-caching-caffeine</artifactId>
-            <version>7.0.0</version>
+            <version>8.6.0</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
@@ -31,18 +31,37 @@
         <dependency>
             <groupId>org.opencds.cqf.cql.ls</groupId>
             <artifactId>cql-ls-core</artifactId>
-            <version>3.9.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opencds.cqf.fhir</groupId>
             <artifactId>cqf-fhir-cr</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-jdk8</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
-            <groupId>org.opencds.cqf.fhir</groupId>
-            <artifactId>cqf-fhir-jackson</artifactId>
-            <type>pom</type>
+            <groupId>org.cqframework</groupId>
+            <artifactId>cql-formatter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-jdk8</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-stdlib-common</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>
@@ -58,26 +77,11 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-        </dependency
->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
-
-        <!-- CQL-to-ELM Translator -->
-        <dependency>
-            <groupId>info.cqframework</groupId>
-            <artifactId>cql-to-elm</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>info.cqframework</groupId>
-            <artifactId>model</artifactId>
-        </dependency>
         <dependency>
-            <groupId>info.cqframework</groupId>
-            <artifactId>cql-formatter</artifactId>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
         </dependency>
 
         <!-- Java implementation of VS Code language server protocol -->
@@ -95,6 +99,21 @@
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>
         </dependency>
+
+        <!-- Generated annotation -->
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+
+        <!-- Testing Only -->
+        <dependency>
+            <groupId>org.opencds.cqf.fhir</groupId>
+            <artifactId>cqf-fhir-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
     <build>
         <pluginManagement>
@@ -104,9 +123,6 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>3.10.0</version>
                     <configuration>
-                        <release>11</release>
-                        <source>11</source>
-                        <target>11</target>
                         <failOnError>true</failOnError>
                         <failOnWarning>true</failOnWarning>
                         <showWarnings>true</showWarnings>