Fix addressResolver afte merge conflict

Related to #1198

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/connection/AbstractConnectionFactory.java

@@ -484,27 +484,7 @@ protected final Connection createBareConnection() {
 		try {
 			String connectionName = this.connectionNameStrategy.obtainNewConnectionName(this);
 
-			com.rabbitmq.client.Connection rabbitConnection;
-			if (this.addresses != null) {
-				List<Address> addressesToConnect = this.addresses;
-				if (this.shuffleAddresses && addressesToConnect.size() > 1) {
-					List<Address> list = new ArrayList<>(addressesToConnect);
-					Collections.shuffle(list);
-					addressesToConnect = list;
-				}
-				if (this.logger.isInfoEnabled()) {
-					this.logger.info("Attempting to connect to: " + addressesToConnect);
-				}
-				rabbitConnection = this.rabbitConnectionFactory.newConnection(this.executorService, addressesToConnect,
-						connectionName);
-			}
-			else {
-				if (this.logger.isInfoEnabled()) {
-					this.logger.info("Attempting to connect to: " + this.rabbitConnectionFactory.getHost()
-							+ ":" + this.rabbitConnectionFactory.getPort());
-				}
-				rabbitConnection = this.rabbitConnectionFactory.newConnection(this.executorService, connectionName);
-			}
+			com.rabbitmq.client.Connection rabbitConnection = connect(connectionName);
 
 			Connection connection = new SimpleConnection(rabbitConnection, this.closeTimeout);
 			if (rabbitConnection instanceof AutorecoveringConnection) {
@@ -535,7 +515,8 @@ public void handleRecovery(Recoverable recoverable) {
 			}
 
 			if (this.applicationEventPublisher != null) {
-				connection.addBlockedListener(new ConnectionBlockedListener(connection, this.applicationEventPublisher));
+				connection.addBlockedListener(new ConnectionBlockedListener(connection,
+						this.applicationEventPublisher));
 			}
 
 			return connection;