Fixed some lazy repo problems

Author: JohannesRabauer

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

@@ -212,11 +212,11 @@ public <T, ID> void createNewEntityData(final Class<T> entityClass, final Versio
 		final SimpleEclipseStoreRepository<?, ?> repository = this.entityClassToRepository.get(entityClass);
 		if(repository != null && repository.isLazy())
 		{
-			root.getCurrentRootData().createNewLazyEntityData(entityClass, idManager);
+			root.getCurrentRootData().createNewLazyEntityData(entityClass, idManager.hasIdField() ? idManager : null);
 		}
 		else
 		{
-			root.getCurrentRootData().createNewEntityData(entityClass, idManager);
+			root.getCurrentRootData().createNewEntityData(entityClass, idManager.hasIdField() ? idManager : null);
 		}
 	}
 

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/root/v2_4/LazyEntityData.java

@@ -18,7 +18,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
-import java.util.function.Function;
 import java.util.stream.Stream;
 
 import org.eclipse.serializer.reference.Lazy;
@@ -83,7 +82,8 @@ public boolean containsEntity(final T entity)
 		else
 		{
 			final ID id = this.idGetter.getId(entity);
-			return this.entitiesById.containsKey(id);
+			final Lazy<T> existingEntity = this.entitiesById.get(id);
+			return existingEntity != null && existingEntity.get() == entity;
 		}
 	}
 
@@ -128,18 +128,25 @@ public void setLastId(final Object lastId)
 	@Override
 	public Collection<Object> ensureEntityAndReturnObjectsToStore(final T entityToStore)
 	{
-		if(!this.containsEntity(entityToStore))
+		Collection<Object> listToSave = List.of();
+		if(this.idGetter == null && !this.containsEntity(entityToStore))
 		{
-			final SpringDataEclipseStoreLazy.Default<T> newLazyEntity =
-				SpringDataEclipseStoreLazy.build(entityToStore);
-			this.entities.add(newLazyEntity);
-			if(this.idGetter != null)
+			this.entities.add(SpringDataEclipseStoreLazy.build(entityToStore));
+			listToSave = this.getObjectsToStore();
+		}
+		if(this.idGetter != null)
+		{
+			final Lazy<T> existingEntity = this.entitiesById.get(this.idGetter.getId(entityToStore));
+			if(existingEntity == null || existingEntity.get() != entityToStore)
 			{
-				this.entitiesById.put(this.idGetter.getId(entityToStore), newLazyEntity);
+				this.entities.remove(existingEntity);
+				final SpringDataEclipseStoreLazy<T> newLazyInstance = SpringDataEclipseStoreLazy.build(entityToStore);
+				this.entities.add(newLazyInstance);
+				this.entitiesById.put(this.idGetter.getId(entityToStore), newLazyInstance);
+				listToSave = this.getObjectsToStore();
 			}
-			return this.getObjectsToStore();
 		}
-		return List.of();
+		return listToSave;
 	}
 
 	@Override

spring-data-eclipse-store/src/test/java/software/xdev/spring/data/eclipse/store/helper/DummyEntityProvider.java

@@ -29,7 +29,7 @@ public DummyEntityProvider(final Collection<T> collection)
 	{
 		super();
 		final EntityData<T, Void> objects = new NonLazyEntityData<>();
-		objects.setIdGetter(i -> null);
+		objects.setIdGetter(null);
 		collection.forEach(objects::ensureEntityAndReturnObjectsToStore);
 		this.addEntityData(objects);
 	}