From ace0c09e225d3375b5ea63a251d716bf4032ccf4 Mon Sep 17 00:00:00 2001 From: Timm Fitschen <t.fitschen@indiscale.com> Date: Sun, 8 Oct 2023 22:52:08 +0200 Subject: [PATCH] WIP: String IDs --- src/main/java/org/caosdb/server/CaosDBServer.java | 4 ++++ src/test/java/org/caosdb/server/caching/TestCaching.java | 1 + src/test/java/org/caosdb/server/caching/TestNoCaching.java | 1 + 3 files changed, 6 insertions(+) diff --git a/src/main/java/org/caosdb/server/CaosDBServer.java b/src/main/java/org/caosdb/server/CaosDBServer.java index e843645c..5781f2e1 100644 --- a/src/main/java/org/caosdb/server/CaosDBServer.java +++ b/src/main/java/org/caosdb/server/CaosDBServer.java @@ -154,6 +154,7 @@ public class CaosDBServer extends Application { parseArguments(args); initScheduler(); initServerProperties(); + initCaching(); initTimeZone(); initOneTimeTokens(); initShiro(); @@ -197,6 +198,9 @@ public class CaosDBServer extends Application { public static void initServerProperties() throws IOException { SERVER_PROPERTIES = ServerProperties.initServerProperties(); + } + + public static void initCaching() { USE_CACHE = !Boolean.parseBoolean(CaosDBServer.getServerProperty(ServerProperties.KEY_CACHE_DISABLE)); } diff --git a/src/test/java/org/caosdb/server/caching/TestCaching.java b/src/test/java/org/caosdb/server/caching/TestCaching.java index 1aba2ff6..26abd47b 100644 --- a/src/test/java/org/caosdb/server/caching/TestCaching.java +++ b/src/test/java/org/caosdb/server/caching/TestCaching.java @@ -17,6 +17,7 @@ public class TestCaching { @BeforeAll public static void init() throws IOException { CaosDBServer.initServerProperties(); + CaosDBServer.initCaching(); JCSCacheHelper.init(); } diff --git a/src/test/java/org/caosdb/server/caching/TestNoCaching.java b/src/test/java/org/caosdb/server/caching/TestNoCaching.java index 4fc73adf..db47853f 100644 --- a/src/test/java/org/caosdb/server/caching/TestNoCaching.java +++ b/src/test/java/org/caosdb/server/caching/TestNoCaching.java @@ -17,6 +17,7 @@ public class TestNoCaching { public static void init() throws IOException { CaosDBServer.initServerProperties(); CaosDBServer.setProperty(ServerProperties.KEY_CACHE_DISABLE, "TRUE"); + CaosDBServer.initCaching(); JCSCacheHelper.init(); } -- GitLab