Merge branch 'release/v2.6.0'

ehrbase · Jan 19, 2024 · 724f0d3 · 724f0d3
2 parents d04e415 + c0c56d7
commit 724f0d3
Show file tree

Hide file tree

Showing 25 changed files with 66 additions and 42 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'
@@ -27,7 +27,7 @@ jobs:
         run: mvn -B verify
 
       - name: Setup Maven Central
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '17'

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -43,14 +43,14 @@ jobs:
         uses: actions/checkout@v4
 
       - name: setup java 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 17
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -64,7 +64,7 @@ jobs:
       # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -77,6 +77,6 @@ jobs:
       #     ./location_of_script_within_repo/buildscript.sh
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3
         with:
           category: "/language:${{matrix.language}}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,18 @@
 
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## [2.6.0]
+ ### Changed
+- Bumped libraries
+ ### Fixed 
+- Parsing of string function CONTAINS ([5ef1eca](https://github.com/ehrbase/openEHR_SDK/commit/5ef1eca72289856fa94a04146aa876a4c5130423))
+- Add missing aggregate function name to the parser ([8fd08bb](https://github.com/ehrbase/openEHR_SDK/commit/8fd08bbd1ce3b5a217cc8e2b701e32c2125bf0bf))
+
 ## [2.5.0]
  ### Added 
  ### Fixed 
-- Flat: fix term mappings can not be saved in name via flat ([#519](https://github.com/ehrbase/openEHR_SDK/pull/519)
-- Validation: fix DV_CODED_TEXT error messages ([#537](https://github.com/ehrbase/openEHR_SDK/pull/537)
+- Flat: fix term mappings can not be saved in name via flat ([#519](https://github.com/ehrbase/openEHR_SDK/pull/519))
+- Validation: fix DV_CODED_TEXT error messages ([#537](https://github.com/ehrbase/openEHR_SDK/pull/537))
 
 ## [2.4.0]
  ### Added 
@@ -352,3 +359,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 [2.3.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.2.0...v2.3.0
 [2.4.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.3.0...v2.4.0
 [2.5.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.4.0...v2.5.0
+[2.6.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.5.0...v2.6.0
diff --git a/aql/pom.xml b/aql/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>aql</artifactId>

diff --git a/aql/src/main/antlr4/org/ehrbase/openehr/sdk/aql/parser/antlr/AqlLexer.g4 b/aql/src/main/antlr4/org/ehrbase/openehr/sdk/aql/parser/antlr/AqlLexer.g4
@@ -90,7 +90,7 @@ LIKE: L I K E ;
 MATCHES: M A T C H E S ;
 
 // functions
-STRING_FUNCTION_ID: LENGTH | CONTAINS | POSITION | SUBSTRING | CONCAT_WS | CONCAT ;
+STRING_FUNCTION_ID: LENGTH | POSITION | SUBSTRING | CONCAT_WS | CONCAT ;
 NUMERIC_FUNCTION_ID: ABS | MOD | CEIL | FLOOR | ROUND ;
 DATE_TIME_FUNCTION_ID: NOW | CURRENT_DATE_TIME | CURRENT_DATE | CURRENT_TIMEZONE | CURRENT_TIME ;
 // string functions

diff --git a/aql/src/main/antlr4/org/ehrbase/openehr/sdk/aql/parser/antlr/AqlParser.g4 b/aql/src/main/antlr4/org/ehrbase/openehr/sdk/aql/parser/antlr/AqlParser.g4
@@ -207,7 +207,7 @@ numericPrimitive
 
 functionCall
     : terminologyFunction
-    | name=(STRING_FUNCTION_ID | NUMERIC_FUNCTION_ID | DATE_TIME_FUNCTION_ID | IDENTIFIER) SYM_LEFT_PAREN (terminal (SYM_COMMA terminal)*)? SYM_RIGHT_PAREN
+    | name=(CONTAINS | STRING_FUNCTION_ID | NUMERIC_FUNCTION_ID | DATE_TIME_FUNCTION_ID | IDENTIFIER) SYM_LEFT_PAREN (terminal (SYM_COMMA terminal)*)? SYM_RIGHT_PAREN
     ;
 
 aggregateFunctionCall

diff --git a/aql/src/main/java/org/ehrbase/openehr/sdk/aql/dto/operand/AggregateFunction.java b/aql/src/main/java/org/ehrbase/openehr/sdk/aql/dto/operand/AggregateFunction.java
@@ -47,6 +47,7 @@ public enum AggregateFunctionName {
         COUNT,
         MIN,
         MAX,
+        SUM,
         AVG
     }
 

diff --git a/aql/src/test/java/org/ehrbase/openehr/sdk/aql/parser/AqlQueryParserTest.java b/aql/src/test/java/org/ehrbase/openehr/sdk/aql/parser/AqlQueryParserTest.java
@@ -29,6 +29,7 @@
 import org.ehrbase.openehr.sdk.aql.dto.containment.ContainmentClassExpression;
 import org.ehrbase.openehr.sdk.aql.dto.containment.ContainmentSetOperator;
 import org.ehrbase.openehr.sdk.aql.dto.operand.AggregateFunction.AggregateFunctionName;
+import org.ehrbase.openehr.sdk.aql.dto.operand.SingleRowFunction.KnownFunctionName;
 import org.ehrbase.openehr.sdk.aql.dto.operand.StringPrimitive;
 import org.ehrbase.openehr.sdk.aql.dto.path.AndOperatorPredicate;
 import org.ehrbase.openehr.sdk.aql.dto.path.AqlObjectPath;
@@ -438,6 +439,20 @@ void testAggregateFunctions(AggregateFunctionName name) {
         testAql(aql, aql);
     }
 
+    @ParameterizedTest
+    @EnumSource(KnownFunctionName.class)
+    void testKnownSingleRowFunctions(KnownFunctionName name) {
+        // Argument count does not matter to the grammar
+        String aql = "SELECT " + name.name() + "() FROM EHR d";
+        testAql(aql, aql);
+    }
+
+    @Test
+    void testUnknownSingleRowFunctions() {
+        String aql = "SELECT CUSTOM_FUNCTION() FROM EHR d";
+        testAql(aql, aql);
+    }
+
     @Test
     void testCountDistinct() {
         String aql = "SELECT COUNT(DISTINCT d/ehr_id/value) FROM EHR d";

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -8,7 +8,7 @@
 
     <artifactId>bom</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>
@@ -42,10 +42,10 @@
         <archie.version>3.3.0</archie.version>
         <assertj.version>3.24.2</assertj.version>
         <cglib.version>3.3.0</cglib.version>
-        <classgraph.version>4.8.164</classgraph.version>
-        <commons-cli.version>1.5.0</commons-cli.version>
+        <classgraph.version>4.8.165</classgraph.version>
+        <commons-cli.version>1.6.0</commons-cli.version>
         <commons-collections4.version>4.4</commons-collections4.version>
-        <commons-lang3.version>3.13.0</commons-lang3.version>
+        <commons-lang3.version>3.14.0</commons-lang3.version>
         <commons-io.version>2.15.0</commons-io.version>
         <commons-csv.version>1.10.0</commons-csv.version>
         <commons-text.version>1.11.0</commons-text.version>
@@ -54,7 +54,7 @@
         <guava.version>32.1.3-jre</guava.version>
         <gson.version>2.10.1</gson.version>
         <httpclient.version>4.5.14</httpclient.version>
-        <jackson-bom.version>2.15.3</jackson-bom.version>
+        <jackson-bom.version>2.16.0</jackson-bom.version>
         <javapoet.version>1.13.0</javapoet.version>
         <javax-annotation.version>1.3.2</javax-annotation.version>
         <javax-cache.version>1.1.1</javax-cache.version>
@@ -72,9 +72,9 @@
         <maven-enforcer-plugin.version>3.4.1</maven-enforcer-plugin.version>
         <maven-failsafe-plugin.version>2.22.2</maven-failsafe-plugin.version>
         <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
-        <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
-        <maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
         <jacoco.version>0.8.11</jacoco.version>
         <threeten-extra.version>1.7.2</threeten-extra.version>
         <jaxb-runtime.version>2.3.9</jaxb-runtime.version>
@@ -394,7 +394,7 @@
                 <plugin>
                     <groupId>com.diffplug.spotless</groupId>
                     <artifactId>spotless-maven-plugin</artifactId>
-                    <version>2.40.0</version>
+                    <version>2.41.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.antlr</groupId>

diff --git a/client/pom.xml b/client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>client</artifactId>
@@ -40,7 +40,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.2.1</version>
+                <version>3.2.2</version>
                 <configuration combine.self="override">
                     <dependenciesToScan>com.github.better-care:web-template-tests</dependenciesToScan>
                     <includes>
@@ -164,7 +164,7 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
-            <version>5.3.30</version>
+            <version>5.3.31</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/example-generator/pom.xml b/example-generator/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>sdk-parent</artifactId>
         <groupId>org.ehrbase.openehr.sdk</groupId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/generator-commons/pom.xml b/generator-commons/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>generator-commons</artifactId>

diff --git a/generator-maven-plugin/pom.xml b/generator-maven-plugin/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>sdk-parent</artifactId>
     <groupId>org.ehrbase.openehr.sdk</groupId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -27,13 +27,13 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.10.1</version>
+      <version>3.10.2</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.5</version>
+      <version>3.9.6</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -48,7 +48,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.10.1</version>
+        <version>3.10.2</version>
         <configuration>
           <goalPrefix>generator</goalPrefix>
         </configuration>

diff --git a/generator/pom.xml b/generator/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>generator</artifactId>
@@ -39,7 +39,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.6.1</version>
                 <executions>
                     <execution>
                         <id>copy-dependencies</id>

diff --git a/opt-1.4/pom.xml b/opt-1.4/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>opt-1.4</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>bom</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
         <relativePath>./bom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.5.0</version>
+    <version>2.6.0</version>
     <packaging>pom</packaging>
     <name>openEHR SDK</name>
 

diff --git a/response-dto/pom.xml b/response-dto/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>response-dto</artifactId>

diff --git a/serialisation/pom.xml b/serialisation/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>serialisation</artifactId>

diff --git a/serialisation_conformance_test/pom.xml b/serialisation_conformance_test/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>serialisation_conformance_test</artifactId>

diff --git a/terminology/pom.xml b/terminology/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>terminology</artifactId>

diff --git a/test-coverage/pom.xml b/test-coverage/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>test-coverage</artifactId>

diff --git a/test-data/pom.xml b/test-data/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>test-data</artifactId>

diff --git a/util/pom.xml b/util/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>util</artifactId>

diff --git a/validation/pom.xml b/validation/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>validation</artifactId>

diff --git a/web-template/pom.xml b/web-template/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.ehrbase.openehr.sdk</groupId>
         <artifactId>sdk-parent</artifactId>
-        <version>2.5.0</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>web-template</artifactId>