From 5cc569fc9104d4749ef364b180ed9023453088ee Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Thu, 2 Mar 2017 14:28:33 +0100
Subject: [PATCH] Improve execution speed of `CacheAutoConfigurationTests`

As of Hazelcast 3.7, the bootstrap is pretty slow by default due to the
networking discovery. This commit disables both TCP/IP and multicast
discoveries.
---
 .../src/test/resources/cache/test-hazelcast.xml            | 7 +++++++
 spring-boot-actuator/src/test/resources/hazelcast.xml      | 7 +++++++
 spring-boot-autoconfigure/src/test/resources/hazelcast.xml | 7 +++++++
 .../boot/autoconfigure/cache/hazelcast-specific.xml        | 7 +++++++
 .../boot/autoconfigure/hazelcast/hazelcast-specific.xml    | 7 +++++++
 .../src/main/resources/hazelcast.xml                       | 7 +++++++
 6 files changed, 42 insertions(+)

diff --git a/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml b/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
index b1ef4ab3edf..59ba8d06cec 100644
--- a/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
+++ b/spring-boot-actuator/src/test/resources/cache/test-hazelcast.xml
@@ -5,4 +5,11 @@
 	<map name="books"/>
 	<map name="players"/>
 
+	<network>
+		<join>
+			<tcp-ip enabled="false"/>
+			<multicast enabled="false"/>
+		</join>
+	</network>
+
 </hazelcast>
diff --git a/spring-boot-actuator/src/test/resources/hazelcast.xml b/spring-boot-actuator/src/test/resources/hazelcast.xml
index a7a0f452f46..15665878ac0 100644
--- a/spring-boot-actuator/src/test/resources/hazelcast.xml
+++ b/spring-boot-actuator/src/test/resources/hazelcast.xml
@@ -5,4 +5,11 @@
 
 	<map name="defaultCache" />
 
+	<network>
+		<join>
+			<tcp-ip enabled="false"/>
+			<multicast enabled="false"/>
+		</join>
+	</network>
+
 </hazelcast>
diff --git a/spring-boot-autoconfigure/src/test/resources/hazelcast.xml b/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
index a7a0f452f46..15665878ac0 100644
--- a/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
+++ b/spring-boot-autoconfigure/src/test/resources/hazelcast.xml
@@ -5,4 +5,11 @@
 
 	<map name="defaultCache" />
 
+	<network>
+		<join>
+			<tcp-ip enabled="false"/>
+			<multicast enabled="false"/>
+		</join>
+	</network>
+
 </hazelcast>
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml
index bff6302c65f..f7e59aeaead 100644
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/cache/hazelcast-specific.xml
@@ -7,4 +7,11 @@
 		<max-idle-seconds>600</max-idle-seconds>
 	</map>
 
+	<network>
+		<join>
+			<tcp-ip enabled="false"/>
+			<multicast enabled="false"/>
+		</join>
+	</network>
+
 </hazelcast>
\ No newline at end of file
diff --git a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
index 2e0cf474b16..9a0d0513b7d 100644
--- a/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
+++ b/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-specific.xml
@@ -4,4 +4,11 @@
 
 	<queue name="foobar"/>
 
+	<network>
+		<join>
+			<tcp-ip enabled="false"/>
+			<multicast enabled="false"/>
+		</join>
+	</network>
+
 </hazelcast>
\ No newline at end of file
diff --git a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml
index d8d254ef246..2e705476da6 100644
--- a/spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml
+++ b/spring-boot-samples/spring-boot-sample-cache/src/main/resources/hazelcast.xml
@@ -14,4 +14,11 @@
 		<management-enabled>true</management-enabled>
 	</cache>
 
+	<network>
+		<join>
+			<tcp-ip enabled="false"/>
+			<multicast enabled="false"/>
+		</join>
+	</network>
+
 </hazelcast>