Merge pull request rabbitmq#691 from rabbitmq/optional-reshuffling-in-address-resolver

acogoluegnes · web-flow · commit b709f6b45602 · 2021-06-21T09:01:59.000+02:00
Move resolved address shuffling to AddressResolver
diff --git a/src/main/java/com/rabbitmq/client/AddressResolver.java b/src/main/java/com/rabbitmq/client/AddressResolver.java
@@ -16,6 +16,8 @@
 package com.rabbitmq.client;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -30,4 +32,9 @@ public interface AddressResolver {
      */
     List<Address> getAddresses() throws IOException;
 
+    default List<Address> maybeShuffle(List<Address> input) {
+        List<Address> list = new ArrayList<Address>(input);
+        Collections.shuffle(list);
+        return list;
+    }
 }
diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnectionFactory.java b/src/main/java/com/rabbitmq/client/impl/recovery/RecoveryAwareAMQConnectionFactory.java
@@ -55,7 +55,8 @@ public RecoveryAwareAMQConnectionFactory(ConnectionParams params, FrameHandlerFa
     // package protected API, made public for testing only
     public RecoveryAwareAMQConnection newConnection() throws IOException, TimeoutException {
         Exception lastException = null;
-        List<Address> shuffled = shuffle(addressResolver.getAddresses());
+        List<Address> resolved = addressResolver.getAddresses();
+        List<Address> shuffled = addressResolver.maybeShuffle(resolved);
 
         for (Address addr : shuffled) {
             try {
