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

Polishing

This commit is contained in:
Sam Brannen 2024-01-05 17:06:32 +01:00
parent 79b0d71514
commit 580d9f81e2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2023 the original author or authors. * Copyright 2002-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -517,9 +517,9 @@ public class AutowiredAnnotationBeanPostProcessor implements SmartInstantiationA
} }
/** /**
* 'Native' processing method for direct calls with an arbitrary target instance, * <em>Native</em> processing method for direct calls with an arbitrary target
* resolving all of its fields and methods which are annotated with one of the * instance, resolving all of its fields and methods which are annotated with
* configured 'autowired' annotation types. * one of the configured 'autowired' annotation types.
* @param bean the target instance to process * @param bean the target instance to process
* @throws BeanCreationException if autowiring failed * @throws BeanCreationException if autowiring failed
* @see #setAutowiredAnnotationTypes(Set) * @see #setAutowiredAnnotationTypes(Set)

4
spring-test/src/main/java/org/springframework/test/context/support/DependencyInjectionTestExecutionListener.java
View File

@ -153,7 +153,7 @@ public class DependencyInjectionTestExecutionListener extends AbstractTestExecut
} }
Object bean = testContext.getTestInstance(); Object bean = testContext.getTestInstance();
Class<?> clazz = testContext.getTestClass(); String beanName = testContext.getTestClass().getName() + AutowireCapableBeanFactory.ORIGINAL_INSTANCE_SUFFIX;
ConfigurableListableBeanFactory beanFactory = gac.getBeanFactory(); ConfigurableListableBeanFactory beanFactory = gac.getBeanFactory();
AutowiredAnnotationBeanPostProcessor autowiredAnnotationBpp = new AutowiredAnnotationBeanPostProcessor(); AutowiredAnnotationBeanPostProcessor autowiredAnnotationBpp = new AutowiredAnnotationBeanPostProcessor();
@ -162,7 +162,7 @@ public class DependencyInjectionTestExecutionListener extends AbstractTestExecut
CommonAnnotationBeanPostProcessor commonAnnotationBpp = new CommonAnnotationBeanPostProcessor(); CommonAnnotationBeanPostProcessor commonAnnotationBpp = new CommonAnnotationBeanPostProcessor();
commonAnnotationBpp.setBeanFactory(beanFactory); commonAnnotationBpp.setBeanFactory(beanFactory);
commonAnnotationBpp.processInjection(bean); commonAnnotationBpp.processInjection(bean);
beanFactory.initializeBean(bean, clazz.getName() + AutowireCapableBeanFactory.ORIGINAL_INSTANCE_SUFFIX); beanFactory.initializeBean(bean, beanName);
testContext.removeAttribute(REINJECT_DEPENDENCIES_ATTRIBUTE); testContext.removeAttribute(REINJECT_DEPENDENCIES_ATTRIBUTE);
} }