You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2023/05/22 10:17:11 UTC
[tomcat] branch 10.1.x updated: Code clean-up. No functional change. CheckyStyle, IDE, reformatting
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 4fde5c24d8 Code clean-up. No functional change. CheckyStyle, IDE, reformatting
4fde5c24d8 is described below
commit 4fde5c24d86eb48c15ce52b56aa1e988ee388fa9
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon May 22 11:16:47 2023 +0100
Code clean-up. No functional change. CheckyStyle, IDE, reformatting
---
.../catalina/filters/TestRemoteCIDRFilter.java | 35 ++++++++++++----------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
index 96370a5f04..94eaab2cea 100644
--- a/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
+++ b/test/org/apache/catalina/filters/TestRemoteCIDRFilter.java
@@ -17,11 +17,19 @@
package org.apache.catalina.filters;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Map;
+
import jakarta.servlet.Filter;
import jakarta.servlet.FilterConfig;
import jakarta.servlet.ServletContext;
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;
@@ -30,12 +38,6 @@ 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;
-
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Map;
public class TestRemoteCIDRFilter extends TomcatBaseTest {
@@ -56,9 +58,9 @@ public class TestRemoteCIDRFilter extends TomcatBaseTest {
TesterResponse response;
int expected;
- for (int i=0; i < 256; i++) {
- for (int j=0; j < 256; j += 11) {
- ipAddr = String.format("192.168.%s.%s", i, j);
+ for (int i = 0; i < 256; i++) {
+ for (int j = 0; j < 256; j += 11) {
+ ipAddr = String.format("192.168.%s.%s", Integer.valueOf(i), Integer.valueOf(j));
request = new TestRemoteIpFilter.MockHttpServletRequest(ipAddr);
response = new TestRateLimitFilter.TesterResponseWithStatus();
expected = (i == 10 || i == 20) ? HttpServletResponse.SC_OK : HttpServletResponse.SC_FORBIDDEN;
@@ -85,9 +87,9 @@ public class TestRemoteCIDRFilter extends TomcatBaseTest {
TesterResponse response;
int expected;
- for (int i=0; i < 256; i++) {
- for (int j=0; j < 256; j += 11) {
- ipAddr = String.format("192.168.%s.%s", i, j);
+ for (int i = 0; i < 256; i++) {
+ for (int j = 0; j < 256; j += 11) {
+ ipAddr = String.format("192.168.%s.%s", Integer.valueOf(i), Integer.valueOf(j));
request = new TestRemoteIpFilter.MockHttpServletRequest(ipAddr);
response = new TestRateLimitFilter.TesterResponseWithStatus();
expected = (i != 10 && i != 20) ? HttpServletResponse.SC_OK : HttpServletResponse.SC_FORBIDDEN;
@@ -115,9 +117,9 @@ public class TestRemoteCIDRFilter extends TomcatBaseTest {
TesterResponse response;
int expected;
- for (int i=0; i < 256; i++) {
- for (int j=0; j < 256; j += 11) {
- ipAddr = String.format("10.10.%s.%s", i, j);
+ for (int i = 0; i < 256; i++) {
+ for (int j = 0; j < 256; j += 11) {
+ ipAddr = String.format("10.10.%s.%s", Integer.valueOf(i), Integer.valueOf(j));
request = new TestRemoteIpFilter.MockHttpServletRequest(ipAddr);
response = new TestRateLimitFilter.TesterResponseWithStatus();
expected = (i != 10 && i != 20) ? HttpServletResponse.SC_OK : HttpServletResponse.SC_FORBIDDEN;
@@ -127,7 +129,8 @@ public class TestRemoteCIDRFilter extends TomcatBaseTest {
}
}
- private Filter createTestFilter(FilterDef filterDef, Class testFilterClass, Context root, String urlPattern) throws ServletException {
+ private Filter createTestFilter(FilterDef filterDef, Class<?> testFilterClass, Context root, String urlPattern)
+ throws ServletException {
RemoteCIDRFilter remoteCIDRFilter = new RemoteCIDRFilter();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org