Decouple arguments/properties parsing and processing

Use streams and dedicated mappers.

References #286

Author: acogoluegnes

src/main/java/com/rabbitmq/perf/PerfTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2007-2020 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2007-2022 VMware, Inc. or its affiliates.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2
@@ -23,6 +23,7 @@
 import com.rabbitmq.client.impl.DefaultExceptionHandler;
 import com.rabbitmq.client.impl.nio.NioParams;
 import io.micrometer.core.instrument.composite.CompositeMeterRegistry;
+import java.util.stream.Collectors;
 import org.apache.commons.cli.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -756,22 +757,24 @@ static Map<String, Object> convertKeyValuePairs(String arg) {
         if (arg == null || arg.trim().isEmpty()) {
             return null;
         }
-        Map<String, Object> properties = new HashMap<>();
-        for (String entry : arg.split(",")) {
+        return Arrays.stream(arg.split(",")).map(entry -> {
             String [] keyValue = entry.split("=");
-            if (keyValue.length == 1 ||
-                    keyValue[0].equals("x-dead-letter-exchange") &&
-                    keyValue[1].equals("amq.default")) {
-                properties.put(keyValue[0], "");
+            if (keyValue.length == 1) {
+                return new Object[] {keyValue[0], ""};
             } else {
                 try {
-                    properties.put(keyValue[0], Long.parseLong(keyValue[1]));
+                    return new Object[] {keyValue[0], Long.parseLong(keyValue[1])};
                 } catch(NumberFormatException e) {
-                    properties.put(keyValue[0], keyValue[1]);
+                    return new Object[] {keyValue[0], keyValue[1]};
                 }
             }
-        }
-        return properties;
+        }).map(keyValue -> {
+            if ("x-dead-letter-exchange".equals(keyValue[0]) && "amq.default".equals(keyValue[1])) {
+                return new String[] {"x-dead-letter-exchange", ""};
+            } else {
+                return keyValue;
+            }
+        }).collect(Collectors.toMap(keyEntry -> keyEntry[0].toString(), keyEntry -> keyEntry[1]));
     }
 
     private static String getExchangeName(CommandLineProxy cmd, String def) {

src/test/java/com/rabbitmq/perf/PerfTestTest.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2018-2020 VMware, Inc. or its affiliates.  All rights reserved.
+// Copyright (c) 2018-2022 VMware, Inc. or its affiliates.  All rights reserved.
 //
 // This software, the RabbitMQ Java client library, is triple-licensed under the
 // Mozilla Public License 2.0 ("MPL"), the GNU General Public License version 2
@@ -15,12 +15,12 @@
 
 package com.rabbitmq.perf;
 
-import org.assertj.core.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import static com.rabbitmq.perf.PerfTest.convertKeyValuePairs;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -97,4 +97,20 @@ Map<String, Integer> reasons(String reasons) {
         }
         return result;
     }
+
+    @Test
+    void convertPostProcessKeyValuePairs() {
+        assertThat(convertKeyValuePairs("x-queue-type=quorum,max-length-bytes=100000"))
+            .hasSize(2)
+            .containsEntry("x-queue-type", "quorum")
+            .containsEntry("max-length-bytes", 100000L);
+        assertThat(convertKeyValuePairs("x-dead-letter-exchange=,x-queue-type=quorum"))
+            .hasSize(2)
+            .containsEntry("x-dead-letter-exchange", "")
+            .containsEntry("x-queue-type", "quorum");
+        assertThat(convertKeyValuePairs("x-dead-letter-exchange=amq.default,x-queue-type=quorum"))
+            .hasSize(2)
+            .containsEntry("x-dead-letter-exchange", "")
+            .containsEntry("x-queue-type", "quorum");
+    }
 }