Clean up more import issues

gradle/version

@@ -1 +1 @@
-5.0.0-b1ccfd04a86c8dd65ae80d3f55dd76300f5e2ebc-060f7b26320ac8ccf3354119f4f0eff75f986553
+5.0.0-ef58c44aed7aae4d72dd5eb98d9d7a8e1078e12a-060f7b26320ac8ccf3354119f4f0eff75f986553

src/main/java/runwar/options/ConfigParser.java

@@ -1,22 +1,22 @@
 package runwar.options;
 
-import static runwar.logging.RunwarLogger.CONF_LOG;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 import net.minidev.json.JSONArray;
 import net.minidev.json.JSONObject;
 import net.minidev.json.JSONValue;
+import net.minidev.json.parser.ParseException;
 import runwar.LaunchUtil;
+import runwar.Server;
+import runwar.logging.RunwarLogger;
 import runwar.logging.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static runwar.logging.RunwarLogger.CONF_LOG;
+
 public class ConfigParser {
 
     private ServerOptions serverOptions;

src/main/java/runwar/undertow/SiteDeployment.java

@@ -1,52 +1,97 @@
 package runwar.undertow;
 
-import static runwar.logging.RunwarLogger.LOG;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.xnio.*;
-
 import io.undertow.Handlers;
+import io.undertow.Undertow;
+import io.undertow.Undertow.Builder;
+import io.undertow.client.ClientConnection;
+import io.undertow.UndertowOptions;
 import io.undertow.predicate.Predicates;
+import io.undertow.predicate.Predicate;
+import io.undertow.server.DefaultByteBufferPool;
 import io.undertow.server.HttpHandler;
 import io.undertow.server.HttpServerExchange;
 import io.undertow.server.handlers.PathHandler;
 import io.undertow.server.handlers.ProxyPeerAddressHandler;
 import io.undertow.server.handlers.SSLHeaderHandler;
 import io.undertow.server.handlers.accesslog.AccessLogHandler;
+import io.undertow.server.handlers.accesslog.DefaultAccessLogReceiver;
 import io.undertow.server.handlers.builder.PredicatedHandler;
 import io.undertow.server.handlers.builder.PredicatedHandlersParser;
+import io.undertow.server.handlers.cache.DirectBufferCache;
 import io.undertow.server.handlers.encoding.ContentEncodingRepository;
 import io.undertow.server.handlers.encoding.EncodingHandler;
 import io.undertow.server.handlers.encoding.GzipEncodingProvider;
-import io.undertow.server.handlers.resource.Resource;
-import io.undertow.server.handlers.resource.ResourceHandler;
+import io.undertow.server.handlers.resource.CachingResourceManager;
 import io.undertow.server.handlers.resource.ResourceManager;
+import io.undertow.server.handlers.resource.ResourceHandler;
+import io.undertow.servlet.api.DeploymentInfo;
 import io.undertow.servlet.api.DeploymentManager;
+import io.undertow.servlet.api.ServletSessionConfig;
 import io.undertow.util.CanonicalPathUtils;
+import io.undertow.util.AttachmentKey;
+import io.undertow.util.HeaderValues;
+import io.undertow.server.handlers.resource.Resource;
 import io.undertow.util.Headers;
 import io.undertow.util.HttpString;
 import io.undertow.util.MimeMappings;
+import io.undertow.io.Sender;
+import io.undertow.websockets.jsr.WebSocketDeploymentInfo;
 import io.undertow.server.handlers.MetricsHandler;
-import runwar.Server;
+import net.minidev.json.JSONArray;
+import net.minidev.json.JSONObject;
+import org.xnio.*;
+import runwar.logging.LoggerFactory;
+import runwar.logging.LoggerPrintStream;
 import runwar.logging.RunwarAccessLogReceiver;
+import runwar.mariadb4j.MariaDB4jManager;
 import runwar.options.ServerOptions;
 import runwar.options.SiteOptions;
+import runwar.options.ConfigParser.JSONOption;
+import runwar.security.SSLUtil;
+import runwar.security.SecurityManager;
+import runwar.tray.Tray;
+import runwar.undertow.MappedResourceManager;
+import runwar.undertow.HostResourceManager;
+import runwar.undertow.RequestDebugHandler;
+import runwar.undertow.SSLCertHeaderHandler;
 import runwar.undertow.LifecyleHandler;
 import runwar.undertow.WelcomeFileHandler;
+import runwar.util.ClassLoaderUtils;
+import runwar.util.RequestDumper;
+import runwar.Server;
+
+import javax.net.ssl.SSLContext;
+import java.awt.*;
+import java.io.*;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Method;
+import java.net.*;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.*;
+import javax.servlet.Servlet;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.ServletRequest;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static io.undertow.servlet.Servlets.defaultContainer;
+import static io.undertow.servlet.Servlets.deployment;
+import io.undertow.servlet.handlers.ServletRequestContext;
+import io.undertow.server.HandlerWrapper;
+
+import static runwar.logging.RunwarLogger.LOG;
+import static runwar.logging.RunwarLogger.MAPPER_LOG;
 
 @SuppressWarnings("deprecation")
 public class SiteDeployment {
 
     private final HttpHandler siteInitialHandler;
     private final HttpHandler servletInitialHandler;
-    private metricsHandler siteMetricsHandler;
+    private MetricsHandler siteMetricsHandler;
     private final DeploymentManager deploymentManager;
     private SecurityManager securityManager;
     private final ResourceManager resourceManager;