Changeset 3050

Timestamp:

01/17/12 16:54:14 (4 months ago)

Author:

kasper

Message:

Fixed potential issue with inherited aliases, resolving wrong descriptors (by parent's alias).

Location:

AnalyzerBeans/trunk

Files:

• api/src/main/java/org/eobjects/analyzer/beans/api/Alias.java (modified) (2 diffs)
• core/src/main/java/org/eobjects/analyzer/descriptors/AbstractDescriptorProvider.java (modified) (2 diffs)
• core/src/test/java/org/eobjects/analyzer/descriptors/AnnotationBasedAnalyzerBeanDescriptorTest.java (modified) (1 diff)

AnalyzerBeans/trunk/api/src/main/java/org/eobjects/analyzer/beans/api/Alias.java

@@ -22 +22 @@
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -38 +37 @@
 @Target({ ElementType.FIELD, ElementType.TYPE })
 @Documented
-@Inherited
 public @interface Alias {
 

AnalyzerBeans/trunk/core/src/main/java/org/eobjects/analyzer/descriptors/AbstractDescriptorProvider.java

@@ -207 +207 @@
                 }
                 for (E descriptor : descriptors) {
-                        if (name.equals(descriptor.getDisplayName())) {
+                        String displayName = descriptor.getDisplayName();
+                        if (name.equals(displayName)) {
                                 return descriptor;
                         }
@@ -213 +214 @@
 
                 for (E descriptor : descriptors) {
-                        if (ArrayUtils.contains(descriptor.getAliases(), name)) {
+                        String[] aliases = descriptor.getAliases();
+                        if (ArrayUtils.contains(aliases, name)) {
                                 return descriptor;
                         }

AnalyzerBeans/trunk/core/src/test/java/org/eobjects/analyzer/descriptors/AnnotationBasedAnalyzerBeanDescriptorTest.java

@@ -42 +42 @@
                 super.tearDown();
                 AnalyzerMock.clearInstances();
+        }
+        
+        public void testInheritedAnalyzer() throws Exception {
+                AnalyzerBeanDescriptor<OneMoreMockAnalyzer> descriptor = Descriptors.ofAnalyzer(OneMoreMockAnalyzer.class);
+                assertEquals("One more mock", descriptor.getDisplayName());
+        }
+        
+        @AnalyzerBean("One more mock")
+        public static class OneMoreMockAnalyzer extends StringAnalyzer {
+                
         }