From b569ec97ee488f5f3cdbba7250c1099ff349c7c2 Mon Sep 17 00:00:00 2001 From: Roland Praml Date: Tue, 17 Jan 2023 15:31:11 +0100 Subject: [PATCH] FIX: Search cache annotations recursively --- .../io/ebeaninternal/server/cache/DefaultCacheHolder.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java index aff1929b6..aba5ab363 100644 --- a/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java +++ b/ebean-core/src/main/java/io/ebeaninternal/server/cache/DefaultCacheHolder.java @@ -130,7 +130,7 @@ final class DefaultCacheHolder { } private ServerCacheOptions getQueryOptions(Class cls) { - CacheQueryTuning tuning = AnnotationUtil.get(cls, CacheQueryTuning.class); + CacheQueryTuning tuning = AnnotationUtil.typeGet(cls, CacheQueryTuning.class); if (tuning != null) { return new ServerCacheOptions(tuning).applyDefaults(queryDefault); } @@ -138,9 +138,9 @@ final class DefaultCacheHolder { } private ServerCacheOptions getBeanOptions(Class cls) { - Cache cache = cls.getAnnotation(Cache.class); + Cache cache = AnnotationUtil.typeGet(cls, Cache.class); boolean nearCache = (cache != null && cache.nearCache()); - CacheBeanTuning tuning = cls.getAnnotation(CacheBeanTuning.class); + CacheBeanTuning tuning = AnnotationUtil.typeGet(cls, CacheBeanTuning.class); if (tuning != null) { return new ServerCacheOptions(nearCache, tuning).applyDefaults(beanDefault); }