You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by sc...@apache.org on 2023/05/09 16:30:16 UTC
[tomcat] branch 8.5.x updated: Make checkstyle actually happy.
This is an automated email from the ASF dual-hosted git repository.
schultz pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/8.5.x by this push:
new eb85bb201a Make checkstyle actually happy.
eb85bb201a is described below
commit eb85bb201a47ddbfac77a13d41f70eba2936e5de
Author: Christopher Schultz <ch...@christopherschultz.net>
AuthorDate: Tue May 9 12:29:53 2023 -0400
Make checkstyle actually happy.
---
java/org/apache/catalina/util/TimeBucketCounter.java | 2 +-
test/org/apache/catalina/filters/TestRateLimitFilter.java | 11 +++++------
webapps/docs/changelog.xml | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/java/org/apache/catalina/util/TimeBucketCounter.java b/java/org/apache/catalina/util/TimeBucketCounter.java
index 33820d58fb..5c602c96af 100644
--- a/java/org/apache/catalina/util/TimeBucketCounter.java
+++ b/java/org/apache/catalina/util/TimeBucketCounter.java
@@ -17,9 +17,9 @@
package org.apache.catalina.util;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.Set;
/**
* this class maintains a thread safe hash map that has timestamp-based buckets
diff --git a/test/org/apache/catalina/filters/TestRateLimitFilter.java b/test/org/apache/catalina/filters/TestRateLimitFilter.java
index 8a30a0cff0..9f82306367 100644
--- a/test/org/apache/catalina/filters/TestRateLimitFilter.java
+++ b/test/org/apache/catalina/filters/TestRateLimitFilter.java
@@ -18,7 +18,6 @@
package org.apache.catalina.filters;
import java.io.IOException;
-
import java.util.Date;
import java.util.Enumeration;
import java.util.Map;
@@ -28,20 +27,20 @@ import javax.servlet.FilterConfig;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+import org.junit.Assert;
+import org.junit.Test;
+
import org.apache.catalina.Context;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.startup.Tomcat;
-import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.catalina.filters.TestRemoteIpFilter.MockFilterChain;
import org.apache.catalina.filters.TestRemoteIpFilter.MockHttpServletRequest;
+import org.apache.catalina.startup.Tomcat;
+import org.apache.catalina.startup.TomcatBaseTest;
import org.apache.tomcat.unittest.TesterResponse;
import org.apache.tomcat.unittest.TesterServletContext;
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 TestRateLimitFilter extends TomcatBaseTest {
@Test
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 61a78eafb0..acec04ac77 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -135,7 +135,7 @@
by Jack Shirazi. (remm)
</fix>
<add>
- Add RateLimitFilter which can be used to mitigate DoS and Brute Force
+ Add RateLimitFilter which can be used to mitigate DoS and Brute Force
attacks. (isapir)
</add>
</changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org