Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Sébastien Deleuze
2025-06-09 16:49:34 +02:00
parent 077146d636 7bb19fcde8
commit be02d961fc
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/main/java/org/springframework/aot/hint/BindingReflectionHintsRegistrar.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2024 the original author or authors.
* Copyright 2002-2025 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.
@@ -148,7 +148,8 @@ public class BindingReflectionHintsRegistrar {
String companionClassName = clazz.getCanonicalName() + KOTLIN_COMPANION_SUFFIX;
if (ClassUtils.isPresent(companionClassName, null)) {
Class<?> companionClass = ClassUtils.resolveClassName(companionClassName, null);
Method serializerMethod = ClassUtils.getMethodIfAvailable(companionClass, "serializer");
Method serializerMethod = ClassUtils.getMethodIfAvailable(companionClass, "serializer",
(Class<?>[]) null);
if (serializerMethod != null) {
hints.registerMethod(serializerMethod, ExecutableMode.INVOKE);
}

20
spring-core/src/test/kotlin/org/springframework/aot/hint/BindingReflectionHintsRegistrarKotlinTests.kt
View File

@@ -80,6 +80,12 @@ class BindingReflectionHintsRegistrarKotlinTests {
bindingRegistrar.registerReflectionHints(hints.reflection(), SampleClass::class.java)
assertThat(RuntimeHintsPredicates.reflection().onType(SampleClass::class.java)).accepts(hints)
}
@Test
fun `Register reflection hints on serializer function with parameter`() {
bindingRegistrar.registerReflectionHints(hints.reflection(), SampleResult::class.java)
assertThat(RuntimeHintsPredicates.reflection().onMethodInvocation(SampleResult.Companion::class.java, "serializer")).accepts(hints)
}
}
@kotlinx.serialization.Serializable
@@ -88,3 +94,17 @@ class SampleSerializableClass(val name: String)
data class SampleDataClass(val name: String, val isNonNullable: Boolean, val isNullable: Boolean?)
class SampleClass(val name: String)
@kotlinx.serialization.Serializable
data class SampleResult <T>(
val code: Int,
val message: String,
val data: T,
) {
companion object {
private const val SUCCESS: Int = 200
private const val FAILURE: Int = 500
fun <T> success(message: String, data: T) = SampleResult<T>(code = SUCCESS, message = message, data = data)
fun <T> failure(message: String, data: T) = SampleResult<T>(code = FAILURE, message = message, data = data)
}
}