Merge pull request #31863 from adrianbob

* pr/31863:
  Polish "Disable auto-detection in tests that start Hazelcast"
  Disable auto-detection in tests that start Hazelcast

Closes gh-31863

Author: snicoll

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/resources/hazelcast.xml

@@ -5,6 +5,7 @@
 	<map name="defaultCache" />
 	<network>
 		<join>
+			<auto-detection enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>

spring-boot-project/spring-boot-actuator/src/test/resources/hazelcast.xml

@@ -6,6 +6,7 @@
 	<map name="defaultCache" />
 	<network>
 		<join>
+			<auto-detection enabled="false" />
 			<multicast enabled="false"/>
 		</join>
 	</network>

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastAutoConfigurationServerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 import java.util.Map;
 
 import com.hazelcast.config.Config;
+import com.hazelcast.config.JoinConfig;
 import com.hazelcast.config.QueueConfig;
 import com.hazelcast.core.Hazelcast;
 import com.hazelcast.core.HazelcastInstance;
@@ -130,7 +131,7 @@ void unknownConfigFile() {
 
 	@Test
 	void configInstanceWithName() {
-		Config config = new Config("my-test-instance");
+		Config config = createTestConfig("my-test-instance");
 		HazelcastInstance existing = Hazelcast.newHazelcastInstance(config);
 		try {
 			this.contextRunner.withUserConfiguration(HazelcastConfigWithName.class)
@@ -164,6 +165,14 @@ void autoConfiguredConfigUsesApplicationClassLoader() {
 		});
 	}
 
+	private static Config createTestConfig(String instanceName) {
+		Config config = new Config(instanceName);
+		JoinConfig join = config.getNetworkConfig().getJoin();
+		join.getAutoDetectionConfig().setEnabled(false);
+		join.getMulticastConfig().setEnabled(false);
+		return config;
+	}
+
 	@Configuration(proxyBeanMethods = false)
 	static class HazelcastConfigWithName {
 
@@ -179,7 +188,7 @@ static class HazelcastConfigNoName {
 
 		@Bean
 		Config anotherHazelcastConfig() {
-			Config config = new Config();
+			Config config = createTestConfig("another-test-instance");
 			config.addQueueConfig(new QueueConfig("another-queue"));
 			return config;
 		}

spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.xml

@@ -5,6 +5,7 @@
 	<map name="defaultCache" />
 	<network>
 		<join>
+			<auto-detection enabled="false" />
 			<multicast enabled="false" />
 		</join>
 	</network>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/hazelcast.yaml

@@ -1,5 +1,7 @@
 hazelcast:
   network:
     join:
+      auto-detection:
+        enabled: false
       multicast:
         enabled: false

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml

@@ -11,6 +11,7 @@
 
 	<network>
 		<join>
+			<auto-detection enabled="false" />
 			<multicast enabled="false"/>
 		</join>
 	</network>

spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.yaml

@@ -1,6 +1,8 @@
 hazelcast:
   network:
     join:
+      auto-detection:
+        enabled: false
       multicast:
         enabled: false
 

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-session-hazelcast/src/main/resources/hazelcast.xml

@@ -11,6 +11,7 @@
 
 	<network>
 		<join>
+			<auto-detection enabled="false"/>
 			<multicast enabled="false"/>
 		</join>
 	</network>