Browse Source

minor cleanup

tags/2.0.1
Jonathan Cobb 4 years ago
parent
commit
01ebe8b2ed
2 changed files with 5 additions and 4 deletions
  1. +3
    -2
      wizard-server/src/main/java/org/cobbzilla/wizard/filters/RateLimitFilter.java
  2. +2
    -2
      wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java

+ 3
- 2
wizard-server/src/main/java/org/cobbzilla/wizard/filters/RateLimitFilter.java View File

@@ -16,7 +16,6 @@ import javax.ws.rs.WebApplicationException;
import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter; import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.core.Context; import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
import java.security.Principal; import java.security.Principal;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@@ -25,8 +24,10 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;


import static org.cobbzilla.util.daemon.ZillaRuntime.empty; 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.io.StreamUtil.stream2string;
import static org.cobbzilla.util.string.StringUtil.getPackagePath; import static org.cobbzilla.util.string.StringUtil.getPackagePath;
import static org.cobbzilla.wizard.resources.ResourceUtil.status;


@NoArgsConstructor @Slf4j @NoArgsConstructor @Slf4j
public abstract class RateLimitFilter implements ContainerRequestFilter { public abstract class RateLimitFilter implements ContainerRequestFilter {
@@ -108,7 +109,7 @@ public abstract class RateLimitFilter implements ContainerRequestFilter {
} else { } else {
log.warn("filter: limit ("+limits.get(i.intValue())+") exceeded for keys: "+StringUtil.toString(keys)); 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));
} }
} }




+ 2
- 2
wizard-server/src/main/java/org/cobbzilla/wizard/server/RestServerBase.java View File

@@ -12,7 +12,6 @@ import org.cobbzilla.util.json.JsonUtil;
import org.cobbzilla.util.network.NetworkUtil; import org.cobbzilla.util.network.NetworkUtil;
import org.cobbzilla.util.network.PortPicker; import org.cobbzilla.util.network.PortPicker;
import org.cobbzilla.util.reflect.ReflectionUtil; 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.EntityConfigSource;
import org.cobbzilla.wizard.model.entityconfig.EntityConfigValidator; import org.cobbzilla.wizard.model.entityconfig.EntityConfigValidator;
import org.cobbzilla.wizard.server.config.*; 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.daemon.ZillaRuntime.*;
import static org.cobbzilla.util.network.NetworkUtil.IPv4_ALL_ADDRS; import static org.cobbzilla.util.network.NetworkUtil.IPv4_ALL_ADDRS;
import static org.cobbzilla.util.reflect.ReflectionUtil.*; 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.string.StringUtil.EMPTY_ARRAY;
import static org.cobbzilla.util.system.Sleep.sleep; 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()); final ResourceConfig rc = getJerseyResourceConfig(configuration.getJersey());


BCryptUtil.setBcryptRounds(configuration.getBcryptRounds());
setBcryptRounds(configuration.getBcryptRounds());


applicationContext = buildSpringApplicationContext(); applicationContext = buildSpringApplicationContext();
configuration.setApplicationContext(applicationContext); configuration.setApplicationContext(applicationContext);


Loading…
Cancel
Save