From 3188c0f7db54cffdb95e7127e2adde959dd078f9 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Tue, 15 Feb 2022 13:47:03 +0100 Subject: [PATCH] Ensure fix for gh-28012 is actually tested In 3ec612aaf8, I accidentally removed tests that verified support for non-synthesizable merged annotations for recursive annotations in Kotlin. This commit reinstates those non-synthesizable tests while retaining the synthesizable tests. --- .../springframework/core/annotation/Filter.kt | 4 -- .../KotlinMergedAnnotationsTests.kt | 68 ++++++++++++++++++- .../springframework/core/annotation/Person.kt | 4 -- .../core/annotation/SynthesizableFilter.kt | 35 ++++++++++ .../core/annotation/SynthesizableFilters.kt | 29 ++++++++ .../core/annotation/SynthesizablePerson.kt | 35 ++++++++++ 6 files changed, 166 insertions(+), 9 deletions(-) create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilter.kt create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilters.kt create mode 100644 spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizablePerson.kt diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt index 2755ba4d9b2f..9a05b5ba1adc 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/Filter.kt @@ -24,12 +24,8 @@ package org.springframework.core.annotation @Retention(AnnotationRetention.RUNTIME) public annotation class Filter( - @get:AliasFor("name") val value: String = "", - @get:AliasFor("value") - val name: String = "", - val and: Filters = Filters() ) diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt index dedd3ced4166..fa32cfe3650d 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/KotlinMergedAnnotationsTests.kt @@ -41,6 +41,34 @@ class KotlinMergedAnnotationsTests { val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(Person::class.java)) assertThat(mergedAnnotation).isNotNull(); + // NON-Synthesized Annotations + val jane = mergedAnnotation.synthesize() + assertThat(jane).isNotInstanceOf(SynthesizedAnnotation::class.java) + assertThat(jane.name).isEqualTo("jane") + val synthesizedFriends = jane.friends + assertThat(synthesizedFriends).hasSize(2) + + val john = synthesizedFriends[0] + assertThat(john).isNotInstanceOf(SynthesizedAnnotation::class.java) + assertThat(john.name).isEqualTo("john") + + val sally = synthesizedFriends[1] + assertThat(sally).isNotInstanceOf(SynthesizedAnnotation::class.java) + assertThat(sally.name).isEqualTo("sally") + } + + @Test // gh-28012 + fun recursiveAnnotationWithAttributeAliases() { + val method = javaClass.getMethod("synthesizablePersonMethod") + + // MergedAnnotations + val mergedAnnotations = MergedAnnotations.from(method) + assertThat(mergedAnnotations.isPresent(SynthesizablePerson::class.java)).isTrue(); + + // MergedAnnotation + val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(SynthesizablePerson::class.java)) + assertThat(mergedAnnotation).isNotNull(); + // Synthesized Annotations val jane = mergedAnnotation.synthesize() assertThat(jane).isInstanceOf(SynthesizedAnnotation::class.java) @@ -72,6 +100,36 @@ class KotlinMergedAnnotationsTests { val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(Filter::class.java)) assertThat(mergedAnnotation).isNotNull(); + // NON-Synthesized Annotations + val fooFilter = mergedAnnotation.synthesize() + assertThat(fooFilter).isNotInstanceOf(SynthesizedAnnotation::class.java) + assertThat(fooFilter.value).isEqualTo("foo") + val filters = fooFilter.and + assertThat(filters.value).hasSize(2) + + val barFilter = filters.value[0] + assertThat(barFilter).isNotInstanceOf(SynthesizedAnnotation::class.java) + assertThat(barFilter.value).isEqualTo("bar") + assertThat(barFilter.and.value).isEmpty() + + val bazFilter = filters.value[1] + assertThat(bazFilter).isNotInstanceOf(SynthesizedAnnotation::class.java) + assertThat(bazFilter.value).isEqualTo("baz") + assertThat(bazFilter.and.value).isEmpty() + } + + @Test // gh-28012 + fun recursiveNestedAnnotationWithAttributeAliases() { + val method = javaClass.getMethod("synthesizableFilterMethod") + + // MergedAnnotations + val mergedAnnotations = MergedAnnotations.from(method) + assertThat(mergedAnnotations.isPresent(SynthesizableFilter::class.java)).isTrue(); + + // MergedAnnotation + val mergedAnnotation = MergedAnnotation.from(method.getAnnotation(SynthesizableFilter::class.java)) + assertThat(mergedAnnotation).isNotNull(); + // Synthesized Annotations val fooFilter = mergedAnnotation.synthesize() assertThat(fooFilter).isInstanceOf(SynthesizedAnnotation::class.java) @@ -94,12 +152,20 @@ class KotlinMergedAnnotationsTests { } - @Person("jane", friends = [Person("john"), Person("sally")]) + @Person(name = "jane", friends = [Person(name = "john"), Person(name = "sally")]) fun personMethod() { } + @SynthesizablePerson(name = "jane", friends = [SynthesizablePerson(name = "john"), SynthesizablePerson(name = "sally")]) + fun synthesizablePersonMethod() { + } + @Filter("foo", and = Filters(Filter("bar"), Filter("baz"))) fun filterMethod() { } + @SynthesizableFilter("foo", and = SynthesizableFilters(SynthesizableFilter("bar"), SynthesizableFilter("baz"))) + fun synthesizableFilterMethod() { + } + } diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt index 28d67c4a2364..4ae45e5feb0c 100644 --- a/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt +++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/Person.kt @@ -24,10 +24,6 @@ package org.springframework.core.annotation @Retention(AnnotationRetention.RUNTIME) public annotation class Person( - @get:AliasFor("name") - val value: String = "", - - @get:AliasFor("value") val name: String = "", vararg val friends: Person = [] diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilter.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilter.kt new file mode 100644 index 000000000000..b10a970fdc6d --- /dev/null +++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilter.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2002-2022 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.core.annotation + +/** + * @author Sam Brannen + * @since 5.3.16 + */ +@Target(AnnotationTarget.FUNCTION) +@Retention(AnnotationRetention.RUNTIME) +public annotation class SynthesizableFilter( + + @get:AliasFor("name") + val value: String = "", + + @get:AliasFor("value") + val name: String = "", + + val and: SynthesizableFilters = SynthesizableFilters() + +) diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilters.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilters.kt new file mode 100644 index 000000000000..b961de1abe7a --- /dev/null +++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizableFilters.kt @@ -0,0 +1,29 @@ +/* + * Copyright 2002-2022 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.core.annotation + +/** + * @author Sam Brannen + * @since 5.3.16 + */ +@Target(AnnotationTarget.FUNCTION) +@Retention(AnnotationRetention.RUNTIME) +public annotation class SynthesizableFilters( + + vararg val value: SynthesizableFilter + +) diff --git a/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizablePerson.kt b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizablePerson.kt new file mode 100644 index 000000000000..01d6f870c7cb --- /dev/null +++ b/spring-core/src/test/kotlin/org/springframework/core/annotation/SynthesizablePerson.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2002-2022 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.core.annotation + +/** + * @author Sam Brannen + * @since 5.3.16 + */ +@Target(AnnotationTarget.FUNCTION) +@Retention(AnnotationRetention.RUNTIME) +public annotation class SynthesizablePerson( + + @get:AliasFor("name") + val value: String = "", + + @get:AliasFor("value") + val name: String = "", + + vararg val friends: SynthesizablePerson = [] + +)