From 67dd9ad537ccc4ddce061f994541ff3923591c1e Mon Sep 17 00:00:00 2001
From: Dmytro Nosan <dimanosan@gmail.com>
Date: Tue, 4 Feb 2020 21:45:48 +0200
Subject: [PATCH] Create HazelCastClient if necessary

This commit makes sure to create a HazelcastClient if an instance name
is provided in configuration and if no such client already exists. This
harmonizes the behaviour with of the server counter-part.

See gh-20109
---
 .../hazelcast/HazelcastClientFactory.java             |  4 ++--
 .../HazelcastAutoConfigurationClientTests.java        | 11 ++++++++++-
 .../hazelcast/hazelcast-client-instance.xml           |  7 +++++++
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml

diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientFactory.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientFactory.java
index 7bf5e0d305..b1c9753514 100644
--- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientFactory.java
+++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -72,7 +72,7 @@ public class HazelcastClientFactory {
 	 */
 	public HazelcastInstance getHazelcastInstance() {
 		if (StringUtils.hasText(this.clientConfig.getInstanceName())) {
-			return HazelcastClient.getHazelcastClientByName(this.clientConfig.getInstanceName());
+			return HazelcastClient.getOrCreateHazelcastClient(this.clientConfig);
 		}
 		return HazelcastClient.newHazelcastClient(this.clientConfig);
 	}
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 87d15d0a02..f63dce65fb 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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2020 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.
@@ -124,6 +124,15 @@ class HazelcastAutoConfigurationClientTests {
 						.getBean(HazelcastInstance.class).isInstanceOf(HazelcastClientProxy.class));
 	}
 
+	@Test
+	void clientConfigWithInstanceName() {
+		this.contextRunner
+				.withPropertyValues("spring.hazelcast.config=classpath:org/springframework/"
+						+ "boot/autoconfigure/hazelcast/hazelcast-client-instance.xml")
+				.run((context) -> assertThat(context).getBean(HazelcastInstance.class)
+						.extracting(HazelcastInstance::getName).isEqualTo("spring-boot"));
+	}
+
 	private ContextConsumer<AssertableApplicationContext> assertSpecificHazelcastClient(String label) {
 		return (context) -> assertThat(context).getBean(HazelcastInstance.class).isInstanceOf(HazelcastInstance.class)
 				.has(labelEqualTo(label));
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
new file mode 100644
index 0000000000..29bfac076a
--- /dev/null
+++ b/spring-boot-project/spring-boot-autoconfigure/src/test/resources/org/springframework/boot/autoconfigure/hazelcast/hazelcast-client-instance.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<hazelcast-client xmlns="http://www.hazelcast.com/schema/client-config"
+				  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				  xsi:schemaLocation="http://www.hazelcast.com/schema/client-config hazelcast-client-config-3.12.xsd">
+
+	<instance-name>spring-boot</instance-name>
+</hazelcast-client>