diff --git a/pom.xml b/pom.xml index 067fea6..d61b01d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,82 +5,64 @@ 4.0.0 com.nesscomputing - ness-oss-parent - 28 + ness-root + 1.0-SNAPSHOT - - scm:git:git://github.com/NessComputing/components-ness-httpserver.git - scm:git:git@github.com:NessComputing/components-ness-httpserver.git - http://github.com/NessComputing/components-ness-httpserver - HEAD - - com.nesscomputing.components ness-httpserver httpserver - 2.3.5-SNAPSHOT jar Ness HTTP server component. Can be plugged into a service to make it start up on its own. - 8.1.3.v20120416 - 2.0.5 + com.nesscomputing.components ness-config - 2.2.0 com.nesscomputing.components ness-lifecycle - 1.3.0 com.nesscomputing.components ness-logging - 1.1.1 com.nesscomputing.components ness-jmx4log - 1.0.2 com.nesscomputing.components ness-jmx - 1.3.0 com.nesscomputing.components ness-galaxy - 1.1.0 com.nesscomputing.components ness-serverinfo - 1.1.0 org.antlr stringtemplate - 3.2.1 com.nesscomputing ness-syslog4j - 0.9.47-NESS-7 @@ -101,7 +83,6 @@ net.jpountz.lz4 lz4 - 1.2.0 @@ -112,55 +93,41 @@ org.eclipse.jetty jetty-server - ${dep.jetty.version} - - - org.eclipse.jetty.orbit - javax.servlet - - org.eclipse.jetty jetty-jmx - ${dep.jetty.version} org.eclipse.jetty jetty-servlet - ${dep.jetty.version} org.eclipse.jetty jetty-io - ${dep.jetty.version} org.eclipse.jetty jetty-http - ${dep.jetty.version} org.eclipse.jetty jetty-continuation - ${dep.jetty.version} org.eclipse.jetty jetty-security - ${dep.jetty.version} org.eclipse.jetty jetty-util - ${dep.jetty.version} @@ -171,7 +138,6 @@ com.sun.jersey jersey-core - 1.16 true @@ -202,7 +168,7 @@ com.google.code.findbugs - jsr305 + annotations @@ -220,14 +186,12 @@ com.nesscomputing.components ness-httpclient - ${dep.ness.httpclient.version} test com.nesscomputing.components ness-httpclient - ${dep.ness.httpclient.version} test test-jar diff --git a/src/main/java/com/nesscomputing/httpserver/AbstractJetty8HttpServer.java b/src/main/java/com/nesscomputing/httpserver/AbstractJetty8HttpServer.java index 1a7c7bb..d007260 100644 --- a/src/main/java/com/nesscomputing/httpserver/AbstractJetty8HttpServer.java +++ b/src/main/java/com/nesscomputing/httpserver/AbstractJetty8HttpServer.java @@ -29,6 +29,18 @@ import javax.servlet.DispatcherType; import javax.servlet.Servlet; +import com.google.common.base.Preconditions; +import com.google.common.base.Throwables; +import com.google.common.collect.Sets; +import com.google.common.primitives.Ints; +import com.google.inject.Inject; +import com.google.inject.name.Named; +import com.google.inject.servlet.GuiceFilter; + +import com.nesscomputing.lifecycle.LifecycleStage; +import com.nesscomputing.lifecycle.guice.OnStage; +import com.nesscomputing.logging.Log; + import org.apache.commons.lang3.ObjectUtils; import org.eclipse.jetty.jmx.MBeanContainer; import org.eclipse.jetty.server.Handler; @@ -43,16 +55,6 @@ import org.eclipse.jetty.servlet.ServletHolder; import org.eclipse.jetty.util.ssl.SslContextFactory; import org.eclipse.jetty.util.thread.QueuedThreadPool; -import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; -import com.google.common.collect.Sets; -import com.google.common.primitives.Ints; -import com.google.inject.Inject; -import com.google.inject.name.Named; -import com.google.inject.servlet.GuiceFilter; -import com.nesscomputing.lifecycle.LifecycleStage; -import com.nesscomputing.lifecycle.guice.OnStage; -import com.nesscomputing.logging.Log; public abstract class AbstractJetty8HttpServer implements HttpServer { diff --git a/src/main/java/com/nesscomputing/httpserver/GalaxyJetty8HttpServer.java b/src/main/java/com/nesscomputing/httpserver/GalaxyJetty8HttpServer.java index 502db12..b58ee16 100644 --- a/src/main/java/com/nesscomputing/httpserver/GalaxyJetty8HttpServer.java +++ b/src/main/java/com/nesscomputing/httpserver/GalaxyJetty8HttpServer.java @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableMap.Builder; import com.google.inject.Inject; import com.google.inject.name.Named; + import com.nesscomputing.galaxy.GalaxyConfig; import com.nesscomputing.galaxy.GalaxyIp; diff --git a/src/main/java/com/nesscomputing/httpserver/HttpConnector.java b/src/main/java/com/nesscomputing/httpserver/HttpConnector.java index 9d49acd..4da05ca 100644 --- a/src/main/java/com/nesscomputing/httpserver/HttpConnector.java +++ b/src/main/java/com/nesscomputing/httpserver/HttpConnector.java @@ -19,12 +19,12 @@ import javax.annotation.Nonnull; +import com.google.common.base.Preconditions; + import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.eclipse.jetty.server.Connector; -import com.google.common.base.Preconditions; - /** * Describes a connector used by a server. */ diff --git a/src/main/java/com/nesscomputing/httpserver/HttpServerConfig.java b/src/main/java/com/nesscomputing/httpserver/HttpServerConfig.java index 9a40bed..6ca3041 100644 --- a/src/main/java/com/nesscomputing/httpserver/HttpServerConfig.java +++ b/src/main/java/com/nesscomputing/httpserver/HttpServerConfig.java @@ -75,7 +75,7 @@ public TimeSpan getMaxIdletime() @DefaultNull public TimeSpan getShutdownTimeout() { - return new TimeSpan(1, TimeUnit.SECONDS); + return new TimeSpan(1, TimeUnit.SECONDS); } @Config("ness.httpserver.ssl-keystore") diff --git a/src/main/java/com/nesscomputing/httpserver/HttpServerHandlerBinder.java b/src/main/java/com/nesscomputing/httpserver/HttpServerHandlerBinder.java index b85ca4e..f4e9569 100644 --- a/src/main/java/com/nesscomputing/httpserver/HttpServerHandlerBinder.java +++ b/src/main/java/com/nesscomputing/httpserver/HttpServerHandlerBinder.java @@ -19,14 +19,13 @@ import javax.servlet.Servlet; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.handler.HandlerWrapper; - import com.google.inject.Binder; import com.google.inject.binder.LinkedBindingBuilder; import com.google.inject.multibindings.Multibinder; import com.google.inject.name.Names; -import com.google.inject.servlet.GuiceFilter; + +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.HandlerWrapper; /** diff --git a/src/main/java/com/nesscomputing/httpserver/InvalidRequestServlet.java b/src/main/java/com/nesscomputing/httpserver/InvalidRequestServlet.java index ba4a588..8027a8a 100644 --- a/src/main/java/com/nesscomputing/httpserver/InvalidRequestServlet.java +++ b/src/main/java/com/nesscomputing/httpserver/InvalidRequestServlet.java @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse; import com.google.inject.Singleton; + import com.nesscomputing.logging.Log; /** @@ -31,9 +32,9 @@ @Singleton class InvalidRequestServlet extends HttpServlet { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - private static final Log LOG = Log.findLog(); + private static final Log LOG = Log.findLog(); @Override public void service(final HttpServletRequest req, final HttpServletResponse res) throws IOException diff --git a/src/main/java/com/nesscomputing/httpserver/SoloJetty8HttpServer.java b/src/main/java/com/nesscomputing/httpserver/SoloJetty8HttpServer.java index 55a05b8..fba9b97 100644 --- a/src/main/java/com/nesscomputing/httpserver/SoloJetty8HttpServer.java +++ b/src/main/java/com/nesscomputing/httpserver/SoloJetty8HttpServer.java @@ -22,13 +22,13 @@ import javax.servlet.Servlet; -import org.apache.commons.lang3.ArrayUtils; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.inject.Inject; import com.google.inject.name.Named; +import org.apache.commons.lang3.ArrayUtils; + /** * A standalone, non-galaxy http Server. */ diff --git a/src/main/java/com/nesscomputing/httpserver/jetty/ClasspathResourceHandler.java b/src/main/java/com/nesscomputing/httpserver/jetty/ClasspathResourceHandler.java index d691176..6c882d3 100644 --- a/src/main/java/com/nesscomputing/httpserver/jetty/ClasspathResourceHandler.java +++ b/src/main/java/com/nesscomputing/httpserver/jetty/ClasspathResourceHandler.java @@ -26,6 +26,8 @@ import com.google.common.io.ByteStreams; import com.google.inject.Inject; +import com.nesscomputing.httpserver.HttpServerConfig; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.http.HttpHeaders; @@ -37,8 +39,6 @@ import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.handler.AbstractHandler; -import com.nesscomputing.httpserver.HttpServerConfig; - /** * Serves files from a given folder on the classpath through jetty. * Intended to serve a couple of static files e.g. for javascript or HTML. diff --git a/src/main/java/com/nesscomputing/httpserver/jetty/StaticResourceHandlerProvider.java b/src/main/java/com/nesscomputing/httpserver/jetty/StaticResourceHandlerProvider.java index da1d554..eb6f1bd 100644 --- a/src/main/java/com/nesscomputing/httpserver/jetty/StaticResourceHandlerProvider.java +++ b/src/main/java/com/nesscomputing/httpserver/jetty/StaticResourceHandlerProvider.java @@ -19,15 +19,16 @@ import javax.annotation.Nonnull; -import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.handler.ContextHandler; -import org.eclipse.jetty.server.handler.ResourceHandler; - import com.google.common.base.Preconditions; import com.google.inject.Inject; import com.google.inject.Provider; + import com.nesscomputing.httpserver.HttpServerConfig; +import org.eclipse.jetty.server.Handler; +import org.eclipse.jetty.server.handler.ContextHandler; +import org.eclipse.jetty.server.handler.ResourceHandler; + /** * Serves static resources from a path in the filesystem. The location should be in the galaxy tarball and set by configuration. */ diff --git a/src/main/java/com/nesscomputing/httpserver/jetty/TransparentCompressionFilter.java b/src/main/java/com/nesscomputing/httpserver/jetty/TransparentCompressionFilter.java index 518788b..ed138d6 100644 --- a/src/main/java/com/nesscomputing/httpserver/jetty/TransparentCompressionFilter.java +++ b/src/main/java/com/nesscomputing/httpserver/jetty/TransparentCompressionFilter.java @@ -35,6 +35,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.google.inject.Singleton; + +import com.nesscomputing.logging.Log; + import net.jpountz.lz4.LZ4BlockOutputStream; import org.eclipse.jetty.continuation.Continuation; @@ -44,9 +48,6 @@ import org.eclipse.jetty.http.gzip.AbstractCompressedStream; import org.eclipse.jetty.http.gzip.CompressedResponseWrapper; -import com.google.inject.Singleton; -import com.nesscomputing.logging.Log; - /** * NOTE: this is a copy of the Jetty GzipFilter, updated to add LZ4 support! * @@ -113,9 +114,9 @@ public class TransparentCompressionFilter implements Filter { private static final Log LOG = Log.findLog(); - private final static String LZ4 = "lz4"; - private final static String GZIP="gzip"; - private final static String DEFLATE="deflate"; + private static final String LZ4 = "lz4"; + private static final String GZIP="gzip"; + private static final String DEFLATE="deflate"; protected Set _mimeTypes; protected int _bufferSize=8192; diff --git a/src/main/java/com/nesscomputing/httpserver/log/LogFieldBinder.java b/src/main/java/com/nesscomputing/httpserver/log/LogFieldBinder.java index fdc1cab..4ce305c 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/LogFieldBinder.java +++ b/src/main/java/com/nesscomputing/httpserver/log/LogFieldBinder.java @@ -19,6 +19,7 @@ import com.google.inject.Binder; import com.google.inject.binder.LinkedBindingBuilder; import com.google.inject.multibindings.MapBinder; + import com.nesscomputing.httpserver.log.LogFields.LogField; diff --git a/src/main/java/com/nesscomputing/httpserver/log/LogFields.java b/src/main/java/com/nesscomputing/httpserver/log/LogFields.java index 026ec86..61078db 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/LogFields.java +++ b/src/main/java/com/nesscomputing/httpserver/log/LogFields.java @@ -20,6 +20,8 @@ import javax.servlet.http.Cookie; +import com.nesscomputing.serverinfo.ServerInfo; + import org.apache.commons.lang3.StringUtils; import org.apache.log4j.MDC; import org.eclipse.jetty.server.Request; @@ -28,8 +30,6 @@ import org.joda.time.DateTimeZone; import org.joda.time.Duration; -import com.nesscomputing.serverinfo.ServerInfo; - public final class LogFields { private LogFields() diff --git a/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLog.java b/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLog.java index 2a14d0b..4cd2a83 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLog.java +++ b/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLog.java @@ -26,24 +26,23 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicReference; - -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.RequestLog; -import org.eclipse.jetty.server.Response; -import org.eclipse.jetty.util.component.AbstractLifeCycle; - import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Charsets; import com.google.common.io.Closeables; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.nesscomputing.httpserver.HttpServerConfig; + import com.nesscomputing.httpserver.log.LogFields; import com.nesscomputing.httpserver.log.LogFields.LogField; import com.nesscomputing.logging.Log; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.RequestLog; +import org.eclipse.jetty.server.Response; +import org.eclipse.jetty.util.component.AbstractLifeCycle; + /** * A simple non-rolling access log writer, which writes out to a tab separated file. * In general, this will be configured via a {@link HttpServerConfig}. diff --git a/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLogConfig.java b/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLogConfig.java index f39f507..e6ca7c2 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLogConfig.java +++ b/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLogConfig.java @@ -18,13 +18,13 @@ import java.util.List; import java.util.Set; -import org.skife.config.Config; -import org.skife.config.Default; - import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; +import org.skife.config.Config; +import org.skife.config.Default; + public abstract class FileRequestLogConfig { public static final String REQUEST_LOG_FIELDS_DEFAULT = diff --git a/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLogModule.java b/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLogModule.java index d84e521..65bae4e 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLogModule.java +++ b/src/main/java/com/nesscomputing/httpserver/log/file/FileRequestLogModule.java @@ -16,15 +16,16 @@ package com.nesscomputing.httpserver.log.file; -import org.eclipse.jetty.server.handler.RequestLogHandler; - import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Scopes; + import com.nesscomputing.config.Config; import com.nesscomputing.httpserver.HttpServerHandlerBinder; +import org.eclipse.jetty.server.handler.RequestLogHandler; + public class FileRequestLogModule extends AbstractModule { private final Config config; diff --git a/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLog.java b/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLog.java index 2d08642..d6c7763 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLog.java +++ b/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLog.java @@ -19,6 +19,11 @@ import java.util.Map.Entry; import java.util.Set; +import com.google.inject.Inject; +import com.google.inject.Singleton; + +import com.nesscomputing.httpserver.log.LogFields.LogField; +import com.nesscomputing.logging.Log; import org.antlr.stringtemplate.StringTemplate; import org.apache.commons.lang3.ObjectUtils; @@ -29,11 +34,6 @@ import org.eclipse.jetty.server.Response; import org.eclipse.jetty.util.component.AbstractLifeCycle; -import com.google.inject.Inject; -import com.google.inject.Singleton; -import com.nesscomputing.httpserver.log.LogFields.LogField; -import com.nesscomputing.logging.Log; - /** * Log any request straight into log4j, which then can be used to redirect it e.g. * to graylog. diff --git a/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogConfig.java b/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogConfig.java index 372ded9..e71cba3 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogConfig.java +++ b/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogConfig.java @@ -17,11 +17,11 @@ import java.util.Set; +import com.google.common.collect.ImmutableSet; + import org.skife.config.Config; import org.skife.config.Default; -import com.google.common.collect.ImmutableSet; - public abstract class Log4jRequestLogConfig { private static final String LOG4J_REQUEST_LOG_PATTERN_DEFAULT = diff --git a/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogModule.java b/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogModule.java index 57a6657..ac1da44 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogModule.java +++ b/src/main/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogModule.java @@ -16,15 +16,16 @@ package com.nesscomputing.httpserver.log.log4j; -import org.eclipse.jetty.server.handler.RequestLogHandler; - import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Scopes; + import com.nesscomputing.config.Config; import com.nesscomputing.httpserver.HttpServerHandlerBinder; +import org.eclipse.jetty.server.handler.RequestLogHandler; + public class Log4jRequestLogModule extends AbstractModule { private final Config config; diff --git a/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLog.java b/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLog.java index 8e87a67..9057e1c 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLog.java +++ b/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLog.java @@ -23,18 +23,13 @@ import java.util.Set; import java.util.UUID; -import org.apache.commons.lang3.StringUtils; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.RequestLog; -import org.eclipse.jetty.server.Response; -import org.eclipse.jetty.util.component.AbstractLifeCycle; - import com.google.common.base.Function; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Maps; import com.google.inject.Inject; import com.google.inject.Singleton; + import com.nesscomputing.galaxy.GalaxyConfig; import com.nesscomputing.httpserver.log.LogFields; import com.nesscomputing.httpserver.log.LogFields.LogField; @@ -45,6 +40,12 @@ import com.nesscomputing.syslog4j.impl.message.processor.structured.StructuredSyslogMessageProcessor; import com.nesscomputing.syslog4j.impl.message.structured.StructuredSyslogMessage; +import org.apache.commons.lang3.StringUtils; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.RequestLog; +import org.eclipse.jetty.server.Response; +import org.eclipse.jetty.util.component.AbstractLifeCycle; + /** * Send jetty request log straight into syslog to allow aggregation with logstash. */ diff --git a/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogConfig.java b/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogConfig.java index 6f68e24..dbed28d 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogConfig.java +++ b/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogConfig.java @@ -18,15 +18,16 @@ import java.util.List; import java.util.Set; -import org.skife.config.Config; -import org.skife.config.Default; -import org.skife.config.DefaultNull; - import com.google.common.base.Splitter; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; + import com.nesscomputing.syslog4j.SyslogFacility; +import org.skife.config.Config; +import org.skife.config.Default; +import org.skife.config.DefaultNull; + public abstract class SyslogRequestLogConfig { public static final String REQUEST_LOG_FIELDS_DEFAULT = diff --git a/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogModule.java b/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogModule.java index 22aead1..ed9c048 100644 --- a/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogModule.java +++ b/src/main/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogModule.java @@ -16,15 +16,16 @@ package com.nesscomputing.httpserver.log.syslog; -import org.eclipse.jetty.server.handler.RequestLogHandler; - import com.google.inject.AbstractModule; import com.google.inject.Inject; import com.google.inject.Provider; import com.google.inject.Scopes; + import com.nesscomputing.config.Config; import com.nesscomputing.httpserver.HttpServerHandlerBinder; +import org.eclipse.jetty.server.handler.RequestLogHandler; + public class SyslogRequestLogModule extends AbstractModule { private final Config config; diff --git a/src/main/java/com/nesscomputing/httpserver/selftest/SelftestResource.java b/src/main/java/com/nesscomputing/httpserver/selftest/SelftestResource.java index 48ffd2c..18b9b31 100644 --- a/src/main/java/com/nesscomputing/httpserver/selftest/SelftestResource.java +++ b/src/main/java/com/nesscomputing/httpserver/selftest/SelftestResource.java @@ -47,23 +47,23 @@ public void setDefaultSelftest(DefaultSelftest defaultTest) { this.defaultTest = defaultTest; } - /** - * On success, returns a 2xx response. - * To report a warning-level issue, returns a 3xx response. - * To report an error-level issue, returns a 5xx response - * or throws an Exception. - */ - @GET - public Response doSelftest() throws Exception { - for (Selftest test : tests) { - test.doSelftest(); - } + /** + * On success, returns a 2xx response. + * To report a warning-level issue, returns a 3xx response. + * To report an error-level issue, returns a 5xx response + * or throws an Exception. + */ + @GET + public Response doSelftest() throws Exception { + for (Selftest test : tests) { + test.doSelftest(); + } - if (defaultTest != null) { - return defaultTest.doSelftest(); - } - else { - return Response.ok().build(); - } - } + if (defaultTest != null) { + return defaultTest.doSelftest(); + } + else { + return Response.ok().build(); + } + } } diff --git a/src/main/java/com/nesscomputing/httpserver/standalone/AnnouncingStandaloneServer.java b/src/main/java/com/nesscomputing/httpserver/standalone/AnnouncingStandaloneServer.java index 4eb61ad..1dc41f8 100644 --- a/src/main/java/com/nesscomputing/httpserver/standalone/AnnouncingStandaloneServer.java +++ b/src/main/java/com/nesscomputing/httpserver/standalone/AnnouncingStandaloneServer.java @@ -16,6 +16,7 @@ package com.nesscomputing.httpserver.standalone; import com.google.inject.Module; + import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.ServiceDiscoveryLifecycle; import com.nesscomputing.lifecycle.guice.LifecycleModule; diff --git a/src/main/java/com/nesscomputing/httpserver/standalone/StandaloneServer.java b/src/main/java/com/nesscomputing/httpserver/standalone/StandaloneServer.java index 903f231..4e91f02 100644 --- a/src/main/java/com/nesscomputing/httpserver/standalone/StandaloneServer.java +++ b/src/main/java/com/nesscomputing/httpserver/standalone/StandaloneServer.java @@ -15,8 +15,6 @@ */ package com.nesscomputing.httpserver.standalone; -import org.apache.commons.lang3.time.StopWatch; - import com.google.common.base.Preconditions; import com.google.inject.Binder; import com.google.inject.Guice; @@ -27,6 +25,7 @@ import com.google.inject.Stage; import com.google.inject.servlet.GuiceFilter; import com.google.inject.servlet.ServletModule; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.jmx.JmxModule; @@ -38,6 +37,8 @@ import com.nesscomputing.logging.AssimilateForeignLogging; import com.nesscomputing.logging.Log; +import org.apache.commons.lang3.time.StopWatch; + /** * Standalone main class. * @@ -120,7 +121,7 @@ public void stopServer() doStopServer(false); } - private final void doStopServer(boolean fromHook) { + private void doStopServer(boolean fromHook) { Preconditions.checkState(!stopped, "Server was already stopped, double-stop denied!"); Preconditions.checkNotNull(lifecycle, "No Lifecycle Object was injected!"); diff --git a/src/main/java/com/nesscomputing/httpserver/testing/LocalHttpService.java b/src/main/java/com/nesscomputing/httpserver/testing/LocalHttpService.java index 3bde127..43337e6 100644 --- a/src/main/java/com/nesscomputing/httpserver/testing/LocalHttpService.java +++ b/src/main/java/com/nesscomputing/httpserver/testing/LocalHttpService.java @@ -21,6 +21,8 @@ import javax.security.auth.Subject; +import com.google.common.io.Resources; + import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.security.DefaultIdentityService; import org.eclipse.jetty.security.IdentityService; @@ -40,8 +42,6 @@ import org.eclipse.jetty.util.security.Password; import org.eclipse.jetty.util.ssl.SslContextFactory; -import com.google.common.io.Resources; - /** * Helper class for unit tests to spin up a local http service. */ diff --git a/src/test/java/com/nesscomputing/httpserver/TestGuiceModule.java b/src/test/java/com/nesscomputing/httpserver/TestGuiceModule.java index 380d698..277ba6c 100644 --- a/src/test/java/com/nesscomputing/httpserver/TestGuiceModule.java +++ b/src/test/java/com/nesscomputing/httpserver/TestGuiceModule.java @@ -28,12 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.http.HttpStatus; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Inject; @@ -45,6 +39,7 @@ import com.google.inject.name.Named; import com.google.inject.name.Names; import com.google.inject.servlet.ServletModule; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfigModule; @@ -54,8 +49,14 @@ import com.nesscomputing.lifecycle.junit.LifecycleRule; import com.nesscomputing.lifecycle.junit.LifecycleRunner; import com.nesscomputing.lifecycle.junit.LifecycleStatement; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.apache.http.HttpStatus; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; /** * Test that the guice filter gets injected correctly and dispatches to a servlet that has an injected value on the c'tor. diff --git a/src/test/java/com/nesscomputing/httpserver/TestHttpCompression.java b/src/test/java/com/nesscomputing/httpserver/TestHttpCompression.java index 99ad4dd..2d855b1 100644 --- a/src/test/java/com/nesscomputing/httpserver/TestHttpCompression.java +++ b/src/test/java/com/nesscomputing/httpserver/TestHttpCompression.java @@ -39,15 +39,6 @@ import com.google.inject.name.Named; import com.google.inject.servlet.ServletModule; -import net.jpountz.lz4.LZ4BlockInputStream; - -import org.apache.commons.io.IOUtils; -import org.eclipse.jetty.http.HttpStatus; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfigModule; @@ -58,8 +49,17 @@ import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import net.jpountz.lz4.LZ4BlockInputStream; + +import org.apache.commons.io.IOUtils; +import org.eclipse.jetty.http.HttpStatus; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; /** * manual test for the resource handler. Manual, because it uses port 8080 on localhost which could be taken. diff --git a/src/test/java/com/nesscomputing/httpserver/TestHttpServerForwardedHeaders.java b/src/test/java/com/nesscomputing/httpserver/TestHttpServerForwardedHeaders.java index db4c533..1b96f59 100644 --- a/src/test/java/com/nesscomputing/httpserver/TestHttpServerForwardedHeaders.java +++ b/src/test/java/com/nesscomputing/httpserver/TestHttpServerForwardedHeaders.java @@ -25,14 +25,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.handler.AbstractHandler; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Inject; @@ -40,20 +32,26 @@ import com.google.inject.Module; import com.google.inject.Stage; import com.google.inject.name.Named; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfigModule; import com.nesscomputing.httpclient.HttpClient; import com.nesscomputing.httpclient.guice.HttpClientModule; import com.nesscomputing.httpclient.response.StringContentConverter; -import com.nesscomputing.httpserver.HttpServerHandlerBinder; -import com.nesscomputing.httpserver.HttpServerModule; import com.nesscomputing.httpserver.jetty.ClasspathResourceHandler; import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.handler.AbstractHandler; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; /** * manual test for the resource handler. Manual, because it uses port 8080 on localhost which could be taken. diff --git a/src/test/java/com/nesscomputing/httpserver/TestHttpServerModule.java b/src/test/java/com/nesscomputing/httpserver/TestHttpServerModule.java index d12addf..3e0e9ac 100644 --- a/src/test/java/com/nesscomputing/httpserver/TestHttpServerModule.java +++ b/src/test/java/com/nesscomputing/httpserver/TestHttpServerModule.java @@ -29,11 +29,6 @@ import com.google.inject.Stage; import com.google.inject.name.Named; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfigModule; @@ -44,8 +39,13 @@ import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; /** * manual test for the resource handler. Manual, because it uses port 8080 on localhost which could be taken. diff --git a/src/test/java/com/nesscomputing/httpserver/TestHttpServerSecurityHandler.java b/src/test/java/com/nesscomputing/httpserver/TestHttpServerSecurityHandler.java index 259f5bd..a1fe873 100644 --- a/src/test/java/com/nesscomputing/httpserver/TestHttpServerSecurityHandler.java +++ b/src/test/java/com/nesscomputing/httpserver/TestHttpServerSecurityHandler.java @@ -25,13 +25,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.handler.HandlerWrapper; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.google.common.base.Charsets; import com.google.inject.Binder; import com.google.inject.Guice; @@ -42,6 +35,7 @@ import com.google.inject.Singleton; import com.google.inject.Stage; import com.google.inject.name.Named; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfigModule; @@ -54,8 +48,15 @@ import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.handler.HandlerWrapper; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; /** * manual test for the resource handler. Manual, because it uses port 8080 on localhost which could be taken. diff --git a/src/test/java/com/nesscomputing/httpserver/TestNullPort.java b/src/test/java/com/nesscomputing/httpserver/TestNullPort.java index 86fb036..7efe540 100644 --- a/src/test/java/com/nesscomputing/httpserver/TestNullPort.java +++ b/src/test/java/com/nesscomputing/httpserver/TestNullPort.java @@ -15,24 +15,25 @@ */ package com.nesscomputing.httpserver; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Module; import com.google.inject.Stage; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfigModule; import com.nesscomputing.lifecycle.junit.LifecycleRule; import com.nesscomputing.lifecycle.junit.LifecycleRunner; import com.nesscomputing.lifecycle.junit.LifecycleStatement; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowNetworkListen(ports= {0}) @RunWith(LifecycleRunner.class) diff --git a/src/test/java/com/nesscomputing/httpserver/TestSoloJetty8HttpServer.java b/src/test/java/com/nesscomputing/httpserver/TestSoloJetty8HttpServer.java index c7128f7..1dfaaed 100644 --- a/src/test/java/com/nesscomputing/httpserver/TestSoloJetty8HttpServer.java +++ b/src/test/java/com/nesscomputing/httpserver/TestSoloJetty8HttpServer.java @@ -30,11 +30,6 @@ import com.google.inject.Stage; import com.google.inject.name.Named; -import org.apache.commons.lang3.StringUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; - import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.httpclient.HttpClient; @@ -44,8 +39,13 @@ import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.apache.commons.lang3.StringUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowNetworkListen(ports= {0}) @AllowNetworkAccess(endpoints= {"127.0.0.1:0"}) diff --git a/src/test/java/com/nesscomputing/httpserver/jetty/TestClasspathResourceHandler.java b/src/test/java/com/nesscomputing/httpserver/jetty/TestClasspathResourceHandler.java index 50f89df..e63256b 100644 --- a/src/test/java/com/nesscomputing/httpserver/jetty/TestClasspathResourceHandler.java +++ b/src/test/java/com/nesscomputing/httpserver/jetty/TestClasspathResourceHandler.java @@ -19,6 +19,14 @@ import java.io.InputStream; import java.util.concurrent.atomic.AtomicReference; +import com.nesscomputing.httpclient.HttpClient; +import com.nesscomputing.httpclient.HttpClientResponse; +import com.nesscomputing.httpclient.HttpClientResponseHandler; +import com.nesscomputing.httpclient.response.ContentResponseHandler; +import com.nesscomputing.httpclient.response.StringContentConverter; +import com.nesscomputing.httpclient.response.Valid2xxContentConverter; +import com.nesscomputing.httpserver.testing.LocalHttpService; + import org.apache.commons.lang3.StringUtils; import org.eclipse.jetty.server.Handler; import org.joda.time.format.DateTimeFormat; @@ -27,16 +35,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; - -import com.nesscomputing.httpclient.HttpClient; -import com.nesscomputing.httpclient.HttpClientResponse; -import com.nesscomputing.httpclient.HttpClientResponseHandler; -import com.nesscomputing.httpclient.response.ContentResponseHandler; -import com.nesscomputing.httpclient.response.StringContentConverter; -import com.nesscomputing.httpclient.response.Valid2xxContentConverter; -import com.nesscomputing.httpserver.testing.LocalHttpService; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowNetworkListen(ports= {0}) diff --git a/src/test/java/com/nesscomputing/httpserver/jetty/TestRelativeClasspathResourceHandler.java b/src/test/java/com/nesscomputing/httpserver/jetty/TestRelativeClasspathResourceHandler.java index d7b11f6..be7c8b0 100644 --- a/src/test/java/com/nesscomputing/httpserver/jetty/TestRelativeClasspathResourceHandler.java +++ b/src/test/java/com/nesscomputing/httpserver/jetty/TestRelativeClasspathResourceHandler.java @@ -19,22 +19,20 @@ import java.io.InputStream; import java.util.concurrent.atomic.AtomicReference; - -import org.eclipse.jetty.server.Handler; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; - import com.nesscomputing.httpclient.HttpClient; import com.nesscomputing.httpclient.HttpClientResponse; import com.nesscomputing.httpclient.HttpClientResponseHandler; import com.nesscomputing.httpclient.response.ContentResponseHandler; import com.nesscomputing.httpclient.response.StringContentConverter; -import com.nesscomputing.httpserver.jetty.ClasspathResourceHandler; import com.nesscomputing.httpserver.testing.LocalHttpService; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.eclipse.jetty.server.Handler; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowNetworkListen(ports= {0}) diff --git a/src/test/java/com/nesscomputing/httpserver/log/file/FileRequestLogTest.java b/src/test/java/com/nesscomputing/httpserver/log/file/FileRequestLogTest.java index f34ef38..2409fb4 100644 --- a/src/test/java/com/nesscomputing/httpserver/log/file/FileRequestLogTest.java +++ b/src/test/java/com/nesscomputing/httpserver/log/file/FileRequestLogTest.java @@ -24,15 +24,6 @@ import javax.servlet.http.Cookie; - -import org.easymock.EasyMockSupport; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Response; -import org.joda.time.DateTimeUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; - import com.google.inject.Binder; import com.google.inject.CreationException; import com.google.inject.Guice; @@ -41,10 +32,17 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Stage; + import com.nesscomputing.config.Config; import com.nesscomputing.httpserver.log.LogFieldsModule; -import com.nesscomputing.httpserver.log.file.FileRequestLog; -import com.nesscomputing.httpserver.log.file.FileRequestLogModule; + +import org.easymock.EasyMockSupport; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Response; +import org.joda.time.DateTimeUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; public class FileRequestLogTest extends EasyMockSupport { diff --git a/src/test/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogTest.java b/src/test/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogTest.java index 6c406cd..1c613a3 100644 --- a/src/test/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogTest.java +++ b/src/test/java/com/nesscomputing/httpserver/log/log4j/Log4jRequestLogTest.java @@ -19,15 +19,6 @@ import javax.servlet.http.Cookie; - -import org.easymock.EasyMockSupport; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Response; -import org.joda.time.DateTimeUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; - import com.google.inject.Binder; import com.google.inject.Guice; import com.google.inject.Inject; @@ -35,10 +26,17 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Stage; + import com.nesscomputing.config.Config; import com.nesscomputing.httpserver.log.LogFieldsModule; -import com.nesscomputing.httpserver.log.log4j.Log4jRequestLog; -import com.nesscomputing.httpserver.log.log4j.Log4jRequestLogModule; + +import org.easymock.EasyMockSupport; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Response; +import org.joda.time.DateTimeUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; public class Log4jRequestLogTest extends EasyMockSupport { diff --git a/src/test/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogTest.java b/src/test/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogTest.java index 8f61826..f3d28d9 100644 --- a/src/test/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogTest.java +++ b/src/test/java/com/nesscomputing/httpserver/log/syslog/SyslogRequestLogTest.java @@ -21,14 +21,6 @@ import java.util.List; import java.util.UUID; -import org.easymock.EasyMockSupport; -import org.eclipse.jetty.server.Request; -import org.eclipse.jetty.server.Response; -import org.joda.time.DateTimeUtils; -import org.junit.After; -import org.junit.Assert; -import org.junit.Test; - import com.google.common.collect.Lists; import com.google.inject.AbstractModule; import com.google.inject.Binder; @@ -39,12 +31,11 @@ import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Stage; + import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.galaxy.GalaxyConfig; import com.nesscomputing.httpserver.log.LogFieldsModule; -import com.nesscomputing.httpserver.log.syslog.SyslogRequestLog; -import com.nesscomputing.httpserver.log.syslog.SyslogRequestLogModule; import com.nesscomputing.syslog4j.Syslog; import com.nesscomputing.syslog4j.SyslogIF; import com.nesscomputing.syslog4j.SyslogLevel; @@ -52,7 +43,15 @@ import com.nesscomputing.syslog4j.impl.AbstractSyslogWriter; import com.nesscomputing.syslog4j.impl.net.AbstractNetSyslog; import com.nesscomputing.syslog4j.impl.net.AbstractNetSyslogConfig; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.easymock.EasyMockSupport; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Response; +import org.joda.time.DateTimeUtils; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowNetworkListen(ports={0}) public class SyslogRequestLogTest extends EasyMockSupport diff --git a/src/test/java/com/nesscomputing/httpserver/standalone/AnnouncingDemoServer.java b/src/test/java/com/nesscomputing/httpserver/standalone/AnnouncingDemoServer.java index 815bc40..34a0a68 100644 --- a/src/test/java/com/nesscomputing/httpserver/standalone/AnnouncingDemoServer.java +++ b/src/test/java/com/nesscomputing/httpserver/standalone/AnnouncingDemoServer.java @@ -17,6 +17,7 @@ import com.google.inject.Binder; import com.google.inject.Module; + import com.nesscomputing.config.Config; @SuppressWarnings("deprecation") diff --git a/src/test/java/com/nesscomputing/httpserver/standalone/DemoServer.java b/src/test/java/com/nesscomputing/httpserver/standalone/DemoServer.java index b80b241..ce0838b 100644 --- a/src/test/java/com/nesscomputing/httpserver/standalone/DemoServer.java +++ b/src/test/java/com/nesscomputing/httpserver/standalone/DemoServer.java @@ -17,8 +17,8 @@ import com.google.inject.Binder; import com.google.inject.Module; + import com.nesscomputing.config.Config; -import com.nesscomputing.httpserver.standalone.StandaloneServer; @SuppressWarnings("deprecation") class DemoServer extends StandaloneServer diff --git a/src/test/java/com/nesscomputing/httpserver/standalone/TestServerLifecycle.java b/src/test/java/com/nesscomputing/httpserver/standalone/TestServerLifecycle.java index 39dd11a..df47706 100644 --- a/src/test/java/com/nesscomputing/httpserver/standalone/TestServerLifecycle.java +++ b/src/test/java/com/nesscomputing/httpserver/standalone/TestServerLifecycle.java @@ -15,17 +15,17 @@ */ package com.nesscomputing.httpserver.standalone; +import com.google.inject.Binder; +import com.google.inject.Module; + +import com.nesscomputing.config.Config; + import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - -import com.google.inject.Binder; -import com.google.inject.Module; -import com.nesscomputing.config.Config; -import com.nesscomputing.httpserver.standalone.StandaloneServer; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowNetworkListen(ports= {0}) @AllowNetworkAccess(endpoints= {"127.0.0.1:0"}) diff --git a/src/test/java/com/nesscomputing/httpserver/standalone/TestStandaloneServer.java b/src/test/java/com/nesscomputing/httpserver/standalone/TestStandaloneServer.java index 0ef1392..0a57345 100644 --- a/src/test/java/com/nesscomputing/httpserver/standalone/TestStandaloneServer.java +++ b/src/test/java/com/nesscomputing/httpserver/standalone/TestStandaloneServer.java @@ -15,14 +15,12 @@ */ package com.nesscomputing.httpserver.standalone; +import com.nesscomputing.config.Config; + import org.junit.Assert; import org.junit.Test; - -import com.nesscomputing.config.Config; -import com.nesscomputing.httpserver.standalone.AnnouncingStandaloneServer; -import com.nesscomputing.httpserver.standalone.StandaloneServer; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowNetworkListen(ports= {0})