Browse Source

Follow AOT repository contributor changes in data-commons.

Closes #5040.
pull/5044/head
Christoph Strobl 4 months ago committed by Mark Paluch
parent
commit
d6308ec648
No known key found for this signature in database
GPG Key ID: 55BC6374BAA9D973
  1. 1
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java
  2. 3
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java
  3. 2
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java
  4. 6
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/QueryMethodContributionUnitTests.java
  5. 1
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/ReactiveAotContributionIntegrationTests.java

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java

@ -103,6 +103,7 @@ class AotContributionIntegrationTests { @@ -103,6 +103,7 @@ class AotContributionIntegrationTests {
TestGenerationContext generationContext = new TestGenerationContext();
generator.processAheadOfTime(context, generationContext);
generationContext.writeGeneratedContent();
return generationContext;
}

3
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java

@ -74,10 +74,11 @@ public class AotFragmentTestConfigurationSupport implements BeanFactoryPostProce @@ -74,10 +74,11 @@ public class AotFragmentTestConfigurationSupport implements BeanFactoryPostProce
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();

2
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java

@ -67,7 +67,7 @@ class MongoRepositoryContributorUnitTests { @@ -67,7 +67,7 @@ class MongoRepositoryContributorUnitTests {
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);

6
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/QueryMethodContributionUnitTests.java

@ -15,7 +15,7 @@ @@ -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 javax.lang.model.element.Modifier; @@ -30,7 +30,6 @@ import javax.lang.model.element.Modifier;
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.AotRepositoryFragmentMet @@ -57,7 +56,6 @@ import org.springframework.data.repository.aot.generate.AotRepositoryFragmentMet
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 @@ class QueryMethodContributionUnitTests { @@ -405,7 +403,7 @@ class QueryMethodContributionUnitTests {
Assertions.fail("No contribution for method %s.%s(%s)".formatted(repository.getSimpleName(), methodName,
Arrays.stream(args).map(Class::getSimpleName).toList()));
}
AotRepositoryFragmentMetadata metadata = new AotRepositoryFragmentMetadata(ClassName.get(repository));
AotRepositoryFragmentMetadata metadata = new AotRepositoryFragmentMetadata();
metadata.addField(
FieldSpec.builder(MongoOperations.class, "mongoOperations", Modifier.PRIVATE, Modifier.FINAL).build());

1
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/ReactiveAotContributionIntegrationTests.java

@ -110,6 +110,7 @@ class ReactiveAotContributionIntegrationTests { @@ -110,6 +110,7 @@ class ReactiveAotContributionIntegrationTests {
TestGenerationContext generationContext = new TestGenerationContext();
generator.processAheadOfTime(context, generationContext);
generationContext.writeGeneratedContent();
return generationContext;
}

Loading…
Cancel
Save