More Sonar fixes

Author: acogoluegnes

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

@@ -148,15 +148,7 @@ public static void main(String [] args, PerfTestOptions perfTestOptions) {
 
             PrintWriter output;
             if (outputFile != null) {
-                File file = new File(outputFile);
-                if (file.exists()) {
-                    boolean deleted = file.delete();
-                    if (!deleted) {
-                        LOGGER.warn("Could not delete existing CSV file, will try to append at the end of the file");
-                    }
-                }
-                output = new PrintWriter(new BufferedWriter(new FileWriter(file, true)), true); //NOSONAR
-                Runtime.getRuntime().addShutdownHook(new Thread(() -> output.close()));
+                output = openCsvFileForWriting(outputFile);
             } else {
                 output = null;
             }
@@ -286,6 +278,20 @@ public static void main(String [] args, PerfTestOptions perfTestOptions) {
         }
     }
 
+    private static PrintWriter openCsvFileForWriting(String outputFile) throws IOException {
+        PrintWriter output;
+        File file = new File(outputFile);
+        if (file.exists()) {
+            boolean deleted = file.delete();
+            if (!deleted) {
+                LOGGER.warn("Could not delete existing CSV file, will try to append at the end of the file");
+            }
+        }
+        output = new PrintWriter(new BufferedWriter(new FileWriter(file, true)), true); //NOSONAR
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> output.close()));
+        return output;
+    }
+
     private static ConnectionFactory configureNioIfRequested(CommandLineProxy cmd, ConnectionFactory factory) {
         int nbThreads = intArg(cmd, "niot", -1);
         int executorSize = intArg(cmd, "niotp", -1);
@@ -507,7 +513,7 @@ static boolean boolArg(CommandLineProxy cmd, String opt, boolean def) {
         return Boolean.parseBoolean(cmd.getOptionValue(opt, Boolean.toString(def)));
     }
 
-    static List<?> lstArg(CommandLineProxy cmd, char opt) {
+    static List<Object> lstArg(CommandLineProxy cmd, char opt) {
         String[] vals = cmd.getOptionValues(opt);
         if (vals == null) {
             vals = new String[] {};

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

@@ -27,6 +27,7 @@
  * Class to output stats on the console and in a CSV file.
  */
 class PrintlnStats extends Stats {
+    public static final String MESSAGE_RATE_LABEL = "msg/s";
     private final boolean sendStatsEnabled;
     private final boolean recvStatsEnabled;
     private final boolean returnStatsEnabled;
@@ -139,10 +140,7 @@ protected void report(long now) {
         long[] consumerLatencyStats = null;
         long[] confirmLatencyStats = null;
         if (legacyMetrics && latencyCountInterval > 0) {
-            output += ", min/avg/max latency: " +
-                    minLatency / 1000L + "/" +
-                    cumulativeLatencyInterval / (1000L * latencyCountInterval) + "/" +
-                    maxLatency / 1000L + " µs ";
+            output += legacyMetrics();
         } else {
             if (shouldDisplayConsumerLatency() || shouldDisplayConfirmLatency()) {
                 output += ", min/median/75th/95th/99th ";
@@ -172,6 +170,17 @@ protected void report(long now) {
         }
 
         this.out.println(output);
+        writeToCsvIfNecessary(now, ratePublished, rateReturned, rateConfirmed, rateNacked, rateConsumed, consumerLatencyStats, confirmLatencyStats);
+    }
+
+    private String legacyMetrics() {
+        return ", min/avg/max latency: " +
+                minLatency / 1000L + "/" +
+                cumulativeLatencyInterval / (1000L * latencyCountInterval) + "/" +
+                maxLatency / 1000L + " µs ";
+    }
+
+    private void writeToCsvIfNecessary(long now, double ratePublished, double rateReturned, double rateConfirmed, double rateNacked, double rateConsumed, long[] consumerLatencyStats, long[] confirmLatencyStats) {
         if (this.csvOut != null) {
             if (consumerLatencyStats == null) {
                 consumerLatencyStats = getStats(latency);
@@ -202,7 +211,6 @@ protected void report(long now) {
 
             );
         }
-
     }
 
     boolean shouldDisplayConsumerLatency() {
@@ -233,7 +241,7 @@ private long div(double p) {
 
     private String getRate(String descr, double rate, boolean display) {
         if (display) {
-            return ", " + descr + ": " + formatRate(rate) + " msg/s";
+            return ", " + descr + ": " + formatRate(rate) + " " + MESSAGE_RATE_LABEL;
         } else {
             return "";
         }
@@ -244,13 +252,13 @@ public void printFinal() {
 
         System.out.println("id: " + testID + ", sending rate avg: " +
                 formatRate(sendCountTotal * 1000.0 / (now - startTime)) +
-                " msg/s");
+                " " + MESSAGE_RATE_LABEL);
 
         long elapsed = now - startTime;
         if (elapsed > 0) {
             System.out.println("id: " + testID + ", receiving rate avg: " +
                     formatRate(recvCountTotal * 1000.0 / elapsed) +
-                    " msg/s");
+                    " " + MESSAGE_RATE_LABEL);
         }
     }
 }