FUT1-8014 remove primary annotation

- to allow EHealthFhirContext or TerminologyServerContext
tyfoni-systematic · Feb 20, 2023 · 2c93f88 · 2c93f88
1 parent 097a0ed
commit 2c93f88
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 4 deletions.
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/FhirContextDstu2Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/FhirContextDstu2Config.java
@@ -25,7 +25,6 @@
 import org.springframework.context.annotation.Primary;
 
 public class FhirContextDstu2Config {
-	@Primary
 	@Bean(name = "primaryFhirContext")
 	public FhirContext fhirContextDstu2() {
 		return FhirContext.forDstu2();

diff --git a/...hir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/FhirContextDstu3Config.java b/...hir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/dstu3/FhirContextDstu3Config.java
@@ -27,7 +27,6 @@
 import static ca.uhn.fhir.jpa.config.r4.FhirContextR4Config.configureFhirContext;
 
 public class FhirContextDstu3Config {
-	@Primary
 	@Bean(name = "primaryFhirContext")
 	public FhirContext fhirContextDstu3() {
 		FhirContext retVal = FhirContext.forDstu3();

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/FhirContextR4Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r4/FhirContextR4Config.java
@@ -33,7 +33,6 @@ public class FhirContextR4Config {
 	public static final String DEFAULT_PRESERVE_VERSION_REFS_R4_AND_LATER = "AuditEvent.entity.what";
 
 	@Bean(name = "primaryFhirContext")
-	@Primary
 	public FhirContext fhirContextR4() {
 		FhirContext retVal = FhirContext.forR4();
 

diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/FhirContextR5Config.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/config/r5/FhirContextR5Config.java
@@ -28,7 +28,6 @@
 
 public class FhirContextR5Config {
 	@Bean(name = "primaryFhirContext")
-	@Primary
 	public FhirContext fhirContextR5() {
 		FhirContext retVal = FhirContext.forR5();