diff --git a/spring-beans/spring-beans.gradle b/spring-beans/spring-beans.gradle index 1ba00edf217..877d28852dc 100644 --- a/spring-beans/spring-beans.gradle +++ b/spring-beans/spring-beans.gradle @@ -12,7 +12,6 @@ dependencies { testImplementation(testFixtures(project(":spring-core"))) testImplementation(project(":spring-core-test")) testImplementation("jakarta.annotation:jakarta.annotation-api") - testImplementation(project(":spring-web")) testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesImplementation("org.assertj:assertj-core") } \ No newline at end of file diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsRuntimeHintsTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsRuntimeHintsTests.java index acd3cb68362..d90e0356fc0 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanUtilsRuntimeHintsTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanUtilsRuntimeHintsTests.java @@ -25,7 +25,6 @@ import org.springframework.aot.hint.RuntimeHintsRegistrar; import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; import org.springframework.core.io.ResourceEditor; import org.springframework.core.io.support.SpringFactoriesLoader; -import org.springframework.http.MediaTypeEditor; import org.springframework.util.ClassUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -34,23 +33,18 @@ import static org.assertj.core.api.Assertions.assertThat; * Tests for {@link BeanUtilsRuntimeHints}. * * @author Sebastien Deleuze + * @since 6.0.10 + * @see org.springframework.http.WebBeanUtilsRuntimeHintsTests */ class BeanUtilsRuntimeHintsTests { - private RuntimeHints hints; + private final RuntimeHints hints = new RuntimeHints(); @BeforeEach void setup() { - this.hints = new RuntimeHints(); SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories") - .load(RuntimeHintsRegistrar.class).forEach(registrar -> registrar - .registerHints(this.hints, ClassUtils.getDefaultClassLoader())); - } - - @Test - void mediaTypeEditorHasHints() { - assertThat(RuntimeHintsPredicates.reflection().onType(MediaTypeEditor.class) - .withMemberCategories(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)).accepts(this.hints); + .load(RuntimeHintsRegistrar.class) + .forEach(registrar -> registrar.registerHints(this.hints, ClassUtils.getDefaultClassLoader())); } @Test diff --git a/spring-web/src/test/java/org/springframework/http/WebBeanUtilsRuntimeHintsTests.java b/spring-web/src/test/java/org/springframework/http/WebBeanUtilsRuntimeHintsTests.java new file mode 100644 index 00000000000..cad56880200 --- /dev/null +++ b/spring-web/src/test/java/org/springframework/http/WebBeanUtilsRuntimeHintsTests.java @@ -0,0 +1,55 @@ +/* + * Copyright 2002-2023 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.http; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import org.springframework.aot.hint.MemberCategory; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; +import org.springframework.core.io.support.SpringFactoriesLoader; +import org.springframework.util.ClassUtils; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Web-related tests for {@link BeanUtilsRuntimeHints}. + * + * @author Sebastien Deleuze + * @since 6.0.10 + * @see org.springframework.beans.BeanUtilsRuntimeHintsTests + */ +class WebBeanUtilsRuntimeHintsTests { + + private final RuntimeHints hints = new RuntimeHints(); + + @BeforeEach + void setup() { + SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories") + .load(RuntimeHintsRegistrar.class) + .forEach(registrar -> registrar.registerHints(this.hints, ClassUtils.getDefaultClassLoader())); + } + + @Test + void mediaTypeEditorHasHints() { + assertThat(RuntimeHintsPredicates.reflection().onType(MediaTypeEditor.class) + .withMemberCategories(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)).accepts(this.hints); + } + +}