You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by li...@apache.org on 2012/01/18 00:19:59 UTC
[11/14] git commit: Revert "[DELTASPIKE-45] Adding JavaDoc"
Revert "[DELTASPIKE-45] Adding JavaDoc"
This reverts commit bf9bf4817ad659672caf65c90650ddf086f3e935.
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/e99372f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/e99372f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/e99372f4
Branch: refs/heads/master
Commit: e99372f4cd7a81a456e5b510bb6b94ee47778238
Parents: 3f98b15
Author: Jason Porter <li...@apache.org>
Authored: Tue Jan 17 16:13:13 2012 -0700
Committer: Jason Porter <li...@apache.org>
Committed: Tue Jan 17 16:13:13 2012 -0700
----------------------------------------------------------------------
.../api/metadata/AnnotatedConstructorImpl.java | 13 +---
.../core/api/metadata/AnnotatedFieldImpl.java | 11 +---
.../core/api/metadata/AnnotatedImpl.java | 5 --
.../core/api/metadata/AnnotatedMemberImpl.java | 8 +--
.../core/api/metadata/AnnotatedMethodImpl.java | 12 +---
.../core/api/metadata/AnnotatedParameterImpl.java | 10 +---
.../core/api/metadata/AnnotatedTypeImpl.java | 6 +--
.../core/api/metadata/AnnotationRedefiner.java | 2 +-
.../deltaspike/core/api/metadata/Parameter.java | 32 +---------
.../core/api/metadata/RedefinitionContext.java | 2 +-
.../api/metadata/builder/AnnotatedTypeBuilder.java | 26 +-------
.../api/metadata/builder/AnnotationBuilder.java | 50 +--------------
12 files changed, 23 insertions(+), 154 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java
index 8833baa..aeae547 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedConstructorImpl.java
@@ -16,28 +16,21 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import javax.enterprise.inject.spi.AnnotatedConstructor;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
import java.util.Map;
/**
- * Implementation of {@link AnnotatedConstructor} to be used in {@link AnnotatedTypeBuilder}
- * and other CDI life cycle events.
+ *
*/
class AnnotatedConstructorImpl<X> extends AnnotatedCallableImpl<X, Constructor<X>> implements AnnotatedConstructor<X>
{
- /**
- * Constructor
- */
- public AnnotatedConstructorImpl(AnnotatedTypeImpl<X> type, Constructor<?> constructor, AnnotationStore annotations,
- Map<Integer, AnnotationStore> parameterAnnotations, Map<Integer, Type> typeOverrides)
+ AnnotatedConstructorImpl(AnnotatedTypeImpl<X> type, Constructor<?> constructor, AnnotationStore annotations,
+ Map<Integer, AnnotationStore> parameterAnnotations, Map<Integer, Type> typeOverrides)
{
super(type, (Constructor<X>) constructor, constructor.getDeclaringClass(), constructor.getParameterTypes(),
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java
index 46190a5..1723d21 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedFieldImpl.java
@@ -16,27 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedType;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
/**
- * Implementation of {@link AnnotatedField} to be used in CDI life cycle events and {@link AnnotatedTypeBuilder}.
+ *
*/
class AnnotatedFieldImpl<X> extends AnnotatedMemberImpl<X, Field> implements AnnotatedField<X>
{
- /**
- * Constructor.
- */
- public AnnotatedFieldImpl(AnnotatedType<X> declaringType, Field field, AnnotationStore annotations,
- Type overridenType)
+ AnnotatedFieldImpl(AnnotatedType<X> declaringType, Field field, AnnotationStore annotations, Type overridenType)
{
super(declaringType, field, field.getType(), annotations, field.getGenericType(), overridenType);
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedImpl.java
index ce9cf9c..06851c2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedImpl.java
@@ -70,31 +70,26 @@ abstract class AnnotatedImpl implements Annotated
}
}
- @Override
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return annotations.getAnnotation(annotationType);
}
- @Override
public Set<Annotation> getAnnotations()
{
return annotations.getAnnotations();
}
- @Override
public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
{
return annotations.isAnnotationPresent(annotationType);
}
- @Override
public Set<Type> getTypeClosure()
{
return new HashSet<Type>(typeClosure);
}
- @Override
public Type getBaseType()
{
return type;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java
index 576610a..990b313 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMemberImpl.java
@@ -16,11 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import javax.enterprise.inject.spi.AnnotatedMember;
import javax.enterprise.inject.spi.AnnotatedType;
import java.lang.reflect.Member;
@@ -28,7 +25,7 @@ import java.lang.reflect.Modifier;
import java.lang.reflect.Type;
/**
- * An implementation of {@link AnnotatedMember} to be used in CDI life cycle events and {@link AnnotatedTypeBuilder}.
+ *
*/
abstract class AnnotatedMemberImpl<X, M extends Member> extends AnnotatedImpl implements AnnotatedMember<X>
{
@@ -43,19 +40,16 @@ abstract class AnnotatedMemberImpl<X, M extends Member> extends AnnotatedImpl im
this.javaMember = member;
}
- @Override
public AnnotatedType<X> getDeclaringType()
{
return declaringType;
}
- @Override
public M getJavaMember()
{
return javaMember;
}
- @Override
public boolean isStatic()
{
return Modifier.isStatic(javaMember.getModifiers());
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java
index 67da218..7f38b7e 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedMethodImpl.java
@@ -16,11 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.deltaspike.core.api.metadata;
-import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
-
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedType;
import java.lang.reflect.Method;
@@ -28,15 +25,12 @@ import java.lang.reflect.Type;
import java.util.Map;
/**
- * Implementation of {@link AnnotatedMethod} to be used in CDI life cycle events and {@link AnnotatedTypeBuilder}.
+ * @author Stuart Douglas
*/
class AnnotatedMethodImpl<X> extends AnnotatedCallableImpl<X, Method> implements AnnotatedMethod<X>
{
- /**
- * Constructor.
- */
- public AnnotatedMethodImpl(AnnotatedType<X> type, Method method, AnnotationStore annotations,
- Map<Integer, AnnotationStore> parameterAnnotations, Map<Integer, Type> parameterTypeOverrides)
+ AnnotatedMethodImpl(AnnotatedType<X> type, Method method, AnnotationStore annotations,
+ Map<Integer, AnnotationStore> parameterAnnotations, Map<Integer, Type> parameterTypeOverrides)
{
super(type, method, method.getReturnType(), method.getParameterTypes(), method.getGenericParameterTypes(),
annotations, parameterAnnotations, method.getGenericReturnType(), parameterTypeOverrides);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedParameterImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedParameterImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedParameterImpl.java
index 6f09d32..8b7feb5 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedParameterImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedParameterImpl.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.deltaspike.core.api.metadata;
import javax.enterprise.inject.spi.AnnotatedCallable;
@@ -32,24 +31,19 @@ class AnnotatedParameterImpl<X> extends AnnotatedImpl implements AnnotatedParame
private final int position;
private final AnnotatedCallable<X> declaringCallable;
- /**
- * Constructor
- */
- public AnnotatedParameterImpl(AnnotatedCallable<X> declaringCallable, Class<?> type, int position,
- AnnotationStore annotations, Type genericType, Type typeOverride)
+ AnnotatedParameterImpl(AnnotatedCallable<X> declaringCallable, Class<?> type, int position,
+ AnnotationStore annotations, Type genericType, Type typeOverride)
{
super(type, annotations, genericType, typeOverride);
this.declaringCallable = declaringCallable;
this.position = position;
}
- @Override
public AnnotatedCallable<X> getDeclaringCallable()
{
return declaringCallable;
}
- @Override
public int getPosition()
{
return position;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java
index b5fb935..a500f76 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotatedTypeImpl.java
@@ -33,7 +33,7 @@ import java.util.Map;
import java.util.Set;
/**
- * An implementation of {@link AnnotatedType} to be used in CDI life cycle events and {@link AnnotatedTypeBuilder}.
+ *
*/
public class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType<X>
{
@@ -106,25 +106,21 @@ public class AnnotatedTypeImpl<X> extends AnnotatedImpl implements AnnotatedType
}
}
- @Override
public Set<AnnotatedConstructor<X>> getConstructors()
{
return Collections.unmodifiableSet(constructors);
}
- @Override
public Set<AnnotatedField<? super X>> getFields()
{
return Collections.unmodifiableSet(fields);
}
- @Override
public Class<X> getJavaClass()
{
return javaClass;
}
- @Override
public Set<AnnotatedMethod<? super X>> getMethods()
{
return Collections.unmodifiableSet(methods);
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java
index 862f965..6774867 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/AnnotationRedefiner.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.deltaspike.core.api.metadata;
import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
@@ -28,6 +27,7 @@ import java.lang.annotation.Annotation;
* {@link AnnotatedTypeBuilder}, and receives callbacks for each annotation of
* the type is it applied for.
*
+ * @author Pete Muir
* @see AnnotatedTypeBuilder
*/
public interface AnnotationRedefiner<A extends Annotation>
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/Parameter.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/Parameter.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/Parameter.java
index 661e151..3dd8016 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/Parameter.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/Parameter.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.deltaspike.core.api.metadata;
import org.apache.deltaspike.core.api.util.Reflections;
@@ -31,18 +30,12 @@ import java.lang.reflect.Type;
/**
* An implementation of Member for parameters
+ *
+ * @author pmuir
*/
abstract public class Parameter<X> implements AnnotatedElement
{
- /**
- * Creates a new {@link Parameter} using the member and position passed in.
- *
- * @param declaringMember {@link Method} or {@link Constructor}.
- * @param position position of the parameter
- * @param <X> Type of the parameter
- * @return a new instance of Parameter
- */
public static <X> Parameter<X> create(Member declaringMember, int position)
{
if (declaringMember instanceof Method)
@@ -154,16 +147,8 @@ abstract public class Parameter<X> implements AnnotatedElement
this.position = position;
}
- /**
- * Returns the actual {@link Member} declaring the parameter.
- *
- * @return Instance of the declaring java member.
- */
public abstract Member getDeclaringMember();
- /**
- * Getter
- */
public int getPosition()
{
return position;
@@ -193,9 +178,7 @@ abstract public class Parameter<X> implements AnnotatedElement
}
- /**
- * Returns the instance of the annotation on the member, or null if not found
- */
+
public <T extends Annotation> T getAnnotation(Class<T> annotationClass)
{
for (Annotation annotation : getAnnotations())
@@ -208,25 +191,16 @@ abstract public class Parameter<X> implements AnnotatedElement
return null;
}
- /**
- * Getter
- */
public Annotation[] getDeclaredAnnotations()
{
return getAnnotations();
}
- /**
- * Simple test if an annotation is present.
- */
public boolean isAnnotationPresent(Class<? extends Annotation> annotationClass)
{
return getAnnotation(annotationClass) != null;
}
- /**
- * Getter
- */
public abstract Type getBaseType();
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java
index a3aeefd..8e51683 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/RedefinitionContext.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.deltaspike.core.api.metadata;
import org.apache.deltaspike.core.api.metadata.builder.AnnotatedTypeBuilder;
@@ -33,6 +32,7 @@ import java.lang.reflect.Type;
/**
* Provides access to the context of an annotation redefinition.
*
+ * @author Pete Muir
* @see AnnotatedTypeBuilder
* @see AnnotationRedefiner
*/
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java
index c6b25ff..5b70ae2 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotatedTypeBuilder.java
@@ -42,11 +42,9 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Builder to aid in creation of a new {@link AnnotatedType} for use in CDI life cycle events.
- * Using the builder is typically done by reading the annotations from a {@link Class} or an
- * {@link AnnotatedType}. Once the starting class or type has been added all of annotations
- * can be modified: constructor, parameter, class, method and fields.
+ *
*/
+//X TODO: Javadoc
public class AnnotatedTypeBuilder<X>
{
private Class<X> javaClass;
@@ -518,7 +516,7 @@ public class AnnotatedTypeBuilder<X>
*
* @param annotationType the type of the annotation for which to call the
* redefinition
- * @param redefinition the redefinition callback
+ * @param redefinition the redefiniton callback
* @throws IllegalArgumentException if the annotationType or redefinition is
* null
*/
@@ -570,10 +568,7 @@ public class AnnotatedTypeBuilder<X>
return this;
}
- protected <A extends Annotation> void redefineAnnotationBuilder(Class<A> annotationType,
- AnnotationRedefiner<A> redefinition,
- AnnotatedElement annotated, Type baseType,
- AnnotationBuilder builder, String elementName)
+ protected <A extends Annotation> void redefineAnnotationBuilder(Class<A> annotationType, AnnotationRedefiner<A> redefinition, AnnotatedElement annotated, Type baseType, AnnotationBuilder builder, String elementName)
{
if (builder.isAnnotationPresent(annotationType))
{
@@ -960,13 +955,6 @@ public class AnnotatedTypeBuilder<X>
return this;
}
- /**
- * Override the declared type of a parameter.
- *
- * @param parameter the parameter to override the type on
- * @param type the new type of the parameter
- * @throws IllegalArgumentException if parameter or type is null
- */
public AnnotatedTypeBuilder<X> overrideParameterType(AnnotatedParameter<? super X> parameter, Type type)
{
if (parameter.getDeclaringCallable().getJavaMember() instanceof Method)
@@ -986,17 +974,11 @@ public class AnnotatedTypeBuilder<X>
}
}
- /**
- * getter for the class
- */
public Class<X> getJavaClass()
{
return javaClass;
}
- /**
- * setter for the class
- */
public AnnotatedTypeBuilder<X> setJavaClass(Class<X> javaClass)
{
this.javaClass = javaClass;
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/e99372f4/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotationBuilder.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotationBuilder.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotationBuilder.java
index e708618..427cf6a 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotationBuilder.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/metadata/builder/AnnotationBuilder.java
@@ -24,7 +24,6 @@ import org.apache.deltaspike.core.api.util.Reflections;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
-import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -32,8 +31,7 @@ import java.util.Map;
import java.util.Set;
/**
- * A store of annotations to be used {@link AnnotatedTypeBuilder} and other places
- * where a collection of annotations needs manipulation.
+ *
*/
//X TODO: JavaDoc the methods
public class AnnotationBuilder
@@ -41,21 +39,12 @@ public class AnnotationBuilder
private final Map<Class<? extends Annotation>, Annotation> annotationMap;
private final Set<Annotation> annotationSet;
- /**
- * Default constructor.
- */
public AnnotationBuilder()
{
this.annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
this.annotationSet = new HashSet<Annotation>();
}
- /**
- * Adds the annotation to the collections.
- *
- * @param annotation annotation to be added
- * @return this
- */
public AnnotationBuilder add(Annotation annotation)
{
if (annotation == null)
@@ -67,12 +56,6 @@ public class AnnotationBuilder
return this;
}
- /**
- * Removes the given annotation from the collections.
- *
- * @param annotationType to be removed
- * @return this
- */
public AnnotationBuilder remove(Class<? extends Annotation> annotationType)
{
if (annotationType == null)
@@ -93,23 +76,12 @@ public class AnnotationBuilder
return this;
}
- /**
- * Creates an {@link AnnotationStore} using the annotations from this instance.
- *
- * @return new AnnotationStore
- */
public AnnotationStore create()
{
return new AnnotationStore(annotationMap, annotationSet);
}
- /**
- * Adds all annotations from the given collection
- *
- * @param annotations collection of annotations to be added
- * @return this
- */
- public AnnotationBuilder addAll(Collection<Annotation> annotations)
+ public AnnotationBuilder addAll(Set<Annotation> annotations)
{
for (Annotation annotation : annotations)
{
@@ -118,12 +90,6 @@ public class AnnotationBuilder
return this;
}
- /**
- * Adds all annotations from an {@link AnnotationStore}.
- *
- * @param annotations annotations to be added
- * @return this
- */
public AnnotationBuilder addAll(AnnotationStore annotations)
{
for (Annotation annotation : annotations.getAnnotations())
@@ -133,12 +99,6 @@ public class AnnotationBuilder
return this;
}
- /**
- * Adds all annotations from the given {@link AnnotatedElement}.
- *
- * @param element element containing annotations to be added
- * @return this
- */
public AnnotationBuilder addAll(AnnotatedElement element)
{
for (Annotation a : element.getAnnotations())
@@ -148,17 +108,11 @@ public class AnnotationBuilder
return this;
}
- /**
- * Getter.
- */
public <T extends Annotation> T getAnnotation(Class<T> anType)
{
return Reflections.<T>cast(annotationMap.get(anType));
}
- /**
- * Simple check for an annotation.
- */
public boolean isAnnotationPresent(Class<?> annotationType)
{
return annotationMap.containsKey(annotationType);