Polishing

jhoeller · jhoeller · commit 59ef34d769ec · 2013-05-14T21:20:24.000+02:00
diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/AspectJWeaverMessageHandler.java
@@ -45,44 +45,42 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {
 
 	private static final String AJ_ID = "[AspectJ] ";
 
-	private static final Log LOGGER = LogFactory.getLog("AspectJ Weaver");
+	private static final Log logger = LogFactory.getLog("AspectJ Weaver");
 
 
 	@Override
 	public boolean handleMessage(IMessage message) throws AbortException {
 		Kind messageKind = message.getKind();
-
 		if (messageKind == IMessage.DEBUG) {
-			if (LOGGER.isDebugEnabled() || LOGGER.isTraceEnabled()) {
-				LOGGER.debug(makeMessageFor(message));
+			if (logger.isDebugEnabled()) {
+				logger.debug(makeMessageFor(message));
 				return true;
 			}
 		}
-		else if ((messageKind == IMessage.INFO) || (messageKind == IMessage.WEAVEINFO)) {
-			if (LOGGER.isInfoEnabled()) {
-				LOGGER.info(makeMessageFor(message));
+		else if (messageKind == IMessage.INFO || messageKind == IMessage.WEAVEINFO) {
+			if (logger.isInfoEnabled()) {
+				logger.info(makeMessageFor(message));
 				return true;
 			}
 		}
 		else if (messageKind == IMessage.WARNING) {
-			if (LOGGER.isWarnEnabled()) {
-				LOGGER.warn(makeMessageFor(message));
+			if (logger.isWarnEnabled()) {
+				logger.warn(makeMessageFor(message));
 				return true;
 			}
 		}
 		else if (messageKind == IMessage.ERROR) {
-			if (LOGGER.isErrorEnabled()) {
-				LOGGER.error(makeMessageFor(message));
+			if (logger.isErrorEnabled()) {
+				logger.error(makeMessageFor(message));
 				return true;
 			}
 		}
 		else if (messageKind == IMessage.ABORT) {
-			if (LOGGER.isFatalEnabled()) {
-				LOGGER.fatal(makeMessageFor(message));
+			if (logger.isFatalEnabled()) {
+				logger.fatal(makeMessageFor(message));
 				return true;
 			}
 		}
-
 		return false;
 	}
 
diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java b/spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
@@ -171,6 +171,7 @@ public AbstractAutowireCapableBeanFactory(BeanFactory parentBeanFactory) {
 		setParentBeanFactory(parentBeanFactory);
 	}
 
+
 	/**
 	 * Set the instantiation strategy to use for creating bean instances.
 	 * Default is CglibSubclassingInstantiationStrategy.
@@ -261,7 +262,6 @@ public void ignoreDependencyInterface(Class<?> ifc) {
 		this.ignoredDependencyInterfaces.add(ifc);
 	}
 
-
 	@Override
 	public void copyConfigurationFrom(ConfigurableBeanFactory otherFactory) {
 		super.copyConfigurationFrom(otherFactory);
@@ -352,10 +352,8 @@ public Object autowire(Class<?> beanClass, int autowireMode, boolean dependencyC
 		else {
 			Object bean;
 			final BeanFactory parent = this;
-
 			if (System.getSecurityManager() != null) {
 				bean = AccessController.doPrivileged(new PrivilegedAction<Object>() {
-
 					@Override
 					public Object run() {
 						return getInstantiationStrategy().instantiate(bd, null, parent);
@@ -365,7 +363,6 @@ public Object run() {
 			else {
 				bean = getInstantiationStrategy().instantiate(bd, null, parent);
 			}
-
 			populateBean(beanClass.getName(), bd, new BeanWrapperImpl(bean));
 			return bean;
 		}

Original file line number	Diff line number	Diff line change
`@@ -45,44 +45,42 @@ public class AspectJWeaverMessageHandler implements IMessageHandler {`
`45`	`45`
`46`	`46`	`private static final String AJ_ID = "[AspectJ] ";`
`47`	`47`
`48`		`- private static final Log LOGGER = LogFactory.getLog("AspectJ Weaver");`
	`48`	`+ private static final Log logger = LogFactory.getLog("AspectJ Weaver");`
`49`	`49`
`50`	`50`
`51`	`51`	`@Override`
`52`	`52`	`public boolean handleMessage(IMessage message) throws AbortException {`
`53`	`53`	`Kind messageKind = message.getKind();`
`54`		`-`
`55`	`54`	`if (messageKind == IMessage.DEBUG) {`
`56`		`- if (LOGGER.isDebugEnabled() \|\| LOGGER.isTraceEnabled()) {`
`57`		`- LOGGER.debug(makeMessageFor(message));`
	`55`	`+ if (logger.isDebugEnabled()) {`
	`56`	`+ logger.debug(makeMessageFor(message));`
`58`	`57`	`return true;`
`59`	`58`	`}`
`60`	`59`	`}`
`61`		`- else if ((messageKind == IMessage.INFO) \|\| (messageKind == IMessage.WEAVEINFO)) {`
`62`		`- if (LOGGER.isInfoEnabled()) {`
`63`		`- LOGGER.info(makeMessageFor(message));`
	`60`	`+ else if (messageKind == IMessage.INFO \|\| messageKind == IMessage.WEAVEINFO) {`
	`61`	`+ if (logger.isInfoEnabled()) {`
	`62`	`+ logger.info(makeMessageFor(message));`
`64`	`63`	`return true;`
`65`	`64`	`}`
`66`	`65`	`}`
`67`	`66`	`else if (messageKind == IMessage.WARNING) {`
`68`		`- if (LOGGER.isWarnEnabled()) {`
`69`		`- LOGGER.warn(makeMessageFor(message));`
	`67`	`+ if (logger.isWarnEnabled()) {`
	`68`	`+ logger.warn(makeMessageFor(message));`
`70`	`69`	`return true;`
`71`	`70`	`}`
`72`	`71`	`}`
`73`	`72`	`else if (messageKind == IMessage.ERROR) {`
`74`		`- if (LOGGER.isErrorEnabled()) {`
`75`		`- LOGGER.error(makeMessageFor(message));`
	`73`	`+ if (logger.isErrorEnabled()) {`
	`74`	`+ logger.error(makeMessageFor(message));`
`76`	`75`	`return true;`
`77`	`76`	`}`
`78`	`77`	`}`
`79`	`78`	`else if (messageKind == IMessage.ABORT) {`
`80`		`- if (LOGGER.isFatalEnabled()) {`
`81`		`- LOGGER.fatal(makeMessageFor(message));`
	`79`	`+ if (logger.isFatalEnabled()) {`
	`80`	`+ logger.fatal(makeMessageFor(message));`
`82`	`81`	`return true;`
`83`	`82`	`}`
`84`	`83`	`}`
`85`		`-`
`86`	`84`	`return false;`
`87`	`85`	`}`
`88`	`86`