From dec101c68207120a9857f926fc4774ce4e2682fd Mon Sep 17 00:00:00 2001 From: Jay Bryant Date: Thu, 25 Jun 2020 14:44:52 -0500 Subject: [PATCH] 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. --- src/main/asciidoc/jdbc.adoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/asciidoc/jdbc.adoc b/src/main/asciidoc/jdbc.adoc index 68e878d0aa..48c6c6a031 100644 --- a/src/main/asciidoc/jdbc.adoc +++ b/src/main/asciidoc/jdbc.adoc @@ -22,7 +22,7 @@ Also, things that are really simple conceptually get rather difficult with JPA. Spring Data JDBC aims to be much simpler conceptually, by embracing the following design decisions: -* If you load an entity, SQL statements get executed. +* If you load an entity, SQL statements get run. Once this is done, you have a completely loaded entity. No lazy loading or caching is done. @@ -705,8 +705,8 @@ You can specify the following return types: [[jdbc.mybatis]] == MyBatis Integration -The execution of CRUD operations and query methods can be delegated to MyBatis. -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. +The CRUD operations and query methods can be delegated to MyBatis. +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. [[jdbc.mybatis.configuration]] === Configuration @@ -837,7 +837,7 @@ public ApplicationListener> loggingSaves() { return event -> { Object entity = event.getEntity(); - LOG.info("{} is getting saved."; + LOG.info("{} is getting saved."); }; } ---- @@ -923,7 +923,7 @@ include::jdbc-custom-conversions.adoc[] Spring Data JDBC does little to no logging on its own. Instead, the mechanics of `JdbcTemplate` to issue SQL statements provide logging. -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]. +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]. [[jdbc.transactions]] == Transactionality @@ -949,7 +949,7 @@ public interface UserRepository extends CrudRepository { ---- ==== -The preceding causes the `findAll()` method to be executed with a timeout of 10 seconds and without the `readOnly` flag. +The preceding causes the `findAll()` method to be run with a timeout of 10 seconds and without the `readOnly` flag. 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.