diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java index 50beaa00617d..f6363db6a430 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/autoproxy/AbstractAutoProxyCreator.java @@ -148,7 +148,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport /** * Set whether the proxy should be frozen, preventing advice * from being added to it once it is created. - *

Overridden from the super class to prevent the proxy configuration + *

Overridden from the superclass to prevent the proxy configuration * from being frozen before the proxy is created. */ @Override diff --git a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj index 94f9f8c6ded5..19ba5e5b0530 100644 --- a/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj +++ b/spring-aspects/src/main/java/org/springframework/beans/factory/aspectj/AbstractDependencyInjectionAspect.aj @@ -35,7 +35,7 @@ public abstract aspect AbstractDependencyInjectionAspect { mostSpecificSubTypeConstruction() && !preConstructionConfiguration(); /** - * Select least specific super type that is marked for DI + * Select least specific supertype that is marked for DI * (so that injection occurs only once with pre-construction injection). */ public abstract pointcut leastSpecificSuperTypeConstruction(); diff --git a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java index f24fd21df42a..8789d3f530fd 100644 --- a/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java +++ b/spring-context-indexer/src/main/java/org/springframework/context/index/processor/TypeHelper.java @@ -80,7 +80,7 @@ private String getQualifiedName(Element element) { } /** - * Return the super class of the specified {@link Element} or null if this + * Return the superclass of the specified {@link Element} or null if this * {@code element} represents {@link Object}. */ public Element getSuperClass(Element element) { @@ -99,7 +99,7 @@ public Element getSuperClass(Element element) { public List getDirectInterfaces(Element element) { List superTypes = this.types.directSupertypes(element.asType()); List directInterfaces = new ArrayList<>(); - if (superTypes.size() > 1) { // index 0 is the super class + if (superTypes.size() > 1) { // index 0 is the superclass for (int i = 1; i < superTypes.size(); i++) { Element e = this.types.asElement(superTypes.get(i)); if (e != null) { diff --git a/spring-core/src/main/java/org/springframework/asm/Type.java b/spring-core/src/main/java/org/springframework/asm/Type.java index f346c6a44b6e..24d0e679b87c 100644 --- a/spring-core/src/main/java/org/springframework/asm/Type.java +++ b/spring-core/src/main/java/org/springframework/asm/Type.java @@ -708,8 +708,8 @@ public int getSize() { * * @return the size of the arguments of the method (plus one for the implicit this argument), * argumentsSize, and the size of its return value, returnSize, packed into a single int i = - * {@code (argumentsSize << 2) | returnSize} (argumentsSize is therefore equal to {@code - * i >> 2}, and returnSize to {@code i & 0x03}). + * {@code (argumentsSize << 2) | returnSize} (argumentsSize is therefore equal to {@code + * i >> 2}, and returnSize to {@code i & 0x03}). */ public int getArgumentsAndReturnSizes() { return getArgumentsAndReturnSizes(getDescriptor()); @@ -721,8 +721,8 @@ public int getArgumentsAndReturnSizes() { * @param methodDescriptor a method descriptor. * @return the size of the arguments of the method (plus one for the implicit this argument), * argumentsSize, and the size of its return value, returnSize, packed into a single int i = - * {@code (argumentsSize << 2) | returnSize} (argumentsSize is therefore equal to {@code - * i >> 2}, and returnSize to {@code i & 0x03}). + * {@code (argumentsSize << 2) | returnSize} (argumentsSize is therefore equal to {@code + * i >> 2}, and returnSize to {@code i & 0x03}). */ public static int getArgumentsAndReturnSizes(final String methodDescriptor) { int argumentsSize = 1; diff --git a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java index 0baa3943916a..ad8df6836628 100644 --- a/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java +++ b/spring-core/src/main/java/org/springframework/core/type/filter/AbstractTypeHierarchyTraversingFilter.java @@ -86,7 +86,7 @@ public boolean match(MetadataReader metadataReader, MetadataReaderFactory metada } catch (IOException ex) { if (logger.isDebugEnabled()) { - logger.debug("Could not read super class [" + metadata.getSuperClassName() + + logger.debug("Could not read superclass [" + metadata.getSuperClassName() + "] of type-filtered class [" + metadata.getClassName() + "]"); } } diff --git a/spring-core/src/main/java/org/springframework/util/DigestUtils.java b/spring-core/src/main/java/org/springframework/util/DigestUtils.java index 63554c65b218..0af0d81b7e25 100644 --- a/spring-core/src/main/java/org/springframework/util/DigestUtils.java +++ b/spring-core/src/main/java/org/springframework/util/DigestUtils.java @@ -125,8 +125,8 @@ private static byte[] digest(String algorithm, byte[] bytes) { private static byte[] digest(String algorithm, InputStream inputStream) throws IOException { MessageDigest messageDigest = getDigest(algorithm); - if (inputStream instanceof UpdateMessageDigestInputStream digestIntputStream){ - digestIntputStream.updateMessageDigest(messageDigest); + if (inputStream instanceof UpdateMessageDigestInputStream digestInputStream){ + digestInputStream.updateMessageDigest(messageDigest); return messageDigest.digest(); } else { diff --git a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java index 0d4cb1859bd9..1b8d222a84af 100644 --- a/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java +++ b/spring-expression/src/main/java/org/springframework/expression/ExpressionException.java @@ -19,7 +19,7 @@ import org.springframework.lang.Nullable; /** - * Super class for exceptions that can occur whilst processing expressions. + * Superclass for exceptions that can occur whilst processing expressions. * * @author Andy Clement * @author Phillip Webb diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java index 0184d934df43..522b96d733cc 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java @@ -29,7 +29,7 @@ import org.springframework.util.Assert; /** - * Convenient super class for JDBC-based data access objects. + * Convenient superclass for JDBC-based data access objects. * *

Requires a {@link javax.sql.DataSource} to be set, providing a * {@link org.springframework.jdbc.core.JdbcTemplate} based on it to diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java index f85c3db9925d..ba05ba60816c 100644 --- a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java +++ b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java @@ -26,7 +26,7 @@ import org.springframework.lang.Nullable; /** - * Convenient super class for application classes that need JMS access. + * Convenient superclass for application classes that need JMS access. * *

Requires a ConnectionFactory or a JmsTemplate instance to be set. * It will create its own JmsTemplate if a ConnectionFactory is passed in. diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java index 8acdc7976668..dd67e265f306 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractBrokerMessageHandler.java @@ -262,7 +262,7 @@ public final boolean isRunning() { * may still independently alternate between being on and off depending on the * concrete subclass implementation. *

Application components may implement - * {@code org.springframework.context.ApplicationListener<BrokerAvailabilityEvent>} + * {@code org.springframework.context.ApplicationListener} * to receive notifications when broker becomes available and unavailable. */ public boolean isBrokerAvailable() { diff --git a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java index 7bdb958dc515..a65d52555615 100644 --- a/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java +++ b/spring-orm/src/main/java/org/springframework/orm/hibernate5/support/HibernateDaoSupport.java @@ -26,7 +26,7 @@ import org.springframework.util.Assert; /** - * Convenient super class for Hibernate-based data access objects. + * Convenient superclass for Hibernate-based data access objects. * *

Requires a {@link SessionFactory} to be set, providing a * {@link org.springframework.orm.hibernate5.HibernateTemplate} based on it to diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java index d0b004b20d97..1530ef696400 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/Transactional.java @@ -57,7 +57,7 @@ * rules to be specified as types or patterns, respectively. * *

When a rollback rule is defined with an exception type, that type will be - * used to match against the type of a thrown exception and its super types, + * used to match against the type of a thrown exception and its supertypes, * providing type safety and avoiding any unintentional matches that may occur * when using a pattern. For example, a value of * {@code jakarta.servlet.ServletException.class} will only match thrown exceptions diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java index d06d981ce1cb..0073f977aebb 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/RollbackRuleAttribute.java @@ -32,7 +32,7 @@ * respectively. * *

When a rollback rule is defined with an exception type, that type will be - * used to match against the type of a thrown exception and its super types, + * used to match against the type of a thrown exception and its supertypes, * providing type safety and avoiding any unintentional matches that may occur * when using a pattern. For example, a value of * {@code jakarta.servlet.ServletException.class} will only match thrown exceptions diff --git a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java index a1c9cbac8361..eef4a8cc9fff 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java +++ b/spring-tx/src/main/java/org/springframework/transaction/interceptor/TransactionAttributeSourceEditor.java @@ -29,7 +29,7 @@ * {@link TransactionAttributeEditor} in this package. * *

Strings are in property syntax, with the form:
- * {@code FQCN.methodName=<transaction attribute string>} + * {@code FQCN.methodName=} * *

For example:
* {@code com.mycompany.mycode.MyClass.myMethod=PROPAGATION_MANDATORY,ISOLATION_DEFAULT} diff --git a/spring-web/src/main/java/org/springframework/web/client/support/RestGatewaySupport.java b/spring-web/src/main/java/org/springframework/web/client/support/RestGatewaySupport.java index 80854c2a1bdc..a31c4d911a80 100644 --- a/spring-web/src/main/java/org/springframework/web/client/support/RestGatewaySupport.java +++ b/spring-web/src/main/java/org/springframework/web/client/support/RestGatewaySupport.java @@ -24,7 +24,7 @@ import org.springframework.web.client.RestTemplate; /** - * Convenient super class for application classes that need REST access. + * Convenient superclass for application classes that need REST access. * *

Requires a {@link ClientHttpRequestFactory} or a {@link RestTemplate} instance to be set. * diff --git a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java index 26813bd10353..eb104e23543f 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/AbstractRequestAttributesScope.java @@ -28,7 +28,7 @@ * this class which {@link RequestAttributes} scope to read attributes from. * *

Subclasses may wish to override the {@link #get} and {@link #remove} - * methods to add synchronization around the call back into this super class. + * methods to add synchronization around the call back into this superclass. * * @author Rod Johnson * @author Juergen Hoeller diff --git a/spring-web/src/main/java/org/springframework/web/method/HandlerTypePredicate.java b/spring-web/src/main/java/org/springframework/web/method/HandlerTypePredicate.java index 74b09041f42e..d91704195198 100644 --- a/spring-web/src/main/java/org/springframework/web/method/HandlerTypePredicate.java +++ b/spring-web/src/main/java/org/springframework/web/method/HandlerTypePredicate.java @@ -128,7 +128,7 @@ public static HandlerTypePredicate forBasePackageClass(Class... packageClasse /** * Match handlers that are assignable to a given type. - * @param types one or more handler super types + * @param types one or more handler supertypes */ public static HandlerTypePredicate forAssignableType(Class... types) { return new Builder().assignableType(types).build(); @@ -187,7 +187,7 @@ private void addBasePackage(String basePackage) { /** * Match handlers that are assignable to a given type. - * @param types one or more handler super types + * @param types one or more handler supertypes */ public Builder assignableType(Class... types) { this.assignableTypes.addAll(Arrays.asList(types)); diff --git a/spring-web/src/test/java/org/springframework/web/server/handler/ResponseStatusExceptionHandlerTests.java b/spring-web/src/test/java/org/springframework/web/server/handler/ResponseStatusExceptionHandlerTests.java index 5943d8896c3d..61288d9f6cd1 100644 --- a/spring-web/src/test/java/org/springframework/web/server/handler/ResponseStatusExceptionHandlerTests.java +++ b/spring-web/src/test/java/org/springframework/web/server/handler/ResponseStatusExceptionHandlerTests.java @@ -26,6 +26,6 @@ */ public class ResponseStatusExceptionHandlerTests extends AbstractResponseStatusExceptionHandlerTests { - // all tests in super class + // all tests in superclass } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java index 0dc6875f018b..00f47b77feba 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/handler/AbstractHandlerMethodMapping.java @@ -479,8 +479,8 @@ protected HandlerMethod handleNoMatch(Set mappings, String lookupPath, HttpSe @Override protected boolean hasCorsConfigurationSource(Object handler) { return super.hasCorsConfigurationSource(handler) || - (handler instanceof HandlerMethod handerMethod && - this.mappingRegistry.getCorsConfiguration(handerMethod) != null); + (handler instanceof HandlerMethod handlerMethod && + this.mappingRegistry.getCorsConfiguration(handlerMethod) != null); } @Override diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java index 92528dcabf43..ed521e83971b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/tags/form/AbstractHtmlElementBodyTag.java @@ -27,7 +27,7 @@ import org.springframework.util.StringUtils; /** - * Convenient super class for many html tags that render content using the databinding + * Convenient superclass for many html tags that render content using the databinding * features of the {@link AbstractHtmlElementTag AbstractHtmlElementTag}. The only thing * sub-tags need to do is override {@link #renderDefaultContent(TagWriter)}. * diff --git a/src/docs/asciidoc/data-access.adoc b/src/docs/asciidoc/data-access.adoc index dc767498a104..9cb28e52dd4b 100644 --- a/src/docs/asciidoc/data-access.adoc +++ b/src/docs/asciidoc/data-access.adoc @@ -1052,7 +1052,7 @@ be configured via the `rollbackFor`/`noRollbackFor` and defined based on exception types or patterns, respectively. When a rollback rule is defined with an exception type, that type will be used to match -against the type of a thrown exception and its super types, providing type safety and +against the type of a thrown exception and its supertypes, providing type safety and avoiding any unintentional matches that may occur when using a pattern. For example, a value of `jakarta.servlet.ServletException.class` will only match thrown exceptions of type `jakarta.servlet.ServletException` and its subclasses. diff --git a/src/docs/asciidoc/testing.adoc b/src/docs/asciidoc/testing.adoc index 86fa1831e7ae..9e6af1e433f0 100644 --- a/src/docs/asciidoc/testing.adoc +++ b/src/docs/asciidoc/testing.adoc @@ -1870,7 +1870,7 @@ Spring test configuration annotations are processed within enclosing class hiera for inner test classes. If `@NestedTestConfiguration` is not present or meta-present on a test class, in its -super type hierarchy, or in its enclosing class hierarchy, the default _enclosing +supertype hierarchy, or in its enclosing class hierarchy, the default _enclosing configuration inheritance mode_ will be used. See the tip below for details on how to change the default mode.