This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 6d6654ed3b chore: remove removeUnusedImports() rule
6d6654ed3b is described below
commit 6d6654ed3b171e3599c8c59454e28d570aaa485a
Author: Vladimir Sitnikov <[email protected]>
AuthorDate: Mon Jul 21 16:56:29 2025 +0300
chore: remove removeUnusedImports() rule
removeUnusedImports causes issues with parsing newer Java, and
google-java-format requires --add-exports when running with Java 17+
We'd better use OpenRewrite for imports.
---
.../verification/src/main/kotlin/build-logic.autostyle.gradle.kts | 1 -
.../src/main/java/org/apache/jmeter/assertions/SizeAssertion.java | 2 +-
.../src/main/java/org/apache/jmeter/functions/ChangeCase.java | 2 +-
.../org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java | 8 ++++----
4 files changed, 6 insertions(+), 7 deletions(-)
diff --git
a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
index 7117e87aba..eb874732ff 100644
--- a/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
+++ b/build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts
@@ -75,7 +75,6 @@ plugins.withId("java") {
java {
license()
importOrder("static ", "java.", "javax", "org", "net", "com", "")
- removeUnusedImports()
indentWithSpaces(4)
}
}
diff --git
a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
index 5e83d920c4..ac2ad0132b 100644
---
a/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
+++
b/src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java
@@ -249,7 +249,7 @@ public class SizeAssertion extends AbstractScopedAssertion
implements Serializab
if (operator == null) {
return "ERROR - invalid condition";
}
-
+
if (operator.evaluate(resultSize, allowedSize)) {
return "";
} else {
diff --git
a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
index faf5c841b0..44187fb4e9 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java
@@ -86,7 +86,7 @@ public class ChangeCase extends AbstractFunction {
LOGGER.error("Unknown mode {}, returning {} unchanged", mode,
originalString);
return originalString;
}
-
+
return switch (changeCaseMode) {
case UPPER -> StringUtils.upperCase(originalString);
case LOWER -> StringUtils.lowerCase(originalString);
diff --git
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
index d538a73e99..da4868a20f 100644
---
a/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
+++
b/src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
@@ -81,7 +81,7 @@ public class TestHttpRequestHdr extends JMeterTestCase {
Content-type: %s\r
Content-length: %d\r
\r
- %s""".formatted(url,
HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED,
+ %s""".formatted(url,
HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED,
getBodyLength(postBody, contentEncoding),
postBody);
s = getSamplerForRequest(url, testPostRequest, contentEncoding);
assertEquals(HTTPConstants.POST, s.getMethod());
@@ -597,15 +597,15 @@ public class TestHttpRequestHdr extends JMeterTestCase {
private String createMultipartFormBody(String titleValue, String
descriptionValue,
String contentEncoding, boolean includeExtraHeaders,
String boundary, String endOfLine) {
-
+
String titleHeaders = includeExtraHeaders ? """
Content-Type: text/plain; charset=%s%s\
Content-Transfer-Encoding:
8bit%s""".formatted(contentEncoding, endOfLine, endOfLine) : "";
-
+
String descriptionHeaders = includeExtraHeaders ? """
Content-Type: text/plain; charset=%s%s\
Content-Transfer-Encoding:
8bit%s""".formatted(contentEncoding, endOfLine, endOfLine) : "";
-
+
return """
--%s%s\
Content-Disposition: form-data; name="title"%s\
