From 65004813b536c92b2172974f75e024909ac45b4c Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 30 May 2018 01:23:33 -0700 Subject: [PATCH] Repackage the codebase under org.springframework.geode. Repackage all Apache Geode extension classes under org.springframework.geode. Repackage all Spring Boot extension classes under org.springframework.geode.boot. Repackage all Spring Boot auto-configuration class under org.springframework.boot.autoconfigure. --- .../CachingProviderAutoConfiguration.java | 6 +++--- .../ClientCacheAutoConfiguration.java | 2 +- .../ClientSecurityAutoConfiguration.java | 17 +++++++++------- .../ContinuousQueryAutoConfiguration.java | 2 +- .../FunctionExecutionAutoConfiguration.java | 4 ++-- ...epositoriesAutoConfigurationRegistrar.java | 4 ++-- .../PeerSecurityAutoConfiguration.java | 6 +++--- .../RepositoriesAutoConfiguration.java | 5 +++-- .../autoconfigure/SslAutoConfiguration.java | 7 ++++--- .../boot}/autoconfigure/package-info.java | 4 ++-- .../cache/support/CacheLoaderSupport.java | 2 +- .../geode/core/env/VcapPropertySource.java | 18 ++++++++++------- .../core/env/support/CloudCacheService.java | 11 ++++++---- .../geode/core/env/support/Service.java | 2 +- .../geode/core/env/support/User.java | 8 ++++---- .../geode/core/util/ObjectUtils.java | 9 +++++---- .../support/AbstractResultCollector.java | 2 +- .../SingleResultReturningCollector.java | 4 ++-- .../support/SecurityManagerProxy.java | 6 ++++-- .../main/resources/META-INF/spring.factories | 20 +++++++++---------- .../example/geode/cache/EchoCacheLoader.java | 4 ++-- ...lientCacheApplicationIntegrationTests.java | 5 +++-- ...ePeerCacheApplicationIntegrationTests.java | 4 ++-- ...AutoConfiguredCachingIntegrationTests.java | 3 ++- ...iguredContinuousQueryIntegrationTests.java | 8 +++++--- ...redFunctionExecutionsIntegrationTests.java | 8 +++++--- .../function/executions/Calculator.java | 2 +- ...onfiguredRepositoriesIntegrationTests.java | 7 ++++--- .../repository/model/Customer.java | 2 +- .../repository/repo/CustomerRepository.java | 6 +++--- .../repository/service/CustomerService.java | 10 +++++----- ...iguredSecurityContextIntegrationTests.java | 4 +++- ...dCloudSecurityContextIntegrationTests.java | 12 +++++------ ...dLocalSecurityContextIntegrationTests.java | 11 +++++----- .../AutoConfiguredSslIntegrationTests.java | 7 ++++--- .../core/env/VcapPropertySourceUnitTests.java | 17 +++++++++++----- .../support/CloudCacheServiceUnitTests.java | 4 ++-- .../core/env/support/ServiceUnitTests.java | 4 ++-- .../geode/core/env/support/UserUnitTests.java | 4 ++-- .../geode/core/util/ObjectUtilsUnitTests.java | 3 ++- .../AbstractResultCollectorUnitTests.java | 4 ++-- ...ngleResultReturningCollectorUnitTests.java | 4 ++-- .../SecurityManagerProxyIntegrationTests.java | 6 +++--- .../SecurityManagerProxyUnitTests.java | 4 ++-- 44 files changed, 158 insertions(+), 124 deletions(-) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/CachingProviderAutoConfiguration.java (94%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/ClientCacheAutoConfiguration.java (97%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/ClientSecurityAutoConfiguration.java (92%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/ContinuousQueryAutoConfiguration.java (97%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/FunctionExecutionAutoConfiguration.java (94%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java (93%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/PeerSecurityAutoConfiguration.java (93%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/RepositoriesAutoConfiguration.java (93%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/SslAutoConfiguration.java (98%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data/geode => geode/boot}/autoconfigure/package-info.java (83%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/cache/support/CacheLoaderSupport.java (95%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/core/env/VcapPropertySource.java (94%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/core/env/support/CloudCacheService.java (96%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/core/env/support/Service.java (96%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/core/env/support/User.java (93%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/core/util/ObjectUtils.java (93%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/function/support/AbstractResultCollector.java (97%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/function/support/SingleResultReturningCollector.java (93%) rename geode-spring-boot-starter/src/main/java/org/springframework/{boot/data => }/geode/security/support/SecurityManagerProxy.java (95%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java (96%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java (97%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/caching/AutoConfiguredCachingIntegrationTests.java (96%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/cq/AutoConfiguredContinuousQueryIntegrationTests.java (96%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/function/AutoConfiguredFunctionExecutionsIntegrationTests.java (93%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/function/executions/Calculator.java (94%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/repository/AutoConfiguredRepositoriesIntegrationTests.java (92%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/repository/model/Customer.java (94%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/repository/repo/CustomerRepository.java (83%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/repository/service/CustomerService.java (84%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java (97%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java (88%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java (87%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data/geode => geode/boot/autoconfigure}/security/ssl/AutoConfiguredSslIntegrationTests.java (95%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/core/env/VcapPropertySourceUnitTests.java (97%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/core/env/support/CloudCacheServiceUnitTests.java (98%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/core/env/support/ServiceUnitTests.java (93%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/core/env/support/UserUnitTests.java (97%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/core/util/ObjectUtilsUnitTests.java (95%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/function/support/AbstractResultCollectorUnitTests.java (96%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/function/support/SingleResultReturningCollectorUnitTests.java (96%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/security/support/SecurityManagerProxyIntegrationTests.java (95%) rename geode-spring-boot-starter/src/test/java/org/springframework/{boot/data => }/geode/security/support/SecurityManagerProxyUnitTests.java (97%) diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/CachingProviderAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java similarity index 94% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/CachingProviderAutoConfiguration.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java index ab5abac0..7115656d 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/CachingProviderAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/CachingProviderAutoConfiguration.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; @@ -41,16 +41,16 @@ import org.springframework.data.gemfire.cache.config.EnableGemfireCaching; * using Apache Geode as the caching provider. * * @author John Blum + * @see javax.annotation.PostConstruct * @see org.apache.geode.cache.GemFireCache * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration * @see org.springframework.boot.autoconfigure.cache.CacheManagerCustomizers * @see org.springframework.boot.autoconfigure.cache.CacheProperties - * @see org.springframework.boot.data.geode.autoconfigure.ClientCacheAutoConfiguration - * @see org.springframework.context.annotation.Configuration * @see org.springframework.cache.CacheManager * @see org.springframework.context.annotation.Configuration * @see org.springframework.data.gemfire.cache.GemfireCacheManager * @see org.springframework.data.gemfire.cache.config.EnableGemfireCaching + * @see org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration * @since 1.0.0 */ @Configuration diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientCacheAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java similarity index 97% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientCacheAutoConfiguration.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java index 0b46b34e..8ba80954 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientCacheAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientCacheAutoConfiguration.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.client.ClientCache; diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientSecurityAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java similarity index 92% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientSecurityAutoConfiguration.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java index ec1f5c78..6a07965e 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ClientSecurityAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import java.util.Optional; import java.util.Properties; @@ -30,9 +30,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatfo import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.cloud.CloudPlatform; -import org.springframework.boot.data.geode.core.env.VcapPropertySource; -import org.springframework.boot.data.geode.core.env.support.CloudCacheService; -import org.springframework.boot.data.geode.core.env.support.Service; import org.springframework.boot.env.EnvironmentPostProcessor; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; @@ -42,6 +39,9 @@ import org.springframework.core.env.PropertiesPropertySource; import org.springframework.data.gemfire.client.ClientCacheFactoryBean; import org.springframework.data.gemfire.config.annotation.EnableSecurity; import org.springframework.data.gemfire.config.annotation.support.AutoConfiguredAuthenticationInitializer; +import org.springframework.geode.core.env.VcapPropertySource; +import org.springframework.geode.core.env.support.CloudCacheService; +import org.springframework.geode.core.env.support.Service; /** * Spring Boot {@link EnableAutoConfiguration auto-configuration} enabling Apache Geode's Security functionality, @@ -54,15 +54,18 @@ import org.springframework.data.gemfire.config.annotation.support.AutoConfigured * @see org.springframework.boot.SpringApplication * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration * @see org.springframework.boot.cloud.CloudPlatform - * @see org.springframework.boot.data.geode.autoconfigure.ClientCacheAutoConfiguration - * @see org.springframework.boot.data.geode.core.env.VcapPropertySource - * @see org.springframework.boot.data.geode.core.env.support.CloudCacheService * @see org.springframework.boot.env.EnvironmentPostProcessor * @see org.springframework.context.annotation.Configuration + * @see org.springframework.core.env.ConfigurableEnvironment * @see org.springframework.core.env.Environment + * @see org.springframework.core.env.PropertiesPropertySource * @see org.springframework.data.gemfire.client.ClientCacheFactoryBean * @see org.springframework.data.gemfire.config.annotation.EnableSecurity * @see org.springframework.data.gemfire.config.annotation.support.AutoConfiguredAuthenticationInitializer + * @see org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration + * @see org.springframework.geode.core.env.VcapPropertySource + * @see org.springframework.geode.core.env.support.CloudCacheService + * @see org.springframework.geode.core.env.support.Service * @since 1.0.0 */ @Configuration diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ContinuousQueryAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java similarity index 97% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ContinuousQueryAutoConfiguration.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java index 431ada8c..e6f1be3a 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/ContinuousQueryAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/ContinuousQueryAutoConfiguration.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import org.apache.geode.cache.client.ClientCache; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/FunctionExecutionAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java similarity index 94% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/FunctionExecutionAutoConfiguration.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java index 7320c6f4..9b0e830a 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/FunctionExecutionAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/FunctionExecutionAutoConfiguration.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import org.apache.geode.cache.GemFireCache; import org.springframework.boot.autoconfigure.AutoConfigureAfter; @@ -34,13 +34,13 @@ import org.springframework.data.gemfire.function.execution.GemfireFunctionOperat * @author John Blum * @see org.apache.geode.cache.GemFireCache * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration - * @see org.springframework.boot.data.geode.autoconfigure.ClientCacheAutoConfiguration * @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.Import * @see org.springframework.data.gemfire.function.config.EnableGemfireFunctions * @see org.springframework.data.gemfire.function.config.EnableGemfireFunctionExecutions * @see org.springframework.data.gemfire.function.config.GemFireFunctionExecutionAutoConfigurationRegistrar * @see org.springframework.data.gemfire.function.execution.GemfireFunctionOperations + * @see org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration * @since 1.0.0 */ @Configuration diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java similarity index 93% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java index e44d59d1..ae6e9c10 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/GemFireRepositoriesAutoConfigurationRegistrar.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import java.lang.annotation.Annotation; @@ -29,9 +29,9 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi * * @author John Blum * @see org.springframework.boot.autoconfigure.data.AbstractRepositoryConfigurationSourceSupport - * @see org.springframework.boot.data.geode.autoconfigure.RepositoriesAutoConfiguration * @see org.springframework.data.gemfire.repository.config.EnableGemfireRepositories * @see org.springframework.data.gemfire.repository.config.GemfireRepositoryConfigurationExtension + * @see org.springframework.geode.boot.autoconfigure.RepositoriesAutoConfiguration * @since 1.0.0 */ public class GemFireRepositoriesAutoConfigurationRegistrar extends AbstractRepositoryConfigurationSourceSupport { diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/PeerSecurityAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java similarity index 93% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/PeerSecurityAutoConfiguration.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java index af846e97..90b02fc7 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/PeerSecurityAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/PeerSecurityAutoConfiguration.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -40,7 +40,7 @@ import org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurit * @see org.springframework.data.gemfire.config.annotation.EnableBeanFactoryLocator * @see org.springframework.data.gemfire.config.annotation.EnableSecurity * @see org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurityConfiguration - * @see org.springframework.data.gemfire.config.annotation.PeerCacheConfigurer + * @see org.springframework.geode.security.support.SecurityManagerProxy * @since 1.0.0 */ @Configuration @@ -51,7 +51,7 @@ import org.springframework.data.gemfire.config.annotation.GeodeIntegratedSecurit GeodeIntegratedSecurityConfiguration.class }) @EnableBeanFactoryLocator -@EnableSecurity(securityManagerClassName = "org.springframework.boot.data.geode.security.support.SecurityManagerProxy") +@EnableSecurity(securityManagerClassName = "org.springframework.geode.security.support.SecurityManagerProxy") @SuppressWarnings("unused") public class PeerSecurityAutoConfiguration { diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/RepositoriesAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java similarity index 93% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/RepositoriesAutoConfiguration.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java index 50b5eb53..430382b7 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/RepositoriesAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import org.apache.geode.cache.Cache; import org.apache.geode.cache.GemFireCache; @@ -48,13 +48,14 @@ import org.springframework.data.gemfire.repository.support.GemfireRepositoryFact * @see org.apache.geode.cache.GemFireCache * @see org.apache.geode.cache.client.ClientCache * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration - * @see org.springframework.boot.data.geode.autoconfigure.GemFireRepositoriesAutoConfigurationRegistrar * @see org.springframework.context.annotation.Configuration * @see org.springframework.context.annotation.Import * @see org.springframework.data.gemfire.repository.GemfireRepository * @see org.springframework.data.gemfire.repository.config.EnableGemfireRepositories * @see org.springframework.data.gemfire.repository.config.GemfireRepositoryConfigurationExtension * @see org.springframework.data.gemfire.repository.support.GemfireRepositoryFactoryBean + * @see org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration + * @see org.springframework.geode.boot.autoconfigure.GemFireRepositoriesAutoConfigurationRegistrar * @since 1.0.0 */ @Configuration diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SslAutoConfiguration.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java similarity index 98% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SslAutoConfiguration.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java index c32f6a1b..c2a73ca5 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/SslAutoConfiguration.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/SslAutoConfiguration.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; import static org.springframework.data.gemfire.util.ArrayUtils.nullSafeArray; @@ -61,16 +61,17 @@ import org.springframework.util.StringUtils; * @see java.io.File * @see java.net.URL * @see java.util.Properties - * @see org.springframework.boot.SpringApplication * @see org.apache.geode.cache.GemFireCache + * @see org.springframework.boot.SpringApplication * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration - * @see org.springframework.boot.data.geode.autoconfigure.ClientCacheAutoConfiguration + * @see org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration * @see org.springframework.boot.env.EnvironmentPostProcessor * @see org.springframework.context.annotation.Condition * @see org.springframework.context.annotation.Conditional * @see org.springframework.context.annotation.Configuration * @see org.springframework.core.env.ConfigurableEnvironment * @see org.springframework.core.env.Environment + * @see org.springframework.core.env.PropertiesPropertySource * @see org.springframework.core.io.Resource * @see org.springframework.data.gemfire.CacheFactoryBean * @see org.springframework.data.gemfire.config.annotation.EnableSsl diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/package-info.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java similarity index 83% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/package-info.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java index b49e8093..d6ff298d 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/autoconfigure/package-info.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java @@ -15,6 +15,6 @@ */ /** - * Spring Boot auto-configuration for Spring Data Geode. + * Spring Boot auto-configuration for Apache Geode & Pivotal GemFire. */ -package org.springframework.boot.data.geode.autoconfigure; +package org.springframework.geode.boot.autoconfigure; diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/cache/support/CacheLoaderSupport.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java similarity index 95% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/cache/support/CacheLoaderSupport.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java index 88f54336..df611aca 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/cache/support/CacheLoaderSupport.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/cache/support/CacheLoaderSupport.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.cache.support; +package org.springframework.geode.cache.support; import org.apache.geode.cache.CacheLoader; diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/VcapPropertySource.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java similarity index 94% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/VcapPropertySource.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java index 1466db95..a1f4b26f 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/VcapPropertySource.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/VcapPropertySource.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.env; +package org.springframework.geode.core.env; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; @@ -30,15 +30,15 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import org.springframework.boot.data.geode.core.env.support.CloudCacheService; -import org.springframework.boot.data.geode.core.env.support.Service; -import org.springframework.boot.data.geode.core.env.support.User; -import org.springframework.boot.data.geode.core.util.ObjectUtils; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.env.Environment; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertySource; +import org.springframework.geode.core.env.support.CloudCacheService; +import org.springframework.geode.core.env.support.Service; +import org.springframework.geode.core.env.support.User; +import org.springframework.geode.core.util.ObjectUtils; import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; @@ -48,12 +48,16 @@ import org.springframework.util.StringUtils; * * @author John Blum * @see java.lang.Iterable + * @see java.net.URL * @see java.util.Properties - * @see org.springframework.boot.data.geode.core.env.support.Service - * @see org.springframework.boot.data.geode.core.env.support.User + * @see java.util.function.Predicate * @see org.springframework.core.env.EnumerablePropertySource * @see org.springframework.core.env.Environment + * @see org.springframework.core.env.PropertiesPropertySource * @see org.springframework.core.env.PropertySource + * @see org.springframework.geode.core.env.support.CloudCacheService + * @see org.springframework.geode.core.env.support.Service + * @see org.springframework.geode.core.env.support.User * @since 1.0.0 */ @SuppressWarnings("unused") diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/CloudCacheService.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java similarity index 96% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/CloudCacheService.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java index b512830e..569a8996 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/CloudCacheService.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.env.support; +package org.springframework.geode.core.env.support; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException; @@ -25,15 +25,18 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -import org.apache.shiro.util.Assert; -import org.springframework.boot.data.geode.core.util.ObjectUtils; import org.springframework.data.gemfire.GemfireUtils; +import org.springframework.geode.core.util.ObjectUtils; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** - * The CloudCacheService class... + * The {@link CloudCacheService} class is an Abstract Data Type (ADT) modeling the Pivotal Cloud Cache service + * in Pivotal CloudFoundry (PCF). * * @author John Blum + * @see java.net.URL + * @see org.springframework.geode.core.env.support.Service * @since 1.0.0 */ public class CloudCacheService extends Service { diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/Service.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/Service.java similarity index 96% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/Service.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/Service.java index c9d9bc89..fe8c18d0 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/Service.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/Service.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.env.support; +package org.springframework.geode.core.env.support; import org.springframework.util.Assert; diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/User.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/User.java similarity index 93% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/User.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/User.java index 74831b0d..a15cdced 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/env/support/User.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/env/support/User.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.env.support; +package org.springframework.geode.core.env.support; import java.util.Arrays; import java.util.Optional; @@ -24,7 +24,7 @@ import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; /** - * The User class... + * The {@link User} class is an Abstract Data Type (ADT) modeling a user in Pivotal CloudFoundry (PCF). * * @author John Blum * @since 1.0.0 @@ -86,7 +86,7 @@ public class User implements Comparable { * Returns an {@link Optional} {@link Role} for this {@link User}. * * @return an {@link Optional} {@link Role} for this {@link User}. - * @see org.springframework.boot.data.geode.core.env.support.User.Role + * @see org.springframework.geode.core.env.support.User.Role * @see java.util.Optional */ public Optional getRole() { @@ -109,7 +109,7 @@ public class User implements Comparable { * * @param role assigned {@link Role} of this {@link User}. * @return this {@link User}. - * @see org.springframework.boot.data.geode.core.env.support.User + * @see org.springframework.geode.core.env.support.User */ public User withRole(Role role) { this.role = role; diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/util/ObjectUtils.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/util/ObjectUtils.java similarity index 93% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/util/ObjectUtils.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/core/util/ObjectUtils.java index 83d12510..ced604b4 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/core/util/ObjectUtils.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/core/util/ObjectUtils.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.util; +package org.springframework.geode.core.util; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; @@ -24,9 +24,10 @@ import org.slf4j.LoggerFactory; import org.springframework.lang.Nullable; /** - * The ObjectUtils class... + * The {@link ObjectUtils} class is an abstract utility class with operations for {@link Object objects}. * * @author John Blum + * @see java.lang.Object * @since 1.0.0 */ @SuppressWarnings("all") @@ -43,7 +44,7 @@ public abstract class ObjectUtils extends org.springframework.util.ObjectUtils { * @param operation {@link ExceptionThrowingOperation} to execute. * @return the result of the given {@link ExceptionThrowingOperation} or throw an {@link IllegalStateException} * wrapping the checked {@link Exception} thrown by the operation. - * @see org.springframework.boot.data.geode.core.util.ObjectUtils.ExceptionThrowingOperation + * @see org.springframework.geode.core.util.ObjectUtils.ExceptionThrowingOperation * @see #doOperationSafely(ExceptionThrowingOperation, Object) */ @Nullable @@ -64,7 +65,7 @@ public abstract class ObjectUtils extends org.springframework.util.ObjectUtils { * the checked {@link Exception} if the {@link Object default value} is {@literal null}. * @throws IllegalStateException if the {@link ExceptionThrowingOperation} throws a checked {@link Exception} * and {@link Object default value} is {@literal null}. - * @see org.springframework.boot.data.geode.core.util.ObjectUtils.ExceptionThrowingOperation + * @see org.springframework.geode.core.util.ObjectUtils.ExceptionThrowingOperation * @see #returnValueThrowOnNull(Object, RuntimeException) */ @Nullable diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/function/support/AbstractResultCollector.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java similarity index 97% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/function/support/AbstractResultCollector.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java index d06ec47e..3e0148c2 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/function/support/AbstractResultCollector.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/AbstractResultCollector.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.function.support; +package org.springframework.geode.function.support; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/function/support/SingleResultReturningCollector.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java similarity index 93% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/function/support/SingleResultReturningCollector.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java index 391e7a73..7b3d96da 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/function/support/SingleResultReturningCollector.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/function/support/SingleResultReturningCollector.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.function.support; +package org.springframework.geode.function.support; import java.util.Collections; import java.util.Iterator; @@ -29,7 +29,7 @@ import org.apache.geode.distributed.DistributedMember; * * @author John Blum * @see org.apache.geode.cache.execute.ResultCollector - * @see org.springframework.boot.data.geode.function.support.AbstractResultCollector + * @see org.springframework.geode.function.support.AbstractResultCollector * @since 1.0.0 */ @SuppressWarnings("unused") diff --git a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxy.java b/geode-spring-boot-starter/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java similarity index 95% rename from geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxy.java rename to geode-spring-boot-starter/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java index 9d8d727b..928bc96a 100644 --- a/geode-spring-boot-starter/src/main/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxy.java +++ b/geode-spring-boot-starter/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.security.support; +package org.springframework.geode.security.support; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; @@ -41,7 +41,7 @@ import org.springframework.util.Assert; * Therefore, this implementation allows a developer to set the Apache Geode System property using this proxy... * * - * gemfire.security-manager=org.springframework.boot.data.geode.security.support.SecurityManagerProxy + * gemfire.security-manager=org.springframework.geode.security.support.SecurityManagerProxy * * * And then declare and define a bean in the Spring context implementing the @@ -61,7 +61,9 @@ import org.springframework.util.Assert; * * * @author John Blum + * @see org.apache.geode.security.ResourcePermission * @see org.apache.geode.security.SecurityManager + * @see org.springframework.beans.factory.annotation.Autowired * @see org.springframework.data.gemfire.support.LazyWiringDeclarableSupport * @since 1.0.0 */ diff --git a/geode-spring-boot-starter/src/main/resources/META-INF/spring.factories b/geode-spring-boot-starter/src/main/resources/META-INF/spring.factories index 2baffaba..22298234 100644 --- a/geode-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/geode-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,15 +1,15 @@ # Auto Configuration org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -org.springframework.boot.data.geode.autoconfigure.ClientCacheAutoConfiguration,\ -org.springframework.boot.data.geode.autoconfigure.CachingProviderAutoConfiguration,\ -org.springframework.boot.data.geode.autoconfigure.ClientSecurityAutoConfiguration,\ -org.springframework.boot.data.geode.autoconfigure.ContinuousQueryAutoConfiguration,\ -org.springframework.boot.data.geode.autoconfigure.FunctionExecutionAutoConfiguration,\ -org.springframework.boot.data.geode.autoconfigure.PeerSecurityAutoConfiguration,\ -org.springframework.boot.data.geode.autoconfigure.RepositoriesAutoConfiguration,\ -org.springframework.boot.data.geode.autoconfigure.SslAutoConfiguration +org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration,\ +org.springframework.geode.boot.autoconfigure.CachingProviderAutoConfiguration,\ +org.springframework.geode.boot.autoconfigure.ClientSecurityAutoConfiguration,\ +org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration,\ +org.springframework.geode.boot.autoconfigure.FunctionExecutionAutoConfiguration,\ +org.springframework.geode.boot.autoconfigure.PeerSecurityAutoConfiguration,\ +org.springframework.geode.boot.autoconfigure.RepositoriesAutoConfiguration,\ +org.springframework.geode.boot.autoconfigure.SslAutoConfiguration # Environment Post Processing org.springframework.boot.env.EnvironmentPostProcessor=\ -org.springframework.boot.data.geode.autoconfigure.ClientSecurityAutoConfiguration.AutoConfiguredCloudSecurityEnvironmentPostProcessor,\ -org.springframework.boot.data.geode.autoconfigure.SslAutoConfiguration.SslEnvironmentPostProcessor +org.springframework.geode.boot.autoconfigure.ClientSecurityAutoConfiguration.AutoConfiguredCloudSecurityEnvironmentPostProcessor,\ +org.springframework.geode.boot.autoconfigure.SslAutoConfiguration.SslEnvironmentPostProcessor diff --git a/geode-spring-boot-starter/src/test/java/example/geode/cache/EchoCacheLoader.java b/geode-spring-boot-starter/src/test/java/example/geode/cache/EchoCacheLoader.java index 0d821f8d..ba984fa4 100644 --- a/geode-spring-boot-starter/src/test/java/example/geode/cache/EchoCacheLoader.java +++ b/geode-spring-boot-starter/src/test/java/example/geode/cache/EchoCacheLoader.java @@ -19,13 +19,13 @@ package example.geode.cache; import org.apache.geode.cache.CacheLoader; import org.apache.geode.cache.CacheLoaderException; import org.apache.geode.cache.LoaderHelper; -import org.springframework.boot.data.geode.cache.support.CacheLoaderSupport; +import org.springframework.geode.cache.support.CacheLoaderSupport; /** * The {@link EchoCacheLoader} class is an implementation of {@link CacheLoader} that echos the key as the value. * * @author John Blum - * @see org.springframework.boot.data.geode.cache.support.CacheLoaderSupport + * @see org.springframework.geode.cache.support.CacheLoaderSupport * @since 1.0.0 */ @SuppressWarnings("unused") diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java similarity index 96% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java index 456cf3d6..2780b430 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/client/SpringBootApacheGeodeClientCacheApplicationIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.cache.client; +package org.springframework.geode.boot.autoconfigure.cache.client; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; @@ -47,8 +47,9 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.Region * @see org.apache.geode.cache.client.ClientCache * @see org.springframework.boot.autoconfigure.SpringBootApplication - * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.boot.test.context.SpringBootTest + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport + * @see org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java similarity index 97% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java index 50fa9e69..0d8bfa76 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cache/peer/SpringBootApacheGeodePeerCacheApplicationIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.cache.peer; +package org.springframework.geode.boot.autoconfigure.cache.peer; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; @@ -45,8 +45,8 @@ import org.springframework.test.context.junit4.SpringRunner; * @author John Blum * @see org.junit.Test * @see org.apache.geode.cache.Cache + * @see org.apache.geode.cache.GemFireCache * @see org.apache.geode.cache.Region - * @see org.apache.geode.cache.client.ClientCache * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.config.annotation.PeerCacheApplication diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/caching/AutoConfiguredCachingIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java similarity index 96% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/caching/AutoConfiguredCachingIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java index d2b30d1c..95c4308c 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/caching/AutoConfiguredCachingIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.caching; +package org.springframework.geode.boot.autoconfigure.caching; import static org.assertj.core.api.Assertions.assertThat; @@ -50,6 +50,7 @@ import example.app.service.support.CachingBookService; * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.config.annotation.EnableCachingDefinedRegions * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport + * @see org.springframework.geode.boot.autoconfigure.CachingProviderAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cq/AutoConfiguredContinuousQueryIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java similarity index 96% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cq/AutoConfiguredContinuousQueryIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java index 1457a700..0cd3b93d 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/cq/AutoConfiguredContinuousQueryIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.cq; +package org.springframework.geode.boot.autoconfigure.cq; import static org.assertj.core.api.Assertions.assertThat; @@ -52,21 +52,23 @@ import example.geode.query.cq.event.TemperatureReading; import example.geode.query.cq.event.TemperatureReadingsContinuousQueriesHandler; /** - * Integration tests testing the auto-configuration of Apache Geode/Pivotal GemFire Continuous Query functionality. + * Integration tests testing the auto-configuration of Apache Geode/Pivotal GemFire Continuous Query. * * @author John Blum * @see org.junit.Test * @see org.apache.geode.cache.GemFireCache * @see org.apache.geode.cache.Region * @see org.springframework.boot.autoconfigure.SpringBootApplication - * @see org.springframework.boot.data.geode.autoconfigure.ContinuousQueryAutoConfiguration * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.context.annotation.AnnotationConfigApplicationContext * @see org.springframework.context.annotation.Bean * @see org.springframework.data.gemfire.config.annotation.CacheServerApplication * @see org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport * @see org.springframework.data.gemfire.tests.integration.config.SubscriptionEnabledClientServerIntegrationTestsConfiguration + * @see org.springframework.geode.boot.autoconfigure.ContinuousQueryAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner + * @see example.geode.query.cq.event.TemperatureReading + * @see example.geode.query.cq.event.TemperatureReadingsContinuousQueriesHandler * @since 1.0.0 */ @RunWith(SpringRunner.class) diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/AutoConfiguredFunctionExecutionsIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java similarity index 93% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/AutoConfiguredFunctionExecutionsIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java index 9a8955be..be9f4dd9 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/AutoConfiguredFunctionExecutionsIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.function; +package org.springframework.geode.boot.autoconfigure.function; import static org.assertj.core.api.Assertions.assertThat; @@ -32,13 +32,13 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.data.geode.function.executions.Calculator; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.config.annotation.EnableGemFireProperties; import org.springframework.data.gemfire.config.annotation.EnableLogging; 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; /** @@ -50,10 +50,12 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.apache.geode.cache.GemFireCache * @see org.apache.geode.cache.execute.FunctionService * @see org.springframework.boot.autoconfigure.SpringBootApplication - * @see org.springframework.boot.data.geode.function.executions.Calculator * @see org.springframework.boot.test.context.SpringBootTest + * @see org.springframework.context.annotation.Bean * @see org.springframework.data.gemfire.function.annotation.GemfireFunction * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport + * @see org.springframework.geode.boot.autoconfigure.function.executions.Calculator + * @see org.springframework.geode.boot.autoconfigure.FunctionExecutionAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/executions/Calculator.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java similarity index 94% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/executions/Calculator.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java index 0ca2a3e9..bf0b6a63 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/executions/Calculator.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.function.executions; +package org.springframework.geode.boot.autoconfigure.function.executions; import org.springframework.data.gemfire.function.annotation.OnMember; diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/AutoConfiguredRepositoriesIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java similarity index 92% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/AutoConfiguredRepositoriesIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java index 04633984..07647c26 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/AutoConfiguredRepositoriesIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.repository; +package org.springframework.geode.boot.autoconfigure.repository; import static org.assertj.core.api.Assertions.assertThat; @@ -28,13 +28,13 @@ import org.junit.runner.RunWith; import org.junit.runners.MethodSorters; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.data.geode.repository.model.Customer; -import org.springframework.boot.data.geode.repository.service.CustomerService; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions; import org.springframework.data.gemfire.config.annotation.EnableLogging; import org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport; import org.springframework.data.gemfire.util.RegionUtils; +import org.springframework.geode.boot.autoconfigure.repository.model.Customer; +import org.springframework.geode.boot.autoconfigure.repository.service.CustomerService; import org.springframework.test.context.junit4.SpringRunner; /** @@ -48,6 +48,7 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.config.annotation.EnableEntityDefinedRegions * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport + * @see org.springframework.geode.boot.autoconfigure.RepositoriesAutoConfiguration * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/model/Customer.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java similarity index 94% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/model/Customer.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java index 6b80cf26..316c9445 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/model/Customer.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/model/Customer.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.repository.model; +package org.springframework.geode.boot.autoconfigure.repository.model; import org.springframework.data.annotation.Id; import org.springframework.data.gemfire.mapping.annotation.Region; diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/repo/CustomerRepository.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java similarity index 83% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/repo/CustomerRepository.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java index 0fec71a3..326139a0 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/repo/CustomerRepository.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java @@ -14,18 +14,18 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.repository.repo; +package org.springframework.geode.boot.autoconfigure.repository.repo; -import org.springframework.boot.data.geode.repository.model.Customer; import org.springframework.data.repository.CrudRepository; +import org.springframework.geode.boot.autoconfigure.repository.model.Customer; /** * The {@link CustomerRepository} interface defines a Spring Data {@link CrudRepository} for performing basic CRUD * and simple query data access operations on {@link Customer} objects stored in Apache Geode or Pivotal GemFire. * * @author John Blum - * @see org.springframework.boot.data.geode.repository.model.Customer * @see org.springframework.data.repository.CrudRepository + * @see org.springframework.geode.boot.autoconfigure.repository.model.Customer * @since 1.0.0 */ public interface CustomerRepository extends CrudRepository { diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/service/CustomerService.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java similarity index 84% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/service/CustomerService.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java index d8a4d774..ee0dc469 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/repository/service/CustomerService.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/repository/service/CustomerService.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.repository.service; +package org.springframework.geode.boot.autoconfigure.repository.service; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalArgumentException; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newIllegalStateException; @@ -22,16 +22,16 @@ import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newI import java.util.Optional; import java.util.concurrent.atomic.AtomicLong; -import org.springframework.boot.data.geode.repository.model.Customer; -import org.springframework.boot.data.geode.repository.repo.CustomerRepository; +import org.springframework.geode.boot.autoconfigure.repository.model.Customer; +import org.springframework.geode.boot.autoconfigure.repository.repo.CustomerRepository; import org.springframework.stereotype.Service; /** * The {@link CustomerService} class is an application service for managing {@link Customer Customers}. * * @author John Blum - * @see org.springframework.boot.data.geode.repository.model.Customer - * @see org.springframework.boot.data.geode.repository.repo.CustomerRepository + * @see org.springframework.geode.boot.autoconfigure.repository.model.Customer + * @see org.springframework.geode.boot.autoconfigure.repository.repo.CustomerRepository * @see org.springframework.stereotype.Service * @since 1.0.0 */ diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java similarity index 97% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java index 1b0a531c..08f6eda3 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/AbstractAutoConfiguredSecurityContextIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.security.auth; +package org.springframework.geode.boot.autoconfigure.security.auth; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.data.gemfire.config.annotation.support.AutoConfiguredAuthenticationInitializer.SECURITY_PASSWORD_PROPERTY; @@ -58,6 +58,8 @@ import lombok.ToString; * @author John Blum * @see java.security.Principal * @see org.apache.geode.cache.GemFireCache + * @see org.apache.geode.security.ResourcePermission + * @see org.springframework.core.env.Environment * @see org.springframework.data.gemfire.GemfireTemplate * @see org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport * @since 1.0.0 diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java similarity index 88% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java index e36264a6..7dba9cb6 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.security.auth.cloud; +package org.springframework.geode.boot.autoconfigure.security.auth.cloud; import java.io.IOException; import java.util.Properties; @@ -24,13 +24,13 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.data.geode.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.io.ClassPathResource; import org.springframework.data.gemfire.config.annotation.CacheServerApplication; import org.springframework.data.gemfire.config.annotation.EnableLocator; import org.springframework.data.gemfire.config.annotation.EnableLogging; import org.springframework.data.gemfire.support.GemfireBeanFactoryLocatorProxy; +import org.springframework.geode.boot.autoconfigure.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests; import org.springframework.test.context.junit4.SpringRunner; /** @@ -39,18 +39,18 @@ import org.springframework.test.context.junit4.SpringRunner; * * @author John Blum * @see java.security.Principal + * @see java.util.Properties * @see org.junit.Test * @see org.apache.geode.cache.GemFireCache * @see org.springframework.boot.SpringApplication * @see org.springframework.boot.autoconfigure.SpringBootApplication - * @see org.springframework.boot.data.geode.autoconfigure.ClientSecurityAutoConfiguration - * @see org.springframework.boot.data.geode.autoconfigure.PeerSecurityAutoConfiguration - * @see org.springframework.boot.data.geode.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.data.gemfire.config.annotation.CacheServerApplication * @see org.springframework.data.gemfire.config.annotation.EnableLocator * @see org.springframework.data.gemfire.config.annotation.EnableSecurity - * @see org.springframework.test.context.ActiveProfiles + * @see org.springframework.geode.boot.autoconfigure.ClientSecurityAutoConfiguration + * @see org.springframework.geode.boot.autoconfigure.PeerSecurityAutoConfiguration + * @see org.springframework.geode.boot.autoconfigure.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java similarity index 87% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java index c8688041..d44974fb 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.security.auth.local; +package org.springframework.geode.boot.autoconfigure.security.auth.local; import java.io.IOException; @@ -23,13 +23,13 @@ import org.junit.BeforeClass; import org.junit.runner.RunWith; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.data.geode.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Import; import org.springframework.data.gemfire.config.annotation.CacheServerApplication; import org.springframework.data.gemfire.config.annotation.EnableLogging; import org.springframework.data.gemfire.support.GemfireBeanFactoryLocatorProxy; import org.springframework.data.gemfire.tests.integration.config.ClientServerIntegrationTestsConfiguration; +import org.springframework.geode.boot.autoconfigure.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; @@ -38,18 +38,19 @@ import org.springframework.test.context.junit4.SpringRunner; * authentication/authorization in a local, non-managed context. * * @author John Blum + * @see java.security.Principal * @see org.junit.Test * @see org.apache.geode.cache.GemFireCache * @see org.springframework.boot.SpringApplication * @see org.springframework.boot.autoconfigure.SpringBootApplication - * @see org.springframework.boot.data.geode.autoconfigure.ClientSecurityAutoConfiguration - * @see org.springframework.boot.data.geode.autoconfigure.PeerSecurityAutoConfiguration - * @see org.springframework.boot.data.geode.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests * @see org.springframework.boot.test.context.SpringBootTest * @see org.springframework.context.annotation.Import * @see org.springframework.data.gemfire.config.annotation.CacheServerApplication * @see org.springframework.data.gemfire.config.annotation.EnableSecurity * @see org.springframework.data.gemfire.tests.integration.config.ClientServerIntegrationTestsConfiguration + * @see org.springframework.geode.boot.autoconfigure.ClientSecurityAutoConfiguration + * @see org.springframework.geode.boot.autoconfigure.PeerSecurityAutoConfiguration + * @see org.springframework.geode.boot.autoconfigure.security.auth.AbstractAutoConfiguredSecurityContextIntegrationTests * @see org.springframework.test.context.ActiveProfiles * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/ssl/AutoConfiguredSslIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java similarity index 95% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/ssl/AutoConfiguredSslIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java index 9abd8470..ea383a95 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/ssl/AutoConfiguredSslIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.security.ssl; +package org.springframework.geode.boot.autoconfigure.security.ssl; import static org.assertj.core.api.Assertions.assertThat; @@ -51,12 +51,13 @@ import example.echo.config.EchoServerConfiguration; * @see org.apache.geode.cache.Region * @see org.springframework.boot.autoconfigure.SpringBootApplication * @see org.springframework.boot.test.context.SpringBootTest - * @see org.springframework.context.annotation.Bean - * @see org.springframework.core.io.Resource + * @see org.springframework.context.annotation.Import + * @see org.springframework.data.gemfire.GemfireTemplate * @see org.springframework.data.gemfire.config.annotation.CacheServerApplication * @see org.springframework.data.gemfire.config.annotation.EnableSsl * @see org.springframework.data.gemfire.tests.integration.ForkingClientServerIntegrationTestsSupport * @see org.springframework.data.gemfire.tests.integration.config.ClientServerIntegrationTestsConfiguration + * @see org.springframework.test.context.ActiveProfiles * @see org.springframework.test.context.junit4.SpringRunner * @since 1.0.0 */ diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/VcapPropertySourceUnitTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java similarity index 97% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/VcapPropertySourceUnitTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java index 1dd6e3af..133f328c 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/VcapPropertySourceUnitTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/VcapPropertySourceUnitTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.env; +package org.springframework.geode.core.env; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyString; @@ -34,20 +34,27 @@ import java.util.Properties; import java.util.Set; import org.junit.Test; -import org.springframework.boot.data.geode.core.env.support.CloudCacheService; -import org.springframework.boot.data.geode.core.env.support.Service; -import org.springframework.boot.data.geode.core.env.support.User; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.env.Environment; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.env.PropertySource; +import org.springframework.geode.core.env.support.CloudCacheService; +import org.springframework.geode.core.env.support.Service; +import org.springframework.geode.core.env.support.User; /** - * The VcapPropertySourceUnitTests class... + * Unit tests for {@link VcapPropertySource}. * * @author John Blum + * @see java.util.Properties + * @see org.junit.Test + * @see org.mockito.Mockito + * @see org.springframework.core.env.Environment + * @see org.springframework.core.env.PropertiesPropertySource + * @see org.springframework.core.env.PropertySource + * @see org.springframework.geode.core.env.VcapPropertySource * @since 1.0.0 */ public class VcapPropertySourceUnitTests { diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/CloudCacheServiceUnitTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java similarity index 98% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/CloudCacheServiceUnitTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java index 05eca252..91c42659 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/CloudCacheServiceUnitTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/CloudCacheServiceUnitTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.env.support; +package org.springframework.geode.core.env.support; import static org.assertj.core.api.Assertions.assertThat; @@ -28,7 +28,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.boot.data.geode.core.env.support.CloudCacheService + * @see org.springframework.geode.core.env.support.CloudCacheService * @since 1.0.0 */ public class CloudCacheServiceUnitTests { diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/ServiceUnitTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java similarity index 93% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/ServiceUnitTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java index 43d530a3..98c3334f 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/ServiceUnitTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/ServiceUnitTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.env.support; +package org.springframework.geode.core.env.support; import static org.assertj.core.api.Assertions.assertThat; @@ -25,7 +25,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.boot.data.geode.core.env.support.Service + * @see org.springframework.geode.core.env.support.Service * @since 1.0.0 */ public class ServiceUnitTests { diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/UserUnitTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java similarity index 97% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/UserUnitTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java index 88ec4769..f3112e4c 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/env/support/UserUnitTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/env/support/UserUnitTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.env.support; +package org.springframework.geode.core.env.support; import static org.assertj.core.api.Assertions.assertThat; @@ -27,7 +27,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.boot.data.geode.core.env.support.User + * @see org.springframework.geode.core.env.support.User * @since 1.0.0 */ public class UserUnitTests { diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/util/ObjectUtilsUnitTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java similarity index 95% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/util/ObjectUtilsUnitTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java index da3fb592..c4ca24d6 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/core/util/ObjectUtilsUnitTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/core/util/ObjectUtilsUnitTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.core.util; +package org.springframework.geode.core.util; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.data.gemfire.util.RuntimeExceptionFactory.newRuntimeException; @@ -26,6 +26,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test + * @see org.springframework.geode.core.util.ObjectUtils * @since 1.0.0 */ public class ObjectUtilsUnitTests { diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/support/AbstractResultCollectorUnitTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java similarity index 96% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/support/AbstractResultCollectorUnitTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java index a09243d3..ad9dabad 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/support/AbstractResultCollectorUnitTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/AbstractResultCollectorUnitTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.function.support; +package org.springframework.geode.function.support; import static org.assertj.core.api.Assertions.assertThat; @@ -33,7 +33,7 @@ import org.junit.Test; * * @author John Blum * @see org.junit.Test - * @see org.springframework.boot.data.geode.function.support.AbstractResultCollector + * @see org.springframework.geode.function.support.AbstractResultCollector * @since 1.0.0 */ public class AbstractResultCollectorUnitTests { diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/support/SingleResultReturningCollectorUnitTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java similarity index 96% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/support/SingleResultReturningCollectorUnitTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java index ad652695..3967327a 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/function/support/SingleResultReturningCollectorUnitTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/function/support/SingleResultReturningCollectorUnitTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.function.support; +package org.springframework.geode.function.support; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -37,7 +37,7 @@ import org.mockito.junit.MockitoJUnitRunner; * @see org.mockito.Mock * @see org.mockito.Mockito * @see org.mockito.junit.MockitoJUnitRunner - * @see org.springframework.boot.data.geode.function.support.SingleResultReturningCollector + * @see org.springframework.geode.function.support.SingleResultReturningCollector * @since 1.0.0 */ @RunWith(MockitoJUnitRunner.class) diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyIntegrationTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java similarity index 95% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyIntegrationTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java index e3876b1b..a951d650 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyIntegrationTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyIntegrationTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.security.support; +package org.springframework.geode.security.support; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -42,9 +42,9 @@ import org.springframework.test.context.junit4.SpringRunner; * @see org.springframework.context.annotation.Bean * @see org.springframework.data.gemfire.config.annotation.EnableSecurity * @see org.springframework.data.gemfire.config.annotation.PeerCacheApplication + * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @see org.springframework.test.context.ContextConfiguration * @see org.springframework.test.context.junit4.SpringRunner - * @see org.springframework.data.gemfire.tests.integration.IntegrationTestsSupport * @since 1.0.0 */ @RunWith(SpringRunner.class) @@ -70,7 +70,7 @@ public class SecurityManagerProxyIntegrationTests extends IntegrationTestsSuppor @PeerCacheApplication(logLevel = GEMFIRE_LOG_LEVEL, useBeanFactoryLocator = true) @EnableSecurity(securityManagerClassName = - "org.springframework.boot.data.geode.security.support.SecurityManagerProxy") + "org.springframework.geode.security.support.SecurityManagerProxy") static class TestConfiguration { @Bean diff --git a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyUnitTests.java b/geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java similarity index 97% rename from geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyUnitTests.java rename to geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java index 93e18cea..40b9ef9e 100644 --- a/geode-spring-boot-starter/src/test/java/org/springframework/boot/data/geode/security/support/SecurityManagerProxyUnitTests.java +++ b/geode-spring-boot-starter/src/test/java/org/springframework/geode/security/support/SecurityManagerProxyUnitTests.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package org.springframework.boot.data.geode.security.support; +package org.springframework.geode.security.support; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -37,7 +37,7 @@ import org.junit.Test; * @see java.security.Principal * @see org.junit.Test * @see org.mockito.Mockito - * @see org.springframework.boot.data.geode.security.support.SecurityManagerProxy + * @see org.springframework.geode.security.support.SecurityManagerProxy * @since 1.0.0 */ public class SecurityManagerProxyUnitTests {