fix default partition setting on resource (hapifhir#5617)

* fix default partition setting on resource

* changelog

* Handle DEFAULT partition in rule checker.

* Fix spotless

---------

Co-authored-by: Michael Buckley <[email protected]>
Co-authored-by: James Agnew <[email protected]>

Author: 3 people

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_0_0/5617-fix-default-partition-setting.yaml

@@ -0,0 +1,5 @@
+---
+type: fix
+issue: 5617
+title: "Resource UserData RESOURCE_PARTITION_ID was incorrectly being set to null for the default partition.  
+This has been corrected to use RequestPartitionId.defaultPartition()"

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/JpaStorageResourceParser.java

@@ -23,6 +23,7 @@
 import ca.uhn.fhir.context.FhirVersionEnum;
 import ca.uhn.fhir.context.RuntimeResourceDefinition;
 import ca.uhn.fhir.i18n.Msg;
+import ca.uhn.fhir.interceptor.model.RequestPartitionId;
 import ca.uhn.fhir.jpa.api.config.JpaStorageSettings;
 import ca.uhn.fhir.jpa.api.dao.IDao;
 import ca.uhn.fhir.jpa.dao.data.IResourceHistoryTableDao;
@@ -248,7 +249,7 @@ private <R extends IBaseResource> void populateResourcePartitionInformation(
 						myPartitionLookupSvc.getPartitionById(partitionId.getPartitionId());
 				retVal.setUserData(Constants.RESOURCE_PARTITION_ID, persistedPartition.toRequestPartitionId());
 			} else {
-				retVal.setUserData(Constants.RESOURCE_PARTITION_ID, null);
+				retVal.setUserData(Constants.RESOURCE_PARTITION_ID, RequestPartitionId.defaultPartition());
 			}
 		}
 	}

hapi-fhir-jpaserver-model/src/main/java/ca/uhn/fhir/jpa/model/util/JpaConstants.java

@@ -263,7 +263,7 @@ public class JpaConstants {
 	/**
 	 * The name of the default partition
 	 */
-	public static final String DEFAULT_PARTITION_NAME = "DEFAULT";
+	public static final String DEFAULT_PARTITION_NAME = ProviderConstants.DEFAULT_PARTITION_NAME;
 
 	/**
 	 * The name of the collection of all partitions

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/auth/RuleBuilder.java

@@ -25,6 +25,7 @@
 import ca.uhn.fhir.rest.api.Constants;
 import ca.uhn.fhir.rest.api.RestOperationTypeEnum;
 import ca.uhn.fhir.rest.api.server.RequestDetails;
+import ca.uhn.fhir.rest.server.provider.ProviderConstants;
 import com.google.common.collect.Lists;
 import jakarta.annotation.Nonnull;
 import org.apache.commons.lang3.Validate;
@@ -234,6 +235,11 @@ private boolean matchesResource(IBaseResource theResource) {
 					RequestPartitionId partitionId =
 							(RequestPartitionId) theResource.getUserData(Constants.RESOURCE_PARTITION_ID);
 					if (partitionId != null) {
+						if (partitionId.hasDefaultPartitionId()
+								&& myTenantIds.contains(ProviderConstants.DEFAULT_PARTITION_NAME)) {
+							return myOutcome;
+						}
+
 						String partitionNameOrNull = partitionId.getFirstPartitionNameOrNull();
 						if (partitionNameOrNull == null || !myTenantIds.contains(partitionNameOrNull)) {
 							return !myOutcome;

hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java

@@ -52,6 +52,8 @@ public class ProviderConstants {
 	public static final String PARTITION_MANAGEMENT_PARTITION_NAME = "name";
 	public static final String PARTITION_MANAGEMENT_PARTITION_DESC = "description";
 
+	public static final String DEFAULT_PARTITION_NAME = "DEFAULT";
+
 	/**
 	 * Operation name: diff
 	 */