Tolerate Hazelcast 4

This commit updates HazelcastHealthIndicator and
HazelcastCacheMeterBinderProvider so that they work with
Hazelcast 4 while retaining compatibility with Hazelcast 3. Reflection
is used when necessary.

This commit also adds a smoke test that validates those features are
working when Hazelcast 4 is on the classpath.

Closes gh-21169

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/hazelcast/Hazelcast4HazelcastHealthIndicatorTests.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2012-2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.hazelcast;
+
+import java.io.IOException;
+
+import com.hazelcast.core.HazelcastException;
+import com.hazelcast.core.HazelcastInstance;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.Status;
+import org.springframework.boot.autoconfigure.hazelcast.HazelcastInstanceFactory;
+import org.springframework.boot.testsupport.classpath.ClassPathExclusions;
+import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
+import org.springframework.core.io.ClassPathResource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.BDDMockito.when;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link HazelcastHealthIndicator} with Hazelcast 4.
+ *
+ * @author Dmytro Nosan
+ * @author Stephane Nicoll
+ */
+@ClassPathExclusions("hazelcast*.jar")
+@ClassPathOverrides("com.hazelcast:hazelcast:4.0")
+class Hazelcast4HazelcastHealthIndicatorTests {
+
+	@Test
+	void hazelcastUp() throws IOException {
+		HazelcastInstance hazelcast = new HazelcastInstanceFactory(new ClassPathResource("hazelcast-4.xml"))
+				.getHazelcastInstance();
+		try {
+			Health health = new HazelcastHealthIndicator(hazelcast).health();
+			assertThat(health.getStatus()).isEqualTo(Status.UP);
+			assertThat(health.getDetails()).containsOnlyKeys("name", "uuid").containsEntry("name",
+					"actuator-hazelcast-4");
+			assertThat(health.getDetails().get("uuid")).asString().isNotEmpty();
+		}
+		finally {
+			hazelcast.shutdown();
+		}
+	}
+
+	@Test
+	void hazelcastDown() {
+		HazelcastInstance hazelcast = mock(HazelcastInstance.class);
+		when(hazelcast.executeTransaction(any())).thenThrow(new HazelcastException());
+		Health health = new HazelcastHealthIndicator(hazelcast).health();
+		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
+	}
+
+}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/hazelcast/HazelcastHealthIndicatorTests.java

@@ -16,14 +16,16 @@
 
 package org.springframework.boot.actuate.hazelcast;
 
-import com.hazelcast.core.Endpoint;
+import java.io.IOException;
+
 import com.hazelcast.core.HazelcastException;
 import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.transaction.TransactionalTask;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.Status;
+import org.springframework.boot.autoconfigure.hazelcast.HazelcastInstanceFactory;
+import org.springframework.core.io.ClassPathResource;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
@@ -38,28 +40,27 @@ import static org.mockito.Mockito.mock;
  */
 class HazelcastHealthIndicatorTests {
 
-	private final HazelcastInstance hazelcast = mock(HazelcastInstance.class);
-
 	@Test
-	void hazelcastUp() {
-		Endpoint endpoint = mock(Endpoint.class);
-		when(this.hazelcast.getName()).thenReturn("hz0-instance");
-		when(this.hazelcast.getLocalEndpoint()).thenReturn(endpoint);
-		when(endpoint.getUuid()).thenReturn("7581bb2f-879f-413f-b574-0071d7519eb0");
-		when(this.hazelcast.executeTransaction(any())).thenAnswer((invocation) -> {
-			TransactionalTask<?> task = invocation.getArgument(0);
-			return task.execute(null);
-		});
-		Health health = new HazelcastHealthIndicator(this.hazelcast).health();
-		assertThat(health.getStatus()).isEqualTo(Status.UP);
-		assertThat(health.getDetails()).containsOnlyKeys("name", "uuid").containsEntry("name", "hz0-instance")
-				.containsEntry("uuid", "7581bb2f-879f-413f-b574-0071d7519eb0");
+	void hazelcastUp() throws IOException {
+		HazelcastInstance hazelcast = new HazelcastInstanceFactory(new ClassPathResource("hazelcast.xml"))
+				.getHazelcastInstance();
+		try {
+			Health health = new HazelcastHealthIndicator(hazelcast).health();
+			assertThat(health.getStatus()).isEqualTo(Status.UP);
+			assertThat(health.getDetails()).containsOnlyKeys("name", "uuid").containsEntry("name",
+					"actuator-hazelcast");
+			assertThat(health.getDetails().get("uuid")).asString().isNotEmpty();
+		}
+		finally {
+			hazelcast.shutdown();
+		}
 	}
 
 	@Test
 	void hazelcastDown() {
-		when(this.hazelcast.executeTransaction(any())).thenThrow(new HazelcastException());
-		Health health = new HazelcastHealthIndicator(this.hazelcast).health();
+		HazelcastInstance hazelcast = mock(HazelcastInstance.class);
+		when(hazelcast.executeTransaction(any())).thenThrow(new HazelcastException());
+		Health health = new HazelcastHealthIndicator(hazelcast).health();
 		assertThat(health.getStatus()).isEqualTo(Status.DOWN);
 	}
 

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

@@ -0,0 +1,13 @@
+<hazelcast xmlns="http://www.hazelcast.com/schema/config"
+		   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		   xsi:schemaLocation="http://www.hazelcast.com/schema/config
+           http://www.hazelcast.com/schema/config/hazelcast-config-4.0.xsd">
+	<instance-name>actuator-hazelcast-4</instance-name>
+	<map name="defaultCache"/>
+	<network>
+		<join>
+			<tcp-ip enabled="false"/>
+			<multicast enabled="false"/>
+		</join>
+	</network>
+</hazelcast>

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

@@ -2,6 +2,7 @@
 		xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-3.12.xsd"
 		xmlns="http://www.hazelcast.com/schema/config"
 		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<instance-name>actuator-hazelcast</instance-name>
 	<map name="defaultCache" />
 	<network>
 		<join>