Merge branch 'develop' into spring-boot-dev-tools-support

Author: JohannesRabauer

CHANGELOG.md

@@ -2,7 +2,8 @@
 
 * Add support for shuting down the storage during application shutdown
   * By default only enabled when Spring DevTools are active
-    * This should fix "StorageExceptionInitialization: Active storage for ... already exists" errors during DevTools restart
+  * This should fix "StorageExceptionInitialization: Active storage for ... already exists" errors during DevTools restart
+* Added [Jakarta Bean Validation Constraints](https://jakarta.ee/learn/docs/jakartaee-tutorial/current/beanvalidation/bean-validation/bean-validation.html#_using_jakarta_bean_validation_constraints) with Hibernate validator for entities.
 
 # 2.2.2
 

spring-data-eclipse-store/pom.xml

@@ -54,6 +54,10 @@
 		<org.springframework.boot.version>3.3.4</org.springframework.boot.version>
 		<org.eclipse.store.version>1.4.0</org.eclipse.store.version>
 		<org.eclipse.serializer.version>1.4.0</org.eclipse.serializer.version>
+		<hibernate-validator.version>8.0.1.Final</hibernate-validator.version>
+		<jakarta.el-api.version>6.0.1</jakarta.el-api.version>
+		<expressly.version>6.0.0-M1</expressly.version>
+		<hibernate-core.version>6.6.1.Final</hibernate-core.version>
 	</properties>
 
 	<repositories>
@@ -164,6 +168,37 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>${hibernate-validator.version}</version>
+		</dependency>
+		<dependency>
+			<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>
+			<artifactId>jakarta.el-api</artifactId>
+			<version>${jakarta.el-api.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.expressly</groupId>
+			<artifactId>expressly</artifactId>
+			<version>${expressly.version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>com.googlecode.cqengine</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>
@@ -266,6 +266,7 @@ private <T> void createRepositoryForType(
 				storageInstance,
 				new SupportedChecker.Implementation(),
 				storageInstance,
+				this.configuration.getValidator(),
 				this.configuration.getClassLoaderProvider()
 			),
 			domainClass,

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

@@ -16,6 +16,9 @@
 package software.xdev.spring.data.eclipse.store.repository.config;
 
 import org.eclipse.serializer.reflect.ClassLoaderProvider;
+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;
@@ -25,6 +28,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 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.context.event.ContextClosedEvent;
@@ -199,4 +203,10 @@ public void shutdownStorageOnContextClosed(final ContextClosedEvent event)
 			this.storageInstance.stop();
 		}
 	}
+
+	@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
@@ -83,6 +87,7 @@ private <T> WorkingCopier<T> createWorkingCopier(
 			storage,
 			new SupportedChecker.Implementation(),
 			storage,
+			this.validator,
 			storage.getClassLoaderProvider()
 		);
 	}

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;
@@ -45,6 +47,7 @@ protected AbstractRegisteringCopier(
 		final RegisteringWorkingCopyAndOriginal register,
 		final ObjectSwizzling objectSwizzling,
 		final WorkingCopier<?> copier,
+		final Validator validator,
 		final ClassLoaderProvider currentClassLoaderProvider
 	)
 	{
@@ -56,8 +59,10 @@ protected AbstractRegisteringCopier(
 				this.createSerializerFoundation(),
 				objectSwizzling,
 				copier,
-				currentClassLoaderProvider
-			)
+				currentClassLoaderProvider,
+				copier
+			),
+			validator
 		);
 	}
 

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

@@ -18,8 +18,14 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Queue;
+import java.util.Set;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
 
 import org.eclipse.serializer.persistence.binary.types.Binary;
 import org.eclipse.serializer.persistence.binary.types.BinaryStorer;
@@ -45,15 +51,19 @@ public class EclipseSerializerRegisteringCopier implements AutoCloseable
 	private final Supplier<PersistenceManager<Binary>> persistenceManagerSupplier;
 	private final SupportedChecker supportedChecker;
 	private final RegisteringWorkingCopyAndOriginal register;
+	private final Validator validator;
 
 	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<>();
 	}
 
@@ -138,10 +148,7 @@ private <T> T copy(final T source, final PersistenceManager<Binary> persistenceM
 				{
 					return;
 				}
-				if(copiedObject != null && !this.supportedChecker.isSupported(copiedObject.getClass()))
-				{
-					throw new DataTypeNotSupportedException(copiedObject.getClass());
-				}
+				this.validate(copiedObject);
 				summarizer.incrementCopiedObjectsCount();
 				if(DataTypeUtil.isPrimitiveType(copiedObject.getClass()))
 				{
@@ -167,6 +174,30 @@ private <T> T copy(final T source, final PersistenceManager<Binary> persistenceM
 		return returnValue;
 	}
 
+	private void validate(final Object copiedObject)
+	{
+		if(copiedObject != null)
+		{
+			if(!this.supportedChecker.isSupported(copiedObject.getClass()))
+			{
+				throw new DataTypeNotSupportedException(copiedObject.getClass());
+			}
+			final Set<ConstraintViolation<Object>> violations = this.validator.validate(copiedObject);
+			if(!violations.isEmpty())
+			{
+				final String violationsAsMessage = violations.stream()
+					.map(cv -> cv == null ? "null" : cv.getPropertyPath() + ": " + cv.getMessage())
+					.collect(Collectors.joining(", "));
+				
+				throw new ConstraintViolationException(
+					"Error validating " + copiedObject.getClass().getName() + ":" + System.lineSeparator()
+						+ violationsAsMessage,
+					violations
+				);
+			}
+		}
+	}
+	
 	private static class Summarizer
 	{
 		private long copiedObjectsCount;

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 org.eclipse.serializer.reflect.ClassLoaderProvider;
 
@@ -34,13 +36,16 @@ public RegisteringStorageToWorkingCopyCopier(
 		final SupportedChecker supportedChecker,
 		final ObjectSwizzling objectSwizzling,
 		final WorkingCopier<?> copier,
-		final ClassLoaderProvider currentClassLoaderProvider)
+		final Validator validator,
+		final ClassLoaderProvider currentClassLoaderProvider
+	)
 	{
 		super(
 			supportedChecker,
 			registry::register,
 			objectSwizzling,
 			copier,
+			validator,
 			currentClassLoaderProvider
 		);
 	}

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 org.eclipse.serializer.reflect.ClassLoaderProvider;
 
@@ -35,13 +37,16 @@ public RegisteringWorkingCopyToStorageCopier(
 		final SupportedChecker supportedChecker,
 		final ObjectSwizzling objectSwizzling,
 		final WorkingCopier<?> copier,
-		final ClassLoaderProvider currentClassLoaderProvider)
+		final Validator validator,
+		final ClassLoaderProvider currentClassLoaderProvider
+	)
 	{
 		super(
 			supportedChecker,
 			registry::invertRegister,
 			objectSwizzling,
 			copier,
+			validator,
 			currentClassLoaderProvider
 		);
 	}