From 9135921d1d5522ababce683fd027adfcdda55822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?= Date: Thu, 30 Jun 2022 11:56:08 +0200 Subject: [PATCH] Move BindingReflectionHintsRegistrar to spring-context Closes gh-28735 --- spring-context/spring-context.gradle | 2 ++ .../context/aot}/BindingReflectionHintsRegistrar.java | 2 +- .../context/aot}/BindingReflectionHintsRegistrarTests.java | 2 +- .../context/aot}/KotlinBindingReflectionHintsRegistrarTests.kt | 2 +- spring-core/spring-core.gradle | 2 -- .../web/bind/annotation/RequestMappingReflectiveProcessor.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename {spring-core/src/main/java/org/springframework/aot/hint/support => spring-context/src/main/java/org/springframework/context/aot}/BindingReflectionHintsRegistrar.java (99%) rename {spring-core/src/test/java/org/springframework/aot/hint/support => spring-context/src/test/java/org/springframework/context/aot}/BindingReflectionHintsRegistrarTests.java (99%) rename {spring-core/src/test/kotlin/org/springframework/aot/hint/support => spring-context/src/test/kotlin/org/springframework/context/aot}/KotlinBindingReflectionHintsRegistrarTests.kt (98%) diff --git a/spring-context/spring-context.gradle b/spring-context/spring-context.gradle index b038d428927..d7e366331b3 100644 --- a/spring-context/spring-context.gradle +++ b/spring-context/spring-context.gradle @@ -1,6 +1,7 @@ description = "Spring Context" apply plugin: "kotlin" +apply plugin: "kotlinx-serialization" dependencies { api(project(":spring-aop")) @@ -32,6 +33,7 @@ dependencies { testImplementation("org.apache.commons:commons-pool2") testImplementation("org.awaitility:awaitility") testImplementation("jakarta.inject:jakarta.inject-tck") + testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json") testRuntimeOnly("jakarta.xml.bind:jakarta.xml.bind-api") testRuntimeOnly("org.glassfish:jakarta.el") // Substitute for javax.management:jmxremote_optional:1.0.1_04 (not available on Maven Central) diff --git a/spring-core/src/main/java/org/springframework/aot/hint/support/BindingReflectionHintsRegistrar.java b/spring-context/src/main/java/org/springframework/context/aot/BindingReflectionHintsRegistrar.java similarity index 99% rename from spring-core/src/main/java/org/springframework/aot/hint/support/BindingReflectionHintsRegistrar.java rename to spring-context/src/main/java/org/springframework/context/aot/BindingReflectionHintsRegistrar.java index c1f4097a5aa..ad0af7827ed 100644 --- a/spring-core/src/main/java/org/springframework/aot/hint/support/BindingReflectionHintsRegistrar.java +++ b/spring-context/src/main/java/org/springframework/context/aot/BindingReflectionHintsRegistrar.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.hint.support; +package org.springframework.context.aot; import java.beans.BeanInfo; import java.beans.IntrospectionException; diff --git a/spring-core/src/test/java/org/springframework/aot/hint/support/BindingReflectionHintsRegistrarTests.java b/spring-context/src/test/java/org/springframework/context/aot/BindingReflectionHintsRegistrarTests.java similarity index 99% rename from spring-core/src/test/java/org/springframework/aot/hint/support/BindingReflectionHintsRegistrarTests.java rename to spring-context/src/test/java/org/springframework/context/aot/BindingReflectionHintsRegistrarTests.java index e4b0573d481..76330a04f58 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/support/BindingReflectionHintsRegistrarTests.java +++ b/spring-context/src/test/java/org/springframework/context/aot/BindingReflectionHintsRegistrarTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.hint.support; +package org.springframework.context.aot; import java.lang.reflect.Type; import java.util.List; diff --git a/spring-core/src/test/kotlin/org/springframework/aot/hint/support/KotlinBindingReflectionHintsRegistrarTests.kt b/spring-context/src/test/kotlin/org/springframework/context/aot/KotlinBindingReflectionHintsRegistrarTests.kt similarity index 98% rename from spring-core/src/test/kotlin/org/springframework/aot/hint/support/KotlinBindingReflectionHintsRegistrarTests.kt rename to spring-context/src/test/kotlin/org/springframework/context/aot/KotlinBindingReflectionHintsRegistrarTests.kt index 17f1a63a9f0..be7bc11d58c 100644 --- a/spring-core/src/test/kotlin/org/springframework/aot/hint/support/KotlinBindingReflectionHintsRegistrarTests.kt +++ b/spring-context/src/test/kotlin/org/springframework/context/aot/KotlinBindingReflectionHintsRegistrarTests.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.aot.hint.support +package org.springframework.context.aot import org.assertj.core.api.Assertions.assertThat import org.assertj.core.api.ThrowingConsumer diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index c9fedf4628d..0517e19e555 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -3,7 +3,6 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar description = "Spring Core" apply plugin: "kotlin" -apply plugin: "kotlinx-serialization" // spring-core includes asm, javapoet and repackages cglib, inlining all into the // spring-core jar. cglib itself depends on asm and is therefore further transformed by @@ -71,7 +70,6 @@ dependencies { testImplementation("io.projectreactor:reactor-test") testImplementation("io.projectreactor.tools:blockhound") testImplementation("org.skyscreamer:jsonassert") - testImplementation("org.jetbrains.kotlinx:kotlinx-serialization-json") testFixturesImplementation("com.google.code.findbugs:jsr305") testFixturesImplementation("org.junit.platform:junit-platform-launcher") testFixturesImplementation("org.junit.jupiter:junit-jupiter-api") diff --git a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMappingReflectiveProcessor.java b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMappingReflectiveProcessor.java index b76529d07e9..a39ae5b0baa 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMappingReflectiveProcessor.java +++ b/spring-web/src/main/java/org/springframework/web/bind/annotation/RequestMappingReflectiveProcessor.java @@ -24,7 +24,7 @@ import java.lang.reflect.Type; import org.springframework.aot.hint.ExecutableMode; import org.springframework.aot.hint.ReflectionHints; import org.springframework.aot.hint.annotation.ReflectiveProcessor; -import org.springframework.aot.hint.support.BindingReflectionHintsRegistrar; +import org.springframework.context.aot.BindingReflectionHintsRegistrar; import org.springframework.core.MethodParameter; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.http.HttpEntity;