LazyRepositories: Implemented StorageCommunicator

Author: JohannesRabauer

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

@@ -41,7 +41,6 @@
 import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository;
 import software.xdev.spring.data.eclipse.store.repository.root.EntityData;
 import software.xdev.spring.data.eclipse.store.repository.root.VersionedRoot;
-import software.xdev.spring.data.eclipse.store.repository.support.SimpleEclipseStoreRepository;
 import software.xdev.spring.data.eclipse.store.repository.support.concurrency.ReadWriteLock;
 import software.xdev.spring.data.eclipse.store.repository.support.concurrency.ReentrantJavaReadWriteLock;
 import software.xdev.spring.data.eclipse.store.repository.support.copier.version.EntityVersionIncrementer;
@@ -60,6 +59,7 @@ public class EclipseStoreStorage
 {
 	private static final Logger LOG = LoggerFactory.getLogger(EclipseStoreStorage.class);
 	private final Map<Class<?>, EclipseStoreRepository<?, ?>> entityClassToRepository = new HashMap<>();
+	private final Map<Class<?>, EclipseStoreRepository<?, ?>> lazyEntityClassToRepository = new HashMap<>();
 	/**
 	 * "Why are the IdManagers seperated from the repositories?" - Because there might be entities for which there are
 	 * no repositories, but they still have IDs.
@@ -161,6 +161,11 @@ else if(!(embeddedStorageManager.root() instanceof VersionedRoot))
 		return this.entityClassToRepository.get(entityClass);
 	}
 
+	public <T> EclipseStoreRepository<?, ?> getLazyRepository(final Class<T> entityClass)
+	{
+		return this.lazyEntityClassToRepository.get(entityClass);
+	}
+	
 	private void initRoot()
 	{
 		if(LOG.isDebugEnabled())
@@ -169,6 +174,20 @@ private void initRoot()
 		}
 		this.repositorySynchronizer =
 			new SimpleRepositorySynchronizer(this.root.getCurrentRootData());
+		this.ensureEntityData();
+		this.ensureLazyEntityData();
+		this.entitySetCollector =
+			new EntitySetCollector(
+				this.root.getCurrentRootData()::getEntityData,
+				this.entityClassToRepository.keySet());
+		if(LOG.isDebugEnabled())
+		{
+			LOG.debug("Done initializing entity lists.");
+		}
+	}
+	
+	private void ensureEntityData()
+	{
 		boolean entityListMustGetStored = false;
 		for(final Class<?> entityClass : this.entityClassToRepository.keySet())
 		{
@@ -186,13 +205,26 @@ private void initRoot()
 		{
 			this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());
 		}
-		this.entitySetCollector =
-			new EntitySetCollector(
-				this.root.getCurrentRootData()::getEntityData,
-				this.entityClassToRepository.keySet());
-		if(LOG.isDebugEnabled())
+	}
+	
+	private void ensureLazyEntityData()
+	{
+		boolean entityListMustGetStored = false;
+		for(final Class<?> entityClass : this.lazyEntityClassToRepository.keySet())
 		{
-			LOG.debug("Done initializing entity lists.");
+			if(this.root.getCurrentRootData().getLazyEntityData(entityClass) == null)
+			{
+				this.createNewLazyEntityData(entityClass, this.root);
+				entityListMustGetStored = true;
+			}
+			else
+			{
+				this.setIdManagerForEntityData(entityClass, this.root);
+			}
+		}
+		if(entityListMustGetStored)
+		{
+			this.storageManager.store(this.root.getCurrentRootData().getLazyEntityListsToStore());
 		}
 	}
 
@@ -202,6 +234,12 @@ private <T, ID> void createNewEntityData(final Class<T> entityClass, final Versi
 		root.getCurrentRootData().createNewEntityData(entityClass, idManager::getId);
 	}
 
+	private <T, ID> void createNewLazyEntityData(final Class<T> entityClass, final VersionedRoot root)
+	{
+		final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
+		root.getCurrentRootData().createNewLazyEntityData(entityClass, idManager::getId);
+	}
+	
 	private <T, ID> void setIdManagerForEntityData(final Class<T> entityClass, final VersionedRoot root)
 	{
 		final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
@@ -237,9 +275,13 @@ public synchronized <T> void registerEntity(
 	private <T, ID> EntityData<T, ID> getEntityData(final Class<T> clazz)
 	{
 		this.ensureEntitiesInRoot();
-		return this.readWriteLock.read(
-			() -> this.root.getCurrentRootData().getEntityData(clazz)
-		);
+		return this.readWriteLock.read(() -> this.root.getCurrentRootData().getEntityData(clazz));
+	}
+	
+	private <T, ID> EntityData<T, ID> getLazyEntityData(final Class<T> clazz)
+	{
+		this.ensureEntitiesInRoot();
+		return this.readWriteLock.read(() -> this.root.getCurrentRootData().getLazyEntityData(clazz));
 	}
 
 	@Override
@@ -298,10 +340,12 @@ private <T, ID> Collection<Object> collectRootEntitiesToStore(
 		final Iterable<T> entitiesToStore)
 	{
 		final EntityData<T, ID> entityData = this.getEntityData(clazz);
+		final EntityData<T, ID> lazyEntityData = this.getLazyEntityData(clazz);
 		final Collection<Object> objectsToStore = new ArrayList<>();
 		for(final T entityToStore : entitiesToStore)
 		{
 			objectsToStore.addAll(entityData.ensureEntityAndReturnObjectsToStore(entityToStore));
+			objectsToStore.addAll(lazyEntityData.ensureEntityAndReturnObjectsToStore(entityToStore));
 			objectsToStore.add(entityToStore);
 			// Add the separate lists of entities to store.
 			this.repositorySynchronizer.syncAndReturnChangedObjectLists(entityToStore).forEach(

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

@@ -0,0 +1,24 @@
+package software.xdev.spring.data.eclipse.store.repository;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import software.xdev.spring.data.eclipse.store.core.EntityProvider;
+import software.xdev.spring.data.eclipse.store.repository.support.concurrency.ReadWriteLock;
+
+
+public interface StorageCommunicator
+{
+	ReadWriteLock getReadWriteLock();
+	
+	<T> void store(Set<Object> nonEntitiesToStore, Class<T> domainClass, List<T> entitiesToStore);
+	
+	<T, ID> EntityProvider<T, ID> getEntityProvider(final Class<T> clazz);
+	
+	<T> long getEntityCount(Class<T> domainClass);
+	
+	<T> void delete(Class<T> domainClass, T foundEntity);
+	
+	<T> void deleteAll(Class<T> domainClass);
+}

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

@@ -15,14 +15,13 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.interfaces.lazy;
 
-import org.eclipse.serializer.reference.Lazy;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 
 
 @SuppressWarnings("java:S119")
 @NoRepositoryBean
-public interface LazyEclipseStoreCrudRepository<T, ID> extends CrudRepository<Lazy<T>, ID>
+public interface LazyEclipseStoreCrudRepository<T, ID> extends CrudRepository<T, ID>
 {
 	/**
 	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
@@ -40,15 +39,6 @@ public interface LazyEclipseStoreCrudRepository<T, ID> extends CrudRepository<La
 	@Override
 	void deleteById(ID id);
 
-	/**
-	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
-	 * another object, the behavior of this function may differ from what you are used to!
-	 * <p>
-	 * For more information see {@link #deleteById(Object)}
-	 * </p>
-	 */
-	void deleteEntity(T entity);
-	
 	/**
 	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
 	 * another object, the behavior of this function may differ from what you are used to!
@@ -57,7 +47,7 @@ public interface LazyEclipseStoreCrudRepository<T, ID> extends CrudRepository<La
 	 * </p>
 	 */
 	@Override
-	void delete(Lazy<T> entity);
+	void delete(T entity);
 
 	/**
 	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
@@ -77,16 +67,7 @@ public interface LazyEclipseStoreCrudRepository<T, ID> extends CrudRepository<La
 	 * </p>
 	 */
 	@Override
-	void deleteAll(Iterable<? extends Lazy<T>> entities);
-	
-	/**
-	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
-	 * another object, the behavior of this function may differ from what you are used to!
-	 * <p>
-	 * For more information see {@link #deleteById(Object)}
-	 * </p>
-	 */
-	void deleteAllEntities(Iterable<? extends T> entities);
+	void deleteAll(Iterable<? extends T> entities);
 
 	/**
 	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by

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

@@ -22,6 +22,6 @@
 
 @SuppressWarnings("java:S119")
 @NoRepositoryBean
-public interface LazyEclipseStoreCustomRepository<T, ID> extends Repository<Lazy<T>, ID>
+public interface LazyEclipseStoreCustomRepository<T, ID> extends Repository<T, ID>
 {
 }

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

@@ -15,16 +15,13 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.interfaces.lazy;
 
-import java.util.List;
-
-import org.eclipse.serializer.reference.Lazy;
 import org.springframework.data.repository.ListCrudRepository;
 import org.springframework.data.repository.NoRepositoryBean;
 
 
 @SuppressWarnings("java:S119")
 @NoRepositoryBean
-public interface LazyEclipseStoreListCrudRepository<T, ID> extends ListCrudRepository<Lazy<T>, ID>
+public interface LazyEclipseStoreListCrudRepository<T, ID> extends ListCrudRepository<T, ID>
 {
 	/**
 	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
@@ -34,26 +31,7 @@ public interface LazyEclipseStoreListCrudRepository<T, ID> extends ListCrudRepos
 	 * </p>
 	 */
 	@Override
-	void deleteById(ID id);
-	
-	/**
-	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
-	 * another object, the behavior of this function may differ from what you are used to!
-	 * <p>
-	 * For more information see {@link LazyEclipseStoreCrudRepository#deleteById(Object)}
-	 * </p>
-	 */
-	@Override
-	void delete(Lazy<T> entity);
-	
-	/**
-	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
-	 * another object, the behavior of this function may differ from what you are used to!
-	 * <p>
-	 * For more information see {@link LazyEclipseStoreCrudRepository#deleteById(Object)}
-	 * </p>
-	 */
-	void deleteEntity(T entity);
+	void delete(T entity);
 
 	/**
 	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
@@ -73,16 +51,7 @@ public interface LazyEclipseStoreListCrudRepository<T, ID> extends ListCrudRepos
 	 * </p>
 	 */
 	@Override
-	void deleteAll(Iterable<? extends Lazy<T>> entities);
-	
-	/**
-	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
-	 * another object, the behavior of this function may differ from what you are used to!
-	 * <p>
-	 * For more information see {@link LazyEclipseStoreCrudRepository#deleteById(Object)}
-	 * </p>
-	 */
-	void deleteAllEntities(Iterable<? extends T> entities);
+	void deleteAll(Iterable<? extends T> entities);
 
 	/**
 	 * @inheritDoc <b>Caution with referenced objects!</b><br/> If you are deleting an object that is referenced by
@@ -93,8 +62,4 @@ public interface LazyEclipseStoreListCrudRepository<T, ID> extends ListCrudRepos
 	 */
 	@Override
 	void deleteAll();
-	
-	<S extends T> List<S> saveAllEntities(Iterable<S> entities);
-	
-	<S extends T> S saveEntity(S entity);
 }

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

@@ -23,6 +23,6 @@
 @SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface LazyEclipseStoreListPagingAndSortingRepositoryRepository<T, ID>
-	extends ListPagingAndSortingRepository<Lazy<T>, ID>
+	extends ListPagingAndSortingRepository<T, ID>
 {
 }

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

@@ -23,6 +23,6 @@
 @SuppressWarnings("java:S119")
 @NoRepositoryBean
 public interface LazyEclipseStorePagingAndSortingRepositoryRepository<T, ID>
-	extends PagingAndSortingRepository<Lazy<T>, ID>
+	extends PagingAndSortingRepository<T, ID>
 {
 }

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

@@ -22,6 +22,6 @@
 
 @SuppressWarnings("java:S119")
 @NoRepositoryBean
-public interface LazyEclipseStoreQueryByExampleExecutor<T> extends QueryByExampleExecutor<Lazy<T>>
+public interface LazyEclipseStoreQueryByExampleExecutor<T> extends QueryByExampleExecutor<T>
 {
 }

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

@@ -28,6 +28,6 @@ public interface LazyEclipseStoreRepository<T, ID>
 	LazyEclipseStoreListCrudRepository<T, ID>,
 	LazyEclipseStoreListPagingAndSortingRepositoryRepository<T, ID>,
 	LazyEclipseStoreQueryByExampleExecutor<T>,
-	EclipseStoreRepository<Lazy<T>, ID>
+	EclipseStoreRepository<T, ID>
 {
 }

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/query/by/example/EclipseStoreFetchableFluentQuery.java

@@ -25,7 +25,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.query.FluentQuery;
 
-import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
+import software.xdev.spring.data.eclipse.store.repository.StorageCommunicator;
 import software.xdev.spring.data.eclipse.store.repository.query.criteria.CriteriaByExample;
 import software.xdev.spring.data.eclipse.store.repository.query.executors.CountQueryExecutor;
 import software.xdev.spring.data.eclipse.store.repository.query.executors.ExistsQueryExecutor;
@@ -43,14 +43,14 @@ public class EclipseStoreFetchableFluentQuery<T, S extends T> implements FluentQ
 	private final WorkingCopier<T> copier;
 	private final Example<S> example;
 	private final Class<T> domainClass;
-	private final EclipseStoreStorage storage;
+	private final StorageCommunicator storage;
 	private final Sort sort;
 
 	public EclipseStoreFetchableFluentQuery(
 		final WorkingCopier<T> copier,
 		final Example<S> example,
 		final Class<T> domainClass,
-		final EclipseStoreStorage storage,
+		final StorageCommunicator storage,
 		final Sort sort
 	)
 	{