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 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 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: For example: 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
- * {@code FQCN.methodName=<transaction attribute string>}
+ * {@code FQCN.methodName=
* {@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.
*
*