This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 370059979a Fix IDE warnings. Reformat code.
370059979a is described below
commit 370059979a5e6f1d6e2c30288c1f639f4dbd2aa2
Author: Mark Thomas <[email protected]>
AuthorDate: Wed Dec 11 14:22:06 2024 +0000
Fix IDE warnings. Reformat code.
---
.../TestDefaultServletRfc9110Section13.java | 19 ++---
...efaultServletRfc9110Section13Parameterized.java | 89 +++++++++++-----------
2 files changed, 55 insertions(+), 53 deletions(-)
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java
index f191e6f027..c02596cb7c 100644
--- a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java
+++ b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13.java
@@ -423,7 +423,7 @@ public class TestDefaultServletRfc9110Section13 extends
TomcatBaseTest {
}
protected List<String> genETagCondtion(String strongETag, String weakETag,
IfPolicy policy) {
- List<String> headerValues = new ArrayList<String>();
+ List<String> headerValues = new ArrayList<>();
switch (policy) {
case ETAG_ALL:
headerValues.add("*");
@@ -443,10 +443,10 @@ public class TestDefaultServletRfc9110Section13 extends
TomcatBaseTest {
break;
case ETAG_NOT_IN:
if (weakETag != null && weakETag.length() > 8) {
- headerValues.add(weakETag.substring(0, 3) +
"XXXXX"+weakETag.substring(8));
+ headerValues.add(weakETag.substring(0, 3) + "XXXXX" +
weakETag.substring(8));
}
if (strongETag != null && strongETag.length() > 6) {
- headerValues.add(strongETag.substring(0, 1) +
"XXXXX"+strongETag.substring(6));
+ headerValues.add(strongETag.substring(0, 1) + "XXXXX" +
strongETag.substring(6));
}
break;
case ETAG_SYNTAX_INVALID:
@@ -460,7 +460,7 @@ public class TestDefaultServletRfc9110Section13 extends
TomcatBaseTest {
}
protected List<String> genDateCondtion(long lastModifiedTimestamp,
IfPolicy policy) {
- List<String> headerValues = new ArrayList<String>();
+ List<String> headerValues = new ArrayList<>();
if (lastModifiedTimestamp <= 0) {
return headerValues;
}
@@ -494,7 +494,7 @@ public class TestDefaultServletRfc9110Section13 extends
TomcatBaseTest {
if (policy == null) {
return;
}
- List<String> headerValues = new ArrayList<String>();
+ List<String> headerValues = new ArrayList<>();
String weakETag = resourceETag;
String strongETag = resourceETag;
if (resourceETag != null) {
@@ -611,8 +611,8 @@ public class TestDefaultServletRfc9110Section13 extends
TomcatBaseTest {
};
client.setPort(getPort());
StringBuffer curl = new StringBuffer();
- curl.append(task.m.name() + " " + task.uri + " HTTP/1.1" +
SimpleHttpClient.CRLF + "Host: localhost" + SimpleHttpClient.CRLF +
- "Connection: Close" + SimpleHttpClient.CRLF);
+ curl.append(task.m.name() + " " + task.uri + " HTTP/1.1" +
SimpleHttpClient.CRLF + "Host: localhost" +
+ SimpleHttpClient.CRLF + "Connection: Close" +
SimpleHttpClient.CRLF);
for (Entry<String,List<String>> e : requestHeaders.entrySet()) {
for (String v : e.getValue()) {
@@ -651,8 +651,9 @@ public class TestDefaultServletRfc9110Section13 extends
TomcatBaseTest {
String scExpectation = usePredicate ? "IntPredicate" :
Arrays.toString(scExpected);
Assert.assertTrue(
"Failure - sc expected:%s, sc actual:%d, %s, task:%s, \ntarget
resource:(%s,%s), \nreq headers: %s, \nresp headers: %s"
- .formatted(scExpectation, sc, message, task, etag,
FastHttpDateFormat.formatDate(lastModified),
- requestHeaders.toString(),
responseHeaders.toString()),
+ .formatted(scExpectation, Integer.valueOf(sc),
message, task, etag,
+ FastHttpDateFormat.formatDate(lastModified),
requestHeaders.toString(),
+ responseHeaders.toString()),
test);
}
diff --git
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
index 192b9ffc75..e9cbb3fee7 100644
---
a/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
+++
b/test/org/apache/catalina/servlets/TestDefaultServletRfc9110Section13Parameterized.java
@@ -74,45 +74,45 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
public static Collection<Object[]> parameters() {
List<Object[]> parameterSets = new ArrayList<>();
// testPreconditions_rfc9110_13_2_2_1_head0
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_ALL, null, null, null, null, false,
- null, new int[] { 200 } });
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_EXACTLY, null, null, null, null,
- false, null, new int[] { 200 } });
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_IN, null, null, null, null, false,
- null, new int[] { 200 } });
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_NOT_IN, null, null, null, null,
- false, null, new int[] { 412 } });
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_SYNTAX_INVALID, null, null, null,
- null, false, null, new int[] { 400 } });
-
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_ALL, null, null, null, null, false,
- null, new int[] { 200 } });
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_EXACTLY, null, null, null, null,
- false, null, new int[] { 412 } });
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_IN, null, null, null, null, false,
- null, new int[] { 412 } });
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_NOT_IN, null, null, null, null,
- false, null, new int[] { 412 } });
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_SYNTAX_INVALID, null, null, null,
- null, false, null, new int[] { 400 } });
-
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML, null,
IfPolicy.DATE_EQ, null, null, null, false,
- null, new int[] { 200 } });
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML, null,
IfPolicy.DATE_LT, null, null, null, false,
- null, new int[] { 412 } });
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML, null,
IfPolicy.DATE_GT, null, null, null, false,
- null, new int[] { 200 } });
- parameterSets.add(new Object[] { true, Task.HEAD_INDEX_HTML, null,
IfPolicy.DATE_MULTI_IN, null, null, null,
- false, null, new int[] { 200 } });
-
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML, null,
IfPolicy.DATE_EQ, null, null, null, false,
- null, new int[] { 200 } });
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML, null,
IfPolicy.DATE_LT, null, null, null, false,
- null, new int[] { 412 } });
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML, null,
IfPolicy.DATE_GT, null, null, null, false,
- null, new int[] { 200 } });
- parameterSets.add(new Object[] { false, Task.HEAD_INDEX_HTML, null,
IfPolicy.DATE_MULTI_IN, null, null, null,
- false, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_ALL, null, null, null, null,
+ Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_EXACTLY, null, null, null,
+ null, Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_IN, null, null, null, null,
+ Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_NOT_IN, null, null, null,
+ null, Boolean.FALSE, null, new int[] { 412 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_SYNTAX_INVALID, null, null,
+ null, null, Boolean.FALSE, null, new int[] { 400 } });
+
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_ALL, null, null, null, null,
+ Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_EXACTLY, null, null, null,
+ null, Boolean.FALSE, null, new int[] { 412 } });
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_IN, null, null, null, null,
+ Boolean.FALSE, null, new int[] { 412 } });
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_NOT_IN, null, null, null,
+ null, Boolean.FALSE, null, new int[] { 412 } });
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
IfPolicy.ETAG_SYNTAX_INVALID, null, null,
+ null, null, Boolean.FALSE, null, new int[] { 400 } });
+
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_EQ, null, null, null,
+ Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_LT, null, null, null,
+ Boolean.FALSE, null, new int[] { 412 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_GT, null, null, null,
+ Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.TRUE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_MULTI_IN, null, null,
+ null, Boolean.FALSE, null, new int[] { 200 } });
+
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_EQ, null, null, null,
+ Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_LT, null, null, null,
+ Boolean.FALSE, null, new int[] { 412 } });
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_GT, null, null, null,
+ Boolean.FALSE, null, new int[] { 200 } });
+ parameterSets.add(new Object[] { Boolean.FALSE, Task.HEAD_INDEX_HTML,
null, IfPolicy.DATE_MULTI_IN, null, null,
+ null, Boolean.FALSE, null, new int[] { 200 } });
return parameterSets;
@@ -205,7 +205,7 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
}
protected List<String> genETagCondtion(String strongETag, String weakETag,
IfPolicy policy) {
- List<String> headerValues = new ArrayList<String>();
+ List<String> headerValues = new ArrayList<>();
switch (policy) {
case ETAG_ALL:
headerValues.add("*");
@@ -242,7 +242,7 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
}
protected List<String> genDateCondtion(long lastModifiedTimestamp,
IfPolicy policy) {
- List<String> headerValues = new ArrayList<String>();
+ List<String> headerValues = new ArrayList<>();
if (lastModifiedTimestamp <= 0) {
return headerValues;
}
@@ -276,7 +276,7 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
if (policy == null) {
return;
}
- List<String> headerValues = new ArrayList<String>();
+ List<String> headerValues = new ArrayList<>();
String weakETag = resourceETag;
String strongETag = resourceETag;
if (resourceETag != null) {
@@ -426,8 +426,9 @@ public class
TestDefaultServletRfc9110Section13Parameterized extends TomcatBaseT
String scExpectation = usePredicate ? "IntPredicate" :
Arrays.toString(scExpected);
Assert.assertTrue(
"Failure - sc expected:%s, sc actual:%d, task:%s, \ntarget
resource:(%s,%s), \nreq headers: %s, \nresp headers: %s"
- .formatted(scExpectation, sc, task, etag,
FastHttpDateFormat.formatDate(lastModified),
- requestHeaders.toString(),
responseHeaders.toString()),
+ .formatted(scExpectation, Integer.valueOf(sc), task,
etag,
+ FastHttpDateFormat.formatDate(lastModified),
requestHeaders.toString(),
+ responseHeaders.toString()),
test);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
