From 01ebe8b2edc67c3ec704f5a7adcf8fa5f4251211 Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 4 Feb 2020 03:23:41 -0500
Subject: [PATCH] minor cleanup

---
 .../java/org/cobbzilla/wizard/filters/RateLimitFilter.java   | 5 +++--
 .../java/org/cobbzilla/wizard/server/RestServerBase.java     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/filters/RateLimitFilter.java b/wizard-server/src/main/java/org/cobbzilla/wizard/filters/RateLimitFilter.java
index aad591d..d945b42 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/filters/RateLimitFilter.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/filters/RateLimitFilter.java
@@ -16,7 +16,6 @@ import javax.ws.rs.WebApplicationException;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.core.Context;
-import javax.ws.rs.core.Response;
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.List;
@@ -25,8 +24,10 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static org.cobbzilla.util.daemon.ZillaRuntime.empty;
+import static org.cobbzilla.util.http.HttpStatusCodes.TOO_MANY_REQUESTS;
 import static org.cobbzilla.util.io.StreamUtil.stream2string;
 import static org.cobbzilla.util.string.StringUtil.getPackagePath;
+import static org.cobbzilla.wizard.resources.ResourceUtil.status;
 
 @NoArgsConstructor @Slf4j
 public abstract class RateLimitFilter implements ContainerRequestFilter {
@@ -108,7 +109,7 @@ public abstract class RateLimitFilter implements ContainerRequestFilter {
             } else {
                 log.warn("filter: limit ("+limits.get(i.intValue())+") exceeded for keys: "+StringUtil.toString(keys));
             }
-            throw new WebApplicationException(Response.status(429).build());
+            throw new WebApplicationException(status(TOO_MANY_REQUESTS));
         }
     }
 
diff --git a/wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java b/wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java
index 7f90122..f7a09b8 100644
--- a/wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java
+++ b/wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java
@@ -12,7 +12,6 @@ import org.cobbzilla.util.json.JsonUtil;
 import org.cobbzilla.util.network.NetworkUtil;
 import org.cobbzilla.util.network.PortPicker;
 import org.cobbzilla.util.reflect.ReflectionUtil;
-import org.cobbzilla.util.security.bcrypt.BCryptUtil;
 import org.cobbzilla.wizard.model.entityconfig.EntityConfigSource;
 import org.cobbzilla.wizard.model.entityconfig.EntityConfigValidator;
 import org.cobbzilla.wizard.server.config.*;
@@ -50,6 +49,7 @@ import java.util.concurrent.TimeUnit;
 import static org.cobbzilla.util.daemon.ZillaRuntime.*;
 import static org.cobbzilla.util.network.NetworkUtil.IPv4_ALL_ADDRS;
 import static org.cobbzilla.util.reflect.ReflectionUtil.*;
+import static org.cobbzilla.util.security.bcrypt.BCryptUtil.setBcryptRounds;
 import static org.cobbzilla.util.string.StringUtil.EMPTY_ARRAY;
 import static org.cobbzilla.util.system.Sleep.sleep;
 
@@ -174,7 +174,7 @@ public abstract class RestServerBase<C extends RestServerConfiguration> implemen
 
         final ResourceConfig rc = getJerseyResourceConfig(configuration.getJersey());
 
-        BCryptUtil.setBcryptRounds(configuration.getBcryptRounds());
+        setBcryptRounds(configuration.getBcryptRounds());
 
         applicationContext = buildSpringApplicationContext();
         configuration.setApplicationContext(applicationContext);