From 991cfbf6e40d75c2a79b54dd2f2054e0274e6cc1 Mon Sep 17 00:00:00 2001 From: Michael Sievers Date: Fri, 4 Dec 2020 15:40:50 +0100 Subject: [PATCH] Replace usage of deprecated StringUtils.isEmpty with !StringUtils.hasLength (#275) * spring-cloud/spring-cloud-zookeeper#274 --- .../config/ZookeeperConfigBootstrapConfiguration.java | 2 +- .../zookeeper/config/ZookeeperConfigDataLocationResolver.java | 4 ++-- .../ZookeeperAutoServiceRegistrationTests.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java index 91e64f87..b50fb5bc 100644 --- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java +++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigBootstrapConfiguration.java @@ -49,7 +49,7 @@ public class ZookeeperConfigBootstrapConfiguration { @ConditionalOnMissingBean public ZookeeperConfigProperties zookeeperConfigProperties(Environment env) { ZookeeperConfigProperties properties = new ZookeeperConfigProperties(); - if (StringUtils.isEmpty(properties.getName())) { + if (!StringUtils.hasLength(properties.getName())) { properties.setName(env.getProperty("spring.application.name", "application")); } return properties; diff --git a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java index f05463e1..cd46ca0d 100644 --- a/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java +++ b/spring-cloud-zookeeper-config/src/main/java/org/springframework/cloud/zookeeper/config/ZookeeperConfigDataLocationResolver.java @@ -106,7 +106,7 @@ public class ZookeeperConfigDataLocationResolver implements ConfigDataLocationRe } protected List getCustomContexts(UriComponents uriComponents) { - if (StringUtils.isEmpty(uriComponents.getPath())) { + if (!StringUtils.hasLength(uriComponents.getPath())) { return Collections.emptyList(); } @@ -134,7 +134,7 @@ public class ZookeeperConfigDataLocationResolver implements ConfigDataLocationRe .bind(ZookeeperConfigProperties.PREFIX, Bindable.of(ZookeeperConfigProperties.class)) .orElse(new ZookeeperConfigProperties()); - if (StringUtils.isEmpty(properties.getName())) { + if (!StringUtils.hasLength(properties.getName())) { properties.setName(binder.bind("spring.application.name", String.class).orElse("application")); } diff --git a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationTests.java b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationTests.java index 1ff96cb1..bc0c692b 100644 --- a/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationTests.java +++ b/spring-cloud-zookeeper-discovery/src/test/java/org/springframework/cloud/zookeeper/serviceregistry/ZookeeperAutoServiceRegistrationTests.java @@ -81,7 +81,7 @@ public class ZookeeperAutoServiceRegistrationTests { * registration.getServiceId(), service.getId()); * assertEquals("service name was wrong", "myTestService1-FF-something", * service.getService()); assertFalse("service address must not be empty", - * StringUtils.isEmpty(service.getAddress())); + * !StringUtils.hasLength(service.getAddress())); * assertEquals("service address must equals hostname from discovery properties", * discoveryProperties.getHostname(), service.getAddress()); */