root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Do not invoke AspectJ hints generation if AspectJ is not present 

See gh-28711
This commit is contained in:
Stephane Nicoll 2023-06-20 17:26:08 +02:00
parent 564f33d5ef
commit 74155e3d88
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java
View File

@ -28,22 +28,42 @@ import org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcess
import org.springframework.beans.factory.aot.BeanFactoryInitializationCode; import org.springframework.beans.factory.aot.BeanFactoryInitializationCode;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.ClassUtils;
/** /**
* {@link BeanFactoryInitializationAotProcessor} implementation responsible for registering * {@link BeanFactoryInitializationAotProcessor} implementation responsible for registering
* hints for AOP advices. * hints for AOP advices.
* *
* @author Sebastien Deleuze * @author Sebastien Deleuze
* @author Stephane Nicoll
* @since 6.0.11 * @since 6.0.11
*/ */
class AspectJBeanFactoryInitializationAotProcessor implements BeanFactoryInitializationAotProcessor { class AspectJBeanFactoryInitializationAotProcessor implements BeanFactoryInitializationAotProcessor {
private static final boolean aspectJPresent = ClassUtils.isPresent(
"org.aspectj.lang.annotation.Pointcut", AspectJBeanFactoryInitializationAotProcessor.class.getClassLoader());
@Nullable @Nullable
@Override @Override
public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) { public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
BeanFactoryAspectJAdvisorsBuilder builder = new BeanFactoryAspectJAdvisorsBuilder(beanFactory); if (aspectJPresent) {
List<Advisor> advisors = builder.buildAspectJAdvisors(); return AspectDelegate.processAheadOfTime(beanFactory);
return advisors.isEmpty() ? null : new AspectContribution(advisors); }
return null;
}
/**
* Inner class to avoid a hard dependency on AspectJ at runtime.
*/
private static class AspectDelegate {
@Nullable
private static AspectContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) {
BeanFactoryAspectJAdvisorsBuilder builder = new BeanFactoryAspectJAdvisorsBuilder(beanFactory);
List<Advisor> advisors = builder.buildAspectJAdvisors();
return advisors.isEmpty() ? null : new AspectContribution(advisors);
}
} }