"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientConfiguration.java" between
spring-boot-2.7.3.tar.gz and spring-boot-2.7.4.tar.gz

About: Spring Boot helps to create Spring-powered, production-grade applications and services.

HazelcastClientConfiguration.java  (spring-boot-2.7.3):HazelcastClientConfiguration.java  (spring-boot-2.7.4)
/* /*
* Copyright 2012-2021 the original author or authors. * Copyright 2012-2022 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* https://www.apache.org/licenses/LICENSE-2.0 * https://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
skipping to change at line 75 skipping to change at line 75
throws IOException { throws IOException {
Resource configLocation = properties.resolveConfigLocatio n(); Resource configLocation = properties.resolveConfigLocatio n();
ClientConfig config = (configLocation != null) ? loadClie ntConfig(configLocation) : ClientConfig.load(); ClientConfig config = (configLocation != null) ? loadClie ntConfig(configLocation) : ClientConfig.load();
config.setClassLoader(resourceLoader.getClassLoader()); config.setClassLoader(resourceLoader.getClassLoader());
return getHazelcastInstance(config); return getHazelcastInstance(config);
} }
private ClientConfig loadClientConfig(Resource configLocation) th rows IOException { private ClientConfig loadClientConfig(Resource configLocation) th rows IOException {
URL configUrl = configLocation.getURL(); URL configUrl = configLocation.getURL();
String configFileName = configUrl.getPath(); String configFileName = configUrl.getPath();
if (configFileName.endsWith(".yaml")) { if (configFileName.endsWith(".yaml") || configFileName.en dsWith(".yml")) {
return new YamlClientConfigBuilder(configUrl).bui ld(); return new YamlClientConfigBuilder(configUrl).bui ld();
} }
return new XmlClientConfigBuilder(configUrl).build(); return new XmlClientConfigBuilder(configUrl).build();
} }
} }
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
@ConditionalOnSingleCandidate(ClientConfig.class) @ConditionalOnSingleCandidate(ClientConfig.class)
static class HazelcastClientConfigConfiguration { static class HazelcastClientConfigConfiguration {
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)