Add prefix or suffix sampler numbering for HTTP Test Script Recorder

bin/jmeter.properties

@@ -604,8 +604,15 @@ upgrade_properties=/bin/upgrade.properties
 # it assumes that the user has clicked a new URL
 #proxy.pause=5000
 
-# Add numeric suffix to Sampler names (default true)
+# Add number to Sampler names (default true)
 #proxy.number.requests=true
+# suffix or prefix numbering
+# prefix numbering (default), eg.: 001 /image.png
+#proxy.number.mode=prefix
+# suffix numbering, e.g.: /image.png-001
+#proxy.number.mode=suffix
+# number format (%03d default), see String.format
+#proxy.number.value_format=%03d
 
 # List of URL patterns that will be added to URL Patterns to exclude
 # Separate multiple lines with ;

src/core/src/main/resources/org/apache/jmeter/resources/messages.properties

@@ -1012,9 +1012,18 @@ run_threadgroup_no_timers=Start no pauses
 running_test=Running test
 runtime_controller_title=Runtime Controller
 runtime_seconds=Runtime (seconds)
+salt_string=Salt to be used for hashing (optional)
 sample_name_prefix=Prefix
 sample_name_transaction=Transaction name
-salt_string=Salt to be used for hashing (optional)
+sample_numbering_mode=Numbering mode
+sample_numbering_mode_example=Without numbering \: '/a.png', prefix \: '001 /a.png', suffix \: '/a.png-001'
+sample_numbering_mode_no_number=Without numbering
+sample_numbering_mode_prefix=Prefix number (start)
+sample_numbering_mode_suffix=Suffix number (at the end)
+sample_numbering_number_format=Number format (String.format) \:
+sample_numbering_start_value=Next number \:
+sample_numbering_start_value_error_digits=Only digits allowed
+sample_numbering_start_value_error_invalid_data=Invalid data
 sample_result_save_configuration=Sample Result Save Configuration
 sample_scope=Apply to:
 sample_scope_all=Main sample and sub-samples

src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties

@@ -1004,6 +1004,15 @@ runtime_seconds=Temps d'exécution (secondes) \:
 salt_string=Sel à utiliser pour le hash
 sample_name_prefix=Préfixe
 sample_name_transaction=Nom de la transaction
+sample_numbering_mode=Mode de numérotation
+sample_numbering_mode_example=Sans numérotation \: '/a.png', préfixe \: '001 /a.png', suffixe \: '/a.png-001'
+sample_numbering_mode_no_number=Sans numérotation
+sample_numbering_mode_prefix=Numérotation préfixe (début)
+sample_numbering_mode_suffix=Numérotation suffixe (en fin)
+sample_numbering_number_format=Format du nombre (String.format) \:
+sample_numbering_start_value=Prochain nombre \:
+sample_numbering_start_value_error_digits=Seul les chiffres sont autorisés
+sample_numbering_start_value_error_invalid_data=Valeur invalide
 sample_result_save_configuration=Sauvegarder la configuration de la sauvegarde des échantillons
 sample_scope=Appliquer sur
 sample_scope_all=L'échantillon et ses ressources liées

src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java

@@ -52,15 +52,8 @@ public abstract class AbstractSamplerCreator implements SamplerCreator {
         JMeterUtils.getPropDefault("proxy.binary.directory",// $NON-NLS-1$
                 System.getProperty("user.dir")); // $NON-NLS-1$ proxy.binary.fileType=binary
 
-    /*
-     * Optionally number the requests
-     */
-    private static final boolean NUMBER_REQUESTS =
-        JMeterUtils.getPropDefault("proxy.number.requests", true); // $NON-NLS-1$
-
     private static AtomicInteger REQUEST_NUMBER = new AtomicInteger(0);// running number
 
-
     static {
         String binaries = JMeterUtils.getPropDefault("proxy.binary.types", // $NON-NLS-1$
                 "application/x-amf,application/x-java-serialized-object,binary/octet-stream"); // $NON-NLS-1$
@@ -72,10 +65,6 @@ public abstract class AbstractSamplerCreator implements SamplerCreator {
         }
     }
 
-
-    /**
-     *
-     */
     /**
      *
      */
@@ -86,30 +75,49 @@ public AbstractSamplerCreator() {
     /**
      * @return int request number
      */
-    protected static int getRequestNumber() {
+    public int getRequestNumber() {
         return REQUEST_NUMBER.get();
     }
 
+    /**
+     * set the RequestNumber to a specify value
+     * @param iValue the current number
+    */
+    public void setRequestNumber(int iValue) {
+        REQUEST_NUMBER.set(iValue);
+    }
+
     /**
      * Increment request number
      */
-    protected static void incrementRequestNumber() {
+    protected void incrementRequestNumber() {
         incrementRequestNumberAndGet();
     }
 
     /**
      * Increment request number
      * @return int number for created sampler
      */
-    protected static int incrementRequestNumberAndGet() {
+    protected int incrementRequestNumberAndGet() {
         return REQUEST_NUMBER.incrementAndGet();
     }
 
     /**
      * @return boolean is numbering requests is required
      */
-    protected static boolean isNumberRequests() {
-        return NUMBER_REQUESTS;
+    protected boolean isNumberRequests() {
+        boolean bNumberRequest = JMeterUtils.getPropDefault("proxy.number.requests", true); // $NON-NLS-1$;
+        return bNumberRequest;
+    }
+
+    protected String getNumberValueFormat() {
+        String sNumberValueFormat = JMeterUtils.getPropDefault("proxy.number.value_format", "%03d");
+       return sNumberValueFormat;
+    }
+
+    protected String getNumberMode() {
+        String sMumberMode = JMeterUtils.getPropDefault("proxy.number.mode", "prefix");
+        return sMumberMode;
     }
 
     /**

src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java

@@ -6,13 +6,14 @@
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *  http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  */
 
 package org.apache.jmeter.protocol.http.proxy;
@@ -34,6 +35,7 @@
 import org.apache.jmeter.config.Arguments;
 import org.apache.jmeter.protocol.http.config.MultipartUrlConfig;
 import org.apache.jmeter.protocol.http.control.gui.HttpTestSampleGui;
+import org.apache.jmeter.protocol.http.proxy.ProxyControl.HttpSamplerNumberingMode;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase;
 import org.apache.jmeter.protocol.http.sampler.HTTPSamplerFactory;
 import org.apache.jmeter.protocol.http.sampler.PostWriter;
@@ -283,32 +285,58 @@ public boolean isErrorDetected() {
      * @param sampler {@link HTTPSamplerBase}
      * @param request {@link HttpRequestHdr}
      */
-    protected void computeSamplerName(HTTPSamplerBase sampler,
-            HttpRequestHdr request) {
-        String prefix = request.getPrefix();
+    protected void computeSamplerName(HTTPSamplerBase sampler, HttpRequestHdr request) {
+        String prefix = request.getPrefix(); // pn for prefix name
         int httpSampleNameMode = request.getHttpSampleNameMode();
         if (!HTTPConstants.CONNECT.equals(request.getMethod()) && isNumberRequests()) {
             if(StringUtils.isNotEmpty(prefix)) {
+            	// with a prefix name
                 if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_PREFIX) {
-                    sampler.setName(prefix + sampler.getPath()+ "-" + incrementRequestNumberAndGet());
+                    if (HttpSamplerNumberingMode.SUFFIX.getStringMode().equals(getNumberMode())) {
+                        // pn/img.png-001
+                        sampler.setName(prefix + sampler.getPath() + "-" + formatNumberingInteger(incrementRequestNumberAndGet()));
+                    }
+                    if (HttpSamplerNumberingMode.PREFIX.getStringMode().equals(getNumberMode())) {
+                        // pn-001 /img.png
+                        sampler.setName(prefix + "-" + formatNumberingInteger(incrementRequestNumberAndGet()) + " " + sampler.getPath());
+                    }
                 } else if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_COMPLETE) {
-                    sampler.setName(prefix + "-" + incrementRequestNumberAndGet());
+                    if (HttpSamplerNumberingMode.SUFFIX.getStringMode().equals(getNumberMode())) {
+                        // pn-001
+                        sampler.setName(prefix + "-" + formatNumberingInteger(incrementRequestNumberAndGet()));
+                    }
+                    if (HttpSamplerNumberingMode.PREFIX.getStringMode().equals(getNumberMode())) {
+                        // 001-pn
+                        sampler.setName(formatNumberingInteger(incrementRequestNumberAndGet()) + "-" + prefix);
+                    }
                 } else {
                     log.debug("Sampler name naming mode not recognized");
                 }
             } else {
-                sampler.setName(sampler.getPath()+"-"+incrementRequestNumberAndGet());
+                // no prefix name
+                if (HttpSamplerNumberingMode.SUFFIX.getStringMode().equals(getNumberMode())) {
+                    // /img.png-001
+                    sampler.setName(sampler.getPath() + "-" + formatNumberingInteger(incrementRequestNumberAndGet()));
+                }
+                if (HttpSamplerNumberingMode.PREFIX.getStringMode().equals(getNumberMode())) {
+                    // 001 /img.png
+                    sampler.setName(formatNumberingInteger(incrementRequestNumberAndGet()) + " " + sampler.getPath());
+                }
             }
-        } else {
+        } else { // no numbering
             if(StringUtils.isNotEmpty(prefix)) {
+            	// with a prefix name
                 if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_PREFIX) {
+                    // pn/img.png
                     sampler.setName(prefix + sampler.getPath());
                 } else if (httpSampleNameMode == SAMPLER_NAME_NAMING_MODE_COMPLETE) {
+                    // pn
                     sampler.setName(prefix);
                 } else {
                     log.debug("Sampler name naming mode not recognized");
                 }
             } else {
+                // /img.png
                 sampler.setName(sampler.getPath());
             }
         }
@@ -448,4 +476,15 @@ protected void computeDomain(HTTPSamplerBase sampler, HttpRequestHdr request) {
             log.debug("Proxy: setting server: {}", sampler.getDomain());
         }
     }
+
+    protected String formatNumberingInteger(int iValue) {
+        // format like %03d
+    	String sFormat = getNumberValueFormat();
+    	if (sFormat.length() == 0) {
+    		// the simplest format for an integer
+    		sFormat = "%d";
+    	}
+        String sReturn = String.format(sFormat, iValue);
+        return sReturn;
+    }
 }