continued self review

Author: Pa-Touche

sormas-api/src/main/java/de/symeda/sormas/api/patch/DataPatchFailure.java

@@ -22,9 +22,6 @@ public class DataPatchFailure implements Serializable {
 	@Nullable
 	private Object providedFieldValue;
 
-	@Nullable
-	private String description;
-
 	public DataPatchFailureCause getDataPatchFailureCause() {
 		return dataPatchFailureCause;
 	}
@@ -52,19 +49,10 @@ public DataPatchFailure setProvidedFieldValue(Object providedFieldValue) {
 		return this;
 	}
 
-	public String getDescription() {
-		return description;
-	}
-
-	public DataPatchFailure setDescription(String description) {
-		this.description = description;
-		return this;
-	}
-
 	@Override
 	public String toString() {
 		return "DataPatchFailure{" + "dataPatchFailureCause=" + dataPatchFailureCause + ", existingFieldValue=" + existingFieldValue
-			+ ", providedFieldValue=" + providedFieldValue + ", description='" + description + '\'' + '}';
+			+ ", providedFieldValue=" + providedFieldValue + "\"" + '\'' + '}';
 	}
 
 	@Override
@@ -74,12 +62,11 @@ public boolean equals(Object o) {
 		DataPatchFailure that = (DataPatchFailure) o;
 		return dataPatchFailureCause == that.dataPatchFailureCause
 			&& Objects.equals(existingFieldValue, that.existingFieldValue)
-			&& Objects.equals(providedFieldValue, that.providedFieldValue)
-			&& Objects.equals(description, that.description);
+			&& Objects.equals(providedFieldValue, that.providedFieldValue);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(dataPatchFailureCause, existingFieldValue, providedFieldValue, description);
+		return Objects.hash(dataPatchFailureCause, existingFieldValue, providedFieldValue);
 	}
 }

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

@@ -29,8 +29,8 @@
 import de.symeda.sormas.backend.common.ConfigFacadeEjb;
 import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb;
 import de.symeda.sormas.backend.json.ObjectMapperProvider;
-import de.symeda.sormas.backend.patch.mapping.PatchEqualityCheckersRegistry;
 import de.symeda.sormas.backend.patch.mapping.FieldCustomMapperRegistry;
+import de.symeda.sormas.backend.patch.mapping.PatchEqualityCheckersRegistry;
 import de.symeda.sormas.backend.patch.mapping.ValueMapperRegistry;
 import de.symeda.sormas.backend.util.CollectorUtils;
 
@@ -71,6 +71,7 @@ public DataPatcherImpl(
 		BusinessDtoFacade businessDtoFacade,
 		FeatureConfigurationFacadeEjb.FeatureConfigurationFacadeEjbLocal featureConfigurationFacade,
 		ConfigFacadeEjb.ConfigFacadeEjbLocal configFacade) {
+
 		this.patchFieldHelper = patchFieldHelper;
 		this.valueMapperRegistry = valueMapperRegistry;
 		this.fieldCustomMapperRegistry = fieldCustomMapperRegistry;
@@ -102,9 +103,8 @@ public DataPatchResponse patch(CaseDataPatchRequest request) {
 			try {
 				return produceSinglePatchResult(request, singleFieldPatchResult, disease, target);
 			} catch (RuntimeException e) {
-				logger.error("Failure during patch operation", e);
-				return singlePatchResult
-					.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setDescription(e.getMessage()));
+				logger.error("Failure during patch operation for request: [{}], [{}]", request, singleFieldPatchResult, e);
+				return singlePatchResult.setFailure(new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL));
 			}
 
 		}).collect(Collectors.toList());
@@ -230,11 +230,9 @@ private void saveDTOsIfAppropriate(Map<String, AttachedEntityWrapper> entityCach
 		Optional<Exception> exception = PropertyAccessor.setNestedProperty(target, relativeFieldName, typedValue);
 		if (exception.isPresent()) {
 			Exception e = exception.orElseThrow();
-			logger.error("Setting nested property failed", e);
+			logger.error("Setting nested property failed for: field [{}] on [{}] with value: [{}]", relativeFieldName, target, typedValue, e);
 			return singlePatchResult.setFailure(
-				new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL)
-					.setDescription(e.getMessage())
-					.setProvidedFieldValue(untypedTargetValue));
+				new DataPatchFailure().setDataPatchFailureCause(DataPatchFailureCause.TECHNICAL).setProvidedFieldValue(untypedTargetValue));
 		} else {
 			return singlePatchResult.setValue(untypedTargetValue);
 		}
@@ -328,15 +326,8 @@ private List<SingleFieldPatchResult> computePatchingTuples(CaseDataPatchRequest
 
 	@NotNull
 	private Stream<SingleFieldPatchResult> splitMultipleFieldsPath(Map.Entry<String, Object> entry) {
-		String path = entry.getKey();
-		int openingParenthesisIndex = path.indexOf("(");
-		String prefix = path.substring(0, openingParenthesisIndex);
-
-		int closeParen = path.indexOf(')');
-
-		String restPath = path.substring(openingParenthesisIndex + 1, closeParen);
-
-		return Arrays.stream(restPath.split("\\|")).map(suffix -> new SingleFieldPatchResult(prefix + suffix, null, entry.getValue()));
+		return patchFieldHelper.splitMultipleFieldsPath(entry.getKey())
+			.map(singlePath -> new SingleFieldPatchResult(singlePath, null, entry.getValue()));
 	}
 
 	private @NotNull Predicate<Map.Entry<String, Object>> buildAdequateDictionaryValuePredicate(CaseDataPatchRequest request) {
@@ -350,6 +341,7 @@ private Stream<SingleFieldPatchResult> splitMultipleFieldsPath(Map.Entry<String,
 		if (caseData == null) {
 			throw new IllegalStateException(String.format("No case found for uuid: [%s]", caseUuid));
 		}
+
 		return caseData;
 	}
 

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

@@ -67,7 +67,7 @@ public Set<Tuple<String, PathFailureCause>> extractFieldTuples(Set<String> field
 	}
 
 	@NotNull
-	private Stream<String> splitMultipleFieldsPath(String path) {
+	public Stream<String> splitMultipleFieldsPath(String path) {
 		int openingParenthesisIndex = path.indexOf("(");
 		String prefix = path.substring(0, openingParenthesisIndex);
 

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

@@ -89,7 +89,7 @@ public static Tuple<Tuple<Class<?>, Object>, PropertyAccessFailure> getPropertyT
 				})
 				.orElseGet(() -> Tuple.of(null, PropertyAccessFailure.FIELD_DOES_NOT_EXIST));
 		} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-			logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e);
+			logger.info("Could not get property type for [{}], [{}]", fieldName, bean, e);
 			return null;
 		}
 	}
@@ -109,7 +109,7 @@ public static Tuple<Class<?>, PropertyAccessFailure> getPropertyType(
 				return new Tuple<>(propertyType, null);
 			}).orElse(FIELD_DOES_NOT_EXIST);
 		} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-			logger.info("Could not get property type for [{}], [{}]", fieldName, bean.getClass().getSimpleName(), e);
+			logger.info("Could not get property type for [{}], [{}]", fieldName, bean, e);
 			return FIELD_DOES_NOT_EXIST;
 		}
 	}

sormas-ui/src/main/java/de/symeda/sormas/ui/externalmessage/surveyresponse/SurveyResponseFailurePanel.java

@@ -70,11 +70,6 @@ public SurveyResponseFailurePanel(Map<String, DataPatchFailure> failures, Displa
 			.setId("currentValue")
 			.setExpandRatio(2);
 
-		grid.addColumn(entry -> entry.getValue().getDescription() != null ? entry.getValue().getDescription() : "")
-			.setCaption(I18nProperties.getCaption(Captions.surveyResponseDescription))
-			.setId("description")
-			.setExpandRatio(3);
-
 		grid.setHeightByRows(Math.max(failureEntries.size(), 1));
 
 		addComponent(grid);