Cleanup work following merge of 6101 (#6110)

* - reverting commented out changes
- removing personal todo

* removing changelog since the related change was reverted.

---------

Co-authored-by: peartree <etienne.poirier@smilecdr.com>

hapi-fhir-docs/src/main/resources/ca/uhn/hapi/fhir/changelog/7_4_0/6090-regression-partition-helper-service-throws-exception.yaml

@@ -1,4 +0,0 @@
----
-type: fix
-issue: 6090
-title: "A regression caused partition resolution to fail when creating non-partitionable resources.  The issue is fixed."

hapi-fhir-jpaserver-test-r4/src/test/java/ca/uhn/fhir/jpa/partition/RequestPartitionHelperSvcTest.java

@@ -55,25 +55,6 @@ class RequestPartitionHelperSvcTest extends BaseJpaR4Test {
 		myPatient.setId(new IdType("Patient", "123", "1"));
 	}
 
-	// TODO EHP: re-enable this test
-	@Disabled
-	@Test
-	public void testDetermineReadPartitionForSystemRequest_whenResourceIsNonPartitionable_returnsDefaultPartition() {
-		// setup
-		SystemRequestDetails srd = new SystemRequestDetails();
-		srd.setRequestPartitionId(RequestPartitionId.allPartitions());
-
-		// execute
-		ConceptMap conceptMap = new ConceptMap();
-		RequestPartitionId result = mySvc.determineCreatePartitionForRequest(srd, conceptMap, conceptMap.fhirType());
-
-		// verify
-		assertThat(result.isAllPartitions()).isFalse();
-		assertThat(result.hasPartitionNames()).isFalse();
-		assertThat(result.isDefaultPartition()).isTrue();
-		assertThat(result.hasDefaultPartitionId()).isTrue();
-	}
-
 	@Test
 	public void testDetermineReadPartitionForSystemRequest_withPartitionIdOnly_returnsCorrectPartition() {
 		// setup

hapi-fhir-storage/src/main/java/ca/uhn/fhir/jpa/partition/BaseRequestPartitionHelperSvc.java

@@ -235,11 +235,6 @@ public abstract class BaseRequestPartitionHelperSvc implements IRequestPartition
 
 		// TODO GGG eventually, theRequest will not be allowed to be null here, and we will pass through
 		// SystemRequestDetails instead.
-		// TODO EHP: temporarely commenting out to fix build pipeline.
-		//		if ((theRequest == null || theRequest instanceof SystemRequestDetails) && nonPartitionableResource) {
-		//			return RequestPartitionId.defaultPartition();
-		//		}
-
 		if (theRequest == null) {
 			requestDetails = new SystemRequestDetails();
 		}