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

Workaround for inner class constructor parameter annotation bug in javac

Browse Source 
Issue: SPR-16652
This commit is contained in:
Juergen Hoeller
2018-03-29 15:45:02 +02:00
parent 3ac46da22f
commit 53d01392d7
2 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-core/src/main/java/org/springframework/core/MethodParameter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 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.
@@ -22,6 +22,7 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.Parameter;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
@@ -57,6 +58,8 @@ import org.springframework.util.Assert;
*/
public class MethodParameter {
private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0];
private final Executable executable;
private final int parameterIndex;
@@ -514,11 +517,20 @@ public class MethodParameter {
Annotation[] paramAnns = this.parameterAnnotations;
if (paramAnns == null) {
Annotation[][] annotationArray = this.executable.getParameterAnnotations();
if (this.parameterIndex >= 0 && this.parameterIndex < annotationArray.length) {
paramAnns = adaptAnnotationArray(annotationArray[this.parameterIndex]);
int index = this.parameterIndex;
if (this.executable instanceof Constructor &&
this.executable.getDeclaringClass().isMemberClass() &&
!Modifier.isStatic(this.executable.getDeclaringClass().getModifiers()) &&
annotationArray.length == this.executable.getParameterCount() - 1) {
// Bug in javac in JDK <9: annotation array excludes enclosing instance parameter
// for inner classes, so access it with the actual parameter index lowered by 1
index = this.parameterIndex - 1;
}
if (index >= 0 && index < annotationArray.length) {
paramAnns = adaptAnnotationArray(annotationArray[index]);
}
else {
paramAnns = new Annotation[0];
paramAnns = EMPTY_ANNOTATION_ARRAY;
}
this.parameterAnnotations = paramAnns;
}