Skip to content

Commit b10d2ba

Browse files
DATAKV-129 - Allow usage of @AliasFor with @keyspace.
...draft
1 parent 4077177 commit b10d2ba

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

src/main/java/org/springframework/data/keyvalue/annotation/KeySpace.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@
5858
@Documented
5959
@Retention(RetentionPolicy.RUNTIME)
6060
@Target(value = { METHOD, TYPE })
61+
@Persistent
6162
public @interface KeySpace {
6263

6364
String value() default "";

src/main/java/org/springframework/data/keyvalue/core/mapping/AnnotationBasedKeySpaceResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public String resolveKeySpace(Class<?> type) {
5959

6060
private static Object getKeySpace(Class<?> type) {
6161

62-
KeySpace keyspace = AnnotationUtils.findAnnotation(type, KeySpace.class);
62+
KeySpace keyspace = AnnotatedElementUtils.findMergedAnnotation(type, KeySpace.class);
6363

6464
if (keyspace != null) {
6565
return AnnotationUtils.getValue(keyspace);

src/test/java/org/springframework/data/keyvalue/CustomKeySpaceAnnotation.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.lang.annotation.RetentionPolicy;
2121
import java.lang.annotation.Target;
2222

23+
import org.springframework.core.annotation.AliasFor;
2324
import org.springframework.data.annotation.Persistent;
2425
import org.springframework.data.keyvalue.annotation.KeySpace;
2526

@@ -31,8 +32,9 @@
3132
@Persistent
3233
@Retention(RetentionPolicy.RUNTIME)
3334
@Target({ ElementType.TYPE })
35+
@KeySpace
3436
public @interface CustomKeySpaceAnnotation {
3537

36-
@KeySpace
38+
@AliasFor(annotation = KeySpace.class, attribute = "value")
3739
String name() default "";
3840
}

0 commit comments

Comments
 (0)