contentResourceTypes = outcome
+ return outcome
.getEntry()
.stream()
.map(t -> t.getResource().getResourceType().name())
.collect(Collectors.toList());
- return contentResourceTypes;
}
@Nonnull
diff --git a/hapi-fhir-jpaserver-ips/src/test/resources/tiny-patient-everything.json.gz b/hapi-fhir-jpaserver-ips/src/test/resources/tiny-patient-everything.json.gz
new file mode 100644
index 00000000000..92194281a39
Binary files /dev/null and b/hapi-fhir-jpaserver-ips/src/test/resources/tiny-patient-everything.json.gz differ
diff --git a/hapi-fhir-jpaserver-mdm/pom.xml b/hapi-fhir-jpaserver-mdm/pom.xml
index 15aa9542fa4..252539e79cc 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-jpaserver-model/pom.xml b/hapi-fhir-jpaserver-model/pom.xml
index a105674e4fa..06b7e2cf3d7 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-jpaserver-searchparam/pom.xml b/hapi-fhir-jpaserver-searchparam/pom.xml
index 119880cd395..c3825b656d3 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-jpaserver-subscription/pom.xml b/hapi-fhir-jpaserver-subscription/pom.xml
index 8dd6082afeb..39e1b4a3c67 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 1bdf83b72ee..0be6f861084 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 f5797e922c1..0c940988c9f 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 28e74fa348d..4cb44fd2115 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/interceptor/MultitenantOverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/interceptor/MultitenantOverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java
new file mode 100644
index 00000000000..43040fd6f32
--- /dev/null
+++ b/hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/interceptor/MultitenantOverridePathBasedReferentialIntegrityForDeletesInterceptorTest.java
@@ -0,0 +1,145 @@
+package ca.uhn.fhir.jpa.interceptor;
+
+import ca.uhn.fhir.jpa.model.config.PartitionSettings;
+import ca.uhn.fhir.jpa.provider.r4.BaseMultitenantResourceProviderR4Test;
+import ca.uhn.fhir.jpa.searchparam.SearchParameterMap;
+import ca.uhn.fhir.rest.api.server.IBundleProvider;
+import ca.uhn.fhir.rest.api.server.RequestDetails;
+import ca.uhn.fhir.rest.api.server.SystemRequestDetails;
+import ca.uhn.fhir.rest.param.ReferenceParam;
+import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
+import ca.uhn.fhir.rest.server.exceptions.ResourceVersionConflictException;
+import org.hl7.fhir.r4.model.AuditEvent;
+import org.hl7.fhir.r4.model.IdType;
+import org.hl7.fhir.r4.model.Patient;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.fail;
+
+/**
+ * Multitenant test version of {@link OverridePathBasedReferentialIntegrityForDeletesInterceptorTest}.
+ *
+ * Ensures the tenant is properly propagated down to the {@link ca.uhn.fhir.jpa.api.dao.DaoRegistry} when requesting
+ * the conflicting resource.
+ *
+ * This test runs a subset of tests from {@link OverridePathBasedReferentialIntegrityForDeletesInterceptorTest}
+ * against the {@link BaseMultitenantResourceProviderR4Test}
+ */
+public class MultitenantOverridePathBasedReferentialIntegrityForDeletesInterceptorTest extends BaseMultitenantResourceProviderR4Test {
+
+ @Autowired
+ private OverridePathBasedReferentialIntegrityForDeletesInterceptor mySvc;
+
+ @Autowired
+ private CascadingDeleteInterceptor myCascadingDeleteInterceptor;
+
+ RequestDetails requestDetails = new SystemRequestDetails();
+
+ @BeforeEach
+ public void beforeEach() {
+ requestDetails.setTenantId(TENANT_A);
+ }
+
+ @AfterEach
+ public void after() throws Exception {
+ myPartitionSettings.setAllowReferencesAcrossPartitions(PartitionSettings.CrossPartitionReferenceMode.NOT_ALLOWED);
+ assertFalse(myPartitionSettings.isAllowUnqualifiedCrossPartitionReference());
+
+ myInterceptorRegistry.unregisterInterceptor(mySvc);
+ mySvc.clearPaths();
+
+ super.after();
+ }
+
+ @Test
+ public void testAllowDelete() {
+
+ mySvc.addPath("AuditEvent.agent.who");
+ myInterceptorRegistry.registerInterceptor(mySvc);
+
+ Patient patient = new Patient();
+ patient.setId("P");
+ patient.setActive(true);
+ myPatientDao.update(patient, requestDetails);
+
+ AuditEvent audit = new AuditEvent();
+ audit.setId("A");
+ audit.addAgent().getWho().setReference("Patient/P");
+ myAuditEventDao.update(audit, requestDetails);
+
+ // Delete should proceed
+ myPatientDao.delete(new IdType("Patient/P"), requestDetails);
+
+ // Make sure we're deleted
+ try {
+ myPatientDao.read(new IdType("Patient/P"), requestDetails);
+ fail();
+ } catch (ResourceGoneException e) {
+ // good
+ }
+
+ // Search should still work
+ IBundleProvider searchOutcome = myAuditEventDao.search(SearchParameterMap.newSynchronous(AuditEvent.SP_AGENT, new ReferenceParam("Patient/P")), requestDetails);
+ assertEquals(1, searchOutcome.size());
+ }
+
+ @Test
+ public void testWrongPath() {
+ mySvc.addPath("AuditEvent.identifier");
+ mySvc.addPath("Patient.agent.who");
+ myInterceptorRegistry.registerInterceptor(mySvc);
+
+ Patient patient = new Patient();
+ patient.setId("P");
+ patient.setActive(true);
+ myPatientDao.update(patient, requestDetails);
+
+ AuditEvent audit = new AuditEvent();
+ audit.setId("A");
+ audit.addAgent().getWho().setReference("Patient/P");
+ myAuditEventDao.update(audit, requestDetails);
+
+ // Delete should proceed
+ try {
+ myPatientDao.delete(new IdType("Patient/P"), requestDetails);
+ fail();
+ } catch (ResourceVersionConflictException e) {
+ // good
+ }
+
+
+ }
+
+ @Test
+ public void testCombineWithCascadeDeleteInterceptor() {
+ try {
+ myInterceptorRegistry.registerInterceptor(myCascadingDeleteInterceptor);
+
+ mySvc.addPath("AuditEvent.agent.who");
+ myInterceptorRegistry.registerInterceptor(mySvc);
+
+ Patient patient = new Patient();
+ patient.setId("P");
+ patient.setActive(true);
+ myPatientDao.update(patient, requestDetails);
+
+ AuditEvent audit = new AuditEvent();
+ audit.setId("A");
+ audit.addAgent().getWho().setReference("Patient/P");
+ myAuditEventDao.update(audit, requestDetails);
+
+ // Delete should proceed
+ myPatientDao.delete(new IdType("Patient/P"), requestDetails);
+
+ } finally {
+ myInterceptorRegistry.unregisterInterceptor(myCascadingDeleteInterceptor);
+ }
+
+ }
+
+}
diff --git a/hapi-fhir-jpaserver-test-r4b/pom.xml b/hapi-fhir-jpaserver-test-r4b/pom.xml
index c11ae5a2df8..309fc0bfe0d 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 7060c408d81..b9cb45f6d29 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetTest.java b/hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetTest.java
index 9fb6b1d0a0a..77d4b524afb 100644
--- a/hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetTest.java
+++ b/hapi-fhir-jpaserver-test-r5/src/test/java/ca/uhn/fhir/jpa/dao/r5/FhirResourceDaoR5ValueSetTest.java
@@ -7,11 +7,14 @@ import ca.uhn.fhir.context.support.ValidationSupportContext;
import ca.uhn.fhir.context.support.ValueSetExpansionOptions;
import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
+import ca.uhn.fhir.jpa.api.model.ExpungeOptions;
+import ca.uhn.fhir.jpa.model.entity.ResourceTable;
import ca.uhn.fhir.jpa.term.api.ITermDeferredStorageSvc;
import ca.uhn.fhir.jpa.term.custom.CustomTerminologySet;
import ca.uhn.fhir.jpa.util.ValueSetTestUtil;
import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
+import ca.uhn.fhir.rest.server.exceptions.ResourceGoneException;
import org.hl7.fhir.common.hapi.validation.support.CachingValidationSupport;
import org.hl7.fhir.instance.model.api.IIdType;
import org.hl7.fhir.instance.model.api.IPrimitiveType;
@@ -19,6 +22,7 @@ import org.hl7.fhir.r5.model.CodeSystem;
import org.hl7.fhir.r5.model.CodeType;
import org.hl7.fhir.r5.model.CodeableConcept;
import org.hl7.fhir.r5.model.Coding;
+import org.hl7.fhir.r5.model.Enumerations;
import org.hl7.fhir.r5.model.IdType;
import org.hl7.fhir.r5.model.StringType;
import org.hl7.fhir.r5.model.UriType;
@@ -30,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
+import java.util.Optional;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -38,6 +43,7 @@ import static org.hamcrest.Matchers.stringContainsInOrder;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
@@ -56,6 +62,7 @@ public class FhirResourceDaoR5ValueSetTest extends BaseJpaR5Test {
public void after() {
myDaoConfig.setPreExpandValueSets(new DaoConfig().isPreExpandValueSets());
myDaoConfig.setMaximumExpansionSize(new DaoConfig().getMaximumExpansionSize());
+ myDaoConfig.setExpungeEnabled(new DaoConfig().isExpungeEnabled());
}
@@ -248,6 +255,49 @@ public class FhirResourceDaoR5ValueSetTest extends BaseJpaR5Test {
}
+
+ /**
+ * See #4305
+ */
+ @Test
+ public void testDeleteExpungePreExpandedValueSet() {
+ myDaoConfig.setExpungeEnabled(true);
+
+ // Create valueset
+ ValueSet vs = myValidationSupport.fetchResource(ValueSet.class, "http://hl7.org/fhir/ValueSet/address-use");
+ assertNotNull(vs);
+ IIdType id = myValueSetDao.create(vs).getId().toUnqualifiedVersionless();
+
+ // Update valueset
+ vs.setName("Hello");
+ assertEquals("2", myValueSetDao.update(vs, mySrd).getId().getVersionIdPart());
+ runInTransaction(()->{
+ Optional resource = myResourceTableDao.findById(id.getIdPartAsLong());
+ assertTrue(resource.isPresent());
+ });
+
+ // Precalculate
+ myTerminologyDeferredStorageSvc.saveAllDeferred();
+ myTermSvc.preExpandDeferredValueSetsToTerminologyTables();
+ logAllValueSets();
+
+ // Delete
+ myValueSetDao.delete(id, mySrd);
+
+ // Verify it's deleted
+ assertThrows(ResourceGoneException.class, ()-> myValueSetDao.read(id, mySrd));
+
+ // Expunge
+ myValueSetDao.expunge(id, new ExpungeOptions().setExpungeDeletedResources(true).setExpungeOldVersions(true), mySrd);
+
+ // Verify expunged
+ runInTransaction(()->{
+ Optional resource = myResourceTableDao.findById(id.getIdPartAsLong());
+ assertFalse(resource.isPresent());
+ });
+ }
+
+
@Test
public void testExpandByValueSet_ExceedsMaxSize() {
// Add a bunch of codes
diff --git a/hapi-fhir-jpaserver-test-utilities/pom.xml b/hapi-fhir-jpaserver-test-utilities/pom.xml
index fc01acda8a3..d1314d7195f 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/WebsocketSubscriptionClient.java b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/WebsocketSubscriptionClient.java
index 95c7600b0fa..73c737a9ee9 100644
--- a/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/WebsocketSubscriptionClient.java
+++ b/hapi-fhir-jpaserver-test-utilities/src/main/java/ca/uhn/fhir/jpa/util/WebsocketSubscriptionClient.java
@@ -20,6 +20,7 @@ package ca.uhn.fhir.jpa.util;
* #L%
*/
+import ca.uhn.fhir.i18n.Msg;
import ca.uhn.fhir.jpa.model.entity.ModelConfig;
import ca.uhn.fhir.jpa.subscription.SocketImplementation;
import ca.uhn.fhir.rest.api.EncodingEnum;
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
index 35754d1c594..49e2221ba3a 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
+++ b/hapi-fhir-jpaserver-uhnfhirtest/pom.xml
@@ -1,11 +1,11 @@
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
4.0.0
ca.uhn.hapi.fhir
hapi-fhir
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../pom.xml
@@ -48,11 +48,16 @@
${project.version}
classes
-
- ca.uhn.hapi.fhir
- hapi-fhir-server-openapi
- ${project.version}
-
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-server-openapi
+ ${project.version}
+
+
+ ca.uhn.hapi.fhir
+ hapi-fhir-jpaserver-ips
+ ${project.version}
+
com.helger
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
index 1cf2d86b133..f1eb9ff5465 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/TestRestfulServer.java
@@ -12,6 +12,7 @@ import ca.uhn.fhir.jpa.bulk.export.provider.BulkDataExportProvider;
import ca.uhn.fhir.jpa.delete.ThreadSafeResourceDeleterSvc;
import ca.uhn.fhir.jpa.graphql.GraphQLProvider;
import ca.uhn.fhir.jpa.interceptor.CascadingDeleteInterceptor;
+import ca.uhn.fhir.jpa.ips.provider.IpsOperationProvider;
import ca.uhn.fhir.jpa.provider.DiffProvider;
import ca.uhn.fhir.jpa.provider.JpaCapabilityStatementProvider;
import ca.uhn.fhir.jpa.provider.JpaConformanceProviderDstu2;
@@ -152,6 +153,7 @@ public class TestRestfulServer extends RestfulServer {
setServerConformanceProvider(confProvider);
providers.add(myAppCtx.getBean(TerminologyUploaderProvider.class));
providers.add(myAppCtx.getBean(GraphQLProvider.class));
+ providers.add(myAppCtx.getBean(IpsOperationProvider.class));
break;
}
case "R4B": {
diff --git a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java
index 48821cd3ecd..2eb94a15a68 100644
--- a/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java
+++ b/hapi-fhir-jpaserver-uhnfhirtest/src/main/java/ca/uhn/fhirtest/config/TestR4Config.java
@@ -2,9 +2,15 @@ package ca.uhn.fhirtest.config;
import ca.uhn.fhir.context.FhirContext;
import ca.uhn.fhir.jpa.api.config.DaoConfig;
+import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
import ca.uhn.fhir.jpa.config.HapiJpaConfig;
import ca.uhn.fhir.jpa.config.r4.JpaR4Config;
import ca.uhn.fhir.jpa.config.util.HapiEntityManagerFactoryUtil;
+import ca.uhn.fhir.jpa.ips.api.IIpsGenerationStrategy;
+import ca.uhn.fhir.jpa.ips.generator.IIpsGeneratorSvc;
+import ca.uhn.fhir.jpa.ips.generator.IpsGeneratorSvcImpl;
+import ca.uhn.fhir.jpa.ips.provider.IpsOperationProvider;
+import ca.uhn.fhir.jpa.ips.strategy.DefaultIpsGenerationStrategy;
import ca.uhn.fhir.jpa.model.dialect.HapiFhirH2Dialect;
import ca.uhn.fhir.jpa.model.dialect.HapiFhirPostgres94Dialect;
import ca.uhn.fhir.jpa.model.entity.ModelConfig;
@@ -196,5 +202,19 @@ public class TestR4Config {
return new PropertySourcesPlaceholderConfigurer();
}
+ @Bean
+ public IIpsGenerationStrategy ipsGenerationStrategy() {
+ return new DefaultIpsGenerationStrategy();
+ }
+
+ @Bean
+ public IIpsGeneratorSvc ipsGeneratorSvc(FhirContext theFhirContext, IIpsGenerationStrategy theGenerationStrategy, DaoRegistry theDaoRegistry) {
+ return new IpsGeneratorSvcImpl(theFhirContext, theGenerationStrategy, theDaoRegistry);
+ }
+
+ @Bean
+ public IpsOperationProvider ipsOperationProvider(IIpsGeneratorSvc theIpsGeneratorSvc) {
+ return new IpsOperationProvider(theIpsGeneratorSvc);
+ }
}
diff --git a/hapi-fhir-server-mdm/pom.xml b/hapi-fhir-server-mdm/pom.xml
index 244a4e150be..34e52715915 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NicknameMatcher.java b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NicknameMatcher.java
index 8e3a3c5fd24..685e84bf5fa 100644
--- a/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NicknameMatcher.java
+++ b/hapi-fhir-server-mdm/src/main/java/ca/uhn/fhir/mdm/rules/matcher/NicknameMatcher.java
@@ -35,7 +35,7 @@ public class NicknameMatcher implements IMdmStringMatcher {
try {
myNicknameSvc = new NicknameSvc();
} catch (IOException e) {
- throw new ConfigurationException(Msg.code(2078) + "Unable to load nicknames", e);
+ throw new ConfigurationException(Msg.code(2234) + "Unable to load nicknames", e);
}
}
diff --git a/hapi-fhir-server-openapi/pom.xml b/hapi-fhir-server-openapi/pom.xml
index 09d5cfc1f09..afc55be6399 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-server/pom.xml b/hapi-fhir-server/pom.xml
index d4b4abe54dd..d4f12e754ee 100644
--- a/hapi-fhir-server/pom.xml
+++ b/hapi-fhir-server/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java
index ea10c3f73e8..1fcd7d7858d 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/ResponseHighlighterInterceptor.java
@@ -814,7 +814,7 @@ public class ResponseHighlighterInterceptor {
writeLength(theServletResponse, outputBuffer.length());
theServletResponse.getWriter().append(" total including HTML)");
- theServletResponse.getWriter().append(" in estimated ");
+ theServletResponse.getWriter().append(" in approximately ");
theServletResponse.getWriter().append(writeSw.toString());
theServletResponse.getWriter().append("");
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java
index 045147d5aa0..9c982bb9c86 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/HashMapResourceProvider.java
@@ -173,7 +173,7 @@ public class HashMapResourceProvider implements IResour
TreeMap versions = myIdToVersionToResourceMap.get(theId.getIdPart());
if (versions == null || versions.isEmpty()) {
- throw new ResourceNotFoundException(Msg.code(1979) + theId);
+ throw new ResourceNotFoundException(Msg.code(2250) + theId);
}
T deletedInstance = (T) myFhirContext.getResourceDefinition(myResourceType).newInstance();
@@ -240,7 +240,7 @@ public class HashMapResourceProvider implements IResour
public synchronized List historyInstance(@IdParam IIdType theId, RequestDetails theRequestDetails) {
LinkedList retVal = myIdToHistory.get(theId.getIdPart());
if (retVal == null) {
- throw new ResourceNotFoundException(Msg.code(1980) + theId);
+ throw new ResourceNotFoundException(Msg.code(2248) + theId);
}
return fireInterceptorsAndFilterAsNeeded(retVal, theRequestDetails);
@@ -255,7 +255,7 @@ public class HashMapResourceProvider implements IResour
public synchronized T read(@IdParam IIdType theId, RequestDetails theRequestDetails) {
TreeMap versions = myIdToVersionToResourceMap.get(theId.getIdPart());
if (versions == null || versions.isEmpty()) {
- throw new ResourceNotFoundException(Msg.code(1981) + theId);
+ throw new ResourceNotFoundException(Msg.code(2247) + theId);
}
T retVal;
@@ -271,14 +271,14 @@ public class HashMapResourceProvider implements IResour
}
if (retVal == null || ResourceMetadataKeyEnum.DELETED_AT.get(retVal) != null) {
- throw new ResourceGoneException(Msg.code(1983) + theId);
+ throw new ResourceGoneException(Msg.code(2244) + theId);
}
myReadCount.incrementAndGet();
retVal = fireInterceptorsAndFilterAsNeeded(retVal, theRequestDetails);
if (retVal == null) {
- throw new ResourceNotFoundException(Msg.code(1984) + theId);
+ throw new ResourceNotFoundException(Msg.code(2243) + theId);
}
return retVal;
}
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java
index ea3fc0946e9..c5eeb97e097 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ServerCapabilityStatementProvider.java
@@ -636,7 +636,7 @@ public class ServerCapabilityStatementProvider implements IServerConformanceProv
@Read(typeName = "OperationDefinition")
public IBaseResource readOperationDefinition(@IdParam IIdType theId, RequestDetails theRequestDetails) {
if (theId == null || theId.hasIdPart() == false) {
- throw new ResourceNotFoundException(Msg.code(1977) + theId);
+ throw new ResourceNotFoundException(Msg.code(2245) + theId);
}
RestfulServerConfiguration configuration = getServerConfiguration();
Bindings bindings = configuration.provideBindings();
@@ -650,7 +650,7 @@ public class ServerCapabilityStatementProvider implements IServerConformanceProv
if (searchBindings != null && !searchBindings.isEmpty()) {
return readOperationDefinitionForNamedSearch(searchBindings);
}
- throw new ResourceNotFoundException(Msg.code(1978) + theId);
+ throw new ResourceNotFoundException(Msg.code(2249) + theId);
}
private String getOperationId(IIdType theId) {
diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-api/pom.xml b/hapi-fhir-serviceloaders/hapi-fhir-caching-api/pom.xml
index 3a198fe53b6..b182513178a 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 3db8187c54d..84d52892290 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../pom.xml
@@ -20,7 +20,7 @@
ca.uhn.hapi.fhir
hapi-fhir-caching-api
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
com.github.ben-manes.caffeine
diff --git a/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml b/hapi-fhir-serviceloaders/hapi-fhir-caching-guava/pom.xml
index e58f3afc9ff..3e2e09f2cd4 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 8a320dedd4b..589d0b19818 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../../pom.xml
diff --git a/hapi-fhir-serviceloaders/pom.xml b/hapi-fhir-serviceloaders/pom.xml
index bc7ea7deba4..5581ed3b03d 100644
--- a/hapi-fhir-serviceloaders/pom.xml
+++ b/hapi-fhir-serviceloaders/pom.xml
@@ -5,7 +5,7 @@
hapi-fhir
ca.uhn.hapi.fhir
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../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 8b6fdd97fec..332e9c99314 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 ea7b07a4ccc..3b4a537586a 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 4f6393f7c0b..3fa44b39612 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
hapi-fhir-spring-boot-sample-client-okhttp
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 3ec1440cb18..8ea45a9e9e5 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
hapi-fhir-spring-boot-sample-server-jersey
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 92e14112893..bfd0ff929f5 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
hapi-fhir-spring-boot-samples
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 d3a530ce6a0..d17f78539b4 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-spring-boot/pom.xml b/hapi-fhir-spring-boot/pom.xml
index aafd16791fe..8b7da530410 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-sql-migrate/pom.xml b/hapi-fhir-sql-migrate/pom.xml
index 7f465bd3e06..2294911d5c6 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeToDriverTypeToSqlType.java b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeToDriverTypeToSqlType.java
index 15eeb8efa28..0aa498f9f02 100644
--- a/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeToDriverTypeToSqlType.java
+++ b/hapi-fhir-sql-migrate/src/main/java/ca/uhn/fhir/jpa/migrate/taskdef/ColumnTypeToDriverTypeToSqlType.java
@@ -109,7 +109,7 @@ public final class ColumnTypeToDriverTypeToSqlType {
setColumnType(ColumnTypeEnum.CLOB, DriverTypeEnum.MARIADB_10_1, "longtext");
setColumnType(ColumnTypeEnum.CLOB, DriverTypeEnum.MYSQL_5_7, "longtext");
setColumnType(ColumnTypeEnum.CLOB, DriverTypeEnum.ORACLE_12C, "clob");
- setColumnType(ColumnTypeEnum.CLOB, DriverTypeEnum.POSTGRES_9_4, "text");
+ setColumnType(ColumnTypeEnum.CLOB, DriverTypeEnum.POSTGRES_9_4, "oid"); // the PG driver will write oid into a `text` column
setColumnType(ColumnTypeEnum.CLOB, DriverTypeEnum.MSSQL_2012, "varchar(MAX)");
}
diff --git a/hapi-fhir-storage-batch2-jobs/pom.xml b/hapi-fhir-storage-batch2-jobs/pom.xml
index e2e613dfadf..7d2da2c06d0 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
4.0.0
diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java
index d6012ee366d..37f89c9fe2f 100644
--- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java
+++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/export/FetchResourceIdsStep.java
@@ -122,7 +122,7 @@ public class FetchResourceIdsStep implements IFirstJobStepWorker
ca.uhn.hapi.fhir
hapi-deployable-pom
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage-cr/pom.xml b/hapi-fhir-storage-cr/pom.xml
index d526868807a..a7c82542be7 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-storage-mdm/pom.xml b/hapi-fhir-storage-mdm/pom.xml
index a6398f0e0bf..acf055b627e 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
4.0.0
diff --git a/hapi-fhir-storage-test-utilities/pom.xml b/hapi-fhir-storage-test-utilities/pom.xml
index 0418ffd4544..59972c1685f 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
4.0.0
diff --git a/hapi-fhir-storage/pom.xml b/hapi-fhir-storage/pom.xml
index eb487e974c3..b72e1f0a85a 100644
--- a/hapi-fhir-storage/pom.xml
+++ b/hapi-fhir-storage/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 6.3.14-SNAPSHOT
+ 6.5.0-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 104266a8abe..272dbdcfd74 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-dstu2/pom.xml b/hapi-fhir-structures-dstu2/pom.xml
index c80e11b4ab5..f8439d45995 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-dstu3/pom.xml b/hapi-fhir-structures-dstu3/pom.xml
index 1a28e61dcfd..a66018c6136 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java
index 1bb52221586..9557beed90e 100644
--- a/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java
+++ b/hapi-fhir-structures-dstu3/src/main/java/org/hl7/fhir/dstu3/hapi/rest/server/ServerCapabilityStatementProvider.java
@@ -475,7 +475,7 @@ public class ServerCapabilityStatementProvider extends BaseServerCapabilityState
if (searchBindings != null && !searchBindings.isEmpty()) {
return readOperationDefinitionForNamedSearch(searchBindings);
}
- throw new ResourceNotFoundException(Msg.code(1985) + theId);
+ throw new ResourceNotFoundException(Msg.code(2257) + theId);
}
private OperationDefinition readOperationDefinitionForNamedSearch(List bindings) {
diff --git a/hapi-fhir-structures-hl7org-dstu2/pom.xml b/hapi-fhir-structures-hl7org-dstu2/pom.xml
index c486671fc7c..bc25b48bd32 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r4/pom.xml b/hapi-fhir-structures-r4/pom.xml
index 01f7b6163e8..94509717a42 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r4b/pom.xml b/hapi-fhir-structures-r4b/pom.xml
index 477572bda4a..74be257e156 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r5/pom.xml b/hapi-fhir-structures-r5/pom.xml
index b88b92ffb83..65fe915fde1 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java
index 0860043f5d0..6da640e9afa 100644
--- a/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java
+++ b/hapi-fhir-structures-r5/src/main/java/org/hl7/fhir/r5/hapi/ctx/HapiWorkerContext.java
@@ -106,7 +106,7 @@ public final class HapiWorkerContext extends I18nBase implements IWorkerContext
@Override
public Map getNSUrlMap() {
- throw new UnsupportedOperationException(Msg.code(2107));
+ throw new UnsupportedOperationException(Msg.code(2241));
}
@Override
diff --git a/hapi-fhir-test-utilities/pom.xml b/hapi-fhir-test-utilities/pom.xml
index de8a86a686e..739892aa343 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerDstu3Helper.java b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerDstu3Helper.java
index 303aee6a72c..1150bfa416f 100644
--- a/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerDstu3Helper.java
+++ b/hapi-fhir-test-utilities/src/main/java/ca/uhn/fhir/test/utilities/RestServerDstu3Helper.java
@@ -66,7 +66,7 @@ public class RestServerDstu3Helper extends BaseRestServerHelper implements IPoin
try {
myRestServer.initialize();
} catch (ServletException e) {
- throw new RuntimeException(Msg.code(2112)+"Failed to initialize server", e);
+ throw new RuntimeException(Msg.code(2252)+"Failed to initialize server", e);
}
}
}
@@ -294,7 +294,7 @@ public class RestServerDstu3Helper extends BaseRestServerHelper implements IPoin
@Override
public MethodOutcome update(T theResource, String theConditional, RequestDetails theRequestDetails) {
if (myFailNextPut) {
- throw new PreconditionFailedException(Msg.code(2113)+"Failed update operation");
+ throw new PreconditionFailedException(Msg.code(2251)+"Failed update operation");
}
return super.update(theResource, theConditional, theRequestDetails);
}
diff --git a/hapi-fhir-testpage-overlay/pom.xml b/hapi-fhir-testpage-overlay/pom.xml
index 92298aefe31..92e68cf0795 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../pom.xml
diff --git a/hapi-fhir-validation-resources-dstu2.1/pom.xml b/hapi-fhir-validation-resources-dstu2.1/pom.xml
index 149494e2c09..4b971f6c5ad 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 9317ff0611d..5fac1e3d10a 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 3ae7b8be7c5..7aaa6e4aa3f 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 e372901ae19..7000646f160 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 5fa0d7acaf3..96cdc9f8afa 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml
index 0012fe578e5..a8079c72ef9 100644
--- a/hapi-fhir-validation/pom.xml
+++ b/hapi-fhir-validation/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-deployable-pom
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../hapi-deployable-pom/pom.xml
diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java
index 435aadb4977..6baac0f80c2 100644
--- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java
+++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/common/hapi/validation/validator/VersionSpecificWorkerContextWrapper.java
@@ -162,18 +162,18 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
@Override
public IWorkerContextManager.IPackageLoadingTracker getPackageTracker() {
- throw new UnsupportedOperationException(Msg.code(2108));
+ throw new UnsupportedOperationException(Msg.code(2235));
}
@Override
public IWorkerContext setPackageTracker(
IWorkerContextManager.IPackageLoadingTracker packageTracker) {
- throw new UnsupportedOperationException(Msg.code(2114));
+ throw new UnsupportedOperationException(Msg.code(2266));
}
@Override
public PackageInformation getPackageForUrl(String s) {
- throw new UnsupportedOperationException(Msg.code(2109));
+ throw new UnsupportedOperationException(Msg.code(2236));
}
@Override
@@ -410,7 +410,7 @@ public class VersionSpecificWorkerContextWrapper extends I18nBase implements IWo
@Override
public Map getNSUrlMap() {
- throw new UnsupportedOperationException(Msg.code(2111));
+ throw new UnsupportedOperationException(Msg.code(2265));
}
@Override
diff --git a/hapi-tinder-plugin/pom.xml b/hapi-tinder-plugin/pom.xml
index 259e7c43bbd..4f824bb81c8 100644
--- a/hapi-tinder-plugin/pom.xml
+++ b/hapi-tinder-plugin/pom.xml
@@ -5,7 +5,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../pom.xml
diff --git a/hapi-tinder-test/pom.xml b/hapi-tinder-test/pom.xml
index bd99b33ed39..d0decbb3444 100644
--- a/hapi-tinder-test/pom.xml
+++ b/hapi-tinder-test/pom.xml
@@ -4,7 +4,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../pom.xml
@@ -62,12 +62,6 @@
-
-
ca.uhn.hapi.fhir
hapi-tinder-plugin
@@ -136,37 +130,6 @@
-
generalstructs
@@ -383,8 +346,6 @@
-
@@ -420,7 +381,6 @@
targetPackage="ca.uhn.test.ant.multi.r5" filenameSuffix="ResourceTest.java" projectHome="${project.basedir}/.."
version="r5" includeResources="patient,organization" />
-
ca.uhn.hapi.fhir
hapi-fhir
pom
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
HAPI-FHIR
An open-source implementation of the FHIR specification in Java.
https://hapifhir.io
@@ -852,6 +852,9 @@
John D'Amore
More Informatics
+
+ JorisHeadease
+
@@ -861,111 +864,109 @@
-
+
+ 5.6.84
+ 1.0.3
+ -Dfile.encoding=UTF-8 -Xmx2048m
- 5.6.84
- 1.0.3
+
+ yyyy-MM-dd'T'HH:mm:ss'Z'
+ UTF-8
- -Dfile.encoding=UTF-8 -Xmx2048m
+
+ ${user.home}/sites/hapi-fhir
+ ${user.home}/sites/scm/hapi-fhir
-
- yyyy-MM-dd'T'HH:mm:ss'Z'
+
+ 1.2.0
+ 4.2.5
+ 1.2
+ 3.1.1
+ 10.6.0
+ 3.2.0
+ 2.12.1
+ 1.15
+ 1.21
+ 1.10.0
+ 2.11.0
+ 3.12.0
+ 1.2
+ 10.14.2.0
+ 2.10.0
+ 4.8.1
+ 0.7.9
+ 31.0.1-jre
+ 2.8.9
+ 2.2.11_1
+ 2.3.1
+ 2.3.0.1
+ 3.0.0
+ 4.2.0
+ 3.0.3
+ 10.0.12
+ 3.0.2
+ 5.9.1
+ 0.50.40
+ 9.4.0
+ 5.6.12.Final
+ 6.1.6.Final
+ 1.4.4
+
+ 8.11.1
+ 2.2
+ 6.1.5.Final
+ 4.4.13
+ 4.5.13
+ 2.14.1
+ 2.14.1
+ 3.3.0
+ 1.8
+ 4.10.0
+ 4.1.2
+ 1.4
+ 5.0.2.Final
+ 5.6.5
+ 9.5.4
+ 2.9.0
+ 9.8.0-15
+ 1.2_5
+ 2.1.12
+ 2.0.3
+ 2.19.0
+ 5.3.23
+ 2021.2.2
+ 4.3.3
+ 2.7.5
+ 1.2.2.RELEASE
- UTF-8
+ 3.1.4
+ 1.17.1
+ 3.0.14.RELEASE
+ 4.4.1
-
- ${user.home}/sites/hapi-fhir
- ${user.home}/sites/scm/hapi-fhir
+
+ 1.6.0
-
- 1.2.0
- 4.2.5
- 1.2
- 3.1.1
- 10.4
- 1.15
- 1.21
- 1.10.0
- 2.11.0
- 3.12.0
- 1.2
- 10.14.2.0
-
- 2.10.0
- 4.8.1
- 0.7.9
- 31.0.1-jre
- 2.8.9
- 2.2.11_1
- 2.3.1
- 2.3.0.1
- 3.0.0
- 4.2.0
- 3.0.3
- 10.0.12
- 3.0.2
- 5.9.1
- 0.50.40
- 9.4.0
- 5.6.12.Final
- 6.1.6.Final
- 1.4.4
-
- 8.11.1
- 2.2
- 6.1.5.Final
- 4.4.13
- 4.5.13
- 2.14.1
- 2.14.1
- 3.3.0
- 1.8
- 4.10.0
- 4.1.2
- 1.4
- 5.0.2.Final
- 5.6.5
- 9.5.4
- 2.9.0
- 9.8.0-15
- 1.2_5
- 2.1.12
- 2.0.3
- 2.19.0
- 5.3.23
- 2021.2.2
- 4.3.3
- 2.7.5
- 1.2.2.RELEASE
+ UTF-8
+ 1.0.1
- 3.1.4
- 1.17.1
- 3.0.14.RELEASE
- 4.4.1
+ 1.28.4
+
+ 2.4.0
+ 2.3.0
+ 2.3.0
-
- 1.6.0
+
+ 5.4.1
+ 11
+ 11
+ 11
+ 17
+ 17
+ 17
- UTF-8
- 1.0.1
-
- 1.28.4
-
- 2.4.0
- 2.3.0
- 2.3.0
-
-
- 5.4.1
- 11
- 11
- 11
- 17
- 17
- 17
-
-
-
+
+
@@ -2123,24 +2124,6 @@
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
- 3.2.0
-
-
- com.puppycrawl.tools
- checkstyle
- ${checkstyle_version}
-
-
- ca.uhn.hapi.fhir
- hapi-fhir-checkstyle
-
- 6.3.14-SNAPSHOT
-
-
-
org.apache.maven.plugins
maven-resources-plugin
@@ -2192,8 +2175,6 @@
500m
2000m
-
-
org.apache.maven.plugins
@@ -2306,6 +2287,11 @@
jetty-maven-plugin
${jetty_version}
+
+ org.apache.maven.plugins
+ maven-changes-plugin
+ ${maven_changes_version}
+
org.eluder.coveralls
coveralls-maven-plugin
@@ -2378,47 +2364,6 @@
-
@@ -2480,6 +2425,7 @@
+ org.apache.maven.plugins
maven-antrun-plugin
false
@@ -2767,7 +2713,7 @@
org.apache.maven.plugins
maven-changes-plugin
- 2.12.1
+ ${maven_changes_version}
false
@@ -2812,20 +2758,7 @@
maven-project-info-reports-plugin
3.0.0
false
-
-
@@ -2900,22 +2833,23 @@
org.apache.maven.plugins
- maven-checkstyle-plugin
+ maven-antrun-plugin
+ 1.8
- validate
- generate-sources
-
-
- ${maven.multiModuleProjectDirectory}/src/checkstyle/checkstyle_config_nofixmes.xml
- UTF-8
- true
- true
- false
-
-
- check
-
+ delete-module-cache-file
+ none
+
+
+
+
+ org.apache.maven.plugins
+ maven-checkstyle-plugin
+ ${maven_checkstyle_version}
+
+
+ hapi-single-module-checkstyle
+ none
@@ -3008,13 +2942,6 @@
integration-testnone
-
- org.apache.maven.plugins
- maven-checkstyle-plugin
-
- validatenone
-
-
diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
deleted file mode 100644
index d175e39ca3c..00000000000
--- a/src/checkstyle/checkstyle.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/checkstyle/checkstyle_config_nofixmes.xml b/src/checkstyle/checkstyle_config_nofixmes.xml
deleted file mode 100644
index 3a6f659b155..00000000000
--- a/src/checkstyle/checkstyle_config_nofixmes.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
index 9c449d93b38..aabb0d585f0 100644
--- a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
+++ b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml
@@ -6,7 +6,7 @@
ca.uhn.hapi.fhir
hapi-fhir
- 6.3.14-SNAPSHOT
+ 6.5.0-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 0dd0d834c18..0ccbc522c0a 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
- 6.3.14-SNAPSHOT
+ 6.5.0-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 74ea4e9adb0..4daf5970442 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
- 6.3.14-SNAPSHOT
+ 6.5.0-SNAPSHOT
../../pom.xml