diff --git a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java index d58e9877776..2eba7cc85dc 100644 --- a/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java +++ b/org.springframework.beans/src/main/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessor.java @@ -95,12 +95,11 @@ import org.springframework.util.ReflectionUtils; * @since 2.5 * @see #setAutowiredAnnotationType * @see Autowired - * @see org.springframework.context.annotation.CommonAnnotationBeanPostProcessor */ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBeanPostProcessorAdapter implements MergedBeanDefinitionPostProcessor, PriorityOrdered, BeanFactoryAware { - protected final Log logger = LogFactory.getLog(AutowiredAnnotationBeanPostProcessor.class); + protected final Log logger = LogFactory.getLog(getClass()); private final Set> autowiredAnnotationTypes = new LinkedHashSet>(); @@ -144,7 +143,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean * Set the 'autowired' annotation type, to be used on constructors, fields, * setter methods and arbitrary config methods. *

The default autowired annotation type is the Spring-provided - * {@link Autowired} annotation. + * {@link Autowired} annotation, as well as {@link Value}. *

This setter property exists so that developers can provide their own * (non-Spring-specific) annotation type to indicate that a member is * supposed to be autowired. @@ -159,8 +158,7 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean * Set the 'autowired' annotation types, to be used on constructors, fields, * setter methods and arbitrary config methods. *

The default autowired annotation type is the Spring-provided - * {@link Autowired} annotation, as well as {@link Value} and raw - * use of the {@link Qualifier} annotation. + * {@link Autowired} annotation, as well as {@link Value}. *

This setter property exists so that developers can provide their own * (non-Spring-specific) annotation types to indicate that a member is * supposed to be autowired. @@ -299,9 +297,8 @@ public class AutowiredAnnotationBeanPostProcessor extends InstantiationAwareBean } /** - * 'Native' processing method for direct calls with an arbitrary target - * instance, resolving all of its fields and methods which are annotated - * with @Autowired. + * 'Native' processing method for direct calls with an arbitrary target instance, + * resolving all of its fields and methods which are annotated with @Autowired. * @param bean the target instance to process */ public void processInjection(Object bean) throws BeansException { diff --git a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java b/org.springframework.transaction/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java index 77287fb05c8..5978fb1a3e1 100644 --- a/org.springframework.transaction/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java +++ b/org.springframework.transaction/src/main/java/org/springframework/transaction/support/AbstractPlatformTransactionManager.java @@ -59,7 +59,7 @@ import org.springframework.transaction.UnexpectedRollbackException; * *

Transaction synchronization is a generic mechanism for registering callbacks * that get invoked at transaction completion time. This is mainly used internally - * by the data access support classes for JDBC, Hibernate, JDO, etc when running + * by the data access support classes for JDBC, Hibernate, JPA, etc when running * within a JTA transaction: They register resources that are opened within the * transaction for closing at transaction completion time, allowing e.g. for reuse * of the same Hibernate Session within the transaction. The same mechanism can @@ -109,7 +109,6 @@ public abstract class AbstractPlatformTransactionManager implements PlatformTran private static final Constants constants = new Constants(AbstractPlatformTransactionManager.class); - /** Transient to optimize serialization */ protected transient Log logger = LogFactory.getLog(getClass()); private int transactionSynchronization = SYNCHRONIZATION_ALWAYS;