Finished Importer

Author: JohannesRabauer

spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/DefaultTestAnnotations.java renamed to spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/integration/DefaultTestAnnotations.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.jpa;
+package software.xdev.spring.data.eclipse.store.jpa.integration;
 
 import static org.springframework.test.annotation.DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD;
 

spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/integration/IntegrationTest.java

@@ -23,16 +23,16 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import software.xdev.spring.data.eclipse.store.importer.EclipseStoreDataImporterComponent;
-import software.xdev.spring.data.eclipse.store.jpa.DefaultTestAnnotations;
 import software.xdev.spring.data.eclipse.store.jpa.integration.repository.PersonToTestInEclipseStore;
 import software.xdev.spring.data.eclipse.store.jpa.integration.repository.PersonToTestInEclipseStoreRepository;
 import software.xdev.spring.data.eclipse.store.jpa.integration.repository.PersonToTestInJpa;
 import software.xdev.spring.data.eclipse.store.jpa.integration.repository.PersonToTestInJpaRepository;
+import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
 import software.xdev.spring.data.eclipse.store.repository.support.SimpleEclipseStoreRepository;
 
 
 @DefaultTestAnnotations
-public class IntegrationTest
+class IntegrationTest
 {
 	@Autowired
 	private PersonToTestInEclipseStoreRepository personToTestInEclipseStoreRepository;
@@ -43,6 +43,9 @@ public class IntegrationTest
 	@Autowired
 	private EclipseStoreDataImporterComponent eclipseStoreDataImporter;
 
+	@Autowired
+	private EclipseStoreStorage eclipseStoreStorage;
+	
 	/**
 	 * Super simple test if there are any start-up errors when running parallel to a JPA configuration
 	 */
@@ -68,5 +71,21 @@ void testEclipseStoreImport()
 		Assertions.assertEquals(1, simpleEclipseStoreRepositories.size());
 		final List<?> allEntities = simpleEclipseStoreRepositories.get(0).findAll();
 		Assertions.assertEquals(1, allEntities.size());
+		
+		this.eclipseStoreStorage.stop();
+		Assertions.assertEquals(
+			1,
+			this.eclipseStoreStorage.getEntityCount(PersonToTestInJpa.class),
+			"After restart the imported entities are not there anymore.");
+	}
+	
+	@Test
+	void testEclipseStoreEmptyImport()
+	{
+		final List<SimpleEclipseStoreRepository<?, ?>> simpleEclipseStoreRepositories =
+			this.eclipseStoreDataImporter.importData();
+		Assertions.assertEquals(1, simpleEclipseStoreRepositories.size());
+		final List<?> allEntities = simpleEclipseStoreRepositories.get(0).findAll();
+		Assertions.assertEquals(0, allEntities.size());
 	}
 }

spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/TestConfiguration.java renamed to spring-data-eclipse-store-jpa/src/test/java/software/xdev/spring/data/eclipse/store/jpa/integration/TestConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package software.xdev.spring.data.eclipse.store.jpa;
+package software.xdev.spring.data.eclipse.store.jpa.integration;
 
 import java.nio.file.Path;
 

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/importer/EclipseStoreDataImporter.java

@@ -34,6 +34,9 @@
 import software.xdev.spring.data.eclipse.store.repository.support.copier.working.RecursiveWorkingCopier;
 
 
+/**
+ * Imports entities from {@link EntityManagerFactory}s into the EclipseStore storage.
+ */
 public class EclipseStoreDataImporter
 {
 	private static final Logger LOG = LoggerFactory.getLogger(EclipseStoreDataImporter.class);
@@ -44,12 +47,39 @@ public EclipseStoreDataImporter(final EclipseStoreStorage eclipseStoreStorage)
 		this.eclipseStoreStorage = eclipseStoreStorage;
 	}
 
+	/**
+	 * Imports entities from all given {@link EntityManagerFactory}s that are available into the EclipseStore storage.
+	 * <p>
+	 * This should be done only once. Otherwise entities may be imported multiple times.
+	 * </p>
+	 * <p>
+	 * After importing all the entities, the existing repositories should be converted to
+	 * {@link software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository}.
+	 * </p>
+	 *
+	 * @param entityManagerFactories which are searched for entities
+	 * @return all the newly created {@link SimpleEclipseStoreRepository} for the specific entities.
+	 */
 	@SuppressWarnings("java:S1452")
 	public List<SimpleEclipseStoreRepository<?, ?>> importData(final EntityManagerFactory... entityManagerFactories)
 	{
 		return this.importData(Arrays.stream(entityManagerFactories));
 	}
 
+	/**
+	 * Imports entities from all given {@link EntityManagerFactory}s that are available into the EclipseStore storage.
+	 * <p>
+	 * This should be done only once. Otherwise entities may be imported multiple times.
+	 * </p>
+	 * <p>
+	 * After importing all the entities, the existing repositories should be converted to
+	 * {@link software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository}.
+	 * </p>
+	 *
+	 * @param entityManagerFactories which are searched for entities
+	 *
+	 * @return all the newly created {@link SimpleEclipseStoreRepository} for the specific entities.
+	 */
 	@SuppressWarnings("java:S1452")
 	public List<SimpleEclipseStoreRepository<?, ?>> importData(
 		final Iterable<EntityManagerFactory> entityManagerFactories
@@ -58,6 +88,20 @@ public EclipseStoreDataImporter(final EclipseStoreStorage eclipseStoreStorage)
 		return this.importData(StreamSupport.stream(entityManagerFactories.spliterator(), false));
 	}
 
+	/**
+	 * Imports entities from all given {@link EntityManagerFactory}s that are available into the EclipseStore storage.
+	 * <p>
+	 * This should be done only once. Otherwise entities may be imported multiple times.
+	 * </p>
+	 * <p>
+	 * After importing all the entities, the existing repositories should be converted to
+	 * {@link software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository}.
+	 * </p>
+	 *
+	 * @param entityManagerFactories which are searched for entities
+	 *
+	 * @return all the newly created {@link SimpleEclipseStoreRepository} for the specific entities.
+	 */
 	@SuppressWarnings({"java:S1452", "java:S6204"})
 	public List<SimpleEclipseStoreRepository<?, ?>> importData(
 		final Stream<EntityManagerFactory> entityManagerFactories
@@ -78,7 +122,8 @@ public EclipseStoreDataImporter(final EclipseStoreStorage eclipseStoreStorage)
 				entityManagerFactoryRepositoryListPair
 					.classRepositoryPairs
 					.forEach(
-						classRepositoryPair -> copyData(entityManagerFactoryRepositoryListPair, classRepositoryPair)
+						classRepositoryPair ->
+							this.copyData(entityManagerFactoryRepositoryListPair, classRepositoryPair)
 					)
 		);
 		LOG.info("Done importing data from JPA Repositories to EclipseStore.");
@@ -91,7 +136,7 @@ public EclipseStoreDataImporter(final EclipseStoreStorage eclipseStoreStorage)
 			.collect(Collectors.toList());
 	}
 
-	private static <T> void copyData(
+	private <T> void copyData(
 		final EntityManagerFactoryRepositoryListPair entityManagerFactoryRepositoryListPair,
 		final ClassRepositoryPair<T> classRepositoryPair)
 	{
@@ -103,7 +148,10 @@ private static <T> void copyData(
 		{
 			final List<T> existingEntitiesToExport =
 				entityManager
-					.createQuery("SELECT c FROM " + className + " c", classRepositoryPair.domainClass)
+					.createQuery(
+						"SELECT c FROM " + className + " c",
+						classRepositoryPair.domainClass
+					)
 					.getResultList();
 
 			LOG.info(

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/importer/EclipseStoreDataImporterComponent.java

@@ -27,6 +27,9 @@
 import software.xdev.spring.data.eclipse.store.repository.support.SimpleEclipseStoreRepository;
 
 
+/**
+ * Imports entities from {@link EntityManagerFactory}s into the EclipseStore storage.
+ */
 @Component
 public class EclipseStoreDataImporterComponent
 {
@@ -41,6 +44,18 @@ public EclipseStoreDataImporterComponent(
 		this.applicationContext = applicationContext;
 	}
 
+	/**
+	 * Imports entities from all {@link EntityManagerFactory}s that are available into the EclipseStore storage.
+	 * <p>
+	 * This should be done only once. Otherwise entities may be imported multiple times.
+	 * </p>
+	 * <p>
+	 * After importing all the entities, the existing repositories should be converted to
+	 * {@link software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreRepository}.
+	 * </p>
+	 *
+	 * @return all the newly created {@link SimpleEclipseStoreRepository} for the specific entities.
+	 */
 	public List<SimpleEclipseStoreRepository<?,?>> importData()
 	{
 		final Map<String, EntityManagerFactory> beansOfEms =

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/importer/EclipseStoreSingleRepositoryImporter.java

@@ -32,7 +32,6 @@
 import org.eclipse.store.storage.types.StorageManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import software.xdev.spring.data.eclipse.store.core.IdentitySet;
@@ -60,7 +59,6 @@ public class EclipseStoreStorage
 	private final WorkingCopyRegistry registry = new WorkingCopyRegistry();
 	private RepositorySynchronizer repositorySynchronizer;
 
-	@Autowired
 	public EclipseStoreStorage(
 		final EclipseStoreProperties storeConfiguration,
 		final EclipseStoreProvider storeProvider)
@@ -138,6 +136,13 @@ public synchronized <T> void registerEntity(final Class<T> classToRegister)
 			throw new AlreadyRegisteredException(entityName);
 		}
 		this.entityClassToRepositoryName.put(classToRegister, entityName);
+		
+		// If the storage is running and a new entity is registered, we need to stop the storage to restart
+		// again with the registered entity.
+		if(this.storageManager != null)
+		{
+			this.stop();
+		}
 	}
 
 	private <T> String getEntityName(final Class<T> classToRegister)