From ca50cd8c8a6ee3dc187e167712fa8c8b337f7fbc Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <wilkinsona@vmware.com>
Date: Wed, 7 Jun 2023 11:22:38 +0100
Subject: [PATCH] Stop using an infinite timeout for connecting to Hazelcast

Closes gh-35771
---
 .../hazelcast/HazelcastAutoConfigurationClientTests.java    | 5 ++++-
 .../autoconfigure/hazelcast/hazelcast-client-instance.xml   | 6 ++++++
 .../autoconfigure/hazelcast/hazelcast-client-specific.xml   | 5 +++++
 .../autoconfigure/hazelcast/hazelcast-client-specific.yaml  | 3 +++
 .../autoconfigure/hazelcast/hazelcast-client-specific.yml   | 3 +++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java
index dbe06a35011..4b3d98440c4 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationClientTests.java
@@ -18,6 +18,8 @@ package org.springframework.boot.autoconfigure.hazelcast;
 
 import com.hazelcast.client.HazelcastClient;
 import com.hazelcast.client.config.ClientConfig;
+import com.hazelcast.client.config.ClientConnectionStrategyConfig;
+import com.hazelcast.client.config.ConnectionRetryConfig;
 import com.hazelcast.client.impl.clientside.HazelcastClientProxy;
 import com.hazelcast.config.Config;
 import com.hazelcast.core.Hazelcast;
@@ -201,7 +203,8 @@ class HazelcastAutoConfigurationClientTests {
 
 		@Bean
 		ClientConfig clientConfig() {
-			return new ClientConfig();
+			return new ClientConfig().setConnectionStrategyConfig(new ClientConnectionStrategyConfig()
+				.setConnectionRetryConfig(new ConnectionRetryConfig().setClusterConnectTimeoutMillis(60000)));
 		}
 
 	}
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml
index 62472cb3b02..855e92086cd 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml
@@ -4,5 +4,11 @@
 				  xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-5.0.xsd">
 
 	<instance-name>spring-boot</instance-name>
+	
+	<connection-strategy>
+		<connection-retry>
+			<cluster-connect-timeout-millis>60000</cluster-connect-timeout-millis>
+		</connection-retry>
+	</connection-strategy>
 
 </hazelcast-client>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml
index 8b30bb96866..6210b807e84 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.xml
@@ -5,5 +5,10 @@
 	<client-labels>
 		<label>explicit-xml</label>
 	</client-labels>
+	<connection-strategy>
+		<connection-retry>
+			<cluster-connect-timeout-millis>60000</cluster-connect-timeout-millis>
+		</connection-retry>
+	</connection-strategy>
 
 </hazelcast-client>
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yaml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yaml
index a6094ec52bf..285d1fe683d 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yaml
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yaml
@@ -1,3 +1,6 @@
 hazelcast-client:
   client-labels:
     - explicit-yaml
+  connection-strategy:
+    connection-retry:
+      cluster-connect-timeout-millis: 60000
diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yml b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yml
index a3e49162806..cd831510b81 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yml
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-specific.yml
@@ -1,3 +1,6 @@
 hazelcast-client:
   client-labels:
     - explicit-yml
+  connection-strategy:
+    connection-retry:
+      cluster-connect-timeout-millis: 60000