From f9ac897eccb935fcdfdc0ace6f8d8a0281578555 Mon Sep 17 00:00:00 2001
From: Christoph Strobl <cstrobl@pivotal.io>
Date: Thu, 6 Oct 2016 18:35:21 +0200
Subject: [PATCH] DATAKV-150 - Fix compile error after switch to Spring 5.

---
 .../keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java b/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
index 1c44447..244f584 100644
--- a/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
+++ b/src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java
@@ -330,7 +330,7 @@ enum AnnotationBasedKeySpaceResolver implements KeySpaceResolver {
 				this.declaringClass = declaringClass;
 				this.composedAnnotation = composedAnnotation;
 				this.annotation = annotation;
-				this.annotationAttributes = AnnotatedElementUtils.getAnnotationAttributes(rootDeclaringClass, annotation
+				this.annotationAttributes = AnnotatedElementUtils.getMergedAnnotationAttributes(rootDeclaringClass, annotation
 						.annotationType().getName());
 			}