From f4062af3bc423f88705fc90bebc4fbab15096e83 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Mon, 13 Jan 2020 18:57:23 -0500
Subject: [PATCH] minor refactorings

---
 .../org/cobbzilla/wizard/client/script/ApiRunner.java     | 1 +
 .../wizardtest/resources/AbstractResourceIT.java          | 1 +
 .../cobbzilla/wizardtest/resources/ApiModelTestBase.java  | 3 ++-
 .../org/cobbzilla/wizard/cache/redis/RedisService.java    | 8 ++------
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java b/wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java
index 09c63fa..9e5fa1e 100644
--- a/wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java
+++ b/wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java
@@ -51,6 +51,7 @@ public class ApiRunner {
 
     @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") // intended for use in debugging
     @Getter private static Map<String, ApiScript> currentScripts = new HashMap<>();
+    public static void resetScripts () { currentScripts.clear(); }
 
     public ApiRunner(ApiClientBase api, ApiRunnerListener listener) {
         this.api = api;
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java
index f5ad62d..43a59e6 100644
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java
+++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java
@@ -210,6 +210,7 @@ public abstract class AbstractResourceIT<C extends PgRestServerConfiguration, S
     public boolean useTestSpecificDatabase () { return false; }
 
     @Before public synchronized void startServer() throws Exception {
+        ApiRunner.resetScripts();
         synchronized (server) {
             if (getServer() == null) {
                 final String serverCacheKey = getServerCacheKey();
diff --git a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
index af8cb2a..1dbb16d 100644
--- a/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
+++ b/wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
@@ -69,7 +69,8 @@ public abstract class ApiModelTestBase<C extends PgRestServerConfiguration, S ex
         if (docsEnabled) listener.addApiListener(apiDocsRunnerListener);
         return listener;
     }
-    @Before public void reset() throws Exception { setSystemTimeOffset(0); }
+
+    @Before public void resetSystemClock() { setSystemTimeOffset(0); }
 
     @Override public void onStart(RestServer<C> server) {
         super.onStart(server);
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java b/wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java
index 69ccd33..402986f 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java
@@ -30,6 +30,7 @@ public class RedisService {
     public static final String EX = "EX";
     public static final String XX = "XX";
     public static final String NX = "NX";
+    public static final String ALL_KEYS = "*";
 
     @Autowired @Getter @Setter private HasRedisConfiguration configuration;
 
@@ -657,11 +658,6 @@ public class RedisService {
         }
     }
 
-    public void flush() {
-        final Collection<String> keys = keys(prefix("*"));
-        for (String key : keys) {
-            del(key);
-        }
-    }
+    public void flush() { keys(prefix(ALL_KEYS)).forEach(this::del); }
 
 }