From 9f0a9309c30e94c0f45aa133f711de5bd13ea765 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 18 Feb 2016 17:42:31 +0000 Subject: [PATCH] Consistent descriptions for ConfigurationClass MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, a ConfigurationClass created from AnnotationMetadata and a ConfigurationClass created from a class would have subtly different descriptions. Given a class named com.example.Foo, the former’s description would be “com.example.Foo”, whereas the latter’s description would be “class com.example.Foo”. This commit updates ConfigurationClass to make the description consistent, preferring the description without “class” in it. --- .../context/annotation/ConfigurationClass.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java index 5cb5c0f3b1d4..69d2c1978a5e 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClass.java @@ -103,7 +103,7 @@ public ConfigurationClass(MetadataReader metadataReader, ConfigurationClass impo public ConfigurationClass(Class clazz, String beanName) { Assert.hasText(beanName, "Bean name must not be null"); this.metadata = new StandardAnnotationMetadata(clazz, true); - this.resource = new DescriptiveResource(clazz.toString()); + this.resource = new DescriptiveResource(clazz.getName()); this.beanName = beanName; } @@ -117,7 +117,7 @@ public ConfigurationClass(Class clazz, String beanName) { */ public ConfigurationClass(Class clazz, ConfigurationClass importedBy) { this.metadata = new StandardAnnotationMetadata(clazz, true); - this.resource = new DescriptiveResource(clazz.toString()); + this.resource = new DescriptiveResource(clazz.getName()); this.importedBy.add(importedBy); }