Merge branch 'release/v2.8.0'

ehrbase · Feb 29, 2024 · 48504b1 · 48504b1
2 parents 86fdb70 + 6a689f0
commit 48504b1
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,8 +41,8 @@ jobs:
       - name: Publish to Maven Central
         run: mvn -B deploy -P release -DskipTests
         env:
-          OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
-          OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
+          OSSRH_USERNAME: ${{ secrets.S01_OSSRH_USERNAME }}
+          OSSRH_TOKEN: ${{ secrets.S01_OSSRH_TOKEN }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
 
       - name: 'Trigger ehrbase:next build'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## [2.8.0]
+ ### Added 
+ ### Fixed 
+
 ## [2.7.0]
 
 ### Added
@@ -376,3 +380,4 @@ Note: version releases in the 0.x.y range may introduce breaking changes.
 [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
 [2.7.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.6.0...v2.7.0
+[2.8.0]: https://github.com/ehrbase/openEHR_SDK/compare/v2.7.0...v2.8.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.7.0</version>
+        <version>2.8.0</version>
     </parent>
 
     <artifactId>aql</artifactId>

diff --git a/aql/src/main/java/org/ehrbase/openehr/sdk/aql/util/AqlUtil.java b/aql/src/main/java/org/ehrbase/openehr/sdk/aql/util/AqlUtil.java
@@ -33,6 +33,8 @@
 import org.ehrbase.openehr.sdk.aql.dto.containment.ContainmentSetOperator;
 import org.ehrbase.openehr.sdk.aql.dto.operand.Operand;
 import org.ehrbase.openehr.sdk.aql.dto.operand.QueryParameter;
+import org.ehrbase.openehr.sdk.aql.dto.path.AndOperatorPredicate;
+import org.ehrbase.openehr.sdk.aql.dto.path.ComparisonOperatorPredicate;
 import org.ehrbase.openehr.sdk.aql.parser.AqlQueryParser;
 import org.ehrbase.openehr.sdk.aql.render.AqlRenderer;
 
@@ -88,24 +90,32 @@ private static WhereCondition removeParameter(WhereCondition condition, String p
 
     public static Map<String, AbstractContainmentExpression> containmentExpressionsByIdentifier(
             Containment containment) {
-        return streamContainmentExpressions(containment)
+        return streamContainments(containment)
+                .filter(e1 -> e1.getIdentifier() != null)
                 .collect(Collectors.toMap(AbstractContainmentExpression::getIdentifier, e -> e));
     }
 
-    private static Stream<AbstractContainmentExpression> streamContainmentExpressions(Containment containment) {
+    public static Stream<AbstractContainmentExpression> streamContainments(Containment containment) {
         if (containment == null) {
             return Stream.empty();
         } else if (containment instanceof AbstractContainmentExpression containmentExp) {
-            return Stream.concat(
-                    Stream.of(containmentExp).filter(e -> e.getIdentifier() != null),
-                    streamContainmentExpressions(containmentExp.getContains()));
+            return containmentExp.getContains() == null
+                    ? Stream.of(containmentExp)
+                    : Stream.concat(Stream.of(containmentExp), streamContainments(containmentExp.getContains()));
         } else if (containment instanceof ContainmentSetOperator containmentSetOp) {
-            return containmentSetOp.getValues().stream().flatMap(AqlUtil::streamContainmentExpressions);
+            return containmentSetOp.getValues().stream().flatMap(AqlUtil::streamContainments);
         } else if (containment instanceof ContainmentNotOperator containmentNotOp) {
-            return streamContainmentExpressions(containmentNotOp.getContainmentExpression());
+            return streamContainments(containmentNotOp.getContainmentExpression());
         } else {
             throw new IllegalArgumentException(
                     "Unsupported class %s".formatted(containment.getClass().getSimpleName()));
         }
     }
+
+    public static Stream<ComparisonOperatorPredicate> streamPredicates(List<AndOperatorPredicate> condition) {
+        if (condition == null) {
+            return Stream.empty();
+        }
+        return condition.stream().map(AndOperatorPredicate::getOperands).flatMap(List::stream);
+    }
 }
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.7.0</version>
+    <version>2.8.0</version>
     <packaging>pom</packaging>
 
     <name>openEHR SDK</name>
@@ -71,7 +71,6 @@
         <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
         <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.3</maven-javadoc-plugin.version>
         <maven-source-plugin.version>3.3.0</maven-source-plugin.version>
         <maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
@@ -83,11 +82,11 @@
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
         <repository>
             <id>ossrh</id>
-            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+            <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
 
@@ -385,7 +384,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <serverId>ossrh</serverId>
-                    <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                    <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                     <autoReleaseAfterClose>true</autoReleaseAfterClose>
                     <stagingProgressTimeoutMinutes>30</stagingProgressTimeoutMinutes>
                 </configuration>

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.7.0</version>
+        <version>2.8.0</version>
     </parent>
 
     <artifactId>client</artifactId>

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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.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.7.0</version>
+    <version>2.8.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

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.7.0</version>
+        <version>2.8.0</version>
     </parent>
 
     <artifactId>generator</artifactId>

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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.0</version>
         <relativePath>./bom/pom.xml</relativePath>
     </parent>
 
     <groupId>org.ehrbase.openehr.sdk</groupId>
     <artifactId>sdk-parent</artifactId>
-    <version>2.7.0</version>
+    <version>2.8.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.7.0</version>
+    <version>2.8.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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.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.7.0</version>
+        <version>2.8.0</version>
     </parent>
 
     <artifactId>web-template</artifactId>