EclipseStoreTransactionManager refined

Author: JohannesRabauer

spring-data-eclipse-store/pom.xml

@@ -107,6 +107,10 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
+		</dependency>
 
 		<dependency>
 			<groupId>jakarta.annotation</groupId>
@@ -163,11 +167,6 @@
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-core</artifactId>

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

@@ -40,16 +40,16 @@
 import software.xdev.spring.data.eclipse.store.repository.support.reposyncer.RepositorySynchronizer;
 import software.xdev.spring.data.eclipse.store.repository.support.reposyncer.SimpleRepositorySynchronizer;
 
+
 public class EclipseStoreStorage
 	implements EntityListProvider, IdSetterProvider, PersistableChecker, ObjectSwizzling
 {
 	private static final Logger LOG = LoggerFactory.getLogger(EclipseStoreStorage.class);
 	private final Map<Class<?>, String> entityClassToRepositoryName = new HashMap<>();
 	private final Map<Class<?>, IdSetter<?>> entityClassToIdSetter = new HashMap<>();
+	private final EclipseStoreStorageFoundationProvider foundationProvider;
 	private EntitySetCollector entitySetCollector;
 	private PersistableChecker persistenceChecker;
-	private final EclipseStoreStorageFoundationProvider foundationProvider;
-	
 	private StorageManager storageManager;
 	private Root root;
 

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

@@ -19,12 +19,18 @@
 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.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;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.TransactionManager;
 
 import software.xdev.spring.data.eclipse.store.repository.EclipseStoreStorage;
+import software.xdev.spring.data.eclipse.store.transactions.EclipseStoreTransactionManager;
 
 
 /**
@@ -73,6 +79,16 @@ public EmbeddedStorageFoundation<?> createEmbeddedStorageFoundation()
 		return this.getStoreProvider().createStorageFoundation(this.getStoreConfiguration());
 	}
 
+	@Bean
+	@ConditionalOnMissingBean(TransactionManager.class)
+	public PlatformTransactionManager transactionManager(
+		final ObjectProvider<TransactionManagerCustomizers> transactionManagerCustomizers)
+	{
+		final EclipseStoreTransactionManager transactionManager = new EclipseStoreTransactionManager();
+		transactionManagerCustomizers.ifAvailable((customizers) -> customizers.customize((TransactionManager)transactionManager));
+		return transactionManager;
+	}
+	
 	@Bean
 	public EclipseStoreStorage getStorageInstance()
 	{

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

@@ -38,7 +38,9 @@ public class EclipseStoreRepositoryFactoryBean<T extends Repository<S, ID>, S, I
 {
 	private EclipseStoreClientConfiguration configuration;
 
-	public EclipseStoreRepositoryFactoryBean(final Class<? extends T> repositoryInterface)
+	public EclipseStoreRepositoryFactoryBean(
+		final Class<? extends T> repositoryInterface
+	)
 	{
 		super(repositoryInterface);
 	}
@@ -52,6 +54,8 @@ public void setConfiguration(final EclipseStoreClientConfiguration configuration
 	@Nonnull
 	protected RepositoryFactorySupport createRepositoryFactory()
 	{
-		return new EclipseStoreRepositoryFactory(this.configuration.getStorageInstance());
+		return new EclipseStoreRepositoryFactory(
+			this.configuration.getStorageInstance()
+		);
 	}
 }

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

@@ -27,9 +27,11 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.springframework.transaction.PlatformTransactionManager;
 
 import software.xdev.spring.data.eclipse.store.exceptions.FieldAccessReflectionException;
 import software.xdev.spring.data.eclipse.store.exceptions.NoIdFieldFoundException;
@@ -45,6 +47,7 @@
 import software.xdev.spring.data.eclipse.store.repository.query.executors.PageableQueryExecutor;
 import software.xdev.spring.data.eclipse.store.repository.support.copier.working.WorkingCopier;
 import software.xdev.spring.data.eclipse.store.repository.support.copier.working.WorkingCopierResult;
+import software.xdev.spring.data.eclipse.store.transactions.EclipseStoreTransactionManager;
 
 
 public class SimpleEclipseStoreRepository<T, ID>
@@ -59,6 +62,8 @@ public class SimpleEclipseStoreRepository<T, ID>
 	private final EclipseStoreStorage storage;
 	private final Class<T> domainClass;
 	private final WorkingCopier<T> copier;
+	@Autowired
+	private PlatformTransactionManager transactionManager;
 	private Field idField;
 
 	public SimpleEclipseStoreRepository(
@@ -91,6 +96,11 @@ public Field getIdField()
 	@SuppressWarnings("unchecked")
 	public synchronized <S extends T> List<S> saveBulk(final Collection<S> entities)
 	{
+		if(this.transactionManager instanceof final EclipseStoreTransactionManager estm)
+		{
+			estm
+				.getResourceFactory();
+		}
 		if(LOG.isDebugEnabled())
 		{
 			LOG.debug("Saving {} entities...", entities.size());

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/transactions/EclipseStoreTransactionManager.java

@@ -16,15 +16,12 @@
 package software.xdev.spring.data.eclipse.store.transactions;
 
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.stereotype.Component;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.support.AbstractPlatformTransactionManager;
 import org.springframework.transaction.support.DefaultTransactionStatus;
 import org.springframework.transaction.support.ResourceTransactionManager;
 
-
-@Component
 public class EclipseStoreTransactionManager extends AbstractPlatformTransactionManager
 	implements ResourceTransactionManager, InitializingBean
 {