From bd0adc6621f8aa5f7357bdb89044cc52f671e8e1 Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 12 Aug 2025 14:42:31 +0200 Subject: [PATCH 1/2] Prepare issue branch --- pom.xml | 4 ++-- spring-data-mongodb-distribution/pom.xml | 2 +- spring-data-mongodb/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 9a1889723d..d6629cdf07 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-mongodb-parent - 5.0.0-SNAPSHOT + 5.0.x-GH-COMMONS-3339-SNAPSHOT pom Spring Data MongoDB @@ -26,7 +26,7 @@ multi spring-data-mongodb - 4.0.0-SNAPSHOT + 4.0.x-GH-3339-SNAPSHOT 5.5.1 1.19 diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml index fc88571622..57e4c39c5e 100644 --- a/spring-data-mongodb-distribution/pom.xml +++ b/spring-data-mongodb-distribution/pom.xml @@ -15,7 +15,7 @@ org.springframework.data spring-data-mongodb-parent - 5.0.0-SNAPSHOT + 5.0.x-GH-COMMONS-3339-SNAPSHOT ../pom.xml diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index 595e5a4250..985278fa10 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -13,7 +13,7 @@ org.springframework.data spring-data-mongodb-parent - 5.0.0-SNAPSHOT + 5.0.x-GH-COMMONS-3339-SNAPSHOT ../pom.xml From 6ae4a8a94a1927c40fb8a81af5ead5dc9d2e289c Mon Sep 17 00:00:00 2001 From: Christoph Strobl Date: Tue, 12 Aug 2025 15:22:25 +0200 Subject: [PATCH 2/2] Follow changes in data-commons --- .../repository/aot/AotContributionIntegrationTests.java | 1 + .../repository/aot/AotFragmentTestConfigurationSupport.java | 3 ++- .../repository/aot/MongoRepositoryContributorUnitTests.java | 2 +- .../repository/aot/QueryMethodContributionUnitTests.java | 6 ++---- .../aot/ReactiveAotContributionIntegrationTests.java | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java index b46b1dfb50..6849b4d621 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java @@ -103,6 +103,7 @@ private static TestGenerationContext generate(Class... configurationClasses) TestGenerationContext generationContext = new TestGenerationContext(); generator.processAheadOfTime(context, generationContext); + generationContext.writeGeneratedContent(); return generationContext; } diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java index ef44c2da8a..58626f8dcb 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java @@ -74,10 +74,11 @@ public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) repositoryContext.setBeanFactory(beanFactory); new MongoRepositoryContributor(repositoryContext).contribute(generationContext); + generationContext.writeGeneratedContent(); AbstractBeanDefinition aotGeneratedRepository = BeanDefinitionBuilder .genericBeanDefinition( - repositoryInterface.getPackageName() + "." + repositoryInterface.getSimpleName() + "Impl__Aot") // + repositoryInterface.getPackageName() + "." + repositoryInterface.getSimpleName() + "Impl__AotRepository") // .addConstructorArgValue(new RuntimeBeanReference(MongoOperations.class)) // .addConstructorArgValue(getCreationContext(repositoryContext)).getBeanDefinition(); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java index c55d460cfc..06e528e692 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java @@ -67,7 +67,7 @@ MongoOperations mongoOperations() { void shouldConsiderMetaAnnotation() throws IOException { InputStreamSource aotFragment = generationContext.getGeneratedFiles().getGeneratedFile(GeneratedFiles.Kind.SOURCE, - MetaUserRepository.class.getPackageName().replace('.', '/') + "/MetaUserRepositoryImpl__Aot.java"); + MetaUserRepository.class.getPackageName().replace('.', '/') + "/MetaUserRepositoryImpl__AotRepository.java"); String content = new InputStreamResource(aotFragment).getContentAsString(StandardCharsets.UTF_8); diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/QueryMethodContributionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/QueryMethodContributionUnitTests.java index bd5c190e20..cc7e49d604 100644 --- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/QueryMethodContributionUnitTests.java +++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/QueryMethodContributionUnitTests.java @@ -15,7 +15,7 @@ */ package org.springframework.data.mongodb.repository.aot; -import static org.assertj.core.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; import example.aot.User; import example.aot.UserRepository; @@ -30,7 +30,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - import org.springframework.data.domain.Limit; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Range; @@ -57,7 +56,6 @@ import org.springframework.data.repository.aot.generate.MethodContributor; import org.springframework.data.repository.core.RepositoryInformation; import org.springframework.data.repository.query.QueryMethod; -import org.springframework.javapoet.ClassName; import org.springframework.javapoet.FieldSpec; import org.springframework.javapoet.MethodSpec; @@ -405,7 +403,7 @@ private static MethodSpec codeOf(Class repository, String methodName, Class... configurationClasses) TestGenerationContext generationContext = new TestGenerationContext(); generator.processAheadOfTime(context, generationContext); + generationContext.writeGeneratedContent(); return generationContext; }