Skip to content

Commit d07cc10

Browse files
committed
Adopt to Spring Framework 6.0 M6 changes.
Closes #2675
1 parent 02ec7ed commit d07cc10

File tree

4 files changed

+8
-68
lines changed

4 files changed

+8
-68
lines changed

src/test/java/org/springframework/data/aot/ClassProxyAssert.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/test/java/org/springframework/data/aot/CodeContributionAssert.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.assertj.core.api.AbstractAssert;
2424

2525
import org.springframework.aot.generate.GenerationContext;
26-
import org.springframework.aot.hint.ClassProxyHint;
2726
import org.springframework.aot.hint.JdkProxyHint;
2827
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
2928

@@ -102,18 +101,4 @@ private Stream<JdkProxyHint> jdkProxiesFor(Class<?> entryPoint) {
102101
.getProxiedInterfaces().get(0).getCanonicalName().equals(entryPoint.getCanonicalName()));
103102
}
104103

105-
public CodeContributionAssert contributesClassProxy(Class<?>... proxyInterfaces) {
106-
107-
assertThat(classProxiesFor(proxyInterfaces[0]))
108-
.describedAs("Unable to find JDK proxy matching [%s]", Arrays.asList(proxyInterfaces))
109-
.anySatisfy(it -> new ClassProxyAssert(it).matches(proxyInterfaces));
110-
111-
return this;
112-
}
113-
114-
private Stream<ClassProxyHint> classProxiesFor(Class<?> entryPoint) {
115-
116-
return this.actual.getRuntimeHints().proxies().classProxies().filter(jdkProxyHint -> jdkProxyHint
117-
.getProxiedInterfaces().get(0).getCanonicalName().equals(entryPoint.getCanonicalName()));
118-
}
119104
}

src/test/java/org/springframework/data/aot/ManagedTypesBeanRegistrationAotProcessorUnitTests.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424

2525
import org.junit.jupiter.api.BeforeEach;
2626
import org.junit.jupiter.api.Test;
27+
2728
import org.springframework.aot.generate.ClassNameGenerator;
2829
import org.springframework.aot.generate.DefaultGenerationContext;
29-
import org.springframework.aot.generate.GeneratedClasses;
3030
import org.springframework.aot.generate.InMemoryGeneratedFiles;
3131
import org.springframework.aot.hint.RuntimeHints;
3232
import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
@@ -86,8 +86,7 @@ void contributesReflectionForManagedTypes() {
8686
BeanRegistrationAotContribution contribution = createPostProcessor("commons")
8787
.processAheadOfTime(RegisteredBean.of(beanFactory, "commons.managed-types"));
8888

89-
DefaultGenerationContext generationContext = new DefaultGenerationContext(
90-
new GeneratedClasses(new ClassNameGenerator(Object.class)),
89+
DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class),
9190
new InMemoryGeneratedFiles(), new RuntimeHints());
9291

9392
contribution.applyTo(generationContext, null);
@@ -151,8 +150,8 @@ void returnsEmptyContributionWhenBeanCannotBeLoaded() {
151150
BeanRegistrationAotContribution contribution = createPostProcessor("commons")
152151
.processAheadOfTime(RegisteredBean.of(beanFactory, "commons.managed-types"));
153152

154-
DefaultGenerationContext generationContext = new DefaultGenerationContext(
155-
new GeneratedClasses(new ClassNameGenerator(Object.class)), new InMemoryGeneratedFiles(), new RuntimeHints());
153+
DefaultGenerationContext generationContext = new DefaultGenerationContext(new ClassNameGenerator(Object.class),
154+
new InMemoryGeneratedFiles(), new RuntimeHints());
156155

157156
contribution.applyTo(generationContext, null);
158157

src/test/java/org/springframework/data/aot/RepositoryRegistrationAotProcessorIntegrationTests.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424

2525
import org.springframework.aop.SpringProxy;
2626
import org.springframework.aop.framework.Advised;
27+
import org.springframework.aot.hint.RuntimeHints;
2728
import org.springframework.beans.factory.aot.BeanRegistrationAotContribution;
28-
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
29+
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
2930
import org.springframework.beans.factory.support.RegisteredBean;
3031
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
3132
import org.springframework.core.DecoratingProxy;
@@ -299,7 +300,7 @@ RepositoryRegistrationAotContributionBuilder computeAotConfiguration(Class<?> co
299300
AnnotationConfigApplicationContext applicationContext) {
300301

301302
applicationContext.register(configuration);
302-
applicationContext.refreshForAotProcessing();
303+
applicationContext.refreshForAotProcessing(new RuntimeHints());
303304

304305
return repositoryType -> {
305306

@@ -311,7 +312,7 @@ RepositoryRegistrationAotContributionBuilder computeAotConfiguration(Class<?> co
311312

312313
String repositoryBeanName = repositoryBeanNames[0];
313314

314-
ConfigurableBeanFactory beanFactory = applicationContext.getDefaultListableBeanFactory();
315+
ConfigurableListableBeanFactory beanFactory = applicationContext.getDefaultListableBeanFactory();
315316

316317
RepositoryRegistrationAotProcessor repositoryAotProcessor = applicationContext
317318
.getBean(RepositoryRegistrationAotProcessor.class);

0 commit comments

Comments
 (0)