diff options
| author | 2016-09-29 13:19:02 +0000 | |
|---|---|---|
| committer | 2016-09-29 13:19:02 +0000 | |
| commit | 125a273e8ae2301376a6d046e1cf142ec372fcd0 (patch) | |
| tree | b72d85336b5eeade7de07dd74fa973b0e6259fee | |
| parent | 505b90ad5c061902d2aa396ce0a97709968260c7 (diff) | |
| parent | bd32321b4fa2dea0e223c0d473ab08d39b0d5691 (diff) | |
Merge "Fix AnnotatedElement.getDeclaredAnnotation() generic signature"
am: bd32321b4f
Change-Id: I17c55503e18f5f189e56fc0e4fed21616f14f3b0
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index b79fbcecdeb6..fd5c371e805d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -51846,7 +51846,7 @@ package java.lang.reflect { method public abstract <T extends java.lang.annotation.Annotation> T getAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getAnnotations(); method public default <T extends java.lang.annotation.Annotation> T[] getAnnotationsByType(java.lang.Class<T>); - method public default <T extends java.lang.annotation.Annotation> java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); + method public default <T extends java.lang.annotation.Annotation> T getDeclaredAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations(); method public default <T extends java.lang.annotation.Annotation> T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public default boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); diff --git a/api/system-current.txt b/api/system-current.txt index f878ec4a44cd..528342fd3ae4 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -55203,7 +55203,7 @@ package java.lang.reflect { method public abstract <T extends java.lang.annotation.Annotation> T getAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getAnnotations(); method public default <T extends java.lang.annotation.Annotation> T[] getAnnotationsByType(java.lang.Class<T>); - method public default <T extends java.lang.annotation.Annotation> java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); + method public default <T extends java.lang.annotation.Annotation> T getDeclaredAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations(); method public default <T extends java.lang.annotation.Annotation> T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public default boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); diff --git a/api/test-current.txt b/api/test-current.txt index b43a15179017..871617f09ccb 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -51926,7 +51926,7 @@ package java.lang.reflect { method public abstract <T extends java.lang.annotation.Annotation> T getAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getAnnotations(); method public default <T extends java.lang.annotation.Annotation> T[] getAnnotationsByType(java.lang.Class<T>); - method public default <T extends java.lang.annotation.Annotation> java.lang.annotation.Annotation getDeclaredAnnotation(java.lang.Class<T>); + method public default <T extends java.lang.annotation.Annotation> T getDeclaredAnnotation(java.lang.Class<T>); method public abstract java.lang.annotation.Annotation[] getDeclaredAnnotations(); method public default <T extends java.lang.annotation.Annotation> T[] getDeclaredAnnotationsByType(java.lang.Class<T>); method public default boolean isAnnotationPresent(java.lang.Class<? extends java.lang.annotation.Annotation>); |