From d86cfc949d55b6dced27ce9435786412e20c9ce1 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 15 May 2023 16:07:15 +0200 Subject: [PATCH] Polishing --- .../aop/aspectj/AspectJExpressionPointcut.java | 4 ++-- .../springframework/aop/aspectj/AspectJPointcutAdvisor.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java index ee26513d6b5..10ed76efd52 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJExpressionPointcut.java @@ -243,8 +243,8 @@ public class AspectJExpressionPointcut extends AbstractExpressionPointcut /** * If a pointcut expression has been specified in XML, the user cannot - * write {@code and} as "&&" (though && will work). - * We also allow {@code and} between two pointcut sub-expressions. + * write "and" as "&&" (though {@code &&} will work). + *

We also allow "and" between two pointcut sub-expressions. *

This method converts back to {@code &&} for the AspectJ pointcut parser. */ private String replaceBooleanOperators(String pcExpr) { diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java index 442df0808f2..605a55e327d 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJPointcutAdvisor.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,8 +25,8 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; /** - * AspectJPointcutAdvisor that adapts an {@link AbstractAspectJAdvice} - * to the {@link org.springframework.aop.PointcutAdvisor} interface. + * {@code AspectJPointcutAdvisor} adapts an {@link AbstractAspectJAdvice} to the + * {@link PointcutAdvisor} interface. * * @author Adrian Colyer * @author Juergen Hoeller