Rework

hapifhir · Feb 12, 2025 · b9286f0 · b9286f0
1 parent d5b24f2
commit b9286f0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.../test/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionCanonicalizerTest.java b/.../test/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionCanonicalizerTest.java
@@ -240,7 +240,8 @@ public void testNonNullDefaultPartitionIDCanonicalizesToCrossPartition() {
 		final SubscriptionSettings subscriptionSettings = new SubscriptionSettings();
 
 		subscriptionSettings.setCrossPartitionSubscriptionEnabled(true);
-		final SubscriptionCanonicalizer subscriptionCanonicalizer = new SubscriptionCanonicalizer(FhirContext.forR4(), subscriptionSettings, myHelperSvc);
+		final SubscriptionCanonicalizer subscriptionCanonicalizer = new SubscriptionCanonicalizer(FhirContext.forR4(), subscriptionSettings);
+		subscriptionCanonicalizer.setPartitionHelperSvc(myHelperSvc);
 		Subscription subscription = buildMdmSubscriptionR4("test-subscription", "Patient?");
 		CanonicalSubscription canonicalize = subscriptionCanonicalizer.canonicalize(subscription);
 

diff --git a/.../src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionCanonicalizer.java b/.../src/main/java/ca/uhn/fhir/jpa/subscription/match/registry/SubscriptionCanonicalizer.java
@@ -71,20 +71,20 @@ public class SubscriptionCanonicalizer {
 
 	final FhirContext myFhirContext;
 	private final SubscriptionSettings mySubscriptionSettings;
-	private final IRequestPartitionHelperSvc myHelperSvc;
+
+	private IRequestPartitionHelperSvc myHelperSvc;
+
 
 	@Autowired
 	public SubscriptionCanonicalizer(FhirContext theFhirContext, SubscriptionSettings theSubscriptionSettings) {
 		myFhirContext = theFhirContext;
 		mySubscriptionSettings = theSubscriptionSettings;
-		myHelperSvc = null;
 	}
-
+	//TODO GGG: Eventually, we will unify autowiring styles. It is this way now as this is the least destrctive method
+	//to accomplish a minimal MR. I recommend moving all dependencies to setter autowiring, but that is for another day.
 	@Autowired
-	public SubscriptionCanonicalizer(FhirContext theFhirContext, SubscriptionSettings theSubscriptionSettings, IRequestPartitionHelperSvc theHelperSvc) {
-		myFhirContext = theFhirContext;
-		mySubscriptionSettings = theSubscriptionSettings;
-		myHelperSvc = theHelperSvc;
+	public void setPartitionHelperSvc(IRequestPartitionHelperSvc thePartitionHelperSvc) {
+		myHelperSvc = thePartitionHelperSvc;
 	}
 
 	// TODO:  LD:  remove this constructor once all callers call the 2 arg constructor above
@@ -96,7 +96,6 @@ public SubscriptionCanonicalizer(FhirContext theFhirContext, SubscriptionSetting
 	public SubscriptionCanonicalizer(FhirContext theFhirContext) {
 		myFhirContext = theFhirContext;
 		mySubscriptionSettings = new SubscriptionSettings();
-		myHelperSvc = null;
 	}
 
 	public CanonicalSubscription canonicalize(IBaseResource theSubscription) {
@@ -798,7 +797,7 @@ private boolean handleCrossPartition(IBaseResource theSubscription) {
 		boolean isSubscriptionCreatedOnDefaultPartition = false;
 
 		if (nonNull(requestPartitionId)) {
-			isSubscriptionCreatedOnDefaultPartition = myHelperSvc.isDefaultPartition(requestPartitionId);
+			isSubscriptionCreatedOnDefaultPartition = myHelperSvc == null ? requestPartitionId.isDefaultPartition() : myHelperSvc.isDefaultPartition(requestPartitionId);
 		}
 
 		boolean isSubscriptionDefinededAsCrossPartitionSubscription =