[3020] fix implementation/add tests

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionLookupSvcImpl.java

@@ -171,10 +171,8 @@ public class PartitionLookupSvcImpl implements IPartitionLookupSvc {
 	}
 
 	@Override
-	@Transactional
 	public List<PartitionEntity> listPartitions() {
 		List<PartitionEntity> allPartitions =  myPartitionDao.findAll();
-		clearCaches();
 		return allPartitions;
 	}
 

hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/partition/PartitionManagementProvider.java

@@ -27,6 +27,7 @@ import ca.uhn.fhir.rest.annotation.OperationParam;
 import ca.uhn.fhir.rest.annotation.ResourceParam;
 import ca.uhn.fhir.rest.server.provider.ProviderConstants;
 import ca.uhn.fhir.util.ParametersUtil;
+import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseParameters;
 import org.hl7.fhir.instance.model.api.IPrimitiveType;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -150,11 +151,11 @@ public class PartitionManagementProvider {
 	/**
 	 * Add Partition:
 	 * <code>
-	 * $partition-management-read-partition
+	 * $partition-management-list-partitions
 	 * </code>
 	 */
 	@Operation(name = ProviderConstants.PARTITION_MANAGEMENT_LIST_PARTITIONS, idempotent = true)
-	public List<IBaseParameters> listPartitions(
+	public IBaseParameters addPartitions(
 		@ResourceParam IBaseParameters theRequest
 	) {
 		List<PartitionEntity> output = myPartitionLookupSvc.listPartitions();
@@ -171,12 +172,21 @@ public class PartitionManagementProvider {
 		return retVal;
 	}
 
-	private List<IBaseParameters> prepareOutputList(List<PartitionEntity> theOutput) {
+	private IBaseParameters prepareOutputList(List<PartitionEntity> theOutput) {
-		List<IBaseParameters> retVal = new ArrayList<IBaseParameters>();
+		if (theOutput != null) {
+			IBaseParameters retVal = ParametersUtil.newInstance(myCtx);
 			for (PartitionEntity partitionEntity : theOutput) {
-			retVal.add(prepareOutput(partitionEntity));
+				IBase resultPart = ParametersUtil.addParameterToParameters(myCtx, retVal, "partition");
+				ParametersUtil.addPartInteger(myCtx, resultPart, ProviderConstants.PARTITION_MANAGEMENT_PARTITION_ID, partitionEntity.getId());
+				ParametersUtil.addPartCode(myCtx, resultPart, ProviderConstants.PARTITION_MANAGEMENT_PARTITION_NAME, partitionEntity.getName());
+				if (isNotBlank(partitionEntity.getDescription())) {
+					ParametersUtil.addPartString(myCtx, resultPart, ProviderConstants.PARTITION_MANAGEMENT_PARTITION_DESC, partitionEntity.getDescription());
+				}
 			}
 			return retVal;
+		} else {
+			return null;
+		}
 	}
 
 	@Nonnull

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionManagementProviderTest.java

@@ -28,8 +28,13 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import javax.annotation.Nonnull;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.fail;
 import static org.mockito.ArgumentMatchers.any;
@@ -241,30 +246,48 @@ public class PartitionManagementProviderTest {
 		partition1.setId(1);
 		partition1.setName("PARTITION-1");
 		partition1.setDescription("a description1");
-		when(myPartitionConfigSvc.getPartitionById(eq(1))).thenReturn(partition1);
 
 		PartitionEntity partition2 = new PartitionEntity();
-		partition1.setId(2);
+		partition2.setId(2);
-		partition1.setName("PARTITION-2");
+		partition2.setName("PARTITION-2");
-		partition1.setDescription("a description2");
+		partition2.setDescription("a description2");
-		when(myPartitionConfigSvc.getPartitionById(eq(2))).thenReturn(partition2);
 
-		List<Parameters> response = (List<Parameters>) myClient
+		List<PartitionEntity> partitionList = new ArrayList<PartitionEntity>();
+		partitionList.add(partition1);
+		partitionList.add(partition2);
+		when(myPartitionConfigSvc.listPartitions()).thenReturn(partitionList);
+
+
+		Parameters response = myClient
 			.operation()
 			.onServer()
 			.named(ProviderConstants.PARTITION_MANAGEMENT_LIST_PARTITIONS)
 			.withNoParameters(Parameters.class)
+			.useHttpGet()
 			.encodedXml()
 			.execute();
 
-		System.out.println(response);
+		ourLog.info("Response:\n{}", ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(response));
-//		ourLog.info("Response:\n{}", ourCtx.newJsonParser().setPrettyPrint(true).encodeResourceToString(response.get(0)));
+		verify(myPartitionConfigSvc, times(1)).listPartitions();
-//		verify(myPartitionConfigSvc, times(1)).getPartitionById(any());
+		verifyNoMoreInteractions(myPartitionConfigSvc);
-//		verifyNoMoreInteractions(myPartitionConfigSvc);
+
-//
+		List<Parameters.ParametersParameterComponent> list = getParametersByName(response, "partition");
-//		assertEquals(1, ((IntegerType) response.get(0).getParameter(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_ID)).getValue().intValue());
+		assertThat(list, hasSize(2));
-//		assertEquals("PARTITION-1", ((StringType) response.get(0).getParameter(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_NAME)).getValue());
+		List<Parameters.ParametersParameterComponent> part = list.get(0).getPart();
-//		assertEquals("a description1", ((StringType) response.get(0).getParameter(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_DESC)).getValue());
+		assertThat(part.get(0).getName(), is(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_ID));
+		assertEquals(1, ((IntegerType) part.get(0).getValue()).getValue().intValue());
+		assertThat(part.get(1).getName(), is(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_NAME));
+		assertEquals("PARTITION-1", part.get(1).getValue().toString());
+		assertThat(part.get(2).getName(), is(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_DESC));
+		assertEquals("a description1", part.get(2).getValue().toString());
+
+		part = list.get(1).getPart();
+		assertThat(part.get(0).getName(), is(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_ID));
+		assertEquals(2, ((IntegerType) part.get(0).getValue()).getValue().intValue());
+		assertThat(part.get(1).getName(), is(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_NAME));
+		assertEquals("PARTITION-2", part.get(1).getValue().toString());
+		assertThat(part.get(2).getName(), is(ProviderConstants.PARTITION_MANAGEMENT_PARTITION_DESC));
+		assertEquals("a description2", part.get(2).getValue().toString());
 	}
 
 
@@ -288,4 +311,7 @@ public class PartitionManagementProviderTest {
 		return t -> t.getArgument(0, PartitionEntity.class);
 	}
 
+	private List<Parameters.ParametersParameterComponent> getParametersByName(Parameters theParams, String theName) {
+		return theParams.getParameter().stream().filter(p -> p.getName().equals(theName)).collect(Collectors.toList());
+	}
 }

hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/partition/PartitionSettingsSvcImplTest.java

@@ -8,7 +8,10 @@ import ca.uhn.fhir.rest.server.exceptions.ResourceNotFoundException;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 
+import java.util.List;
+
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public class PartitionSettingsSvcImplTest extends BaseJpaR4Test {
@@ -166,4 +169,25 @@ public class PartitionSettingsSvcImplTest extends BaseJpaR4Test {
 
 	}
 
+	@Test
+	public void testListPartitions() {
+		PartitionEntity partition1 = new PartitionEntity();
+		partition1.setId(1);
+		partition1.setName("PARTITION-1");
+		partition1.setDescription("a description1");
+
+		PartitionEntity partition2 = new PartitionEntity();
+		partition2.setId(2);
+		partition2.setName("PARTITION-2");
+		partition2.setDescription("a description2");
+
+		myPartitionConfigSvc.createPartition(partition1);
+		myPartitionConfigSvc.createPartition(partition2);
+
+		List<PartitionEntity> actual = myPartitionConfigSvc.listPartitions();
+
+		assertEquals(2, actual.size());
+		assertTrue(actual.stream().anyMatch(item -> "PARTITION-1".equals(item.getName())));
+		assertTrue(actual.stream().anyMatch(item -> "PARTITION-2".equals(item.getName())));
+	}
 }