From b3aa943a1889765d906359e912d8ada491fe1e01 Mon Sep 17 00:00:00 2001 From: Brenin Rhodes Date: Mon, 12 Feb 2024 08:59:15 -0700 Subject: [PATCH 1/3] Add new $questionnaire operation --- pom.xml | 2 +- .../java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java | 4 +++- .../java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 06092a3c0..bd9a3a6d6 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.0.0 + 7.1.3-SNAPSHOT hapi-fhir-jpaserver-starter diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java index c0743d6da..535f7c4b2 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrDstu3Config.java @@ -7,6 +7,7 @@ import ca.uhn.fhir.cr.config.dstu3.ExtractOperationConfig; import ca.uhn.fhir.cr.config.dstu3.PackageOperationConfig; import ca.uhn.fhir.cr.config.dstu3.PopulateOperationConfig; +import ca.uhn.fhir.cr.config.dstu3.QuestionnaireOperationConfig; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.cache.IResourceChangeListenerRegistry; import ca.uhn.fhir.jpa.cache.ResourceChangeListenerRegistryInterceptor; @@ -42,7 +43,8 @@ ApplyOperationConfig.class, ExtractOperationConfig.class, PackageOperationConfig.class, - PopulateOperationConfig.class + PopulateOperationConfig.class, + QuestionnaireOperationConfig.class }) public class StarterCrDstu3Config { private static final Logger ourLogger = LoggerFactory.getLogger(StarterCrDstu3Config.class); diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java index fd9af65f5..0be46759d 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/cr/StarterCrR4Config.java @@ -8,6 +8,7 @@ import ca.uhn.fhir.cr.config.r4.ExtractOperationConfig; import ca.uhn.fhir.cr.config.r4.PackageOperationConfig; import ca.uhn.fhir.cr.config.r4.PopulateOperationConfig; +import ca.uhn.fhir.cr.config.r4.QuestionnaireOperationConfig; import ca.uhn.fhir.jpa.api.dao.DaoRegistry; import ca.uhn.fhir.jpa.cache.IResourceChangeListenerRegistry; import ca.uhn.fhir.jpa.cache.ResourceChangeListenerRegistryInterceptor; @@ -50,7 +51,8 @@ ApplyOperationConfig.class, ExtractOperationConfig.class, PackageOperationConfig.class, - PopulateOperationConfig.class + PopulateOperationConfig.class, + QuestionnaireOperationConfig.class }) public class StarterCrR4Config { private static final Logger ourLogger = LoggerFactory.getLogger(StarterCrR4Config.class); From 1c58e4d4ebf68c719f4b6f654d4a0c4d74b3cdeb Mon Sep 17 00:00:00 2001 From: Brenin Rhodes Date: Tue, 13 Feb 2024 07:34:05 -0700 Subject: [PATCH 2/3] Update StarterIpsConfig.java --- .../java/ca/uhn/fhir/jpa/starter/ips/StarterIpsConfig.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/ips/StarterIpsConfig.java b/src/main/java/ca/uhn/fhir/jpa/starter/ips/StarterIpsConfig.java index 0b1db60e6..9f4995656 100644 --- a/src/main/java/ca/uhn/fhir/jpa/starter/ips/StarterIpsConfig.java +++ b/src/main/java/ca/uhn/fhir/jpa/starter/ips/StarterIpsConfig.java @@ -6,7 +6,7 @@ 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.ips.jpa.DefaultJpaIpsGenerationStrategy; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Conditional; @@ -14,7 +14,7 @@ public class StarterIpsConfig { @Bean IIpsGenerationStrategy ipsGenerationStrategy() { - return new DefaultIpsGenerationStrategy(); + return new DefaultJpaIpsGenerationStrategy(); } @Bean @@ -25,6 +25,6 @@ public IpsOperationProvider ipsOperationProvider(IIpsGeneratorSvc theIpsGenerato @Bean public IIpsGeneratorSvc ipsGeneratorSvcImpl( FhirContext theFhirContext, IIpsGenerationStrategy theGenerationStrategy, DaoRegistry theDaoRegistry) { - return new IpsGeneratorSvcImpl(theFhirContext, theGenerationStrategy, theDaoRegistry); + return new IpsGeneratorSvcImpl(theFhirContext, theGenerationStrategy); } } From fc708df650b9103e97422ec3383fa50fb4ae2f3f Mon Sep 17 00:00:00 2001 From: Brenin Rhodes Date: Mon, 4 Mar 2024 12:58:10 -0700 Subject: [PATCH 3/3] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bd9a3a6d6..4a76285ea 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ ca.uhn.hapi.fhir hapi-fhir - 7.1.3-SNAPSHOT + 7.1.5-SNAPSHOT hapi-fhir-jpaserver-starter