From 3a2f4e57ca3b02311ff140946667958f58eaf708 Mon Sep 17 00:00:00 2001 From: Michele Adduci Date: Mon, 9 Dec 2024 12:41:45 +0100 Subject: [PATCH] Updated dependencies and resolving CVEs, bumped SpringBoot to 3.3.5 (#6449) * Updated dependencies, bumped SpringBoot to 3.3.5 * Fixing compilation issues, added changelog * Fixing compilation issues, updated changelog, Postgres and Oracle drivers * Fixing version conflicts for jboss-logging, fixing tests * Test fix * Spotless * Add bumps * Downgrading lucene * Update changes.yaml * HAPI version bump * License headers * Cleanup * Build fixes * Test fixes --------- Co-authored-by: James Agnew --- hapi-deployable-pom/pom.xml | 2 +- hapi-fhir-android/pom.xml | 2 +- hapi-fhir-base/pom.xml | 2 +- hapi-fhir-bom/pom.xml | 4 +- hapi-fhir-checkstyle/pom.xml | 2 +- hapi-fhir-cli/hapi-fhir-cli-api/pom.xml | 2 +- hapi-fhir-cli/hapi-fhir-cli-app/pom.xml | 2 +- hapi-fhir-cli/pom.xml | 2 +- hapi-fhir-client-apache-http5/pom.xml | 2 +- .../ApacheHttp5GZipContentInterceptor.java | 2 +- .../ApacheHttp5ModifiedStringResponse.java | 2 +- .../client/apache/ApacheHttp5Request.java | 2 +- .../apache/ApacheHttp5ResourceEntity.java | 2 +- .../client/apache/ApacheHttp5Response.java | 2 +- .../apache/ApacheHttp5RestfulClient.java | 2 +- .../ApacheHttp5RestfulClientFactory.java | 2 +- .../tls/ApacheHttp5TlsAuthenticationSvc.java | 2 +- hapi-fhir-client-okhttp/pom.xml | 2 +- hapi-fhir-client/pom.xml | 2 +- hapi-fhir-converter/pom.xml | 2 +- hapi-fhir-dist/pom.xml | 2 +- hapi-fhir-docs/pom.xml | 2 +- .../hapi/fhir/changelog/7_8_0/changes.yaml | 36 ++++++++ hapi-fhir-jacoco/pom.xml | 2 +- hapi-fhir-jaxrsserver-base/pom.xml | 2 +- hapi-fhir-jpa/pom.xml | 2 +- .../jpa/model/dialect/HapiFhirH2Dialect.java | 22 +++++ .../model/dialect/HapiFhirMariaDBDialect.java | 16 ++++ .../model/dialect/HapiFhirMySQLDialect.java | 16 ++++ hapi-fhir-jpaserver-base/pom.xml | 2 +- ...JpaPersistedResourceValidationSupport.java | 3 +- .../uhn/fhir/jpa/dao/search/PathContext.java | 24 +++++ .../jpa/entity/Batch2JobInstanceEntity.java | 3 + .../jpa/entity/Batch2WorkChunkEntity.java | 3 + .../entity/Batch2WorkChunkMetadataView.java | 3 + .../fhir/jpa/entity/BulkImportJobEntity.java | 4 + .../java/ca/uhn/fhir/jpa/entity/Search.java | 1 + .../TermConceptMapGroupElementTarget.java | 3 + .../ca/uhn/fhir/jpa/entity/TermValueSet.java | 3 + .../GraphQLProviderWithIntrospection.java | 11 ++- .../builder/models/SearchQueryProperties.java | 19 ++++ .../fhir/jpa/entity/GeneratedSchemaTest.java | 6 +- .../pom.xml | 2 +- hapi-fhir-jpaserver-hfql/pom.xml | 2 +- hapi-fhir-jpaserver-ips/pom.xml | 2 +- hapi-fhir-jpaserver-mdm/pom.xml | 2 +- hapi-fhir-jpaserver-model/pom.xml | 2 +- .../jpa/model/entity/BaseHasResource.java | 3 + .../model/entity/NpmPackageVersionEntity.java | 3 + .../NpmPackageVersionResourceEntity.java | 3 + .../model/entity/ResourceHistoryTable.java | 3 + .../jpa/model/entity/ResourceHistoryTag.java | 2 - .../ResourceIndexedSearchParamCoords.java | 2 - .../ResourceIndexedSearchParamDate.java | 2 - .../ResourceIndexedSearchParamNumber.java | 2 - .../ResourceIndexedSearchParamQuantity.java | 2 - ...eIndexedSearchParamQuantityNormalized.java | 2 - .../ResourceIndexedSearchParamString.java | 2 - .../ResourceIndexedSearchParamToken.java | 2 - .../entity/ResourceIndexedSearchParamUri.java | 2 - hapi-fhir-jpaserver-searchparam/pom.xml | 2 +- hapi-fhir-jpaserver-subscription/pom.xml | 2 +- hapi-fhir-jpaserver-test-dstu2/pom.xml | 2 +- hapi-fhir-jpaserver-test-dstu3/pom.xml | 2 +- hapi-fhir-jpaserver-test-r4/pom.xml | 2 +- .../r4/FhirResourceDaoR4QueryCountTest.java | 6 +- ...rceProviderR4ValueSetNoVerCSNoVerTest.java | 8 +- hapi-fhir-jpaserver-test-r4b/pom.xml | 2 +- hapi-fhir-jpaserver-test-r5/pom.xml | 2 +- .../r5/dbpartitionmode/TestDefinitions.java | 22 ++--- hapi-fhir-jpaserver-test-utilities/pom.xml | 2 +- hapi-fhir-jpaserver-uhnfhirtest/pom.xml | 2 +- hapi-fhir-server-cds-hooks/pom.xml | 2 +- hapi-fhir-server-mdm/pom.xml | 2 +- hapi-fhir-server-openapi/pom.xml | 2 +- hapi-fhir-server/pom.xml | 2 +- .../hapi-fhir-caching-api/pom.xml | 2 +- .../hapi-fhir-caching-caffeine/pom.xml | 4 +- .../hapi-fhir-caching-guava/pom.xml | 2 +- .../hapi-fhir-caching-testing/pom.xml | 2 +- hapi-fhir-serviceloaders/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../hapi-fhir-spring-boot-samples/pom.xml | 2 +- .../hapi-fhir-spring-boot-starter/pom.xml | 2 +- hapi-fhir-spring-boot/pom.xml | 2 +- hapi-fhir-sql-migrate/pom.xml | 14 +-- hapi-fhir-storage-batch2-jobs/pom.xml | 2 +- .../pom.xml | 2 +- hapi-fhir-storage-batch2/pom.xml | 2 +- hapi-fhir-storage-cr/pom.xml | 2 +- hapi-fhir-storage-mdm/pom.xml | 2 +- hapi-fhir-storage-test-utilities/pom.xml | 2 +- hapi-fhir-storage/pom.xml | 2 +- hapi-fhir-structures-dstu2.1/pom.xml | 2 +- hapi-fhir-structures-dstu2/pom.xml | 2 +- hapi-fhir-structures-dstu3/pom.xml | 2 +- hapi-fhir-structures-hl7org-dstu2/pom.xml | 2 +- hapi-fhir-structures-r4/pom.xml | 2 +- hapi-fhir-structures-r4b/pom.xml | 2 +- hapi-fhir-structures-r5/pom.xml | 2 +- hapi-fhir-test-utilities/pom.xml | 2 +- .../jpa/JpaModelScannerAndVerifier.java | 10 +++ hapi-fhir-testpage-overlay/pom.xml | 2 +- .../pom.xml | 2 +- hapi-fhir-validation-resources-dstu2/pom.xml | 2 +- hapi-fhir-validation-resources-dstu3/pom.xml | 2 +- hapi-fhir-validation-resources-r4/pom.xml | 2 +- hapi-fhir-validation-resources-r4b/pom.xml | 2 +- hapi-fhir-validation-resources-r5/pom.xml | 2 +- hapi-fhir-validation/pom.xml | 2 +- hapi-tinder-plugin/pom.xml | 2 +- .../uhn/fhir/tinder/ddl/GenerateDdlMojo.java | 6 +- hapi-tinder-test/pom.xml | 34 ++++++- .../src/test/java/test/JpaDdlTest.java | 73 +++++++++++++++ .../src/test/resources/logback-test.xml | 17 ++++ pom.xml | 88 +++++++++++-------- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- 122 files changed, 472 insertions(+), 179 deletions(-) create mode 100644 hapi-tinder-test/src/test/java/test/JpaDdlTest.java create mode 100644 hapi-tinder-test/src/test/resources/logback-test.xml diff --git a/hapi-deployable-pom/pom.xml b/hapi-deployable-pom/pom.xml index dbbe09aa117..1d11db11e80 100644 --- a/hapi-deployable-pom/pom.xml +++ b/hapi-deployable-pom/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-android/pom.xml b/hapi-fhir-android/pom.xml index 6bfe0cf3e7c..8d4dac888ef 100644 --- a/hapi-fhir-android/pom.xml +++ b/hapi-fhir-android/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-base/pom.xml b/hapi-fhir-base/pom.xml index 9597668366a..43df2e2b214 100644 --- a/hapi-fhir-base/pom.xml +++ b/hapi-fhir-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-bom/pom.xml b/hapi-fhir-bom/pom.xml index 4b6b79a4fe5..1eb93287a5e 100644 --- a/hapi-fhir-bom/pom.xml +++ b/hapi-fhir-bom/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ca.uhn.hapi.fhir hapi-fhir-bom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT pom HAPI FHIR BOM @@ -12,7 +12,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-checkstyle/pom.xml b/hapi-fhir-checkstyle/pom.xml index 1b59697b4a5..a3e43a48a50 100644 --- a/hapi-fhir-checkstyle/pom.xml +++ b/hapi-fhir-checkstyle/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml index 387f8001659..fab897561a8 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml +++ b/hapi-fhir-cli/hapi-fhir-cli-api/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml index 380a8e20269..99309197db0 100644 --- a/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml +++ b/hapi-fhir-cli/hapi-fhir-cli-app/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-fhir-cli - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-cli/pom.xml b/hapi-fhir-cli/pom.xml index 03ee337610b..9eb4b10c00a 100644 --- a/hapi-fhir-cli/pom.xml +++ b/hapi-fhir-cli/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-client-apache-http5/pom.xml b/hapi-fhir-client-apache-http5/pom.xml index 39c19fa461b..f38adc3014b 100644 --- a/hapi-fhir-client-apache-http5/pom.xml +++ b/hapi-fhir-client-apache-http5/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5GZipContentInterceptor.java b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5GZipContentInterceptor.java index 8a5e8ed9a4f..f64ab06503f 100644 --- a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5GZipContentInterceptor.java +++ b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5GZipContentInterceptor.java @@ -1,6 +1,6 @@ /* * #%L - * HAPI FHIR - Client Framework + * HAPI FHIR - Client Framework using Apache HttpClient 5 * %% * Copyright (C) 2014 - 2024 Smile CDR, Inc. * %% diff --git a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5ModifiedStringResponse.java b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5ModifiedStringResponse.java index cb11c80ca12..9d1f3593fd7 100644 --- a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5ModifiedStringResponse.java +++ b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5ModifiedStringResponse.java @@ -1,6 +1,6 @@ /* * #%L - * HAPI FHIR - Client Framework + * HAPI FHIR - Client Framework using Apache HttpClient 5 * %% * Copyright (C) 2014 - 2024 Smile CDR, Inc. * %% diff --git a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5Request.java b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5Request.java index a70be6c4c21..cc354c7616f 100644 --- a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5Request.java +++ b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5Request.java @@ -1,6 +1,6 @@ /* * #%L - * HAPI FHIR - Client Framework + * HAPI FHIR - Client Framework using Apache HttpClient 5 * %% * Copyright (C) 2014 - 2024 Smile CDR, Inc. * %% diff --git a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5ResourceEntity.java b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5ResourceEntity.java index a0e97607654..7290a522f27 100644 --- a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5ResourceEntity.java +++ b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5ResourceEntity.java @@ -1,6 +1,6 @@ /*- * #%L - * HAPI FHIR - Client Framework + * HAPI FHIR - Client Framework using Apache HttpClient 5 * %% * Copyright (C) 2014 - 2024 Smile CDR, Inc. * %% diff --git a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5Response.java b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5Response.java index a9b7aefabf1..b74229fe6b5 100644 --- a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5Response.java +++ b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5Response.java @@ -1,6 +1,6 @@ /* * #%L - * HAPI FHIR - Client Framework + * HAPI FHIR - Client Framework using Apache HttpClient 5 * %% * Copyright (C) 2014 - 2024 Smile CDR, Inc. * %% diff --git a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5RestfulClient.java b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5RestfulClient.java index d7ecd6f761c..8f947941fc2 100644 --- a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5RestfulClient.java +++ b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5RestfulClient.java @@ -1,6 +1,6 @@ /* * #%L - * HAPI FHIR - Client Framework + * HAPI FHIR - Client Framework using Apache HttpClient 5 * %% * Copyright (C) 2014 - 2024 Smile CDR, Inc. * %% diff --git a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5RestfulClientFactory.java b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5RestfulClientFactory.java index 979d0910169..ff1cd562c06 100644 --- a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5RestfulClientFactory.java +++ b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/apache/ApacheHttp5RestfulClientFactory.java @@ -1,6 +1,6 @@ /* * #%L - * HAPI FHIR - Client Framework + * HAPI FHIR - Client Framework using Apache HttpClient 5 * %% * Copyright (C) 2014 - 2024 Smile CDR, Inc. * %% diff --git a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/tls/ApacheHttp5TlsAuthenticationSvc.java b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/tls/ApacheHttp5TlsAuthenticationSvc.java index b791f8dd122..85ada4e8248 100644 --- a/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/tls/ApacheHttp5TlsAuthenticationSvc.java +++ b/hapi-fhir-client-apache-http5/src/main/java/ca/uhn/fhir/rest/client/tls/ApacheHttp5TlsAuthenticationSvc.java @@ -1,6 +1,6 @@ /*- * #%L - * HAPI FHIR - Client Framework + * HAPI FHIR - Client Framework using Apache HttpClient 5 * %% * Copyright (C) 2014 - 2024 Smile CDR, Inc. * %% diff --git a/hapi-fhir-client-okhttp/pom.xml b/hapi-fhir-client-okhttp/pom.xml index fbfeb9edb6f..88edde5fc22 100644 --- a/hapi-fhir-client-okhttp/pom.xml +++ b/hapi-fhir-client-okhttp/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-client/pom.xml b/hapi-fhir-client/pom.xml index 2fffea5d4e2..5d7c72e9da9 100644 --- a/hapi-fhir-client/pom.xml +++ b/hapi-fhir-client/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-converter/pom.xml b/hapi-fhir-converter/pom.xml index bc27d406e13..380ff4df5f6 100644 --- a/hapi-fhir-converter/pom.xml +++ b/hapi-fhir-converter/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-dist/pom.xml b/hapi-fhir-dist/pom.xml index f124b272cf2..8ffce201dd0 100644 --- a/hapi-fhir-dist/pom.xml +++ b/hapi-fhir-dist/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-docs/pom.xml b/hapi-fhir-docs/pom.xml index c63be183e63..d3be55b7927 100644 --- a/hapi-fhir-docs/pom.xml +++ b/hapi-fhir-docs/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/changes.yaml b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/changes.yaml index 0331ee9c487..fd1d5d2cd55 100644 --- a/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/changes.yaml +++ b/hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_8_0/changes.yaml @@ -5,4 +5,40 @@ (dependent HAPI modules listed in brackets): " diff --git a/hapi-fhir-jacoco/pom.xml b/hapi-fhir-jacoco/pom.xml index de77bc93e7e..278d5dcbc31 100644 --- a/hapi-fhir-jacoco/pom.xml +++ b/hapi-fhir-jacoco/pom.xml @@ -11,7 +11,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jaxrsserver-base/pom.xml b/hapi-fhir-jaxrsserver-base/pom.xml index febc05183c2..2767d9f7c6a 100644 --- a/hapi-fhir-jaxrsserver-base/pom.xml +++ b/hapi-fhir-jaxrsserver-base/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpa/pom.xml b/hapi-fhir-jpa/pom.xml index 6a119f23522..07e09a9d734 100644 --- a/hapi-fhir-jpa/pom.xml +++ b/hapi-fhir-jpa/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java index 6aec92f2e39..39f6c68bdd9 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirH2Dialect.java @@ -57,9 +57,31 @@ public class HapiFhirH2Dialect extends H2Dialect { * RES_VERSION varchar(7), * *

+ *

+ * Also note, as of Hibernate 6.6, Enum types are also used on some database platforms, + * creating a definition like: + * STAT enum ('CANCELLED','COMPLETED','ERRORED','FAILED','FINALIZE','IN_PROGRESS','QUEUED') not null. + * We also disable these by overriding getEnumTypeDeclaration. + *

*/ @Override public boolean supportsColumnCheck() { return false; } + + /** + * @see HapiFhirH2Dialect#supportsColumnCheck() for an explanation of why we disable this + */ + @Override + public String getEnumTypeDeclaration(Class> enumType) { + return null; + } + + /** + * @see HapiFhirH2Dialect#supportsColumnCheck() for an explanation of why we disable this + */ + @Override + public String getEnumTypeDeclaration(String name, String[] values) { + return null; + } } diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirMariaDBDialect.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirMariaDBDialect.java index 0ccefd915ff..c213c68da7c 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirMariaDBDialect.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirMariaDBDialect.java @@ -43,4 +43,20 @@ public class HapiFhirMariaDBDialect extends MariaDBDialect { public boolean supportsColumnCheck() { return false; } + + /** + * @see HapiFhirH2Dialect#supportsColumnCheck() for an explanation of why we disable this + */ + @Override + public String getEnumTypeDeclaration(Class> enumType) { + return null; + } + + /** + * @see HapiFhirH2Dialect#supportsColumnCheck() for an explanation of why we disable this + */ + @Override + public String getEnumTypeDeclaration(String name, String[] values) { + return null; + } } diff --git a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirMySQLDialect.java b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirMySQLDialect.java index 206eb4f81cf..f8ddd481913 100644 --- a/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirMySQLDialect.java +++ b/hapi-fhir-jpa/src/main/java/ca/uhn/fhir/jpa/model/dialect/HapiFhirMySQLDialect.java @@ -43,4 +43,20 @@ public class HapiFhirMySQLDialect extends MySQLDialect { public boolean supportsColumnCheck() { return false; } + + // /** + // * @see HapiFhirH2Dialect#supportsColumnCheck() for an explanation of why we disable this + // */ + // @Override + // public String getEnumTypeDeclaration(Class> enumType) { + // return null; + // } + // + /** + * @see HapiFhirH2Dialect#supportsColumnCheck() for an explanation of why we disable this + */ + @Override + public String getEnumTypeDeclaration(String name, String[] values) { + return "VARCHAR(99)"; + } } diff --git a/hapi-fhir-jpaserver-base/pom.xml b/hapi-fhir-jpaserver-base/pom.xml index b6ff7e6b452..968dccbd64b 100644 --- a/hapi-fhir-jpaserver-base/pom.xml +++ b/hapi-fhir-jpaserver-base/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupport.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupport.java index 61230093b92..271cc51cdcc 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupport.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaPersistedResourceValidationSupport.java @@ -236,7 +236,8 @@ public class JpaPersistedResourceValidationSupport implements IValidationSupport SearchParameterMap params = new SearchParameterMap(); params.setLoadSynchronousUpTo(1); int versionSeparator = theUri.lastIndexOf('|'); - if (versionSeparator != -1) {params.add(StructureDefinition.SP_VERSION, new TokenParam(theUri.substring(versionSeparator + 1))); + if (versionSeparator != -1) { + params.add(StructureDefinition.SP_VERSION, new TokenParam(theUri.substring(versionSeparator + 1))); params.add(StructureDefinition.SP_URL, new UriParam(theUri.substring(0, versionSeparator))); } else { params.add(StructureDefinition.SP_URL, new UriParam(theUri)); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java index 3576e9b7908..0aee74c4411 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/search/PathContext.java @@ -20,9 +20,11 @@ package ca.uhn.fhir.jpa.dao.search; import jakarta.annotation.Nonnull; +import org.hibernate.search.engine.search.common.NamedValues; import org.hibernate.search.engine.search.predicate.SearchPredicate; import org.hibernate.search.engine.search.predicate.dsl.BooleanPredicateClausesStep; import org.hibernate.search.engine.search.predicate.dsl.ExistsPredicateFieldStep; +import org.hibernate.search.engine.search.predicate.dsl.KnnPredicateFieldStep; import org.hibernate.search.engine.search.predicate.dsl.MatchAllPredicateOptionsStep; import org.hibernate.search.engine.search.predicate.dsl.MatchIdPredicateMatchingStep; import org.hibernate.search.engine.search.predicate.dsl.MatchNonePredicateFinalStep; @@ -34,6 +36,8 @@ import org.hibernate.search.engine.search.predicate.dsl.NestedPredicateOptionsSt import org.hibernate.search.engine.search.predicate.dsl.NotPredicateFinalStep; import org.hibernate.search.engine.search.predicate.dsl.PhrasePredicateFieldStep; import org.hibernate.search.engine.search.predicate.dsl.PredicateFinalStep; +import org.hibernate.search.engine.search.predicate.dsl.PrefixPredicateFieldStep; +import org.hibernate.search.engine.search.predicate.dsl.QueryStringPredicateFieldStep; import org.hibernate.search.engine.search.predicate.dsl.RangePredicateFieldStep; import org.hibernate.search.engine.search.predicate.dsl.RegexpPredicateFieldStep; import org.hibernate.search.engine.search.predicate.dsl.SearchPredicateFactory; @@ -221,6 +225,11 @@ class PathContext implements SearchPredicateFactory { return myPredicateFactory.wildcard(); } + @Override + public PrefixPredicateFieldStep prefix() { + return myPredicateFactory.prefix(); + } + @Override public RegexpPredicateFieldStep regexp() { return myPredicateFactory.regexp(); @@ -246,6 +255,11 @@ class PathContext implements SearchPredicateFactory { return myPredicateFactory.simpleQueryString(); } + @Override + public QueryStringPredicateFieldStep queryString() { + return myPredicateFactory.queryString(); + } + @Override public ExistsPredicateFieldStep exists() { return myPredicateFactory.exists(); @@ -262,6 +276,16 @@ class PathContext implements SearchPredicateFactory { return myPredicateFactory.named(path); } + @Override + public KnnPredicateFieldStep knn(int i) { + return myPredicateFactory.knn(i); + } + + @Override + public PredicateFinalStep withParameters(Function function) { + return myPredicateFactory.withParameters(function); + } + @Override public T extension(SearchPredicateFactoryExtension extension) { return myPredicateFactory.extension(extension); diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2JobInstanceEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2JobInstanceEntity.java index 3da31581d26..a2e001e8262 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2JobInstanceEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2JobInstanceEntity.java @@ -37,6 +37,8 @@ import jakarta.persistence.Version; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.Length; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import java.io.Serializable; import java.util.Date; @@ -88,6 +90,7 @@ public class Batch2JobInstanceEntity implements Serializable { @Column(name = "STAT", length = STATUS_MAX_LENGTH, nullable = false) @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) private StatusEnum myStatus; @Column(name = "JOB_CANCELLED", nullable = false) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkEntity.java index 26bccd58bf9..fb481d0302e 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkEntity.java @@ -40,6 +40,8 @@ import jakarta.persistence.Version; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.Length; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import java.io.Serializable; import java.util.Date; @@ -107,6 +109,7 @@ public class Batch2WorkChunkEntity implements Serializable { @Column(name = "STAT", length = STATUS_MAX_LENGTH, nullable = false) @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) private WorkChunkStatusEnum myStatus; @ManyToOne(fetch = FetchType.LAZY) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkMetadataView.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkMetadataView.java index b334e0c7c50..3a6628a129a 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkMetadataView.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Batch2WorkChunkMetadataView.java @@ -27,7 +27,9 @@ import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; import jakarta.persistence.Id; import org.hibernate.annotations.Immutable; +import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.annotations.Subselect; +import org.hibernate.type.SqlTypes; import java.io.Serializable; @@ -58,6 +60,7 @@ public class Batch2WorkChunkMetadataView implements Serializable { @Column(name = "STATE", length = ID_MAX_LENGTH, nullable = false) @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) private WorkChunkStatusEnum myStatus; @Column(name = "INSTANCE_ID", length = ID_MAX_LENGTH, nullable = false) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobEntity.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobEntity.java index 25d877e3908..2041ae60bdf 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobEntity.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/BulkImportJobEntity.java @@ -35,6 +35,8 @@ import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; import jakarta.persistence.UniqueConstraint; import jakarta.persistence.Version; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import java.io.Serializable; import java.util.Date; @@ -64,6 +66,7 @@ public class BulkImportJobEntity implements Serializable { private String myJobDescription; @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) @Column(name = "JOB_STATUS", length = 10, nullable = false) private BulkImportJobStatusEnum myStatus; @@ -82,6 +85,7 @@ public class BulkImportJobEntity implements Serializable { private String myStatusMessage; @Column(name = "ROW_PROCESSING_MODE", length = 20, nullable = false, updatable = false) + @JdbcTypeCode(SqlTypes.VARCHAR) @Enumerated(EnumType.STRING) private JobFileRowProcessingModeEnum myRowProcessingMode; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java index 4237c56a14f..f3990158fb6 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/Search.java @@ -166,6 +166,7 @@ public class Search implements ICachedSearchDetails, Serializable { private SearchTypeEnum mySearchType; @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) @Column(name = "SEARCH_STATUS", nullable = false, length = 10) private SearchStatusEnum myStatus; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java index c38e02f0610..295eb2c9113 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermConceptMapGroupElementTarget.java @@ -38,6 +38,8 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import org.hl7.fhir.r4.model.Enumerations.ConceptMapEquivalence; import java.io.Serializable; @@ -77,6 +79,7 @@ public class TermConceptMapGroupElementTarget implements Serializable { private String myDisplay; @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) @Column(name = "TARGET_EQUIVALENCE", nullable = true, length = MAX_EQUIVALENCE_LENGTH) private ConceptMapEquivalence myEquivalence; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java index a967259e176..e6b926041f9 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/entity/TermValueSet.java @@ -45,6 +45,8 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import java.io.Serializable; import java.util.ArrayList; @@ -113,6 +115,7 @@ public class TermValueSet implements Serializable { private Long myTotalConceptDesignations; @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) @Column(name = "EXPANSION_STATUS", nullable = false, length = MAX_EXPANSION_STATUS_LENGTH) private TermValueSetPreExpansionStatusEnum myExpansionStatus; diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java index 1d08ddbc41d..cb34cc222ff 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/graphql/GraphQLProviderWithIntrospection.java @@ -33,6 +33,8 @@ import ca.uhn.fhir.util.StringUtil; import ca.uhn.fhir.util.VersionUtil; import com.google.gson.Gson; import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonSerializer; import graphql.ExecutionResult; import graphql.GraphQL; import graphql.language.InterfaceTypeDefinition; @@ -80,6 +82,7 @@ public class GraphQLProviderWithIntrospection extends GraphQLProvider { private final ISearchParamRegistry mySearchParamRegistry; private final VersionSpecificWorkerContextWrapper myContext; private final IDaoRegistry myDaoRegistry; + private final Gson myGson; /** * Constructor @@ -97,6 +100,11 @@ public class GraphQLProviderWithIntrospection extends GraphQLProvider { myContext = VersionSpecificWorkerContextWrapper.newVersionSpecificWorkerContextWrapper(theValidationSupport); myGenerator = new GraphQLSchemaGenerator(myContext, VersionUtil.getVersion()); + + GsonBuilder gsonBuilder = new GsonBuilder(); + gsonBuilder.registerTypeAdapter(Collections.emptyList().getClass(), (JsonSerializer) + (src, typeOfSrc, context) -> new JsonArray()); + myGson = gsonBuilder.create(); } @Override @@ -250,8 +258,7 @@ public class GraphQLProviderWithIntrospection extends GraphQLProvider { ExecutionResult executionResult = build.execute(theQueryBody); Map data = executionResult.toSpecification(); - Gson gson = new GsonBuilder().create(); - return gson.toJson(data); + return myGson.toJson(data); } @Nonnull diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/SearchQueryProperties.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/SearchQueryProperties.java index 4603eae831a..56c1a7ffb96 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/SearchQueryProperties.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/search/builder/models/SearchQueryProperties.java @@ -1,3 +1,22 @@ +/*- + * #%L + * HAPI FHIR JPA Server + * %% + * Copyright (C) 2014 - 2024 Smile CDR, Inc. + * %% + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * #L% + */ package ca.uhn.fhir.jpa.search.builder.models; import ca.uhn.fhir.jpa.api.config.JpaStorageSettings; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/GeneratedSchemaTest.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/GeneratedSchemaTest.java index 7cfe0cf42c5..57d1a8b6c53 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/GeneratedSchemaTest.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/entity/GeneratedSchemaTest.java @@ -1,8 +1,13 @@ package ca.uhn.fhir.jpa.entity; +import ca.uhn.fhir.batch2.model.WorkChunkStatusEnum; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; import ca.uhn.fhir.util.ClasspathUtil; import org.apache.commons.lang3.StringUtils; +import org.hibernate.search.mapper.pojo.common.annotation.Param; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import java.util.Arrays; @@ -26,7 +31,6 @@ public class GeneratedSchemaTest { validateLongVarcharDatatype("postgres.sql", "text"); validateLongVarcharDatatype("oracle.sql", "clob"); validateLongVarcharDatatype("sqlserver.sql", "varchar(max)"); - } private static void validateLongVarcharDatatype(String schemaName, String expectedDatatype) { diff --git a/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml b/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml index d74eb5c9052..92e9ef0a472 100644 --- a/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml +++ b/hapi-fhir-jpaserver-elastic-test-utilities/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-hfql/pom.xml b/hapi-fhir-jpaserver-hfql/pom.xml index d79120b3fa7..6b218c55977 100644 --- a/hapi-fhir-jpaserver-hfql/pom.xml +++ b/hapi-fhir-jpaserver-hfql/pom.xml @@ -3,7 +3,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-ips/pom.xml b/hapi-fhir-jpaserver-ips/pom.xml index 9dd41ed0a0f..d5fc4b533e7 100644 --- a/hapi-fhir-jpaserver-ips/pom.xml +++ b/hapi-fhir-jpaserver-ips/pom.xml @@ -3,7 +3,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-mdm/pom.xml b/hapi-fhir-jpaserver-mdm/pom.xml index fa0d8a1ecf4..fd9d80a4093 100644 --- a/hapi-fhir-jpaserver-mdm/pom.xml +++ b/hapi-fhir-jpaserver-mdm/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-model/pom.xml b/hapi-fhir-jpaserver-model/pom.xml index afda4a16ca2..803de6c2647 100644 --- a/hapi-fhir-jpaserver-model/pom.xml +++ b/hapi-fhir-jpaserver-model/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseHasResource.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseHasResource.java index aee59d74ff4..e34f5ad00fb 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseHasResource.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/BaseHasResource.java @@ -29,7 +29,9 @@ import jakarta.persistence.Enumerated; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.Temporal; import jakarta.persistence.TemporalType; +import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.annotations.OptimisticLock; +import org.hibernate.type.SqlTypes; import java.util.Collection; import java.util.Date; @@ -48,6 +50,7 @@ public abstract class BaseHasResource extends BasePartitionable @Column(name = "RES_VERSION", nullable = true, length = 7) @Enumerated(EnumType.STRING) @OptimisticLock(excluded = true) + @JdbcTypeCode(SqlTypes.VARCHAR) private FhirVersionEnum myFhirVersion; @Column(name = "HAS_TAGS", nullable = false) diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionEntity.java index 8763e355766..926d13d1892 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionEntity.java @@ -40,6 +40,8 @@ import jakarta.persistence.TemporalType; import jakarta.persistence.Version; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import java.util.Date; import java.util.List; @@ -107,6 +109,7 @@ public class NpmPackageVersionEntity { private String myFhirVersionId; @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) @Column(name = "FHIR_VERSION", length = NpmPackageVersionEntity.FHIR_VERSION_LENGTH, nullable = false) private FhirVersionEnum myFhirVersion; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionResourceEntity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionResourceEntity.java index 6b5584dad9d..36b6439f89f 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionResourceEntity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/NpmPackageVersionResourceEntity.java @@ -38,6 +38,8 @@ import jakarta.persistence.TemporalType; import jakarta.persistence.Version; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; import java.util.Date; @@ -89,6 +91,7 @@ public class NpmPackageVersionResourceEntity { private String myCanonicalVersion; @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) @Column(name = "FHIR_VERSION", length = NpmPackageVersionEntity.FHIR_VERSION_LENGTH, nullable = false) private FhirVersionEnum myFhirVersion; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java index e42c2d04e37..17919719429 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTable.java @@ -44,7 +44,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.Length; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.annotations.OptimisticLock; +import org.hibernate.type.SqlTypes; import java.io.Serializable; import java.util.ArrayList; @@ -115,6 +117,7 @@ public class ResourceHistoryTable extends BaseHasResource implements Serializabl @Column(name = "RES_ENCODING", nullable = false, length = ENCODING_COL_LENGTH) @Enumerated(EnumType.STRING) + @JdbcTypeCode(SqlTypes.VARCHAR) @OptimisticLock(excluded = true) private ResourceEncodingEnum myEncoding; diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java index ea6951b4981..5d73b971393 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceHistoryTag.java @@ -20,7 +20,6 @@ package ca.uhn.fhir.jpa.model.entity; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.ForeignKey; import jakarta.persistence.GeneratedValue; @@ -37,7 +36,6 @@ import org.hibernate.annotations.GenericGenerator; import java.io.Serializable; -@Embeddable @Entity @Table( name = "HFJ_HISTORY_TAG", diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java index 647490860ab..a0c210d1bef 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamCoords.java @@ -24,7 +24,6 @@ import ca.uhn.fhir.jpa.model.listener.IndexStorageOptimizationListener; import ca.uhn.fhir.model.api.IQueryParameterType; import jakarta.annotation.Nullable; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.FetchType; @@ -42,7 +41,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.hibernate.annotations.GenericGenerator; -@Embeddable @EntityListeners(IndexStorageOptimizationListener.class) @Entity @Table( diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java index 3a98bc66dfe..ed6de776b5f 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamDate.java @@ -28,7 +28,6 @@ import ca.uhn.fhir.rest.param.DateParam; import ca.uhn.fhir.rest.param.DateRangeParam; import ca.uhn.fhir.util.DateUtils; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.FetchType; @@ -56,7 +55,6 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; -@Embeddable @EntityListeners(IndexStorageOptimizationListener.class) @Entity @Table( diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java index 393ab64d60e..8a6a8417d0b 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamNumber.java @@ -24,7 +24,6 @@ import ca.uhn.fhir.jpa.model.listener.IndexStorageOptimizationListener; import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.rest.param.NumberParam; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.FetchType; @@ -48,7 +47,6 @@ import org.hibernate.type.SqlTypes; import java.math.BigDecimal; import java.util.Objects; -@Embeddable @EntityListeners(IndexStorageOptimizationListener.class) @Entity @Table( diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java index 02129a99600..4ec11e41f3c 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantity.java @@ -24,7 +24,6 @@ import ca.uhn.fhir.jpa.model.listener.IndexStorageOptimizationListener; import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.rest.param.QuantityParam; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.FetchType; @@ -50,7 +49,6 @@ import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isBlank; // @formatter:off -@Embeddable @EntityListeners(IndexStorageOptimizationListener.class) @Entity @Table( diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java index 86ec8a7d9bd..8666cff8171 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamQuantityNormalized.java @@ -25,7 +25,6 @@ import ca.uhn.fhir.jpa.model.util.UcumServiceUtil; import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.rest.param.QuantityParam; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.FetchType; @@ -52,7 +51,6 @@ import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.isBlank; // @formatter:off -@Embeddable @EntityListeners(IndexStorageOptimizationListener.class) @Entity @Table( diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java index 5d5466291c6..c1e5240bf8b 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamString.java @@ -27,7 +27,6 @@ import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.rest.param.StringParam; import ca.uhn.fhir.util.StringUtil; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.ForeignKey; @@ -48,7 +47,6 @@ import static ca.uhn.fhir.jpa.model.util.SearchParamHash.hashSearchParam; import static org.apache.commons.lang3.StringUtils.defaultString; // @formatter:off -@Embeddable @EntityListeners(IndexStorageOptimizationListener.class) @Entity @Table( diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java index 50cd671dcb4..3f93d696974 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamToken.java @@ -26,7 +26,6 @@ import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.rest.api.Constants; import ca.uhn.fhir.rest.param.TokenParam; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.FetchType; @@ -52,7 +51,6 @@ import static ca.uhn.fhir.jpa.model.util.SearchParamHash.hashSearchParam; import static org.apache.commons.lang3.StringUtils.defaultString; import static org.apache.commons.lang3.StringUtils.trim; -@Embeddable @EntityListeners(IndexStorageOptimizationListener.class) @Entity @Table( diff --git a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java index 0db8b2ad2b3..95329046bc8 100644 --- a/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java +++ b/hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/entity/ResourceIndexedSearchParamUri.java @@ -25,7 +25,6 @@ import ca.uhn.fhir.jpa.model.listener.IndexStorageOptimizationListener; import ca.uhn.fhir.model.api.IQueryParameterType; import ca.uhn.fhir.rest.param.UriParam; import jakarta.persistence.Column; -import jakarta.persistence.Embeddable; import jakarta.persistence.Entity; import jakarta.persistence.EntityListeners; import jakarta.persistence.FetchType; @@ -47,7 +46,6 @@ import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextFi import static ca.uhn.fhir.jpa.model.util.SearchParamHash.hashSearchParam; import static org.apache.commons.lang3.StringUtils.defaultString; -@Embeddable @EntityListeners(IndexStorageOptimizationListener.class) @Entity @Table( diff --git a/hapi-fhir-jpaserver-searchparam/pom.xml b/hapi-fhir-jpaserver-searchparam/pom.xml index c0883916010..ae660effed3 100755 --- a/hapi-fhir-jpaserver-searchparam/pom.xml +++ b/hapi-fhir-jpaserver-searchparam/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-subscription/pom.xml b/hapi-fhir-jpaserver-subscription/pom.xml index 74ccf5287ff..8786b761128 100644 --- a/hapi-fhir-jpaserver-subscription/pom.xml +++ b/hapi-fhir-jpaserver-subscription/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-test-dstu2/pom.xml b/hapi-fhir-jpaserver-test-dstu2/pom.xml index 03486eb39f5..012fcebea85 100644 --- a/hapi-fhir-jpaserver-test-dstu2/pom.xml +++ b/hapi-fhir-jpaserver-test-dstu2/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-test-dstu3/pom.xml b/hapi-fhir-jpaserver-test-dstu3/pom.xml index 69c28f804b8..32c32ebb399 100644 --- a/hapi-fhir-jpaserver-test-dstu3/pom.xml +++ b/hapi-fhir-jpaserver-test-dstu3/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-test-r4/pom.xml b/hapi-fhir-jpaserver-test-r4/pom.xml index 12abe082ac2..85b5fd7ae27 100644 --- a/hapi-fhir-jpaserver-test-r4/pom.xml +++ b/hapi-fhir-jpaserver-test-r4/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4QueryCountTest.java b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4QueryCountTest.java index 042f8c40640..154bb13ba30 100644 --- a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4QueryCountTest.java +++ b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/dao/r4/FhirResourceDaoR4QueryCountTest.java @@ -678,7 +678,7 @@ public class FhirResourceDaoR4QueryCountTest extends BaseResourceProviderR4Test fail(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(e.getOperationOutcome())); } myCaptureQueriesListener.logSelectQueriesForCurrentThread(); - assertEquals(12, myCaptureQueriesListener.getSelectQueriesForCurrentThread().size()); + assertEquals(11, myCaptureQueriesListener.getSelectQueriesForCurrentThread().size()); assertEquals(0, myCaptureQueriesListener.getUpdateQueriesForCurrentThread().size()); assertEquals(0, myCaptureQueriesListener.getInsertQueriesForCurrentThread().size()); assertEquals(0, myCaptureQueriesListener.getDeleteQueriesForCurrentThread().size()); @@ -3532,7 +3532,7 @@ public class FhirResourceDaoR4QueryCountTest extends BaseResourceProviderR4Test assertThat(expansion.getExpansion().getContains()).hasSize(7); assertThat(expansion.getExpansion().getContains().stream().filter(t -> t.getCode().equals("A")).findFirst().orElseThrow(() -> new IllegalArgumentException()).getDesignation()).hasSize(1); myCaptureQueriesListener.logSelectQueriesForCurrentThread(); - assertThat(myCaptureQueriesListener.countSelectQueries()).as(() -> "\n *" + myCaptureQueriesListener.getSelectQueries().stream().map(t -> t.getSql(true, false)).collect(Collectors.joining("\n * "))).isEqualTo(6); + assertThat(myCaptureQueriesListener.countSelectQueries()).as(() -> "\n *" + myCaptureQueriesListener.getSelectQueries().stream().map(t -> t.getSql(true, false)).collect(Collectors.joining("\n * "))).isEqualTo(5); assertEquals(0, myCaptureQueriesListener.countDeleteQueries()); assertEquals(0, myCaptureQueriesListener.countUpdateQueries()); assertEquals(0, myCaptureQueriesListener.countInsertQueries()); @@ -3575,7 +3575,7 @@ public class FhirResourceDaoR4QueryCountTest extends BaseResourceProviderR4Test assertThat(expansion.getExpansion().getContains()).hasSize(7); assertThat(expansion.getExpansion().getContains().stream().filter(t -> t.getCode().equals("A")).findFirst().orElseThrow(() -> new IllegalArgumentException()).getDesignation()).hasSize(1); myCaptureQueriesListener.logSelectQueriesForCurrentThread(); - assertEquals(6, myCaptureQueriesListener.countSelectQueries()); + assertEquals(5, myCaptureQueriesListener.countSelectQueries()); assertEquals(0, myCaptureQueriesListener.countDeleteQueries()); assertEquals(0, myCaptureQueriesListener.countUpdateQueries()); assertEquals(0, myCaptureQueriesListener.countInsertQueries()); diff --git a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetNoVerCSNoVerTest.java b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetNoVerCSNoVerTest.java index b398a191a17..d79791af9ef 100644 --- a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetNoVerCSNoVerTest.java +++ b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/provider/r4/ResourceProviderR4ValueSetNoVerCSNoVerTest.java @@ -1072,7 +1072,7 @@ public class ResourceProviderR4ValueSetNoVerCSNoVerTest extends BaseResourceProv myCaptureQueriesListener.logSelectQueries(); ourLog.debug(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(expansion)); assertThat(toDirectCodes(expansion.getExpansion().getContains())).containsExactlyInAnyOrder("A", "AA", "AB", "AAA"); - assertThat(myCaptureQueriesListener.getSelectQueries().size()).as(() -> myCaptureQueriesListener.logSelectQueries().stream().map(t -> t.getSql(true, false)).collect(Collectors.joining("\n * "))).isEqualTo(18); + assertThat(myCaptureQueriesListener.getSelectQueries().size()).as(() -> myCaptureQueriesListener.logSelectQueries().stream().map(t -> t.getSql(true, false)).collect(Collectors.joining("\n * "))).isEqualTo(16); assertEquals("ValueSet \"ValueSet.url[http://example.com/my_value_set]\" has not yet been pre-expanded. Performing in-memory expansion without parameters. Current status: NOT_EXPANDED | The ValueSet is waiting to be picked up and pre-expanded by a scheduled task.", expansion.getMeta().getExtensionString(EXT_VALUESET_EXPANSION_MESSAGE)); // Hierarchical @@ -1089,7 +1089,7 @@ public class ResourceProviderR4ValueSetNoVerCSNoVerTest extends BaseResourceProv assertThat(toDirectCodes(expansion.getExpansion().getContains())).containsExactlyInAnyOrder("A"); assertThat(toDirectCodes(expansion.getExpansion().getContains().get(0).getContains())).containsExactlyInAnyOrder("AA", "AB"); assertThat(toDirectCodes(expansion.getExpansion().getContains().get(0).getContains().stream().filter(t -> t.getCode().equals("AA")).findFirst().orElseThrow(() -> new IllegalArgumentException()).getContains())).containsExactlyInAnyOrder("AAA"); - assertThat(myCaptureQueriesListener.getSelectQueries()).hasSize(15); + assertThat(myCaptureQueriesListener.getSelectQueries()).hasSize(13); } @@ -1112,7 +1112,7 @@ public class ResourceProviderR4ValueSetNoVerCSNoVerTest extends BaseResourceProv .execute(); ourLog.debug(myFhirContext.newJsonParser().setPrettyPrint(true).encodeResourceToString(expansion)); assertThat(toDirectCodes(expansion.getExpansion().getContains())).containsExactlyInAnyOrder("A", "AA", "AB", "AAA"); - assertThat(myCaptureQueriesListener.getSelectQueries().size()).as(() -> myCaptureQueriesListener.logSelectQueries().stream().map(t -> t.getSql(true, false)).collect(Collectors.joining("\n * "))).isEqualTo(12); + assertThat(myCaptureQueriesListener.getSelectQueries().size()).as(() -> myCaptureQueriesListener.logSelectQueries().stream().map(t -> t.getSql(true, false)).collect(Collectors.joining("\n * "))).isEqualTo(10); assertEquals("ValueSet with URL \"Unidentified ValueSet\" was expanded using an in-memory expansion", expansion.getMeta().getExtensionString(EXT_VALUESET_EXPANSION_MESSAGE)); // Hierarchical @@ -1129,7 +1129,7 @@ public class ResourceProviderR4ValueSetNoVerCSNoVerTest extends BaseResourceProv assertThat(toDirectCodes(expansion.getExpansion().getContains())).containsExactlyInAnyOrder("A"); assertThat(toDirectCodes(expansion.getExpansion().getContains().get(0).getContains())).containsExactlyInAnyOrder("AA", "AB"); assertThat(toDirectCodes(expansion.getExpansion().getContains().get(0).getContains().stream().filter(t -> t.getCode().equals("AA")).findFirst().orElseThrow(() -> new IllegalArgumentException()).getContains())).containsExactlyInAnyOrder("AAA"); - assertThat(myCaptureQueriesListener.getSelectQueries()).hasSize(13); + assertThat(myCaptureQueriesListener.getSelectQueries()).hasSize(11); } diff --git a/hapi-fhir-jpaserver-test-r4b/pom.xml b/hapi-fhir-jpaserver-test-r4b/pom.xml index 406f281d036..6346b8cac83 100644 --- a/hapi-fhir-jpaserver-test-r4b/pom.xml +++ b/hapi-fhir-jpaserver-test-r4b/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-test-r5/pom.xml b/hapi-fhir-jpaserver-test-r5/pom.xml index 1e3a2468961..bbb7ccef96f 100644 --- a/hapi-fhir-jpaserver-test-r5/pom.xml +++ b/hapi-fhir-jpaserver-test-r5/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/dbpartitionmode/TestDefinitions.java b/hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/dbpartitionmode/TestDefinitions.java index 983d7966201..6f846c9d567 100644 --- a/hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/dbpartitionmode/TestDefinitions.java +++ b/hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/dbpartitionmode/TestDefinitions.java @@ -318,18 +318,18 @@ abstract class TestDefinitions implements ITestDataBuilder { // Verify Delete myCaptureQueriesListener.logDeleteQueries(); String deleteWhere; - assertEquals("delete from HFJ_RES_SEARCH_URL where (RES_ID='" + idLong + "')", getDeleteSql(0)); + assertEquals("delete from HFJ_RES_SEARCH_URL rsue1_0 where (rsue1_0.RES_ID='" + idLong + "')", getDeleteSql(0)); if (myIncludePartitionIdsInPks) { - deleteWhere = "(RES_ID,PARTITION_ID)=('" + idLong + "','1')"; + deleteWhere = "(risps1_0.RES_ID,risps1_0.PARTITION_ID)=('" + idLong + "','1')"; } else { - deleteWhere = "RES_ID='" + idLong + "'"; + deleteWhere = "risps1_0.RES_ID='" + idLong + "'"; } - assertEquals("delete from HFJ_SPIDX_STRING where " + deleteWhere, getDeleteSql(1)); - assertEquals("delete from HFJ_SPIDX_TOKEN where " + deleteWhere, getDeleteSql(2)); + assertEquals("delete from HFJ_SPIDX_STRING risps1_0 where " + deleteWhere, getDeleteSql(1)); + assertEquals("delete from HFJ_SPIDX_TOKEN rispt1_0 where " + deleteWhere.replace("risps1_0", "rispt1_0"), getDeleteSql(2)); if (myIncludePartitionIdsInPks) { - assertEquals("delete from HFJ_RES_LINK where (SRC_RESOURCE_ID,PARTITION_ID)=('" + idLong + "','1')", getDeleteSql(3)); + assertEquals("delete from HFJ_RES_LINK rl1_0 where (rl1_0.SRC_RESOURCE_ID,rl1_0.PARTITION_ID)=('" + idLong + "','1')", getDeleteSql(3)); } else { - assertEquals("delete from HFJ_RES_LINK where SRC_RESOURCE_ID='" + idLong + "'", getDeleteSql(3)); + assertEquals("delete from HFJ_RES_LINK rl1_0 where rl1_0.SRC_RESOURCE_ID='" + idLong + "'", getDeleteSql(3)); } assertEquals(4, myCaptureQueriesListener.countDeleteQueries()); } @@ -499,9 +499,9 @@ abstract class TestDefinitions implements ITestDataBuilder { // Delete HFJ_SPIDX_TOKEN List deleteTokenQueries = getSqlDeleteQueriesWithString(" HFJ_SPIDX_TOKEN "); if (myIncludePartitionIdsInPks) { - assertThat(deleteTokenQueries.get(0).getSql(true, false)).startsWith("delete from HFJ_SPIDX_TOKEN where (SP_ID,PARTITION_ID) in "); + assertThat(deleteTokenQueries.get(0).getSql(true, false)).startsWith("delete from HFJ_SPIDX_TOKEN rispt1_0 where (rispt1_0.SP_ID,rispt1_0.PARTITION_ID) in "); } else { - assertThat(deleteTokenQueries.get(0).getSql(true, false)).startsWith("delete from HFJ_SPIDX_TOKEN where SP_ID in "); + assertThat(deleteTokenQueries.get(0).getSql(true, false)).startsWith("delete from HFJ_SPIDX_TOKEN rispt1_0 where rispt1_0.SP_ID in "); } assertEquals(1, deleteTokenQueries.size(), ()-> "SQL:\n * " + deleteTokenQueries.stream().map(t->t.getSql(true, false)).collect(Collectors.joining("\n * "))); @@ -519,9 +519,9 @@ abstract class TestDefinitions implements ITestDataBuilder { // Select HFJ_RES_VER List deleteResVerQueries = getSqlDeleteQueriesWithString(" HFJ_RES_VER "); if (myIncludePartitionIdsInPks) { - assertThat(deleteResVerQueries.get(0).getSql(true, false)).startsWith("delete from HFJ_RES_VER where (PARTITION_ID,PID) in "); + assertThat(deleteResVerQueries.get(0).getSql(true, false)).startsWith("delete from HFJ_RES_VER rht1_0 where (rht1_0.PARTITION_ID,rht1_0.PID) in "); } else { - assertThat(deleteResVerQueries.get(0).getSql(true, false)).startsWith("delete from HFJ_RES_VER where PID in "); + assertThat(deleteResVerQueries.get(0).getSql(true, false)).startsWith("delete from HFJ_RES_VER rht1_0 where rht1_0.PID in "); } assertEquals(1, deleteResVerQueries.size()); } diff --git a/hapi-fhir-jpaserver-test-utilities/pom.xml b/hapi-fhir-jpaserver-test-utilities/pom.xml index a74e661071c..df8458955b2 100644 --- a/hapi-fhir-jpaserver-test-utilities/pom.xml +++ b/hapi-fhir-jpaserver-test-utilities/pom.xml @@ -6,7 +6,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml index f7a942f6a20..28dad2b99a5 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml +++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-server-cds-hooks/pom.xml b/hapi-fhir-server-cds-hooks/pom.xml index 06293270da3..8433325091e 100644 --- a/hapi-fhir-server-cds-hooks/pom.xml +++ b/hapi-fhir-server-cds-hooks/pom.xml @@ -7,7 +7,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-server-mdm/pom.xml b/hapi-fhir-server-mdm/pom.xml index 82ad7017129..100c95c4456 100644 --- a/hapi-fhir-server-mdm/pom.xml +++ b/hapi-fhir-server-mdm/pom.xml @@ -7,7 +7,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-server-openapi/pom.xml b/hapi-fhir-server-openapi/pom.xml index c68d99561a7..a19f14009c6 100644 --- a/hapi-fhir-server-openapi/pom.xml +++ b/hapi-fhir-server-openapi/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-server/pom.xml b/hapi-fhir-server/pom.xml index 68c91a03f6d..420f6e8c201 100644 --- a/hapi-fhir-server/pom.xml +++ b/hapi-fhir-server/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-deployable-pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/pom.xml b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/pom.xml index 2361d2736c9..b2ea7a0426e 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/pom.xml +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/pom.xml @@ -7,7 +7,7 @@ hapi-fhir-serviceloaders ca.uhn.hapi.fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/pom.xml b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/pom.xml index f7c377f0507..5266813fde1 100644 --- a/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/pom.xml +++ b/hapi-fhir-serviceloaders/hapi-fhir-caching-caffeine/pom.xml @@ -7,7 +7,7 @@ hapi-fhir-serviceloaders ca.uhn.hapi.fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml @@ -21,7 +21,7 @@ ca.uhn.hapi.fhir hapi-fhir-caching-api - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml index 9a2c581e2ae..42d04c0dba6 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.7.11-SNAPSHOT + 7.7.12-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 e247d78f78e..1ea7bba5ba5 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../../pom.xml diff --git a/hapi-fhir-serviceloaders/pom.xml b/hapi-fhir-serviceloaders/pom.xml index 336ae1cb4e7..1b44fea207d 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.7.11-SNAPSHOT + 7.7.12-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 5f737aff16d..831176729ec 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.7.11-SNAPSHOT + 7.7.12-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 0f9869f7b2f..4979bf31eee 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.7.11-SNAPSHOT + 7.7.12-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 140f3ffe355..cb8367a1cb4 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.7.11-SNAPSHOT + 7.7.12-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 8cb6f9830c0..f1ebbfe4206 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.7.11-SNAPSHOT + 7.7.12-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 12f3d784e94..09fbd8614b0 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.7.11-SNAPSHOT + 7.7.12-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 7fef901a3e9..88d653f661d 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-spring-boot/pom.xml b/hapi-fhir-spring-boot/pom.xml index 17701a0482d..8a0b28f1947 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-sql-migrate/pom.xml b/hapi-fhir-sql-migrate/pom.xml index a4e121d74fb..acca02156a7 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml @@ -54,13 +54,13 @@ org.apache.derby derby test - 10.16.1.1 + 10.17.1.0 org.apache.derby derbytools test - 10.16.1.1 + 10.17.1.0 org.postgresql @@ -80,13 +80,6 @@ logback-classic test - - - ca.uhn.hapi.fhir - hapi-fhir-test-utilities - ${project.version} - test - org.testcontainers junit-jupiter @@ -131,7 +124,6 @@ - ca.uhn.hapi.fhir hapi-fhir-test-utilities diff --git a/hapi-fhir-storage-batch2-jobs/pom.xml b/hapi-fhir-storage-batch2-jobs/pom.xml index 761328c2f9b..821ae1ade61 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.7.11-SNAPSHOT + 7.7.12-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 1cefdf95c27..03237d275b6 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-storage-batch2/pom.xml b/hapi-fhir-storage-batch2/pom.xml index b83a2f09821..d25d7eb087d 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-storage-cr/pom.xml b/hapi-fhir-storage-cr/pom.xml index dd650dffc13..30bf9c7631e 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-storage-mdm/pom.xml b/hapi-fhir-storage-mdm/pom.xml index 18f908895fe..7fc3f054ca3 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.7.11-SNAPSHOT + 7.7.12-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 a533069e246..41eb4d4cb37 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-storage/pom.xml b/hapi-fhir-storage/pom.xml index d47cb711680..eb4b180e7a0 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-dstu2.1/pom.xml b/hapi-fhir-structures-dstu2.1/pom.xml index 87b9885ee56..5d7b84d9166 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml index 76e17d42c70..0e9b15d163c 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-dstu3/pom.xml b/hapi-fhir-structures-dstu3/pom.xml index ba35a826e76..c5746e3c44c 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.7.11-SNAPSHOT + 7.7.12-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 1830811ddce..c943eced69f 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-r4/pom.xml b/hapi-fhir-structures-r4/pom.xml index df3c39aa8d8..18f8947f121 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-r4b/pom.xml b/hapi-fhir-structures-r4b/pom.xml index c0b5a24feac..4f566773c50 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-structures-r5/pom.xml b/hapi-fhir-structures-r5/pom.xml index fa421e57b87..2ae8c634a99 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml index d2ed45958d2..ba0f6dd23f6 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/jpa/JpaModelScannerAndVerifier.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/jpa/JpaModelScannerAndVerifier.java index a9f4e2588aa..91fc8bff9a1 100644 --- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/jpa/JpaModelScannerAndVerifier.java +++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/jpa/JpaModelScannerAndVerifier.java @@ -34,6 +34,7 @@ import jakarta.persistence.Embeddable; import jakarta.persistence.Embedded; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; +import jakarta.persistence.Enumerated; import jakarta.persistence.ForeignKey; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -52,6 +53,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.hibernate.annotations.GenericGenerator; +import org.hibernate.annotations.JdbcTypeCode; import org.hibernate.annotations.Subselect; import org.hibernate.validator.constraints.Length; @@ -393,6 +395,14 @@ public class JpaModelScannerAndVerifier { } + Enumerated enumerated = theAnnotatedElement.getAnnotation(Enumerated.class); + if (enumerated != null) { + JdbcTypeCode jdbcTypeCode = theAnnotatedElement.getAnnotation(JdbcTypeCode.class); + if (jdbcTypeCode == null) { + throw new IllegalStateException(Msg.code(2591) + "Field " + theAnnotatedElement + " has @Enumerated but not @JdbcTypeCode (must declare either VARCHAR or a numeric type to avoid the database using native enums)"); + } + } + } private void validateColumnName(String theColumnName, AnnotatedElement theElement) { diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml index 07653aabdc7..4bbf45129fa 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-fhir-validation-resources-dstu2.1/pom.xml b/hapi-fhir-validation-resources-dstu2.1/pom.xml index c4a1f60afaf..ca4059aaa31 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.7.11-SNAPSHOT + 7.7.12-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 920f29439e7..064225caa85 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.7.11-SNAPSHOT + 7.7.12-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 213fd05f74b..49758416c31 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.7.11-SNAPSHOT + 7.7.12-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 3026e37df06..f0758bf8574 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.7.11-SNAPSHOT + 7.7.12-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 e65e3ffb2a3..386922144d3 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.7.11-SNAPSHOT + 7.7.12-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 c6b06f8a338..fc459c91179 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml index 4b5fdd2262b..92d2e60b49f 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../hapi-deployable-pom/pom.xml diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml index bde3eb1d0b4..ed97670654c 100644 --- a/hapi-tinder-plugin/pom.xml +++ b/hapi-tinder-plugin/pom.xml @@ -5,7 +5,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml diff --git a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ddl/GenerateDdlMojo.java b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ddl/GenerateDdlMojo.java index 7b0c99b0ddf..f587092cf3d 100644 --- a/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ddl/GenerateDdlMojo.java +++ b/hapi-tinder-plugin/src/main/java/ca/uhn/fhir/tinder/ddl/GenerateDdlMojo.java @@ -28,13 +28,13 @@ public class GenerateDdlMojo extends AbstractMojo { private static final Logger ourLog = LoggerFactory.getLogger(GenerateDdlMojo.class); @Parameter - List packageNames; + public List packageNames; @Parameter - List dialects; + public List dialects; @Parameter - String outputDirectory; + public String outputDirectory; @Parameter(defaultValue = "false") boolean skip; diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml index eb0051cc011..d23e4b65b07 100644 --- a/hapi-tinder-test/pom.xml +++ b/hapi-tinder-test/pom.xml @@ -4,7 +4,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../pom.xml @@ -58,7 +58,39 @@ hapi-fhir-validation-resources-dstu3 ${project.version} + + ca.uhn.hapi.fhir + hapi-fhir-jpaserver-base + ${project.version} + + + org.apache.maven + maven-plugin-api + test + + + org.apache.maven.plugin-tools + maven-plugin-annotations + test + + + ca.uhn.hapi.fhir + hapi-tinder-plugin + ${project.version} + test + + + ca.uhn.hapi.fhir + hapi-fhir-storage-batch2 + ${project.version} + test + + + ch.qos.logback + logback-classic + test + diff --git a/hapi-tinder-test/src/test/java/test/JpaDdlTest.java b/hapi-tinder-test/src/test/java/test/JpaDdlTest.java new file mode 100644 index 00000000000..26e0f0697ae --- /dev/null +++ b/hapi-tinder-test/src/test/java/test/JpaDdlTest.java @@ -0,0 +1,73 @@ +package test; + +import ca.uhn.fhir.batch2.model.WorkChunkStatusEnum; +import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect; +import ca.uhn.fhir.tinder.ddl.GenerateDdlMojo; +import jakarta.annotation.Nonnull; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +import java.io.FileReader; +import java.io.IOException; +import java.util.Arrays; +import java.util.List; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +public class JpaDdlTest { + + /** + * See {@link HapiFhirH2Dialect#supportsColumnCheck()} + */ + @ParameterizedTest + @CsvSource({ + "ca.uhn.fhir.jpa.model.dialect.HapiFhirDerbyDialect", + "ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect", + "ca.uhn.fhir.jpa.model.dialect.HapiFhirMariaDBDialect", + "ca.uhn.fhir.jpa.model.dialect.HapiFhirMySQLDialect", + "ca.uhn.fhir.jpa.model.dialect.HapiFhirSQLServerDialect", + "ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgresDialect", + "ca.uhn.fhir.jpa.model.dialect.HapiFhirOracleDialect", + "ca.uhn.fhir.jpa.model.dialect.HapiFhirCockroachDialect", + }) + public void testNoEnums(String theDialectName) throws Exception { + // Setup + GenerateDdlMojo m = new GenerateDdlMojo(); + m.packageNames = List.of( + "ca.uhn.fhir.jpa.entity", + "ca.uhn.fhir.jpa.model.entity" + ); + m.outputDirectory = "target/schema"; + m.dialects = List.of(new GenerateDdlMojo.Dialect(theDialectName, "schema.sql")); + + // Test + m.execute(); + + // Verify + List sqlStatements = loadDdlAndExtractStatements("target/schema/schema.sql"); + + String sql = findCreateTable(sqlStatements, "BT2_JOB_INSTANCE"); + assertThat(sql).doesNotContain(WorkChunkStatusEnum.IN_PROGRESS.name()); + } + + private static String findCreateTable(List sqlStatements, String tableName) { + return sqlStatements.stream().filter(t->t.startsWith("create table " + tableName + " ")).findFirst().orElseThrow(()->new IllegalStateException("Couldn't find create "+ tableName +". Statements: " + sqlStatements)); + } + + @Nonnull + private static List loadDdlAndExtractStatements(String fileName) throws IOException { + List sqlStatements; + try (FileReader reader = new FileReader(fileName)) { + String schema = IOUtils.toString(reader); + sqlStatements = Arrays.stream(schema.replaceAll("\\s+", " ").split(";")) + .map(StringUtils::trim) + .filter(StringUtils::isNotBlank) + .toList(); + } + return sqlStatements; + } + + +} diff --git a/hapi-tinder-test/src/test/resources/logback-test.xml b/hapi-tinder-test/src/test/resources/logback-test.xml new file mode 100644 index 00000000000..612d0fd9d69 --- /dev/null +++ b/hapi-tinder-test/src/test/resources/logback-test.xml @@ -0,0 +1,17 @@ + + + + + INFO + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} [%file:%line] %msg%n + + + + + + + + + diff --git a/pom.xml b/pom.xml index b65926a9a26..d56db2046d3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ ca.uhn.hapi.fhir hapi-fhir pom - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT HAPI-FHIR An open-source implementation of the FHIR specification in Java. @@ -959,6 +959,11 @@ Ibrahim Tallouzi Trifork A/S + + madduci + Michele Adduci + gematik GmbH + MangalaEkanayake Mangala Ekanayake @@ -1021,25 +1026,25 @@ 4.0.4 4.9.0 3.0.3 - 12.0.14 + 12.0.15 3.0.2 5.10.1 0.64.8 - 9.4.0 - 6.4.10.Final - 1.4.14 + 10.20.1 + 6.6.2.Final + 1.5.12 - 7.0.1.Final + 7.2.1.Final - 9.8.0 + 9.11.1 2.2 8.0.0.Final - 4.4.13 - 4.5.13 + 4.4.16 + 4.5.14 + 2.18.1 + 2.18.1 5.4.1 5.3.1 - 2.17.1 - 2.17.1 3.3.0 1.8 4.12.0 @@ -1048,34 +1053,35 @@ uses a version which lines up with the OTEL instrumentation version, but with "-alpha" appended to it. So we do that too here. This could change in the future. --> - 2.8.0 + 2.10.0 ${otel_instrumentation.version}-alpha 4.1.2 1.4 - 6.2.9.Final + 6.2.10.Final 7.1.2 9.5.4 2.13.0 0.9.11 9.8.0-15 1.2_5 - 2.2.22 - 2.0.13 - 2.19.0 + 2.2.25 + 2.0.16 + 2.24.1 6.1.14 2024.0.5 4.3.10 - 3.2.6 - 2.0.6 + 3.3.5 + 2.0.10 2.9.0 + 3.6.1.Final 3.1.4 - 1.19.3 + 1.20.3 3.1.2.RELEASE 4.4.1 UTF-8 1.0.1 - 1.44.0 - 8.14.3 + 1.52.0 + 8.15.3 1.0.8 @@ -1130,6 +1136,11 @@ logback-core ${logback_version} + + org.jboss.logging + jboss-logging + ${jboss_logging_version} + com.atlassian.commonmark commonmark @@ -1188,18 +1199,18 @@ com.googlecode.owasp-java-html-sanitizer owasp-java-html-sanitizer - 20211018.2 + 20240325.1 com.graphql-java graphql-java - 21.5 + 22.3 org.simplejavamail simple-java-mail - 8.11.2 + 8.12.2 com.github.bbottema @@ -1298,14 +1309,14 @@ com.squareup.okio okio-jvm - 3.4.0 + 3.9.1 com.tngtech.archunit archunit-junit5 - 1.0.1 + 1.3.0 test @@ -1331,7 +1342,7 @@ commons-cli commons-cli - 1.5.0 + 1.9.0 commons-codec @@ -1376,7 +1387,7 @@ org.jetbrains annotations - 24.0.1 + 26.0.1 commons-io @@ -1507,12 +1518,12 @@ com.mysql mysql-connector-j - 8.2.0 + 9.1.0 org.springdoc springdoc-openapi-starter-webmvc-ui - 2.2.0 + 2.6.0 net.sf.json-lib @@ -2054,12 +2065,12 @@ org.postgresql postgresql - 42.7.3 + 42.7.4 com.oracle.database.jdbc ojdbc11 - 23.3.0.23.09 + 23.6.0.24.10 org.quartz-scheduler @@ -2203,12 +2214,12 @@ org.webjars.npm ace-builds - 1.22.0 + 1.36.3 org.webjars Eonasdan-bootstrap-datetimepicker - 4.17.47 + 4.17.49 * @@ -2219,7 +2230,7 @@ org.webjars font-awesome - 5.8.2 + 5.15.4 org.webjars.bower @@ -2260,12 +2271,12 @@ org.webjars swagger-ui - 4.1.3 + 4.19.1 org.xmlunit xmlunit-core - 2.4.0 + 2.10.0 org.testcontainers @@ -2664,7 +2675,7 @@ ca.uhn.hapi.fhir hapi-tinder-plugin - 7.7.11-SNAPSHOT + 7.7.12-SNAPSHOT @@ -3372,4 +3383,3 @@ - diff --git a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml index a883d020399..ed677e14d85 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.7.11-SNAPSHOT + 7.7.12-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 b5ae26fdfd8..ac51bfd2625 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.7.11-SNAPSHOT + 7.7.12-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 a5b1b644da1..3b4df9e63cd 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.7.11-SNAPSHOT + 7.7.12-SNAPSHOT ../../pom.xml