Merge pull request #752 from samply/release-v0.17.8

Release v0.17.8
samply · Jun 30, 2022 · 1bfb78e · 1bfb78e
2 parents efff6fc + 5d276e3
commit 1bfb78e
Show file tree

Hide file tree

Showing 102 changed files with 499 additions and 158 deletions.
diff --git a/.github/scripts/evaluate-measure-subject-list.sh b/.github/scripts/evaluate-measure-subject-list.sh
@@ -53,7 +53,7 @@ cat <<END
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/.github/scripts/evaluate-measure.sh b/.github/scripts/evaluate-measure.sh
@@ -53,7 +53,7 @@ cat <<END
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/.github/scripts/evaluate-patient-q1-measure.sh b/.github/scripts/evaluate-patient-q1-measure.sh
@@ -48,7 +48,7 @@ cat <<END
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,7 +22,7 @@ jobs:
     - name: Setup clj-kondo
       uses: DeLaGuardo/setup-clj-kondo@master
       with:
-        version: '2022.05.31'
+        version: '2022.06.22'
 
     - name: Check out Git repository
       uses: actions/checkout@v3
@@ -85,7 +85,7 @@ jobs:
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        cli: '1.11.1.1113'
+        cli: '1.11.1.1149'
 
     - name: Check out Git repository
       uses: actions/checkout@v3
@@ -116,7 +116,7 @@ jobs:
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        cli: '1.11.1.1113'
+        cli: '1.11.1.1149'
 
     - name: Check out Git repository
       uses: actions/checkout@v3
@@ -158,7 +158,7 @@ jobs:
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        cli: '1.11.1.1113'
+        cli: '1.11.1.1149'
 
     - name: Check out Git repository
       uses: actions/checkout@v3
@@ -186,7 +186,7 @@ jobs:
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        cli: '1.11.1.1113'
+        cli: '1.11.1.1149'
 
     - name: Check out Git repository
       uses: actions/checkout@v3
@@ -583,7 +583,7 @@ jobs:
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        cli: '1.11.1.1113'
+        cli: '1.11.1.1149'
 
     - name: Check out Git repository
       uses: actions/checkout@v3
@@ -894,7 +894,7 @@ jobs:
     - name: Setup Clojure
       uses: DeLaGuardo/setup-clojure@master
       with:
-        cli: '1.11.1.1113'
+        cli: '1.11.1.1149'
 
     - name: Check out Git repository
       uses: actions/checkout@v3

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,16 @@
 # Changelog
 
-## v0.17.6
+## v0.17.8
+
+### Other
+
+* Switch to Media Type text/cql-identifier for CQL Expressions ([#748](https://github.com/samply/blaze/pull/748))
+* Update Dependencies ([#749](https://github.com/samply/blaze/pull/749))
+* Update Dependencies ([#746](https://github.com/samply/blaze/pull/746))
+
+The full changelog can be found [here](https://github.com/samply/blaze/milestone/46?closed=1).
+
+## v0.17.7
 
 ### Other
 

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ The goal of this project is to provide a FHIR® Store with an internal CQL Evalu
 
 Blaze passes all [Touchstone FHIR 4.0.1 Basic Tests][12] and almost all [CQL Tests][3]. Please refer to the [Conformance](docs/conformance.md) section and report any issues you encounter during evaluation.
 
-Latest release: [v0.17.7][5]
+Latest release: [v0.17.8][5]
 
 ## Quick Start
 
@@ -72,7 +72,7 @@ Unless required by applicable law or agreed to in writing, software distributed
 
 [3]: <https://cql.hl7.org/tests.html>
 [4]: <https://alexanderkiel.gitbook.io/blaze/deployment>
-[5]: <https://github.com/samply/blaze/releases/tag/v0.17.7>
+[5]: <https://github.com/samply/blaze/releases/tag/v0.17.8>
 [6]: <https://www.yourkit.com/java/profiler/>
 [7]: <https://www.yourkit.com/.net/profiler/>
 [8]: <https://www.yourkit.com/youmonitor/>

diff --git a/deps.edn b/deps.edn
@@ -66,7 +66,7 @@
   :kaocha
   {:extra-deps
    {lambdaisland/kaocha
-    {:mvn/version "1.66.1034"}}
+    {:mvn/version "1.68.1059"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 
@@ -80,7 +80,7 @@
   :outdated
   {:replace-deps
    {com.github.liquidz/antq
-    {:mvn/version "1.7.798"}
+    {:mvn/version "1.7.804"}
 
     org.slf4j/slf4j-nop
     {:mvn/version "1.7.36"}}

diff --git a/docs/cql-queries/api.md b/docs/cql-queries/api.md
@@ -89,7 +89,7 @@ The Measure resource represents the actual definition of the measure, which is e
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }

diff --git a/docs/deployment/docker-deployment.md b/docs/deployment/docker-deployment.md
@@ -27,7 +27,7 @@ Blaze should log something like this:
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB
 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8
-2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.7 in 8.2 seconds
+2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.8 in 8.2 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -47,7 +47,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.17.7"
+  "version": "0.17.8"
 }
 ```
 

diff --git a/docs/deployment/manual-deployment.md b/docs/deployment/manual-deployment.md
@@ -2,12 +2,12 @@
 
 The installation works under Windows, Linux and macOS. The only dependency is an installed OpenJDK 11. Blaze is tested with [AdoptOpenJDK][1].
 
-Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.17.7). Look for `blaze-0.17.7-standalone.jar`.
+Blaze runs on the JVM and comes as single JAR file. Download the most recent version [here](https://github.com/samply/blaze/releases/tag/v0.17.8). Look for `blaze-0.17.8-standalone.jar`.
 
 After the download, you can start blaze with the following command (Linux, macOS):
 
 ```sh
-java -jar blaze-0.17.7-standalone.jar -m blaze.core
+java -jar blaze-0.17.8-standalone.jar -m blaze.core
 ```
 
 Blaze will run with an in-memory, volatile database for testing and demo purposes.
@@ -17,14 +17,14 @@ Blaze can be run with durable storage by setting the environment variables `STOR
 Under Linux/macOS:
 
 ```sh
-STORAGE=standalone java -jar blaze-0.17.7-standalone.jar -m blaze.core
+STORAGE=standalone java -jar blaze-0.17.8-standalone.jar -m blaze.core
 ```
 
 Under Windows, you need to set the Environment variables in the PowerShell before starting Blaze:
 
 ```powershell
 $Env:STORAGE="standalone"
-java -jar blaze-0.17.7-standalone.jar -m blaze.core
+java -jar blaze-0.17.8-standalone.jar -m blaze.core
 ```
 
 This will create three directories called `index`, `transaction` and `resource` inside the current working directory, one for each database part used.
@@ -42,7 +42,7 @@ The output should look like this:
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:64] - JVM version: 16.0.2
 2021-06-27T11:02:37.834Z ee086ef908c1 main INFO [blaze.core:65] - Maximum available memory: 1738 MiB
 2021-06-27T11:02:37.835Z ee086ef908c1 main INFO [blaze.core:66] - Number of available processors: 8
-2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.7 in 8.2 seconds
+2021-06-27T11:02:37.836Z ee086ef908c1 main INFO [blaze.core:67] - Successfully started Blaze version 0.17.8 in 8.2 seconds
 ```
 
 In order to test connectivity, query the health endpoint:
@@ -62,7 +62,7 @@ that should return:
 ```json
 {
   "name": "Blaze",
-  "version": "0.17.7"
+  "version": "0.17.8"
 }
 ```
 

diff --git a/evaluate-measure.sh b/evaluate-measure.sh
@@ -61,7 +61,7 @@ cat <<END
             ]
           },
           "criteria": {
-            "language": "text/cql",
+            "language": "text/cql-identifier",
             "expression": "InInitialPopulation"
           }
         }
@@ -121,7 +121,7 @@ BASE=$1
 [[ -z "$BASE" ]] && usage
 
 SUBJECT_TYPE_LOWER=$(echo $SUBJECT_TYPE | tr '[:upper:]' '[:lower:]')
-DATA=$(cat ${FILE} | base64 | tr -d '\n')
+DATA=$(base64 < "$FILE" | tr -d '\n')
 LIBRARY_URI=$(uuidgen | tr '[:upper:]' '[:lower:]')
 MEASURE_URI=$(uuidgen | tr '[:upper:]' '[:lower:]')
 

diff --git a/modules/anomaly/deps.edn b/modules/anomaly/deps.edn
@@ -16,7 +16,7 @@
   :kaocha
   {:extra-deps
    {lambdaisland/kaocha
-    {:mvn/version "1.66.1034"}}
+    {:mvn/version "1.68.1059"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 

diff --git a/modules/async/deps.edn b/modules/async/deps.edn
@@ -19,7 +19,7 @@
   :kaocha
   {:extra-deps
    {lambdaisland/kaocha
-    {:mvn/version "1.66.1034"}}
+    {:mvn/version "1.68.1059"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 

diff --git a/modules/byte-buffer/deps.edn b/modules/byte-buffer/deps.edn
@@ -1,6 +1,6 @@
 {:deps
  {com.google.protobuf/protobuf-java
-  {:mvn/version "3.21.1"}}
+  {:mvn/version "3.21.2"}}
 
  :aliases
  {:test
@@ -13,6 +13,6 @@
   :kaocha
   {:extra-deps
    {lambdaisland/kaocha
-    {:mvn/version "1.66.1034"}}
+    {:mvn/version "1.68.1059"}}
 
    :main-opts ["-m" "kaocha.runner"]}}}
diff --git a/modules/byte-string/deps.edn b/modules/byte-string/deps.edn
@@ -5,7 +5,7 @@
   {:mvn/version "31.1-jre"}
 
   com.google.protobuf/protobuf-java
-  {:mvn/version "3.21.1"}
+  {:mvn/version "3.21.2"}
 
   com.fasterxml.jackson.core/jackson-databind
   {:mvn/version "2.13.3"}}}
diff --git a/modules/cassandra/deps.edn b/modules/cassandra/deps.edn
@@ -11,7 +11,7 @@
 
   ;; current version of transitive dependency of com.datastax.oss/java-driver-core
   io.netty/netty-handler
-  {:mvn/version "4.1.77.Final"}}
+  {:mvn/version "4.1.78.Final"}}
 
  :aliases
  {:test
@@ -27,7 +27,7 @@
   :kaocha
   {:extra-deps
    {lambdaisland/kaocha
-    {:mvn/version "1.66.1034"}}
+    {:mvn/version "1.68.1059"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 

diff --git a/modules/coll/deps.edn b/modules/coll/deps.edn
@@ -8,7 +8,7 @@
   :kaocha
   {:extra-deps
    {lambdaisland/kaocha
-    {:mvn/version "1.66.1034"}}
+    {:mvn/version "1.68.1059"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 

diff --git a/modules/cql/deps.edn b/modules/cql/deps.edn
@@ -8,7 +8,7 @@
   {:mvn/version "2.13.3"}
 
   info.cqframework/cql-to-elm
-  {:mvn/version "1.5.8"
+  {:mvn/version "1.5.9"
    :exclusions
    [com.google.code.javaparser/javaparser
     info.cqframework/qdm
@@ -42,7 +42,7 @@
   :kaocha
   {:extra-deps
    {lambdaisland/kaocha
-    {:mvn/version "1.66.1034"}}
+    {:mvn/version "1.68.1059"}}
 
    :main-opts ["-m" "kaocha.runner"]}
 

diff --git a/modules/cql/src/blaze/elm/boolean.clj b/modules/cql/src/blaze/elm/boolean.clj
@@ -16,6 +16,13 @@
   (to-boolean [x] x))
 
 
+;; 22.24. ToDecimal
+(extend-protocol p/ToDecimal
+  Boolean
+  (to-decimal [x]
+    (if (true? x) 1.0 0.0)))
+
+
 ;; 22.25. ToInteger
 (extend-protocol p/ToInteger
   Boolean
@@ -28,3 +35,10 @@
   Boolean
   (to-long [x]
     (if (true? x) 1 0)))
+
+
+;; 22.30. ToString
+(extend-protocol p/ToString
+  Boolean
+  (to-string [x]
+    (str x)))
diff --git a/modules/cql/src/blaze/elm/compiler/core.clj b/modules/cql/src/blaze/elm/compiler/core.clj
@@ -109,5 +109,4 @@
 
 (extend-protocol p/ToString
   Object
-  (to-string [x]
-    (str x)))
+  (to-string [_]))