Fix for restarting bug

Author: JohannesRabauer

spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexDemoApplicationTest.java

@@ -8,7 +8,6 @@
 import org.springframework.boot.test.context.SpringBootTest;
 
 import software.xdev.spring.data.eclipse.store.demo.TestUtil;
-import software.xdev.spring.data.eclipse.store.demo.simple.SimpleDemoApplication;
 import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
 
 
@@ -34,6 +33,6 @@ void checkPossibilityToSimplyStartAndRestartApplication()
 	{
 		this.configuration.getStorageInstance().clearData();
 		this.configuration.getStorageInstance().stop();
-		SimpleDemoApplication.main(new String[]{});
+		ComplexDemoApplication.main(new String[]{});
 	}
 }

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

@@ -165,9 +165,10 @@ private void initRoot()
 		{
 			if(this.root.getCurrentRootData().getEntityData(entityClass) == null)
 			{
-				this.createNewEntityList(entityClass);
+				this.root.getCurrentRootData().createNewEntityData(entityClass);
 				entityListMustGetStored = true;
 			}
+			this.setIdManagerForEntityData(entityClass, this.root);
 		}
 		if(entityListMustGetStored)
 		{
@@ -183,10 +184,11 @@ private void initRoot()
 		}
 	}
 
-	private <T, ID> void createNewEntityList(final Class<T> entityClass)
+	private <T, ID> void setIdManagerForEntityData(final Class<T> entityClass, final VersionedRoot root)
 	{
 		final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
-		this.root.getCurrentRootData().createNewEntityList(entityClass, idManager::getId);
+		final EntityData<T, Object> entityData = root.getCurrentRootData().getEntityData(entityClass);
+		entityData.setIdGetter(idManager::getId);
 	}
 
 	public synchronized <T> void registerEntity(
@@ -356,7 +358,7 @@ public synchronized void stop()
 				LOG.info("Stopping storage...");
 				if(this.storageManager != null)
 				{
-					this.storageManager.shutdown();
+					this.storageManager.close();
 					this.storageManager = null;
 					this.root = null;
 					this.registry.reset();
@@ -418,7 +420,8 @@ public void setLastId(final Class<?> entityClass, final Object lastId)
 				final EntityData<?, Object> entityData = this.root.getCurrentRootData().getEntityData(entityClass);
 				if(entityData == null)
 				{
-					this.createNewEntityList(entityClass);
+					this.root.getCurrentRootData().createNewEntityData(entityClass);
+					this.setIdManagerForEntityData(entityClass, this.root);
 					this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());
 				}
 				this.root.getCurrentRootData().setLastId(entityClass, lastId);

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

@@ -40,15 +40,19 @@ public class EntityData<T, ID>
 	 */
 	private final HashMap<ID, T> entitiesById;
 
-	private final transient Function<T, ID> idGetter;
+	private transient Function<T, ID> idGetter;
 
-	public EntityData(final Function<T, ID> idGetter)
+	public EntityData()
 	{
-		this.idGetter = idGetter;
 		this.entities = new IdentitySet<>();
 		this.entitiesById = new HashMap<>();
 	}
 
+	public void setIdGetter(final Function<T, ID> idGetter)
+	{
+		this.idGetter = idGetter;
+	}
+	
 	public IdentitySet<T> getEntities()
 	{
 		return this.entities;

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

@@ -17,7 +17,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.Function;
 
 
 /**
@@ -58,11 +57,9 @@ public <T, ID> EntityData<T, ID> getEntityData(final String entityClassName)
 		return (EntityData<T, ID>)this.entityLists.get(entityClassName);
 	}
 
-	public <T, ID> void createNewEntityList(
-		final Class<T> entityClass,
-		final Function<T, ID> idGetter)
+	public <T, ID> void createNewEntityData(final Class<T> entityClass)
 	{
-		this.entityLists.put(this.getEntityName(entityClass), new EntityData<>(idGetter));
+		this.entityLists.put(this.getEntityName(entityClass), new EntityData<>());
 	}
 
 	private <T> String getEntityName(final Class<T> classToRegister)

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

@@ -27,7 +27,8 @@ public class DummyEntityProvider<T> extends EntityProvider<T, Void>
 	public DummyEntityProvider(final Collection<T> collection)
 	{
 		super();
-		final EntityData<T, Void> objects = new EntityData<>(t -> null);
+		final EntityData<T, Void> objects = new EntityData<>();
+		objects.setIdGetter(i -> null);
 		objects.getEntities().addAll(collection);
 		this.addEntityData(objects);
 	}