Merge pull request #334 from Degubi/annotatedelement_refactor

Refactor JsonbAnnotatedElement.java, remove JsonbAnnotated.java

Author: aguibert

src/main/java/org/eclipse/yasson/internal/model/JsonbAnnotated.java

@@ -10,18 +10,27 @@
  * Contributors:
  * Roman Grigoriadi
  ******************************************************************************/
-
 package org.eclipse.yasson.internal.model;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.json.bind.JsonbException;
+
+import org.eclipse.yasson.internal.properties.MessageKeys;
+import org.eclipse.yasson.internal.properties.Messages;
 
 /**
- * Annotation holder for fields, getters and setters.
+ * Annotation holder for classes, superclasses, interfaces, fields, getters and setters.
  *
  * @param <T> annotated element
  */
-public class JsonbAnnotatedElement<T extends AnnotatedElement> extends JsonbAnnotated {
+public class JsonbAnnotatedElement<T extends AnnotatedElement> {
 
+    private final Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<>(4);
+    
     private final T element;
 
     /**
@@ -30,7 +39,10 @@ public class JsonbAnnotatedElement<T extends AnnotatedElement> extends JsonbAnno
      * @param element Element.
      */
     public JsonbAnnotatedElement(T element) {
-        super(element.getAnnotations());
+        for (Annotation ann : element.getAnnotations()) {
+            annotations.put(ann.annotationType(), ann);
+        }
+        
         this.element = element;
     }
 
@@ -42,4 +54,31 @@ public JsonbAnnotatedElement(T element) {
     public T getElement() {
         return element;
     }
+    
+    /**
+     * Get an annotation by type.
+     * @param <AT> Type of annotation
+     * @param annotationClass Type of annotation
+     * @return Annotation by passed type
+     */
+    public <AT extends Annotation> AT getAnnotation(Class<AT> annotationClass) {
+        return annotationClass.cast(annotations.get(annotationClass));
+    }
+    
+    public Annotation[] getAnnotations() {
+        return annotations.values().toArray(new Annotation[0]);
+    }
+    
+    /**
+     * Adds annotation.
+     *
+     * @param annotation Annotation to add.
+     */
+    public void putAnnotation(Annotation annotation) {
+        if (annotations.containsKey(annotation.annotationType())) {
+            throw new JsonbException(Messages.getMessage(MessageKeys.INTERNAL_ERROR,
+                                                         "Annotation already present: " + annotation));
+        }
+        annotations.put(annotation.annotationType(), annotation);
+    }
 }