Fix NPE for idGetter

Author: JohannesRabauer

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

@@ -31,7 +31,6 @@ static void clearPreviousData()
 	@Test
 	void checkPossibilityToSimplyStartAndRestartApplication()
 	{
-		this.configuration.getStorageInstance().clearData();
 		this.configuration.getStorageInstance().stop();
 		ComplexDemoApplication.main(new String[]{});
 	}

spring-data-eclipse-store-demo/src/test/java/software/xdev/spring/data/eclipse/store/demo/simple/SimpleDemoApplicationTest.java

@@ -33,7 +33,6 @@ static void clearPreviousData()
 	@Test
 	void checkPossibilityToSimplyStartAndRestartApplication()
 	{
-		this.configuration.getStorageInstance().clearData();
 		this.configuration.getStorageInstance().stop();
 		SimpleDemoApplication.main(new String[]{});
 	}

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

@@ -165,10 +165,13 @@ private void initRoot()
 		{
 			if(this.root.getCurrentRootData().getEntityData(entityClass) == null)
 			{
-				this.root.getCurrentRootData().createNewEntityData(entityClass);
+				this.createNewEntityData(entityClass, this.root);
 				entityListMustGetStored = true;
 			}
-			this.setIdManagerForEntityData(entityClass, this.root);
+			else
+			{
+				this.setIdManagerForEntityData(entityClass, this.root);
+			}
 		}
 		if(entityListMustGetStored)
 		{
@@ -184,6 +187,12 @@ private void initRoot()
 		}
 	}
 
+	private <T, ID> void createNewEntityData(final Class<T> entityClass, final VersionedRoot root)
+	{
+		final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
+		root.getCurrentRootData().createNewEntityData(entityClass, idManager::getId);
+	}
+	
 	private <T, ID> void setIdManagerForEntityData(final Class<T> entityClass, final VersionedRoot root)
 	{
 		final IdManager<T, ID> idManager = this.ensureIdManager(entityClass);
@@ -420,10 +429,13 @@ public void setLastId(final Class<?> entityClass, final Object lastId)
 				final EntityData<?, Object> entityData = this.root.getCurrentRootData().getEntityData(entityClass);
 				if(entityData == null)
 				{
-					this.root.getCurrentRootData().createNewEntityData(entityClass);
-					this.setIdManagerForEntityData(entityClass, this.root);
+					this.createNewEntityData(entityClass, this.root);
 					this.storageManager.store(this.root.getCurrentRootData().getEntityListsToStore());
 				}
+				else
+				{
+					this.setIdManagerForEntityData(entityClass, this.root);
+				}
 				this.root.getCurrentRootData().setLastId(entityClass, lastId);
 				this.storageManager.store(this.root.getCurrentRootData().getObjectsToStoreAfterNewLastId(entityClass));
 			}

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

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