diff --git a/framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc b/framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc index a60f78ef2e..c872157a60 100644 --- a/framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc +++ b/framework-docs/modules/ROOT/pages/core/beans/classpath-scanning.adoc @@ -668,7 +668,7 @@ generated by the `BeanNameGenerator` strategy known to that scanner. By default, the `AnnotationBeanNameGenerator` is used. For Spring xref:core/beans/classpath-scanning.adoc#beans-stereotype-annotations[stereotype annotations], -if you supply a name via the the annotation's `value` attribute that name will be used as +if you supply a name via the annotation's `value` attribute that name will be used as the name in the corresponding bean definition. This convention also applies when the following JSR-250 and JSR-330 annotations are used instead of Spring stereotype annotations: `@jakarta.annotation.ManagedBean`, `@javax.annotation.ManagedBean`, diff --git a/framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc b/framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc index f7bf2586ea..bc69769349 100644 --- a/framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc +++ b/framework-docs/modules/ROOT/pages/core/validation/beans-beans.adoc @@ -9,7 +9,7 @@ input: - xref:beans-constructor-binding[Constructor binding] - bind user input to a public data constructor, looking up constructor argument values in the user input. - xref:beans-beans[Property binding] - bind user input to setters, matching keys from the -the user input to properties of the target object structure. +user input to properties of the target object structure. You can apply both constructor and property binding or only one. diff --git a/framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc b/framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc index a8e6c98bf2..60b6eea8fb 100644 --- a/framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc +++ b/framework-docs/modules/ROOT/pages/data-access/jdbc/core.adoc @@ -824,7 +824,7 @@ between ``SQLException``s and Spring's own `org.springframework.dao.DataAccessEx which is agnostic in regard to data access strategy. Implementations can be generic (for example, using SQLState codes for JDBC) or proprietary (for example, using Oracle error codes) for greater precision. This exception translation mechanism is used behind the -the common `JdbcTemplate` and `JdbcTransactionManager` entry points which do not +common `JdbcTemplate` and `JdbcTransactionManager` entry points which do not propagate `SQLException` but rather `DataAccessException`. NOTE: As of 6.0, the default exception translator is `SQLExceptionSubclassTranslator`, diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java index db28c0b449..5f7ae3ef2a 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessagingTemplate.java @@ -39,8 +39,7 @@ import org.springframework.util.StringUtils; * *
Also provides methods for sending messages to a user. See
* {@link org.springframework.messaging.simp.user.UserDestinationResolver
- * UserDestinationResolver}
- * for more on user destinations.
+ * UserDestinationResolver} for more on user destinations.
*
* @author Rossen Stoyanchev
* @since 4.0
@@ -234,12 +233,11 @@ public class SimpMessagingTemplate extends AbstractMessageSendingTemplate However if the given headers already contain the key
- * {@code NATIVE_HEADERS NATIVE_HEADERS} then the same headers instance is
- * returned without changes.
+ * However if the given headers already contain the key {@code NATIVE_HEADERS}
+ * then the same headers instance is returned without changes.
* Also if the given headers were prepared and obtained with
* {@link SimpMessageHeaderAccessor#getMessageHeaders()} then the same headers
* instance is also returned without changes.