Most tests for lazy working

Author: JohannesRabauer

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/WorkingCopyRegistry.java

@@ -27,6 +27,9 @@
 public class WorkingCopyRegistry
 {
 	private static final Logger LOG = LoggerFactory.getLogger(WorkingCopyRegistry.class);
+	/**
+	 * Map with Working Copies (key) with the corresponding original object (value).
+	 */
 	private Map<Object, Object> currentWorkingCopies = new IdentityHashMap<>();
 
 	/**

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/lazy/SpringDataEclipseStoreLazy.java

@@ -24,6 +24,7 @@
 
 import software.xdev.spring.data.eclipse.store.exceptions.LazyNotUnlinkableException;
 import software.xdev.spring.data.eclipse.store.repository.access.modifier.FieldAccessModifier;
+import software.xdev.spring.data.eclipse.store.repository.support.copier.copier.RegisteringObjectCopier;
 
 
 /**
@@ -67,6 +68,7 @@ class Default<T> implements SpringDataEclipseStoreLazy<T>
 		private Lazy<T> wrappedLazy;
 		private long objectId = Swizzling.notFoundId();
 		private transient ObjectSwizzling loader;
+		private transient RegisteringObjectCopier copier;
 		private transient boolean isStored = false;
 
 		private Default(final Lazy<T> lazySubject)
@@ -79,10 +81,11 @@ private Default(final T objectToBeWrapped)
 			this.objectToBeWrapped = objectToBeWrapped;
 		}
 
-		private Default(final long objectId, final ObjectSwizzling loader)
+		private Default(final long objectId, final ObjectSwizzling loader, final RegisteringObjectCopier copier)
 		{
 			this.objectId = objectId;
 			this.loader = loader;
+			this.copier = copier;
 			// This object is already stored in the real storage. So it can get cleared.
 			this.setStored();
 		}
@@ -100,8 +103,9 @@ private Lazy<T> createNewDefaultLazyWithClearableReference()
 		{
 			Objects.requireNonNull(this.loader);
 			Objects.requireNonNull(this.objectId);
+			Objects.requireNonNull(this.copier);
 			return Lazy.New(
-				(T)this.loader.getObject(this.objectId),
+				(T)this.copier.copy(this.loader.getObject(this.objectId)),
 				Swizzling.nullId(),
 				this.loader
 			);
@@ -211,7 +215,8 @@ public SpringDataEclipseStoreLazy<T> copyOnlyWithReference()
 		{
 			return new SpringDataEclipseStoreLazy.Default(
 				this.objectId(),
-				this.loader
+				this.loader,
+				this.copier
 			);
 		}
 

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/lazy/SpringDataEclipseStoreLazyBinaryHandler.java

@@ -29,6 +29,8 @@
 import org.eclipse.serializer.reference.ObjectSwizzling;
 import org.eclipse.serializer.reflect.XReflect;
 
+import software.xdev.spring.data.eclipse.store.repository.support.copier.copier.RegisteringObjectCopier;
+
 
 /**
  * This is a complicated one. First off: this handler should only be used for WorkingCopies (see
@@ -58,16 +60,20 @@ public final class SpringDataEclipseStoreLazyBinaryHandler
 		XReflect.getDeclaredConstructor(
 			SpringDataEclipseStoreLazy.Default.class,
 			long.class,
-			ObjectSwizzling.class
+			ObjectSwizzling.class,
+			RegisteringObjectCopier.class
 		)
 	);
 
 	public static final int OFFSET_UNWRAPPED_OBJECT = 8;
 	public static final int OFFSET_LAZY = 0;
 
 	private final ObjectSwizzling originalStoreLoader;
+	private final RegisteringObjectCopier copier;
 
-	public SpringDataEclipseStoreLazyBinaryHandler(final ObjectSwizzling originalStoreLoader)
+	public SpringDataEclipseStoreLazyBinaryHandler(
+		final ObjectSwizzling originalStoreLoader,
+		final RegisteringObjectCopier copier)
 	{
 		super(
 			SpringDataEclipseStoreLazy.Default.genericType(),
@@ -77,6 +83,7 @@ public SpringDataEclipseStoreLazyBinaryHandler(final ObjectSwizzling originalSto
 			)
 		);
 		this.originalStoreLoader = Objects.requireNonNull(originalStoreLoader);
+		this.copier = copier;
 	}
 
 	@Override
@@ -112,7 +119,7 @@ public SpringDataEclipseStoreLazy.Default<?> create(final Binary data, final Per
 		if(objectIdOfUnwrappedObject == 0)
 		{
 			return Lazy.register(
-				XReflect.invoke(CONSTRUCTOR_SURROGATE_LAZY, objectIdOfLazy, this.originalStoreLoader)
+				XReflect.invoke(CONSTRUCTOR_SURROGATE_LAZY, objectIdOfLazy, this.originalStoreLoader, this.copier)
 			);
 		}
 		return XMemory.instantiateBlank(SpringDataEclipseStoreLazy.Default.class);

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

@@ -59,7 +59,7 @@ private PersistenceManager<Binary> createPersistenceManager(
 		return serializerFoundation
 			.registerCustomTypeHandler(BinaryHandlerImmutableCollectionsSet12.New())
 			.registerCustomTypeHandler(BinaryHandlerImmutableCollectionsList12.New())
-			.registerCustomTypeHandlers(new SpringDataEclipseStoreLazyBinaryHandler(objectSwizzling))
+			.registerCustomTypeHandlers(new SpringDataEclipseStoreLazyBinaryHandler(objectSwizzling, this))
 			.createPersistenceManager();
 	}