Constraints now work with supplied validator

Author: JohannesRabauer

spring-data-eclipse-store/pom.xml

@@ -182,6 +182,12 @@
 			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>${hibernate-core.version}</version>
+			<exclusions>
+				<exclusion>
+					<artifactId>antlr4-runtime</artifactId>
+					<groupId>org.antlr</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.el</groupId>

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

@@ -51,7 +51,7 @@ public EclipseStoreDataImporter(final EclipseStoreClientConfiguration configurat
 	{
 		this.configuration = configuration;
 	}
-	
+
 	/**
 	 * Imports entities from all given {@link EntityManagerFactory}s that are available into the EclipseStore storage.
 	 * <p>
@@ -265,7 +265,8 @@ private <T> void createRepositoryForType(
 				storageInstance,
 				storageInstance,
 				new SupportedChecker.Implementation(),
-				storageInstance
+				storageInstance,
+				this.configuration.getValidator()
 			),
 			domainClass,
 			new EclipseStoreTransactionManager(),

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

@@ -15,12 +15,16 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.config;
 
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+
 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.EmbeddedStorageFoundation;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.transaction.TransactionManagerCustomizers;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.transaction.PlatformTransactionManager;
@@ -113,4 +117,10 @@ public EclipseStoreTransactionManager getTransactionManagerInstance()
 		}
 		return this.transactionManager;
 	}
+	
+	@Bean
+	public Validator getValidator()
+	{
+		return Validation.buildDefaultValidatorFactory().getValidator();
+	}
 }

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

@@ -18,6 +18,7 @@
 import java.util.Optional;
 
 import jakarta.annotation.Nonnull;
+import jakarta.validation.Validator;
 
 import org.springframework.data.mapping.model.BasicPersistentEntity;
 import org.springframework.data.repository.core.EntityInformation;
@@ -46,13 +47,16 @@ public class EclipseStoreRepositoryFactory extends RepositoryFactorySupport
 {
 	private final EclipseStoreStorage storage;
 	private final PlatformTransactionManager transactionManager;
+	private final Validator validator;
 
 	public EclipseStoreRepositoryFactory(
 		final EclipseStoreStorage storage,
-		final PlatformTransactionManager transactionManager)
+		final PlatformTransactionManager transactionManager,
+		final Validator validator)
 	{
 		this.storage = storage;
 		this.transactionManager = transactionManager;
+		this.validator = validator;
 	}
 
 	@Override
@@ -82,7 +86,8 @@ private <T> WorkingCopier<T> createWorkingCopier(
 			storage,
 			storage,
 			new SupportedChecker.Implementation(),
-			storage
+			storage,
+			this.validator
 		);
 	}
 

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

@@ -81,7 +81,8 @@ protected RepositoryFactorySupport createRepositoryFactory()
 		final EclipseStoreClientConfiguration ensuredConfiguration = this.ensureConfiguration();
 		return new EclipseStoreRepositoryFactory(
 			ensuredConfiguration.getStorageInstance(),
-			ensuredConfiguration.getTransactionManagerInstance()
+			ensuredConfiguration.getTransactionManagerInstance(),
+			ensuredConfiguration.getValidator()
 		);
 	}
 

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

@@ -15,6 +15,8 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.support.copier.registering;
 
+import jakarta.validation.Validator;
+
 import org.eclipse.serializer.Serializer;
 import org.eclipse.serializer.SerializerFoundation;
 import org.eclipse.serializer.persistence.binary.jdk17.java.util.BinaryHandlerImmutableCollectionsList12;
@@ -42,7 +44,8 @@ protected AbstractRegisteringCopier(
 		final SupportedChecker supportedChecker,
 		final RegisteringWorkingCopyAndOriginal register,
 		final ObjectSwizzling objectSwizzling,
-		final WorkingCopier<?> copier)
+		final WorkingCopier<?> copier,
+		final Validator validator)
 	{
 		this.actualCopier = new EclipseSerializerRegisteringCopier(
 			supportedChecker,
@@ -52,7 +55,8 @@ protected AbstractRegisteringCopier(
 				this.createSerializerFoundation(),
 				objectSwizzling,
 				copier
-			)
+			),
+			validator
 		);
 	}
 

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

@@ -58,15 +58,15 @@ public class EclipseSerializerRegisteringCopier implements AutoCloseable
 	public EclipseSerializerRegisteringCopier(
 		final SupportedChecker supportedChecker,
 		final RegisteringWorkingCopyAndOriginal register,
-		final Supplier<PersistenceManager<Binary>> persistenceManagerSupplier)
+		final Supplier<PersistenceManager<Binary>> persistenceManagerSupplier,
+		final Validator validator
+	)
 	{
 		this.supportedChecker = supportedChecker;
 		this.register = register;
 		this.persistenceManagerSupplier = persistenceManagerSupplier;
+		this.validator = validator;
 		this.persistenceManagers = new ConcurrentLinkedQueue<>();
-		
-		final ValidatorFactory validatorFactory = Validation.buildDefaultValidatorFactory();
-		this.validator = validatorFactory.getValidator();
 	}
 
 	private PersistenceManager<Binary> ensurePersistenceManager()

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

@@ -15,6 +15,8 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.support.copier.registering;
 
+import jakarta.validation.Validator;
+
 import org.eclipse.serializer.reference.ObjectSwizzling;
 
 import software.xdev.spring.data.eclipse.store.repository.SupportedChecker;
@@ -32,13 +34,15 @@ public RegisteringStorageToWorkingCopyCopier(
 		final WorkingCopyRegistry registry,
 		final SupportedChecker supportedChecker,
 		final ObjectSwizzling objectSwizzling,
-		final WorkingCopier<?> copier)
+		final WorkingCopier<?> copier,
+		final Validator validator)
 	{
 		super(
 			supportedChecker,
 			registry::register,
 			objectSwizzling,
-			copier
+			copier,
+			validator
 		);
 	}
 }

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

@@ -15,6 +15,8 @@
  */
 package software.xdev.spring.data.eclipse.store.repository.support.copier.registering;
 
+import jakarta.validation.Validator;
+
 import org.eclipse.serializer.reference.ObjectSwizzling;
 
 import software.xdev.spring.data.eclipse.store.repository.SupportedChecker;
@@ -33,13 +35,15 @@ public RegisteringWorkingCopyToStorageCopier(
 		final WorkingCopyRegistry registry,
 		final SupportedChecker supportedChecker,
 		final ObjectSwizzling objectSwizzling,
-		final WorkingCopier<?> copier)
+		final WorkingCopier<?> copier,
+		final Validator validator)
 	{
 		super(
 			supportedChecker,
 			registry::invertRegister,
 			objectSwizzling,
-			copier
+			copier,
+			validator
 		);
 	}
 }

spring-data-eclipse-store/src/main/java/software/xdev/spring/data/eclipse/store/repository/support/copier/working/RecursiveWorkingCopier.java

@@ -28,6 +28,8 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 
+import jakarta.validation.Validator;
+
 import org.eclipse.serializer.reference.Lazy;
 import org.eclipse.serializer.reference.ObjectSwizzling;
 import org.slf4j.Logger;
@@ -72,15 +74,16 @@ public RecursiveWorkingCopier(
 		final VersionManagerProvider versionManagerProvider,
 		final PersistableChecker persistableChecker,
 		final SupportedChecker supportedChecker,
-		final ObjectSwizzling objectSwizzling
+		final ObjectSwizzling objectSwizzling,
+		final Validator validator
 	)
 	{
 		this.domainClass = domainClass;
 		this.registry = registry;
 		this.workingCopyToStorageCopier =
-			new RegisteringWorkingCopyToStorageCopier(registry, supportedChecker, objectSwizzling, this);
+			new RegisteringWorkingCopyToStorageCopier(registry, supportedChecker, objectSwizzling, this, validator);
 		this.storageToWorkingCopyCopier =
-			new RegisteringStorageToWorkingCopyCopier(registry, supportedChecker, objectSwizzling, this);
+			new RegisteringStorageToWorkingCopyCopier(registry, supportedChecker, objectSwizzling, this, validator);
 		this.idManagerProvider = idManagerProvider;
 		this.versionManagerProvider = versionManagerProvider;
 		this.persistableChecker = persistableChecker;