From 68e84577188ca133c469659b7344baf3ef2f3ecd Mon Sep 17 00:00:00 2001 From: fk-currenxie Date: Wed, 6 Dec 2023 17:56:32 +0100 Subject: [PATCH] fix AnnotationEntityViewConfigurationSource to use the correct Assert.notNull in Spring 6.1 --- CHANGELOG.md | 1 + .../impl/AnnotationEntityViewConfigurationSource.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fb79b250d..7adfa2aa67 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Changes that happened in releases ### Bug fixes * Fix over-fetching of entity view data with dynamic fetches +* Fix Spring 6.1 compatibility ### Backwards-incompatible changes diff --git a/integration/entity-view-spring-6.0/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AnnotationEntityViewConfigurationSource.java b/integration/entity-view-spring-6.0/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AnnotationEntityViewConfigurationSource.java index 3edea4502b..439e15cacd 100644 --- a/integration/entity-view-spring-6.0/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AnnotationEntityViewConfigurationSource.java +++ b/integration/entity-view-spring-6.0/src/main/java/com/blazebit/persistence/integration/view/spring/impl/AnnotationEntityViewConfigurationSource.java @@ -55,9 +55,9 @@ public class AnnotationEntityViewConfigurationSource extends AbstractEntityViewC public AnnotationEntityViewConfigurationSource(AnnotationMetadata metadata, Class annotation, ResourceLoader resourceLoader, Environment environment) { super(environment); - Assert.notNull(metadata); - Assert.notNull(annotation); - Assert.notNull(resourceLoader); + Assert.notNull(metadata, "metadata must not be null"); + Assert.notNull(annotation, "annotation must not be null"); + Assert.notNull(resourceLoader, "resourceLoader must not be null"); this.attributes = new AnnotationAttributes(metadata.getAnnotationAttributes(annotation.getName())); this.configMetadata = metadata;