Skip to content

Commit 95b2258

Browse files
Jay Bryantschauder
Jay Bryant
authored andcommitted
DATAJDBC-583 - 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: #233.
1 parent 6c133da commit 95b2258

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/main/asciidoc/jdbc.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Also, things that are really simple conceptually get rather difficult with JPA.
2222

2323
Spring Data JDBC aims to be much simpler conceptually, by embracing the following design decisions:
2424

25-
* If you load an entity, SQL statements get executed.
25+
* If you load an entity, SQL statements get run.
2626
Once this is done, you have a completely loaded entity.
2727
No lazy loading or caching is done.
2828

@@ -454,8 +454,8 @@ You can specify the following return types:
454454
[[jdbc.mybatis]]
455455
== MyBatis Integration
456456

457-
The execution of CRUD operations and query methods can be delegated to MyBatis.
458-
This section describes how to configure Spring Data JDBC to integrate with MyBatis and which conventions to follow to hand over the execution of the queries as well as the mapping to the library.
457+
The CRUD operations and query methods can be delegated to MyBatis.
458+
This section describes how to configure Spring Data JDBC to integrate with MyBatis and which conventions to follow to hand over the running of the queries as well as the mapping to the library.
459459

460460
[[jdbc.mybatis.configuration]]
461461
=== Configuration
@@ -649,7 +649,7 @@ Spring Data JDBC uses the `EntityCallback` API for its auditing support and reac
649649

650650
Spring Data JDBC does little to no logging on its own.
651651
Instead, the mechanics of `JdbcTemplate` to issue SQL statements provide logging.
652-
Thus, if you want to inspect what SQL statements are executed, activate logging for Spring's {spring-framework-docs}/data-access.html#jdbc-JdbcTemplate[`NamedParameterJdbcTemplate`] or https://www.mybatis.org/mybatis-3/logging.html[MyBatis].
652+
Thus, if you want to inspect what SQL statements are run, activate logging for Spring's {spring-framework-docs}/data-access.html#jdbc-JdbcTemplate[`NamedParameterJdbcTemplate`] or https://www.mybatis.org/mybatis-3/logging.html[MyBatis].
653653

654654
[[jdbc.transactions]]
655655
== Transactionality
@@ -672,7 +672,7 @@ public interface UserRepository extends CrudRepository<User, Long> {
672672
----
673673
====
674674

675-
The preceding causes the `findAll()` method to be executed with a timeout of 10 seconds and without the `readOnly` flag.
675+
The preceding causes the `findAll()` method to be run with a timeout of 10 seconds and without the `readOnly` flag.
676676

677677
Another way to alter transactional behavior is by using a facade or service implementation that typically covers more than one repository. Its purpose is to define transactional boundaries for non-CRUD operations. The following example shows how to create such a facade:
678678

0 commit comments

Comments
 (0)