Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #33687 from luben93

Browse Source 
* pr/33687:
  Use hazelcast's Config.loadFromStream()

Closes gh-33687
This commit is contained in:
Moritz Halbritter
2023-01-31 11:03:25 +01:00
parent 48db5ff35c 275f15b8d3
commit 3f4bb4eacc
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastServerConfiguration.java
View File

@@ -20,8 +20,6 @@ import java.io.IOException;
import java.net.URL;
import com.hazelcast.config.Config;
import com.hazelcast.config.XmlConfigBuilder;
import com.hazelcast.config.YamlConfigBuilder;
import com.hazelcast.core.Hazelcast;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.spring.context.SpringManagedContext;
@@ -78,7 +76,7 @@ class HazelcastServerConfiguration {
private Config loadConfig(Resource configLocation) throws IOException {
URL configUrl = configLocation.getURL();
Config config = loadConfig(configUrl);
Config config = Config.loadFromStream(configUrl.openStream());
if (ResourceUtils.isFileURL(configUrl)) {
config.setConfigurationFile(configLocation.getFile());
}
@@ -88,14 +86,6 @@ class HazelcastServerConfiguration {
return config;
}
private static Config loadConfig(URL configUrl) throws IOException {
String configFileName = configUrl.getPath();
if (configFileName.endsWith(".yaml") || configFileName.endsWith(".yml")) {
return new YamlConfigBuilder(configUrl).build();
}
return new XmlConfigBuilder(configUrl).build();
}
}
@Configuration(proxyBeanMethods = false)