Skip to content

Commit 6d6654e

Browse files
committed
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.
1 parent b495352 commit 6d6654e

4 files changed

Lines changed: 6 additions & 7 deletions

File tree

build-logic/verification/src/main/kotlin/build-logic.autostyle.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ plugins.withId("java") {
7575
java {
7676
license()
7777
importOrder("static ", "java.", "javax", "org", "net", "com", "")
78-
removeUnusedImports()
7978
indentWithSpaces(4)
8079
}
8180
}

src/components/src/main/java/org/apache/jmeter/assertions/SizeAssertion.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ private String compareSize(long resultSize) {
249249
if (operator == null) {
250250
return "ERROR - invalid condition";
251251
}
252-
252+
253253
if (operator.evaluate(resultSize, allowedSize)) {
254254
return "";
255255
} else {

src/functions/src/main/java/org/apache/jmeter/functions/ChangeCase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ protected String changeCase(String originalString, String mode) {
8686
LOGGER.error("Unknown mode {}, returning {} unchanged", mode, originalString);
8787
return originalString;
8888
}
89-
89+
9090
return switch (changeCaseMode) {
9191
case UPPER -> StringUtils.upperCase(originalString);
9292
case LOWER -> StringUtils.lowerCase(originalString);

src/protocol/http/src/test/java/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void testRepeatedArguments() throws Exception {
8181
Content-type: %s\r
8282
Content-length: %d\r
8383
\r
84-
%s""".formatted(url, HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED,
84+
%s""".formatted(url, HTTPConstants.APPLICATION_X_WWW_FORM_URLENCODED,
8585
getBodyLength(postBody, contentEncoding), postBody);
8686
s = getSamplerForRequest(url, testPostRequest, contentEncoding);
8787
assertEquals(HTTPConstants.POST, s.getMethod());
@@ -597,15 +597,15 @@ public void testPostMultipartFileUpload() throws Exception {
597597
private String createMultipartFormBody(String titleValue, String descriptionValue,
598598
String contentEncoding, boolean includeExtraHeaders,
599599
String boundary, String endOfLine) {
600-
600+
601601
String titleHeaders = includeExtraHeaders ? """
602602
Content-Type: text/plain; charset=%s%s\
603603
Content-Transfer-Encoding: 8bit%s""".formatted(contentEncoding, endOfLine, endOfLine) : "";
604-
604+
605605
String descriptionHeaders = includeExtraHeaders ? """
606606
Content-Type: text/plain; charset=%s%s\
607607
Content-Transfer-Encoding: 8bit%s""".formatted(contentEncoding, endOfLine, endOfLine) : "";
608-
608+
609609
return """
610610
--%s%s\
611611
Content-Disposition: form-data; name="title"%s\

0 commit comments

Comments
 (0)