Changeset 974 for AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/descriptors/AbstractBeanDescriptor.java

Timestamp:

08/14/10 11:12:43 (22 months ago)

Author:

kasper

Message:

limited possibility of @Configured and @Provided to fields in order to make it easy to also get value of properties through PropertyDescriptor?.

File:

• AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/descriptors/AbstractBeanDescriptor.java (modified) (3 diffs)

AnalyzerBeans/trunk/src/main/java/org/eobjects/analyzer/descriptors/AbstractBeanDescriptor.java

@@ -52 +52 @@
                         Configured configuredAnnotation = field
                                         .getAnnotation(Configured.class);
+                        Provided providedAnnotation = field.getAnnotation(Provided.class);
+
+                        if (configuredAnnotation != null && providedAnnotation != null) {
+                                throw new DescriptorException(
+                                                "The field "
+                                                                + field
+                                                                + " is annotated with both @Configured and @Provided, which are mutually exclusive.");
+                        }
+
                         if (configuredAnnotation != null) {
                                 if (!field.isAnnotationPresent(Inject.class)) {
@@ -62 +71 @@
                         }
 
-                        Provided providedAnnotation = field.getAnnotation(Provided.class);
                         if (providedAnnotation != null) {
                                 if (!field.isAnnotationPresent(Inject.class)) {
@@ -87 +95 @@
                 Method[] methods = beanClass.getDeclaredMethods();
                 for (Method method : methods) {
-                        Configured configuredAnnotation = method
-                                        .getAnnotation(Configured.class);
-                        if (configuredAnnotation != null) {
-                                if (!method.isAnnotationPresent(Inject.class)) {
-                                        logger.warn(
-                                                        "No @Inject annotation found for @Configured method: {}",
-                                                        method);
-                                }
-                                _configuredProperties.add(new ConfiguredPropertyDescriptorImpl(
-                                                method));
-                        }
-
-                        Provided providedAnnotation = method.getAnnotation(Provided.class);
-                        if (providedAnnotation != null) {
-                                if (!method.isAnnotationPresent(Inject.class)) {
-                                        logger.warn(
-                                                        "No @Inject annotation found for @Provided method: {}",
-                                                        method);
-                                }
-                                _providedProperties.add(new ProvidedPropertyDescriptorImpl(
-                                                method));
-                        }
-
                         Initialize initializeAnnotation = method
                                         .getAnnotation(Initialize.class);