GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Improve debug logging at BeanDefinitionReader and BeanFactory level 

Issue: SPR-17090
pull/1905/merge
Juergen Hoeller 8 years ago
parent
23bda9a5a7
commit
c037e75f26
24 changed files with 177 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
  2. 4
      spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
  3. 4
      spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
  4. 4
      spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
  5. 11
      spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
  6. 32
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
  7. 37
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
  8. 22
      spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
  9. 20
      spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
  10. 12
      spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
  11. 18
      spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
  12. 19
      spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
  13. 12
      spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
  14. 7
      spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
  15. 16
      spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
  16. 6
      spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
  17. 7
      spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
  18. 14
      spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
  19. 17
      spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
  20. 6
      spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
  21. 9
      spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
  22. 4
      spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
  23. 4
      spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
  24. 4
      spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java

38
spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
Unescape View File

@ -157,8 +157,8 @@ class CglibAopProxy implements AopProxy, Serializable {
@Override @Override
public Object getProxy(@Nullable ClassLoader classLoader) { public Object getProxy(@Nullable ClassLoader classLoader) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Creating CGLIB proxy: target source is " + this.advised.getTargetSource()); logger.trace("Creating CGLIB proxy: " + this.advised.getTargetSource());
} }
try { try {
@ -810,24 +810,28 @@ class CglibAopProxy implements AopProxy, Serializable {
@Override @Override
public int accept(Method method) { public int accept(Method method) {
if (AopUtils.isFinalizeMethod(method)) { if (AopUtils.isFinalizeMethod(method)) {
logger.debug("Found finalize() method - using NO_OVERRIDE"); logger.trace("Found finalize() method - using NO_OVERRIDE");
return NO_OVERRIDE; return NO_OVERRIDE;
} }
if (!this.advised.isOpaque() && method.getDeclaringClass().isInterface() && if (!this.advised.isOpaque() && method.getDeclaringClass().isInterface() &&
method.getDeclaringClass().isAssignableFrom(Advised.class)) { method.getDeclaringClass().isAssignableFrom(Advised.class)) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Method is declared on Advised interface: " + method); logger.trace("Method is declared on Advised interface: " + method);
} }
return DISPATCH_ADVISED; return DISPATCH_ADVISED;
} }
// We must always proxy equals, to direct calls to this. // We must always proxy equals, to direct calls to this.
if (AopUtils.isEqualsMethod(method)) { if (AopUtils.isEqualsMethod(method)) {
logger.debug("Found 'equals' method: " + method); if (logger.isTraceEnabled()) {
logger.trace("Found 'equals' method: " + method);
}
return INVOKE_EQUALS; return INVOKE_EQUALS;
} }
// We must always calculate hashCode based on the proxy. // We must always calculate hashCode based on the proxy.
if (AopUtils.isHashCodeMethod(method)) { if (AopUtils.isHashCodeMethod(method)) {
logger.debug("Found 'hashCode' method: " + method); if (logger.isTraceEnabled()) {
logger.trace("Found 'hashCode' method: " + method);
}
return INVOKE_HASHCODE; return INVOKE_HASHCODE;
} }
Class<?> targetClass = this.advised.getTargetClass(); Class<?> targetClass = this.advised.getTargetClass();
@ -840,8 +844,8 @@ class CglibAopProxy implements AopProxy, Serializable {
if (haveAdvice || !isFrozen) { if (haveAdvice || !isFrozen) {
// If exposing the proxy, then AOP_PROXY must be used. // If exposing the proxy, then AOP_PROXY must be used.
if (exposeProxy) { if (exposeProxy) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Must expose proxy on advised method: " + method); logger.trace("Must expose proxy on advised method: " + method);
} }
return AOP_PROXY; return AOP_PROXY;
} }
@ -849,16 +853,16 @@ class CglibAopProxy implements AopProxy, Serializable {
// Check to see if we have fixed interceptor to serve this method. // Check to see if we have fixed interceptor to serve this method.
// Else use the AOP_PROXY. // Else use the AOP_PROXY.
if (isStatic && isFrozen && this.fixedInterceptorMap.containsKey(key)) { if (isStatic && isFrozen && this.fixedInterceptorMap.containsKey(key)) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Method has advice and optimizations are enabled: " + method); logger.trace("Method has advice and optimizations are enabled: " + method);
} }
// We know that we are optimizing so we can use the FixedStaticChainInterceptors. // We know that we are optimizing so we can use the FixedStaticChainInterceptors.
int index = this.fixedInterceptorMap.get(key); int index = this.fixedInterceptorMap.get(key);
return (index + this.fixedInterceptorOffset); return (index + this.fixedInterceptorOffset);
} }
else { else {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Unable to apply any optimizations to advised method: " + method); logger.trace("Unable to apply any optimizations to advised method: " + method);
} }
return AOP_PROXY; return AOP_PROXY;
} }
@ -874,15 +878,15 @@ class CglibAopProxy implements AopProxy, Serializable {
} }
Class<?> returnType = method.getReturnType(); Class<?> returnType = method.getReturnType();
if (targetClass != null && returnType.isAssignableFrom(targetClass)) { if (targetClass != null && returnType.isAssignableFrom(targetClass)) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Method return type is assignable from target type and " + logger.trace("Method return type is assignable from target type and " +
"may therefore return 'this' - using INVOKE_TARGET: " + method); "may therefore return 'this' - using INVOKE_TARGET: " + method);
} }
return INVOKE_TARGET; return INVOKE_TARGET;
} }
else { else {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Method return type ensures 'this' cannot be returned - " + logger.trace("Method return type ensures 'this' cannot be returned - " +
"using DISPATCH_TARGET: " + method); "using DISPATCH_TARGET: " + method);
} }
return DISPATCH_TARGET; return DISPATCH_TARGET;

4
spring-aop/src/main/java/org/springframework/aop/framework/JdkDynamicAopProxy.java
Unescape View File

@ -115,8 +115,8 @@ final class JdkDynamicAopProxy implements AopProxy, InvocationHandler, Serializa
@Override @Override
public Object getProxy(@Nullable ClassLoader classLoader) { public Object getProxy(@Nullable ClassLoader classLoader) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Creating JDK dynamic proxy: target source is " + this.advised.getTargetSource()); logger.trace("Creating JDK dynamic proxy: " + this.advised.getTargetSource());
} }
Class<?>[] proxiedInterfaces = AopProxyUtils.completeProxiedInterfaces(this.advised, true); Class<?>[] proxiedInterfaces = AopProxyUtils.completeProxiedInterfaces(this.advised, true);
findDefinedEqualsAndHashCodeMethods(proxiedInterfaces); findDefinedEqualsAndHashCodeMethods(proxiedInterfaces);

4
spring-aop/src/main/java/org/springframework/aop/framework/adapter/ThrowsAdviceInterceptor.java
Unescape View File

@ -136,8 +136,8 @@ public class ThrowsAdviceInterceptor implements MethodInterceptor, AfterAdvice {
exceptionClass = exceptionClass.getSuperclass(); exceptionClass = exceptionClass.getSuperclass();
handler = this.exceptionHandlerMap.get(exceptionClass); handler = this.exceptionHandlerMap.get(exceptionClass);
} }
if (handler != null && logger.isDebugEnabled()) { if (handler != null && logger.isTraceEnabled()) {
logger.debug("Found handler for exception of type [" + exceptionClass.getName() + "]: " + handler); logger.trace("Found handler for exception of type [" + exceptionClass.getName() + "]: " + handler);
} }
return handler; return handler;
} }

4
spring-beans/src/main/java/org/springframework/beans/BeanUtils.java
Unescape View File

@ -511,8 +511,8 @@ public abstract class BeanUtils {
return (PropertyEditor) instantiateClass(editorClass); return (PropertyEditor) instantiateClass(editorClass);
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("No property editor [" + editorName + "] found for type " + logger.trace("No property editor [" + editorName + "] found for type " +
targetType.getName() + " according to 'Editor' suffix convention"); targetType.getName() + " according to 'Editor' suffix convention");
} }
unknownEditorTypes.add(targetType); unknownEditorTypes.add(targetType);

11
spring-beans/src/main/java/org/springframework/beans/factory/groovy/GroovyBeanDefinitionReader.java
Unescape View File

@ -236,6 +236,10 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp
return this.standardXmlBeanDefinitionReader.loadBeanDefinitions(encodedResource); return this.standardXmlBeanDefinitionReader.loadBeanDefinitions(encodedResource);
} }
if (logger.isTraceEnabled()) {
logger.trace("Loading Groovy bean definitions from " + encodedResource);
}
Closure beans = new Closure(this) { Closure beans = new Closure(this) {
@Override @Override
public Object call(Object[] args) { public Object call(Object[] args) {
@ -265,7 +269,12 @@ public class GroovyBeanDefinitionReader extends AbstractBeanDefinitionReader imp
throw new BeanDefinitionParsingException(new Problem("Error evaluating Groovy script: " + ex.getMessage(), throw new BeanDefinitionParsingException(new Problem("Error evaluating Groovy script: " + ex.getMessage(),
new Location(encodedResource.getResource()), null, ex)); new Location(encodedResource.getResource()), null, ex));
} }
return getRegistry().getBeanDefinitionCount() - countBefore;
int count = getRegistry().getBeanDefinitionCount() - countBefore;
if (logger.isDebugEnabled()) {
logger.debug("Loaded " + count + " bean definitions from " + encodedResource);
}
return count;
} }

32
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractAutowireCapableBeanFactory.java
Unescape View File

@ -459,8 +459,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
protected Object createBean(String beanName, RootBeanDefinition mbd, @Nullable Object[] args) protected Object createBean(String beanName, RootBeanDefinition mbd, @Nullable Object[] args)
throws BeanCreationException { throws BeanCreationException {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Creating instance of bean '" + beanName + "'"); logger.trace("Creating instance of bean '" + beanName + "'");
} }
RootBeanDefinition mbdToUse = mbd; RootBeanDefinition mbdToUse = mbd;
@ -496,8 +496,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
try { try {
Object beanInstance = doCreateBean(beanName, mbdToUse, args); Object beanInstance = doCreateBean(beanName, mbdToUse, args);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Finished creating instance of bean '" + beanName + "'"); logger.trace("Finished creating instance of bean '" + beanName + "'");
} }
return beanInstance; return beanInstance;
} }
@ -562,8 +562,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
boolean earlySingletonExposure = (mbd.isSingleton() && this.allowCircularReferences && boolean earlySingletonExposure = (mbd.isSingleton() && this.allowCircularReferences &&
isSingletonCurrentlyInCreation(beanName)); isSingletonCurrentlyInCreation(beanName));
if (earlySingletonExposure) { if (earlySingletonExposure) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Eagerly caching bean '" + beanName + logger.trace("Eagerly caching bean '" + beanName +
"' to allow for resolving potential circular references"); "' to allow for resolving potential circular references");
} }
addSingletonFactory(beanName, () -> getEarlyBeanReference(beanName, mbd, bean)); addSingletonFactory(beanName, () -> getEarlyBeanReference(beanName, mbd, bean));
@ -1417,8 +1417,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
Object bean = getBean(propertyName); Object bean = getBean(propertyName);
pvs.add(propertyName, bean); pvs.add(propertyName, bean);
registerDependentBean(propertyName, beanName); registerDependentBean(propertyName, beanName);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Added autowiring by name from bean name '" + beanName + logger.trace("Added autowiring by name from bean name '" + beanName +
"' via property '" + propertyName + "' to bean named '" + propertyName + "'"); "' via property '" + propertyName + "' to bean named '" + propertyName + "'");
} }
} }
@ -1468,8 +1468,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
} }
for (String autowiredBeanName : autowiredBeanNames) { for (String autowiredBeanName : autowiredBeanNames) {
registerDependentBean(autowiredBeanName, beanName); registerDependentBean(autowiredBeanName, beanName);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Autowiring by type from bean name '" + beanName + "' via property '" + logger.trace("Autowiring by type from bean name '" + beanName + "' via property '" +
propertyName + "' to bean named '" + autowiredBeanName + "'"); propertyName + "' to bean named '" + autowiredBeanName + "'");
} }
} }
@ -1784,8 +1784,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
boolean isInitializingBean = (bean instanceof InitializingBean); boolean isInitializingBean = (bean instanceof InitializingBean);
if (isInitializingBean && (mbd == null || !mbd.isExternallyManagedInitMethod("afterPropertiesSet"))) { if (isInitializingBean && (mbd == null || !mbd.isExternallyManagedInitMethod("afterPropertiesSet"))) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Invoking afterPropertiesSet() on bean with name '" + beanName + "'"); logger.trace("Invoking afterPropertiesSet() on bean with name '" + beanName + "'");
} }
if (System.getSecurityManager() != null) { if (System.getSecurityManager() != null) {
try { try {
@ -1835,8 +1835,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
initMethodName + "' on bean with name '" + beanName + "'"); initMethodName + "' on bean with name '" + beanName + "'");
} }
else { else {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("No default init method named '" + initMethodName + logger.trace("No default init method named '" + initMethodName +
"' found on bean with name '" + beanName + "'"); "' found on bean with name '" + beanName + "'");
} }
// Ignore non-existent default lifecycle methods. // Ignore non-existent default lifecycle methods.
@ -1844,8 +1844,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
} }
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Invoking init method '" + initMethodName + "' on bean with name '" + beanName + "'"); logger.trace("Invoking init method '" + initMethodName + "' on bean with name '" + beanName + "'");
} }
if (System.getSecurityManager() != null) { if (System.getSecurityManager() != null) {

37
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanDefinitionReader.java
Unescape View File

@ -17,6 +17,7 @@
package org.springframework.beans.factory.support; package org.springframework.beans.factory.support;
import java.io.IOException; import java.io.IOException;
import java.util.Collections;
import java.util.Set; import java.util.Set;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -45,7 +46,7 @@ import org.springframework.util.Assert;
* @since 11.12.2003 * @since 11.12.2003
* @see BeanDefinitionReaderUtils * @see BeanDefinitionReaderUtils
*/ */
public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable, BeanDefinitionReader { public abstract class AbstractBeanDefinitionReader implements BeanDefinitionReader, EnvironmentCapable {
/** Logger available to subclasses. */ /** Logger available to subclasses. */
protected final Log logger = LogFactory.getLog(getClass()); protected final Log logger = LogFactory.getLog(getClass());
@ -182,11 +183,11 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
@Override @Override
public int loadBeanDefinitions(Resource... resources) throws BeanDefinitionStoreException { public int loadBeanDefinitions(Resource... resources) throws BeanDefinitionStoreException {
Assert.notNull(resources, "Resource array must not be null"); Assert.notNull(resources, "Resource array must not be null");
int counter = 0; int count = 0;
for (Resource resource : resources) { for (Resource resource : resources) {
counter += loadBeanDefinitions(resource); count += loadBeanDefinitions(resource);
} }
return counter; return count;
} }
@Override @Override
@ -213,23 +214,21 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
ResourceLoader resourceLoader = getResourceLoader(); ResourceLoader resourceLoader = getResourceLoader();
if (resourceLoader == null) { if (resourceLoader == null) {
throw new BeanDefinitionStoreException( throw new BeanDefinitionStoreException(
"Cannot import bean definitions from location [" + location + "]: no ResourceLoader available"); "Cannot load bean definitions from location [" + location + "]: no ResourceLoader available");
} }
if (resourceLoader instanceof ResourcePatternResolver) { if (resourceLoader instanceof ResourcePatternResolver) {
// Resource pattern matching available. // Resource pattern matching available.
try { try {
Resource[] resources = ((ResourcePatternResolver) resourceLoader).getResources(location); Resource[] resources = ((ResourcePatternResolver) resourceLoader).getResources(location);
int loadCount = loadBeanDefinitions(resources); int count = loadBeanDefinitions(resources);
if (actualResources != null) { if (actualResources != null) {
for (Resource resource : resources) { Collections.addAll(actualResources, resources);
actualResources.add(resource);
}
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Loaded " + loadCount + " bean definitions from location pattern [" + location + "]"); logger.trace("Loaded " + count + " bean definitions from location pattern [" + location + "]");
} }
return loadCount; return count;
} }
catch (IOException ex) { catch (IOException ex) {
throw new BeanDefinitionStoreException( throw new BeanDefinitionStoreException(
@ -239,25 +238,25 @@ public abstract class AbstractBeanDefinitionReader implements EnvironmentCapable
else { else {
// Can only load single resources by absolute URL. // Can only load single resources by absolute URL.
Resource resource = resourceLoader.getResource(location); Resource resource = resourceLoader.getResource(location);
int loadCount = loadBeanDefinitions(resource); int count = loadBeanDefinitions(resource);
if (actualResources != null) { if (actualResources != null) {
actualResources.add(resource); actualResources.add(resource);
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Loaded " + loadCount + " bean definitions from location [" + location + "]"); logger.trace("Loaded " + count + " bean definitions from location [" + location + "]");
} }
return loadCount; return count;
} }
} }
@Override @Override
public int loadBeanDefinitions(String... locations) throws BeanDefinitionStoreException { public int loadBeanDefinitions(String... locations) throws BeanDefinitionStoreException {
Assert.notNull(locations, "Location array must not be null"); Assert.notNull(locations, "Location array must not be null");
int counter = 0; int count = 0;
for (String location : locations) { for (String location : locations) {
counter += loadBeanDefinitions(location); count += loadBeanDefinitions(location);
} }
return counter; return count;
} }
} }

22
spring-beans/src/main/java/org/springframework/beans/factory/support/AbstractBeanFactory.java
Unescape View File

@ -245,13 +245,13 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
// Eagerly check singleton cache for manually registered singletons. // Eagerly check singleton cache for manually registered singletons.
Object sharedInstance = getSingleton(beanName); Object sharedInstance = getSingleton(beanName);
if (sharedInstance != null && args == null) { if (sharedInstance != null && args == null) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
if (isSingletonCurrentlyInCreation(beanName)) { if (isSingletonCurrentlyInCreation(beanName)) {
logger.debug("Returning eagerly cached instance of singleton bean '" + beanName + logger.trace("Returning eagerly cached instance of singleton bean '" + beanName +
"' that is not fully initialized yet - a consequence of a circular reference"); "' that is not fully initialized yet - a consequence of a circular reference");
} }
else { else {
logger.debug("Returning cached instance of singleton bean '" + beanName + "'"); logger.trace("Returning cached instance of singleton bean '" + beanName + "'");
} }
} }
bean = getObjectForBeanInstance(sharedInstance, name, beanName, null); bean = getObjectForBeanInstance(sharedInstance, name, beanName, null);
@ -385,8 +385,8 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
return convertedBean; return convertedBean;
} }
catch (TypeMismatchException ex) { catch (TypeMismatchException ex) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Failed to convert bean '" + name + "' to required type '" + logger.trace("Failed to convert bean '" + name + "' to required type '" +
ClassUtils.getQualifiedName(requiredType) + "'", ex); ClassUtils.getQualifiedName(requiredType) + "'", ex);
} }
throw new BeanNotOfRequiredTypeException(name, requiredType, bean.getClass()); throw new BeanNotOfRequiredTypeException(name, requiredType, bean.getClass());
@ -1519,18 +1519,18 @@ public abstract class AbstractBeanFactory extends FactoryBeanRegistrySupport imp
} }
catch (BeanCreationException ex) { catch (BeanCreationException ex) {
if (ex.contains(BeanCurrentlyInCreationException.class)) { if (ex.contains(BeanCurrentlyInCreationException.class)) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Bean currently in creation on FactoryBean type check: " + ex); logger.trace("Bean currently in creation on FactoryBean type check: " + ex);
} }
} }
else if (mbd.isLazyInit()) { else if (mbd.isLazyInit()) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Bean creation exception on lazy FactoryBean type check: " + ex); logger.trace("Bean creation exception on lazy FactoryBean type check: " + ex);
} }
} }
else { else {
if (logger.isInfoEnabled()) { if (logger.isDebugEnabled()) {
logger.info("Bean creation exception on non-lazy FactoryBean type check: " + ex); logger.debug("Bean creation exception on non-lazy FactoryBean type check: " + ex);
} }
} }
onSuppressedException(ex); onSuppressedException(ex);

20
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
Unescape View File

@ -503,8 +503,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
throw ex; throw ex;
} }
// Probably a class name with a placeholder: let's ignore it for type matching purposes. // Probably a class name with a placeholder: let's ignore it for type matching purposes.
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Ignoring bean class loading failure for bean '" + beanName + "'", ex); logger.trace("Ignoring bean class loading failure for bean '" + beanName + "'", ex);
} }
onSuppressedException(ex); onSuppressedException(ex);
} }
@ -513,8 +513,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
throw ex; throw ex;
} }
// Probably some metadata with a placeholder: let's ignore it for type matching purposes. // Probably some metadata with a placeholder: let's ignore it for type matching purposes.
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Ignoring unresolvable metadata in bean definition '" + beanName + "'", ex); logger.trace("Ignoring unresolvable metadata in bean definition '" + beanName + "'", ex);
} }
onSuppressedException(ex); onSuppressedException(ex);
} }
@ -541,8 +541,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
} }
catch (NoSuchBeanDefinitionException ex) { catch (NoSuchBeanDefinitionException ex) {
// Shouldn't happen - probably a result of circular reference resolution... // Shouldn't happen - probably a result of circular reference resolution...
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Failed to check manually registered singleton with name '" + beanName + "'", ex); logger.trace("Failed to check manually registered singleton with name '" + beanName + "'", ex);
} }
} }
} }
@ -586,8 +586,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
BeanCreationException bce = (BeanCreationException) rootCause; BeanCreationException bce = (BeanCreationException) rootCause;
String exBeanName = bce.getBeanName(); String exBeanName = bce.getBeanName();
if (exBeanName != null && isCurrentlyInCreation(exBeanName)) { if (exBeanName != null && isCurrentlyInCreation(exBeanName)) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Ignoring match to currently created bean '" + exBeanName + "': " + logger.trace("Ignoring match to currently created bean '" + exBeanName + "': " +
ex.getMessage()); ex.getMessage());
} }
onSuppressedException(ex); onSuppressedException(ex);
@ -790,8 +790,8 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
@Override @Override
public void preInstantiateSingletons() throws BeansException { public void preInstantiateSingletons() throws BeansException {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Pre-instantiating singletons in " + this); logger.trace("Pre-instantiating singletons in " + this);
} }
// Iterate over a copy to allow for init methods which in turn register new bean definitions. // Iterate over a copy to allow for init methods which in turn register new bean definitions.

12
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultSingletonBeanRegistry.java
Unescape View File

@ -489,8 +489,8 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
} }
public void destroySingletons() { public void destroySingletons() {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Destroying singletons in " + this); logger.trace("Destroying singletons in " + this);
} }
synchronized (this.singletonObjects) { synchronized (this.singletonObjects) {
this.singletonsCurrentlyInDestruction = true; this.singletonsCurrentlyInDestruction = true;
@ -557,8 +557,8 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
dependencies = this.dependentBeanMap.remove(beanName); dependencies = this.dependentBeanMap.remove(beanName);
} }
if (dependencies != null) { if (dependencies != null) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Retrieved dependent beans for bean '" + beanName + "': " + dependencies); logger.trace("Retrieved dependent beans for bean '" + beanName + "': " + dependencies);
} }
for (String dependentBeanName : dependencies) { for (String dependentBeanName : dependencies) {
destroySingleton(dependentBeanName); destroySingleton(dependentBeanName);
@ -571,7 +571,9 @@ public class DefaultSingletonBeanRegistry extends SimpleAliasRegistry implements
bean.destroy(); bean.destroy();
} }
catch (Throwable ex) { catch (Throwable ex) {
logger.warn("Destroy method on bean with name '" + beanName + "' threw an exception", ex); if (logger.isInfoEnabled()) {
logger.info("Destroy method on bean with name '" + beanName + "' threw an exception", ex);
}
} }
} }

18
spring-beans/src/main/java/org/springframework/beans/factory/support/DisposableBeanAdapter.java
Unescape View File

@ -242,8 +242,8 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
} }
if (this.invokeDisposableBean) { if (this.invokeDisposableBean) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Invoking destroy() on bean with name '" + this.beanName + "'"); logger.trace("Invoking destroy() on bean with name '" + this.beanName + "'");
} }
try { try {
if (System.getSecurityManager() != null) { if (System.getSecurityManager() != null) {
@ -259,10 +259,10 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
catch (Throwable ex) { catch (Throwable ex) {
String msg = "Invocation of destroy method failed on bean with name '" + this.beanName + "'"; String msg = "Invocation of destroy method failed on bean with name '" + this.beanName + "'";
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.warn(msg, ex); logger.info(msg, ex);
} }
else { else {
logger.warn(msg + ": " + ex); logger.info(msg + ": " + ex);
} }
} }
} }
@ -314,8 +314,8 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
if (paramTypes.length == 1) { if (paramTypes.length == 1) {
args[0] = Boolean.TRUE; args[0] = Boolean.TRUE;
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Invoking destroy method '" + this.destroyMethodName + logger.trace("Invoking destroy method '" + this.destroyMethodName +
"' on bean with name '" + this.beanName + "'"); "' on bean with name '" + this.beanName + "'");
} }
try { try {
@ -341,14 +341,14 @@ class DisposableBeanAdapter implements DisposableBean, Runnable, Serializable {
String msg = "Destroy method '" + this.destroyMethodName + "' on bean with name '" + String msg = "Destroy method '" + this.destroyMethodName + "' on bean with name '" +
this.beanName + "' threw an exception"; this.beanName + "' threw an exception";
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.warn(msg, ex.getTargetException()); logger.info(msg, ex.getTargetException());
} }
else { else {
logger.warn(msg + ": " + ex.getTargetException()); logger.info(msg + ": " + ex.getTargetException());
} }
} }
catch (Throwable ex) { catch (Throwable ex) {
logger.warn("Failed to invoke destroy method '" + this.destroyMethodName + logger.info("Failed to invoke destroy method '" + this.destroyMethodName +
"' on bean with name '" + this.beanName + "'", ex); "' on bean with name '" + this.beanName + "'", ex);
} }
} }

19
spring-beans/src/main/java/org/springframework/beans/factory/support/PropertiesBeanDefinitionReader.java
Unescape View File

@ -247,6 +247,10 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
public int loadBeanDefinitions(EncodedResource encodedResource, @Nullable String prefix) public int loadBeanDefinitions(EncodedResource encodedResource, @Nullable String prefix)
throws BeanDefinitionStoreException { throws BeanDefinitionStoreException {
if (logger.isTraceEnabled()) {
logger.trace("Loading properties bean definitions from " + encodedResource);
}
Properties props = new Properties(); Properties props = new Properties();
try { try {
try (InputStream is = encodedResource.getResource().getInputStream()) { try (InputStream is = encodedResource.getResource().getInputStream()) {
@ -257,7 +261,12 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
getPropertiesPersister().load(props, is); getPropertiesPersister().load(props, is);
} }
} }
return registerBeanDefinitions(props, prefix, encodedResource.getResource().getDescription());
int count = registerBeanDefinitions(props, prefix, encodedResource.getResource().getDescription());
if (logger.isDebugEnabled()) {
logger.debug("Loaded " + count + " bean definitions from " + encodedResource);
}
return count;
} }
catch (IOException ex) { catch (IOException ex) {
throw new BeanDefinitionStoreException("Could not parse properties from " + encodedResource.getResource(), ex); throw new BeanDefinitionStoreException("Could not parse properties from " + encodedResource.getResource(), ex);
@ -368,8 +377,8 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
} }
if (sepIdx != -1) { if (sepIdx != -1) {
String beanName = nameAndProperty.substring(0, sepIdx); String beanName = nameAndProperty.substring(0, sepIdx);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Found bean name '" + beanName + "'"); logger.trace("Found bean name '" + beanName + "'");
} }
if (!getRegistry().containsBeanDefinition(beanName)) { if (!getRegistry().containsBeanDefinition(beanName)) {
// If we haven't already registered it... // If we haven't already registered it...
@ -468,8 +477,8 @@ public class PropertiesBeanDefinitionReader extends AbstractBeanDefinitionReader
} }
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Registering bean definition for bean name '" + beanName + "' with " + pvs); logger.trace("Registering bean definition for bean name '" + beanName + "' with " + pvs);
} }
// Just use default parent if we're not dealing with the parent itself, // Just use default parent if we're not dealing with the parent itself,

12
spring-beans/src/main/java/org/springframework/beans/factory/xml/BeanDefinitionParserDelegate.java
Unescape View File

@ -424,8 +424,8 @@ public class BeanDefinitionParserDelegate {
String beanName = id; String beanName = id;
if (!StringUtils.hasText(beanName) && !aliases.isEmpty()) { if (!StringUtils.hasText(beanName) && !aliases.isEmpty()) {
beanName = aliases.remove(0); beanName = aliases.remove(0);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("No XML 'id' specified - using '" + beanName + logger.trace("No XML 'id' specified - using '" + beanName +
"' as bean name and " + aliases + " as aliases"); "' as bean name and " + aliases + " as aliases");
} }
} }
@ -454,8 +454,8 @@ public class BeanDefinitionParserDelegate {
aliases.add(beanClassName); aliases.add(beanClassName);
} }
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Neither XML 'id' nor 'name' specified - " + logger.trace("Neither XML 'id' nor 'name' specified - " +
"using generated bean name [" + beanName + "]"); "using generated bean name [" + beanName + "]");
} }
} }
@ -1429,8 +1429,8 @@ public class BeanDefinitionParserDelegate {
} }
String id = ele.getNodeName() + BeanDefinitionReaderUtils.GENERATED_BEAN_NAME_SEPARATOR + String id = ele.getNodeName() + BeanDefinitionReaderUtils.GENERATED_BEAN_NAME_SEPARATOR +
ObjectUtils.getIdentityHexString(innerDefinition); ObjectUtils.getIdentityHexString(innerDefinition);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Using generated bean name [" + id + logger.trace("Using generated bean name [" + id +
"] for nested custom element '" + ele.getNodeName() + "'"); "] for nested custom element '" + ele.getNodeName() + "'");
} }
return new BeanDefinitionHolder(innerDefinition, id); return new BeanDefinitionHolder(innerDefinition, id);

7
spring-beans/src/main/java/org/springframework/beans/factory/xml/BeansDtdResolver.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 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.
@ -70,8 +70,8 @@ public class BeansDtdResolver implements EntityResolver {
InputSource source = new InputSource(resource.getInputStream()); InputSource source = new InputSource(resource.getInputStream());
source.setPublicId(publicId); source.setPublicId(publicId);
source.setSystemId(systemId); source.setSystemId(systemId);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Found beans DTD [" + systemId + "] in classpath: " + dtdFile); logger.trace("Found beans DTD [" + systemId + "] in classpath: " + dtdFile);
} }
return source; return source;
} }
@ -80,7 +80,6 @@ public class BeansDtdResolver implements EntityResolver {
logger.debug("Could not resolve beans DTD [" + systemId + "]: not found in classpath", ex); logger.debug("Could not resolve beans DTD [" + systemId + "]: not found in classpath", ex);
} }
} }
} }
} }

16
spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultBeanDefinitionDocumentReader.java
Unescape View File

@ -93,9 +93,7 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
@Override @Override
public void registerBeanDefinitions(Document doc, XmlReaderContext readerContext) { public void registerBeanDefinitions(Document doc, XmlReaderContext readerContext) {
this.readerContext = readerContext; this.readerContext = readerContext;
logger.debug("Loading bean definitions"); doRegisterBeanDefinitions(doc.getDocumentElement());
Element root = doc.getDocumentElement();
doRegisterBeanDefinitions(root);
} }
/** /**
@ -234,8 +232,8 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
if (absoluteLocation) { if (absoluteLocation) {
try { try {
int importCount = getReaderContext().getReader().loadBeanDefinitions(location, actualResources); int importCount = getReaderContext().getReader().loadBeanDefinitions(location, actualResources);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Imported " + importCount + " bean definitions from URL location [" + location + "]"); logger.trace("Imported " + importCount + " bean definitions from URL location [" + location + "]");
} }
} }
catch (BeanDefinitionStoreException ex) { catch (BeanDefinitionStoreException ex) {
@ -257,16 +255,16 @@ public class DefaultBeanDefinitionDocumentReader implements BeanDefinitionDocume
importCount = getReaderContext().getReader().loadBeanDefinitions( importCount = getReaderContext().getReader().loadBeanDefinitions(
StringUtils.applyRelativePath(baseLocation, location), actualResources); StringUtils.applyRelativePath(baseLocation, location), actualResources);
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Imported " + importCount + " bean definitions from relative location [" + location + "]"); logger.trace("Imported " + importCount + " bean definitions from relative location [" + location + "]");
} }
} }
catch (IOException ex) { catch (IOException ex) {
getReaderContext().error("Failed to resolve current resource location", ele, ex); getReaderContext().error("Failed to resolve current resource location", ele, ex);
} }
catch (BeanDefinitionStoreException ex) { catch (BeanDefinitionStoreException ex) {
getReaderContext().error("Failed to import bean definitions from relative location [" + location + "]", getReaderContext().error(
ele, ex); "Failed to import bean definitions from relative location [" + location + "]", ele, ex);
} }
} }
Resource[] actResArray = actualResources.toArray(new Resource[0]); Resource[] actResArray = actualResources.toArray(new Resource[0]);

6
spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultDocumentLoader.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 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.
@ -70,8 +70,8 @@ public class DefaultDocumentLoader implements DocumentLoader {
ErrorHandler errorHandler, int validationMode, boolean namespaceAware) throws Exception { ErrorHandler errorHandler, int validationMode, boolean namespaceAware) throws Exception {
DocumentBuilderFactory factory = createDocumentBuilderFactory(validationMode, namespaceAware); DocumentBuilderFactory factory = createDocumentBuilderFactory(validationMode, namespaceAware);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Using JAXP provider [" + factory.getClass().getName() + "]"); logger.trace("Using JAXP provider [" + factory.getClass().getName() + "]");
} }
DocumentBuilder builder = createDocumentBuilder(factory, entityResolver, errorHandler); DocumentBuilder builder = createDocumentBuilder(factory, entityResolver, errorHandler);
return builder.parse(inputSource); return builder.parse(inputSource);

7
spring-beans/src/main/java/org/springframework/beans/factory/xml/DefaultNamespaceHandlerResolver.java
Unescape View File

@ -156,11 +156,14 @@ public class DefaultNamespaceHandlerResolver implements NamespaceHandlerResolver
synchronized (this) { synchronized (this) {
handlerMappings = this.handlerMappings; handlerMappings = this.handlerMappings;
if (handlerMappings == null) { if (handlerMappings == null) {
if (logger.isTraceEnabled()) {
logger.trace("Loading NamespaceHandler mappings from [" + this.handlerMappingsLocation + "]");
}
try { try {
Properties mappings = Properties mappings =
PropertiesLoaderUtils.loadAllProperties(this.handlerMappingsLocation, this.classLoader); PropertiesLoaderUtils.loadAllProperties(this.handlerMappingsLocation, this.classLoader);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Loaded NamespaceHandler mappings: " + mappings); logger.trace("Loaded NamespaceHandler mappings: " + mappings);
} }
Map<String, Object> mappingsToUse = new ConcurrentHashMap<>(mappings.size()); Map<String, Object> mappingsToUse = new ConcurrentHashMap<>(mappings.size());
CollectionUtils.mergePropertiesIntoMap(mappings, mappingsToUse); CollectionUtils.mergePropertiesIntoMap(mappings, mappingsToUse);

14
spring-beans/src/main/java/org/springframework/beans/factory/xml/PluggableSchemaResolver.java
Unescape View File

@ -119,14 +119,14 @@ public class PluggableSchemaResolver implements EntityResolver {
InputSource source = new InputSource(resource.getInputStream()); InputSource source = new InputSource(resource.getInputStream());
source.setPublicId(publicId); source.setPublicId(publicId);
source.setSystemId(systemId); source.setSystemId(systemId);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Found XML schema [" + systemId + "] in classpath: " + resourceLocation); logger.trace("Found XML schema [" + systemId + "] in classpath: " + resourceLocation);
} }
return source; return source;
} }
catch (FileNotFoundException ex) { catch (FileNotFoundException ex) {
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug("Couldn't find XML schema [" + systemId + "]: " + resource, ex); logger.debug("Could not find XML schema [" + systemId + "]: " + resource, ex);
} }
} }
} }
@ -143,14 +143,14 @@ public class PluggableSchemaResolver implements EntityResolver {
synchronized (this) { synchronized (this) {
schemaMappings = this.schemaMappings; schemaMappings = this.schemaMappings;
if (schemaMappings == null) { if (schemaMappings == null) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Loading schema mappings from [" + this.schemaMappingsLocation + "]"); logger.trace("Loading schema mappings from [" + this.schemaMappingsLocation + "]");
} }
try { try {
Properties mappings = Properties mappings =
PropertiesLoaderUtils.loadAllProperties(this.schemaMappingsLocation, this.classLoader); PropertiesLoaderUtils.loadAllProperties(this.schemaMappingsLocation, this.classLoader);
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Loaded schema mappings: " + mappings); logger.trace("Loaded schema mappings: " + mappings);
} }
Map<String, String> mappingsToUse = new ConcurrentHashMap<>(mappings.size()); Map<String, String> mappingsToUse = new ConcurrentHashMap<>(mappings.size());
CollectionUtils.mergePropertiesIntoMap(mappings, mappingsToUse); CollectionUtils.mergePropertiesIntoMap(mappings, mappingsToUse);

17
spring-beans/src/main/java/org/springframework/beans/factory/xml/XmlBeanDefinitionReader.java
Unescape View File

@ -105,7 +105,8 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
private boolean namespaceAware = false; private boolean namespaceAware = false;
private Class<?> documentReaderClass = DefaultBeanDefinitionDocumentReader.class; private Class<? extends BeanDefinitionDocumentReader> documentReaderClass =
DefaultBeanDefinitionDocumentReader.class;
private ProblemReporter problemReporter = new FailFastProblemReporter(); private ProblemReporter problemReporter = new FailFastProblemReporter();
@ -312,8 +313,8 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
*/ */
public int loadBeanDefinitions(EncodedResource encodedResource) throws BeanDefinitionStoreException { public int loadBeanDefinitions(EncodedResource encodedResource) throws BeanDefinitionStoreException {
Assert.notNull(encodedResource, "EncodedResource must not be null"); Assert.notNull(encodedResource, "EncodedResource must not be null");
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Loading XML bean definitions from " + encodedResource.getResource()); logger.trace("Loading XML bean definitions from " + encodedResource);
} }
Set<EncodedResource> currentResources = this.resourcesCurrentlyBeingLoaded.get(); Set<EncodedResource> currentResources = this.resourcesCurrentlyBeingLoaded.get();
@ -386,9 +387,14 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
*/ */
protected int doLoadBeanDefinitions(InputSource inputSource, Resource resource) protected int doLoadBeanDefinitions(InputSource inputSource, Resource resource)
throws BeanDefinitionStoreException { throws BeanDefinitionStoreException {
try { try {
Document doc = doLoadDocument(inputSource, resource); Document doc = doLoadDocument(inputSource, resource);
return registerBeanDefinitions(doc, resource); int count = registerBeanDefinitions(doc, resource);
if (logger.isDebugEnabled()) {
logger.debug("Loaded " + count + " bean definitions from " + resource);
}
return count;
} }
catch (BeanDefinitionStoreException ex) { catch (BeanDefinitionStoreException ex) {
throw ex; throw ex;
@ -429,7 +435,6 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
getValidationModeForResource(resource), isNamespaceAware()); getValidationModeForResource(resource), isNamespaceAware());
} }
/** /**
* Gets the validation mode for the specified {@link Resource}. If no explicit * Gets the validation mode for the specified {@link Resource}. If no explicit
* validation mode has been configured then the validation mode is * validation mode has been configured then the validation mode is
@ -515,7 +520,7 @@ public class XmlBeanDefinitionReader extends AbstractBeanDefinitionReader {
* @see #setDocumentReaderClass * @see #setDocumentReaderClass
*/ */
protected BeanDefinitionDocumentReader createBeanDefinitionDocumentReader() { protected BeanDefinitionDocumentReader createBeanDefinitionDocumentReader() {
return BeanDefinitionDocumentReader.class.cast(BeanUtils.instantiateClass(this.documentReaderClass)); return BeanUtils.instantiateClass(this.documentReaderClass);
} }
/** /**

6
spring-context/src/main/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProvider.java
Unescape View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2017 the original author or authors. * Copyright 2002-2018 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.
@ -209,7 +209,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
try { try {
this.includeFilters.add(new AnnotationTypeFilter( this.includeFilters.add(new AnnotationTypeFilter(
((Class<? extends Annotation>) ClassUtils.forName("javax.annotation.ManagedBean", cl)), false)); ((Class<? extends Annotation>) ClassUtils.forName("javax.annotation.ManagedBean", cl)), false));
logger.debug("JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning"); logger.trace("JSR-250 'javax.annotation.ManagedBean' found and supported for component scanning");
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
// JSR-250 1.1 API (as included in Java EE 6) not available - simply skip. // JSR-250 1.1 API (as included in Java EE 6) not available - simply skip.
@ -217,7 +217,7 @@ public class ClassPathScanningCandidateComponentProvider implements EnvironmentC
try { try {
this.includeFilters.add(new AnnotationTypeFilter( this.includeFilters.add(new AnnotationTypeFilter(
((Class<? extends Annotation>) ClassUtils.forName("javax.inject.Named", cl)), false)); ((Class<? extends Annotation>) ClassUtils.forName("javax.inject.Named", cl)), false));
logger.debug("JSR-330 'javax.inject.Named' annotation found and supported for component scanning"); logger.trace("JSR-330 'javax.inject.Named' annotation found and supported for component scanning");
} }
catch (ClassNotFoundException ex) { catch (ClassNotFoundException ex) {
// JSR-330 API not available - simply skip. // JSR-330 API not available - simply skip.

9
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
Unescape View File

@ -89,8 +89,8 @@ class ConfigurationClassBeanDefinitionReader {
/** /**
* Create a new {@link ConfigurationClassBeanDefinitionReader} instance that will be used * Create a new {@link ConfigurationClassBeanDefinitionReader} instance
* to populate the given {@link BeanDefinitionRegistry}. * that will be used to populate the given {@link BeanDefinitionRegistry}.
*/ */
ConfigurationClassBeanDefinitionReader(BeanDefinitionRegistry registry, SourceExtractor sourceExtractor, ConfigurationClassBeanDefinitionReader(BeanDefinitionRegistry registry, SourceExtractor sourceExtractor,
ResourceLoader resourceLoader, Environment environment, BeanNameGenerator importBeanNameGenerator, ResourceLoader resourceLoader, Environment environment, BeanNameGenerator importBeanNameGenerator,
@ -266,11 +266,10 @@ class ConfigurationClassBeanDefinitionReader {
(RootBeanDefinition) proxyDef.getBeanDefinition(), configClass, metadata); (RootBeanDefinition) proxyDef.getBeanDefinition(), configClass, metadata);
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug(String.format("Registering bean definition for @Bean method %s.%s()", logger.trace(String.format("Registering bean definition for @Bean method %s.%s()",
configClass.getMetadata().getClassName(), beanName)); configClass.getMetadata().getClassName(), beanName));
} }
this.registry.registerBeanDefinition(beanName, beanDefToRegister); this.registry.registerBeanDefinition(beanName, beanDefToRegister);
} }

4
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassEnhancer.java
Unescape View File

@ -108,8 +108,8 @@ class ConfigurationClassEnhancer {
return configClass; return configClass;
} }
Class<?> enhancedClass = createClass(newEnhancer(configClass, classLoader)); Class<?> enhancedClass = createClass(newEnhancer(configClass, classLoader));
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug(String.format("Successfully enhanced %s; enhanced class name is: %s", logger.trace(String.format("Successfully enhanced %s; enhanced class name is: %s",
configClass.getName(), enhancedClass.getName())); configClass.getName(), enhancedClass.getName()));
} }
return enhancedClass; return enhancedClass;

4
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
Unescape View File

@ -401,8 +401,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
if (configClass != null) { if (configClass != null) {
Class<?> enhancedClass = enhancer.enhance(configClass, this.beanClassLoader); Class<?> enhancedClass = enhancer.enhance(configClass, this.beanClassLoader);
if (configClass != enhancedClass) { if (configClass != enhancedClass) {
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug(String.format("Replacing bean definition '%s' existing class '%s' with " + logger.trace(String.format("Replacing bean definition '%s' existing class '%s' with " +
"enhanced class '%s'", entry.getKey(), configClass.getName(), enhancedClass.getName())); "enhanced class '%s'", entry.getKey(), configClass.getName(), enhancedClass.getName()));
} }
beanDef.setBeanClass(enhancedClass); beanDef.setBeanClass(enhancedClass);

4
spring-core/src/main/java/org/springframework/core/env/PropertySourcesPropertyResolver.java vendored
Unescape View File

@ -92,8 +92,8 @@ public class PropertySourcesPropertyResolver extends AbstractPropertyResolver {
} }
} }
} }
if (logger.isDebugEnabled()) { if (logger.isTraceEnabled()) {
logger.debug("Could not find key '" + key + "' in any property source"); logger.trace("Could not find key '" + key + "' in any property source");
} }
return null; return null;
} }

Write Preview
Loading…
Cancel
Save