[tomcat] branch 10.1.x updated: Fix import order

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
     new a397e3949e Fix import order
a397e3949e is described below

commit a397e3949e68921db980a84be7cda4cf3b086a0a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 29 08:12:09 2023 +0100

    Fix import order
---
 test/org/apache/catalina/filters/TestRateLimitFilter.java  | 12 +++++++-----
 test/org/apache/catalina/filters/TestRemoteCIDRFilter.java |  6 ++++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java 
b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index d754b0cc72..f4a35da6dc 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -17,9 +17,16 @@
 
 package org.apache.catalina.filters;
 
+import java.io.IOException;
+import java.time.Instant;
+
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.FilterConfig;
 import jakarta.servlet.ServletException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.filters.TestRemoteIpFilter.MockFilterChain;
 import org.apache.catalina.filters.TestRemoteIpFilter.MockHttpServletRequest;
@@ -28,11 +35,6 @@ import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.unittest.TesterResponse;
 import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.time.Instant;
 
 public class TestRateLimitFilter extends TomcatBaseTest {
 
diff --git a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java 
b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
index ffac84a7b9..904751792c 100644
--- a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
+++ b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
@@ -21,6 +21,10 @@ import jakarta.servlet.Filter;
 import jakarta.servlet.FilterConfig;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletResponse;
+
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.apache.catalina.Context;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.startup.Tomcat;
@@ -28,8 +32,6 @@ import org.apache.catalina.startup.TomcatBaseTest;
 import org.apache.tomcat.unittest.TesterResponse;
 import org.apache.tomcat.util.descriptor.web.FilterDef;
 import org.apache.tomcat.util.descriptor.web.FilterMap;
-import org.junit.Assert;
-import org.junit.Test;
 
 public class TestRemoteCIDRFilter extends TomcatBaseTest {
 


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org