From c6b31ccb0dae036e56f47c47a3d032b82e128b07 Mon Sep 17 00:00:00 2001 From: Thorsten Marx Date: Fri, 31 Jan 2025 15:43:18 +0100 Subject: [PATCH 1/2] fix template cache --- .../java/com/condation/cms/templates/TemplateConfiguration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cms-templates/src/main/java/com/condation/cms/templates/TemplateConfiguration.java b/cms-templates/src/main/java/com/condation/cms/templates/TemplateConfiguration.java index 4cfc08c2..ddc1972f 100644 --- a/cms-templates/src/main/java/com/condation/cms/templates/TemplateConfiguration.java +++ b/cms-templates/src/main/java/com/condation/cms/templates/TemplateConfiguration.java @@ -62,7 +62,7 @@ public boolean hasFilters () { } public TemplateConfiguration setCache (ICache cache) { - if (templateCache != null) { + if (templateCache == null) { templateCache = new TemplateCache(cache); } return this; From aeee6cf9be5dfb83376ae66893f9a396df66d129 Mon Sep 17 00:00:00 2001 From: Thorsten Marx Date: Fri, 31 Jan 2025 15:49:57 +0100 Subject: [PATCH 2/2] remove serializable --- cms-api/src/main/java/com/condation/cms/api/cache/ICache.java | 3 --- .../src/main/java/com/condation/cms/core/cache/LocalCache.java | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/cms-api/src/main/java/com/condation/cms/api/cache/ICache.java b/cms-api/src/main/java/com/condation/cms/api/cache/ICache.java index a5c41efd..2ee75f39 100644 --- a/cms-api/src/main/java/com/condation/cms/api/cache/ICache.java +++ b/cms-api/src/main/java/com/condation/cms/api/cache/ICache.java @@ -22,9 +22,6 @@ * #L% */ - -import java.io.Serializable; - /** * * @author t.marx diff --git a/cms-core/src/main/java/com/condation/cms/core/cache/LocalCache.java b/cms-core/src/main/java/com/condation/cms/core/cache/LocalCache.java index 2c0290ec..54f48a5c 100644 --- a/cms-core/src/main/java/com/condation/cms/core/cache/LocalCache.java +++ b/cms-core/src/main/java/com/condation/cms/core/cache/LocalCache.java @@ -26,7 +26,6 @@ import com.github.benmanes.caffeine.cache.Cache; import lombok.RequiredArgsConstructor; import com.condation.cms.api.cache.ICache; -import java.io.Serializable; import java.util.function.Function; /** @@ -36,7 +35,7 @@ * @param */ @RequiredArgsConstructor -public class LocalCache implements ICache { +public class LocalCache implements ICache { private final Cache wrappedCache; private final Function loader;