More Sonar fixes

Author: acogoluegnes

pom.xml

@@ -223,6 +223,16 @@
 
   <build>
 
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>3.5.0.1254</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
     <resources>
       <resource>
         <directory>src/main/resources</directory>

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

@@ -17,6 +17,7 @@
 
 import com.rabbitmq.client.MissedHeartbeatException;
 import com.rabbitmq.client.ShutdownSignalException;
+import com.rabbitmq.client.impl.recovery.AutorecoveringConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,11 +32,6 @@ public abstract class AgentBase {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(AgentBase.class);
 
-    // FIXME this is the condition to start connection recovery
-    // ensure it's the appropriate condition and get it from the Java client code
-    static final Predicate<ShutdownSignalException> CONNECTION_RECOVERY_TRIGGERED =
-        e -> !e.isInitiatedByApplication() || (e.getCause() instanceof MissedHeartbeatException);
-
     protected void delay(long now, AgentState state) {
 
         long elapsed = now - state.getLastStatsTime();
@@ -56,7 +52,7 @@ protected void delay(long now, AgentState state) {
     }
 
     protected boolean isConnectionRecoveryTriggered(ShutdownSignalException e) {
-        return CONNECTION_RECOVERY_TRIGGERED.test(e);
+        return AutorecoveringConnection.DEFAULT_CONNECTION_RECOVERY_TRIGGERING_CONDITION.test(e);
     }
 
     protected void handleShutdownSignalExceptionOnWrite(Recovery.RecoveryProcess recoveryProcess, ShutdownSignalException e) {

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

@@ -164,9 +164,12 @@ public static void main(String [] args, PerfTestOptions perfTestOptions) {
             if (outputFile != null) {
                 File file = new File(outputFile);
                 if (file.exists()) {
-                    file.delete();
+                    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); //NOSONAR
+                output = new PrintWriter(new BufferedWriter(new FileWriter(file, true)), true); //NOSONAR
                 Runtime.getRuntime().addShutdownHook(new Thread(() -> output.close()));
             } else {
                 output = null;
@@ -288,7 +291,7 @@ public static void main(String [] args, PerfTestOptions perfTestOptions) {
             usage(options);
         } catch (Exception e) {
             System.err.println("Main thread caught exception: " + e);
-            e.printStackTrace();
+            LOGGER.error("Main thread caught exception", e);
             systemExiter.exit(1);
         } finally {
             if (metrics != null) {
@@ -803,10 +806,10 @@ public void exit(int status) {
 
     }
 
-    public static Function<String, String> LONG_OPTION_TO_ENVIRONMENT_VARIABLE = option ->
+    static final Function<String, String> LONG_OPTION_TO_ENVIRONMENT_VARIABLE = option ->
         option.replace('-', '_').toUpperCase(Locale.ENGLISH);
 
-    public static Function<String, String> ENVIRONMENT_VARIABLE_PREFIX = name -> {
+    private static final Function<String, String> ENVIRONMENT_VARIABLE_PREFIX = name -> {
         String prefix = System.getenv("RABBITMQ_PERF_TEST_ENV_PREFIX");
         if (prefix == null || prefix.trim().isEmpty()) {
             return name;
@@ -818,6 +821,6 @@ public void exit(int status) {
         }
     };
 
-    static Function<String, String> ENVIRONMENT_VARIABLE_LOOKUP = name -> System.getenv(name);
+    private static final Function<String, String> ENVIRONMENT_VARIABLE_LOOKUP = name -> System.getenv(name);
 
 }

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

@@ -88,7 +88,7 @@ public void handleRecovery(Recoverable recoverable) {
                 }
             });
             connection.addShutdownListener(cause -> {
-                if (AgentBase.CONNECTION_RECOVERY_TRIGGERED.test(cause)) {
+                if (AutorecoveringConnection.DEFAULT_CONNECTION_RECOVERY_TRIGGERING_CONDITION.test(cause)) {
                     LOGGER.debug("Setting recovery in progress flag for connection {}", connection.getClientProvidedName());
                     recoveryInProgress.set(true);
                 }