diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml
index 9a52f75affe..e86e65734fa 100644
--- a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml
+++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml
@@ -7,7 +7,7 @@
hapi-fhir-serviceloaders
ca.uhn.hapi.fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-testing/pom.xml b/hapi-fhir-serviceloaders/hapi-fhir-caching-testing/pom.xml
index d5c9d19cf87..fa616b0d002 100644
--- a/hapi-fhir-serviceloaders/hapi-fhir-caching-testing/pom.xml
+++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-testing/pom.xml
@@ -7,7 +7,7 @@
hapi-fhir
ca.uhn.hapi.fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../../pom.xml
diff --git a/hapi-fhir-serviceloaders/pom.xml b/hapi-fhir-serviceloaders/pom.xml
index de9b98d09ed..c17ee444659 100644
--- a/hapi-fhir-serviceloaders/pom.xml
+++ b/hapi-fhir-serviceloaders/pom.xml
@@ -5,7 +5,7 @@
hapi-deployable-pom
ca.uhn.hapi.fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
index b0f74140c5a..50bf4ba70b3 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml
index 341c4fd0d41..85576aebb13 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-apache/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir-spring-boot-samples
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
hapi-fhir-spring-boot-sample-client-apache
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml
index 5d3bd003dc5..3506e898c35 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-client-okhttp/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir-spring-boot-samples
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml
index 6429c18c130..7b2e450a995 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/hapi-fhir-spring-boot-sample-server-jersey/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir-spring-boot-samples
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml
index 97b72201425..d3303cdcf8b 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-samples/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir-spring-boot
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
diff --git a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml
index 82280e80b6a..9b02cd16aff 100644
--- a/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml
+++ b/hapi-fhir-spring-boot/hapi-fhir-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-spring-boot/pom.xml b/hapi-fhir-spring-boot/pom.xml
index 6706cd9259f..ae91db91609 100644
--- a/hapi-fhir-spring-boot/pom.xml
+++ b/hapi-fhir-spring-boot/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-sql-migrate/pom.xml b/hapi-fhir-sql-migrate/pom.xml
index 6a206776c55..df128579d9a 100644
--- a/hapi-fhir-sql-migrate/pom.xml
+++ b/hapi-fhir-sql-migrate/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage-batch2-jobs/pom.xml b/hapi-fhir-storage-batch2-jobs/pom.xml
index 63d1b4263d6..29af596c723 100644
--- a/hapi-fhir-storage-batch2-jobs/pom.xml
+++ b/hapi-fhir-storage-batch2-jobs/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage-batch2-test-utilities/pom.xml b/hapi-fhir-storage-batch2-test-utilities/pom.xml
index 454e9cf36b7..547f339257d 100644
--- a/hapi-fhir-storage-batch2-test-utilities/pom.xml
+++ b/hapi-fhir-storage-batch2-test-utilities/pom.xml
@@ -7,7 +7,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage-batch2/pom.xml b/hapi-fhir-storage-batch2/pom.xml
index 9d205053e6d..05a0d821742 100644
--- a/hapi-fhir-storage-batch2/pom.xml
+++ b/hapi-fhir-storage-batch2/pom.xml
@@ -7,7 +7,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage-cr/pom.xml b/hapi-fhir-storage-cr/pom.xml
index b9fa0da3fda..31acaba7813 100644
--- a/hapi-fhir-storage-cr/pom.xml
+++ b/hapi-fhir-storage-cr/pom.xml
@@ -7,7 +7,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage-cr/src/test/resources/BCSEHEDISMY2022-bundle.json b/hapi-fhir-storage-cr/src/test/resources/BCSEHEDISMY2022-bundle.json
index 59ac27f84f0..0666c3df416 100644
--- a/hapi-fhir-storage-cr/src/test/resources/BCSEHEDISMY2022-bundle.json
+++ b/hapi-fhir-storage-cr/src/test/resources/BCSEHEDISMY2022-bundle.json
@@ -1843,6 +1843,7 @@
"guidance": "* For Medicare plans, I-SNP and LTI exclusions are not included in the measure calculation logic and need to be programmed manually. Administrative data must be used for these exclusions.\n*Non-administrative data may be used for the frailty and advanced illness exclusion.\n**Allocation:**
The member was enrolled with a medical benefit throughout the Participation Period.
No more than one gap in enrollment of up to 45 days for each full calendar year of the Participation Period (i.e., the Measurement Period and the year prior to the Measurement Period).
No gaps in enrollment are allowed from October 1 two years prior to the Measurement Period through December 31 two years prior to the Measurement Period.
**Reporting:**
For Medicare plans, the SES stratifications are mutually exclusive. NCQA calculates a total rate for Medicare plans by adding all six Medicare stratifications.
SES and product line stratifications are not included in the measure calculation logic and need to be programmed manually.
**Stratification:**
1. Commercial.\n2. Medicaid.\n3. Medicare: Non-LIS/DE, Nondisability.\n4. Medicare: LIS/DE.\n5. Medicare: Disability\n6. Medicare: LIS/DE and Disability.\n7. Medicare: Other.\n8. Medicare: Unknown.
",
"group": [ {
"population": [ {
+ "id": "initial-population",
"code": {
"coding": [ {
"system": "http://terminology.hl7.org/CodeSystem/measure-population",
@@ -1856,6 +1857,7 @@
"expression": "Initial Population"
}
}, {
+ "id": "denominator",
"code": {
"coding": [ {
"system": "http://terminology.hl7.org/CodeSystem/measure-population",
@@ -1869,6 +1871,7 @@
"expression": "Denominator"
}
}, {
+ "id": "denominator-exclusion",
"code": {
"coding": [ {
"system": "http://terminology.hl7.org/CodeSystem/measure-population",
@@ -1882,6 +1885,7 @@
"expression": "Exclusions"
}
}, {
+ "id": "numerator",
"code": {
"coding": [ {
"system": "http://terminology.hl7.org/CodeSystem/measure-population",
@@ -1897,6 +1901,7 @@
} ]
} ],
"supplementalData": [ {
+ "id": "Enrolled-During-Participation-Period",
"code": {
"text": "Enrolled During Participation Period"
},
@@ -1911,6 +1916,7 @@
"expression": "Enrolled During Participation Period"
}
}, {
+ "id": "participation-period",
"code": {
"text": "Participation Period"
},
diff --git a/hapi-fhir-storage-cr/src/test/resources/ColorectalCancerScreeningsFHIR-bundle.json b/hapi-fhir-storage-cr/src/test/resources/ColorectalCancerScreeningsFHIR-bundle.json
index 87864f5254d..b48340e557e 100644
--- a/hapi-fhir-storage-cr/src/test/resources/ColorectalCancerScreeningsFHIR-bundle.json
+++ b/hapi-fhir-storage-cr/src/test/resources/ColorectalCancerScreeningsFHIR-bundle.json
@@ -147712,7 +147712,7 @@
}
],
"library": [
- "http://ecqi.healthit.gov/ecqms/Library/ColorectalCancerScreeningsFHIR|0.0.001"
+ "http://ecqi.healthit.gov/ecqms/Library/ColorectalCancerScreeningsFHIR"
],
"disclaimer": "The performance Measure is not a clinical guideline and does not establish a standard of medical care, and has not been tested for all potential applications. THE MEASURE AND SPECIFICATIONS ARE PROVIDED \"AS IS\" WITHOUT WARRANTY OF ANY KIND.\n \nDue to technical limitations, registered trademarks are indicated by (R) or [R] and unregistered trademarks are indicated by (TM) or [TM].",
"scoring": {
diff --git a/hapi-fhir-storage-cr/src/test/resources/Exm104FhirR4MeasureBundle.json b/hapi-fhir-storage-cr/src/test/resources/Exm104FhirR4MeasureBundle.json
index 2768880210d..96f35977412 100644
--- a/hapi-fhir-storage-cr/src/test/resources/Exm104FhirR4MeasureBundle.json
+++ b/hapi-fhir-storage-cr/src/test/resources/Exm104FhirR4MeasureBundle.json
@@ -140,7 +140,7 @@
}
],
"library": [
- "http://localhost:8080/fhir/Library/library-EXM104|8.2.000"
+ "http://localhost:8080/fhir/Library/EXM104|8.2.000"
],
"disclaimer": "These performance measures are not clinical guidelines and do not establish a standard of medical care, and have not been tested for all potential applications. The measures and specifications are provided without warranty.",
"scoring": {
@@ -177,6 +177,7 @@
"id": "group-1",
"population": [
{
+ "id": "initial-population",
"code": {
"coding": [
{
@@ -192,6 +193,7 @@
}
},
{
+ "id": "numerator",
"code": {
"coding": [
{
@@ -207,6 +209,7 @@
}
},
{
+ "id": "denominator",
"code": {
"coding": [
{
@@ -222,6 +225,7 @@
}
},
{
+ "id": "denominator-exclusion",
"code": {
"coding": [
{
@@ -237,6 +241,7 @@
}
},
{
+ "id": "denominator-exception",
"code": {
"coding": [
{
@@ -341,7 +346,7 @@
{
"resource": {
"resourceType": "Library",
- "id": "library-EXM104",
+ "id": "EXM104",
"extension": [
{
"url": "http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-softwaresystem",
@@ -350,7 +355,7 @@
}
}
],
- "url": "http://localhost:8080/fhir/Library/library-EXM104",
+ "url": "http://localhost:8080/fhir/Library/EXM104",
"version": "8.2.000",
"name": "library-EXM104",
"status": "active",
@@ -600,7 +605,7 @@
},
"request": {
"method": "PUT",
- "url": "Library/library-EXM104"
+ "url": "Library/EXM104"
}
},
{
diff --git a/hapi-fhir-storage-cr/src/test/resources/largeValueSetMeasureTest-Bundle.json b/hapi-fhir-storage-cr/src/test/resources/largeValueSetMeasureTest-Bundle.json
index a4785ce2534..1e20e8e31df 100644
--- a/hapi-fhir-storage-cr/src/test/resources/largeValueSetMeasureTest-Bundle.json
+++ b/hapi-fhir-storage-cr/src/test/resources/largeValueSetMeasureTest-Bundle.json
@@ -1377,6 +1377,7 @@
"id": "group-1",
"population": [
{
+ "id": "initial-population",
"code": {
"coding": [
{
@@ -1392,6 +1393,7 @@
}
},
{
+ "id": "denominator",
"code": {
"coding": [
{
@@ -1407,6 +1409,7 @@
}
},
{
+ "id": "numerator",
"code": {
"coding": [
{
diff --git a/hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-7.0.000-bundle.json b/hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-7.0.000-bundle.json
index 65b48a37b9e..e33706679ef 100644
--- a/hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-7.0.000-bundle.json
+++ b/hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-7.0.000-bundle.json
@@ -1372,6 +1372,7 @@
"id": "group-1",
"population": [
{
+ "id": "initial-population",
"code": {
"coding": [
{
@@ -1387,6 +1388,7 @@
}
},
{
+ "id": "numerator",
"code": {
"coding": [
{
@@ -1402,6 +1404,7 @@
}
},
{
+ "id": "denominator",
"code": {
"coding": [
{
@@ -1417,6 +1420,7 @@
}
},
{
+ "id": "denominator-exclusion",
"code": {
"coding": [
{
@@ -1436,6 +1440,7 @@
],
"supplementalData": [
{
+ "id": "sde-ethnicity",
"code": {
"text": "sde-ethnicity"
},
@@ -1455,6 +1460,7 @@
}
},
{
+ "id": "sde-payer",
"code": {
"text": "sde-payer"
},
@@ -1474,6 +1480,7 @@
}
},
{
+ "id": "sde-race",
"code": {
"text": "sde-race"
},
@@ -1493,6 +1500,7 @@
}
},
{
+ "id": "sde-sex",
"code": {
"text": "sde-sex"
},
diff --git a/hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-9.0.000-bundle.json b/hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-9.0.000-bundle.json
index afec4ed9ae9..1e940988fd5 100644
--- a/hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-9.0.000-bundle.json
+++ b/hapi-fhir-storage-cr/src/test/resources/multiversion/EXM124-9.0.000-bundle.json
@@ -1372,6 +1372,7 @@
"id": "group-1",
"population": [
{
+ "id": "initial-population",
"code": {
"coding": [
{
@@ -1387,6 +1388,7 @@
}
},
{
+ "id": "numerator",
"code": {
"coding": [
{
@@ -1402,6 +1404,7 @@
}
},
{
+ "id": "denominator",
"code": {
"coding": [
{
@@ -1417,6 +1420,7 @@
}
},
{
+ "id": "denominator-exclusion",
"code": {
"coding": [
{
@@ -1436,6 +1440,7 @@
],
"supplementalData": [
{
+ "id": "sde-ethnicity",
"code": {
"text": "sde-ethnicity"
},
@@ -1455,6 +1460,7 @@
}
},
{
+ "id": "sde-payer",
"code": {
"text": "sde-payer"
},
@@ -1474,6 +1480,7 @@
}
},
{
+ "id": "sde-race",
"code": {
"text": "sde-race"
},
@@ -1493,6 +1500,7 @@
}
},
{
+ "id": "sde-sex",
"code": {
"text": "sde-sex"
},
diff --git a/hapi-fhir-storage-mdm/pom.xml b/hapi-fhir-storage-mdm/pom.xml
index 52087f84fa8..d3c58df6f67 100644
--- a/hapi-fhir-storage-mdm/pom.xml
+++ b/hapi-fhir-storage-mdm/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage-test-utilities/pom.xml b/hapi-fhir-storage-test-utilities/pom.xml
index 7666edd31df..65d0de719b5 100644
--- a/hapi-fhir-storage-test-utilities/pom.xml
+++ b/hapi-fhir-storage-test-utilities/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage/pom.xml b/hapi-fhir-storage/pom.xml
index 83d5fa7d4c6..a05219b43f7 100644
--- a/hapi-fhir-storage/pom.xml
+++ b/hapi-fhir-storage/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptor.java b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptor.java
index c563f19e9d9..2a0aceafd7a 100644
--- a/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptor.java
+++ b/hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/interceptor/PatientIdPartitionInterceptor.java
@@ -36,6 +36,7 @@ import ca.uhn.fhir.model.api.IQueryParameterType;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import ca.uhn.fhir.rest.param.ReferenceParam;
import ca.uhn.fhir.rest.server.exceptions.MethodNotAllowedException;
+import ca.uhn.fhir.rest.server.provider.ProviderConstants;
import jakarta.annotation.Nonnull;
import org.hl7.fhir.instance.model.api.IBaseResource;
import org.hl7.fhir.r4.model.IdType;
@@ -151,7 +152,12 @@ public class PatientIdPartitionInterceptor {
break;
case EXTENDED_OPERATION_SERVER:
- return provideNonPatientSpecificQueryResponse(theReadDetails);
+ String extendedOp = theReadDetails.getExtendedOperationName();
+ if (ProviderConstants.OPERATION_EXPORT.equals(extendedOp)
+ || ProviderConstants.OPERATION_EXPORT_POLL_STATUS.equals(extendedOp)) {
+ return provideNonPatientSpecificQueryResponse(theReadDetails);
+ }
+ break;
default:
// nothing
}
diff --git a/hapi-fhir-structures-dstu2.1/pom.xml b/hapi-fhir-structures-dstu2.1/pom.xml
index 5feea64c5ef..bbabf3e42d2 100644
--- a/hapi-fhir-structures-dstu2.1/pom.xml
+++ b/hapi-fhir-structures-dstu2.1/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml
index e09675b0c14..0d92336749a 100644
--- a/hapi-fhir-structures-dstu2/pom.xml
+++ b/hapi-fhir-structures-dstu2/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-dstu3/pom.xml b/hapi-fhir-structures-dstu3/pom.xml
index 24563186f25..35aea6553c9 100644
--- a/hapi-fhir-structures-dstu3/pom.xml
+++ b/hapi-fhir-structures-dstu3/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml
index edede0feca8..760a8f800c1 100644
--- a/hapi-fhir-structures-hl7org-dstu2/pom.xml
+++ b/hapi-fhir-structures-hl7org-dstu2/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r4/pom.xml b/hapi-fhir-structures-r4/pom.xml
index 1dcc4bb483b..5192a7cbaad 100644
--- a/hapi-fhir-structures-r4/pom.xml
+++ b/hapi-fhir-structures-r4/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r4b/pom.xml b/hapi-fhir-structures-r4b/pom.xml
index e75f5d5931d..fbc83bd2e6f 100644
--- a/hapi-fhir-structures-r4b/pom.xml
+++ b/hapi-fhir-structures-r4b/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r5/pom.xml b/hapi-fhir-structures-r5/pom.xml
index d3eaea31a2d..4b1356f4f35 100644
--- a/hapi-fhir-structures-r5/pom.xml
+++ b/hapi-fhir-structures-r5/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml
index a040dbbe3b8..331972a559b 100644
--- a/hapi-fhir-test-utilities/pom.xml
+++ b/hapi-fhir-test-utilities/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml
index 3cc1275c96a..b998896b055 100644
--- a/hapi-fhir-testpage-overlay/pom.xml
+++ b/hapi-fhir-testpage-overlay/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-validation-resources-dstu2.1/pom.xml b/hapi-fhir-validation-resources-dstu2.1/pom.xml
index f7263c83488..869b2d098d5 100644
--- a/hapi-fhir-validation-resources-dstu2.1/pom.xml
+++ b/hapi-fhir-validation-resources-dstu2.1/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-dstu2/pom.xml b/hapi-fhir-validation-resources-dstu2/pom.xml
index 2dcf14738f5..3d369c796be 100644
--- a/hapi-fhir-validation-resources-dstu2/pom.xml
+++ b/hapi-fhir-validation-resources-dstu2/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-dstu3/pom.xml b/hapi-fhir-validation-resources-dstu3/pom.xml
index 97aa6040159..b297010c7d7 100644
--- a/hapi-fhir-validation-resources-dstu3/pom.xml
+++ b/hapi-fhir-validation-resources-dstu3/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-r4/pom.xml b/hapi-fhir-validation-resources-r4/pom.xml
index 2b42c8253b9..2bf39d8f2de 100644
--- a/hapi-fhir-validation-resources-r4/pom.xml
+++ b/hapi-fhir-validation-resources-r4/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-r4b/pom.xml b/hapi-fhir-validation-resources-r4b/pom.xml
index c6daff498bb..1b7d519f581 100644
--- a/hapi-fhir-validation-resources-r4b/pom.xml
+++ b/hapi-fhir-validation-resources-r4b/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation-resources-r5/pom.xml b/hapi-fhir-validation-resources-r5/pom.xml
index 3524ed588d0..80a6a9bc5c3 100644
--- a/hapi-fhir-validation-resources-r5/pom.xml
+++ b/hapi-fhir-validation-resources-r5/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml
index 53280b3951e..fd0c291a98b 100644
--- a/hapi-fhir-validation/pom.xml
+++ b/hapi-fhir-validation/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupport.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupport.java
index 08f94902a66..2e69b1a46cf 100644
--- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupport.java
+++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/support/RemoteTerminologyServiceValidationSupport.java
@@ -12,7 +12,6 @@ import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.rest.api.SummaryEnum;
import ca.uhn.fhir.rest.client.api.IGenericClient;
import ca.uhn.fhir.rest.gclient.IQuery;
-import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.util.BundleUtil;
import ca.uhn.fhir.util.ParametersUtil;
import jakarta.annotation.Nonnull;
@@ -314,8 +313,10 @@ public class RemoteTerminologyServiceValidationSupport extends BaseValidationSup
conceptProperty = new CodingConceptProperty(
propertyName, coding.getSystem(), coding.getCode(), coding.getDisplay());
break;
+ // TODO: add other property types as per FHIR spec https://github.com/hapifhir/hapi-fhir/issues/5699
default:
- throw new InternalErrorException(Msg.code(2450) + "Property type " + fhirType + " is not supported.");
+ // other types will not fail for Remote Terminology
+ conceptProperty = new StringConceptProperty(propertyName, value.toString());
}
return conceptProperty;
}
@@ -347,8 +348,10 @@ public class RemoteTerminologyServiceValidationSupport extends BaseValidationSup
conceptProperty =
new CodingConceptProperty(theName, coding.getSystem(), coding.getCode(), coding.getDisplay());
break;
+ // TODO: add other property types as per FHIR spec https://github.com/hapifhir/hapi-fhir/issues/5699
default:
- throw new InternalErrorException(Msg.code(2451) + "Property type " + fhirType + " is not supported.");
+ // other types will not fail for Remote Terminology
+ conceptProperty = new StringConceptProperty(theName, theValue.toString());
}
return conceptProperty;
}
@@ -447,8 +450,10 @@ public class RemoteTerminologyServiceValidationSupport extends BaseValidationSup
conceptProperty = new CodingConceptProperty(
propertyName, coding.getSystem(), coding.getCode(), coding.getDisplay());
break;
+ // TODO: add other property types as per FHIR spec https://github.com/hapifhir/hapi-fhir/issues/5699
default:
- throw new InternalErrorException(Msg.code(2452) + "Property type " + fhirType + " is not supported.");
+ // other types will not fail for Remote Terminology
+ conceptProperty = new StringConceptProperty(propertyName, value.toString());
}
return conceptProperty;
}
@@ -467,8 +472,10 @@ public class RemoteTerminologyServiceValidationSupport extends BaseValidationSup
conceptProperty =
new CodingConceptProperty(theName, coding.getSystem(), coding.getCode(), coding.getDisplay());
break;
+ // TODO: add other property types as per FHIR spec https://github.com/hapifhir/hapi-fhir/issues/5699
default:
- throw new InternalErrorException(Msg.code(2453) + "Property type " + fhirType + " is not supported.");
+ // other types will not fail for Remote Terminology
+ conceptProperty = new StringConceptProperty(theName, theValue.toString());
}
return conceptProperty;
}
diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/common/hapi/validation/ILookupCodeTest.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/common/hapi/validation/ILookupCodeTest.java
index 966a795eef3..0b4624d733f 100644
--- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/common/hapi/validation/ILookupCodeTest.java
+++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/common/hapi/validation/ILookupCodeTest.java
@@ -39,44 +39,11 @@ public interface ILookupCodeTest {
IResourceProvider getCodeSystemProvider();
}
- @Nested
- interface ILookupCodeUnsupportedPropertyTypeTest extends IValidationTest {
-
- String getInvalidValueErrorCode();
-
- String getInvalidValueErrorCodeForConvert();
-
- @Override
- IMySimpleCodeSystemProvider getCodeSystemProvider();
-
- @Test
- default void testLookupCode_forCodeSystemWithPropertyInvalidValue_throwsException() {
- // test and verify
- try {
- getService().lookupCode(null, new LookupCodeRequest(CODE_SYSTEM, CODE, LANGUAGE, null));
- fail();
- } catch (InternalErrorException e) {
- assertTrue(e.getMessage().contains(getInvalidValueErrorCode() + ": Property type " + getCodeSystemProvider().getPropertyValue().fhirType() + " is not supported"));
- }
- }
-
- @Test
- default void testCreateConceptProperty_forCodeSystemWithPropertyInvalidValue_throwsException() {
- // test and verify
- try {
- RemoteTerminologyServiceValidationSupport.createConceptProperty("property", getCodeSystemProvider().getPropertyValue());
- fail();
- } catch (InternalErrorException e) {
- assertTrue(e.getMessage().contains(getInvalidValueErrorCodeForConvert() + ": Property type " + getCodeSystemProvider().getPropertyValue().fhirType() + " is not supported"));
- }
- }
- }
-
@Nested
interface ILookupCodeSupportedPropertyTest extends IValidationTest {
IMyCodeSystemProvider getCodeSystemProvider();
- Stream getEmptyPropertyValues();
+ Stream getEmptyPropertyValues();
Stream getPropertyValues();
diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/LookupCodeDstu3Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/LookupCodeDstu3Test.java
index 6bf78229f1e..404d971928e 100644
--- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/LookupCodeDstu3Test.java
+++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/dstu3/hapi/validation/LookupCodeDstu3Test.java
@@ -4,17 +4,14 @@ import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.support.IValidationSupport;
import ca.uhn.fhir.context.support.IValidationSupport.ConceptDesignation;
import ca.uhn.fhir.context.support.IValidationSupport.LookupCodeResult;
-import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.model.util.JpaConstants;
import ca.uhn.fhir.rest.annotation.Operation;
import ca.uhn.fhir.rest.annotation.OperationParam;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
-import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.test.utilities.server.RestfulServerExtension;
import jakarta.servlet.http.HttpServletRequest;
import org.hl7.fhir.common.hapi.validation.ILookupCodeTest.ILookupCodeSupportedPropertyTest;
-import org.hl7.fhir.common.hapi.validation.ILookupCodeTest.ILookupCodeUnsupportedPropertyTypeTest;
import org.hl7.fhir.common.hapi.validation.ILookupCodeTest.IMyCodeSystemProvider;
import org.hl7.fhir.common.hapi.validation.ILookupCodeTest.IMySimpleCodeSystemProvider;
import org.hl7.fhir.common.hapi.validation.support.RemoteTerminologyServiceValidationSupport;
@@ -29,12 +26,17 @@ import org.hl7.fhir.dstu3.model.Type;
import org.hl7.fhir.dstu3.model.UriType;
import org.hl7.fhir.instance.model.api.IBaseDatatype;
import org.hl7.fhir.instance.model.api.IBaseResource;
+import org.hl7.fhir.r4.model.DateTimeType;
+import org.hl7.fhir.r4.model.DecimalType;
+import org.hl7.fhir.r4.model.InstantType;
+import org.hl7.fhir.r4.model.IntegerType;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.provider.Arguments;
+import java.util.Calendar;
import java.util.List;
import java.util.stream.Stream;
@@ -57,40 +59,6 @@ public class LookupCodeDstu3Test {
mySvc.addClientInterceptor(new LoggingInterceptor(true));
}
- @TestInstance(TestInstance.Lifecycle.PER_CLASS)
- @Nested
- class LookupCodeUnsupportedPropertyTypeDstu3Test implements ILookupCodeUnsupportedPropertyTypeTest {
- private final MySimplePropertyCodeSystemProviderDstu3 myMySimplePropertyCodeSystemProvider = new MySimplePropertyCodeSystemProviderDstu3();
-
- @Override
- public IMySimpleCodeSystemProvider getCodeSystemProvider() {
- return myMySimplePropertyCodeSystemProvider;
- }
-
- @Override
- public RemoteTerminologyServiceValidationSupport getService() {
- return mySvc;
- }
-
- @Override
- public String getInvalidValueErrorCode() {
- return "HAPI-2450";
- }
-
- @Override
- public String getInvalidValueErrorCodeForConvert() {
- return "HAPI-2451";
- }
-
- @BeforeEach
- public void before() {
- // TODO: use another type when "code" is added to the supported types
- myMySimplePropertyCodeSystemProvider.myPropertyName = "somePropertyName";
- myMySimplePropertyCodeSystemProvider.myPropertyValue = new CodeType("someCode");
- ourRestfulServerExtension.getRestfulServer().registerProvider(myMySimplePropertyCodeSystemProvider);
- }
- }
-
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@Nested
class ILookupCodeSupportedPropertyDstu3Test implements ILookupCodeSupportedPropertyTest {
@@ -116,8 +84,13 @@ public class LookupCodeDstu3Test {
String type = theConceptProperty.getType();
switch (type) {
case IValidationSupport.TYPE_STRING -> {
- assertTrue(theExpectedValue instanceof StringType);
- StringType stringValue = (StringType) theExpectedValue;
+ if (!(theExpectedValue instanceof StringType stringValue)) {
+ // TODO: remove this branch to test other property types as per FHIR spec https://github.com/hapifhir/hapi-fhir/issues/5699
+ IValidationSupport.StringConceptProperty stringConceptProperty = (IValidationSupport.StringConceptProperty) theConceptProperty;
+ assertEquals(theExpectedValue.toString(), stringConceptProperty.getValue());
+ break;
+ }
+ // StringType stringValue = (StringType) theExpectedValue;
assertTrue(theConceptProperty instanceof StringConceptProperty);
StringConceptProperty stringConceptProperty = (StringConceptProperty) theConceptProperty;
assertEquals(stringValue.getValue(), stringConceptProperty.getValue());
@@ -131,8 +104,10 @@ public class LookupCodeDstu3Test {
assertEquals(coding.getSystem(), codingConceptProperty.getCodeSystem());
assertEquals(coding.getDisplay(), codingConceptProperty.getDisplay());
}
- default ->
- throw new InternalErrorException(Msg.code(2451) + "Property type " + type + " is not supported.");
+ default -> {
+ IValidationSupport.StringConceptProperty stringConceptProperty = (IValidationSupport.StringConceptProperty) theConceptProperty;
+ assertEquals(theExpectedValue.toString(), stringConceptProperty.getValue());
+ }
}
}
@@ -149,8 +124,27 @@ public class LookupCodeDstu3Test {
public Stream getPropertyValues() {
return Stream.of(
+ // FHIR DSTU3 spec types
Arguments.arguments(new StringType("value")),
- Arguments.arguments(new Coding("code", "system", "display"))
+ Arguments.arguments(new Coding("code", "system", "display")),
+ Arguments.arguments(new CodeType("code")),
+ Arguments.arguments(new BooleanType(true)),
+ Arguments.arguments(new IntegerType(1)),
+ Arguments.arguments(new DateTimeType(Calendar.getInstance())),
+ // other types will also not fail for Remote Terminology
+ Arguments.arguments(new DecimalType(1.1)),
+ Arguments.arguments(new InstantType(Calendar.getInstance())),
+ Arguments.arguments(new Type() {
+ @Override
+ protected Type typedCopy() {
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return "randomType";
+ }
+ })
);
}
diff --git a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/LookupCodeR4Test.java b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/LookupCodeR4Test.java
index 9fb662a8a3b..f01e66c16c2 100644
--- a/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/LookupCodeR4Test.java
+++ b/hapi-fhir-validation/src/test/java/org/hl7/fhir/r4/validation/LookupCodeR4Test.java
@@ -2,17 +2,14 @@ package org.hl7.fhir.r4.validation;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.context.support.IValidationSupport;
-import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.model.util.JpaConstants;
import ca.uhn.fhir.rest.annotation.Operation;
import ca.uhn.fhir.rest.annotation.OperationParam;
import ca.uhn.fhir.rest.api.server.RequestDetails;
import ca.uhn.fhir.rest.client.interceptor.LoggingInterceptor;
-import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.test.utilities.server.RestfulServerExtension;
import jakarta.servlet.http.HttpServletRequest;
import org.hl7.fhir.common.hapi.validation.ILookupCodeTest.ILookupCodeSupportedPropertyTest;
-import org.hl7.fhir.common.hapi.validation.ILookupCodeTest.ILookupCodeUnsupportedPropertyTypeTest;
import org.hl7.fhir.common.hapi.validation.ILookupCodeTest.IMyCodeSystemProvider;
import org.hl7.fhir.common.hapi.validation.ILookupCodeTest.IMySimpleCodeSystemProvider;
import org.hl7.fhir.common.hapi.validation.support.RemoteTerminologyServiceValidationSupport;
@@ -23,6 +20,10 @@ import org.hl7.fhir.r4.model.BooleanType;
import org.hl7.fhir.r4.model.CodeSystem;
import org.hl7.fhir.r4.model.CodeType;
import org.hl7.fhir.r4.model.Coding;
+import org.hl7.fhir.r4.model.DateTimeType;
+import org.hl7.fhir.r4.model.DecimalType;
+import org.hl7.fhir.r4.model.InstantType;
+import org.hl7.fhir.r4.model.IntegerType;
import org.hl7.fhir.r4.model.Parameters;
import org.hl7.fhir.r4.model.StringType;
import org.hl7.fhir.r4.model.Type;
@@ -33,6 +34,7 @@ import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.api.extension.RegisterExtension;
import org.junit.jupiter.params.provider.Arguments;
+import java.util.Calendar;
import java.util.List;
import java.util.stream.Stream;
@@ -52,41 +54,6 @@ public class LookupCodeR4Test {
mySvc.addClientInterceptor(new LoggingInterceptor(true));
}
- @TestInstance(TestInstance.Lifecycle.PER_CLASS)
- @Nested
- class LookupCodeUnsupportedPropertyTypeR4Test implements ILookupCodeUnsupportedPropertyTypeTest {
- private final MySimplePropertyCodeSystemProviderR4 myMySimplePropertyCodeSystemProvider = new MySimplePropertyCodeSystemProviderR4();
-
- @Override
- public IMySimpleCodeSystemProvider getCodeSystemProvider() {
- return myMySimplePropertyCodeSystemProvider;
- }
-
- @Override
- public RemoteTerminologyServiceValidationSupport getService() {
- return mySvc;
- }
-
- @Override
- public String getInvalidValueErrorCode() {
- return "HAPI-2452";
- }
-
-
- @Override
- public String getInvalidValueErrorCodeForConvert() {
- return "HAPI-2453";
- }
-
- @BeforeEach
- public void before() {
- // TODO: use another type when "code" is added to the supported types
- myMySimplePropertyCodeSystemProvider.myPropertyName = "somePropertyName";
- myMySimplePropertyCodeSystemProvider.myPropertyValue = new CodeType("someCode");
- ourRestfulServerExtension.getRestfulServer().registerProvider(myMySimplePropertyCodeSystemProvider);
- }
- }
-
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
@Nested
class ILookupCodeSupportedPropertyR4Test implements ILookupCodeSupportedPropertyTest {
@@ -113,8 +80,13 @@ public class LookupCodeR4Test {
String type = theConceptProperty.getType();
switch (type) {
case IValidationSupport.TYPE_STRING -> {
- assertTrue(theExpectedValue instanceof StringType);
- StringType stringValue = (StringType) theExpectedValue;
+ if (!(theExpectedValue instanceof StringType stringValue)) {
+ // TODO: remove this branch to test other property types as per FHIR spec https://github.com/hapifhir/hapi-fhir/issues/5699
+ IValidationSupport.StringConceptProperty stringConceptProperty = (IValidationSupport.StringConceptProperty) theConceptProperty;
+ assertEquals(theExpectedValue.toString(), stringConceptProperty.getValue());
+ break;
+ }
+ // StringType stringValue = (StringType) theExpectedValue;
assertTrue(theConceptProperty instanceof IValidationSupport.StringConceptProperty);
IValidationSupport.StringConceptProperty stringConceptProperty = (IValidationSupport.StringConceptProperty) theConceptProperty;
assertEquals(stringValue.getValue(), stringConceptProperty.getValue());
@@ -128,8 +100,10 @@ public class LookupCodeR4Test {
assertEquals(coding.getSystem(), codingConceptProperty.getCodeSystem());
assertEquals(coding.getDisplay(), codingConceptProperty.getDisplay());
}
- default ->
- throw new InternalErrorException(Msg.code(2451) + "Property type " + type + " is not supported.");
+ default -> {
+ IValidationSupport.StringConceptProperty stringConceptProperty = (IValidationSupport.StringConceptProperty) theConceptProperty;
+ assertEquals(theExpectedValue.toString(), stringConceptProperty.getValue());
+ }
}
}
@@ -146,13 +120,29 @@ public class LookupCodeR4Test {
public Stream getPropertyValues() {
return Stream.of(
+ // FHIR R4 spec types
Arguments.arguments(new StringType("value")),
- Arguments.arguments(new Coding("code", "system", "display"))
+ Arguments.arguments(new Coding("code", "system", "display")),
+ Arguments.arguments(new CodeType("code")),
+ Arguments.arguments(new BooleanType(true)),
+ Arguments.arguments(new IntegerType(1)),
+ Arguments.arguments(new DateTimeType(Calendar.getInstance())),
+ Arguments.arguments(new DecimalType(1.1)),
+ // other types will also not fail for Remote Terminology
+ Arguments.arguments(new InstantType(Calendar.getInstance())),
+ Arguments.arguments(new Type() {
+ @Override
+ protected Type typedCopy() {
+ return this;
+ }
+ @Override
+ public String toString() {
+ return "randomType";
+ }
+ })
);
}
-
-
public Stream getDesignations() {
return Stream.of(
Arguments.arguments(new IValidationSupport.ConceptDesignation().setLanguage("en").setUseCode("code1").setUseSystem("system-1").setUseDisplay("display").setValue("some value")),
diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml
index 5b0ff5ea727..202e0c5e60f 100644
--- a/hapi-tinder-plugin/pom.xml
+++ b/hapi-tinder-plugin/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../pom.xml
diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml
index 1baa86aedee..1bcfe10762e 100644
--- a/hapi-tinder-test/pom.xml
+++ b/hapi-tinder-test/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../pom.xml
diff --git a/pom.xml b/pom.xml
index b219abc329c..30a683dc67a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
ca.uhn.hapi.fhir
hapi-fhir
pom
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
HAPI-FHIR
An open-source implementation of the FHIR specification in Java.
@@ -1002,7 +1002,7 @@
1.0.8
- 3.0.0-PRE14
+ 3.0.0-PRE17
5.4.1
diff --git a/release-pipeline.yml b/release-pipeline.yml
index 6142cc53b91..766456fce09 100644
--- a/release-pipeline.yml
+++ b/release-pipeline.yml
@@ -140,7 +140,9 @@ jobs:
# want to fail fast if there is an issue, and avoid running the tests more than once, so it doesn't take all day.
timeoutInMinutes: 360
dependsOn: ['get_release_version', 'get_branch_id']
- container: maven:3.9-eclipse-temurin-21-jammy
+ container:
+ image: smilecdr/hapi-build:latest
+
steps:
- task: Cache@2
inputs:
@@ -153,7 +155,7 @@ jobs:
releaseType: stable
- task: Maven@3
env:
- JAVA_HOME_11_X64: /usr/java/openjdk
+ JAVA_HOME_11_X64: /opt/java/openjdk
displayName: Checkstyle Build
inputs:
mavenPomFile: 'hapi-fhir-checkstyle/pom.xml'
diff --git a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
index 5eb7176ab8f..bcccdf8b2dc 100644
--- a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
+++ b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
@@ -7,7 +7,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../../pom.xml
diff --git a/tests/hapi-fhir-base-test-mindeps-client/pom.xml b/tests/hapi-fhir-base-test-mindeps-client/pom.xml
index a3a7e4f29f6..b6c7b5b3a09 100644
--- a/tests/hapi-fhir-base-test-mindeps-client/pom.xml
+++ b/tests/hapi-fhir-base-test-mindeps-client/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../../pom.xml
diff --git a/tests/hapi-fhir-base-test-mindeps-server/pom.xml b/tests/hapi-fhir-base-test-mindeps-server/pom.xml
index 935b0881c29..8d82179e717 100644
--- a/tests/hapi-fhir-base-test-mindeps-server/pom.xml
+++ b/tests/hapi-fhir-base-test-mindeps-server/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 7.1.4-SNAPSHOT
+ 7.1.5-SNAPSHOT
../../pom.xml