Skip to content

Commit 45d721d

Browse files
Jay Bryantmp911de
authored andcommitted
DATAREDIS-825 - Full editing pass for Spring Data Redis.
I edited for spelling, punctuation, grammar, clarity, and cross-references. I also pulled one piece of content that was being reused into its own file, so that I could include it rather than repeat it. Original pull request: #331.
1 parent 2b4f249 commit 45d721d

20 files changed

+449
-336
lines changed

src/main/asciidoc/appendix/appendix-command-reference.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
[appendix]
33
= Command Reference
44

5-
== Supported commands
6-
.Redis commands supported by RedisTemplate.
5+
== Supported Commands
6+
.Redis commands supported by `RedisTemplate`
77
[width="50%",cols="<2,^1",options="header"]
88
|=========================================================
99
|Command |Template Support
@@ -181,4 +181,4 @@
181181
|ZSCAN |X
182182
|ZSCORE |X
183183
|ZUNINONSTORE |X
184-
|=========================================================
184+
|=========================================================

src/main/asciidoc/appendix/appendix-schema.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
= Schema
44
:resourcesDir: ../../resources
55

6-
== Core schema
6+
== Core Schema
77

88
[source,xml]
99
-------------------------------------------
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[float]
2-
= Appendix Document structure
2+
= Appendix Document Structure
33

4-
Various appendixes outside the reference documentation.
4+
The appendix contains various additional detail that complements the information in the rest of the reference documentation:
55

6-
<<appendix:schema>> defines the schemas provided by Spring Data Redis.
6+
* "`<<appendix:schema>>`" defines the schemas provided by Spring Data Redis.
77

8+
* "`<<appendix:command-reference>>`" details which commands are supported by `RedisTemplate`.

src/main/asciidoc/index.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
= Spring Data Redis
2-
Costin Leau, Jennifer Hickey, Christoph Strobl, Thomas Darimont, Mark Paluch
2+
Costin Leau, Jennifer Hickey, Christoph Strobl, Thomas Darimont, Mark Paluch, Jay Bryant
33
:revnumber: {version}
44
:revdate: {localdate}
5-
:toc:
6-
:toc-placement!:
5+
:toc: left
6+
:spring-data-commons-include: ../../../../spring-data-commons/src/main/asciidoc
77
:spring-data-commons-docs: https://raw.githubusercontent.com/spring-projects/spring-data-commons/master/src/main/asciidoc
88

99
(C) 2011-2018 The original authors.
Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,37 @@
11
[[get-started]]
22
= Getting Started
33

4-
Learning a new framework is not always straight forward. In this section, we (the Spring Data team) tried to provide, what we think is, an easy to follow guide for starting with the Spring Data Redis module. Of course, feel free to create your own learning 'path' as you see fit and, if possible, please report back any improvements to the documentation that can help others.
4+
This section provides an easy-to-follow guide for getting started with the Spring Data Redis module.
55

66
[[get-started:first-steps]]
77
== First Steps
88

9-
As explained in <<why-spring-redis>>, Spring Data Redis (SDR) provides integration between Spring framework and the Redis key value store. Thus, it is important to become acquainted with both of these frameworks (storages or environments depending on how you want to name them). Throughout the SDR documentation, each section provides links to resources relevant however, it is best to become familiar with these topics beforehand.
9+
As explained in <<why-spring-redis>>, Spring Data Redis (SDR) provides integration between the Spring framework and the Redis key-value store. Consequently, you should become acquainted with both of these frameworks. Throughout the SDR documentation, each section provides links to relevant resources. However, you should become familiar with these topics before reading this guide.
1010

1111
[[get-started:first-steps:spring]]
12-
=== Knowing Spring
12+
=== Learning Spring
1313

14-
Spring Data uses heavily Spring framework's http://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html[core] functionality, such as the http://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html[IoC] container, http://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#resources[resource] abstract or http://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#aop[AOP] infrastructure. While it is not important to know the Spring APIs, understanding the concepts behind them is. At a minimum, the idea behind IoC should be familiar. That being said, the more knowledge one has about the Spring, the faster she will pick up Spring Data Redis. Besides the very comprehensive (and sometimes disarming) documentation that explains in detail the Spring Framework, there are a lot of articles, blog entries and books on the matter - take a look at the Spring Guides http://spring.io/guides[home page] for more information. In general, this should be the starting point for developers wanting to try Spring DR.
14+
Spring Data uses Spring framework's http://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html[core] functionality, such as the http://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html[IoC] container, http://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#resources[resource] abstract, and the http://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#aop[AOP] infrastructure. While it is not important to know the Spring APIs, understanding the concepts behind them is important. At a minimum, the idea behind IoC should be familiar. That being said, the more knowledge you have about the Spring, the faster you can pick up Spring Data Redis. In addition to the Spring Framework's comprehensive documentation, there are a lot of articles, blog entries, and books on the matter. The Spring Guides http://spring.io/guides[home page] offer a good place to start. In general, this should be the starting point for developers wanting to try Spring Data Redis.
1515

1616
[[get-started:first-steps:nosql]]
17-
=== Knowing NoSQL and Key Value stores
17+
=== Learning NoSQL and Key Value Stores
1818

19-
NoSQL stores have taken the storage world by storm. It is a vast domain with a plethora of solutions, terms and patterns (to make things worse even the term itself has multiple http://www.google.com/search?q=nosoql+acronym[meanings]). While some of the principles are common, it is crucial that the user is familiar to some degree with the stores supported by SDR. The best way to get acquainted with these solutions is to read their documentation and follow their examples - it usually doesn't take more then 5-10 minutes to go through them and if you are coming from an RDMBS-only background many times these exercises can be an eye opener.
19+
NoSQL stores have taken the storage world by storm. It is a vast domain with a plethora of solutions, terms, and patterns (to make things worse, even the term itself has multiple http://www.google.com/search?q=nosoql+acronym[meanings]). While some of the principles are common, it is crucial that you be familiar to some degree with the stores supported by SDR. The best way to get acquainted with these solutions is to read their documentation and follow their examples. It usually does not take more then five to ten minutes to go through them and, if you come from an RDMBS-only background, many times these exercises can be eye-openers.
2020

2121
[[get-started:first-steps:samples]]
22-
=== Trying Out The Samples
22+
=== Trying out the Samples
2323

24-
One can find various samples for key value stores in the dedicated example repo, at https://github.com/spring-projects/spring-data-keyvalue-examples[http://github.com/spring-projects/spring-data-keyvalue-examples]. For Spring Data Redis, of interest is the `retwisj` sample, a Twitter-clone built on top of Redis which can be run locally or be deployed into the cloud. See its http://static.springsource.org/spring-data/data-keyvalue/examples/retwisj/current/[documentation], the following blog http://blog.springsource.com/2011/04/27/getting-started-redis-spring-cloud-foundry/[entry] or the http://retwisj.cloudfoundry.com/[live instance] for more information.
24+
One can find various samples for key-value stores in the dedicated Spring Data example repo, at https://github.com/spring-projects/spring-data-keyvalue-examples[http://github.com/spring-projects/spring-data-keyvalue-examples]. For Spring Data Redis, you should pay particular attention to the `retwisj` sample, a Twitter-clone built on top of Redis that can be run locally or be deployed into the cloud. See its http://static.springsource.org/spring-data/data-keyvalue/examples/retwisj/current/[documentation], the following blog http://blog.springsource.com/2011/04/27/getting-started-redis-spring-cloud-foundry/[entry] or the http://retwisj.cloudfoundry.com/[live instance] for more information.
2525

2626
[[get-started:help]]
2727
== Need Help?
2828

29-
If you encounter issues or you are just looking for advice, feel free to use one of the links below:
29+
If you encounter issues or you are just looking for advice, use one of the links below:
3030

3131
[[get-started:help:community]]
3232
=== Community Support
3333

34-
The Spring Data tag on http://stackoverflow.com/questions/tagged/spring-data[Stackoverflow] is a message board for all Spring Data (not just Redis) users to share information and help each other. Note that registration is needed *only* for posting.
34+
The Spring Data tag on http://stackoverflow.com/questions/tagged/spring-data[Stack Overflow] is a message board for all Spring Data (not just Redis) users to share information and help each other. Note that registration is needed *only* for posting.
3535

3636
[[get-started:help:professional]]
3737
=== Professional Support
@@ -41,14 +41,13 @@ Professional, from-the-source support, with guaranteed response time, is availab
4141
[[get-started:up-to-date]]
4242
== Following Development
4343

44-
For information on the Spring Data source code repository, nightly builds and snapshot artifacts please see the Spring Data home http://spring.io/spring-data[page].
44+
For information on the Spring Data source code repository, nightly builds, and snapshot artifacts, see the Spring Data home http://spring.io/spring-data[page].
4545

46-
You can help make Spring Data best serve the needs of the Spring community by interacting with developers on Stackoverflow at either
46+
You can help make Spring Data best serve the needs of the Spring community by interacting with developers on Stack Overflow at either
4747
http://stackoverflow.com/questions/tagged/spring-data[spring-data] or http://stackoverflow.com/questions/tagged/spring-data-redis[spring-data-redis].
4848

49-
If you encounter a bug or want to suggest an improvement, please create a ticket on the Spring Data issue https://jira.springsource.org/browse/DATAREDIS[tracker].
49+
If you encounter a bug or want to suggest an improvement (including to this documentation), please create a ticket on the Spring Data issue https://jira.springsource.org/browse/DATAREDIS[tracker].
5050

5151
To stay up to date with the latest news and announcements in the Spring eco system, subscribe to the Spring Community http://spring.io/[Portal].
5252

5353
Lastly, you can follow the Spring http://spring.io/blog/[blog] or the project team (http://twitter.com/SpringData[@SpringData]) on Twitter.
54-
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
This document is the reference guide for Spring Data Redis (SDR) Support. It explains Key Value module concepts and semantics and the syntax for various stores namespaces.
2-
3-
For an introduction to key value stores or Spring, or Spring Data examples, please refer to <<get-started>> - this documentation refers only to Spring Data Redis Support and assumes the user is familiar with the key value storages and Spring concepts.
1+
This document is the reference guide for Spring Data Redis (SDR) Support. It explains Key-Value module concepts and semantics and the syntax for various stores namespaces.
42

3+
For an introduction to key-value stores, Spring, or Spring Data examples, see <<get-started>>. This documentation refers only to Spring Data Redis Support and assumes the user is familiar with key-value storage and Spring concepts.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
[[requirements]]
22
= Requirements
33

4-
Spring Data Redis 1.x binaries requires JDK level 6.0 and above, and http://projects.spring.io/spring-framework/[Spring Framework] {springVersion} and above.
5-
6-
In terms of key value stores, http://redis.io[Redis] 2.6.x or higher is required. Spring Data Redis is currently tested against the latest 3.2 release.
4+
Spring Data Redis 1.x binaries require JDK level 6.0 and above and http://projects.spring.io/spring-framework/[Spring Framework] {springVersion} and above.
75

6+
In terms of key-value stores, http://redis.io[Redis] 2.6.x or higher is required. Spring Data Redis is currently tested against the latest 3.2 release.

src/main/asciidoc/introduction/why-sdr.adoc

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
The Spring Framework is the leading full-stack Java/JEE application framework. It provides a lightweight container and a non-invasive programming model enabled by the use of dependency injection, AOP, and portable service abstractions.
55

6-
http://en.wikipedia.org/wiki/NoSQL[NoSQL] storages provide an alternative to classical RDBMS for horizontal scalability and speed. In terms of implementation, Key Value stores represent one of the largest (and oldest) members in the NoSQL space.
7-
8-
The Spring Data Redis (or SDR) framework makes it easy to write Spring applications that use the Redis key value store by eliminating the redundant tasks and boiler plate code required for interacting with the store through Spring's excellent infrastructure support.
6+
http://en.wikipedia.org/wiki/NoSQL[NoSQL] storage systems provide an alternative to classical RDBMS for horizontal scalability and speed. In terms of implementation, key-value stores represent one of the largest (and oldest) members in the NoSQL space.
97

8+
The Spring Data Redis (SDR) framework makes it easy to write Spring applications that use the Redis key-value store by eliminating the redundant tasks and boilerplate code required for interacting with the store through Spring's excellent infrastructure support.

src/main/asciidoc/new-features.adoc

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[[new-features]]
22
= New Features
33

4-
New and noteworthy in the latest releases.
4+
This section briefly covers items that are new and noteworthy in the latest releases.
55

66
[[new-in-2.0.0]]
77
== New in Spring Data Redis 2.0
@@ -11,7 +11,7 @@ New and noteworthy in the latest releases.
1111
* Removed support for SRP and JRedis drivers.
1212
* <<redis:reactive,Reactive connection support using Lettuce>>.
1313
* Introduce Redis feature-specific interfaces for `RedisConnection`.
14-
* Improved `RedisConnectionFactory` configuration via `JedisClientConfiguration` and `LettuceClientConfiguration`.
14+
* Improved `RedisConnectionFactory` configuration with `JedisClientConfiguration` and `LettuceClientConfiguration`.
1515
* Revised `RedisCache` implementation.
1616
* Add `SPOP` with count command for Redis 3.2.
1717

@@ -22,10 +22,10 @@ New and noteworthy in the latest releases.
2222
* Upgrade to `Lettuce` 4.2 (Note: Lettuce 4.2 requires Java 8).
2323
* Support for Redis http://redis.io/commands#geo[GEO] commands.
2424
* Support for Geospatial Indexes using Spring Data Repository abstractions (see <<redis.repositories.indexes.geospatial>>).
25-
* `MappingRedisConverter` based `HashMapper` implementation (see <<redis.hashmappers.root>>).
26-
* Support for `PartialUpdate` in repository support (see <<redis.repositories.partial-updates>>).
25+
* `MappingRedisConverter`-based `HashMapper` implementation (see <<redis.hashmappers.root>>).
26+
* Support for `PartialUpdate` in repositories (see <<redis.repositories.partial-updates>>).
2727
* SSL support for connections to Redis cluster.
28-
* Support for `client name` via `ConnectionFactory` when using Jedis.
28+
* Support for `client name` through `ConnectionFactory` when using Jedis.
2929

3030
[[new-in-1.7.0]]
3131
== New in Spring Data Redis 1.7
@@ -38,14 +38,13 @@ New and noteworthy in the latest releases.
3838

3939
* The `Lettuce` Redis driver switched from https://github.com/wg/lettuce[wg/lettuce] to https://github.com/mp911de/lettuce[mp911de/lettuce].
4040
* Support for `ZRANGEBYLEX`.
41-
* Enhanced range operations for `ZSET` s including `+inf` / `-inf`.
42-
* Performance improvements in `RedisCache` now releasing connections earlier.
41+
* Enhanced range operations for `ZSET`, including `+inf` / `-inf`.
42+
* Performance improvements in `RedisCache`, now releasing connections earlier.
4343
* Generic Jackson2 `RedisSerializer` making use of Jackson's polymorphic deserialization.
4444

4545
[[new-in-1-5-0]]
4646
== New in Spring Data Redis 1.5
4747

48-
* Add support for Redis HyperLogLog commands `PFADD`, `PFCOUNT` and `PFMERGE`.
49-
* Configurable `JavaType` lookup for Jackson based `RedisSerializers`.
50-
* `PropertySource` based configuration for connecting to Redis Sentinel (see: <<redis:sentinel>>).
51-
48+
* Add support for Redis HyperLogLog commands: `PFADD`, `PFCOUNT`, and `PFMERGE`.
49+
* Configurable `JavaType` lookup for Jackson-based `RedisSerializers`.
50+
* `PropertySource`-based configuration for connecting to Redis Sentinel (see: <<redis:sentinel>>).

src/main/asciidoc/preface.adoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
= Preface
22

3-
The Spring Data Redis project applies core Spring concepts to the development of solutions using a key-value style data store. We provide a "template" as a high-level abstraction for sending and receiving messages. You will notice similarities to the JDBC support in the Spring Framework.
4-
3+
The Spring Data Redis project applies core Spring concepts to the development of solutions by using a key-value style data store. We provide a "`template`" as a high-level abstraction for sending and receiving messages. You may notice similarities to the JDBC support in the Spring Framework.

src/main/asciidoc/reference/introduction.adoc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@
44
This part of the reference documentation explains the core functionality offered by Spring Data Redis.
55

66
<<redis>> introduces the Redis module feature set.
7-

0 commit comments

Comments
 (0)