spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5.x' into 4.0.x

Browse Source 
Closes gh-48659
This commit is contained in:
Stéphane Nicoll
2026-01-02 14:02:59 +01:00
parent 57ae8a5778 196d665e63
commit cb1596e8c8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/io/hazelcast.adoc
+1 -1
View File
@@ -12,7 +12,7 @@ Spring Boot first attempts to create a client by checking the following configur
* A `hazelcast-client.yaml` (or `hazelcast-client.yml`) in the working directory or at the root of the classpath.
If a client can not be created, Spring Boot attempts to configure an embedded server.
If you define a javadoc:com.hazelcast.config.Config[] bean, Spring Boot uses that.
If you define a javadoc:com.hazelcast.config.Config[] bean, Spring Boot uses it at is.
If your configuration defines an instance name, Spring Boot tries to locate an existing instance rather than creating a new one.
You could also specify the Hazelcast configuration file to use through configuration, as shown in the following example:
module/spring-boot-hazelcast/src/main/java/org/springframework/boot/hazelcast/autoconfigure/HazelcastConfigCustomizer.java
+2 -2
View File
@@ -19,8 +19,8 @@ package org.springframework.boot.hazelcast.autoconfigure;
import com.hazelcast.config.Config;
/**
* Callback interface that can be implemented by beans wishing to customize the Hazelcast
* server {@link Config configuration}.
* Callback interface that can be implemented by beans wishing to customize the
* auto-configured Hazelcast server {@link Config configuration}.
*
* @author Jaromir Hamala
* @author Stephane Nicoll