diff --git a/README.adoc b/README.adoc index 3ea922e..d830d7a 100644 --- a/README.adoc +++ b/README.adoc @@ -24,7 +24,7 @@ By participating, you are expected to uphold this code. Please report unaccepta == Documentation -The documentation for current Spring Session Data GemFire/Geode can be found +The documentation for current Spring Session for Apache Geode and Pivotal GemFire can be found https://docs.spring.io/autorepo/docs/spring-session-data-geode-build/2.0.2.RELEASE/reference/html5/[here]. = Spring Session Project Site diff --git a/docs/src/docs/asciidoc/guides/xml-gemfire-clientserver.adoc b/docs/src/docs/asciidoc/guides/xml-gemfire-clientserver.adoc index bc7f0df..a93c75e 100644 --- a/docs/src/docs/asciidoc/guides/xml-gemfire-clientserver.adoc +++ b/docs/src/docs/asciidoc/guides/xml-gemfire-clientserver.adoc @@ -87,9 +87,9 @@ include::{samples-dir}xml/gemfire-clientserver/src/main/webapp/WEB-INF/spring/se ---- <1> (Optional) First, we can include a `Properties` bean to configure certain aspects of the Apache Geode `ClientCache` -using http://geode.apache.org/docs/guide/12/reference/topics/gemfire_properties.html[GemFire Properties]. In this case, -we are just setting Apache Geode's "`log-level`" from a application-specific System property, defaulting to "`warning`" -if unspecified. +using http://geode.apache.org/docs/guide/12/reference/topics/gemfire_properties.html[Pivotal GemFire Properties]. +In this case, we are just setting Apache Geode's "`log-level`" from a application-specific System property, +defaulting to "`warning`" if unspecified. <2> We must create an instance of an Apache Geode `ClientCache` initialized with our `gemfireProperties`. <3> Then we configure a `Pool` of client connections to talk to the Apache Geode Server in our Client/Server topology. In our configuration, we use sensible settings for timeouts, number of connections and so on. Also, our `Pool` @@ -120,9 +120,9 @@ include::{samples-dir}xml/gemfire-clientserver/src/main/resources/META-INF/sprin ---- <1> (Optional) First, we can include a `Properties` bean to configure certain aspects of the Apache Geode peer `Cache` -using http://geode.apache.org/docs/guide/12/reference/topics/gemfire_properties.html[GemFire Properties]. In this case, -we are just setting Apache Geode's "`log-level`" from a application-specific System property, defaulting to "`warning`" -if unspecified. +using http://geode.apache.org/docs/guide/12/reference/topics/gemfire_properties.html[Pivotal GemFire Properties]. +In this case, we are just setting Apache Geode's "`log-level`" from a application-specific System property, +defaulting to "`warning`" if unspecified. <2> We must configure an Apache Geode peer `Cache` instance initialized with the Apache Geode properties. <3> Next, we define a `CacheServer` with sensible configuration for `bind-address` and `port` used by our cache client application to connect to the server to pass Session state. diff --git a/docs/src/docs/asciidoc/guides/xml-gemfire-p2p.adoc b/docs/src/docs/asciidoc/guides/xml-gemfire-p2p.adoc index c11c537..f00f4aa 100644 --- a/docs/src/docs/asciidoc/guides/xml-gemfire-p2p.adoc +++ b/docs/src/docs/asciidoc/guides/xml-gemfire-p2p.adoc @@ -88,9 +88,9 @@ include::{samples-dir}xml/gemfire-p2p/src/main/webapp/WEB-INF/spring/session.xml ---- <1> (Optional) First, we can include a `Properties` bean to configure certain aspects of the Apache Geode peer `Cache` -using http://geode.apache.org/docs/guide/12/reference/topics/gemfire_properties.html[GemFire Properties]. In this case, -we are just setting Apache Geode's "`log-level`" from a application-specific System property, defaulting to "`warning`" -if unspecified. +using http://geode.apache.org/docs/guide/12/reference/topics/gemfire_properties.html[Pivotal GemFire Properties]. +In this case, we are just setting Apache Geode's "`log-level`" from a application-specific System property, +defaulting to "`warning`" if unspecified. <2> We must configure an Apache Geode peer `Cache` instance initialized with the Apache Geode properties. <3> Finally, we enable _Spring Session_ functionality by registering an instance of `GemFireHttpSessionConfiguration`. diff --git a/docs/src/docs/asciidoc/index.adoc b/docs/src/docs/asciidoc/index.adoc index 2857933..393c2ea 100644 --- a/docs/src/docs/asciidoc/index.adoc +++ b/docs/src/docs/asciidoc/index.adoc @@ -113,7 +113,7 @@ http://geode.apache.org/docs/guide/12/topologies_and_comm/multi_site_configurati The ability to configure and use _Apache Geode's_ WAN functionality is independent of _Spring Session_, and beyond the scope of this document. -More details on configuring _Apache Geode_ WAN functionality using _Spring Data Geode_ can be found +More details on configuring _Apache Geode_ WAN functionality using _Spring Data Apache Geode_ can be found http://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#bootstrap:gateway[here]. [[httpsession-gemfire-clientserver]] @@ -209,7 +209,7 @@ with Apache Geode (P2P) using XML Guide_ when integrating with your own applicat include::guides/xml-gemfire-p2p.adoc[tags=config,leveloffset=+3] [[httpsession-gemfire-serialization]] -=== Apache Geode/Pivotal Pivotal GemFire Serialization +=== Apache Geode/Pivotal GemFire Serialization In order to transfer data between clients and servers, or when data is distributed/replicated between peer nodes in a cluster, the data must be serialized. In this case, the data in question is the Session's state. @@ -233,7 +233,7 @@ As such, Pivotal GemFire and Apache Geode provides its own serialization framewo 2. http://geode.apache.org/docs/guide/12/developing/data_serialization/gemfire_pdx_serialization.html[PDX Serialization] [[httpsession-gemfire-serialization-background]] -==== Apache Geode/Pivotal Pivotal GemFire Serialization Background +==== Apache Geode/Pivotal GemFire Serialization Background As mentioned above, Apache Geode and Pivotal GemFire provide 2 additional serialization frameworks: _Data Serialization_ and PDX _Serialization_. @@ -249,9 +249,9 @@ or overflowed to disk. However, _Data Serialization_ incurs a CPU penalty anytime data is transferred over-the-wire, or persisted/overflowed to and accessed from disk, since the receiving end performs a deserialization. In fact, anytime _Delta Propagation_ -is used, the object must be deserialized on the receiving end in order to apply the "delta", since GemFire/Apache Geode -applies deltas by invoking a method on the object that implements the `org.apache.geode.Delta` interface. Clearly, -you cannot invoke a method on a serialized object. +is used, the object must be deserialized on the receiving end in order to apply the "delta", since Pivotal GemFire +/ Apache Geode applies deltas by invoking a method on the object that implements the `org.apache.geode.Delta` interface. +Clearly, you cannot invoke a method on a serialized object. [[httpsession-gemfire-serialization-pdx]] ===== PDX @@ -282,7 +282,7 @@ Native Clients with Java clients, typically there will not be any associated Jav of the servers in the cluster. With PDX, it is not necessary to provide the Java types on the classpath, and many customers who only develop and use Native Clients will not provide any Java types for the corresponding C# types. -GemFire and Apache Geode also support JSON serialized to/from PDX. In this case, it is very likely that Java types will +Pivotal GemFire and Apache Geode also support JSON serialized to/from PDX. In this case, it is very likely that Java types will not be provided on the servers classpath since many different languages (e.g. JavaScript, Python, Ruby) supporting JSON can be used with Pivotal GemFire and Apache Geode. @@ -316,7 +316,7 @@ but rather a method containing a computation based on another field of `Person` Likewise, calling any `java.lang.Object` method in a OQL query, like `Object.toString()`, is going to cause a deserialization to happen as well. -GemFire and Apache Geode do provide the http://geode.apache.org/releases/latest/javadoc/org/apache/geode/cache/client/ClientCacheFactory.html#setPdxReadSerialized-boolean-[`read-serialized`] +Pivotal GemFire and Apache Geode do provide the http://geode.apache.org/releases/latest/javadoc/org/apache/geode/cache/client/ClientCacheFactory.html#setPdxReadSerialized-boolean-[`read-serialized`] configuration setting so that any cache `Region.get(key)` operations that are potentially invoked inside a `Function` do not cause PDX serialized objects to be deserialized. But, nothing will prevent an ill-conceived OQL query from causing a deserialization, so be careful. @@ -324,7 +324,7 @@ from causing a deserialization, so be careful. [[httpsession-gemfire-serialization-java-data-pdx]] ===== PDX + _Data Serialization_ + _Java Serialization_ -It is possible for Apache Geode/Pivotal Pivotal GemFire to support all 3 serialization formats simultaneously. +It is possible for Apache Geode/Pivotal GemFire to support all 3 serialization formats simultaneously. For instance, your application domain model might contain objects that implement the `java.io.Serialiable` interface, and you may be using a combination of the _Data Serialization_ framework along with PDX. @@ -409,8 +409,8 @@ wishes to use with her _Spring Session_ application backed by either Apache Geod ==== Spring Session for Pivotal GemFire/Apache Geode Serialization Framework To abstract away the details of Apache Geode/Pivotal GemFire's _Data Serialization_ and _PDX Serialization_ frameworks -_Spring Session for Pivotal GemFire/Apache Geode_ provides its own Serialization framework (facade) wrapping GemFire/Apache Geode's -Serialization frameworks. +_Spring Session for Pivotal GemFire/Apache Geode_ provides its own Serialization framework (facade) wrapping +Pivotal GemFire/Apache Geode's Serialization frameworks. The Serialization API exists under the `org.springframework.session.data.gemfire.serialization` package. @@ -441,26 +441,27 @@ Basically, the interface allows you to serialize and deserialize a _Spring_ `Ses The `IN` and `OUT` type parameters and corresponding method arguments of those types provide reference to the objects responsible for writing the `Session` to a stream of bytes or reading the `Session` from a stream of bytes. The actual -arguments will be type dependent/specific, based on the underlying GemFire/Apache Geode Serialization strategy configured. +arguments will be type dependent/specific, based on the underlying Pivotal GemFire/Apache Geode Serialization +strategy configured. -For instance, when using GemFire/Apache Geode's PDX _Serialization_ framework, `IN` and `OUT` will be instances of -`org.apache.geode.pdx.PdxReader` and `org.apache.geode.pdx.PdxWriter`, respectively. When GemFire/Apache Geode's +For instance, when using Pivotal GemFire/Apache Geode's PDX _Serialization_ framework, `IN` and `OUT` will be instances of +`org.apache.geode.pdx.PdxReader` and `org.apache.geode.pdx.PdxWriter`, respectively. When Pivotal GemFire/Apache Geode's _Data Serialization_ framework has been configured, then `IN` and `OUT` will be instances of `java.io.DataInput` and `java.io.DataOuput`, respectively. These arguments are provided to the `SessionSerializer` implementation by the framework automatically, and as mentioned -above, is based on the underlying GemFire/Apache Geode Serialization strategy configured. +above, is based on the underlying Pivotal GemFire/Apache Geode Serialization strategy configured. -Essentially, even though _Spring Session for Pivotal GemFire/Apache Geode_ provides a facade around GemFire/Apache Geode's Serialization -frameworks, under-the-hood, GemFire/Apache Geode still expects that one of these Serialization frameworks is being used to -serialize data to/from GemFire/Apache Geode. +Essentially, even though _Spring Session for Pivotal GemFire/Apache Geode_ provides a facade around Pivotal GemFire/Apache Geode's +Serialization frameworks, under-the-hood, Pivotal GemFire/Apache Geode still expects that one of these Serialization frameworks +is being used to serialize data to/from Pivotal GemFire/Apache Geode. _So what purpose does the `SessionSerializer` interface really serve then?_ Effectively, it allows a user to customize what aspects of the Session's state actually gets serialized and stored in Pivotal GemFire or Apache Geode. Application developers can provide their own custom, application-specific `SessionSerializer` implementation, register it as a bean in the _Spring_ context, and then configure it to be used by _Spring Session -Data GemFire/Apache Geode_ to serialize the Session state... +for Pivotal GemFire/Apache Geode_ to serialize the Session state... [source, java] ---- @@ -481,56 +482,56 @@ _Spring Session for Pivotal GemFire/Apache Geode_ (SSDG) provides assistance whe `SessionSerializer` that fits into one of Pivotal GemFire or Apache Geode's Serialization frameworks. If the user just implements the `org.springframework.session.data.gemfire.serialization.SessionSerializer` interface -directly without extending from one of SSDG's provided abstract base classes, pertaining to 1 of GemFire/Apache Geode's +directly without extending from one of SSDG's provided abstract base classes, pertaining to 1 of Pivotal GemFire/Apache Geode's Serialization frameworks , then SSDG will wrap the user's custom `SessionSerializer` implementation in an instance of `org.springframework.session.data.gemfire.serialization.pdx.support.PdxSerializerSessionSerializerAdapter` and register -it with GemFire/Apache Geode as a `org.apache.geode.pdx.PdxSerializer`. +it with Pivotal GemFire/Apache Geode as a `org.apache.geode.pdx.PdxSerializer`. _Spring Session for Pivotal GemFire/Apache Geode_ is careful not to stomp on any existing, `PdxSerializer` implementation that a user -may already have registered with the GemFire/Apache Geode cache by some other means. Indeed, several different and provided -implementations of the GemFire/Apache Geode `org.apache.geode.pdx.PdxSerializer` interface do exists: +may already have registered with the Pivotal GemFire/Apache Geode cache by some other means. Indeed, several different and provided +implementations of the Pivotal GemFire/Apache Geode `org.apache.geode.pdx.PdxSerializer` interface do exists: * Pivotal GemFire/Apache Geode itself provides the http://geode.apache.org/releases/latest/javadoc/org/apache/geode/pdx/ReflectionBasedAutoSerializer.html[`org.apache.geode.pdx.ReflectionBasedAutoSerializer`]. -* _Spring Data GemFire/Apache Geode_ (SDG) provide the +* _Spring Data for Apache Geode or Pivotal GemFire_ (SDG) provide the https://docs.spring.io/spring-data/geode/docs/current/api/org/springframework/data/gemfire/mapping/MappingPdxSerializer.html[`org.springframework.data.gemfire.mapping.MappingPdxSerializer`], which is used in the SD _Repository_ abstraction and SDG extension to handle mapping PDX serialized types to the application domain object types defined in the application _Repository_ interfaces. This is accomplished by obtaining any currently registered `PdxSerializer` instance on the cache and composing it with the `PdxSerializerSessionSerializerAdapter` wrapping the user's custom application `SessionSerializer` -implementation and re-registering this "_composite_" `PdxSerializer` on the GemFire/Apache Geode cache. The "_composite_" +implementation and re-registering this "_composite_" `PdxSerializer` on the Pivotal GemFire/Apache Geode cache. The "_composite_" `PdxSerializer` implementation is provided _Spring Session for Pivotal GemFire/Apache Geode's_ `org.springframework.session.data.gemfire.pdx.support.ComposablePdxSerializer` class when entities are stored in either -GemFire or Apache Geode as PDX. +Pivotal GemFire or Apache Geode as PDX. -If no other `PdxSerializer` was currently registered with the GemFire/Apache Geode cache, then the adapter +If no other `PdxSerializer` was currently registered with the Pivotal GemFire/Apache Geode cache, then the adapter is simply registered. -Of course, the user is allowed to force the underlying GemFire/Apache Geode Serialization strategy used with his/her custom -`SessionSerializer` implementation by doing 1 of the following... +Of course, the user is allowed to force the underlying Pivotal GemFire/Apache Geode Serialization strategy used with +his/her custom `SessionSerializer` implementation by doing 1 of the following... -1. The custom `SessionSerializer` implementation can implement GemFire/Apache Geode's `org.apache.geode.pdx.PdxSerializer` +1. The custom `SessionSerializer` implementation can implement Pivotal GemFire/Apache Geode's `org.apache.geode.pdx.PdxSerializer` interface, or for convenience, extend _Spring Session for Pivotal GemFire/Apache Geode's_ `org.springframework.session.data.gemfire.serialization.pdx.AbstractPdxSerializableSessionSerializer` class and _Spring Session for Pivotal GemFire/Apache Geode_ will register the custom `SessionSerializer` as a `PdxSerializer` -with GemFire/Apache Geode. +with Pivotal GemFire/Apache Geode. -2. The custom `SessionSerializer` implementation can extend the GemFire/Apache Geode's `org.apache.geode.DataSerializable` +2. The custom `SessionSerializer` implementation can extend the Pivotal GemFire/Apache Geode's `org.apache.geode.DataSerializable` class, or for convenience, extend _Spring Session for Pivotal GemFire/Apache Geode's_ `org.springframework.session.data.gemfire.serialization.data.AbstractDataSerializableSessionSerializer` class and _Spring Session for Pivotal GemFire/Apache Geode_ will register the custom `SessionSerializer` as a `DataSerializer` -with GemFire/Apache Geode. +with Pivotal GemFire/Apache Geode. -3. Finally, a user can create a custom `SessionSerializer` implementation as before, not specifying which GemFire/Apache Geode -Serialization framework to use because the custom `SessionSeriaizer` implementation does not implement any GemFire/Apache Geode +3. Finally, a user can create a custom `SessionSerializer` implementation as before, not specifying which Pivotal GemFire/Apache Geode +Serialization framework to use because the custom `SessionSeriaizer` implementation does not implement any Pivotal GemFire/Apache Geode serialization interfaces or extend from any of _Spring Session for Pivotal GemFire/Apache Geode's_ provided abstract base classes, -and still have it registered in GemFire/Apache Geode as a `DataSerializer` by declaring an additional +and still have it registered in Pivotal GemFire/Apache Geode as a `DataSerializer` by declaring an additional _Spring Session for Pivotal GemFire/Apache Geode_ bean in the _Spring_ context of type `org.springframework.session.data.gemfire.serialization.data.support.DataSerializerSessionSerializerAdapter`, like so... -.Forcing the registration of a custom SessionSerializer as a DataSerializer in GemFire/Apache Geode +.Forcing the registration of a custom SessionSerializer as a DataSerializer in Pivotal GemFire/Apache Geode [source, java] ---- @EnableGemFireHttpSession(sessionSerializerBeanName = "customSessionSerializer") @@ -550,22 +551,22 @@ class Application { Just by the very presence of the `DataSerializerSessionSerializerAdapter` registered as a bean in the _Spring_ context any neutral, custom `SessionSerializer` implementation will be treated and registered as a `DataSerializer` -in GemFire/Apache Geode. +in Pivotal GemFire/Apache Geode. [[httpsession-gemfire-serialization-framework-session-representation]] ===== Changing the Session Representation Internally, _Spring Session for Pivotal GemFire/Apache Geode_ maintains 2 representations for the (HTTP) Session and the Session's -attributes. Each representation is based on whether GemFire/Apache Geode "_Deltas_" are supported or not. GemFire/Apache Geode +attributes. Each representation is based on whether Pivotal GemFire/Apache Geode "_Deltas_" are supported or not. Pivotal GemFire/Apache Geode _Delta Propagation_ is only enabled by _Spring Session for Pivotal GemFire/Apache Geode_ when using _Data Serialization_ for reasons that were discussed <>. Effectively, the strategy is: -1. If GemFire/Apache Geode _Data Serialization_ is configured, then _Deltas_ are supported and the +1. If Pivotal GemFire/Apache Geode _Data Serialization_ is configured, then _Deltas_ are supported and the `DeltaCapableGemFireSession` and `DeltaCapableGemFireSessionAttributes` representations are used. -2. If GemFire/Apache Geode _PDX Serialization_ is configured, then the _Delta Propagation_ will be disabled and the +2. If Pivotal GemFire/Apache Geode _PDX Serialization_ is configured, then the _Delta Propagation_ will be disabled and the `GemFireSession` and `GemFireSessionAttributes` representations are used. It is possible to override these internal representations used by _Spring Session for Pivotal GemFire/Apache Geode_, and for users @@ -600,11 +601,11 @@ class MySessionRepository extends GemFireOperationsSessionRepository { } ---- -If the user provided his/her own custom `SessionSerializer` implementation and GemFire/Apache Geode _PDX Serialization_ +If the user provided his/her own custom `SessionSerializer` implementation and Pivotal GemFire/Apache Geode _PDX Serialization_ is configured, then the user is done. -However, if the user configured GemFire/Apache Geode _Data Serialization_ then the user must provide a custom implementation -of the `SessionSerializer` interface and either have it directly extend the GemFire/Apache Geode's +However, if the user configured Pivotal GemFire/Apache Geode _Data Serialization_ then the user must provide a custom implementation +of the `SessionSerializer` interface and either have it directly extend the Pivotal GemFire/Apache Geode's `org.apache.geode.DataSerializer` class, or extend _Spring Session for Pivotal GemFire/Apache Geode's_ `org.springframework.session.data.gemfire.serialization.data.AbstractDataSerializableSessionSerializer` class and override the `getSupportedClasses():Class[]` method. @@ -627,7 +628,7 @@ class MySessionSerializer extends AbstractDataSerializableSessionSerializer { Unfortunately, `getSupportedClasses()` cannot return the generic _Spring Session_ `org.springframework.session.Session` interface type. If it could then we could avoid the explicit need to override the `getSupportedClasses()` method -on the custom `DataSerializer` implementaton. Bu, GemFire/Apache Geode's _Data Serialization_ framework can only match +on the custom `DataSerializer` implementaton. Bu, Pivotal GemFire/Apache Geode's _Data Serialization_ framework can only match on exact class types since it incorrectly and internally stores and refers to the class type by name, which basically requires a user to override and implement the `getSupportedClasses()` method. diff --git a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java index d4cb24e..9325b33 100644 --- a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/client/Application.java @@ -47,7 +47,7 @@ import sample.client.model.RequestScopedProxyBean; import sample.client.model.SessionScopedProxyBean; /** - * A Spring Boot, GemFire cache client, web application that reveals the current state of the HTTP Session. + * A Spring Boot, Pivotal GemFire cache client, web application that reveals the current state of the HTTP Session. * * @author John Blum * @see javax.servlet.http.HttpSession diff --git a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java index dc6c97f..9382cf0 100644 --- a/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java +++ b/samples/boot/gemfire-with-scoped-proxies/src/main/java/sample/server/GemFireServer.java @@ -28,7 +28,7 @@ import org.springframework.data.gemfire.config.annotation.EnableManager; import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession; /** - * A Spring Boot application bootstrapping a GemFire Cache Server JVM process. + * A Spring Boot application bootstrapping a Pivotal GemFire Cache Server JVM process. * * @author John Blum * @see org.springframework.boot.SpringApplication diff --git a/samples/boot/gemfire/src/main/java/sample/client/Application.java b/samples/boot/gemfire/src/main/java/sample/client/Application.java index 20a154d..4f557a8 100644 --- a/samples/boot/gemfire/src/main/java/sample/client/Application.java +++ b/samples/boot/gemfire/src/main/java/sample/client/Application.java @@ -48,7 +48,7 @@ import org.springframework.web.servlet.config.annotation.ViewControllerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; /** - * A Spring Boot, GemFire cache client, web application that reveals the current state of the HTTP Session. + * A Spring Boot, Pivotal GemFire cache client, web application that reveals the current state of the HTTP Session. * * @author John Blum * @see javax.servlet.http.HttpSession diff --git a/samples/boot/gemfire/src/main/java/sample/client/IntegrationTestConfiguration.java b/samples/boot/gemfire/src/main/java/sample/client/IntegrationTestConfiguration.java index 65a2c3d..60736e2 100644 --- a/samples/boot/gemfire/src/main/java/sample/client/IntegrationTestConfiguration.java +++ b/samples/boot/gemfire/src/main/java/sample/client/IntegrationTestConfiguration.java @@ -131,8 +131,8 @@ public class IntegrationTestConfiguration { } Assert.state(cacheClientSubscriptionQueueConnectionEstablished, - String.format("Cache client subscription queue connection not established; Geode Pool was [%s];" - + " Geode Pool configuration was [locators = %s, servers = %s]", + String.format("Cache client subscription queue connection not established; Apache Geode Pool was [%s];" + + " Apache Geode Pool configuration was [locators = %s, servers = %s]", pool, pool.getLocators(), pool.getServers())); } diff --git a/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java b/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java index 3cf2762..0596492 100644 --- a/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java +++ b/samples/boot/gemfire/src/main/java/sample/server/GemFireServer.java @@ -27,7 +27,7 @@ import org.springframework.data.gemfire.config.annotation.EnableManager; import org.springframework.session.data.gemfire.config.annotation.web.http.EnableGemFireHttpSession; /** - * A Spring Boot application bootstrapping a GemFire Cache Server JVM process. + * A Spring Boot application bootstrapping a Pivotal GemFire Cache Server JVM process. * * @author John Blum * @see org.springframework.boot.SpringApplication diff --git a/samples/boot/gemfire/src/main/java/sample/server/NativeGemFireServer.java b/samples/boot/gemfire/src/main/java/sample/server/NativeGemFireServer.java index e4bf1f5..afd9fa9 100644 --- a/samples/boot/gemfire/src/main/java/sample/server/NativeGemFireServer.java +++ b/samples/boot/gemfire/src/main/java/sample/server/NativeGemFireServer.java @@ -37,7 +37,7 @@ import org.springframework.session.data.gemfire.config.annotation.web.http.GemFi import org.springframework.util.StringUtils; /** - * The {@link NativeGemFireServer} class uses the GemFire API to create a GemFire (cache) instance. + * The {@link NativeGemFireServer} class uses the Pivotal GemFire API to create a Pivotal GemFire (cache) instance. * * @author John Blum * @see org.apache.geode.cache.Cache diff --git a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/IntegrationTestConfig.java b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/IntegrationTestConfig.java index 7278360..36bfb08 100644 --- a/samples/javaconfig/gemfire-clientserver/src/main/java/sample/IntegrationTestConfig.java +++ b/samples/javaconfig/gemfire-clientserver/src/main/java/sample/IntegrationTestConfig.java @@ -131,8 +131,8 @@ public abstract class IntegrationTestConfig { } Assert.state(cacheClientSubscriptionQueueConnectionEstablished, - String.format("Cache client subscription queue connection not established; Geode Pool was [%s];" - + " Geode Pool configuration was [locators = %s, servers = %s]", + String.format("Cache client subscription queue connection not established; Apache Geode Pool was [%s];" + + " Apache Geode Pool configuration was [locators = %s, servers = %s]", pool, pool.getLocators(), pool.getServers())); } diff --git a/samples/xml/gemfire-clientserver/src/main/java/sample/ClientServerReadyBeanPostProcessor.java b/samples/xml/gemfire-clientserver/src/main/java/sample/ClientServerReadyBeanPostProcessor.java index a9cef95..1009b87 100644 --- a/samples/xml/gemfire-clientserver/src/main/java/sample/ClientServerReadyBeanPostProcessor.java +++ b/samples/xml/gemfire-clientserver/src/main/java/sample/ClientServerReadyBeanPostProcessor.java @@ -134,8 +134,8 @@ public class ClientServerReadyBeanPostProcessor implements BeanPostProcessor { } Assert.state(cacheClientSubscriptionQueueConnectionEstablished, - String.format("Cache client subscription queue connection not established; Geode Pool was [%s];" - + " Geode Pool configuration was [locators = %s, servers = %s]", + String.format("Cache client subscription queue connection not established; Apache Geode Pool was [%s];" + + " Apache Geode Pool configuration was [locators = %s, servers = %s]", pool, pool.getLocators(), pool.getServers())); } diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/AbstractGemFireIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/AbstractGemFireIntegrationTests.java index 0463172..486cab6 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/AbstractGemFireIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/AbstractGemFireIntegrationTests.java @@ -57,7 +57,7 @@ import org.springframework.util.StringUtils; /** * {@link AbstractGemFireIntegrationTests} is an abstract base class encapsulating common functionality - * for writing Spring Session Data GemFire & Geode integration tests. + * for writing Spring Session Data Pivotal GemFire & Apache Geode integration tests. * * @author John Blum * @since 1.1.0 diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerGemFireOperationsSessionRepositoryIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerGemFireOperationsSessionRepositoryIntegrationTests.java index a5f769d..ed7c30c 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerGemFireOperationsSessionRepositoryIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerGemFireOperationsSessionRepositoryIntegrationTests.java @@ -69,7 +69,7 @@ import org.springframework.util.SocketUtils; /** * Integration tests testing the functionality of Apache Geode / Pivotal GemFire backed Spring Sessions - * using the GemFire client-server topology. + * using the Pivotal GemFire client-server topology. * * @author John Blum * @since 1.1.0 @@ -124,7 +124,7 @@ public class ClientServerGemFireOperationsSessionRepositoryIntegrationTests int port = SocketUtils.findAvailableTcpPort(); - System.err.printf("Starting a GemFire Server running on host [%1$s] listening on port [%2$d]%n", + System.err.printf("Starting a Pivotal GemFire Server running on host [%1$s] listening on port [%2$d]%n", TestGemFireServerConfiguration.SERVER_HOSTNAME, port); System.setProperty("spring.session.data.gemfire.port", String.valueOf(port)); diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerHttpSessionAttributesDeltaIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerHttpSessionAttributesDeltaIntegrationTests.java index 8c9d073..77d0ff8 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerHttpSessionAttributesDeltaIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerHttpSessionAttributesDeltaIntegrationTests.java @@ -53,7 +53,7 @@ import org.springframework.util.SocketUtils; /** * Integration tests testing the addition/removal of HTTP Session Attributes - * and the proper persistence of the HTTP Session state in a GemFire cache + * and the proper persistence of the HTTP Session state in a Pivotal GemFire cache * across a client/server topology. * * @author John Blum @@ -91,7 +91,7 @@ public class ClientServerHttpSessionAttributesDeltaIntegrationTests extends Abst int port = SocketUtils.findAvailableTcpPort(); - System.err.printf("Starting a GemFire Server running on host [%1$s] listening on port [%2$d]%n", + System.err.printf("Starting a Pivotal GemFire Server running on host [%1$s] listening on port [%2$d]%n", SpringSessionDataGemFireServerConfiguration.SERVER_HOSTNAME, port); System.setProperty("spring.session.data.gemfire.port", String.valueOf(port)); diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerProxyRegionSessionOperationsIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerProxyRegionSessionOperationsIntegrationTests.java index a62e82e..d42079b 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerProxyRegionSessionOperationsIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/ClientServerProxyRegionSessionOperationsIntegrationTests.java @@ -88,7 +88,7 @@ public class ClientServerProxyRegionSessionOperationsIntegrationTests extends Ab int port = SocketUtils.findAvailableTcpPort(); - System.err.printf("Starting a GemFire Server running on host [%1$s] listening on port [%2$d]%n", + System.err.printf("Starting a Pivotal GemFire Server running on host [%1$s] listening on port [%2$d]%n", SpringSessionDataGemFireServerConfiguration.SERVER_HOSTNAME, port); System.setProperty("spring.session.data.gemfire.port", String.valueOf(port)); diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationTests.java index bcd1fbb..9fa03e3 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationTests.java @@ -65,9 +65,9 @@ import org.springframework.util.FileSystemUtils; import org.springframework.util.SocketUtils; /** - * Integration test to test the functionality of a GemFire cache client in a Spring Session application - * using a specifically named GemFire {@link org.apache.geode.cache.client.Pool} configured with - * the 'poolName' attribute in the Spring Session Data GemFire {@link EnableGemFireHttpSession} annotation. + * Integration test to test the functionality of a Pivotal GemFire cache client in a Spring Session application + * using a specifically named Pivotal GemFire {@link org.apache.geode.cache.client.Pool} configured with + * the 'poolName' attribute in the Spring Session Data Pivotal GemFire {@link EnableGemFireHttpSession} annotation. * * @author John Blum * @see org.junit.Test @@ -113,7 +113,7 @@ public class MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationT final int port = SocketUtils.findAvailableTcpPort(); - System.err.printf("Starting a GemFire Server on [%1$s] listening on port [%2$d]%n", + System.err.printf("Starting a Pivotal GemFire Server on [%1$s] listening on port [%2$d]%n", SpringSessionGemFireServerConfiguration.SERVER_HOSTNAME, port); System.setProperty("spring.session.data.gemfire.port", String.valueOf(port)); @@ -243,7 +243,7 @@ public class MultiPoolClientServerGemFireOperationsSessionRepositoryIntegrationT poolFactory.setMinConnections(0); poolFactory.setReadTimeout(500); - // deliberately set to a non-existing GemFire (Cache) Server + // deliberately set to a non-existing Pivotal GemFire (Cache) Server poolFactory.addServers(newConnectionEndpoint("localhost", 53135)); return poolFactory; diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/pdx/SessionSerializationWithPdxRequiresNoServerConfigurationIntegrationTests.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/pdx/SessionSerializationWithPdxRequiresNoServerConfigurationIntegrationTests.java index 2c39c64..7e99b2d 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/pdx/SessionSerializationWithPdxRequiresNoServerConfigurationIntegrationTests.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/serialization/pdx/SessionSerializationWithPdxRequiresNoServerConfigurationIntegrationTests.java @@ -113,7 +113,7 @@ public class SessionSerializationWithPdxRequiresNoServerConfigurationIntegration int port = SocketUtils.findAvailableTcpPort(); - System.err.printf("Starting a GemFire Server running on host [localhost] listening on port [%d]%n", port); + System.err.printf("Starting a Pivotal GemFire Server running on host [localhost] listening on port [%d]%n", port); System.setProperty("spring.session.data.gemfire.cache.server.port", String.valueOf(port)); diff --git a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/server/GemFireServer.java b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/server/GemFireServer.java index 7458ab4..ee8d7aa 100644 --- a/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/server/GemFireServer.java +++ b/spring-session-data-geode/src/integration-test/java/org/springframework/session/data/gemfire/server/GemFireServer.java @@ -31,7 +31,7 @@ import org.apache.geode.cache.RegionShortcut; import org.apache.geode.cache.server.CacheServer; /** - * The {@link GemFireServer} class is a Java application class used to launch a GemFire Server + * The {@link GemFireServer} class is a Java application class used to launch a Pivotal GemFire Server * with a peer {@link Cache}, a {@link CacheServer} and the {@literal ClusteredSpringSessions} * {@link RegionShortcut#PARTITION} {@link Region}. * diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java index 4181b04..d819833 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/AbstractGemFireOperationsSessionRepository.java @@ -121,7 +121,7 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi /** * Constructs an instance of {@link AbstractGemFireOperationsSessionRepository} - * with a required {@link GemfireOperations} instance used to perform GemFire data access operations + * with a required {@link GemfireOperations} instance used to perform Pivotal GemFire data access operations * and interactions supporting the SessionRepository operations. * * @param template {@link GemfireOperations} instance used to interact with GemFire; must not be {@literal null}. @@ -148,7 +148,7 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi /** * Sets the ApplicationEventPublisher used to publish Session events corresponding to - * GemFire cache events. + * Pivotal GemFire cache events. * * @param applicationEventPublisher the Spring ApplicationEventPublisher used to * publish Session-based events; must not be {@literal null}. @@ -326,7 +326,7 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi /** * Used to determine whether the application developer is storing (HTTP) Sessions with other, arbitrary - * application domain objects in the same GemFire cache {@link Region}; crazier things have happened! + * application domain objects in the same Pivotal GemFire cache {@link Region}; crazier things have happened! * * @param obj {@link Object} to evaluate. * @return a boolean value indicating whether the old/new {@link Object} from the {@link Region} @@ -384,7 +384,7 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi "Minimally, the session ID [%s] must be known to trigger a Session event", sessionId)); } /** - * Callback method triggered when an entry is created in the GemFire cache {@link Region}. + * Callback method triggered when an entry is created in the Pivotal GemFire cache {@link Region}. * * @param event {@link EntryEvent} containing the details of the cache operation. * @see org.apache.geode.cache.EntryEvent @@ -404,7 +404,7 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi } /** - * Callback method triggered when an entry is destroyed in the GemFire cache {@link Region}. + * Callback method triggered when an entry is destroyed in the Pivotal GemFire cache {@link Region}. * * @param event {@link EntryEvent} containing the details of the cache operation. * @see org.apache.geode.cache.EntryEvent @@ -423,7 +423,7 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi } /** - * Callback method triggered when an entry is invalidated in the GemFire cache {@link Region}. + * Callback method triggered when an entry is invalidated in the Pivotal GemFire cache {@link Region}. * * @param event {@link EntryEvent} containing the details of the cache operation. * @see org.apache.geode.cache.EntryEvent @@ -1011,7 +1011,7 @@ public abstract class AbstractGemFireOperationsSessionRepository extends CacheLi /** * The GemFireSessionAttributes class is a container for Session attributes implementing - * both the {@link DataSerializable} and {@link Delta} GemFire interfaces for efficient + * both the {@link DataSerializable} and {@link Delta} Pivotal GemFire interfaces for efficient * storage and distribution (replication) in GemFire. Additionally, GemFireSessionAttributes * extends {@link AbstractMap} providing {@link Map}-like behavior since attributes of a Session * are effectively a name to value mapping. diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java index f000c0a..025da22 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/GemFireOperationsSessionRepository.java @@ -28,7 +28,7 @@ import org.springframework.session.SessionRepository; /** * The {@link GemFireOperationsSessionRepository} class is a Spring {@link SessionRepository} implementation - * that interfaces with and uses GemFire to back and store Spring Sessions. + * that interfaces with and uses Pivotal GemFire to back and store Spring Sessions. * * @author John Blum * @see org.springframework.data.gemfire.GemfireOperations @@ -39,11 +39,11 @@ import org.springframework.session.SessionRepository; */ public class GemFireOperationsSessionRepository extends AbstractGemFireOperationsSessionRepository { - // GemFire OQL query used to lookup Sessions by arbitrary attributes. + // Pivotal GemFire OQL query used to lookup Sessions by arbitrary attributes. protected static final String FIND_SESSIONS_BY_INDEX_NAME_INDEX_VALUE_QUERY = "SELECT s FROM %1$s s WHERE s.attributes['%2$s'] = $1"; - // GemFire OQL query used to look up Sessions by principal name. + // Pivotal GemFire OQL query used to look up Sessions by principal name. protected static final String FIND_SESSIONS_BY_PRINCIPAL_NAME_QUERY = "SELECT s FROM %1$s s WHERE s.principalName = $1"; @@ -87,11 +87,11 @@ public class GemFireOperationsSessionRepository extends AbstractGemFireOperation } /** - * Prepares the appropriate GemFire OQL query based on the indexed Session attribute + * Prepares the appropriate Pivotal GemFire OQL query based on the indexed Session attribute * name. * * @param indexName a String indicating the name of the indexed Session attribute. - * @return an appropriate GemFire OQL statement for querying on a particular indexed + * @return an appropriate Pivotal GemFire OQL statement for querying on a particular indexed * Session attribute. */ protected String prepareQuery(String indexName) { diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java index 1c0b66d..6349b0d 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/EnableGemFireHttpSession.java @@ -104,7 +104,7 @@ public @interface EnableGemFireHttpSession { /** * Identifies the {@link Session} attributes by name that will be indexed for query operations. * - * For instance, find all {@link Session Sessions} in GemFire or Geode having attribute A defined with value X. + * For instance, find all {@link Session Sessions} in Pivotal GemFire or Apache Geode having attribute A defined with value X. * * @return an array of {@link String Strings} identifying the names of {@link Session} attributes to index. */ diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java index ac707a2..3fd9049 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/GemFireHttpSessionConfiguration.java @@ -137,7 +137,7 @@ public class GemFireHttpSessionConfiguration extends SpringHttpSessionConfigurat /** * Name of the connection {@link Pool} used by the client {@link Region} to send {@link Session} state - * to the cluster of Geode servers. + * to the cluster of Apache Geode servers. */ public static final String DEFAULT_POOL_NAME = GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME; @@ -666,12 +666,12 @@ public class GemFireHttpSessionConfiguration extends SpringHttpSessionConfigurat } /** - * Defines a GemFire Index bean on the GemFire cache {@link Region} storing and managing Sessions, + * Defines a Pivotal GemFire Index bean on the Pivotal GemFire cache {@link Region} storing and managing Sessions, * specifically on the 'principalName' property for quick lookup of Sessions by 'principalName'. * - * @param gemfireCache a reference to the GemFire cache. - * @return a {@link IndexFactoryBean} to create an GemFire Index on the 'principalName' property - * for Sessions stored in the GemFire cache {@link Region}. + * @param gemfireCache a reference to the Pivotal GemFire cache. + * @return a {@link IndexFactoryBean} to create an Pivotal GemFire Index on the 'principalName' property + * for Sessions stored in the Pivotal GemFire cache {@link Region}. * @see org.springframework.data.gemfire.IndexFactoryBean * @see org.apache.geode.cache.GemFireCache */ @@ -692,13 +692,13 @@ public class GemFireHttpSessionConfiguration extends SpringHttpSessionConfigurat } /** - * Defines a GemFire Index bean on the GemFire cache {@link Region} storing and managing Sessions, + * Defines a Pivotal GemFire Index bean on the Pivotal GemFire cache {@link Region} storing and managing Sessions, * specifically on all Session attributes for quick lookup and queries on Session attribute names * with a given value. * - * @param gemfireCache a reference to the GemFire cache. - * @return a {@link IndexFactoryBean} to create an GemFire Index on attributes of Sessions - * stored in the GemFire cache {@link Region}. + * @param gemfireCache a reference to the Pivotal GemFire cache. + * @return a {@link IndexFactoryBean} to create an Pivotal GemFire Index on attributes of Sessions + * stored in the Pivotal GemFire cache {@link Region}. * @see org.springframework.data.gemfire.IndexFactoryBean * @see org.apache.geode.cache.GemFireCache */ diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java index 2e86e6d..ad17015 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/GemFireCacheTypeAwareRegionFactoryBean.java @@ -40,7 +40,7 @@ import org.springframework.util.StringUtils; /** * The {@link GemFireCacheTypeAwareRegionFactoryBean} class is a Spring {@link FactoryBean} - * used to construct, configure and initialize the GemFire cache {@link Region} used to + * used to construct, configure and initialize the Pivotal GemFire cache {@link Region} used to * store and manage Session state. * * @author John Blum @@ -93,11 +93,11 @@ public class GemFireCacheTypeAwareRegionFactoryBean /** * Post-construction initialization callback to create, configure and initialize the - * GemFire cache {@link Region} used to store, replicate (distribute) and manage + * Pivotal GemFire cache {@link Region} used to store, replicate (distribute) and manage * Session state. This method intelligently handles both client-server and - * peer-to-peer (p2p) GemFire supported distributed system topologies. + * peer-to-peer (p2p) Pivotal GemFire supported distributed system topologies. * - * @throws Exception if the initialization of the GemFire cache {@link Region} fails. + * @throws Exception if the initialization of the Pivotal GemFire cache {@link Region} fails. * @see org.springframework.session.data.gemfire.support.GemFireUtils#isClient(GemFireCache) * @see #getGemfireCache() * @see #newClientRegion(GemFireCache) @@ -112,16 +112,16 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Constructs a GemFire cache {@link Region} using a peer-to-peer (p2p) GemFire - * topology to store and manage Session state in a GemFire server cluster accessible - * from a GemFire cache client. + * Constructs a Pivotal GemFire cache {@link Region} using a peer-to-peer (p2p) GemFire + * topology to store and manage Session state in a Pivotal GemFire server cluster accessible + * from a Pivotal GemFire cache client. * * @param gemfireCache a reference to the GemFire * {@link org.apache.geode.cache.Cache}. - * @return a peer-to-peer-based GemFire cache {@link Region} to store and manage + * @return a peer-to-peer-based Pivotal GemFire cache {@link Region} to store and manage * Session state. * @throws Exception if the instantiation, configuration and initialization of the - * GemFire cache {@link Region} fails. + * Pivotal GemFire cache {@link Region} fails. * @see org.springframework.data.gemfire.GenericRegionFactoryBean * @see org.apache.geode.cache.GemFireCache * @see org.apache.geode.cache.Region @@ -143,16 +143,16 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Constructs a GemFire cache {@link Region} using the client-server GemFire topology - * to store and manage Session state in a GemFire server cluster accessible from a - * GemFire cache client. + * Constructs a Pivotal GemFire cache {@link Region} using the client-server Pivotal GemFire topology + * to store and manage Session state in a Pivotal GemFire server cluster accessible from a + * Pivotal GemFire cache client. * * @param gemfireCache a reference to the GemFire * {@link org.apache.geode.cache.Cache}. - * @return a client-server-based GemFire cache {@link Region} to store and manage + * @return a client-server-based Pivotal GemFire cache {@link Region} to store and manage * Session state. * @throws Exception if the instantiation, configuration and initialization of the - * GemFire cache {@link Region} fails. + * Pivotal GemFire cache {@link Region} fails. * @see org.springframework.data.gemfire.client.ClientRegionFactoryBean * @see org.apache.geode.cache.GemFireCache * @see org.apache.geode.cache.Region @@ -196,7 +196,7 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Returns a reference to the constructed GemFire cache {@link Region} used to store + * Returns a reference to the constructed Pivotal GemFire cache {@link Region} used to store * and manage Session state. * * @return the {@link Region} used to store and manage Session state. @@ -208,10 +208,10 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Returns the specific type of GemFire cache {@link Region} this factory creates when + * Returns the specific type of Pivotal GemFire cache {@link Region} this factory creates when * initialized or Region.class when uninitialized. * - * @return the GemFire cache {@link Region} class type constructed by this factory. + * @return the Pivotal GemFire cache {@link Region} class type constructed by this factory. * @see org.apache.geode.cache.Region * @see java.lang.Class */ @@ -221,10 +221,10 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Returns true indicating the GemFire cache {@link Region} created by this factory is + * Returns true indicating the Pivotal GemFire cache {@link Region} created by this factory is * the sole instance. * - * @return true to indicate the GemFire cache {@link Region} storing and managing + * @return true to indicate the Pivotal GemFire cache {@link Region} storing and managing * Sessions is a Singleton. */ public boolean isSingleton() { @@ -233,7 +233,7 @@ public class GemFireCacheTypeAwareRegionFactoryBean /** * Sets a reference to the Spring {@link BeanFactory} responsible for - * creating GemFire components. + * creating Pivotal GemFire components. * * @param beanFactory reference to the Spring {@link BeanFactory} * @throws IllegalArgumentException if the {@link BeanFactory} reference is null. @@ -246,7 +246,7 @@ public class GemFireCacheTypeAwareRegionFactoryBean /** * Gets a reference to the Spring {@link BeanFactory} responsible for - * creating GemFire components. + * creating Pivotal GemFire components. * * @return a reference to the Spring {@link BeanFactory} * @throws IllegalStateException if the {@link BeanFactory} reference @@ -259,7 +259,7 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Sets the {@link Region} data policy used by the GemFire cache client to manage + * Sets the {@link Region} data policy used by the Pivotal GemFire cache client to manage * Session state. * * @param clientRegionShortcut a {@link ClientRegionShortcut} to specify the client @@ -271,7 +271,7 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Returns the {@link Region} data policy used by the GemFire cache client to manage + * Returns the {@link Region} data policy used by the Pivotal GemFire cache client to manage * Session state. Defaults to {@link ClientRegionShortcut#PROXY}. * * @return a {@link ClientRegionShortcut} specifying the client {@link Region} data @@ -284,10 +284,10 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Sets a reference to the GemFire cache used to construct the appropriate + * Sets a reference to the Pivotal GemFire cache used to construct the appropriate * {@link Region}. * - * @param gemfireCache a reference to the GemFire cache. + * @param gemfireCache a reference to the Pivotal GemFire cache. * @throws IllegalArgumentException if the {@link GemFireCache} reference is null. */ public void setGemfireCache(GemFireCache gemfireCache) { @@ -296,10 +296,10 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Returns a reference to the GemFire cache used to construct the appropriate + * Returns a reference to the Pivotal GemFire cache used to construct the appropriate * {@link Region}. * - * @return a reference to the GemFire cache. + * @return a reference to the Pivotal GemFire cache. * @throws IllegalStateException if the {@link GemFireCache} reference is null. */ protected GemFireCache getGemfireCache() { @@ -308,10 +308,10 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Sets the name of the GemFire {@link Pool} used by the client Region for managing Sessions + * Sets the name of the Pivotal GemFire {@link Pool} used by the client Region for managing Sessions * during cache operations involving the server. * - * @param poolName the name of a GemFire {@link Pool}. + * @param poolName the name of a Pivotal GemFire {@link Pool}. * @see Pool#getName() */ public void setPoolName(final String poolName) { @@ -319,10 +319,10 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Returns the name of the GemFire {@link Pool} used by the client Region for managing Sessions + * Returns the name of the Pivotal GemFire {@link Pool} used by the client Region for managing Sessions * during cache operations involving the server. * - * @return the name of a GemFire {@link Pool}. + * @return the name of a Pivotal GemFire {@link Pool}. * @see Pool#getName() */ protected String getPoolName() { @@ -330,11 +330,11 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Sets the GemFire {@link RegionAttributes} used to configure the GemFire cache + * Sets the Pivotal GemFire {@link RegionAttributes} used to configure the Pivotal GemFire cache * {@link Region} used to store and manage Session state. * - * @param regionAttributes the GemFire {@link RegionAttributes} used to configure the - * GemFire cache {@link Region}. + * @param regionAttributes the Pivotal GemFire {@link RegionAttributes} used to configure the + * Pivotal GemFire cache {@link Region}. * @see org.apache.geode.cache.RegionAttributes */ public void setRegionAttributes(RegionAttributes regionAttributes) { @@ -342,10 +342,10 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Returns the GemFire {@link RegionAttributes} used to configure the GemFire cache + * Returns the Pivotal GemFire {@link RegionAttributes} used to configure the Pivotal GemFire cache * {@link Region} used to store and manage Session state. * - * @return the GemFire {@link RegionAttributes} used to configure the GemFire cache + * @return the Pivotal GemFire {@link RegionAttributes} used to configure the Pivotal GemFire cache * {@link Region}. * @see org.apache.geode.cache.RegionAttributes */ @@ -354,20 +354,20 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Sets the name of the GemFire cache {@link Region} use to store and manage Session + * Sets the name of the Pivotal GemFire cache {@link Region} use to store and manage Session * state. * - * @param regionName a String specifying the name of the GemFire cache {@link Region}. + * @param regionName a String specifying the name of the Pivotal GemFire cache {@link Region}. */ public void setRegionName(final String regionName) { this.regionName = regionName; } /** - * Returns the configured name of the GemFire cache {@link Region} use to store and + * Returns the configured name of the Pivotal GemFire cache {@link Region} use to store and * manage Session state. Defaults to "ClusteredSpringSessions" * - * @return a String specifying the name of the GemFire cache {@link Region}. + * @return a String specifying the name of the Pivotal GemFire cache {@link Region}. * @see org.apache.geode.cache.Region#getName() */ protected String getRegionName() { @@ -375,7 +375,7 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Sets the {@link Region} data policy used by the GemFire peer cache to manage + * Sets the {@link Region} data policy used by the Pivotal GemFire peer cache to manage * Session state. * * @param serverRegionShortcut a {@link RegionShortcut} to specify the peer @@ -387,7 +387,7 @@ public class GemFireCacheTypeAwareRegionFactoryBean } /** - * Returns the {@link Region} data policy used by the GemFire peer cache to manage + * Returns the {@link Region} data policy used by the Pivotal GemFire peer cache to manage * Session state. Defaults to {@link RegionShortcut#PARTITION}. * * @return a {@link RegionShortcut} specifying the peer {@link Region} data management diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java index 430705d..0928dd9 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/config/annotation/web/http/support/SessionAttributesIndexFactoryBean.java @@ -34,7 +34,7 @@ import org.springframework.session.data.gemfire.support.GemFireUtils; import org.springframework.util.ObjectUtils; /** - * The SessionAttributesIndexFactoryBean class is a Spring {@link FactoryBean} that creates a GemFire {@link Index} + * The SessionAttributesIndexFactoryBean class is a Spring {@link FactoryBean} that creates a Pivotal GemFire {@link Index} * on the session attributes of the {@link HttpSession} object. * * @author John Blum @@ -81,10 +81,10 @@ public class SessionAttributesIndexFactoryBean } /** - * Constructs a GemFire {@link Index} over the attributes of the {@link HttpSession}. + * Constructs a Pivotal GemFire {@link Index} over the attributes of the {@link HttpSession}. * - * @return a GemFire {@link Index} over the {@link HttpSession} attributes. - * @throws Exception if an error occurs while initializing the GemFire {@link Index}. + * @return a Pivotal GemFire {@link Index} over the {@link HttpSession} attributes. + * @throws Exception if an error occurs while initializing the Pivotal GemFire {@link Index}. * @see org.springframework.data.gemfire.IndexFactoryBean */ protected Index newIndex() throws Exception { @@ -105,7 +105,7 @@ public class SessionAttributesIndexFactoryBean } /** - * Gets the names of all Session attributes that will be indexed by GemFire as single, comma-delimited + * Gets the names of all Session attributes that will be indexed by Pivotal GemFire as single, comma-delimited * String value constituting the Index expression of the Index definition. * * @return a String composed of all the named Session attributes for which GemFire diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/serialization/pdx/AbstractPdxSerializableSessionSerializer.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/serialization/pdx/AbstractPdxSerializableSessionSerializer.java index b775557..73bf6e9 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/serialization/pdx/AbstractPdxSerializableSessionSerializer.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/serialization/pdx/AbstractPdxSerializableSessionSerializer.java @@ -30,7 +30,7 @@ import org.springframework.session.data.gemfire.serialization.SessionSerializer; * to all GemFire/Geode PDX-based {@link SessionSerializer} implementations. * * This class also implements GemFire/Geode's {@link PdxSerializer} interface, adapting it to the Spring Session, - * Data GemFire {@link SessionSerializer} interface. + * Data Pivotal GemFire {@link SessionSerializer} interface. * * @author John Blum * @see org.apache.geode.pdx.PdxReader diff --git a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java index 3ab7056..b374502 100644 --- a/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java +++ b/spring-session-data-geode/src/main/java/org/springframework/session/data/gemfire/support/GemFireUtils.java @@ -31,7 +31,7 @@ import org.apache.geode.cache.client.ClientRegionShortcut; import org.apache.geode.internal.cache.GemFireCacheImpl; /** - * {@link GemFireUtils} is an abstract, extensible utility class for working with GemFire objects and types. + * {@link GemFireUtils} is an abstract, extensible utility class for working with Pivotal GemFire objects and types. * * @author John Blum * @see org.apache.geode.cache.Cache @@ -65,10 +65,10 @@ public abstract class GemFireUtils { } /** - * Determines whether the GemFire cache is a client. + * Determines whether the Pivotal GemFire cache is a client. * - * @param gemfireCache a reference to the GemFire cache. - * @return a boolean value indicating whether the GemFire cache is a client. + * @param gemfireCache a reference to the Pivotal GemFire cache. + * @return a boolean value indicating whether the Pivotal GemFire cache is a client. * @see org.apache.geode.cache.client.ClientCache * @see org.apache.geode.cache.GemFireCache */ @@ -82,10 +82,10 @@ public abstract class GemFireUtils { } /** - * Determines whether the GemFire cache is a peer. + * Determines whether the Pivotal GemFire cache is a peer. * - * @param gemFireCache a reference to the GemFire cache. - * @return a boolean value indicating whether the GemFire cache is a peer. + * @param gemFireCache a reference to the Pivotal GemFire cache. + * @return a boolean value indicating whether the Pivotal GemFire cache is a peer. * @see org.apache.geode.cache.Cache * @see org.apache.geode.cache.GemFireCache */