Polishing around @EnableTransactionManagement

Issue: SPR-10864

Author: jhoeller

spring-context/src/main/java/org/springframework/context/annotation/AdviceModeImportSelector.java

@@ -60,7 +60,7 @@ protected String getAdviceModeAttributeName() {
 	 */
 	@Override
 	public final String[] selectImports(AnnotationMetadata importingClassMetadata) {
-		Class<?> annoType = GenericTypeResolver.resolveTypeArgument(this.getClass(), AdviceModeImportSelector.class);
+		Class<?> annoType = GenericTypeResolver.resolveTypeArgument(getClass(), AdviceModeImportSelector.class);
 		AnnotationAttributes attributes = AnnotationConfigUtils.attributesFor(importingClassMetadata, annoType);
 		Assert.notNull(attributes, String.format(
 				"@%s is not present on importing class '%s' as expected",

spring-context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java

@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,6 +20,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+
 import org.springframework.aop.config.AopConfigUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.annotation.AnnotationAttributes;
@@ -31,8 +32,8 @@
  * {@code proxyTargetClass} attributes set to the correct values.
  *
  * @author Chris Beams
- * @see EnableAspectJAutoProxy
  * @since 3.1
+ * @see EnableAspectJAutoProxy
  */
 public class AutoProxyRegistrar implements ImportBeanDefinitionRegistrar {
 
@@ -45,7 +46,6 @@ public class AutoProxyRegistrar implements ImportBeanDefinitionRegistrar {
 	 * attributes. If {@code mode} is set to {@code PROXY}, the APC is registered; if
 	 * {@code proxyTargetClass} is set to {@code true}, then the APC is forced to use
 	 * subclass (CGLIB) proxying.
-	 *
 	 * <p>Several {@code @Enable*} annotations expose both {@code mode} and
 	 * {@code proxyTargetClass} attributes. It is important to note that most of these
 	 * capabilities end up sharing a {@linkplain AopConfigUtils#AUTO_PROXY_CREATOR_BEAN_NAME
@@ -62,13 +62,12 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
 			AnnotationAttributes candidate = AnnotationConfigUtils.attributesFor(importingClassMetadata, annoType);
 			Object mode = candidate.get("mode");
 			Object proxyTargetClass = candidate.get("proxyTargetClass");
-			if (mode != null && proxyTargetClass != null
-					&& mode.getClass().equals(AdviceMode.class)
-					&& proxyTargetClass.getClass().equals(Boolean.class)) {
+			if (mode != null && proxyTargetClass != null && mode.getClass().equals(AdviceMode.class) &&
+					proxyTargetClass.getClass().equals(Boolean.class)) {
 				candidateFound = true;
 				if (mode == AdviceMode.PROXY) {
 					AopConfigUtils.registerAutoProxyCreatorIfNecessary(registry);
-					if ((Boolean)proxyTargetClass) {
+					if ((Boolean) proxyTargetClass) {
 						AopConfigUtils.forceAutoProxyCreatorToUseClassProxying(registry);
 						return;
 					}
@@ -87,4 +86,5 @@ public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, B
 					"altogether.", name, name, name));
 		}
 	}
+
 }

spring-tx/src/main/java/org/springframework/transaction/annotation/EnableTransactionManagement.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -145,7 +145,6 @@
 	 * opposed to standard Java interface-based proxies ({@code false}). The default is
 	 * {@code false}. <strong>Applicable only if {@link #mode()} is set to
 	 * {@link AdviceMode#PROXY}</strong>.
-	 *
 	 * <p>Note that setting this attribute to {@code true} will affect <em>all</em>
 	 * Spring-managed beans requiring proxying, not just those marked with
 	 * {@code @Transactional}. For example, other beans marked with Spring's
@@ -168,4 +167,5 @@
 	 * The default is {@link Ordered#LOWEST_PRECEDENCE}.
 	 */
 	int order() default Ordered.LOWEST_PRECEDENCE;
+
 }

spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 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.
@@ -40,8 +40,7 @@ public class ProxyTransactionManagementConfiguration extends AbstractTransaction
 	@Bean(name=TransactionManagementConfigUtils.TRANSACTION_ADVISOR_BEAN_NAME)
 	@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
 	public BeanFactoryTransactionAttributeSourceAdvisor transactionAdvisor() {
-		BeanFactoryTransactionAttributeSourceAdvisor advisor =
-			new BeanFactoryTransactionAttributeSourceAdvisor();
+		BeanFactoryTransactionAttributeSourceAdvisor advisor = new BeanFactoryTransactionAttributeSourceAdvisor();
 		advisor.setTransactionAttributeSource(transactionAttributeSource());
 		advisor.setAdvice(transactionInterceptor());
 		advisor.setOrder(this.enableTx.<Integer>getNumber("order"));

spring-tx/src/main/java/org/springframework/transaction/annotation/TransactionManagementConfigurationSelector.java

@@ -32,8 +32,7 @@
  * @see ProxyTransactionManagementConfiguration
  * @see TransactionManagementConfigUtils#TRANSACTION_ASPECT_CONFIGURATION_CLASS_NAME
  */
-public class TransactionManagementConfigurationSelector
-		extends AdviceModeImportSelector<EnableTransactionManagement> {
+public class TransactionManagementConfigurationSelector extends AdviceModeImportSelector<EnableTransactionManagement> {
 
 	/**
 	 * {@inheritDoc}