Fixed faulty behavior if classloader is not set for EclipseStore

Author: JohannesRabauer

spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/complex/ComplexConfiguration.java

@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 
+import org.eclipse.serializer.reflect.ClassLoaderProvider;
 import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
 import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorage;
@@ -25,13 +26,17 @@ public class ComplexConfiguration extends EclipseStoreClientConfiguration
 
 	public static final String STORAGE_PATH = "storage-complex";
 
+	private final ClassLoaderProvider classLoaderProvider;
+	
 	@Autowired
 	public ComplexConfiguration(
 		final EclipseStoreProperties defaultEclipseStoreProperties,
-		final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider
+		final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider,
+		final ClassLoaderProvider classLoaderProvider
 	)
 	{
 		super(defaultEclipseStoreProperties, defaultEclipseStoreProvider);
+		this.classLoaderProvider = classLoaderProvider;
 	}
 
 	/**
@@ -45,7 +50,11 @@ public ComplexConfiguration(
 	@Override
 	public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 	{
-		return EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of(STORAGE_PATH))));
+		final EmbeddedStorageFoundation<?> storageFoundation =
+			EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of(STORAGE_PATH))));
+		// This is only needed, if a different ClassLoader is used (e.g. when using spring-dev-tools)
+		storageFoundation.getConnectionFoundation().setClassLoaderProvider(this.classLoaderProvider);
+		return storageFoundation;
 	}
 
 	/**

spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/dual/storage/invoice/PersistenceInvoiceConfiguration.java

@@ -2,6 +2,7 @@
 
 import java.nio.file.Path;
 
+import org.eclipse.serializer.reflect.ClassLoaderProvider;
 import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
 import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorage;
@@ -23,15 +24,18 @@
 @EnableEclipseStoreRepositories
 public class PersistenceInvoiceConfiguration extends EclipseStoreClientConfiguration
 {
-	
 	public static final String STORAGE_PATH = "storage-invoice";
 
+	private final ClassLoaderProvider classLoaderProvider;
+	
 	@Autowired
 	protected PersistenceInvoiceConfiguration(
 		final EclipseStoreProperties defaultEclipseStoreProperties,
-		final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider)
+		final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider,
+		final ClassLoaderProvider classLoaderProvider)
 	{
 		super(defaultEclipseStoreProperties, defaultEclipseStoreProvider);
+		this.classLoaderProvider = classLoaderProvider;
 	}
 
 	/**
@@ -45,6 +49,10 @@ protected PersistenceInvoiceConfiguration(
 	@Override
 	public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 	{
-		return EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of(STORAGE_PATH))));
+		final EmbeddedStorageFoundation<?> storageFoundation =
+			EmbeddedStorage.Foundation(Storage.Configuration(Storage.FileProvider(Path.of(STORAGE_PATH))));
+		// This is only needed, if a different ClassLoader is used (e.g. when using spring-dev-tools)
+		storageFoundation.getConnectionFoundation().setClassLoaderProvider(this.classLoaderProvider);
+		return storageFoundation;
 	}
 }

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/registering/EclipseSerializerRegisteringCopier.java

@@ -116,7 +116,7 @@ private <T> T copy(final T source, final PersistenceManager<Binary> persistenceM
 	{
 		persistenceManager.objectRegistry().truncateAll();
 		final BinaryStorer.Default storer = (BinaryStorer.Default)persistenceManager.createStorer();
-		// Loader erstellen
+		// Create Loader
 		final PersistenceLoader loader = persistenceManager.createLoader();
 
 		storer.store(source);