Handle Versioned Canonical Refs (#6003)

* Work on versioned canonidal refs * Merge * Tests working * Working without version support * CLean refactor * Targets * Remove redundant parameter * Fix up tests * Remove fixme * Add changelog * Improve changelog * Update version * Test fixes
hapifhir · Jun 17, 2024 · 8947706 · 8947706
1 parent 72b50a4
commit 8947706
Show file tree

Hide file tree

Showing 86 changed files with 775 additions and 331 deletions.
diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-bom/pom.xml b/hapi-fhir-bom/pom.xml
@@ -4,15 +4,15 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-bom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <packaging>pom</packaging>
  <name>HAPI FHIR BOM</name>
 
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-checkstyle/pom.xml b/hapi-fhir-checkstyle/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir-cli</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-fhir</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-docs/pom.xml b/hapi-fhir-docs/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/...urces/ca/uhn/hapi/fhir/changelog/7_4_0/6003-improve-versioned-canonical-ref-handling.yaml b/...urces/ca/uhn/hapi/fhir/changelog/7_4_0/6003-improve-versioned-canonical-ref-handling.yaml
@@ -0,0 +1,12 @@
+---
+type: add
+issue: 6003
+title: "When performing a search for a resource which uses versioned canonical
+ references to another resource (e.g. a QuestionnaireResponse with a 
+ questionnaire reference of `http:https://example.org/my-questionnaire|1.0`),
+ the server failed to process `_include` directives which should bring in
+ these references. Includes will now fetch all versions of a canonical
+ reference, which is still not perfect but is an improvement over the
+ current behaviour. A future update may add more targeted behaviour to
+ address including versioned reference targets, but this will require a
+ significant re-architecture of the loading module."
diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml
@@ -11,7 +11,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml
@@ -4,7 +4,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpa/pom.xml b/hapi-fhir-jpa/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml
@@ -5,7 +5,7 @@
  <parent>
  <groupId>ca.uhn.hapi.fhir</groupId>
  <artifactId>hapi-deployable-pom</artifactId>
- <version>7.3.6-SNAPSHOT</version>
+ <version>7.3.7-SNAPSHOT</version>
 
  <relativePath>../hapi-deployable-pom/pom.xml</relativePath>
  </parent>

diff --git a/...r-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IResourceTableDaoImpl.java b/...r-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/data/custom/IResourceTableDaoImpl.java
@@ -42,6 +42,7 @@ public class IResourceTableDaoImpl implements IForcedIdQueries {
  * is an object array, where the order matters (the array represents columns returned by the query).
  * Deleted resources are not filtered.
  */
+ @Override
  public Collection<Object[]> findAndResolveByForcedIdWithNoTypeIncludeDeleted(
  String theResourceType, Collection<String> theForcedIds) {
  return findAndResolveByForcedIdWithNoType(theResourceType, theForcedIds, false);
@@ -52,6 +53,7 @@ public Collection<Object[]> findAndResolveByForcedIdWithNoTypeIncludeDeleted(
  * is an object array, where the order matters (the array represents columns returned by the query).
  * Deleted resources are optionally filtered. Be careful if you change this query in any way.
  */
+ @Override
  public Collection<Object[]> findAndResolveByForcedIdWithNoType(
  String theResourceType, Collection<String> theForcedIds, boolean theExcludeDeleted) {
  String query = "SELECT t.myResourceType, t.myId, t.myFhirId, t.myDeleted "
@@ -74,6 +76,7 @@ public Collection<Object[]> findAndResolveByForcedIdWithNoType(
  * is an object array, where the order matters (the array represents columns returned by the query).
  * Deleted resources are optionally filtered. Be careful if you change this query in any way.
  */
+ @Override
  public Collection<Object[]> findAndResolveByForcedIdWithNoTypeInPartition(
  String theResourceType,
  Collection<String> theForcedIds,
@@ -100,6 +103,7 @@ public Collection<Object[]> findAndResolveByForcedIdWithNoTypeInPartition(
  * is an object array, where the order matters (the array represents columns returned by the query).
  * Deleted resources are optionally filtered. Be careful if you change this query in any way.
  */
+ @Override
  public Collection<Object[]> findAndResolveByForcedIdWithNoTypeInPartitionNull(
  String theResourceType, Collection<String> theForcedIds, boolean theExcludeDeleted) {
  String query = "SELECT t.myResourceType, t.myId, t.myFhirId, t.myDeleted "
@@ -122,6 +126,7 @@ public Collection<Object[]> findAndResolveByForcedIdWithNoTypeInPartitionNull(
  * is an object array, where the order matters (the array represents columns returned by the query).
  * Deleted resources are optionally filtered. Be careful if you change this query in any way.
  */
+ @Override
  public Collection<Object[]> findAndResolveByForcedIdWithNoTypeInPartitionIdOrNullPartitionId(
  String theResourceType,
  Collection<String> theForcedIds,