diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/cache/SimpleCacheResolver.java b/apache-geode-extensions/src/main/java/org/springframework/geode/cache/SimpleCacheResolver.java index 0153de5f..f8bd1636 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/cache/SimpleCacheResolver.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/cache/SimpleCacheResolver.java @@ -28,7 +28,7 @@ import org.apache.geode.cache.client.ClientCacheFactory; import org.springframework.geode.util.CacheUtils; /** - * The {@link SimpleCacheResolver} abstract class contains utility functions for resolving GemFire/Geode + * The {@link SimpleCacheResolver} abstract class contains utility functions for resolving Apache Geode * {@link GemFireCache} instances, such as a {@link ClientCache} or a {@literal peer} {@link Cache}. * * @author John Blum @@ -64,7 +64,7 @@ public abstract class SimpleCacheResolver { } /** - * The 1st {@code resolve():Optional} method signature avoids the cast + * The 1st {@code resolve():Optional} method signature avoids the cast * and the @SuppressWarnings("unchecked") annotation, but puts the burden on the caller. * The 2nd {@code resolve():Optional} method signature requires a cast * and the @SuppressWarnings("unchecked") annotation, but avoids putting the burden on the caller. diff --git a/apache-geode-extensions/src/main/java/org/springframework/geode/util/CacheUtils.java b/apache-geode-extensions/src/main/java/org/springframework/geode/util/CacheUtils.java index 6b2deee8..8dfd411d 100644 --- a/apache-geode-extensions/src/main/java/org/springframework/geode/util/CacheUtils.java +++ b/apache-geode-extensions/src/main/java/org/springframework/geode/util/CacheUtils.java @@ -33,7 +33,7 @@ import org.apache.geode.cache.client.Pool; import org.apache.geode.internal.cache.GemFireCacheImpl; /** - * Abstract utility class for working with GemFire/Geode cache instances, such as {@link ClientCache} + * Abstract utility class for working with Apache Geode cache instances, such as {@link ClientCache} * and {@literal peer} {@link Cache} instances. * * @author John Blum diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleClientCacheResolverIntegrationTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleClientCacheResolverIntegrationTests.java index e8e0c635..094e260f 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleClientCacheResolverIntegrationTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimpleClientCacheResolverIntegrationTests.java @@ -27,7 +27,7 @@ import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientCacheFactory; /** - * Integration Tests for {@link SimpleCacheResolver} using a GemFire/Geode {@link ClientCache}. + * Integration Tests for {@link SimpleCacheResolver} using an Apache Geode {@link ClientCache}. * * @author John Blum * @see org.junit.Test diff --git a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimplePeerCacheResolverIntegrationTests.java b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimplePeerCacheResolverIntegrationTests.java index 1d5edeb4..e6905e7c 100644 --- a/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimplePeerCacheResolverIntegrationTests.java +++ b/apache-geode-extensions/src/test/java/org/springframework/geode/cache/SimplePeerCacheResolverIntegrationTests.java @@ -27,7 +27,7 @@ import org.apache.geode.cache.Cache; import org.apache.geode.cache.CacheFactory; /** - * Integration Tests for {@link SimpleCacheResolver} using a GemFire/Geode {@literal peer} {@link Cache}. + * Integration Tests for {@link SimpleCacheResolver} using an Apache Geode {@literal peer} {@link Cache}. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeHealthIndicatorAutoConfiguration.java b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeHealthIndicatorAutoConfiguration.java index b3a861b5..e478d84c 100644 --- a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeHealthIndicatorAutoConfiguration.java +++ b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/GeodeHealthIndicatorAutoConfiguration.java @@ -32,7 +32,7 @@ import org.springframework.geode.boot.actuate.autoconfigure.config.PeerCacheHeal import org.springframework.geode.boot.autoconfigure.ClientCacheAutoConfiguration; /** - * Spring Boot {@link EnableAutoConfiguration auto-configuration} for Apache Geode/Pivotal GemFire + * Spring Boot {@link EnableAutoConfiguration auto-configuration} for Apache Geode * {@link HealthIndicator HealthIndicators}. * * @author John Blum diff --git a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/BaseGeodeHealthIndicatorConfiguration.java b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/BaseGeodeHealthIndicatorConfiguration.java index 538d7ded..7523ebee 100644 --- a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/BaseGeodeHealthIndicatorConfiguration.java +++ b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/BaseGeodeHealthIndicatorConfiguration.java @@ -29,8 +29,8 @@ import org.springframework.geode.boot.actuate.GeodeIndexesHealthIndicator; import org.springframework.geode.boot.actuate.GeodeRegionsHealthIndicator; /** - * Spring {@link Configuration @Configuration} class declaring Spring beans for general Apache Geode/Pivotal GemFire - * peer {@link Cache} and {@link ClientCache} {@link HealthIndicator HealthIndicators}. + * Spring {@link Configuration} class declaring Spring beans for general Apache Geode peer {@link Cache} + * and {@link ClientCache} {@link HealthIndicator HealthIndicators}. * * @author John Blum * @see org.apache.geode.cache.Cache diff --git a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/ClientCacheHealthIndicatorConfiguration.java b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/ClientCacheHealthIndicatorConfiguration.java index 61428801..57156f74 100644 --- a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/ClientCacheHealthIndicatorConfiguration.java +++ b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/ClientCacheHealthIndicatorConfiguration.java @@ -33,8 +33,8 @@ import org.springframework.geode.boot.actuate.GeodeContinuousQueriesHealthIndica import org.springframework.geode.boot.actuate.GeodePoolsHealthIndicator; /** - * Spring {@link Configuration @Configuration} class declaring Spring beans for Apache Geode/Pivotal GemFire - * {@link ClientCache} {@link HealthIndicator HealthIndicators}. + * Spring {@link Configuration} class declaring Spring beans for Apache Geode {@link ClientCache} + * {@link HealthIndicator HealthIndicators}. * * @author John Blum * @see org.apache.geode.cache.GemFireCache @@ -65,7 +65,7 @@ public class ClientCacheHealthIndicatorConfiguration { public static final class ClientCacheCondition implements Condition { - @Override @SuppressWarnings("all") + @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { Cache peerCache = CacheUtils.getCache(); diff --git a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/PeerCacheHealthIndicatorConfiguration.java b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/PeerCacheHealthIndicatorConfiguration.java index 0e3e7142..c34b1fc8 100644 --- a/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/PeerCacheHealthIndicatorConfiguration.java +++ b/spring-geode-actuator-autoconfigure/src/main/java/org/springframework/geode/boot/actuate/autoconfigure/config/PeerCacheHealthIndicatorConfiguration.java @@ -43,8 +43,8 @@ import org.springframework.geode.core.util.ObjectUtils; import org.springframework.lang.Nullable; /** - * Spring {@link Configuration @Configuration} class declaring Spring beans for Apache Geode/Pivotal GemFire - * peer {@link Cache} {@link HealthIndicator HealthIndicators}. + * Spring {@link Configuration} class declaring Spring beans for Apache Geode peer {@link Cache} + * {@link HealthIndicator HealthIndicators}. * * @author John Blum * @see org.apache.geode.cache.Cache @@ -107,7 +107,7 @@ public class PeerCacheHealthIndicatorConfiguration { return bean; } - @Nullable @Override @SuppressWarnings("all") + @Nullable @Override public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { if (bean instanceof CacheServer) { @@ -133,7 +133,7 @@ public class PeerCacheHealthIndicatorConfiguration { public static final class PeerCacheCondition implements Condition { - @Override @SuppressWarnings("all") + @Override public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) { Cache peerCache = CacheUtils.getCache(); diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java index f8c2c232..55b701b6 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/CacheNameAutoConfiguration.java @@ -36,8 +36,8 @@ import org.springframework.util.StringUtils; /** * Spring Boot {@link EnableAutoConfiguration auto-configuration} class used to configure the Apache Geode - * / Pivotal GemFire {@link ClientCache} application or peer {@link Cache} member node name - * (i.e. {@literal gemfire.name}) with the Spring Boot {@literal spring.application.name} property. + * {@link ClientCache} application or peer {@link Cache} member node name (i.e. {@literal gemfire.name}) + * with the Spring Boot {@literal spring.application.name} property. * * @author John Blum * @see org.apache.geode.cache.Cache diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java index 5d8af7c4..a78caf5b 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/ClientSecurityAutoConfiguration.java @@ -310,8 +310,8 @@ public class ClientSecurityAutoConfiguration { } // This custom PropertySource is required to prevent Pivotal Spring Cloud Services - // (spring-cloud-services-starter-service-registry) from losing the GemFire/PCC Security Context credentials - // stored in the Environment. + // (spring-cloud-services-starter-service-registry) from losing the Apache Geode or Cloud Cache Security Context + // credentials stored in the Environment. static class SpringDataGemFirePropertiesPropertySource extends PropertySource { private static final String SPRING_DATA_GEMFIRE_PROPERTIES_PROPERTY_SOURCE_NAME = diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java index d8d461e3..477dbd8f 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/DataImportExportAutoConfiguration.java @@ -146,10 +146,10 @@ public class DataImportExportAutoConfiguration { } /** - * If we do not disable GemFire/Geode's {@link org.apache.geode.distributed.DistributedSystem} JRE/JVM runtime + * If we do not disable Apache Geode's {@link org.apache.geode.distributed.DistributedSystem} JRE/JVM runtime * shutdown hook then the {@link org.apache.geode.cache.Region} is prematurely closed by the JRE/JVM shutdown hook - * before Spring's {@link org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor}s can do their - * work of exporting data from the {@link org.apache.geode.cache.Region} as JSON. + * before Spring's {@link org.springframework.beans.factory.config.DestructionAwareBeanPostProcessor}s can do + * their work of exporting data from the {@link org.apache.geode.cache.Region} as JSON. */ void disableGemFireShutdownHook(@Nullable Environment environment) { System.setProperty(GEMFIRE_DISABLE_SHUTDOWN_HOOK, Boolean.TRUE.toString()); diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java index 3ea0a3ca..522038bf 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/GemFirePropertiesAutoConfiguration.java @@ -29,8 +29,8 @@ import org.springframework.geode.boot.autoconfigure.configuration.GemFirePropert /** * Spring Boot {@link EnableAutoConfiguration auto-configuration} class used to configure Spring Boot - * {@link ConfigurationProperties @ConfigurationProperites} classes and beans from the Spring {@link Environment} - * containing Apache Geode / Pivotal GemFire configuration properties. + * {@link ConfigurationProperties} classes and beans from the Spring {@link Environment} containing Apache Geode + * configuration properties. * * @author John Blum * @see org.apache.geode.cache.GemFireCache diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/LoggingAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/LoggingAutoConfiguration.java index c0c02313..e4a67fed 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/LoggingAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/LoggingAutoConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.config.annotation.EnableLogging; /** - * Spring Boot {@link EnableAutoConfiguration Auto-Configuration} for Apache Geode and Pivotal GemFire logging. + * Spring Boot {@link EnableAutoConfiguration auto-Configuration} for Apache Geode logging. * * @author John Blum * @see org.springframework.boot.autoconfigure.EnableAutoConfiguration diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java index 3e1df8de..e94cd36c 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RegionTemplateAutoConfiguration.java @@ -65,8 +65,8 @@ import org.springframework.util.StringUtils; /** * Spring Boot {@link EnableAutoConfiguration auto-configuration} class used to configure a {@link GemfireTemplate} - * for each Apache Geode / Pivotal GemFire {@link Region} declared/defined in - * the Spring {@link ConfigurableApplicationContext} in order to perform {@link Region} data access operations. + * for each Apache Geode cache {@link Region} declared/defined in the Spring {@link ConfigurableApplicationContext} + * in order to perform {@link Region} data access operations. * * @author John Blum * @see org.apache.geode.cache.GemFireCache @@ -292,7 +292,7 @@ public class RegionTemplateAutoConfiguration extends TypelessAnnotationConfigSup private void registerRegionTemplatesForCacheRegions(@NonNull ConfigurableApplicationContext applicationContext, @NonNull GemFireCache cache) { - for (Region region : CollectionUtils.nullSafeSet(cache.rootRegions())) { + for (Region region : CollectionUtils.nullSafeSet(cache.rootRegions())) { String regionTemplateBeanName = toRegionTemplateBeanName(region.getName()); @@ -301,7 +301,7 @@ public class RegionTemplateAutoConfiguration extends TypelessAnnotationConfigSup } private void registerRegionTemplateBean(@NonNull ConfigurableApplicationContext applicationContext, - @NonNull Region region, String regionTemplateBeanName) { + @NonNull Region region, String regionTemplateBeanName) { Optional.of(applicationContext) .filter(it -> isNotBean(it, regionTemplateBeanName)) @@ -313,8 +313,7 @@ public class RegionTemplateAutoConfiguration extends TypelessAnnotationConfigSup return !(StringUtils.hasText(beanName) && applicationContext.containsBean(beanName)); } - @SuppressWarnings("unchecked") - private GemfireTemplate newGemfireTemplate(@NonNull Region region) { + private GemfireTemplate newGemfireTemplate(@NonNull Region region) { return new GemfireTemplate(region); } diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java index 7ee850b7..249f8fa7 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/RepositoriesAutoConfiguration.java @@ -33,8 +33,7 @@ import org.springframework.data.gemfire.repository.config.GemfireRepositoryConfi import org.springframework.data.gemfire.repository.support.GemfireRepositoryFactoryBean; /** - * Spring Boot {@link EnableAutoConfiguration auto-configuration} for Spring Data Geode - * and Spring Data GemFire Repositories. + * Spring Boot {@link EnableAutoConfiguration auto-configuration} for Spring Data for Apache Geode (SDG) Repositories. * * Activates when there is a bean of type {@link Cache} or {@link ClientCache} configured in the Spring context, * the Spring Data Geode {@link GemfireRepository} type is on the classpath, and no other existing diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java index 5a2fd4d8..38a39ef0 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionAutoConfiguration.java @@ -47,8 +47,8 @@ import org.springframework.session.web.http.SessionRepositoryFilter; import org.springframework.util.StringUtils; /** - * Spring Boot {@link EnableAutoConfiguration auto-configuration} for configuring either Apache Geode - * or Pivotal GemFire as an (HTTP) {@link Session} state management provider in Spring Session. + * Spring Boot {@link EnableAutoConfiguration auto-configuration} for configuring Apache Geode + * as an (HTTP) {@link Session} state management provider in Spring Session. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionPropertiesAutoConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionPropertiesAutoConfiguration.java index 1d673dfa..443f4cd9 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionPropertiesAutoConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/SpringSessionPropertiesAutoConfiguration.java @@ -31,9 +31,8 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.GemFi /** * Spring Boot {@link EnableAutoConfiguration auto-configuration} class used to configure Spring Boot - * {@link ConfigurationProperties @ConfigurationProperites} classes and beans from the Spring {@link Environment} - * containing Spring Session configuration properties used to configure either Apache Geode or Pivotal GemFire - * to manage (HTTP) Session state. + * {@link ConfigurationProperties} classes and beans from the Spring {@link Environment} containing Spring Session + * configuration properties used to configure either Apache Geode to manage (HTTP) Session state. * * @author John Blum * @see org.apache.geode.cache.GemFireCache diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java index a0d9576b..411ef5fd 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/GemFireProperties.java @@ -33,8 +33,8 @@ import org.springframework.geode.boot.autoconfigure.configuration.support.Securi import org.springframework.geode.boot.autoconfigure.configuration.support.ServiceProperties; /** - * Spring Boot {@link ConfigurationProperties} for well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * Spring Boot {@link ConfigurationProperties} for well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * This class assists the application developer in the auto-completion / content-assist of the well-known, documented * SDG {@link Properties}. diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java index 4736e3c1..b5ca34a7 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/SpringSessionProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration; import org.apache.geode.cache.RegionShortcut; @@ -23,9 +22,8 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; /** - * Spring Boot {@link ConfigurationProperties} used to configure Spring Session for Apache Geode or Pivotal GemFire - * (SSDG) in order to manage (HTTP) Session state with Spring Session, backed by either Apache Geode - * or Pivotal GemFire. + * Spring Boot {@link ConfigurationProperties} used to configure Spring Session for Apache Geode (SSDG) in order to + * manage (HTTP) Session state with Spring Session backed by Apache Geode. * * @author John Blum * @see org.springframework.boot.context.properties.ConfigurationProperties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheProperties.java index 8a697a76..4c3cb1ed 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -27,11 +26,11 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; /** - * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode / Pivotal GemFire peer {@link Cache}, - * {@link ClientCache} and {@link CacheServer} objects. + * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode peer {@link Cache}, {@link ClientCache} + * and {@link CacheServer} objects. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheServerProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheServerProperties.java index f7065abb..8152a2e7 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheServerProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/CacheServerProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -25,10 +24,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.data.gemfire.server.SubscriptionEvictionPolicy; /** - * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode / Pivotal GemFire {@link CacheServer}. + * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode {@link CacheServer}. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientCacheProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientCacheProperties.java index 16b5d871..3734b786 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientCacheProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientCacheProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -23,10 +22,10 @@ import org.apache.geode.cache.client.ClientCache; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode / Pivotal GemFire {@link ClientCache}. + * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode {@link ClientCache}. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientSecurityProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientSecurityProperties.java index 2e42a523..53f8dd5a 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientSecurityProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClientSecurityProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -23,11 +22,11 @@ import org.apache.geode.cache.client.ClientCache; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode / Pivotal GemFire {@link ClientCache} - * Security (authentication & authorization). + * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode {@link ClientCache} Security + * (authentication & authorization). * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClusterProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClusterProperties.java index f1fa45c0..a3678f55 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClusterProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ClusterProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -26,10 +25,10 @@ import org.springframework.boot.context.properties.ConfigurationProperties; /** * Spring Boot {@link ConfigurationProperties} used to configure the {@link DataPolicy} of all {@link Region Regions} - * in an Apache Geode / Pivotal GemFire cluster. + * in an Apache Geode cluster. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/DiskStoreProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/DiskStoreProperties.java index e04b57b8..c645d7db 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/DiskStoreProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/DiskStoreProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -24,11 +23,10 @@ import org.apache.geode.cache.DiskStoreFactory; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode / Pivotal GemFire - * {@link DiskStore DiskStores}. + * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode {@link DiskStore DiskStores}. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/EntityProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/EntityProperties.java index fba7e181..e66652e3 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/EntityProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/EntityProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -23,12 +22,12 @@ import org.apache.geode.cache.Region; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure the application base {@link Package package} + * Spring Boot {@link ConfigurationProperties} used to configure the application base {@link Package} * containing the application entity classes. The entity classes are then used to create and configure - * Apache Geode / Pivotal GemFire {@link Region Regions}. + * Apache Geode {@link Region Regions}. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LocatorProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LocatorProperties.java index 5176c6ae..50216694 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LocatorProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LocatorProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -23,14 +22,13 @@ import org.apache.geode.distributed.Locator; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure an embedded Apache Geode / Pivotal GemFire - * {@link Locator}. + * Spring Boot {@link ConfigurationProperties} used to configure an embedded Apache Geode {@link Locator}. * * A {@link Locator} enables location services used by nodes to join an existing cluster as a peer member * and is also used by clients to discover servers in the cluster. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LoggingProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LoggingProperties.java index 8a890ffd..4eb2a19a 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LoggingProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/LoggingProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -21,10 +20,10 @@ import java.util.Properties; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode / Pivotal GemFire logging. + * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode logging. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagementProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagementProperties.java index 82ddea18..ce5e107d 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagementProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagementProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -21,11 +20,10 @@ import java.util.Properties; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode / Pivotal GemFire management services, - * such as HTTP. + * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode management services, such as HTTP. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagerProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagerProperties.java index 673719fd..70795376 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagerProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ManagerProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -21,13 +20,12 @@ import java.util.Properties; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure an embedded Apache Geode / Pivotal GemFire - * {@literal Manager}. + * Spring Boot {@link ConfigurationProperties} used to configure an embedded Apache Geode {@literal Manager}. * * A {@literal Manager} allows users to manage a cluster with tools like {@literal Gfsh} or {@literal Pulse}. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PdxProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PdxProperties.java index 3d478c33..f68c0224 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PdxProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PdxProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -21,17 +20,15 @@ import java.util.Properties; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode / Pivotal GemFire - * {@literal PDX} serialization. + * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode {@literal PDX} serialization. * - * PDX serialization is an alternative serialization format to Java Serialization provided by - * Apache Geode / Pivotal GemFire. PDX enables interoperability with native language clients (e.g. C++), - * enables objects stored in GemFire/Geode to be queried without causing deserialization and is a more efficient - * format than Java Serialization. While PDX is more robust in some ways, it is less robust in others. For example, - * PDX does not handle cyclic references in the object graph. + * PDX serialization is an alternative serialization format to Java Serialization provided by Apache Geode. PDX enables + * interoperability with native language clients (e.g. C++), enables objects stored in Apache Geode to be queried + * without causing deserialization and is a more efficient format than Java Serialization. While PDX is more robust in + * some ways, it is less robust in others. For example, PDX does not handle cyclic references in the object graph. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerCacheProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerCacheProperties.java index 5155b794..eda42223 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerCacheProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerCacheProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -23,10 +22,10 @@ import org.apache.geode.cache.Cache; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode / Pivotal GemFire peer {@link Cache}. + * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode peer {@link Cache}. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerSecurityProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerSecurityProperties.java index 51c99cdb..e454908d 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerSecurityProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PeerSecurityProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -23,11 +22,11 @@ import org.apache.geode.cache.Cache; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode / Pivotal GemFire peer {@link Cache} - * Security (authentication & authorization). + * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode peer {@link Cache} Security + * (authentication & authorization). * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java index ac0f4363..7b1689e8 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/PoolProperties.java @@ -23,10 +23,10 @@ import org.apache.geode.cache.client.PoolFactory; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode / Pivotal GemFire peer {@link Pool}. + * Spring Boot {@link ConfigurationProperties} used to configure an Apache Geode client {@link Pool}. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SecurityProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SecurityProperties.java index 6293d8eb..4ffcba19 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SecurityProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SecurityProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -22,13 +21,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; /** - * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode / Pivotal GemFire Security. + * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode Security. * * Security configuration covers Authentication & Authorization (AUTH) as well as Secure Transport using SSL * (i.e. securing data in motion). Securing data at rest (e.g. disk based encryption) is not yet supported. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ServiceProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ServiceProperties.java index 2c3c704a..6d48d202 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ServiceProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/ServiceProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -22,13 +21,13 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.data.gemfire.config.annotation.EnableMemcachedServer; /** - * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode / Pivotal GemFire embedded services. + * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode embedded services. * * Currently, the supported embedded services include HTTP service (Jetty), Memcached (protocol) server * and a Redis (protocol) server. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SslProperties.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SslProperties.java index d3be447c..d1b1fbcb 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SslProperties.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/configuration/support/SslProperties.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.configuration.support; import java.util.Properties; @@ -23,13 +22,13 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.data.gemfire.config.annotation.EnableSsl; /** - * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode / Pivotal GemFire Socket layer SSL. + * Spring Boot {@link ConfigurationProperties} used to configure Apache Geode Socket layer SSL. * * The SSL configuration is used to secure communications and data in motion between clients and servers * as well as between peers in a cluster. * - * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode/Pivotal GemFire - * (SDG) {@link Properties}. + * The configuration {@link Properties} are based on well-known, documented Spring Data for Apache Geode (SDG) + * {@link Properties}. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java index b4e974b1..7392792e 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/package-info.java @@ -15,6 +15,6 @@ */ /** - * Spring Boot auto-configuration for Apache Geode & Pivotal GemFire. + * Spring Boot auto-configuration for Apache Geode. */ package org.springframework.geode.boot.autoconfigure; diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfiguration.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfiguration.java index ca1ecd08..a4b3d615 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfiguration.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/EnableSubscriptionConfiguration.java @@ -28,8 +28,8 @@ import org.springframework.data.gemfire.config.annotation.ClientCacheConfigurer; import org.springframework.data.gemfire.config.annotation.PoolConfigurer; /** - * A Spring {@link Configuration} class used to enable subscription on the Apache Geode & Pivotal GemFire - * {@literal DEFAULT} {@link Pool} as well as the SDG {@literal gemfirePool} {@link Pool}, only. + * A Spring {@link Configuration} class used to enable subscription on the Apache Geode {@literal DEFAULT} {@link Pool} + * as well as the SDG {@literal gemfirePool} {@link Pool}, only. * * @author John Blum * @see org.apache.geode.cache.client.Pool diff --git a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java index d03925eb..2e9ca27e 100644 --- a/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java +++ b/spring-geode-autoconfigure/src/main/java/org/springframework/geode/boot/autoconfigure/support/PdxInstanceWrapperRegionAspect.java @@ -34,7 +34,7 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; /** - * A Spring, AspectJ {@link Aspect} advising GemFire/Geode cache {@link Region} data access operations. + * A Spring, AspectJ {@link Aspect} advising Apache Geode cache {@link Region} data access operations. * * Specifically, this {@link Aspect} wraps all {@link PdxInstance} objects returned from cache {@link Region} * read data access operations inside a new instance of {@link PdxInstanceWrapper}. diff --git a/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java b/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java index 199b5375..33edfa6e 100644 --- a/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java +++ b/spring-geode-autoconfigure/src/test/java/example/geode/query/cq/event/TemperatureReadingsContinuousQueriesHandler.java @@ -26,8 +26,8 @@ import org.apache.geode.cache.query.CqEvent; import org.springframework.data.gemfire.listener.annotation.ContinuousQuery; /** - * The {@link TemperatureReadingsContinuousQueriesHandler} class is a POJO containing Apache Geode/Pivotal GemFire - * Continuous Query (CQ) definitions. + * The {@link TemperatureReadingsContinuousQueriesHandler} class is a POJO containing Apache Geode Continuous Query (CQ) + * definitions. * * @author John Blum * @see org.apache.geode.cache.query.CqEvent diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java index 561ba8fe..f65e5c01 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/AutoConfiguredCachingIntegrationTests.java @@ -43,8 +43,8 @@ import example.app.books.model.Book; import example.app.books.service.support.CachingBookService; /** - * Integration tests testing the auto-configuration of Spring's Cache Abstraction with Apache Geode - * or Pivotal GemFire as the caching provider. + * Integration Tests testing the auto-configuration of Spring's Cache Abstraction with Apache Geode + * as the caching provider. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java index 20e0db2e..df709f68 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/caching/ManuallyConfiguredCachingIntegrationTests.java @@ -35,9 +35,9 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; /** - * Integration tests for {@link CachingProviderAutoConfiguration} asserting that neither Apache Geode - * nor Pivotal GemFire is configured as the caching provider in Spring's Cache Abstraction when another - * caching provider (i.e. {@link CacheManager} bean) has been declared and configured. + * Integration Tests for {@link CachingProviderAutoConfiguration} asserting that Apache Geode is not configured as + * the caching provider in Spring's Cache Abstraction when another caching provider (i.e. {@link CacheManager} bean) + * has been declared and configured. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java index 4a0f73b5..e86ce744 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cluster/ClusterConfigurationWithAuthenticationIntegrationTests.java @@ -64,8 +64,8 @@ import example.app.books.model.Book; import example.app.books.model.ISBN; /** - * Integration Tests testing the SDG {@link EnableClusterConfiguration} annotation functionality - * when the GemFire/Geode server is configured with Security (Authentication). + * Integration Tests testing the SDG {@link EnableClusterConfiguration} annotation functionality when the Apache Geode + * server is configured with Security (Authentication). * * @author John Blum * @see java.io.File diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java index 5e954266..c9ac6c3f 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/configuration/GeodePropertiesVsSpringDataGeodePropertiesPrecedenceIntegrationTests.java @@ -35,11 +35,11 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; /** - * Integration Tests asserting and testing the precedence of GemFire, Spring and Spring Data for Apache Geode - * & Pivotal GemFire (SDG) {@link Properties} precedence. + * Integration Tests asserting and testing the precedence of Apache Geode, Spring and Spring Data for Apache Geode (SDG) + * {@link Properties} precedence. * - * Essentially, SDG {@link Properties} should take precedence over (i.e. override) both Spring And Apache Geode - * or Pivotal GemFire {@link Properties}. + * Essentially, SDG {@link Properties} should take precedence over (i.e. override) both Spring and Apache Geode + * {@link Properties}. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java index 39f9ea4a..6d69d103 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/cq/AutoConfiguredContinuousQueryIntegrationTests.java @@ -54,7 +54,7 @@ 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. + * Integration Tests testing the auto-configuration of Apache Geode Continuous Query. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java index d2bc7dc1..fefdd896 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/AutoConfiguredFunctionExecutionsIntegrationTests.java @@ -42,8 +42,8 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.Assert; /** - * Integration Tests testing the auto-configuration of Spring Data for Apache Geode/Pivotal GemFire - * Function implementations and executions support. + * Integration Tests testing the auto-configuration of Spring Data for Apache Geode Function implementations + * and executions support. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java index 7ada4b42..200f4b29 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/function/executions/Calculator.java @@ -13,21 +13,20 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.function.executions; import org.springframework.data.gemfire.function.annotation.OnMember; /** - * The {@link Calculator} interface defines Apache Geode/Pivotal GemFire Functions. + * The {@link Calculator} interface defines Apache Geode Functions. * * @author John Blum * @see org.springframework.data.gemfire.function.annotation.OnRegion + * @see org.springframework.data.gemfire.function.annotation.OnMember * @since 1.0.0 */ -@OnMember(groups = "test") -@SuppressWarnings("all") // TODO change Function returns type when SDG properly handles Function method return types/values +@OnMember(groups = "test") public interface Calculator { Object add(double operandOne, double operandTwo); diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java index a5f0d7f1..9524b603 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/logging/LoggingAutoConfigurationIntegrationTests.java @@ -33,8 +33,8 @@ import org.springframework.geode.util.GeodeConstants; import org.springframework.test.context.junit4.SpringRunner; /** - * Integration Tests asserting the configuration and behavior of Apache Geode & Pivotal GemFire logging - * when configured with Spring Boot auto-configuration. + * Integration Tests asserting the configuration and behavior of Apache Geode logging when configured with + * Spring Boot auto-configuration. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java index 4585dd3d..d952b61d 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/AutoConfiguredRepositoriesIntegrationTests.java @@ -38,8 +38,7 @@ import org.springframework.geode.boot.autoconfigure.repository.service.CustomerS import org.springframework.test.context.junit4.SpringRunner; /** - * Integration Tests testing the auto-configuration of Spring Data Repositories backed by either Apache Geode - * or Pivotal GemFire. + * Integration Tests testing the auto-configuration of Spring Data Repositories backed by Apache Geode. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java index 8bed7f60..0d106505 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/repository/repo/CustomerRepository.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.boot.autoconfigure.repository.repo; import org.springframework.data.repository.CrudRepository; @@ -21,7 +20,7 @@ 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. + * and simple query data access operations on {@link Customer} objects stored in Apache Geode. * * @author John Blum * @see org.springframework.data.repository.CrudRepository diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java index f80140af..ad6ce05b 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/cloud/AutoConfiguredCloudSecurityContextIntegrationTests.java @@ -34,8 +34,8 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; /** - * Integration Tests testing the auto-configuration of Apache Geode/Pivotal GemFire Security - * authentication/authorization in a cloud, managed context (e.g. Pivotal CloudFoundry) + * Integration Tests testing the auto-configuration of Apache Geode Security (authentication/authorization) in a cloud, + * managed context (e.g. CloudFoundry). * * @author John Blum * @see java.security.Principal diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java index b0157d5f..d45a0ade 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/hybrid/AutoConfiguredHybridSecurityContextIntegrationTests.java @@ -38,12 +38,11 @@ import org.springframework.test.context.junit4.SpringRunner; /** * Integration Tests testing the functionality and behavior of {@link ClientSecurityAutoConfiguration} when a - * Spring Boot app is deployed (pushed) to Pivotal CloudFoundry (PCF), however, the app has not be bound to a - * Pivotal Cloud Cache (PCC) service instance. + * Spring Boot app is deployed (pushed) to CloudFoundry, however, the app has not be bound to a Pivotal Cloud Cache + * (PCC) service instance. * - * This Use Case is common when users want to deploy their Spring Boot, {@link ClientCache} apps to - * Pivotal CloudFoundry (PCF) however, want to connect those apps to an external Apache Geode or Pivotal GemFire - * cluster. + * This Use Case is common when users want to deploy their Spring Boot, Apache Geode {@link ClientCache} apps to + * CloudFoundry however, want to connect those apps to an external Apache Geode cluster. * * @author John Blum * @see java.util.Properties diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java index d4ef8fee..d26885e4 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/auth/local/AutoConfiguredLocalSecurityContextIntegrationTests.java @@ -31,8 +31,8 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; /** - * Integration Tests testing the auto-configuration of Apache Geode/Pivotal GemFire Security - * authentication/authorization in a local, non-managed context. + * Integration Tests testing the auto-configuration of Apache Geode Security (authentication/authorization) in a local, + * non-managed context. * * @author John Blum * @see java.security.Principal diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java index 7d09f819..c429d932 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/ssl/AutoConfiguredSslIntegrationTests.java @@ -53,7 +53,7 @@ import example.echo.config.EchoClientConfiguration; import example.echo.config.EchoServerConfiguration; /** - * Integration Tests testing the auto-configuration of Apache Geode/Pivotal GemFire SSL. + * Integration Tests testing the auto-configuration of Apache Geode SSL. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java index bac811b8..0ceaa125 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/MockedTlsEnabledAutoConfigurationIntegrationTests.java @@ -28,7 +28,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * Integration Tests testing the configuration of TLS (e.g. SSL) in a Cloud Platform Environment/Context (e.g. PCF) - * using GemFire Mock Objects. + * using Apache Geode Mock Objects. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/TlsEnabledAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/TlsEnabledAutoConfigurationIntegrationTests.java index 6317ff60..2ed8b2ce 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/TlsEnabledAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/security/tls/TlsEnabledAutoConfigurationIntegrationTests.java @@ -27,7 +27,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * Integration Tests testing the configuration of TLS (e.g. SSL) in a Cloud Platform Environment/Context (e.g. PCF) - * using Live GemFire Objects. + * using live Apache Geode objects. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java index f127b69e..993a1d11 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/AutoConfiguredSessionCachingIntegrationTests.java @@ -42,11 +42,10 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.GemFi import org.springframework.test.context.junit4.SpringRunner; /** - * Integration Tests for auto-configuration of Spring Session using either Apache Geode or Pivotal GemFire + * Integration Tests for auto-configuration of Spring Session using either Apache Geode * as the {@link Session} state management provider. * - * This test asserts that the Spring Boot auto-configuration properly configures Spring Session - * with either Apache Geode or Pivotal GemFire + * This test asserts that the Spring Boot auto-configuration properly configures Spring Session with Apache Geode. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java index 74890e7d..4d8bd826 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/CustomConfiguredSessionCachingIntegrationTests.java @@ -52,7 +52,7 @@ import org.springframework.web.context.ConfigurableWebApplicationContext; import org.springframework.web.context.support.GenericWebApplicationContext; /** - * Integration Test for the auto-configuration of Spring Session using either Apache Geode or Pivotal GemFire + * Integration Test for the auto-configuration of Spring Session using either Apache Geode * as the {@link Session} state management provider. * * This test asserts that the Spring Boot auto-configuration can be customized using either {@link Properties} @@ -116,7 +116,7 @@ public class CustomConfiguredSessionCachingIntegrationTests extends SpringBootAp return applicationContext -> { - PropertySource springSessionGemFireProperties = new MockPropertySource("TestSpringSessionGemFireProperties") + PropertySource springSessionGemFireProperties = new MockPropertySource("TestSpringSessionGemFireProperties") .withProperty(springSessionPropertyName("cache.client.region.shortcut"), "LOCAL") .withProperty(springSessionPropertyName("session.attributes.indexable"), "one, two") .withProperty(springSessionPropertyName("session.expiration.max-inactive-interval-seconds"), "600") diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java index 729d36d7..52daab55 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredSessionCachingIntegrationTests.java @@ -41,7 +41,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * Integration Tests for auto-configuration of Spring Session using a custom Spring Session {@link Session} state - * management provider, asserting that neither Apache Geode nor Pivotal GemFire is configured. + * management provider, asserting that Apache Geode is not configured. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java index 36ba738c..51f67cf0 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/ManuallyConfiguredWithPropertiesSessionCachingIntegrationTests.java @@ -37,8 +37,7 @@ import org.springframework.test.context.junit4.SpringRunner; /** * Integration Tests asserting the configuration of Spring Session using Spring Boot's * {@literal spring.session.store-type} configuration property set to {@literal none} - * and assert neither Apache Geode nor Pivotal GemFire was configured as the Session - * state management provider. + * and assert that Apache Geode was not configured as the Session state management provider. * * @author John Blum * @see org.apache.geode.cache.GemFireCache diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java index 06f88701..62a15966 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/session/NoAutoConfigurationOfSessionCachingIntegrationTests.java @@ -32,9 +32,8 @@ import org.springframework.test.context.junit4.SpringRunner; import org.springframework.web.context.WebApplicationContext; /** - * Integration tests for {@link SpringSessionAutoConfiguration} asserting that Spring Session - * (for Apache Geode/Pivotal GemFire) is not auto-configured when the Spring {@link ApplicationContext} - * is not a {@link WebApplicationContext}. + * Integration Tests for {@link SpringSessionAutoConfiguration} asserting that Spring Session for Apache Geode (SSDG) + * is not auto-configured when the Spring {@link ApplicationContext} is not a {@link WebApplicationContext}. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java index 1b9c3b03..c3c8357e 100644 --- a/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java +++ b/spring-geode-autoconfigure/src/test/java/org/springframework/geode/boot/autoconfigure/template/NativeDefinedRegionTemplateAutoConfigurationIntegrationTests.java @@ -41,8 +41,8 @@ import org.springframework.geode.boot.autoconfigure.RegionTemplateAutoConfigurat import org.springframework.test.context.junit4.SpringRunner; /** - * Integration Tests for {@link RegionTemplateAutoConfiguration} using natively declared {@link Region} - * definitions in GemFire/Geode {@literal cache.xml}. + * Integration Tests for {@link RegionTemplateAutoConfiguration} using natively declared {@link Region} definitions + * in Apache Geode {@literal cache.xml}. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/locator/SpringBootApacheGeodeLocatorApplication.java b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/locator/SpringBootApacheGeodeLocatorApplication.java index a6855f30..a1581754 100644 --- a/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/locator/SpringBootApacheGeodeLocatorApplication.java +++ b/spring-geode-docs/src/main/java/org/springframework/geode/docs/example/app/locator/SpringBootApacheGeodeLocatorApplication.java @@ -30,7 +30,7 @@ import org.springframework.geode.config.annotation.UseLocators; /** * The {@link SpringBootApacheGeodeLocatorApplication} class is a Spring Boot application that configures and bootstraps - * an Apache Geode or Pivotal GemFire {@link Locator} application JVM process. + * an Apache Geode {@link Locator} application JVM process. * * @author John Blum * @see org.apache.geode.distributed.Locator diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java index acee9cc1..4914843d 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/RepositoryAsyncEventListener.java @@ -82,7 +82,7 @@ public class RepositoryAsyncEventListener implements AsyncEventListener { * * Since the processing of {@link AsyncEvent AsyncEvents} is asynchronous, the {@link AsyncEventErrorHandler} gives * users the opportunity to respond to errors for each {@link AsyncEvent} as it is is processed given this listener - * is designed to coordinate data/state changes occurring in a GemFire/Geode cache with an external data source. + * is designed to coordinate data/state changes occurring in an Apache Geode cache with an external data source. * * @param asyncEventErrorHandler {@link AsyncEventErrorHandler} used to handle errors while processing the batch of * {@link AsyncEvent AsyncEvents}. diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheWriterSupport.java b/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheWriterSupport.java index 11f6cc73..55e91854 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheWriterSupport.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/support/CacheWriterSupport.java @@ -21,7 +21,7 @@ import org.apache.geode.cache.EntryEvent; import org.apache.geode.cache.RegionEvent; /** - * Class supporting the implementation of Apache Geode / Pivotal GemFire (PCC) {@link CacheWriter CacheWriters}. + * Class supporting the implementation of Apache Geode {@link CacheWriter CacheWriters}. * * @author John Blum * @see org.apache.geode.cache.CacheWriter diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupport.java b/spring-geode/src/main/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupport.java index 73577487..12d7b2d8 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupport.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/support/RepositoryCacheLoaderWriterSupport.java @@ -34,7 +34,7 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** - * Abstract base class supporting the implementation of Apache Geode / Pivotal GemFire {@link CacheLoader CacheLoaders} + * Abstract base class supporting the implementation of Apache Geode {@link CacheLoader CacheLoaders} * and {@link CacheWriter CacheWriters} backed by Spring Data {@link Repository Repositories}. * * @author John Blum diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java index fb38ee0d..a7cbed40 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterAvailableConfiguration.java @@ -23,8 +23,8 @@ import org.springframework.context.annotation.Configuration; import org.springframework.data.gemfire.config.annotation.EnableClusterConfiguration; /** - * The {@link ClusterAvailableConfiguration} class is a Spring {@link Configuration @Configuration} class that enables - * configuration when an Apache Geode or Pivotal GemFire cluster of servers are available. + * The {@link ClusterAvailableConfiguration} class is a Spring {@link Configuration} class that enables configuration + * when an Apache Geode cluster of servers are available. * * @author John Blum * @see org.springframework.boot.autoconfigure.condition.AnyNestedCondition diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java index 785819bc..815d7628 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfiguration.java @@ -38,8 +38,8 @@ import org.springframework.data.gemfire.config.annotation.support.CacheTypeAware import org.springframework.lang.Nullable; /** - * The {@link ClusterNotAvailableConfiguration} class is a Spring {@link Configuration @Configuration} class that - * enables configuration when an Apache Geode or Pivotal GemFire cluster of servers is not available. + * The {@link ClusterNotAvailableConfiguration} class is a Spring {@link Configuration} class that enables configuration + * when an Apache Geode cluster of servers is not available. * * @author John Blum * @see org.springframework.beans.factory.config.BeanPostProcessor @@ -113,7 +113,7 @@ public class ClusterNotAvailableConfiguration { return clientRegion; } - protected ClientRegionFactoryBean configureAsLocalClientRegion(Environment environment, + protected ClientRegionFactoryBean configureAsLocalClientRegion(Environment environment, ClientRegionFactoryBean clientRegion) { ClientRegionShortcut shortcut = diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java index b583ee7c..4ddb70ce 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableClusterAware.java @@ -25,9 +25,8 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Import; /** - * The {@link EnableClusterAware} helps an Spring Boot application using Apache Geode (or Pivotal GemFire - * / Pivotal Cloud Cache (PCC)) decide whether it needs to operate in {@literal local-only mode} - * or {@literal client/server}. + * The {@link EnableClusterAware} annotation helps Spring Boot applications using Apache Geode decide whether it needs + * to operate in {@literal local-only mode} or in a {@literal client/server topology}. * * @author John Blum * @see java.lang.annotation.Annotation diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManager.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManager.java index 8def12ac..577a1c49 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManager.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManager.java @@ -26,7 +26,7 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Import; /** - * Spring {@link Annotation} to enable Apache Geode or Pivotal GemFire (PCC) Security (Auth). + * Spring {@link Annotation} to enable Apache Geode Security (Auth). * * @author John Blum * @see java.lang.annotation.Annotation diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManagerProxy.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManagerProxy.java index 3559f18b..5f420652 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManagerProxy.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/EnableSecurityManagerProxy.java @@ -26,7 +26,7 @@ import java.lang.annotation.Target; import org.springframework.context.annotation.Import; /** - * Spring {@link Annotation} to enable Apache Geode or Pivotal GemFire (PCC) Security (Auth) through proxying. + * Spring {@link Annotation} to enable Apache Geode Security (Authentication/Authorization (Auth)) through proxying. * * @author John Blum * @see java.lang.annotation.Annotation diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/GroupsConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/GroupsConfiguration.java index 3d422818..92e2748e 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/GroupsConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/GroupsConfiguration.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.config.annotation; import java.lang.annotation.Annotation; @@ -21,6 +20,7 @@ import java.util.Optional; import org.apache.geode.cache.Cache; import org.apache.geode.cache.client.ClientCache; + import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; @@ -34,9 +34,8 @@ import org.springframework.util.StringUtils; /** * The {@link GroupsConfiguration} class is a Spring {@link Configuration} class used to configure the {@literal groups} - * in which is member belongs in an Apache Geode/Pivotal GemFire distributed system, whether the member - * is a {@link ClientCache} in a client/server topology or a {@link Cache peer Cache} in a cluster - * using the P2P topology. + * in which is member belongs in an Apache Geode distributed system, whether the member is a {@link ClientCache} in a + * client/server topology or a {@link Cache peer Cache} in a cluster using the P2P topology. * * @author John Blum * @see org.apache.geode.cache.Cache diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/LocatorsConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/LocatorsConfiguration.java index 5390058b..ebc0e2bf 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/LocatorsConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/LocatorsConfiguration.java @@ -21,9 +21,6 @@ import java.util.Properties; import org.apache.geode.cache.Cache; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; @@ -35,10 +32,13 @@ import org.springframework.data.gemfire.config.annotation.PeerCacheConfigurer; import org.springframework.data.gemfire.config.annotation.support.AbstractAnnotationConfigSupport; import org.springframework.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * The {@link LocatorsConfiguration} class is a Spring {@link Configuration} class used to configure Apache Geode - * or Pivotal GemFire's {@literal locators} and/or {@literal remote-locators} properties used by a - * {@link Cache peer Cache member} to join a cluster of servers when using the P2P topology. + * {@literal locators} and/or {@literal remote-locators} properties used by a {@link Cache peer Cache member} + * to join a cluster of servers when using the P2P topology. * * The {@literal remote-locators} property is used to configure the Locators that a cluster will use in order to * connect to a remote site in a multi-site (WAN) topology configuration. To use Locators in a WAN configuration, diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java index 6aace8ef..f0a57d14 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/MemberNameConfiguration.java @@ -38,10 +38,9 @@ import org.springframework.data.gemfire.config.annotation.support.AbstractAnnota import org.springframework.util.StringUtils; /** - * The {@link MemberNameConfiguration} class is a Spring {@link Configuration} class used to configure - * an Apache Geode or Pivotal GemFire's member name in the distributed system, whether the member - * is a {@link ClientCache client} in the client/server topology or a {@link Cache peer} in a cluster - * using the P2P topology. + * The {@link MemberNameConfiguration} class is a Spring {@link Configuration} class used to configure an Apache Geode + * member name in the distributed system, whether the member is a {@link ClientCache client} in the client/server + * topology or a {@link Cache peer} in a cluster using the P2P topology. * * @author John Blum * @see org.apache.geode.cache.Cache diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerConfiguration.java index 3a22ef4d..41cababc 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerConfiguration.java @@ -22,7 +22,7 @@ import org.springframework.data.gemfire.config.annotation.PeerCacheConfigurer; /** * Spring {@link Configuration} class used to configure a {@link org.apache.geode.security.SecurityManager}, - * thereby enabling Security (Auth) on this GemFire/Geode node. + * thereby enabling Security (Auth) on this Apache Geode node. * * @author John Blum * @see org.springframework.context.annotation.Bean diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java index 471249ea..4fb41893 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/SecurityManagerProxyConfiguration.java @@ -26,7 +26,7 @@ import org.springframework.geode.security.support.SecurityManagerProxy; /** * Spring {@link Configuration} class used to configure a {@link org.apache.geode.security.SecurityManager}, - * thereby enabling Security (Auth) on this GemFire/Geode node. + * thereby enabling Security (Auth) on this Apache Geode node. * * @author John Blum * @see org.springframework.context.ApplicationListener diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseDistributedSystemId.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseDistributedSystemId.java index 499f0961..a53440ac 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseDistributedSystemId.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseDistributedSystemId.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.config.annotation; import java.lang.annotation.Documented; @@ -25,12 +24,13 @@ import java.lang.annotation.Target; import org.apache.geode.cache.Cache; import org.apache.geode.cache.client.ClientCache; + import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; /** * The {@link UseDistributedSystemId} annotation configures the {@literal distributed-system-id} property - * of a {@link Cache peer Cache member} in an Apache Geode/Pivotal GemFire P2P topology. + * of a {@link Cache peer Cache member} in an Apache Geode P2P topology. * * This configuration annotation is only applicable on {@link Cache peer Cache members} * and has no effect on {@link ClientCache} instances. diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseGroups.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseGroups.java index 6ecb18d2..dd7ec684 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseGroups.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseGroups.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.config.annotation; import java.lang.annotation.Documented; @@ -25,12 +24,13 @@ import java.lang.annotation.Target; import org.apache.geode.cache.Cache; import org.apache.geode.cache.client.ClientCache; + import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; /** * The {@link UseGroups} annotation configures the groups in which the member belongs in an Apache Geode - * or Pivotal GemFire distributed system, whether the member is a {@link ClientCache} in a client/server topology + * distributed system, whether the member is a {@link ClientCache} in a client/server topology * or a {@link Cache peer Cache} in a cluster using the P2P topology. * * @author John Blum diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseLocators.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseLocators.java index b4ee5e07..b226c0f3 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseLocators.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseLocators.java @@ -31,9 +31,9 @@ import org.springframework.context.annotation.Import; import org.springframework.core.annotation.AliasFor; /** - * The {@link UseLocators} annotation configures the {@literal locators} and/or {@literal remote-locators} - * Apache Geode/Pivotal GemFire properties used by a {@link Cache peer Cache member} to join a cluster of servers - * when using the P2P topology as well as when configuring the multi-site, WAN topology. + * The {@link UseLocators} annotation configures the {@literal locators} and/or {@literal remote-locators} Apache Geode + * properties used by a {@link Cache peer Cache member} to join a cluster of servers when using the P2P topology + * as well as when configuring the multi-site, WAN topology. * * @author John Blum * @see java.lang.annotation.Documented diff --git a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java index 72090139..c8aed087 100644 --- a/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java +++ b/spring-geode/src/main/java/org/springframework/geode/config/annotation/UseMemberName.java @@ -30,8 +30,8 @@ import org.springframework.core.annotation.AliasFor; /** * The {@link UseMemberName} annotation configures the {@literal name} of the member in the Apache Geode - * or Pivotal GemFire distributed system, whether the member is a {@link ClientCache client} in - * the client/server topology or a {@link Cache peer Cache member} in the cluster using the P2P topology. + * distributed system, whether the member is a {@link ClientCache client} in the client/server topology + * or a {@link Cache peer Cache member} in the cluster using the P2P topology. * * @author John Blum * @see java.lang.annotation.Documented @@ -53,7 +53,7 @@ import org.springframework.core.annotation.AliasFor; public @interface UseMemberName { /** - * Alias for the {@link String name} of the Apache Geode/Pivotal GemFire distributed system member. + * Alias for the {@link String name} of the Apache Geode distributed system member. * * @see #value() */ @@ -61,7 +61,7 @@ public @interface UseMemberName { String name() default ""; /** - * {@link String Name} used for the Apache Geode/Pivotal GemFire distributed system member. + * {@link String Name} used for the Apache Geode distributed system member. * * @see #name() */ diff --git a/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java b/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java index d44d2cf2..7e359a7c 100644 --- a/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java +++ b/spring-geode/src/main/java/org/springframework/geode/context/annotation/RefreshableAnnotationConfigApplicationContext.java @@ -53,10 +53,10 @@ import org.slf4j.LoggerFactory; * providing the ability to reload/refresh the context at some point later during runtime. * * DISCLAIMER: Currently, this {@link ApplicationContext} implementation (and extension) is being used exclusively for - * testing and experimental (R&D) purposes. It was designed around Apache Geode & Pivotal GemFire's forced-disconnect - * / auto-reconnect functionality, providing support for this behavior inside a Spring context. Specifically, this - * concern is only applicable when using Spring Boot to configure and bootstrap Apache Geode or Pivotal GemFire peer - * member {@link org.apache.geode.cache.Cache} applications, such as when annotating your Spring Boot application with + * testing and experimental (R&D) purposes. It was designed around Apache Geode's forced-disconnect / auto-reconnect + * functionality, providing support for this behavior inside a Spring context. Specifically, this concern is only + * applicable when using Spring Boot to configure and bootstrap Apache Geode peer member + * {@link org.apache.geode.cache.Cache} applications, such as when annotating your Spring Boot application with * SDG's {@link PeerCacheApplication} annotation. This {@link ApplicationContext} implementation is not recommended for * use in Production Systems/Applications (yet). * diff --git a/spring-geode/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java b/spring-geode/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java index fa75ce6e..153b6208 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/env/support/CloudCacheService.java @@ -69,10 +69,10 @@ public class CloudCacheService extends Service { } /** - * Returns an {@link Optional} Gfsh {@link URL}, if configured, used to connect to Pivotal GemFire's - * Management REST API (service). + * Returns an {@link Optional} Gfsh {@link URL} if configured, used to connect to Apache Geode's Management REST API + * (service). * - * @return an {@link Optional} Gfsh {@link URL} used to connect to Pivotal GemFire's Management REST API (service). + * @return an {@link Optional} Gfsh {@link URL} used to connect to Apache Geode's Management REST API (service). * @see #withGfshUrl(URL) * @see java.util.Optional * @see java.net.URL @@ -82,11 +82,11 @@ public class CloudCacheService extends Service { } /** - * Returns an {@link Optional} {@link String} containing the list of Pivotal GemFire Locator network endpoints. + * Returns an {@link Optional} {@link String} containing the list of Apache Geode Locator network endpoints. * * The format of the {@link String}, if present, is {@literal host1[port1],host2[port2], ...,hostN[portN]}. * - * @return an {@link Optional} {@link String} containing the list of Pivotal GemFire Locator network endpoints. + * @return an {@link Optional} {@link String} containing the list of Apache Geode Locator network endpoints. * @see #withLocators(String) */ public Optional getLocators() { @@ -96,11 +96,11 @@ public class CloudCacheService extends Service { } /** - * Returns a {@link List} of Pivotal GemFire Locator network endpoints. + * Returns a {@link List} of Apache Geode Locator network endpoints. * * Returns an {@link Collections#emptyList() empty List} if no Locators were configured. * - * @return a {@link List} of Pivotal GemFire Locator network endpoints. + * @return a {@link List} of Apache Geode Locator network endpoints. * @see #getLocators() */ public List getLocatorList() { @@ -121,10 +121,10 @@ public class CloudCacheService extends Service { } /** - * Builder method used to configure the Gfsh {@link URL} to connect to the Pivotal GemFire + * Builder method used to configure the Gfsh {@link URL} to connect to the Apache Geode * Management REST API (service). * - * @param gfshUrl {@link URL} used to connect to the Pivotal GemFire Management REST API (service). + * @param gfshUrl {@link URL} used to connect to the Apache Geode Management REST API (service). * @return this {@link CloudCacheService}. * @see #getGfshUrl() */ @@ -296,7 +296,7 @@ public class CloudCacheService extends Service { } } - return digits.length() > 0 ? Integer.valueOf(digits.toString()) : DEFAULT_LOCATOR_PORT; + return digits.length() > 0 ? Integer.parseInt(digits.toString()) : DEFAULT_LOCATOR_PORT; } /** @@ -335,7 +335,6 @@ public class CloudCacheService extends Service { } @Override - @SuppressWarnings("all") public int compareTo(Locator other) { int result = this.getHost().compareTo(other.getHost()); diff --git a/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectUtils.java b/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectUtils.java index f4bdcc58..b21c31b7 100644 --- a/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectUtils.java +++ b/spring-geode/src/main/java/org/springframework/geode/core/util/ObjectUtils.java @@ -58,7 +58,7 @@ public abstract class ObjectUtils extends org.springframework.util.ObjectUtils { /** * Tries to cast the given source {@link Object} into an instance of the given {@link Class} type. * - * This method is cable of handling GemFire/Geode {@link PdxInstance} types. + * This method is cable of handling Apache Geode {@link PdxInstance} types. * * @param desired {@link Class type} of the source {@link Object}. * @param source {@link Object} to evaluate. diff --git a/spring-geode/src/main/java/org/springframework/geode/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java b/spring-geode/src/main/java/org/springframework/geode/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java index 11bcc6c5..ec3dd7d3 100644 --- a/spring-geode/src/main/java/org/springframework/geode/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java +++ b/spring-geode/src/main/java/org/springframework/geode/function/config/GemFireFunctionExecutionAutoConfigurationRegistrar.java @@ -13,18 +13,17 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.function.config; import org.apache.geode.cache.execute.Execution; import org.apache.geode.cache.execute.Function; + import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.data.gemfire.function.config.EnableGemfireFunctionExecutions; /** * The {@link GemFireFunctionExecutionAutoConfigurationRegistrar} class is a Spring {@link ImportBeanDefinitionRegistrar} - * used to register SDG POJO interfaces defining Apache Geode/Pivotal GemFire - * {@link Function} {@link Execution Executions} + * used to register SDG POJO interfaces defining Apache Geode {@link Function} {@link Execution Executions}. * * @author John Blum * @see org.apache.geode.cache.execute.Execution diff --git a/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/TypelessCollectionSerializer.java b/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/TypelessCollectionSerializer.java index f6709d58..e0640dd9 100644 --- a/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/TypelessCollectionSerializer.java +++ b/spring-geode/src/main/java/org/springframework/geode/jackson/databind/serializer/TypelessCollectionSerializer.java @@ -37,7 +37,7 @@ import org.springframework.data.gemfire.util.CollectionUtils; * The {@link TypelessCollectionSerializer} class is a custom, typeless {@link CollectionSerializer} implementation. * * This {@link AsArraySerializerBase} implementation is a lot like {@link CollectionSerializer}, however it excludes - * unnecessary type metadata in the context of GemFire/Geode. + * unnecessary type metadata in the context of Apache Geode. * * @author John Blum * @see java.util.Collection diff --git a/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java b/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java index 72ed2e9a..2c057ab0 100644 --- a/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java +++ b/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerProxy.java @@ -15,12 +15,12 @@ */ package org.springframework.geode.security.support; -import java.util.Optional; import java.util.Properties; import java.util.concurrent.atomic.AtomicReference; import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.ResourcePermission; + import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; @@ -35,7 +35,7 @@ import org.springframework.util.Assert; * which is registered as a managed bean in a Spring context. * * The idea behind this {@link org.apache.geode.security.SecurityManager} is to enable users to be able to configure - * and manage the {@code SecurityManager} as a Spring bean. However, Apache Geode/Pivotal GemFire require + * and manage the {@code SecurityManager} as a Spring bean. However, Apache Geode require * the {@link org.apache.geode.security.SecurityManager} to be configured using a System property when launching * Apache Geode Servers with Gfsh, which makes it difficult to "manage" the {@code SecurityManager} instance. * @@ -82,8 +82,7 @@ public class SecurityManagerProxy extends LazyWiringDeclarableSupport private org.apache.geode.security.SecurityManager securityManager; /** - * Returns a reference to the single {@link SecurityManagerProxy} instance configured by - * Apache Geode/Pivotal GemFire in startup. + * Returns a reference to the single {@link SecurityManagerProxy} instance configured by Apache Geode in startup. * * @return a reference to the single {@link SecurityManagerProxy} instance. */ @@ -174,8 +173,6 @@ public class SecurityManagerProxy extends LazyWiringDeclarableSupport @Override protected BeanFactory locateBeanFactory() { - - return Optional.ofNullable(this.beanFactory) - .orElseGet(() -> super.locateBeanFactory()); + return this.beanFactory != null ? this.beanFactory : super.locateBeanFactory(); } } diff --git a/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerSupport.java b/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerSupport.java index 033ffddf..5cc28e63 100644 --- a/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerSupport.java +++ b/spring-geode/src/main/java/org/springframework/geode/security/support/SecurityManagerSupport.java @@ -13,7 +13,6 @@ * or implied. See the License for the specific language governing * permissions and limitations under the License. */ - package org.springframework.geode.security.support; import java.util.Properties; @@ -22,9 +21,9 @@ import org.apache.geode.security.AuthenticationFailedException; import org.apache.geode.security.ResourcePermission; /** - * {@link SecurityManagerSupport} is an abstract base class implementing Apache Geode/Pivotal GemFire's + * {@link SecurityManagerSupport} is an abstract base class implementing Apache Geode's * {@link org.apache.geode.security.SecurityManager} interface, providing default implementations of the - * {@literal SecurityManager's} auth methods. + * {@link org.apache.geode.security.SecurityManager's} auth methods. * * @author John Blum * @see org.apache.geode.security.SecurityManager diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java index 57b9521e..1958912d 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterAvailableConfigurationIntegrationTests.java @@ -21,6 +21,12 @@ import java.io.IOException; import javax.annotation.Resource; +import org.junit.AfterClass; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; + import org.apache.geode.cache.DataPolicy; import org.apache.geode.cache.GemFireCache; import org.apache.geode.cache.Region; @@ -28,12 +34,6 @@ import org.apache.geode.cache.client.ClientCache; import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.cache.server.CacheServer; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -54,7 +54,7 @@ import example.app.crm.service.CustomerService; /** * Integration Tests asserting the functionality and behavior of {@link EnableClusterAware} - * and {@link ClusterAvailableConfiguration} when the Apache Geode (or Pivotal GemFire) cluster of servers is available. + * and {@link ClusterAvailableConfiguration} when the Apache Geode cluster of servers is available. * * @author John Blum * @see org.junit.Test diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java index 3186d051..4f565bbb 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/ClusterNotAvailableConfigurationIntegrationTests.java @@ -19,16 +19,16 @@ import static org.assertj.core.api.Assertions.assertThat; import javax.annotation.Resource; -import org.apache.geode.cache.DataPolicy; -import org.apache.geode.cache.GemFireCache; -import org.apache.geode.cache.Region; -import org.apache.geode.cache.client.ClientRegionShortcut; - import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.apache.geode.cache.DataPolicy; +import org.apache.geode.cache.GemFireCache; +import org.apache.geode.cache.Region; +import org.apache.geode.cache.client.ClientRegionShortcut; + import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.data.gemfire.client.ClientRegionFactoryBean; @@ -43,7 +43,7 @@ import example.app.crm.service.CustomerService; /** * Integration Tests asserting the functionality and behavior of {@link EnableClusterAware} - * and {@link ClusterNotAvailableConfiguration} when the Apache Geode (or Pivotal GemFire) cluster of servers + * and {@link ClusterNotAvailableConfiguration} when the Apache Geode cluster of servers * is not available. * * @author John Blum diff --git a/spring-geode/src/test/java/org/springframework/geode/config/annotation/LocatorsConfigurationIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/config/annotation/LocatorsConfigurationIntegrationTests.java index 48fbe365..d37b22d2 100644 --- a/spring-geode/src/test/java/org/springframework/geode/config/annotation/LocatorsConfigurationIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/config/annotation/LocatorsConfigurationIntegrationTests.java @@ -162,7 +162,7 @@ public class LocatorsConfigurationIntegrationTests extends SpringApplicationCont } // TODO: replace with STDG when STDG is rebased on SD[G] Moore/2.2 and STDG includes dedicated mocking support - // for Apache Geode/Pivotal GemFire Locator creation using SDG's o.s.d.g.LocatorFactoryBean + // for Apache Geode Locator creation using SDG's o.s.d.g.LocatorFactoryBean @EnableGemFireMockObjects @PeerCacheApplication(logLevel = "error") @UseLocators(locators = "mailbox[11235],skullbox[12480]", remoteLocators = "remotehost[10334]") diff --git a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonClientCacheDataImporterExporterIntegrationTests.java b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonClientCacheDataImporterExporterIntegrationTests.java index d36723bf..782ac74b 100644 --- a/spring-geode/src/test/java/org/springframework/geode/data/json/JsonClientCacheDataImporterExporterIntegrationTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/data/json/JsonClientCacheDataImporterExporterIntegrationTests.java @@ -57,7 +57,7 @@ import org.springframework.util.FileCopyUtils; import example.app.crm.model.Customer; /** - * Integration Tests for {@link JsonCacheDataImporterExporter} using a GemFire/Geode {@link ClientCache}. + * Integration Tests for {@link JsonCacheDataImporterExporter} using an Apache Geode {@link ClientCache}. * * @author John Blum * @see java.util.Properties