Merge 2f165863e7 into e8a0bba072

Updating version to: 6.3.30-SNAPSHOT and incrementing test cases dependency.
Release: v6.3.29
2024-09-26 14:32:03 +02:00 · 2024-09-26 12:30:18 +00:00 · 2024-09-26 11:44:41 +00:00 · 2024-09-26 07:11:28 -04:00 · 2024-09-26 07:08:52 -04:00 · 2024-09-26 07:08:47 -04:00
15 changed files with 47 additions and 26 deletions
--- a/org.hl7.fhir.convertors/pom.xml
+++ b/org.hl7.fhir.convertors/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>org.hl7.fhir.core</artifactId>
-        <version>6.3.29-SNAPSHOT</version>
+        <version>6.3.30-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/org.hl7.fhir.dstu2/pom.xml
+++ b/org.hl7.fhir.dstu2/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>6.3.29-SNAPSHOT</version>
+		<version>6.3.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/org.hl7.fhir.dstu2016may/pom.xml
+++ b/org.hl7.fhir.dstu2016may/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>6.3.29-SNAPSHOT</version>
+		<version>6.3.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/org.hl7.fhir.dstu3/pom.xml
+++ b/org.hl7.fhir.dstu3/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>org.hl7.fhir.core</artifactId>
-        <version>6.3.29-SNAPSHOT</version>
+        <version>6.3.30-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/org.hl7.fhir.r4/pom.xml
+++ b/org.hl7.fhir.r4/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>6.3.29-SNAPSHOT</version>
+		<version>6.3.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/org.hl7.fhir.r4b/pom.xml
+++ b/org.hl7.fhir.r4b/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>6.3.29-SNAPSHOT</version>
+		<version>6.3.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/org.hl7.fhir.r5/pom.xml
+++ b/org.hl7.fhir.r5/pom.xml
@ -5,7 +5,7 @@
 	<parent>
 		<groupId>ca.uhn.hapi.fhir</groupId>
 		<artifactId>org.hl7.fhir.core</artifactId>
-		<version>6.3.29-SNAPSHOT</version>
+		<version>6.3.30-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>

--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
@ -1331,7 +1331,7 @@ public abstract class BaseWorkerContext extends I18nBase implements IWorkerConte
        issues.add(iss);
        return new ValidationResult(IssueSeverity.FATAL, e.getMessage(), e.getError(), issues);
      } catch (Exception e) {
-        e.printStackTrace();
+//        e.printStackTrace();
        localError = e.getMessage();
      }
    }
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/structuremap/StructureMapUtilities.java
@ -1087,7 +1087,7 @@ public class StructureMapUtilities {
    if (lexer.hasToken("log")) {
      lexer.take();
      ExpressionNode node = fpe.parse(lexer);
-      source.setUserData(MAP_WHERE_CHECK, node);
+      source.setUserData(MAP_WHERE_LOG, node);
      source.setLogMessage(node.toString());
    }
  }
@ -1629,17 +1629,20 @@ public class StructureMapUtilities {
      }
      items.removeAll(remove);
    }
-
+    
    if (src.hasCondition()) {
      ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_EXPRESSION);
      if (expr == null) {
        expr = fpe.parse(src.getCondition());
-        //        fpe.check(context.appInfo, ??, ??, expr)
        src.setUserData(MAP_WHERE_EXPRESSION, expr);
      }
      List<Base> remove = new ArrayList<Base>();
      for (Base item : items) {
-        if (!fpe.evaluateToBoolean(vars, null, null, item, expr)) {
+        Variables varsForSource = vars.copy();
+        if (src.hasVariable()) {
+            varsForSource.add(VariableMode.INPUT, src.getVariable(), item);
+        }
+        if (!fpe.evaluateToBoolean(varsForSource, null, null, item, expr)) {
          log(indent + "  condition [" + src.getCondition() + "] for " + item.toString() + " : false");
          remove.add(item);
        } else
@ -1652,12 +1655,14 @@ public class StructureMapUtilities {
      ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_CHECK);
      if (expr == null) {
        expr = fpe.parse(src.getCheck());
-        //        fpe.check(context.appInfo, ??, ??, expr)
        src.setUserData(MAP_WHERE_CHECK, expr);
      }
-      List<Base> remove = new ArrayList<Base>();
      for (Base item : items) {
-        if (!fpe.evaluateToBoolean(vars, null, null, item, expr))
+        Variables varsForSource = vars.copy();
+        if (src.hasVariable()) {
+            varsForSource.add(VariableMode.INPUT, src.getVariable(), item);
+        }
+        if (!fpe.evaluateToBoolean(varsForSource, null, null, item, expr))
          throw new FHIRException("Rule \"" + ruleId + "\": Check condition failed");
      }
    }
@ -1666,16 +1671,20 @@ public class StructureMapUtilities {
      ExpressionNode expr = (ExpressionNode) src.getUserData(MAP_WHERE_LOG);
      if (expr == null) {
        expr = fpe.parse(src.getLogMessage());
-        //        fpe.check(context.appInfo, ??, ??, expr)
        src.setUserData(MAP_WHERE_LOG, expr);
      }
      CommaSeparatedStringBuilder b = new CommaSeparatedStringBuilder();
-      for (Base item : items)
-        b.appendIfNotNull(fpe.evaluateToString(vars, null, null, item, expr));
+      for (Base item : items) {
+        Variables varsForSource = vars.copy();
+        if (src.hasVariable()) {
+            varsForSource.add(VariableMode.INPUT, src.getVariable(), item);
+        }
+        b.appendIfNotNull(fpe.evaluateToString(varsForSource, null, null, item, expr));
+      }
      if (b.length() > 0)
        services.log(b.toString());
    }
-
+    

    if (src.hasListMode() && !items.isEmpty()) {
      switch (src.getListMode()) {
@ -1753,7 +1762,7 @@ public class StructureMapUtilities {
    if (tgt.hasVariable() && v != null)
      vars.add(VariableMode.OUTPUT, tgt.getVariable(), v);
  }
-
+  
  private Base runTransform(String rulePath, TransformContext context, StructureMap map, StructureMapGroupComponent group, StructureMapGroupRuleTargetComponent tgt, Variables vars, Base dest, String element, String srcVar, boolean root) throws FHIRException {
    try {
      switch (tgt.getTransform()) {
@ -2520,7 +2529,6 @@ public class StructureMapUtilities {
        ExpressionNode expr = (ExpressionNode) tgt.getUserData(MAP_EXPRESSION);
        if (expr == null) {
          expr = fpe.parse(getParamString(vars, tgt.getParameter().get(tgt.getParameter().size() - 1)));
-          tgt.setUserData(MAP_WHERE_EXPRESSION, expr);
        }
        return fpe.check(vars, null, expr);
      case TRANSLATE:
--- a/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/StructureMapUtilitiesTest.java
+++ b/org.hl7.fhir.r5/src/test/java/org/hl7/fhir/r5/test/StructureMapUtilitiesTest.java
@ -71,6 +71,19 @@ public class StructureMapUtilitiesTest implements ITransformerServices {
    assertEquals("2023-10-26", fp.evaluateToString(target, "birthDate"));
    assertEquals("2023-09-20T13:19:13.502Z", fp.evaluateToString(target, "deceased"));
  }
+  
+  @Test
+  public void testWhereClause() throws IOException, FHIRException {
+      StructureMapUtilities scu = new StructureMapUtilities(context, this);
+      scu.setDebug(true);
+      String fileMap = TestingUtilities.loadTestResource("r5", "structure-mapping", "whereclause.map");
+      Element source = Manager.parseSingle(context, TestingUtilities.loadTestResourceStream("r4", "examples", "capabilitystatement-example.json"), FhirFormat.JSON);
+      StructureMap structureMap = scu.parse(fileMap, "whereclause");
+      Element target = Manager.build(context, scu.getTargetType(structureMap));
+      scu.transform(null, source, structureMap, target);
+      FHIRPathEngine fp = new FHIRPathEngine(context);
+      assertEquals("true", fp.evaluateToString(target, "rest.resource.interaction.where(code='create').exists()"));
+  }

  private void assertSerializeDeserialize(StructureMap structureMap) {
    Assertions.assertEquals("syntax", structureMap.getName());
--- a/org.hl7.fhir.report/pom.xml
+++ b/org.hl7.fhir.report/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>org.hl7.fhir.core</artifactId>
-        <version>6.3.29-SNAPSHOT</version>
+        <version>6.3.30-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/org.hl7.fhir.utilities/pom.xml
+++ b/org.hl7.fhir.utilities/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>org.hl7.fhir.core</artifactId>
-        <version>6.3.29-SNAPSHOT</version>
+        <version>6.3.30-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/org.hl7.fhir.validation.cli/pom.xml
+++ b/org.hl7.fhir.validation.cli/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>org.hl7.fhir.core</artifactId>
-        <version>6.3.29-SNAPSHOT</version>
+        <version>6.3.30-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/org.hl7.fhir.validation/pom.xml
+++ b/org.hl7.fhir.validation/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>ca.uhn.hapi.fhir</groupId>
        <artifactId>org.hl7.fhir.core</artifactId>
-        <version>6.3.29-SNAPSHOT</version>
+        <version>6.3.30-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -14,7 +14,7 @@
    HAPI FHIR
    -->
    <artifactId>org.hl7.fhir.core</artifactId>
-    <version>6.3.29-SNAPSHOT</version>
+    <version>6.3.30-SNAPSHOT</version>
    <packaging>pom</packaging>

    <properties>
Author	SHA1	Message	Date
Oliver Egger	c2647dce86	Merge `2f165863e7` into `e8a0bba072`	2024-09-26 14:32:03 +02:00
markiantorno	e8a0bba072	Updating version to: 6.3.30-SNAPSHOT and incrementing test cases dependency.	2024-09-26 12:30:18 +00:00
markiantorno	53ec745184	Release: v6.3.29 ## Validator Changes * remove spurious logging statement ## Other code changes * no changes *NO_CI*	2024-09-26 11:44:41 +00:00
Grahame Grieve	10921bef1f	release notes	2024-09-26 07:11:28 -04:00
Grahame Grieve	7bd5d3b7ce	Merge remote-tracking branch 'origin/master'	2024-09-26 07:08:52 -04:00
Grahame Grieve	bd53f7c011	remove spurious logging statement	2024-09-26 07:08:47 -04:00
oliveregger	2f165863e7	fix test, revert var patch	2024-09-21 18:50:01 +02:00
oliveregger	d69a8e3e43	FHIR-46548: where clause on alias #1748	2024-09-18 23:09:24 +02:00