Skip to content

Commit 0b1fcb6

Browse files
Jay Bryantmp911de
authored andcommitted
DATACASS-816 - Wording changes.
Removed the language of oppression and violence and replaced it with more neutral language. Note that problematic words in the code have to remain in the docs until the code changes. Original pull request: #176.
1 parent 857bde1 commit 0b1fcb6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/main/asciidoc/reference/migration-guide-2.2-to-3.0.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Typical cases include:
9696

9797
=== Changes in `AsyncCqlTemplate`
9898

99-
DataStax driver 4 has changed the result type of queries that are executed asynchronously.
99+
DataStax driver 4 has changed the result type of queries that are run asynchronously.
100100
To reflect these changes, you need to adapt your code that provides:
101101

102102
* Implementations of `AsyncSessionCallback`
@@ -182,9 +182,9 @@ Keyspace creation via `CqlSessionFactoryBean` (`cassandra:session`) is not affec
182182

183183
* `GuavaListenableFutureAdapter`
184184
* `QueryOptions` and `WriteOptions` constructor taking `ConsistencyLevel` and `RetryPolicy` arguments.
185-
Use the builder in conjunction of execution profiles as replacement.
185+
Use the builder in conjunction with run profiles as a replacement.
186186
* `CassandraAccessor.setRetryPolicy(…)` and `ReactiveCqlTemplate.setRetryPolicy(…)` methods.
187-
Use execution profiles as replacement.
187+
Use run profiles as a replacement.
188188

189189
=== Namespace support
190190

src/main/asciidoc/reference/reactive-cassandra.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ First, you need to set up a running Apache Cassandra server.
2525
See the
2626
https://cassandra.apache.org/doc/latest/getting_started/index.html[Apache Cassandra Quick Start Guide]
2727
for an explanation on how to start Apache Cassandra.
28-
Once installed, starting Cassandra is typically a matter of executing the following command: `CASSANDRA_HOME/bin/cassandra -f`.
28+
Once installed, starting Cassandra is typically a matter of running the following command: `CASSANDRA_HOME/bin/cassandra -f`.
2929

3030
To create a Spring project in STS, go to File -> New -> Spring Template Project -> Simple Spring Utility Project and press Yes when prompted.
3131
Then enter a project and a package name, such as `org.spring.data.cassandra.example`.
@@ -121,7 +121,7 @@ as well as the detailed documentation {spring-framework-docs}core.html#beans-jav
121121
=== Registering a Session instance using Java-based metadata
122122

123123
You can configure Reactive Cassandra support by using <<cassandra.cassandra-java-config,Java Configuration classes>>.
124-
Reactive Cassandra support adapts a `CqlSession` to provide a reactive execution model on top of an asynchronous driver.
124+
Reactive Cassandra support adapts a `CqlSession` to provide a reactive processing model on top of an asynchronous driver.
125125

126126
A reactive `CqlSession` is configured similarly to an imperative `CqlSession`.
127127
We provide supporting configuration classes that come with predefined defaults and require only environment-specific information to configure Spring Data for Apache Cassandra.
@@ -145,8 +145,8 @@ See <<cassandra.schema-management>> for further details.
145145

146146
The `ReactiveCqlTemplate` class is the central class in the core CQL package.
147147
It handles the creation and release of resources.
148-
It performs the basic tasks of the core CQL workflow, such as statement creation and execution, leaving application code to provide CQL and extract results.
149-
The `ReactiveCqlTemplate` class executes CQL queries and update statements and performs iteration over `ResultSet` instances and extraction of returned parameter values.
148+
It performs the basic tasks of the core CQL workflow, such as creating and running statements, leaving application code to provide CQL and extract results.
149+
The `ReactiveCqlTemplate` class runs CQL queries and update statements and performs iteration over `ResultSet` instances and extraction of returned parameter values.
150150
It also catches CQL exceptions and translates them into the generic, more informative, exception hierarchy defined in the `org.springframework.dao` package.
151151

152152
When you use the `ReactiveCqlTemplate` in your code, you need only implement callback interfaces, which have a clearly defined contract.
@@ -261,7 +261,7 @@ include::../{example-root}/ReactiveCqlTemplateExamples.java[tags=delete]
261261
include::exception-translation.adoc[]
262262

263263
`ReactiveCqlTemplate` and `ReactiveCassandraTemplate` propagate exceptions as early as possible.
264-
Exceptions that occur during execution of the reactive sequence are emitted as error signals.
264+
Exceptions that occur during the processing of the reactive sequence are emitted as error signals.
265265

266266
[[cassandra.reactive.template]]
267267
== Introduction to `ReactiveCassandraTemplate`

0 commit comments

Comments
 (0)