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

Ignore Kotlin annotations when creating test context cache key

Browse Source 
Every classes that's compiled by Kotlin is annotated with
kotlin.Metadata. The attributes of this annotation always differ so
if they are used in the cache key, context caching will effectively
be disabled.

This commit updates the key used by ImportsContextCustomizer to
ignore the kotlin.Metadata annotation. Additionally, to align with
with Java where annotations in java.lang.annotation are ignored,
annotations in kotlin.annotation are also ignored.

Closes gh-7101
This commit is contained in:
Andy Wilkinson
2016-10-19 12:03:33 +01:00
parent 639b0f554d
commit 64d32191cf
3 changed files with 69 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-boot-test/src/main/java/org/springframework/boot/test/context/ImportsContextCustomizer.java
View File

@@ -207,10 +207,10 @@ class ImportsContextCustomizer implements ContextCustomizer {
/**
* The key used to ensure correct application context caching. Keys are generated
* based on <em>all</em> the annotations used with the test. We must use something
* broader than just {@link Import @Import} annotations since an {@code @Import} may
* use an {@link ImportSelector} which could make decisions based on anything
* available from {@link AnnotationMetadata}.
* based on <em>all</em> the annotations used with the test that aren't core Java or
* Kotlin annotations. We must use something broader than just {@link Import @Import}
* annotations since an {@code @Import} may use an {@link ImportSelector} which could
* make decisions based on anything available from {@link AnnotationMetadata}.
*/
static class ContextCustomizerKey {
@@ -239,7 +239,8 @@ class ImportsContextCustomizer implements ContextCustomizer {
private void collectElementAnnotations(AnnotatedElement element,
Set<Annotation> annotations, Set<Class<?>> seen) {
for (Annotation annotation : element.getDeclaredAnnotations()) {
if (!AnnotationUtils.isInJavaLangAnnotationPackage(annotation)) {
if (!AnnotationUtils.isInJavaLangAnnotationPackage(annotation)
&& !isIgnoredKotlinAnnotation(annotation)) {
annotations.add(annotation);
collectClassAnnotations(annotation.annotationType(), annotations,
seen);
@@ -247,6 +248,15 @@ class ImportsContextCustomizer implements ContextCustomizer {
}
}
private boolean isIgnoredKotlinAnnotation(Annotation annotation) {
return "kotlin.Metadata".equals(annotation.annotationType().getName())
|| isInKotlinAnnotationPackage(annotation);
}
private boolean isInKotlinAnnotationPackage(Annotation annotation) {
return annotation.annotationType().getName().startsWith("kotlin.annotation.");
}
@Override
public int hashCode() {
return this.annotations.hashCode();