Implemented useful Configuration through Spring

Author: JohannesRabauer

.gitignore

@@ -68,6 +68,8 @@ target/
 
 # EclipseStore
 storage
+storage-person
+storage-invoice
 storage-jpa
 
 # == IntelliJ ==

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

@@ -1,12 +1,27 @@
 package software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice;
 
+import static org.eclipse.store.storage.embedded.types.EmbeddedStorage.Foundation;
+
+import java.nio.file.Path;
+
+import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
+import org.eclipse.store.storage.types.Storage;
 import org.springframework.context.annotation.Configuration;
 
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
 import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
 
 
 @Configuration
-@EnableEclipseStoreRepositories("software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice")
-public class PersistenceInvoiceConfiguration
+@EnableEclipseStoreRepositories(
+	value = "software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice",
+	clientConfiguration = "persistenceInvoiceConfiguration"
+)
+public class PersistenceInvoiceConfiguration extends EclipseStoreClientConfiguration
 {
+	@Override
+	public EmbeddedStorageFoundation<?> getEmbeddedStorageFoundation()
+	{
+		return Foundation(Storage.Configuration(Storage.FileProvider(Path.of("storage-invoice"))));
+	}
 }

spring-data-eclipse-store-demo/src/main/java/software/xdev/spring/data/eclipse/store/demo/dual/storage/person/PersistencePersonConfiguration.java

@@ -1,12 +1,27 @@
 package software.xdev.spring.data.eclipse.store.demo.dual.storage.person;
 
+import static org.eclipse.store.storage.embedded.types.EmbeddedStorage.Foundation;
+
+import java.nio.file.Path;
+
+import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
+import org.eclipse.store.storage.types.Storage;
 import org.springframework.context.annotation.Configuration;
 
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
 import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
 
 
 @Configuration
-@EnableEclipseStoreRepositories("software.xdev.spring.data.eclipse.store.demo.dual.storage.person")
-public class PersistencePersonConfiguration
+@EnableEclipseStoreRepositories(
+	value = "software.xdev.spring.data.eclipse.store.demo.dual.storage.person",
+	clientConfigurationClass = PersistencePersonConfiguration.class
+)
+public class PersistencePersonConfiguration extends EclipseStoreClientConfiguration
 {
+	@Override
+	public EmbeddedStorageFoundation<?> getEmbeddedStorageFoundation()
+	{
+		return Foundation(Storage.Configuration(Storage.FileProvider(Path.of("storage-person"))));
+	}
 }

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

@@ -27,7 +27,7 @@
 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.config.EclipseStoreClientConfiguration;
 import software.xdev.spring.data.eclipse.store.repository.support.SimpleEclipseStoreRepository;
 
 
@@ -44,7 +44,7 @@ class IntegrationTest
 	private EclipseStoreDataImporterComponent eclipseStoreDataImporter;
 
 	@Autowired
-	private EclipseStoreStorage eclipseStoreStorage;
+	private EclipseStoreClientConfiguration configuration;
 
 	/**
 	 * Super simple test if there are any start-up errors when running parallel to a JPA configuration
@@ -72,10 +72,10 @@ void testEclipseStoreImport()
 		final List<?> allEntities = simpleEclipseStoreRepositories.get(0).findAll();
 		Assertions.assertEquals(1, allEntities.size());
 
-		this.eclipseStoreStorage.stop();
+		this.configuration.getStorageInstance().stop();
 		Assertions.assertEquals(
 			1,
-			this.eclipseStoreStorage.getEntityCount(PersonToTestInJpa.class),
+			this.configuration.getStorageInstance().getEntityCount(PersonToTestInJpa.class),
 			"After restart the imported entities are not there anymore.");
 	}
 

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

@@ -28,7 +28,7 @@
 import org.springframework.context.event.EventListener;
 import org.springframework.util.FileSystemUtils;
 
-import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
 import software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories;
 
 
@@ -40,7 +40,7 @@
 public class TestConfiguration implements DisposableBean
 {
 	@Autowired
-	EclipseStoreStorage storage;
+	EclipseStoreClientConfiguration configuration;
 
 	@Value("${org.eclipse.store.storage-directory}")
 	private String storageDirectory;
@@ -49,15 +49,15 @@ public class TestConfiguration implements DisposableBean
 	public void handleContextRefresh(final ContextRefreshedEvent event)
 	{
 		// Init with empty root object
-		this.storage.clearData();
+		this.configuration.getStorageInstance().clearData();
 	}
 
 	@Override
 	public void destroy() throws Exception
 	{
 		// End with empty root object
-		this.storage.clearData();
-		this.storage.stop();
+		this.configuration.getStorageInstance().clearData();
+		this.configuration.getStorageInstance().stop();
 		FileSystemUtils.deleteRecursively(Path.of(this.storageDirectory));
 	}
 }

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

@@ -31,6 +31,7 @@
 
 import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
 import software.xdev.spring.data.eclipse.store.repository.SupportedChecker;
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
 import software.xdev.spring.data.eclipse.store.repository.support.SimpleEclipseStoreRepository;
 import software.xdev.spring.data.eclipse.store.repository.support.copier.working.RecursiveWorkingCopier;
 
@@ -41,11 +42,11 @@
 public class EclipseStoreDataImporter
 {
 	private static final Logger LOG = LoggerFactory.getLogger(EclipseStoreDataImporter.class);
-	private final EclipseStoreStorage eclipseStoreStorage;
+	private final EclipseStoreClientConfiguration configuration;
 
-	public EclipseStoreDataImporter(final EclipseStoreStorage eclipseStoreStorage)
+	public EclipseStoreDataImporter(final EclipseStoreClientConfiguration configuration)
 	{
-		this.eclipseStoreStorage = eclipseStoreStorage;
+		this.configuration = configuration;
 	}
 
 	/**
@@ -196,13 +197,14 @@ private <T> void createRepositoryForType(
 
 	private <T> SimpleEclipseStoreRepository<T, ?> createEclipseStoreRepo(final Class<T> domainClass)
 	{
+		final EclipseStoreStorage storageInstance = this.configuration.getStorageInstance();
 		return new SimpleEclipseStoreRepository<>(
-			this.eclipseStoreStorage,
+			storageInstance,
 			new RecursiveWorkingCopier<>(
 				domainClass,
-				this.eclipseStoreStorage.getRegistry(),
-				this.eclipseStoreStorage,
-				this.eclipseStoreStorage,
+				storageInstance.getRegistry(),
+				storageInstance,
+				storageInstance,
 				new SupportedChecker.Implementation()),
 			domainClass);
 	}

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

@@ -23,7 +23,7 @@
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 
-import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
 import software.xdev.spring.data.eclipse.store.repository.support.SimpleEclipseStoreRepository;
 
 
@@ -37,10 +37,10 @@ public class EclipseStoreDataImporterComponent
 	private final ApplicationContext applicationContext;
 
 	public EclipseStoreDataImporterComponent(
-		final EclipseStoreStorage eclipseStoreStorage,
+		final EclipseStoreClientConfiguration configuration,
 		final ApplicationContext applicationContext)
 	{
-		this.importer = new EclipseStoreDataImporter(eclipseStoreStorage);
+		this.importer = new EclipseStoreDataImporter(configuration);
 		this.applicationContext = applicationContext;
 	}
 

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

@@ -26,22 +26,19 @@
 import org.eclipse.serializer.persistence.binary.jdk17.java.util.BinaryHandlerImmutableCollectionsList12;
 import org.eclipse.serializer.persistence.binary.jdk17.java.util.BinaryHandlerImmutableCollectionsSet12;
 import org.eclipse.serializer.persistence.types.Storer;
-import org.eclipse.store.integrations.spring.boot.types.EclipseStoreProvider;
-import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
 import org.eclipse.store.storage.types.StorageManager;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
 
 import software.xdev.spring.data.eclipse.store.core.IdentitySet;
 import software.xdev.spring.data.eclipse.store.exceptions.AlreadyRegisteredException;
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
+import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreStorageFoundationProvider;
 import software.xdev.spring.data.eclipse.store.repository.support.copier.id.IdSetter;
 import software.xdev.spring.data.eclipse.store.repository.support.reposyncer.RepositorySynchronizer;
 import software.xdev.spring.data.eclipse.store.repository.support.reposyncer.SimpleRepositorySynchronizer;
 
-
-@Component
 public class EclipseStoreStorage
 	implements EntityListProvider, IdSetterProvider, PersistableChecker
 {
@@ -50,21 +47,17 @@ public class EclipseStoreStorage
 	private final Map<Class<?>, IdSetter<?>> entityClassToIdSetter = new HashMap<>();
 	private EntitySetCollector entitySetCollector;
 	private PersistableChecker persistenceChecker;
-	private final EclipseStoreProperties storeConfiguration;
-	private final EclipseStoreProvider storeProvider;
+	private final EclipseStoreStorageFoundationProvider foundationProvider;
 
 	private StorageManager storageManager;
 	private Root root;
 
 	private final WorkingCopyRegistry registry = new WorkingCopyRegistry();
 	private RepositorySynchronizer repositorySynchronizer;
 
-	public EclipseStoreStorage(
-		final EclipseStoreProperties storeConfiguration,
-		final EclipseStoreProvider storeProvider)
+	public EclipseStoreStorage(final EclipseStoreClientConfiguration storeConfiguration)
 	{
-		this.storeConfiguration = storeConfiguration;
-		this.storeProvider = storeProvider;
+		this.foundationProvider = storeConfiguration;
 	}
 
 	private synchronized StorageManager getInstanceOfStorageManager()
@@ -85,7 +78,7 @@ private synchronized void ensureEntitiesInRoot()
 			LOG.info("Starting storage...");
 			this.root = new Root();
 			final EmbeddedStorageFoundation<?> embeddedStorageFoundation =
-				this.storeProvider.createStorageFoundation(this.storeConfiguration);
+				this.foundationProvider.getEmbeddedStorageFoundation();
 			embeddedStorageFoundation.registerTypeHandler(BinaryHandlerImmutableCollectionsSet12.New());
 			embeddedStorageFoundation.registerTypeHandler(BinaryHandlerImmutableCollectionsList12.New());
 			this.storageManager = embeddedStorageFoundation.start(this.root);

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

@@ -0,0 +1,24 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.spring.data.eclipse.store.repository.config;
+
+import org.springframework.context.annotation.Configuration;
+
+
+@Configuration(proxyBeanMethods = false)
+public class DefaultEclipseStoreClientConfiguration extends EclipseStoreClientConfiguration
+{
+}

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

@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2023 XDEV Software (https://xdev.software)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package software.xdev.spring.data.eclipse.store.repository.config;
+
+import org.eclipse.store.integrations.spring.boot.types.EclipseStoreProvider;
+import org.eclipse.store.integrations.spring.boot.types.EclipseStoreProviderImpl;
+import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
+import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+
+import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
+
+
+@Configuration(proxyBeanMethods = false)
+public abstract class EclipseStoreClientConfiguration implements EclipseStoreStorageFoundationProvider
+{
+	@Autowired
+	private EclipseStoreProperties defaultEclipseStoreProperties;
+	
+	@Autowired
+	private EclipseStoreProviderImpl defaultEclipseStoreProvider;
+	
+	private EclipseStoreStorage storageInstance;
+	
+	public EclipseStoreProperties getStoreConfiguration()
+	{
+		return this.defaultEclipseStoreProperties;
+	}
+	
+	public EclipseStoreProvider getStoreProvider()
+	{
+		return this.defaultEclipseStoreProvider;
+	}
+	
+	@Override
+	public EmbeddedStorageFoundation<?> getEmbeddedStorageFoundation()
+	{
+		return this.getStoreProvider().createStorageFoundation(this.getStoreConfiguration());
+	}
+	
+	public EclipseStoreStorage getStorageInstance()
+	{
+		if(this.storageInstance == null)
+		{
+			this.storageInstance = new EclipseStoreStorage(this);
+		}
+		return this.storageInstance;
+	}
+}

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

@@ -15,15 +15,22 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.config;
 
+import static software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories.CLIENT_CONFIGURATION_ANNOTATION_VALUE;
+import static software.xdev.spring.data.eclipse.store.repository.config.EnableEclipseStoreRepositories.CLIENT_CONFIGURATION_CLASS_ANNOTATION_VALUE;
+
 import java.lang.annotation.Annotation;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import jakarta.annotation.Nonnull;
 
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.core.annotation.AnnotationAttributes;
+import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfigurationExtension;
 import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
+import org.springframework.util.ClassUtils;
 
 import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCrudRepository;
 import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCustomRepository;
@@ -63,6 +70,19 @@ public String getRepositoryFactoryBeanClassName()
 		return EclipseStoreRepositoryFactoryBean.class.getName();
 	}
 
+	@Override
+	public void postProcess(final BeanDefinitionBuilder builder, final AnnotationRepositoryConfigurationSource config)
+	{
+		final AnnotationAttributes attributes = config.getAttributes();
+		final Class<?> configurationClass = attributes.getClass(CLIENT_CONFIGURATION_CLASS_ANNOTATION_VALUE);
+		String configurationString = attributes.getString(CLIENT_CONFIGURATION_ANNOTATION_VALUE);
+		if(!configurationClass.equals(DefaultEclipseStoreClientConfiguration.class))
+		{
+			configurationString = ClassUtils.getShortNameAsProperty(configurationClass);
+		}
+		builder.addPropertyReference("configuration", configurationString);
+	}
+	
 	@Override
 	@Nonnull
 	public String getModuleIdentifier()