From 6558e0ee978a5131267b037aaeff385afd5986e0 Mon Sep 17 00:00:00 2001 From: John Blum Date: Tue, 20 Aug 2019 15:00:12 -0700 Subject: [PATCH] Remove all improper uses of the Apache Shiro API and replace with the appropriate core Spring Framework API. For example, usages of org.apache.shiro.util.Assert and org.apache.shiro.util.StringUtils should be replaced with org.springframework.util.Assert and org.springframework.util.StringUtils, respectively. --- .../boot/actuate/GeodeDiskStoresHealthIndicator.java | 3 ++- .../geode/boot/actuate/GeodeIndexesHealthIndicator.java | 3 ++- .../HttpBasicAuthenticationSecurityConfiguration.java | 5 +++-- .../condition/OnMissingPropertyCondition.java | 4 ++-- .../src/test/java/example/app/books/model/ISBN.java | 2 +- .../AutoConfiguredFunctionExecutionsIntegrationTests.java | 8 ++++---- .../java/example/app/temp/service/TemperatureMonitor.java | 2 +- .../near/client/service/support/PhoneNumberGenerator.java | 2 +- .../geode/cache/InlineCachingRegionConfigurer.java | 2 +- .../annotation/DistributedSystemIdConfiguration.java | 4 +++- 10 files changed, 20 insertions(+), 15 deletions(-) diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicator.java index 88c8f144..273c89bd 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeDiskStoresHealthIndicator.java @@ -25,12 +25,13 @@ import java.util.Optional; import java.util.stream.Collectors; import org.apache.geode.cache.DiskStore; -import org.apache.shiro.util.Assert; + import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.util.ArrayUtils; import org.springframework.geode.boot.actuate.health.AbstractGeodeHealthIndicator; +import org.springframework.util.Assert; /** * The {@link GeodeDiskStoresHealthIndicator} class is a Spring Boot {@link HealthIndicator} providing details about diff --git a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicator.java b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicator.java index fed6cf9c..acebde27 100644 --- a/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicator.java +++ b/spring-geode-actuator/src/main/java/org/springframework/geode/boot/actuate/GeodeIndexesHealthIndicator.java @@ -23,11 +23,12 @@ import java.util.Optional; import org.apache.geode.cache.Region; import org.apache.geode.cache.query.Index; import org.apache.geode.cache.query.IndexStatistics; -import org.apache.shiro.util.Assert; + import org.springframework.boot.actuate.health.Health; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.context.ApplicationContext; import org.springframework.geode.boot.actuate.health.AbstractGeodeHealthIndicator; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/HttpBasicAuthenticationSecurityConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/HttpBasicAuthenticationSecurityConfiguration.java index 26d13825..8c569db7 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/HttpBasicAuthenticationSecurityConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/HttpBasicAuthenticationSecurityConfiguration.java @@ -24,8 +24,7 @@ import java.util.Optional; import java.util.function.Function; import org.apache.geode.management.internal.security.ResourceConstants; -import org.apache.shiro.util.Assert; -import org.apache.shiro.util.StringUtils; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.context.annotation.Bean; @@ -41,7 +40,9 @@ import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; +import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; +import org.springframework.util.StringUtils; import org.springframework.web.client.RestTemplate; /** diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/OnMissingPropertyCondition.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/OnMissingPropertyCondition.java index 83feba64..b500f61c 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/OnMissingPropertyCondition.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/condition/OnMissingPropertyCondition.java @@ -22,8 +22,6 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import org.apache.shiro.util.Assert; -import org.apache.shiro.util.StringUtils; import org.springframework.boot.autoconfigure.condition.ConditionMessage; import org.springframework.boot.autoconfigure.condition.ConditionOutcome; import org.springframework.boot.autoconfigure.condition.SpringBootCondition; @@ -32,7 +30,9 @@ import org.springframework.context.annotation.ConditionContext; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.env.PropertyResolver; import org.springframework.core.type.AnnotatedTypeMetadata; +import org.springframework.util.Assert; import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; /** * The {@link OnMissingPropertyCondition} class is a {@link SpringBootCondition}, Spring {@link Condition} type diff --git a/spring-geode-autoconfigure/src/test/java/example/app/books/model/ISBN.java b/spring-geode-autoconfigure/src/test/java/example/app/books/model/ISBN.java index e15b0915..00251127 100644 --- a/spring-geode-autoconfigure/src/test/java/example/app/books/model/ISBN.java +++ b/spring-geode-autoconfigure/src/test/java/example/app/books/model/ISBN.java @@ -17,7 +17,7 @@ package example.app.books.model; import java.util.UUID; -import org.apache.shiro.util.Assert; +import org.springframework.util.Assert; /** * The {@link ISBN} class is a Abstract Data Type (ADT) modeling either a {@link Book} ISBN-10 or ISBN-13 number. diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java index cee50737..269d255e 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java @@ -22,15 +22,14 @@ import java.util.Arrays; import java.util.Iterator; import java.util.Optional; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.execute.FunctionService; + import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.execute.FunctionService; -import org.apache.shiro.util.Assert; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.test.context.SpringBootTest; @@ -41,6 +40,7 @@ import org.springframework.data.gemfire.function.annotation.GemfireFunction; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.geode.boot.autoconfigure.function.executions.Calculator; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.util.Assert; /** * Integration tests testing the auto-configuration of Spring Data for Apache Geode/Pivotal GemFire diff --git a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java index 3203af27..499cda09 100644 --- a/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java +++ b/spring-geode-samples/boot/actuator/src/main/java/example/app/temp/service/TemperatureMonitor.java @@ -18,10 +18,10 @@ package example.app.temp.service; import java.util.Optional; import org.apache.geode.cache.query.CqEvent; -import org.apache.shiro.util.Assert; import org.springframework.context.ApplicationEventPublisher; import org.springframework.data.gemfire.listener.annotation.ContinuousQuery; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import example.app.temp.event.BoilingTemperatureEvent; import example.app.temp.event.FreezingTemperatureEvent; diff --git a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java index b1566aa1..1f8e0f7f 100644 --- a/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java +++ b/spring-geode-samples/caching/near/src/main/java/example/app/caching/near/client/service/support/PhoneNumberGenerator.java @@ -19,7 +19,7 @@ import java.util.Arrays; import java.util.List; import java.util.Random; -import org.apache.shiro.util.StringUtils; +import org.springframework.util.StringUtils; /** * Generates random phone number using a few well-defined area codes. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/InlineCachingRegionConfigurer.java b/spring-geode/src/main/java/org/springframework/geode/cache/InlineCachingRegionConfigurer.java index b0f4f312..e021e885 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/InlineCachingRegionConfigurer.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/InlineCachingRegionConfigurer.java @@ -22,7 +22,6 @@ import java.util.function.Predicate; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheWriter; import org.apache.geode.cache.Region; -import org.apache.shiro.util.Assert; import org.springframework.data.gemfire.PeerRegionFactoryBean; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; @@ -30,6 +29,7 @@ import org.springframework.data.gemfire.config.annotation.RegionConfigurer; import org.springframework.data.repository.CrudRepository; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; +import org.springframework.util.Assert; /** * A {@link RegionConfigurer} implementation used to enable Inline Caching on a designated {@link Region}. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/DistributedSystemIdConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/DistributedSystemIdConfiguration.java index 2b425220..b34091c8 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/DistributedSystemIdConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/DistributedSystemIdConfiguration.java @@ -20,9 +20,10 @@ import java.lang.annotation.Annotation; import java.util.Optional; import org.apache.geode.cache.Cache; -import org.apache.shiro.util.Assert; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; @@ -31,6 +32,7 @@ import org.springframework.core.type.AnnotationMetadata; import org.springframework.data.gemfire.config.annotation.ClientCacheConfigurer; import org.springframework.data.gemfire.config.annotation.PeerCacheConfigurer; import org.springframework.data.gemfire.config.annotation.support.AbstractAnnotationConfigSupport; +import org.springframework.util.Assert; /** * The {@link DistributedSystemIdConfiguration} class is a Spring {@link Configuration} class used to configure