diff --git a/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java b/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java index 480d9f087c..b975538940 100644 --- a/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java +++ b/spring-aop/src/main/java/org/aopalliance/intercept/Joinpoint.java @@ -63,7 +63,7 @@ public interface Joinpoint { /** * Return the static part of this joinpoint. *

The static part is an accessible object on which a chain of - * interceptors are installed. + * interceptors is installed. */ @Nonnull AccessibleObject getStaticPart(); diff --git a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java index 4185c92fa2..181237b2a8 100644 --- a/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/IntroductionAwareMethodMatcher.java @@ -36,7 +36,7 @@ public interface IntroductionAwareMethodMatcher extends MethodMatcher { * @param targetClass the target class * @param hasIntroductions {@code true} if the object on whose behalf we are * asking is the subject on one or more introductions; {@code false} otherwise - * @return whether or not this method matches statically + * @return whether this method matches statically */ boolean matches(Method method, Class targetClass, boolean hasIntroductions); diff --git a/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java index 29127c73d4..d5f8c2a89a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java +++ b/spring-aop/src/main/java/org/springframework/aop/MethodMatcher.java @@ -60,7 +60,7 @@ public interface MethodMatcher { * will be made. * @param method the candidate method * @param targetClass the target class - * @return whether or not this method matches statically + * @return whether this method matches statically */ boolean matches(Method method, Class targetClass); @@ -70,7 +70,7 @@ public interface MethodMatcher { * runtime even if the 2-arg matches method returns {@code true}? *

Can be invoked when an AOP proxy is created, and need not be invoked * again before each method invocation, - * @return whether or not a runtime match via the 3-arg + * @return whether a runtime match via the 3-arg * {@link #matches(java.lang.reflect.Method, Class, Object[])} method * is required if static matching passed */ diff --git a/spring-aop/src/main/java/org/springframework/aop/SpringProxy.java b/spring-aop/src/main/java/org/springframework/aop/SpringProxy.java index 42e44ceb02..95057e0d7d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/SpringProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/SpringProxy.java @@ -18,7 +18,7 @@ package org.springframework.aop; /** * Marker interface implemented by all AOP proxies. Used to detect - * whether or not objects are Spring-generated proxies. + * whether objects are Spring-generated proxies. * * @author Rob Harrop * @since 2.0.1 diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java index ddba1f0c1f..c3bf168529 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorFactory.java @@ -39,7 +39,7 @@ import org.springframework.lang.Nullable; public interface AspectJAdvisorFactory { /** - * Determine whether or not the given class is an aspect, as reported + * Determine whether the given class is an aspect, as reported * by AspectJ's {@link org.aspectj.lang.reflect.AjTypeSystem}. *

Will simply return {@code false} if the supposed aspect is * invalid (such as an extension of a concrete aspect class). @@ -47,7 +47,7 @@ public interface AspectJAdvisorFactory { * such as those with unsupported instantiation models. * Use the {@link #validate} method to handle these cases if necessary. * @param clazz the supposed annotation-style AspectJ class - * @return whether or not this class is recognized by AspectJ as an aspect class + * @return whether this class is recognized by AspectJ as an aspect class */ boolean isAspect(Class clazz); diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java index 27fb520d40..1617e2267e 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectMetadata.java @@ -67,7 +67,7 @@ public class AspectMetadata implements Serializable { /** * Spring AOP pointcut corresponding to the per clause of the - * aspect. Will be the Pointcut.TRUE canonical instance in the + * aspect. Will be the {@code Pointcut.TRUE} canonical instance in the * case of a singleton, otherwise an AspectJExpressionPointcut. */ private final Pointcut perClausePointcut; diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java index 2d2aabd07f..8579e5e4c9 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/autoproxy/AspectJAwareAdvisorAutoProxyCreator.java @@ -60,8 +60,8 @@ public class AspectJAwareAdvisorAutoProxyCreator extends AbstractAdvisorAutoProx *

  • Otherwise the advice declared first gets highest precedence (i.e., runs * first).
    • * - *

    Important: Advisors are sorted in precedence order, from highest - * precedence to lowest. "On the way in" to a join point, the highest precedence + *

    Important: Advisors are sorted in precedence order, from the highest + * precedence to the lowest. "On the way in" to a join point, the highest precedence * advisor should run first. "On the way out" of a join point, the highest * precedence advisor should run last. */ diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java index b2b8060b8a..3de330c108 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/AdvisedSupport.java @@ -314,7 +314,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { } /** - * Add all of the given advisors to this proxy configuration. + * Add all the given advisors to this proxy configuration. * @param advisors the advisors to register */ public void addAdvisors(Advisor... advisors) { @@ -322,7 +322,7 @@ public class AdvisedSupport extends ProxyConfig implements Advised { } /** - * Add all of the given advisors to this proxy configuration. + * Add all the given advisors to this proxy configuration. * @param advisors the advisors to register */ public void addAdvisors(Collection advisors) { diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java index fcfaf93dd8..3aeb80cd18 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java @@ -72,8 +72,8 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa * NOTE: We could avoid the code duplication between this class and the CGLIB * proxies by refactoring "invoke" into a template method. However, this approach * adds at least 10% performance overhead versus a copy-paste solution, so we sacrifice - * elegance for performance. (We have a good test suite to ensure that the different - * proxies behave the same :-) + * elegance for performance (we have a good test suite to ensure that the different + * proxies behave the same :-)). * This way, we can also more easily take advantage of minor optimizations in each class. */ @@ -198,7 +198,7 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa // Get the interception chain for this method. List chain = this.advised.getInterceptorsAndDynamicInterceptionAdvice(method, targetClass); - // Check whether we have any advice. If we don't, we can fallback on direct + // Check whether we have any advice. If we don't, we can fall back on direct // reflective invocation of the target, and avoid creating a MethodInvocation. if (chain.isEmpty()) { // We can skip creating a MethodInvocation: just invoke the target directly diff --git a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java index 3133dbaaa1..c0a8286eae 100644 --- a/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java +++ b/spring-aop/src/main/java/org/springframework/aop/framework/ProxyFactoryBean.java @@ -60,7 +60,7 @@ import org.springframework.util.ObjectUtils; * to use the "targetName"/"target"/"targetSource" properties instead. * *

    Global interceptors and advisors can be added at the factory level. The specified - * ones are expanded in an interceptor list where an "xxx*" entry is included in the + * ones are expanded in an interceptor list where a "xxx*" entry is included in the * list, matching the given prefix with the bean names (e.g. "global*" would match * both "globalBean1" and "globalBean2", "*" all defined interceptors). The matching * interceptors get applied according to their returned order value, if they implement @@ -406,7 +406,7 @@ public class ProxyFactoryBean extends ProxyCreatorSupport if (namedBeanClass != null) { return (Advisor.class.isAssignableFrom(namedBeanClass) || Advice.class.isAssignableFrom(namedBeanClass)); } - // Treat it as an target bean if we can't tell. + // Treat it as a target bean if we can't tell. if (logger.isDebugEnabled()) { logger.debug("Could not determine type of bean with name '" + beanName + "' - assuming it is neither an Advisor nor an Advice"); 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 c550168800..e81b6e43e0 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 @@ -119,7 +119,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport private AdvisorAdapterRegistry advisorAdapterRegistry = GlobalAdvisorAdapterRegistry.getInstance(); /** - * Indicates whether or not the proxy should be frozen. Overridden from super + * Indicates whether the proxy should be frozen. Overridden from super * to prevent the configuration from becoming frozen too early. */ private boolean freezeProxy = false; @@ -145,7 +145,7 @@ public abstract class AbstractAutoProxyCreator extends ProxyProcessorSupport /** - * Set whether or not the proxy should be frozen, preventing advice + * 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 * from being frozen before the proxy is created. diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java index 892cf5cacc..2d67708c35 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AbstractTraceInterceptor.java @@ -56,7 +56,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser protected transient Log defaultLogger = LogFactory.getLog(getClass()); /** - * Indicates whether or not proxy class names should be hidden when using dynamic loggers. + * Indicates whether proxy class names should be hidden when using dynamic loggers. * @see #setUseDynamicLogger */ private boolean hideProxyClassNames = false; @@ -119,7 +119,7 @@ public abstract class AbstractTraceInterceptor implements MethodInterceptor, Ser /** - * Determines whether or not logging is enabled for the particular {@code MethodInvocation}. + * Determines whether logging is enabled for the particular {@code MethodInvocation}. * If not, the method invocation proceeds as normal, otherwise the method invocation is passed * to the {@code invokeUnderTrace} method for handling. * @see #invokeUnderTrace(org.aopalliance.intercept.MethodInvocation, org.apache.commons.logging.Log) diff --git a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncUncaughtExceptionHandler.java b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncUncaughtExceptionHandler.java index a3d7d850eb..868e4898f5 100644 --- a/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncUncaughtExceptionHandler.java +++ b/spring-aop/src/main/java/org/springframework/aop/interceptor/AsyncUncaughtExceptionHandler.java @@ -36,7 +36,7 @@ public interface AsyncUncaughtExceptionHandler { * Handle the given uncaught exception thrown from an asynchronous method. * @param ex the exception thrown from the asynchronous method * @param method the asynchronous method - * @param params the parameters used to invoked the method + * @param params the parameters used to invoke the method */ void handleUncaughtException(Throwable ex, Method method, Object... params); diff --git a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java index 860f0d6339..e3001ec497 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/AopUtils.java @@ -217,7 +217,7 @@ public abstract class AopUtils { * out a pointcut for a class. * @param pc the static or dynamic pointcut to check * @param targetClass the class to test - * @param hasIntroductions whether or not the advisor chain + * @param hasIntroductions whether the advisor chain * for this bean includes any introductions * @return whether the pointcut can apply on any method */ @@ -261,7 +261,7 @@ public abstract class AopUtils { /** * Can the given advisor apply at all on the given class? * This is an important test as it can be used to optimize - * out a advisor for a class. + * out an advisor for a class. * @param advisor the advisor to check * @param targetClass class we're testing * @return whether the pointcut can apply on any method @@ -272,11 +272,11 @@ public abstract class AopUtils { /** * Can the given advisor apply at all on the given class? - *

    This is an important test as it can be used to optimize out a advisor for a class. + *

    This is an important test as it can be used to optimize out an advisor for a class. * This version also takes into account introductions (for IntroductionAwareMethodMatchers). * @param advisor the advisor to check * @param targetClass class we're testing - * @param hasIntroductions whether or not the advisor chain for this bean includes + * @param hasIntroductions whether the advisor chain for this bean includes * any introductions * @return whether the pointcut can apply on any method */ diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java index 0f3ded0e6b..45c2e17254 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultPointcutAdvisor.java @@ -43,7 +43,7 @@ public class DefaultPointcutAdvisor extends AbstractGenericPointcutAdvisor imple /** * Create an empty DefaultPointcutAdvisor. - *

    Advice must be set before use using setter methods. + *

    Advice must be set before using setter methods. * Pointcut will normally be set also, but defaults to {@code Pointcut.TRUE}. */ public DefaultPointcutAdvisor() { diff --git a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java index 23b4d9b78d..f36b47cb8a 100644 --- a/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java +++ b/spring-aop/src/main/java/org/springframework/aop/support/MethodMatchers.java @@ -90,7 +90,7 @@ public abstract class MethodMatchers { * @param targetClass the target class * @param hasIntroductions {@code true} if the object on whose behalf we are * asking is the subject on one or more introductions; {@code false} otherwise - * @return whether or not this method matches statically + * @return whether this method matches statically */ public static boolean matches(MethodMatcher mm, Method method, Class targetClass, boolean hasIntroductions) { Assert.notNull(mm, "MethodMatcher must not be null"); diff --git a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java index a5cfedbcbe..30e9c1e2ef 100644 --- a/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java +++ b/spring-aop/src/main/java/org/springframework/aop/target/AbstractPoolingTargetSource.java @@ -37,7 +37,7 @@ import org.springframework.lang.Nullable; * {@link AbstractPrototypeBasedTargetSource} can be used to create objects * in order to put them into the pool. * - *

    Subclasses must also implement some of the monitoring methods from the + *

    Subclasses must also implement some monitoring methods from the * {@link PoolingConfig} interface. The {@link #getPoolingConfigMixin()} method * makes these stats available on proxied objects through an IntroductionAdvisor. * diff --git a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java index 3f5a7b562c..847ef4f380 100644 --- a/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java +++ b/spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java @@ -931,7 +931,7 @@ abstract class AbstractMakeModifiable { return setter.getDeclaringClass().getMethod(getterName); } catch (NoSuchMethodException ex) { - // must be write only + // must be write-only return null; } } diff --git a/spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/EnableSpringConfigured.java b/spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/EnableSpringConfigured.java index e26a94f71b..0f362d91e8 100644 --- a/spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/EnableSpringConfigured.java +++ b/spring-aspects/src/main/java/org/springframework/context/annotation/aspectj/EnableSpringConfigured.java @@ -26,7 +26,7 @@ import org.springframework.context.annotation.Import; /** * Signals the current application context to apply dependency injection to - * non-managed classes that are instantiated outside of the Spring bean factory + * non-managed classes that are instantiated outside the Spring bean factory * (typically classes annotated with the * {@link org.springframework.beans.factory.annotation.Configurable @Configurable} * annotation).