diff --git a/framework-docs/src/docs/asciidoc/core/core-beans.adoc b/framework-docs/src/docs/asciidoc/core/core-beans.adoc index 6341ae03d51..906e43023df 100644 --- a/framework-docs/src/docs/asciidoc/core/core-beans.adoc +++ b/framework-docs/src/docs/asciidoc/core/core-beans.adoc @@ -7175,7 +7175,7 @@ to have the relevant jars in your classpath. ===== If you use Maven, the `jakarta.inject` artifact is available in the standard Maven repository ( -https://repo1.maven.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/[https://repo1.maven.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/]). +https://repo.maven.apache.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/[https://repo.maven.apache.org/maven2/jakarta/inject/jakarta.inject-api/2.0.0/]). You can add the following dependency to your file pom.xml: [source,xml,indent=0,subs="verbatim,quotes"] diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java index 7f8104531d6..01424c63fbb 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java +++ b/spring-beans/src/main/java/org/springframework/beans/factory/aot/InstanceSupplierCodeGenerator.java @@ -47,7 +47,7 @@ import org.springframework.util.function.ThrowingSupplier; * the form of a {@link BeanInstanceSupplier} that retains the executable * that is used to instantiate the bean. * - *

Generated code is usually a method reference that generate the + *

Generated code is usually a method reference that generates the * {@link BeanInstanceSupplier}, but some shortcut can be used as well such as: *

  * {@code InstanceSupplier.of(TheGeneratedClass::getMyBeanInstance);}
diff --git a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
index 42509c3098b..34db40b9fd9 100644
--- a/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
+++ b/spring-context-support/src/main/java/org/springframework/mail/javamail/JavaMailSenderImpl.java
@@ -132,10 +132,10 @@ public class JavaMailSenderImpl implements JavaMailSender {
 	}
 
 	/**
-	 * Allow {code Map} access to the JavaMail properties of this sender,
+	 * Allow {@code Map} access to the JavaMail properties of this sender,
 	 * with the option to add or override specific entries.
 	 * 

Useful for specifying entries directly, for example via - * {code javaMailProperties[mail.smtp.auth]}. + * {@code javaMailProperties[mail.smtp.auth]}. */ public Properties getJavaMailProperties() { return this.javaMailProperties; diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java index a11146506ce..6d5e5071b3e 100644 --- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java +++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessor.java @@ -63,7 +63,7 @@ class BeanValidationBeanRegistrationAotProcessor implements BeanRegistrationAotP private static class BeanValidationDelegate { - private static Validator validator = Validation.buildDefaultValidatorFactory().getValidator(); + private static final Validator validator = Validation.buildDefaultValidatorFactory().getValidator(); @Nullable public static BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) { diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessorTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessorTests.java index c974494a58e..bb2d5bcddd1 100644 --- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessorTests.java +++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/BeanValidationBeanRegistrationAotProcessorTests.java @@ -107,7 +107,7 @@ class BeanValidationBeanRegistrationAotProcessorTests { @Repeatable(Exists.List.class) private @interface Exists { - String message() default "Does not exists"; + String message() default "Does not exist"; Class[] groups() default { }; diff --git a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java index bd007ac26d6..c36d2054fcb 100644 --- a/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java +++ b/spring-core/src/main/java/org/springframework/asm/RecordComponentWriter.java @@ -37,7 +37,7 @@ final class RecordComponentWriter extends RecordComponentVisitor { /** The name_index field of the Record attribute. */ private final int nameIndex; - /** The descriptor_index field of the the Record attribute. */ + /** The descriptor_index field of the Record attribute. */ private final int descriptorIndex; /** diff --git a/spring-core/src/main/java/org/springframework/util/InstanceFilter.java b/spring-core/src/main/java/org/springframework/util/InstanceFilter.java index 3eb69149e16..f47683f8ce8 100644 --- a/spring-core/src/main/java/org/springframework/util/InstanceFilter.java +++ b/spring-core/src/main/java/org/springframework/util/InstanceFilter.java @@ -64,7 +64,7 @@ public class InstanceFilter { /** - * Determine if the specified {code instance} matches this filter. + * Determine if the specified {@code instance} matches this filter. */ public boolean match(T instance) { Assert.notNull(instance, "Instance to match must not be null"); diff --git a/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java b/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java index 124f03c4f88..f8d5e5622fe 100644 --- a/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java +++ b/spring-core/src/test/java/org/springframework/aot/hint/BindingReflectionHintsRegistrarTests.java @@ -381,7 +381,7 @@ public class BindingReflectionHintsRegistrarTests { return new Builder(); } - public Builder id(String name) { + public Builder name(String name) { this.name = name; return this; } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessor.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessor.java index 97635aa5e8f..c1a5cf8eae2 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessor.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceManagedTypesBeanRegistrationAotProcessor.java @@ -18,7 +18,6 @@ package org.springframework.orm.jpa.persistenceunit; import java.lang.annotation.Annotation; import java.lang.reflect.Executable; -import java.util.Arrays; import java.util.List; import javax.lang.model.element.Modifier; @@ -68,7 +67,7 @@ import org.springframework.util.ReflectionUtils; */ class PersistenceManagedTypesBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor { - private static final List> CALLBACK_TYPES = Arrays.asList(PreUpdate.class, + private static final List> CALLBACK_TYPES = List.of(PreUpdate.class, PostUpdate.class, PrePersist.class, PostPersist.class, PreRemove.class, PostRemove.class, PostLoad.class); @Nullable diff --git a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java index cbb28a9d6a1..1086ef49339 100644 --- a/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java +++ b/spring-r2dbc/src/main/java/org/springframework/r2dbc/core/DatabaseClient.java @@ -84,7 +84,7 @@ public interface DatabaseClient extends ConnectionAccessor { * bind markers or named parameters (e.g. {@literal :foo, :bar}) when * {@link NamedParameterExpander} is enabled. *

Accepts {@link PreparedOperation} as SQL and binding {@link Supplier}. - *

{code DatabaseClient} implementations should defer the resolution of + *

{@code DatabaseClient} implementations should defer the resolution of * the SQL string as much as possible, ideally up to the point where a * {@code Subscription} happens. This is the case for the default implementation. * @param sqlSupplier a supplier for the SQL statement diff --git a/spring-test/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java b/spring-test/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java index 75029904682..dd84f736249 100644 --- a/spring-test/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java +++ b/spring-test/src/main/java/org/springframework/test/web/client/response/MockRestResponseCreators.java @@ -32,7 +32,7 @@ import org.springframework.test.web.client.ResponseCreator; * response. * *

In addition, see also the {@link ExecutingResponseCreator} implementation - * that performs an actual requests to remote services. + * that performs actual requests to remote services. * * @author Rossen Stoyanchev * @since 3.2 diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java index 60869f37e66..86ad7becea7 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/XpathResultMatchers.java @@ -83,7 +83,7 @@ public class XpathResultMatchers { } /** - * Get the response encoding if explicitly defined in the response, {code null} otherwise. + * Get the response encoding if explicitly defined in the response, {@code null} otherwise. */ @Nullable private String getDefinedEncoding(MockHttpServletResponse response) { diff --git a/spring-test/src/test/java/org/springframework/test/web/client/response/ExecutingResponseCreatorTests.java b/spring-test/src/test/java/org/springframework/test/web/client/response/ExecutingResponseCreatorTests.java index 333894cfb23..a03fee56218 100644 --- a/spring-test/src/test/java/org/springframework/test/web/client/response/ExecutingResponseCreatorTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/client/response/ExecutingResponseCreatorTests.java @@ -86,7 +86,6 @@ class ExecutingResponseCreatorTests { .first() .isNotSameAs(originalRequest) .satisfies(request -> { - assertThat(request).isNotSameAs(originalRequest); assertThat(request.isExecuted()).isTrue(); assertThat(request.getBody()).isNotSameAs(originalRequest.getBody()); assertThat(request.getHeaders()).isNotSameAs(originalRequest.getHeaders()); diff --git a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java index 776f7695642..d22819dbee6 100644 --- a/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java +++ b/spring-web/src/main/java/org/springframework/http/codec/protobuf/ProtobufDecoder.java @@ -265,7 +265,7 @@ public class ProtobufDecoder extends ProtobufCodecSupport implements DecoderBase 128 Varints */ diff --git a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java index cafd60a4e86..93454f588f3 100644 --- a/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java +++ b/spring-web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java @@ -113,7 +113,7 @@ public class MethodArgumentNotValidException extends BindException implements Er /** * Resolve global and field errors to messages with the given * {@link MessageSource} and {@link Locale}. - * @return a Map with errors as key and resolves messages as value + * @return a Map with errors as key and resolved messages as value * @since 6.0.3 */ public Map resolveErrorMessages(MessageSource messageSource, Locale locale) { diff --git a/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java b/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java index e01a1a8bc2a..76b20ca8d88 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java +++ b/spring-web/src/main/java/org/springframework/web/cors/CorsUtils.java @@ -66,7 +66,7 @@ public abstract class CorsUtils { } /** - * Returns {@code true} if the request is a valid CORS pre-flight one by checking {code OPTIONS} method with + * Returns {@code true} if the request is a valid CORS pre-flight one by checking {@code OPTIONS} method with * {@code Origin} and {@code Access-Control-Request-Method} headers presence. */ public static boolean isPreFlightRequest(HttpServletRequest request) { diff --git a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java index 1d78ed9aab0..4a1be8b56cc 100644 --- a/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java +++ b/spring-web/src/main/java/org/springframework/web/cors/reactive/CorsUtils.java @@ -45,7 +45,7 @@ public abstract class CorsUtils { } /** - * Returns {@code true} if the request is a valid CORS pre-flight one by checking {code OPTIONS} method with + * Returns {@code true} if the request is a valid CORS pre-flight one by checking {@code OPTIONS} method with * {@code Origin} and {@code Access-Control-Request-Method} headers presence. */ public static boolean isPreFlightRequest(ServerHttpRequest request) {