Merge 3310c2bb37 into 6d6654ed3b

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.

bin/jmeter.properties

@@ -759,6 +759,8 @@ wmlParser.types=text/vnd.wap.wml
 # set this property to false
 #sample_sender_strip_also_on_error=true
 
+sample_sender_strip_if_success=false
+
 # Remote batching support
 # Since JMeter 2.9, default is MODE_STRIPPED_BATCH, which returns samples in
 # batch mode (every 100 samples or every minute by default)

build-logic/build.gradle.kts

@@ -17,7 +17,7 @@
 
 plugins {
     `embedded-kotlin` apply false
-    id("com.github.autostyle") version "3.2"
+    id("com.github.autostyle") version "4.0"
 }
 
 allprojects {

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)
         }
     }

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 {

src/core/src/main/java/org/apache/jmeter/samplers/DataStrippingSampleSender.java

@@ -53,6 +53,7 @@ public class DataStrippingSampleSender extends AbstractSampleSender implements S
     private final SampleSender decoratedSender;
     // Configuration items, set up by readResolve
     private transient volatile boolean stripAlsoOnError;
+    private static boolean stripIfSuccess = JMeterUtils.getPropDefault("sample_sender_strip_if_success", false);
 
 
     /**
@@ -126,6 +127,24 @@ public class DataStrippingSampleSender extends AbstractSampleSender implements S
     private static void stripResponse(SampleResult result) {
         result.setBytes(result.getBytesAsLong());
         result.setResponseData(EMPTY_BA);
+
+        if (stripIfSuccess && result.isSuccessful()) {
+            result.setSentBytes(result.getSentBytes());
+            result.setSamplerData(null);
+            result.setRequestHeaders(null);
+
+            result.setBodySize(result.getBodySizeAsLong());
+            //result.setDataType(null);
+            //result.setDataEncoding(null);
+
+            result.setHeadersSize(result.getHeadersSize());
+            result.setResponseHeaders(null);
+
+            //result.setURL(null);
+
+            //result.setResponseMessage(null);
+            //result.setResponseCode(null);
+        }
     }
 
     /**
@@ -138,10 +157,12 @@ public class DataStrippingSampleSender extends AbstractSampleSender implements S
     protected Object readResolve() throws ObjectStreamException{
         if (isClientConfigured()) {
             stripAlsoOnError = clientConfiguredStripAlsoOnError;
+            stripIfSuccess = JMeterUtils.getPropDefault("sample_sender_strip_if_success", false);
         } else {
             stripAlsoOnError = SERVER_CONFIGURED_STRIP_ALSO_ON_ERROR;
         }
         log.info("Using DataStrippingSampleSender for this run with stripAlsoOnError: {}", stripAlsoOnError);
+        log.info("Using DataStrippingSampleSender for this run with stripIfSuccess: {}", stripIfSuccess);
         return this;
     }
 }

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);

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\