Major restructuring of configuration

Author: JohannesRabauer

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

@@ -21,8 +21,7 @@
  */
 @Configuration
 @EnableEclipseStoreRepositories(
-	value = "software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice",
-	clientConfiguration = "persistenceInvoiceConfiguration"
+	basePackages = "software.xdev.spring.data.eclipse.store.demo.dual.storage.invoice"
 )
 public class PersistenceInvoiceConfiguration extends EclipseStoreClientConfiguration
 {

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

@@ -20,8 +20,7 @@
  */
 @Configuration
 @EnableEclipseStoreRepositories(
-	value = "software.xdev.spring.data.eclipse.store.demo.dual.storage.person",
-	clientConfigurationClass = PersistencePersonConfiguration.class
+	basePackages = "software.xdev.spring.data.eclipse.store.demo.dual.storage.person"
 )
 public class PersistencePersonConfiguration extends EclipseStoreClientConfiguration
 {

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

@@ -18,6 +18,7 @@
 import org.eclipse.store.integrations.spring.boot.types.configuration.EclipseStoreProperties;
 import org.eclipse.store.integrations.spring.boot.types.factories.EmbeddedStorageFoundationFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Configuration;
 
 
@@ -27,6 +28,7 @@
  * he created a different {@link EclipseStoreClientConfiguration}.
  */
 @Configuration(proxyBeanMethods = false)
+@ConditionalOnMissingBean(EclipseStoreClientConfiguration.class)
 public class DefaultEclipseStoreClientConfiguration extends EclipseStoreClientConfiguration
 {
 	@Autowired

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

@@ -20,7 +20,6 @@
 import org.eclipse.store.storage.embedded.types.EmbeddedStorageFoundation;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
 import org.springframework.context.annotation.Bean;
@@ -52,6 +51,8 @@ public abstract class EclipseStoreClientConfiguration implements EclipseStoreSto
 	private final EclipseStoreProperties defaultEclipseStoreProperties;
 	private final EmbeddedStorageFoundationFactory defaultEclipseStoreProvider;
 
+	private EclipseStoreStorage storageInstance;
+	
 	@Autowired
 	protected EclipseStoreClientConfiguration(
 		final EclipseStoreProperties defaultEclipseStoreProperties,
@@ -62,9 +63,7 @@ protected EclipseStoreClientConfiguration(
 		this.defaultEclipseStoreProvider = defaultEclipseStoreProvider;
 	}
 
-	private EclipseStoreStorage storageInstance;
-	
-	public EclipseStoreProperties getStoreConfiguration()
+	public EclipseStoreProperties getEclipseStoreProperties()
 	{
 		return this.defaultEclipseStoreProperties;
 	}
@@ -76,12 +75,12 @@ public EmbeddedStorageFoundationFactory getStoreProvider()
 
 	/**
 	 * Creates a {@link EmbeddedStorageFoundation} out of the two other provided functions {@link #getStoreProvider()}
-	 * and {@link #getStoreConfiguration()}.
+	 * and {@link #getEclipseStoreProperties()}.
 	 */
 	@Override
 	public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 	{
-		return this.getStoreProvider().createStorageFoundation(this.getStoreConfiguration());
+		return this.getStoreProvider().createStorageFoundation(this.getEclipseStoreProperties());
 	}
 
 	@Bean
@@ -99,6 +98,7 @@ public PlatformTransactionManager transactionManager(
 	@Bean
 	public EclipseStoreStorage getStorageInstance()
 	{
+		// hier muss was gemacht werden.
 		if(this.storageInstance == null)
 		{
 			this.storageInstance = new EclipseStoreStorage(this);

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

@@ -15,9 +15,6 @@
  */
 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;
@@ -26,11 +23,10 @@
 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 org.springframework.data.repository.core.RepositoryMetadata;
 
 import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCrudRepository;
 import software.xdev.spring.data.eclipse.store.repository.interfaces.EclipseStoreCustomRepository;
@@ -70,23 +66,10 @@ public String getRepositoryFactoryBeanClassName()
 		return EclipseStoreRepositoryFactoryBean.class.getName();
 	}
 
-	/**
-	 * This method puts the {@link EclipseStoreRepositoryFactoryBean#configuration} in the created
-	 * {@link EclipseStoreRepositoryFactoryBean}. This is important to link
-	 * {@link EnableEclipseStoreRepositories#clientConfiguration()} with the actual
-	 * {@link software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage}.
-	 */
 	@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
@@ -116,4 +99,10 @@ protected Collection<Class<?>> getIdentifyingTypes()
 			EclipseStoreListCrudRepository.class
 		);
 	}
+	
+	@Override
+	protected boolean useRepositoryConfiguration(final RepositoryMetadata metadata)
+	{
+		return super.useRepositoryConfiguration(metadata);
+	}
 }

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

@@ -23,7 +23,6 @@
 import java.lang.annotation.Target;
 
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.repository.config.DefaultRepositoryBaseClass;
@@ -42,10 +41,6 @@
 @Documented
 @Inherited
 @Import(EclipseStoreRepositoriesRegistrar.class)
-@ComponentScan({
-	"software.xdev.spring.data.eclipse.store.importer",
-	"software.xdev.spring.data.eclipse.store.repository"
-})
 public @interface EnableEclipseStoreRepositories
 {
 
@@ -81,23 +76,6 @@
 	 */
 	Filter[] excludeFilters() default {};
 
-	String CLIENT_CONFIGURATION_ANNOTATION_VALUE = "clientConfiguration";
-	
-	/**
-	 * @return the name of a {@link EclipseStoreClientConfiguration} to use.
-	 * {@link DefaultEclipseStoreClientConfiguration} is used if not defined.
-	 */
-	String clientConfiguration() default "defaultEclipseStoreClientConfiguration";
-	
-	String CLIENT_CONFIGURATION_CLASS_ANNOTATION_VALUE = "clientConfigurationClass";
-	
-	/**
-	 * @return the class of a {@link EclipseStoreClientConfiguration} to use.
-	 * {@link DefaultEclipseStoreClientConfiguration} is used if not defined.
-	 */
-	Class<? extends EclipseStoreClientConfiguration> clientConfigurationClass()
-		default DefaultEclipseStoreClientConfiguration.class;
-	
 	/**
 	 * Returns the postfix to be used when looking up custom repository implementations. Defaults to {@literal Impl} .
 	 * So for a repository named {@code PersonRepository} the corresponding implementation class will be looked up

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

@@ -19,6 +19,8 @@
 
 import jakarta.annotation.Nonnull;
 
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
 import org.springframework.data.repository.core.EntityInformation;
 import org.springframework.data.repository.core.RepositoryInformation;
@@ -42,11 +44,17 @@
  */
 public class EclipseStoreRepositoryFactory extends RepositoryFactorySupport
 {
-	private final EclipseStoreStorage storage;
+	private BeanFactory beanFactory;
 
-	public EclipseStoreRepositoryFactory(final EclipseStoreStorage storage)
+	public EclipseStoreRepositoryFactory()
 	{
-		this.storage = storage;
+	}
+	
+	@Override
+	public void setBeanFactory(final BeanFactory beanFactory) throws BeansException
+	{
+		super.setBeanFactory(beanFactory);
+		this.beanFactory = beanFactory;
 	}
 
 	@Override
@@ -62,17 +70,23 @@ protected Optional<QueryLookupStrategy> getQueryLookupStrategy(
 		@Nullable final QueryLookupStrategy.Key key,
 		@Nonnull final QueryMethodEvaluationContextProvider evaluationContextProvider)
 	{
-		return Optional.of(new EclipseStoreQueryLookupStrategy(this.storage, this::createWorkingCopier));
+		return Optional.of(new EclipseStoreQueryLookupStrategy(this.getEclipseStoreStorage(), this::createWorkingCopier));
+	}
+	
+	private EclipseStoreStorage getEclipseStoreStorage()
+	{
+		return this.beanFactory.getBean(EclipseStoreStorage.class);
 	}
 
 	@Override
 	@Nonnull
 	protected Object getTargetRepository(@Nonnull final RepositoryInformation metadata)
 	{
+		final EclipseStoreStorage eclipseStoreStorage = this.getEclipseStoreStorage();
 		return this.getTargetRepositoryViaReflection(
 			metadata,
-			this.storage,
-			this.createWorkingCopier(metadata.getDomainType(), this.storage),
+			eclipseStoreStorage,
+			this.createWorkingCopier(metadata.getDomainType(), eclipseStoreStorage),
 			metadata.getDomainType()
 		);
 	}

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

@@ -25,37 +25,32 @@
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
 import org.springframework.stereotype.Component;
 
-import software.xdev.spring.data.eclipse.store.repository.config.EclipseStoreClientConfiguration;
+import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
 
 
 @ComponentScan({
 	"software.xdev.spring.data.eclipse.store.repository",
 	"software.xdev.spring.data.eclipse.store.transactions"
-	})
+})
 @Component
 public class EclipseStoreRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
 	extends RepositoryFactoryBeanSupport<T, S, ID>
 {
-	private EclipseStoreClientConfiguration configuration;
+	private final EclipseStoreStorage storage;
 
 	public EclipseStoreRepositoryFactoryBean(
-		final Class<? extends T> repositoryInterface
+		final Class<? extends T> repositoryInterface,
+		final EclipseStoreStorage storage
 	)
 	{
 		super(repositoryInterface);
-	}
-	
-	public void setConfiguration(final EclipseStoreClientConfiguration configuration)
-	{
-		this.configuration = configuration;
+		this.storage = storage;
 	}
 
 	@Override
 	@Nonnull
 	protected RepositoryFactorySupport createRepositoryFactory()
 	{
-		return new EclipseStoreRepositoryFactory(
-			this.configuration.getStorageInstance()
-		);
+		return new EclipseStoreRepositoryFactory();
 	}
 }