Skip to content

Commit 315c300

Browse files
committed
Replace use of Apache Shiro StringUtils with Spring Framework StringUtils.
1 parent 28080cc commit 315c300

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/extensions/spring/context/annotation/DependencyOfBeanFactoryPostProcessor.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
import java.lang.annotation.Annotation;
1919
import java.util.Optional;
2020

21-
import org.apache.shiro.util.StringUtils;
22-
2321
import org.springframework.beans.BeansException;
2422
import org.springframework.beans.factory.config.BeanDefinition;
2523
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
@@ -30,6 +28,7 @@
3028
import org.springframework.data.gemfire.util.ArrayUtils;
3129
import org.springframework.lang.NonNull;
3230
import org.springframework.lang.Nullable;
31+
import org.springframework.util.StringUtils;
3332

3433
/**
3534
* Spring {@link BeanFactoryPostProcessor} implementation used to post process {@link BeanDefinition BeanDefinitions}

spring-data-geode-test/src/main/java/org/springframework/data/gemfire/tests/integration/IntegrationTestsSupport.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import java.util.function.Function;
3838
import java.util.function.Predicate;
3939
import java.util.function.Supplier;
40-
import java.util.stream.Collectors;
4140

4241
import org.junit.AfterClass;
4342
import org.junit.Before;
@@ -56,8 +55,6 @@
5655
import org.apache.geode.internal.net.SSLConfigurationFactory;
5756
import org.apache.geode.internal.net.SocketCreatorFactory;
5857

59-
import org.apache.shiro.util.StringUtils;
60-
6158
import org.springframework.beans.factory.annotation.Autowired;
6259
import org.springframework.context.ApplicationContext;
6360
import org.springframework.context.ApplicationEvent;
@@ -80,6 +77,7 @@
8077
import org.springframework.lang.Nullable;
8178
import org.springframework.util.Assert;
8279
import org.springframework.util.ReflectionUtils;
80+
import org.springframework.util.StringUtils;
8381

8482
/**
8583
* The {@link IntegrationTestsSupport} class is an abstract base class supporting integration tests
@@ -235,7 +233,7 @@ public static void clearAllJavaGemFireGeodeAndSpringDotPrefixedSystemProperties(
235233

236234
List<String> allSystemPropertyNames = System.getProperties().stringPropertyNames().stream()
237235
.filter(ALL_SYSTEM_PROPERTIES_NAME_PREDICATE)
238-
.collect(Collectors.toList());
236+
.toList();
239237

240238
allSystemPropertyNames.forEach(System::clearProperty);
241239
}

0 commit comments

Comments
 (0)