[chore] Align import ordering/format

chadlwilson · chadlwilson · commit be1d4a056d8e · 2025-08-13T15:20:01.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
@@ -16,7 +16,6 @@
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.jruby.rack.servlet.RequestCapture;
 import org.jruby.rack.servlet.ResponseCapture;
 import org.jruby.rack.servlet.ServletRackEnvironment;
diff --git a/src/main/java/org/jruby/rack/AbstractServlet.java b/src/main/java/org/jruby/rack/AbstractServlet.java
@@ -15,7 +15,6 @@
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.jruby.rack.servlet.ServletRackEnvironment;
 import org.jruby.rack.servlet.ServletRackResponseEnvironment;
 
diff --git a/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java b/src/main/java/org/jruby/rack/DefaultRackApplicationFactory.java
@@ -8,6 +8,14 @@
 package org.jruby.rack;
 
 
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.util.Map;
+import java.util.Set;
+
 import org.jruby.Ruby;
 import org.jruby.RubyInstanceConfig;
 import org.jruby.exceptions.RaiseException;
@@ -19,14 +27,6 @@
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.cli.OutputStrings;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.util.Map;
-import java.util.Set;
-
 import static org.jruby.rack.DefaultRackConfig.isIgnoreRUBYOPT;
 import static org.jruby.rack.RackLogger.Level.*;
 
diff --git a/src/main/java/org/jruby/rack/DefaultRackConfig.java b/src/main/java/org/jruby/rack/DefaultRackConfig.java
@@ -7,17 +7,21 @@
 
 package org.jruby.rack;
 
-import org.jruby.rack.logging.OutputStreamLogger;
-import org.jruby.rack.logging.StandardOutLogger;
-import org.jruby.util.SafePropertyAccessor;
-
-import java.io.*;
+import java.io.IOException;
+import java.io.LineNumberReader;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.io.StringReader;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 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;
+
 /**
  * A base implementation of that retrieves settings from system properties.
  *
diff --git a/src/main/java/org/jruby/rack/RackDispatcher.java b/src/main/java/org/jruby/rack/RackDispatcher.java
@@ -7,9 +7,10 @@
 
 package org.jruby.rack;
 
-import jakarta.servlet.ServletException;
 import java.io.IOException;
 
+import jakarta.servlet.ServletException;
+
 /**
  *
  * @author nicksieger
diff --git a/src/main/java/org/jruby/rack/RackFilter.java b/src/main/java/org/jruby/rack/RackFilter.java
@@ -9,13 +9,13 @@
 
 import java.io.IOException;
 import java.net.MalformedURLException;
+
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.FilterConfig;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
-
 import org.jruby.rack.servlet.RequestCapture;
 import org.jruby.rack.servlet.ResponseCapture;
 import org.jruby.rack.servlet.ServletRackContext;
diff --git a/src/main/java/org/jruby/rack/RackServletContextListener.java b/src/main/java/org/jruby/rack/RackServletContextListener.java
@@ -10,7 +10,6 @@
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletContextEvent;
 import jakarta.servlet.ServletContextListener;
-
 import org.jruby.rack.servlet.DefaultServletRackContext;
 import org.jruby.rack.servlet.ServletRackConfig;
 import org.jruby.rack.servlet.ServletRackContext;
diff --git a/src/main/java/org/jruby/rack/RackTag.java b/src/main/java/org/jruby/rack/RackTag.java
@@ -7,13 +7,12 @@
 
 package org.jruby.rack;
 
-import org.jruby.rack.servlet.ServletRackEnvironment;
-
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.servlet.jsp.JspException;
 import jakarta.servlet.jsp.tagext.TagSupport;
+import org.jruby.rack.servlet.ServletRackEnvironment;
 
 @SuppressWarnings("serial")
 public class RackTag extends TagSupport {
diff --git a/src/main/java/org/jruby/rack/UnmappedRackFilter.java b/src/main/java/org/jruby/rack/UnmappedRackFilter.java
@@ -6,13 +6,6 @@
  */
 package org.jruby.rack;
 
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletResponse;
-import org.jruby.rack.servlet.RequestCapture;
-import org.jruby.rack.servlet.ResponseCapture;
-
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Arrays;
@@ -22,6 +15,13 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletResponse;
+import org.jruby.rack.servlet.RequestCapture;
+import org.jruby.rack.servlet.ResponseCapture;
+
 /**
  * UnappedRackFilter does dispatching to Ruby but does not alter the request
  * URI or attempt to map to an available static resource.
diff --git a/src/main/java/org/jruby/rack/embed/Servlet.java b/src/main/java/org/jruby/rack/embed/Servlet.java
@@ -8,7 +8,6 @@
 package org.jruby.rack.embed;
 
 import jakarta.servlet.ServletConfig;
-
 import org.jruby.rack.AbstractServlet;
 import org.jruby.rack.RackContext;
 import org.jruby.rack.RackDispatcher;
diff --git a/src/main/java/org/jruby/rack/ext/Logger.java b/src/main/java/org/jruby/rack/ext/Logger.java
@@ -24,7 +24,13 @@
 package org.jruby.rack.ext;
 
 import jakarta.servlet.ServletContext;
-import org.jruby.*;
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyException;
+import org.jruby.RubyObject;
+import org.jruby.RubyProc;
+import org.jruby.RubyString;
+import org.jruby.RubyTime;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.exceptions.RaiseException;
diff --git a/src/main/java/org/jruby/rack/ext/Response.java b/src/main/java/org/jruby/rack/ext/Response.java
@@ -23,24 +23,44 @@
  */
 package org.jruby.rack.ext;
 
-import org.jruby.*;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.channels.Channel;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
+import java.util.Map;
+
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyBoolean;
+import org.jruby.RubyClass;
+import org.jruby.RubyHash;
+import org.jruby.RubyIO;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.RubyTime;
 import org.jruby.anno.JRubyClass;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.javasupport.JavaUtil;
 import org.jruby.rack.RackException;
 import org.jruby.rack.RackResponse;
 import org.jruby.rack.RackResponseEnvironment;
-import org.jruby.runtime.*;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.BlockBody;
+import org.jruby.runtime.Helpers;
+import org.jruby.runtime.JavaInternalBlockBody;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.Signature;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.util.ByteList;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.nio.ByteBuffer;
-import java.nio.channels.*;
-import java.util.Map;
-
 /**
  * JRuby::Rack::Response - the bridge from a Rack response into a (Java)
  * (servlet) response environment, (re-)implemented mostly in Java ...
diff --git a/src/main/java/org/jruby/rack/logging/JulLogger.java b/src/main/java/org/jruby/rack/logging/JulLogger.java
@@ -23,10 +23,10 @@
  */
 package org.jruby.rack.logging;
 
-import org.jruby.rack.RackLogger;
-
 import java.util.logging.Logger;
 
+import org.jruby.rack.RackLogger;
+
 /**
  * java.util.logging based logger implementation
  *
diff --git a/src/main/java/org/jruby/rack/logging/ServletContextLogger.java b/src/main/java/org/jruby/rack/logging/ServletContextLogger.java
@@ -7,9 +7,8 @@
  */
 package org.jruby.rack.logging;
 
-import org.jruby.rack.RackLogger;
-
 import jakarta.servlet.ServletContext;
+import org.jruby.rack.RackLogger;
 
 public class ServletContextLogger extends RackLogger.Base {
 
diff --git a/src/main/java/org/jruby/rack/servlet/DefaultServletRackContext.java b/src/main/java/org/jruby/rack/servlet/DefaultServletRackContext.java
@@ -7,12 +7,6 @@
  */
 package org.jruby.rack.servlet;
 
-import jakarta.servlet.*;
-import jakarta.servlet.descriptor.JspConfigDescriptor;
-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;
@@ -21,6 +15,20 @@
 import java.util.Map;
 import java.util.Set;
 
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterRegistration;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.Servlet;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRegistration;
+import jakarta.servlet.SessionCookieConfig;
+import jakarta.servlet.SessionTrackingMode;
+import jakarta.servlet.descriptor.JspConfigDescriptor;
+import org.jruby.rack.RackApplicationFactory;
+import org.jruby.rack.RackConfig;
+import org.jruby.rack.RackLogger;
+
 /**
  *
  * @author nicksieger
diff --git a/src/main/java/org/jruby/rack/servlet/RequestCapture.java b/src/main/java/org/jruby/rack/servlet/RequestCapture.java
@@ -7,10 +7,6 @@
 
 package org.jruby.rack.servlet;
 
-import jakarta.servlet.ServletInputStream;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -21,6 +17,10 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+
 /**
  * Request wrapper passed to filter chain.
  */
diff --git a/src/main/java/org/jruby/rack/servlet/RewindableInputStream.java b/src/main/java/org/jruby/rack/servlet/RewindableInputStream.java
@@ -8,8 +8,8 @@
 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;
 
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,11 @@
 
 package org.jruby.rack.servlet;
 
+import jakarta.servlet.ServletContext;
 import org.jruby.rack.DefaultRackConfig;
 import org.jruby.rack.RackLogger;
 import org.jruby.rack.logging.ServletContextLogger;
 
-import jakarta.servlet.ServletContext;
-
 /**
  * Servlet environment version of RackConfig.
  */
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackContext.java b/src/main/java/org/jruby/rack/servlet/ServletRackContext.java
@@ -8,7 +8,6 @@
 package org.jruby.rack.servlet;
 
 import jakarta.servlet.ServletContext;
-
 import org.jruby.rack.RackApplicationFactory;
 import org.jruby.rack.RackContext;
 
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java b/src/main/java/org/jruby/rack/servlet/ServletRackEnvironment.java
@@ -13,7 +13,6 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletRequestWrapper;
 import jakarta.servlet.http.HttpServletResponse;
-
 import org.jruby.rack.RackContext;
 import org.jruby.rack.RackEnvironment;
 import org.jruby.rack.ext.Input;
diff --git a/src/main/java/org/jruby/rack/servlet/ServletRackResponseEnvironment.java b/src/main/java/org/jruby/rack/servlet/ServletRackResponseEnvironment.java
@@ -7,14 +7,13 @@
 
 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 jakarta.servlet.http.HttpServletResponse;
 import jakarta.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/FakeJspWriter.java b/src/spec/java/org/jruby/rack/fake/FakeJspWriter.java
@@ -8,6 +8,7 @@
 package org.jruby.rack.fake;
 
 import java.io.IOException;
+
 import jakarta.servlet.jsp.JspWriter;
 
 /**
diff --git a/src/spec/java/org/jruby/rack/fake/FakePageContext.java b/src/spec/java/org/jruby/rack/fake/FakePageContext.java
diff --git a/src/spec/java/org/jruby/rack/mock/fail/FailingHttpServletResponse.java b/src/spec/java/org/jruby/rack/mock/fail/FailingHttpServletResponse.java

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