reverted supplier usage which isn't required

Author: Pa-Touche

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/DataPatcherImpl.java

@@ -190,10 +190,10 @@ public DataPatchResponse patch(CaseDataPatchRequest request) {
 		return response.setApplied(true);
 	}
 
-	private static @NotNull Map<CustomizableContextIndexKey, Supplier<String>> buildEntityUuidDictionaryFrom(
+	private static @NotNull Map<CustomizableContextIndexKey, String> buildEntityUuidDictionaryFrom(
 		Map<Tuple<String, Integer>, AttachedEntityWrapper> entityCache,
 		CaseDataDto caseData) {
-		Map<CustomizableContextIndexKey, Supplier<String>> temporaryResult = entityCache.entrySet()
+		Map<CustomizableContextIndexKey, String> temporaryResult = entityCache.entrySet()
 			.stream()
 			.map(
 				entry -> CustomizableFieldContextPatchMapping.fromI18nName(entry.getKey().getFirst())
@@ -202,7 +202,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) {
 							new CustomizableContextIndexKey().setContext(context).setGroupIndex(entry.getKey().getSecond()),
 							entry.getValue().getEntityDto().getUuid())))
 			.flatMap(Optional::stream)
-			.collect(Collectors.toMap(Tuple::getFirst, t -> t::getSecond));
+			.collect(Collectors.toMap(Tuple::getFirst, Tuple::getSecond));
 
 		if (temporaryResult.keySet().stream().anyMatch(key -> key.getContext() == CustomizableFieldContext.EPIDATA)) {
 			return temporaryResult;
@@ -214,7 +214,7 @@ public DataPatchResponse patch(CaseDataPatchRequest request) {
 			Stream.of(
 				new AbstractMap.SimpleEntry<>(
 					new CustomizableContextIndexKey().setContext(CustomizableFieldContext.EPIDATA),
-					(Supplier<String>) () -> caseData.getEpiData().getUuid())))
+					caseData.getEpiData().getUuid())))
 			.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
 	}
 

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/customizablefield/CustomizableFieldDataPatchRequest.java

@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.Supplier;
 
 import javax.validation.constraints.NotNull;
 
@@ -23,7 +22,7 @@ public final class CustomizableFieldDataPatchRequest {
 	private CaseDataDto caseDataDto;
 
 	@NotNull
-	private Map<CustomizableContextIndexKey, Supplier<String>> entityUuidDictionary;
+	private Map<CustomizableContextIndexKey, String> entityUuidDictionary;
 
 	public CaseDataPatchRequest getCaseDataPatchRequest() {
 		return caseDataPatchRequest;
@@ -52,11 +51,11 @@ public CustomizableFieldDataPatchRequest setCaseDataDto(CaseDataDto caseDataDto)
 		return this;
 	}
 
-	public Map<CustomizableContextIndexKey, Supplier<String>> getEntityUuidDictionary() {
+	public Map<CustomizableContextIndexKey, String> getEntityUuidDictionary() {
 		return entityUuidDictionary;
 	}
 
-	public CustomizableFieldDataPatchRequest setEntityUuidDictionary(Map<CustomizableContextIndexKey, Supplier<String>> entityUuidDictionary) {
+	public CustomizableFieldDataPatchRequest setEntityUuidDictionary(Map<CustomizableContextIndexKey, String> entityUuidDictionary) {
 		this.entityUuidDictionary = entityUuidDictionary;
 		return this;
 	}

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/customizablefield/CustomizableFieldDataPatcher.java

@@ -7,7 +7,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import javax.ejb.EJB;
@@ -184,19 +183,16 @@ private Map<CustomizableFieldContext, Map<CustomizableFieldMetadataDto, Function
 			contexts.stream().map(context -> {
 				List<CustomizableFieldMetadataDto> activeFieldsForContext = metaDataFacade.getActiveFieldsForContext(context);
 
-				Map<CustomizableContextIndexKey, Supplier<String>> entityUuidDictionary = request.getEntityUuidDictionary();
+				Map<CustomizableContextIndexKey, String> entityUuidDictionary = request.getEntityUuidDictionary();
 
 				Map<String, Map<CustomizableFieldMetadataDto, CustomizableFieldValueDto>> entityValuesCache = new HashMap<>();
 
 				Map<CustomizableFieldMetadataDto, Function<CustomizablePatchField, CustomizableFieldValueDto>> valueProviderDictionary =
 					activeFieldsForContext.stream().collect(Collectors.toMap(Function.identity(), metaData -> (customizablePatchField) -> {
 
-						String entityUuid =
-							entityUuidDictionary
-								.get(
-									new CustomizableContextIndexKey().setContext(customizablePatchField.getContext())
-										.setGroupIndex(customizablePatchField.getGroupIndex()))
-								.get();
+						String entityUuid = entityUuidDictionary.get(
+							new CustomizableContextIndexKey().setContext(customizablePatchField.getContext())
+								.setGroupIndex(customizablePatchField.getGroupIndex()));
 
 						Map<CustomizableFieldMetadataDto, CustomizableFieldValueDto> alreadyExistingValuesForEntity =
 							entityValuesCache.computeIfAbsent(entityUuid, uuid -> valueFacade.getValuesForEntity(uuid, context));