HashMaps are now specifically copied when merged. There is no other, clean way.

Author: JohannesRabauer

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/working/RecursiveWorkingCopier.java

@@ -19,6 +19,9 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.Collection;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.LinkedHashMap;
 import java.util.Objects;
 
 import org.slf4j.Logger;
@@ -253,12 +256,23 @@ else if(DataTypeUtil.isObjectArray(valueOfSourceObject))
 								originalValueObjectOfSource,
 								!targetObjectIsPartOfJavaPackage);
 						}
-						// Merge after setting reference to avoid endless loops
-						this.mergeValues(
-							valueOfSourceObject,
-							originalValueObjectOfSource,
-							alreadyMergedTargets,
-							changedCollector);
+						
+						if(this.isSpecialCaseWhereOnlyAFullCopyWorks(valueOfSourceObject))
+						{
+							fam.writeValueOfField(
+								targetObject,
+								this.onlyCreateCopy(valueOfSourceObject, true),
+								!targetObjectIsPartOfJavaPackage);
+						}
+						else
+						{
+							// Merge after setting reference to avoid endless loops
+							this.mergeValues(
+								valueOfSourceObject,
+								originalValueObjectOfSource,
+								alreadyMergedTargets,
+								changedCollector);
+						}
 					}
 				}
 			}
@@ -269,6 +283,21 @@ else if(DataTypeUtil.isObjectArray(valueOfSourceObject))
 		}
 	}
 
+	/**
+	 * Super special case for HashMap or similar java-classes which can't be merged nicely. Thus, we make a simple copy
+	 * of the whole object.
+	 */
+	private boolean isSpecialCaseWhereOnlyAFullCopyWorks(final Object valueOfSourceObject)
+	{
+		return
+			valueOfSourceObject != null
+				&& (
+				valueOfSourceObject.getClass().isAssignableFrom(HashMap.class)
+					|| valueOfSourceObject.getClass().isAssignableFrom(LinkedHashMap.class)
+					|| valueOfSourceObject.getClass().isAssignableFrom(Hashtable.class)
+			);
+	}
+	
 	@SuppressWarnings("unchecked")
 	private <E> E[] createGenericObjectArray(
 		final Class<E> clazz,

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/integration/isolated/tests/special/types/TypesTest.java

@@ -21,7 +21,6 @@
 import java.util.function.Function;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -127,8 +126,6 @@ <T extends ComplexObject<?>> void simpleChangeAfterStore(
 
 	@ParameterizedTest
 	@MethodSource(TYPES_DATA_SOURCE)
-	// TODO: Fix this.
-	@Disabled("Is not fixed yet, but will be.")
 	<T extends ComplexObject<?>> void doubleStoreSameEntityWithChange(
 		final Class<? extends EclipseStoreRepository<T, Integer>> repositoryClass,
 		final Function<Integer, T> objectCreator,