File tree Expand file tree Collapse file tree 1 file changed +6
-5
lines changed
src/main/java/org/springframework/data/keyvalue/core/mapping Expand file tree Collapse file tree 1 file changed +6
-5
lines changed Original file line number Diff line number Diff line change 15
15
*/
16
16
package org .springframework .data .keyvalue .core .mapping ;
17
17
18
- import org .springframework .core .annotation .AnnotatedElementUtils ;
19
- import org .springframework .core .annotation .AnnotationUtils ;
18
+ import org .springframework .core .annotation .MergedAnnotation ;
19
+ import org .springframework .core .annotation .MergedAnnotations ;
20
20
import org .springframework .data .annotation .Persistent ;
21
21
import org .springframework .data .keyvalue .annotation .KeySpace ;
22
22
import org .springframework .lang .Nullable ;
@@ -50,10 +50,11 @@ public String resolveKeySpace(Class<?> type) {
50
50
@ Nullable
51
51
private static Object getKeySpace (Class <?> type ) {
52
52
53
- KeySpace keyspace = AnnotatedElementUtils .findMergedAnnotation (type , KeySpace .class );
53
+ MergedAnnotation <KeySpace > annotation = MergedAnnotations
54
+ .from (type , MergedAnnotations .SearchStrategy .TYPE_HIERARCHY ).get (KeySpace .class );
54
55
55
- if (keyspace != null ) {
56
- return AnnotationUtils .getValue (keyspace );
56
+ if (annotation . isPresent () ) {
57
+ return annotation .getValue ("value" ). orElse ( null );
57
58
}
58
59
59
60
return null ;
You can’t perform that action at this time.
0 commit comments