Ver código fonte

minor refactorings

tags/2.0.1
Jonathan Cobb 4 anos atrás
pai
commit
f4062af3bc
4 arquivos alterados com 6 adições e 7 exclusões
  1. +1
    -0
      wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java
  2. +1
    -0
      wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java
  3. +2
    -1
      wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java
  4. +2
    -6
      wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java

+ 1
- 0
wizard-common/src/main/java/org/cobbzilla/wizard/client/script/ApiRunner.java Ver arquivo

@@ -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;


+ 1
- 0
wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/AbstractResourceIT.java Ver arquivo

@@ -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();


+ 2
- 1
wizard-server-test/src/main/java/org/cobbzilla/wizardtest/resources/ApiModelTestBase.java Ver arquivo

@@ -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);


+ 2
- 6
wizard-server/src/main/java/org/cobbzilla/wizard/cache/redis/RedisService.java Ver arquivo

@@ -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); }

}

Carregando…
Cancelar
Salvar