Skip to content

Commit 3028054

Browse files
committed
feat: Removes Optional / StringUtil
1 parent fd5a363 commit 3028054

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

spring-cloud-loadbalancer/src/main/java/org/springframework/cloud/loadbalancer/config/LoadBalancerAutoConfiguration.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
import java.util.Collections;
2020
import java.util.List;
21-
import java.util.Optional;
22-
23-
import io.netty.util.internal.StringUtil;
2421

2522
import org.springframework.beans.factory.ObjectProvider;
2623
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -48,9 +45,9 @@
4845
*/
4946
@Configuration(proxyBeanMethods = false)
5047
@LoadBalancerClients
51-
@EnableConfigurationProperties({ LoadBalancerClientsProperties.class, LoadBalancerEagerLoadProperties.class })
52-
@AutoConfigureBefore({ ReactorLoadBalancerClientAutoConfiguration.class,
53-
LoadBalancerBeanPostProcessorAutoConfiguration.class })
48+
@EnableConfigurationProperties({LoadBalancerClientsProperties.class, LoadBalancerEagerLoadProperties.class})
49+
@AutoConfigureBefore({ReactorLoadBalancerClientAutoConfiguration.class,
50+
LoadBalancerBeanPostProcessorAutoConfiguration.class})
5451
@ConditionalOnProperty(value = "spring.cloud.loadbalancer.enabled", havingValue = "true", matchIfMissing = true)
5552
public class LoadBalancerAutoConfiguration {
5653

@@ -60,8 +57,8 @@ public class LoadBalancerAutoConfiguration {
6057
@ConditionalOnMissingBean
6158
public LoadBalancerZoneConfig zoneConfig(Environment environment) {
6259
return new LoadBalancerZoneConfig(environment.getProperty("spring.cloud.loadbalancer.zone"),
63-
List.of(Optional.ofNullable(environment.getProperty("spring.cloud.loadbalancer.secondary-zones"))
64-
.orElse(StringUtil.EMPTY_STRING).split(ZONE_SPLITTER_COMMA)));
60+
List.of(environment.getProperty("spring.cloud.loadbalancer.secondary-zones", "")
61+
.split(ZONE_SPLITTER_COMMA)));
6562
}
6663

6764
@ConditionalOnMissingBean

0 commit comments

Comments
 (0)