[chore] Align import ordering/format

chadlwilson · chadlwilson · commit b5bb220fdb49 · 2025-08-13T15:17:28.000+08:00
Try and make PRs a bit cleaner to review
diff --git a/src/main/java/org/jruby/rack/AbstractFilter.java b/src/main/java/org/jruby/rack/AbstractFilter.java
@@ -8,7 +8,6 @@
 package org.jruby.rack;
 
 import java.io.IOException;
-
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
diff --git a/src/main/java/org/jruby/rack/AbstractServlet.java b/src/main/java/org/jruby/rack/AbstractServlet.java
@@ -8,7 +8,6 @@
 package org.jruby.rack;
 
 import java.io.IOException;
-
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
diff --git a/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java b/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java
@@ -20,15 +20,15 @@
 import org.jruby.RubyInstanceConfig;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.JavaUtil;
-import org.jruby.rack.servlet.ServletRackContext;
 import org.jruby.rack.servlet.RewindableInputStream;
+import org.jruby.rack.servlet.ServletRackContext;
 import org.jruby.rack.util.IOHelpers;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.cli.OutputStrings;
 
-import static org.jruby.rack.RackLogger.Level.*;
 import static org.jruby.rack.DefaultRackConfig.isIgnoreRUBYOPT;
+import static org.jruby.rack.RackLogger.Level.*;
 
 /**
  * Default application factory creates a new application instance on each
diff --git a/src/main/java/org/jruby/rack/DefaultRackConfig.java b/src/main/java/org/jruby/rack/DefaultRackConfig.java
@@ -17,6 +17,7 @@
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
+
 import org.jruby.rack.logging.OutputStreamLogger;
 import org.jruby.rack.logging.StandardOutLogger;
 import org.jruby.util.SafePropertyAccessor;
diff --git a/src/main/java/org/jruby/rack/DefaultRackDispatcher.java b/src/main/java/org/jruby/rack/DefaultRackDispatcher.java
@@ -11,7 +11,7 @@
 
 import org.jruby.rack.servlet.ServletRackContext;
 
-import static org.jruby.rack.RackLogger.Level.*;
+import static org.jruby.rack.RackLogger.Level.ERROR;
 
 /**
  * Dispatcher suited for use in a servlet container
diff --git a/src/main/java/org/jruby/rack/RackApplicationFactoryDecorator.java b/src/main/java/org/jruby/rack/RackApplicationFactoryDecorator.java
@@ -29,7 +29,7 @@
 
 import org.jruby.Ruby;
 
-import static org.jruby.rack.RackLogger.Level.*;
+import static org.jruby.rack.RackLogger.Level.DEBUG;
 
 /**
  * An abstract base class for decorating factories.
diff --git a/src/main/java/org/jruby/rack/RackDispatcher.java b/src/main/java/org/jruby/rack/RackDispatcher.java
@@ -7,8 +7,8 @@
 
 package org.jruby.rack;
 
-import javax.servlet.ServletException;
 import java.io.IOException;
+import javax.servlet.ServletException;
 
 /**
  *
diff --git a/src/main/java/org/jruby/rack/RackException.java b/src/main/java/org/jruby/rack/RackException.java
@@ -6,6 +6,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+
 import org.jruby.exceptions.RaiseException;
 
 /**
diff --git a/src/main/java/org/jruby/rack/RackTag.java b/src/main/java/org/jruby/rack/RackTag.java
@@ -7,14 +7,14 @@
 
 package org.jruby.rack;
 
-import org.jruby.rack.servlet.ServletRackEnvironment;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.TagSupport;
 
+import org.jruby.rack.servlet.ServletRackEnvironment;
+
 @SuppressWarnings("serial")
 public class RackTag extends TagSupport {
     private String path;
diff --git a/src/main/java/org/jruby/rack/SharedRackApplicationFactory.java b/src/main/java/org/jruby/rack/SharedRackApplicationFactory.java
@@ -10,7 +10,7 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import static org.jruby.rack.RackLogger.Level.*;
+import static org.jruby.rack.RackLogger.Level.INFO;
 
 /**
  * Shared application factory that only creates a single application instance.
diff --git a/src/main/java/org/jruby/rack/UnmappedRackFilter.java b/src/main/java/org/jruby/rack/UnmappedRackFilter.java
@@ -8,7 +8,11 @@
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.stream.Collectors;
 import javax.servlet.FilterChain;
 import javax.servlet.FilterConfig;
diff --git a/src/main/java/org/jruby/rack/ext/Input.java b/src/main/java/org/jruby/rack/ext/Input.java
@@ -23,16 +23,15 @@
 import org.jruby.RubyString;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.javasupport.JavaEmbedUtils;
+import org.jruby.rack.RackEnvironment;
+import org.jruby.rack.servlet.RewindableInputStream;
+import org.jruby.rack.util.ExceptionUtils;
 import org.jruby.runtime.Block;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.ObjectAllocator;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
-
-import org.jruby.rack.RackEnvironment;
-import org.jruby.rack.servlet.RewindableInputStream;
-import org.jruby.rack.util.ExceptionUtils;
 import org.jruby.util.StringSupport;
 
 /**
diff --git a/src/main/java/org/jruby/rack/logging/CommonsLoggingLogger.java b/src/main/java/org/jruby/rack/logging/CommonsLoggingLogger.java
@@ -9,7 +9,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-
 import org.jruby.rack.RackLogger;
 
 public class CommonsLoggingLogger extends RackLogger.Base {
diff --git a/src/main/java/org/jruby/rack/logging/ServletContextLogger.java b/src/main/java/org/jruby/rack/logging/ServletContextLogger.java
@@ -7,10 +7,10 @@
  */
 package org.jruby.rack.logging;
 
-import org.jruby.rack.RackLogger;
-
 import javax.servlet.ServletContext;
 
+import org.jruby.rack.RackLogger;
+
 public class ServletContextLogger extends RackLogger.Base {
 
     private final ServletContext context;
diff --git a/src/main/java/org/jruby/rack/logging/Slf4jLogger.java b/src/main/java/org/jruby/rack/logging/Slf4jLogger.java
@@ -8,7 +8,6 @@
 package org.jruby.rack.logging;
 
 import org.jruby.rack.RackLogger;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/jruby/rack/servlet/DefaultServletRackContext.java b/src/main/java/org/jruby/rack/servlet/DefaultServletRackContext.java
@@ -7,29 +7,27 @@
  */
 package org.jruby.rack.servlet;
 
-import org.jruby.rack.RackApplicationFactory;
-import org.jruby.rack.RackConfig;
-import org.jruby.rack.RackLogger;
-
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.EventListener;
+import java.util.Map;
+import java.util.Set;
 import javax.servlet.Filter;
+import javax.servlet.FilterRegistration;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
-// 3.0
-import javax.servlet.FilterRegistration;
 import javax.servlet.ServletRegistration;
 import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
 import javax.servlet.descriptor.JspConfigDescriptor;
 
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Enumeration;
-import java.util.EventListener;
-import java.util.Map;
-import java.util.Set;
+import org.jruby.rack.RackApplicationFactory;
+import org.jruby.rack.RackConfig;
+import org.jruby.rack.RackLogger;
 
 /**
  *
diff --git a/src/main/java/org/jruby/rack/servlet/RequestCapture.java b/src/main/java/org/jruby/rack/servlet/RequestCapture.java
@@ -16,7 +16,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
diff --git a/src/main/java/org/jruby/rack/servlet/ResponseCapture.java b/src/main/java/org/jruby/rack/servlet/ResponseCapture.java
@@ -12,7 +12,6 @@
 import java.io.PrintWriter;
 import java.util.Collection;
 import java.util.Collections;
-
 import javax.servlet.ServletOutputStream;
 import javax.servlet.WriteListener;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/org/jruby/rack/servlet/RewindableInputStream.java b/src/main/java/org/jruby/rack/servlet/RewindableInputStream.java
@@ -8,11 +8,10 @@
 package org.jruby.rack.servlet;
 
 import java.io.File;
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.RandomAccessFile;
 import java.nio.ByteBuffer;
-
 import javax.servlet.ReadListener;
 import javax.servlet.ServletInputStream;
 
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackConfig.java b/src/main/java/org/jruby/rack/servlet/ServletRackConfig.java
@@ -7,12 +7,12 @@
 
 package org.jruby.rack.servlet;
 
+import javax.servlet.ServletContext;
+
 import org.jruby.rack.DefaultRackConfig;
 import org.jruby.rack.RackLogger;
 import org.jruby.rack.logging.ServletContextLogger;
 
-import javax.servlet.ServletContext;
-
 /**
  * Servlet environment version of RackConfig.
  */
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java b/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java
@@ -8,7 +8,6 @@
 package org.jruby.rack.servlet;
 
 import java.io.IOException;
-
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequestWrapper;
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackIncludedResponse.java b/src/main/java/org/jruby/rack/servlet/ServletRackIncludedResponse.java
@@ -13,7 +13,6 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
-
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletResponse;
 import javax.servlet.WriteListener;
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackResponseEnvironment.java b/src/main/java/org/jruby/rack/servlet/ServletRackResponseEnvironment.java
@@ -7,15 +7,14 @@
 
 package org.jruby.rack.servlet;
 
-import org.jruby.rack.RackResponse;
-import org.jruby.rack.RackResponseEnvironment;
-import org.jruby.rack.DefaultErrorApplication;
-
 import java.io.IOException;
-
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponseWrapper;
 
+import org.jruby.rack.DefaultErrorApplication;
+import org.jruby.rack.RackResponse;
+import org.jruby.rack.RackResponseEnvironment;
+
 /**
  * The default (servlet) {@link RackResponseEnvironment} implementation.
  *
diff --git a/src/spec/java/org/jruby/rack/fake/FakePageContext.java b/src/spec/java/org/jruby/rack/fake/FakePageContext.java
@@ -9,7 +9,6 @@
 
 import java.io.IOException;
 import java.util.Enumeration;
-
 import javax.el.ELContext;
 import javax.servlet.Servlet;
 import javax.servlet.ServletConfig;
diff --git a/src/spec/java/org/jruby/rack/mock/fail/FailingHttpServletResponse.java b/src/spec/java/org/jruby/rack/mock/fail/FailingHttpServletResponse.java
@@ -23,10 +23,10 @@
  */
 package org.jruby.rack.mock.fail;
 
-import org.springframework.mock.web.MockHttpServletResponse;
-
-import javax.servlet.ServletOutputStream;
 import java.io.IOException;
+import javax.servlet.ServletOutputStream;
+
+import org.springframework.mock.web.MockHttpServletResponse;
 
 /**
  * @author kares
diff --git a/src/spec/java/org/jruby/rack/mock/fail/FailingServletOutputStream.java b/src/spec/java/org/jruby/rack/mock/fail/FailingServletOutputStream.java
@@ -23,12 +23,12 @@
  */
 package org.jruby.rack.mock.fail;
 
-import org.springframework.mock.web.DelegatingServletOutputStream;
-
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 
+import org.springframework.mock.web.DelegatingServletOutputStream;
+
 /**
  * @author kares
  */

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@`
`7`	`7`
`8`	`8`	`package org.jruby.rack;`
`9`	`9`
`10`		`-import javax.servlet.ServletException;`
`11`	`10`	`import java.io.IOException;`
	`11`	`+import javax.servlet.ServletException;`
`12`	`12`
`13`	`13`	`/**`
`14`	`14`	`*`