[weld-commits] Weld SVN: r6202 - in extensions/trunk/src/main/java/org/jboss/weld/extensions: annotated and 5 other directories.
weld-commits at lists.jboss.org
weld-commits at lists.jboss.org
Thu Apr 29 17:51:54 EDT 2010
Author: pete.muir at jboss.org
Date: 2010-04-29 17:51:53 -0400 (Thu, 29 Apr 2010)
New Revision: 6202
Added:
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/Annotateds.java
Removed:
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/
extensions/trunk/src/main/java/org/jboss/weld/extensions/util/AnnotatedTypeUtils.java
Modified:
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedCallableImpl.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedConstructorImpl.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedFieldImpl.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedImpl.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedMemberImpl.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedMethodImpl.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedParameterImpl.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedTypeBuilder.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedTypeImpl.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationBuilder.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationRedefiner.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationStore.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/MemberAnnotationRedefiner.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/Parameter.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/ParameterAnnotationRedefiner.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/TypeAnnotationRedefiner.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/TypeClosureBuilder.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/CustomBeanBuilder.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/core/CoreExtension.java
extensions/trunk/src/main/java/org/jboss/weld/extensions/log/LoggerProducer.java
Log:
cleanup annotated
Copied: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated (from rev 6201, extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType)
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedCallableImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedCallableImpl.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedCallableImpl.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Member;
import java.lang.reflect.Type;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedConstructorImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedConstructorImpl.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedConstructorImpl.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Constructor;
import java.lang.reflect.Type;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedFieldImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedFieldImpl.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedFieldImpl.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Field;
import java.lang.reflect.Type;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedImpl.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedImpl.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedMemberImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedMemberImpl.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedMemberImpl.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Member;
import java.lang.reflect.Modifier;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedMethodImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedMethodImpl.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedMethodImpl.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedParameterImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedParameterImpl.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedParameterImpl.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Type;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedTypeBuilder.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedTypeBuilder.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedTypeBuilder.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedTypeImpl.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotatedTypeImpl.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotatedTypeImpl.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
Copied: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/Annotateds.java (from rev 6200, extensions/trunk/src/main/java/org/jboss/weld/extensions/util/AnnotatedTypeUtils.java)
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/Annotateds.java (rev 0)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/Annotateds.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -0,0 +1,565 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.extensions.annotated;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedCallable;
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedParameter;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * Utilities for working with {@link Annotated}s.
+ *
+ * Includes utilities to check the equality of {@link Annotated} instances, and
+ * to create unique ids for {@link Annotated} instances.
+ *
+ * @author Stuart Douglas <stuart at baileyroberts.com.au>
+ */
+public class Annotateds
+{
+
+ /**
+ * Does the first stage of comparing AnnoatedCallables, however it cannot
+ * compare the method parameters
+ */
+ private static class AnnotatedCallableComparator<T> implements Comparator<AnnotatedCallable<? super T>>
+ {
+
+ public int compare(AnnotatedCallable<? super T> arg0, AnnotatedCallable<? super T> arg1)
+ {
+ // compare the names first
+ int result = (arg0.getJavaMember().getName().compareTo(arg1.getJavaMember().getName()));
+ if (result != 0)
+ {
+ return result;
+ }
+ result = arg0.getJavaMember().getDeclaringClass().getName().compareTo(arg1.getJavaMember().getDeclaringClass().getName());
+ if (result != 0)
+ {
+ return result;
+ }
+ result = arg0.getParameters().size() - arg1.getParameters().size();
+ return result;
+ }
+
+ }
+
+ private static class AnnotatedMethodComparator<T> implements Comparator<AnnotatedMethod<? super T>>
+ {
+
+ public static <T> Comparator<AnnotatedMethod<? super T>> instance()
+ {
+ return new AnnotatedMethodComparator<T>();
+ }
+
+ private AnnotatedCallableComparator<T> callableComparator = new AnnotatedCallableComparator<T>();
+
+ public int compare(AnnotatedMethod<? super T> arg0, AnnotatedMethod<? super T> arg1)
+ {
+ int result = callableComparator.compare(arg0, arg1);
+ if (result != 0)
+ {
+ return result;
+ }
+ for (int i = 0; i < arg0.getJavaMember().getParameterTypes().length; ++i)
+ {
+ Class<?> p0 = arg0.getJavaMember().getParameterTypes()[i];
+ Class<?> p1 = arg1.getJavaMember().getParameterTypes()[i];
+ result = p0.getName().compareTo(p1.getName());
+ if (result != 0)
+ {
+ return result;
+ }
+ }
+ return 0;
+ }
+
+ }
+
+ private static class AnnotatedConstructorComparator<T> implements Comparator<AnnotatedConstructor<? super T>>
+ {
+
+ public static <T> Comparator<AnnotatedConstructor<? super T>> instance()
+ {
+ return new AnnotatedConstructorComparator<T>();
+ }
+
+ private AnnotatedCallableComparator<T> callableComparator = new AnnotatedCallableComparator<T>();
+
+ public int compare(AnnotatedConstructor<? super T> arg0, AnnotatedConstructor<? super T> arg1)
+ {
+ int result = callableComparator.compare(arg0, arg1);
+ if (result != 0)
+ {
+ return result;
+ }
+ for (int i = 0; i < arg0.getJavaMember().getParameterTypes().length; ++i)
+ {
+ Class<?> p0 = arg0.getJavaMember().getParameterTypes()[i];
+ Class<?> p1 = arg1.getJavaMember().getParameterTypes()[i];
+ result = p0.getName().compareTo(p1.getName());
+ if (result != 0)
+ {
+ return result;
+ }
+ }
+ return 0;
+ }
+
+ }
+
+ private static class AnnotatedFieldComparator<T> implements Comparator<AnnotatedField<? super T>>
+ {
+
+ public static <T> Comparator<AnnotatedField<? super T>> instance()
+ {
+ return new AnnotatedFieldComparator<T>();
+ }
+
+ public int compare(AnnotatedField<? super T> arg0, AnnotatedField<? super T> arg1)
+ {
+ if (arg0.getJavaMember().getName().equals(arg1.getJavaMember().getName()))
+ {
+ return arg0.getJavaMember().getDeclaringClass().getName().compareTo(arg1.getJavaMember().getDeclaringClass().getName());
+ }
+ return arg0.getJavaMember().getName().compareTo(arg1.getJavaMember().getName());
+ }
+
+ }
+
+ private static class AnnotationComparator implements Comparator<Annotation>
+ {
+
+ public static final Comparator<Annotation> INSTANCE = new AnnotationComparator();
+
+ public int compare(Annotation arg0, Annotation arg1)
+ {
+ return arg0.annotationType().getName().compareTo(arg1.annotationType().getName());
+ }
+ }
+
+ private static class MethodComparator implements Comparator<Method>
+ {
+
+ public static final Comparator<Method> INSTANCE = new MethodComparator();
+
+ public int compare(Method arg0, Method arg1)
+ {
+ return arg0.getName().compareTo(arg1.getName());
+ }
+ }
+
+ private static final char SEPERATOR = ';';
+
+ /**
+ * Generates a unique signature for an annotated type. Members without
+ * annotations are omitted to reduce the length of the signature
+ *
+ * @param <X>
+ * @param annotatedType
+ * @return
+ */
+ public static <X> String createTypeId(AnnotatedType<X> annotatedType)
+ {
+ return createTypeId(annotatedType.getJavaClass(), annotatedType.getAnnotations(), annotatedType.getMethods(), annotatedType.getFields(), annotatedType.getConstructors());
+ }
+
+ /**
+ * Generates a unique signature for a concrete class
+ *
+ * @param <X>
+ * @param annotatedType
+ * @return
+ */
+ public static <X> String createTypeId(Class<X> clazz, Collection<Annotation> annotations, Collection<AnnotatedMethod<? super X>> methods, Collection<AnnotatedField<? super X>> fields, Collection<AnnotatedConstructor<X>> constructors)
+ {
+ StringBuilder builder = new StringBuilder();
+
+ builder.append(clazz.getName());
+ builder.append(createAnnotationCollectionId(annotations));
+ builder.append("{");
+
+ // now deal with the fields
+ List<AnnotatedField<? super X>> sortedFields = new ArrayList<AnnotatedField<? super X>>();
+ sortedFields.addAll(fields);
+ Collections.sort(sortedFields, AnnotatedFieldComparator.<X> instance());
+ for (AnnotatedField<? super X> field : sortedFields)
+ {
+ if (!field.getAnnotations().isEmpty())
+ {
+ builder.append(createFieldId(field));
+ builder.append(SEPERATOR);
+ }
+ }
+
+ // methods
+ List<AnnotatedMethod<? super X>> sortedMethods = new ArrayList<AnnotatedMethod<? super X>>();
+ sortedMethods.addAll(methods);
+ Collections.sort(sortedMethods, AnnotatedMethodComparator.<X> instance());
+ for (AnnotatedMethod<? super X> method : sortedMethods)
+ {
+ if (!method.getAnnotations().isEmpty() || hasMethodParameters(method))
+ {
+ builder.append(createCallableId(method));
+ builder.append(SEPERATOR);
+ }
+ }
+
+ // constructors
+ List<AnnotatedConstructor<? super X>> sortedConstructors = new ArrayList<AnnotatedConstructor<? super X>>();
+ sortedConstructors.addAll(constructors);
+ Collections.sort(sortedConstructors, AnnotatedConstructorComparator.<X> instance());
+ for (AnnotatedConstructor<? super X> constructor : sortedConstructors)
+ {
+ if (!constructor.getAnnotations().isEmpty() || hasMethodParameters(constructor))
+ {
+ builder.append(createCallableId(constructor));
+ builder.append(SEPERATOR);
+ }
+ }
+ builder.append("}");
+
+ return builder.toString();
+ }
+
+ private static <X> boolean hasMethodParameters(AnnotatedCallable<X> callable)
+ {
+ for (AnnotatedParameter<X> parameter : callable.getParameters())
+ {
+ if (!parameter.getAnnotations().isEmpty())
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static String createAnnotationCollectionId(Collection<Annotation> annotations)
+ {
+ if (annotations.isEmpty())
+ {
+ return "";
+ }
+
+ StringBuilder builder = new StringBuilder();
+ builder.append('[');
+
+ List<Annotation> annotationList = new ArrayList<Annotation>(annotations.size());
+ annotationList.addAll(annotations);
+ Collections.sort(annotationList, AnnotationComparator.INSTANCE);
+
+ for (Annotation a : annotationList)
+ {
+ builder.append('@');
+ builder.append(a.annotationType().getName());
+ builder.append('(');
+ Method[] declaredMethods = a.annotationType().getDeclaredMethods();
+ List<Method> methods = new ArrayList<Method>(declaredMethods.length);
+ for (Method m : declaredMethods)
+ {
+ methods.add(m);
+ }
+ Collections.sort(methods, MethodComparator.INSTANCE);
+
+ for (int i = 0; i < methods.size(); ++i)
+ {
+ Method method = methods.get(i);
+ try
+ {
+ Object value = method.invoke(a);
+ builder.append(method.getName());
+ builder.append('=');
+ builder.append(value.toString());
+ }
+ catch (NullPointerException e)
+ {
+ throw new RuntimeException("NullPointerException accessing annotation member, annotation:" + a.annotationType().getName() + " member: " + method.getName(), e);
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw new RuntimeException("IllegalArgumentException accessing annotation member, annotation:" + a.annotationType().getName() + " member: " + method.getName(), e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new RuntimeException("IllegalAccessException accessing annotation member, annotation:" + a.annotationType().getName() + " member: " + method.getName(), e);
+ }
+ catch (InvocationTargetException e)
+ {
+ throw new RuntimeException("InvocationTargetException accessing annotation member, annotation:" + a.annotationType().getName() + " member: " + method.getName(), e);
+ }
+ if (i + 1 != methods.size())
+ {
+ builder.append(',');
+ }
+ }
+ builder.append(')');
+ }
+ builder.append(']');
+ return builder.toString();
+ }
+
+ public static <X> String createFieldId(AnnotatedField<X> field)
+ {
+ return createFieldId(field.getJavaMember(), field.getAnnotations());
+ }
+
+ public static <X> String createFieldId(Field field, Collection<Annotation> annotations)
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append(field.getDeclaringClass().getName());
+ builder.append('.');
+ builder.append(field.getName());
+ builder.append(createAnnotationCollectionId(annotations));
+ return builder.toString();
+ }
+
+ public static <X> String createCallableId(AnnotatedCallable<X> method)
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append(method.getJavaMember().getDeclaringClass().getName());
+ builder.append('.');
+ builder.append(method.getJavaMember().getName());
+ builder.append(createAnnotationCollectionId(method.getAnnotations()));
+ builder.append(createParameterListId(method.getParameters()));
+ return builder.toString();
+ }
+
+ public static <X> String createMethodId(Method method, Set<Annotation> annotations, List<AnnotatedParameter<X>> parameters)
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append(method.getDeclaringClass().getName());
+ builder.append('.');
+ builder.append(method.getName());
+ builder.append(createAnnotationCollectionId(annotations));
+ builder.append(createParameterListId(parameters));
+ return builder.toString();
+ }
+
+ public static <X> String createConstructorId(Constructor<X> constructor, Set<Annotation> annotations, List<AnnotatedParameter<X>> parameters)
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append(constructor.getDeclaringClass().getName());
+ builder.append('.');
+ builder.append(constructor.getName());
+ builder.append(createAnnotationCollectionId(annotations));
+ builder.append(createParameterListId(parameters));
+ return builder.toString();
+ }
+
+ public static <X> String createParameterListId(List<AnnotatedParameter<X>> parameters)
+ {
+ StringBuilder builder = new StringBuilder();
+ builder.append("(");
+ for (int i = 0; i < parameters.size(); ++i)
+ {
+ AnnotatedParameter<X> ap = parameters.get(i);
+ builder.append(createParameterId(ap));
+ if (i + 1 != parameters.size())
+ {
+ builder.append(',');
+ }
+ }
+ builder.append(")");
+ return builder.toString();
+ }
+
+ public static <X> String createParameterId(AnnotatedParameter<X> annotatedParameter)
+ {
+ return createParameterId(annotatedParameter.getBaseType(), annotatedParameter.getAnnotations());
+ }
+
+ public static <X> String createParameterId(Type type, Set<Annotation> annotations)
+ {
+ StringBuilder builder = new StringBuilder();
+ if (type instanceof Class<?>)
+ {
+ Class<?> c = (Class<?>) type;
+ builder.append(c.getName());
+ }
+ else
+ {
+ builder.append(type.toString());
+ }
+ builder.append(createAnnotationCollectionId(annotations));
+ return builder.toString();
+ }
+
+ /**
+ * compares two annotated elemetes to see if they have the same annotations
+ *
+ * @param a1
+ * @param a2
+ * @return
+ */
+ private static boolean compareAnnotated(Annotated a1, Annotated a2)
+ {
+ return a1.getAnnotations().equals(a2.getAnnotations());
+ }
+
+ /**
+ * compares two annotated elements to see if they have the same annotations
+ *
+ */
+ private static boolean compareAnnotatedParameters(List<? extends AnnotatedParameter<?>> p1, List<? extends AnnotatedParameter<?>> p2)
+ {
+ if (p1.size() != p2.size())
+ {
+ return false;
+ }
+ for (int i = 0; i < p1.size(); ++i)
+ {
+ if (!compareAnnotated(p1.get(i), p2.get(i)))
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public static boolean compareAnnotatedField(AnnotatedField<?> f1, AnnotatedField<?> f2)
+ {
+ if (!f1.getJavaMember().equals(f2.getJavaMember()))
+ {
+ return false;
+ }
+ return compareAnnotated(f1, f2);
+ }
+
+ public static boolean compareAnnotatedCallable(AnnotatedCallable<?> m1, AnnotatedCallable<?> m2)
+ {
+ if (!m1.getJavaMember().equals(m2.getJavaMember()))
+ {
+ return false;
+ }
+ if (!compareAnnotated(m1, m2))
+ {
+ return false;
+ }
+ return compareAnnotatedParameters(m1.getParameters(), m2.getParameters());
+ }
+
+ /**
+ * Compares two annotated types and returns true if they are the same
+ */
+ public static boolean compareAnnotatedTypes(AnnotatedType<?> t1, AnnotatedType<?> t2)
+ {
+ if (!t1.getJavaClass().equals(t2.getJavaClass()))
+ {
+ return false;
+ }
+ if (!compareAnnotated(t1, t2))
+ {
+ return false;
+ }
+
+ if (t1.getFields().size() != t2.getFields().size())
+ {
+ return false;
+ }
+ Map<Field, AnnotatedField<?>> fields = new HashMap<Field, AnnotatedField<?>>();
+ for (AnnotatedField<?> f : t2.getFields())
+ {
+ fields.put(f.getJavaMember(), f);
+ }
+ for (AnnotatedField<?> f : t1.getFields())
+ {
+ if (fields.containsKey(f.getJavaMember()))
+ {
+ if (!compareAnnotatedField(f, fields.get(f.getJavaMember())))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ if (t1.getMethods().size() != t2.getMethods().size())
+ {
+ return false;
+ }
+ Map<Method, AnnotatedMethod<?>> methods = new HashMap<Method, AnnotatedMethod<?>>();
+ for (AnnotatedMethod<?> f : t2.getMethods())
+ {
+ methods.put(f.getJavaMember(), f);
+ }
+ for (AnnotatedMethod<?> f : t1.getMethods())
+ {
+ if (methods.containsKey(f.getJavaMember()))
+ {
+ if (!compareAnnotatedCallable(f, methods.get(f.getJavaMember())))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+ if (t1.getConstructors().size() != t2.getConstructors().size())
+ {
+ return false;
+ }
+ Map<Constructor<?>, AnnotatedConstructor<?>> constructors = new HashMap<Constructor<?>, AnnotatedConstructor<?>>();
+ for (AnnotatedConstructor<?> f : t2.getConstructors())
+ {
+ constructors.put(f.getJavaMember(), f);
+ }
+ for (AnnotatedConstructor<?> f : t1.getConstructors())
+ {
+ if (constructors.containsKey(f.getJavaMember()))
+ {
+ if (!compareAnnotatedCallable(f, constructors.get(f.getJavaMember())))
+ {
+ return false;
+ }
+ }
+ else
+ {
+ return false;
+ }
+ }
+ return true;
+
+ }
+
+ private Annotateds()
+ {
+ }
+
+}
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationBuilder.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotationBuilder.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationBuilder.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.annotation.Annotation;
import java.lang.reflect.AnnotatedElement;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationRedefiner.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotationRedefiner.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationRedefiner.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.annotation.Annotation;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationStore.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/AnnotationStore.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/AnnotationStore.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.annotation.Annotation;
import java.util.Collections;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/MemberAnnotationRedefiner.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/MemberAnnotationRedefiner.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/MemberAnnotationRedefiner.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/Parameter.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/Parameter.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/Parameter.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Member;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/ParameterAnnotationRedefiner.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/ParameterAnnotationRedefiner.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/ParameterAnnotationRedefiner.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.annotation.Annotation;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/TypeAnnotationRedefiner.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/TypeAnnotationRedefiner.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/TypeAnnotationRedefiner.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -1,4 +1,4 @@
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.annotation.Annotation;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/TypeClosureBuilder.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/annotatedType/TypeClosureBuilder.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/annotated/TypeClosureBuilder.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.jboss.weld.extensions.annotatedType;
+package org.jboss.weld.extensions.annotated;
import java.lang.reflect.Type;
import java.util.HashSet;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/CustomBeanBuilder.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/CustomBeanBuilder.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/CustomBeanBuilder.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -29,7 +29,7 @@
import javax.enterprise.inject.spi.InjectionTarget;
import javax.inject.Named;
-import org.jboss.weld.extensions.util.AnnotatedTypeUtils;
+import org.jboss.weld.extensions.annotated.Annotateds;
/**
* class that can build a bean from an AnnotatedType.
@@ -107,7 +107,7 @@
types.add(i);
}
beanLifecycle = new SimpleBeanLifecycle<T>(type.getJavaClass(), beanManager);
- id = CustomBean.class.getName() + ":" + AnnotatedTypeUtils.createTypeId(type);
+ id = CustomBean.class.getName() + ":" + Annotateds.createTypeId(type);
}
public Bean<T> build()
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/bean/generic/GenericExtension.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -43,7 +43,7 @@
import javax.enterprise.inject.spi.ProcessInjectionTarget;
import javax.inject.Inject;
-import org.jboss.weld.extensions.annotatedType.AnnotatedTypeBuilder;
+import org.jboss.weld.extensions.annotated.AnnotatedTypeBuilder;
import org.jboss.weld.extensions.bean.CustomBeanBuilder;
import org.jboss.weld.extensions.util.AnnotationInstanceProvider;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/core/CoreExtension.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/core/CoreExtension.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/core/CoreExtension.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -38,11 +38,11 @@
import javax.inject.Named;
import javax.inject.Qualifier;
-import org.jboss.weld.extensions.annotatedType.AnnotatedTypeBuilder;
-import org.jboss.weld.extensions.annotatedType.AnnotationBuilder;
-import org.jboss.weld.extensions.annotatedType.MemberAnnotationRedefiner;
-import org.jboss.weld.extensions.annotatedType.Parameter;
-import org.jboss.weld.extensions.annotatedType.ParameterAnnotationRedefiner;
+import org.jboss.weld.extensions.annotated.AnnotatedTypeBuilder;
+import org.jboss.weld.extensions.annotated.AnnotationBuilder;
+import org.jboss.weld.extensions.annotated.MemberAnnotationRedefiner;
+import org.jboss.weld.extensions.annotated.Parameter;
+import org.jboss.weld.extensions.annotated.ParameterAnnotationRedefiner;
import org.jboss.weld.extensions.bean.CustomBeanBuilder;
import org.jboss.weld.extensions.core.Exact.ExactLiteral;
Modified: extensions/trunk/src/main/java/org/jboss/weld/extensions/log/LoggerProducer.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/log/LoggerProducer.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/log/LoggerProducer.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -32,7 +32,7 @@
* @author David Allen
*
*/
-public class LoggerProducer
+class LoggerProducer
{
@Produces
Deleted: extensions/trunk/src/main/java/org/jboss/weld/extensions/util/AnnotatedTypeUtils.java
===================================================================
--- extensions/trunk/src/main/java/org/jboss/weld/extensions/util/AnnotatedTypeUtils.java 2010-04-29 21:41:13 UTC (rev 6201)
+++ extensions/trunk/src/main/java/org/jboss/weld/extensions/util/AnnotatedTypeUtils.java 2010-04-29 21:51:53 UTC (rev 6202)
@@ -1,564 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc., and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jboss.weld.extensions.util;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.enterprise.inject.spi.Annotated;
-import javax.enterprise.inject.spi.AnnotatedCallable;
-import javax.enterprise.inject.spi.AnnotatedConstructor;
-import javax.enterprise.inject.spi.AnnotatedField;
-import javax.enterprise.inject.spi.AnnotatedMethod;
-import javax.enterprise.inject.spi.AnnotatedParameter;
-import javax.enterprise.inject.spi.AnnotatedType;
-
-/**
- * Class that can take an AnnotatedType and return a unique string
- * representation of that type
- *
- * @author Stuart Douglas <stuart at baileyroberts.com.au>
- */
-public class AnnotatedTypeUtils
-{
-
- /**
- * Does the first stage of comparing AnnoatedCallables, however it cannot
- * compare the method parameters
- */
- private static class AnnotatedCallableComparator<T> implements Comparator<AnnotatedCallable<? super T>>
- {
-
- public int compare(AnnotatedCallable<? super T> arg0, AnnotatedCallable<? super T> arg1)
- {
- // compare the names first
- int result = (arg0.getJavaMember().getName().compareTo(arg1.getJavaMember().getName()));
- if (result != 0)
- {
- return result;
- }
- result = arg0.getJavaMember().getDeclaringClass().getName().compareTo(arg1.getJavaMember().getDeclaringClass().getName());
- if (result != 0)
- {
- return result;
- }
- result = arg0.getParameters().size() - arg1.getParameters().size();
- return result;
- }
-
- }
-
- private static class AnnotatedMethodComparator<T> implements Comparator<AnnotatedMethod<? super T>>
- {
-
- public static <T> Comparator<AnnotatedMethod<? super T>> instance()
- {
- return new AnnotatedMethodComparator<T>();
- }
-
- private AnnotatedCallableComparator<T> callableComparator = new AnnotatedCallableComparator<T>();
-
- public int compare(AnnotatedMethod<? super T> arg0, AnnotatedMethod<? super T> arg1)
- {
- int result = callableComparator.compare(arg0, arg1);
- if (result != 0)
- {
- return result;
- }
- for (int i = 0; i < arg0.getJavaMember().getParameterTypes().length; ++i)
- {
- Class<?> p0 = arg0.getJavaMember().getParameterTypes()[i];
- Class<?> p1 = arg1.getJavaMember().getParameterTypes()[i];
- result = p0.getName().compareTo(p1.getName());
- if (result != 0)
- {
- return result;
- }
- }
- return 0;
- }
-
- }
-
- private static class AnnotatedConstructorComparator<T> implements Comparator<AnnotatedConstructor<? super T>>
- {
-
- public static <T> Comparator<AnnotatedConstructor<? super T>> instance()
- {
- return new AnnotatedConstructorComparator<T>();
- }
-
- private AnnotatedCallableComparator<T> callableComparator = new AnnotatedCallableComparator<T>();
-
- public int compare(AnnotatedConstructor<? super T> arg0, AnnotatedConstructor<? super T> arg1)
- {
- int result = callableComparator.compare(arg0, arg1);
- if (result != 0)
- {
- return result;
- }
- for (int i = 0; i < arg0.getJavaMember().getParameterTypes().length; ++i)
- {
- Class<?> p0 = arg0.getJavaMember().getParameterTypes()[i];
- Class<?> p1 = arg1.getJavaMember().getParameterTypes()[i];
- result = p0.getName().compareTo(p1.getName());
- if (result != 0)
- {
- return result;
- }
- }
- return 0;
- }
-
- }
-
- private static class AnnotatedFieldComparator<T> implements Comparator<AnnotatedField<? super T>>
- {
-
- public static <T> Comparator<AnnotatedField<? super T>> instance()
- {
- return new AnnotatedFieldComparator<T>();
- }
-
- public int compare(AnnotatedField<? super T> arg0, AnnotatedField<? super T> arg1)
- {
- if (arg0.getJavaMember().getName().equals(arg1.getJavaMember().getName()))
- {
- return arg0.getJavaMember().getDeclaringClass().getName().compareTo(arg1.getJavaMember().getDeclaringClass().getName());
- }
- return arg0.getJavaMember().getName().compareTo(arg1.getJavaMember().getName());
- }
-
- }
-
- private static class AnnotationComparator implements Comparator<Annotation>
- {
-
- public static final Comparator<Annotation> INSTANCE = new AnnotationComparator();
-
- public int compare(Annotation arg0, Annotation arg1)
- {
- return arg0.annotationType().getName().compareTo(arg1.annotationType().getName());
- }
- }
-
- private static class MethodComparator implements Comparator<Method>
- {
-
- public static final Comparator<Method> INSTANCE = new MethodComparator();
-
- public int compare(Method arg0, Method arg1)
- {
- return arg0.getName().compareTo(arg1.getName());
- }
- }
-
- private static final char SEPERATOR = ';';
-
- /**
- * Generates a unique signature for an annotated type. Members without
- * annotations are omitted to reduce the length of the signature
- *
- * @param <X>
- * @param annotatedType
- * @return
- */
- public static <X> String createTypeId(AnnotatedType<X> annotatedType)
- {
- return createTypeId(annotatedType.getJavaClass(), annotatedType.getAnnotations(), annotatedType.getMethods(), annotatedType.getFields(), annotatedType.getConstructors());
- }
-
- /**
- * Generates a unique signature for a concrete class
- *
- * @param <X>
- * @param annotatedType
- * @return
- */
- public static <X> String createTypeId(Class<X> clazz, Collection<Annotation> annotations, Collection<AnnotatedMethod<? super X>> methods, Collection<AnnotatedField<? super X>> fields, Collection<AnnotatedConstructor<X>> constructors)
- {
- StringBuilder builder = new StringBuilder();
-
- builder.append(clazz.getName());
- builder.append(createAnnotationCollectionId(annotations));
- builder.append("{");
-
- // now deal with the fields
- List<AnnotatedField<? super X>> sortedFields = new ArrayList<AnnotatedField<? super X>>();
- sortedFields.addAll(fields);
- Collections.sort(sortedFields, AnnotatedFieldComparator.<X> instance());
- for (AnnotatedField<? super X> field : sortedFields)
- {
- if (!field.getAnnotations().isEmpty())
- {
- builder.append(createFieldId(field));
- builder.append(SEPERATOR);
- }
- }
-
- // methods
- List<AnnotatedMethod<? super X>> sortedMethods = new ArrayList<AnnotatedMethod<? super X>>();
- sortedMethods.addAll(methods);
- Collections.sort(sortedMethods, AnnotatedMethodComparator.<X> instance());
- for (AnnotatedMethod<? super X> method : sortedMethods)
- {
- if (!method.getAnnotations().isEmpty() || hasMethodParameters(method))
- {
- builder.append(createCallableId(method));
- builder.append(SEPERATOR);
- }
- }
-
- // constructors
- List<AnnotatedConstructor<? super X>> sortedConstructors = new ArrayList<AnnotatedConstructor<? super X>>();
- sortedConstructors.addAll(constructors);
- Collections.sort(sortedConstructors, AnnotatedConstructorComparator.<X> instance());
- for (AnnotatedConstructor<? super X> constructor : sortedConstructors)
- {
- if (!constructor.getAnnotations().isEmpty() || hasMethodParameters(constructor))
- {
- builder.append(createCallableId(constructor));
- builder.append(SEPERATOR);
- }
- }
- builder.append("}");
-
- return builder.toString();
- }
-
- private static <X> boolean hasMethodParameters(AnnotatedCallable<X> callable)
- {
- for (AnnotatedParameter<X> parameter : callable.getParameters())
- {
- if (!parameter.getAnnotations().isEmpty())
- {
- return true;
- }
- }
- return false;
- }
-
- private static String createAnnotationCollectionId(Collection<Annotation> annotations)
- {
- if (annotations.isEmpty())
- {
- return "";
- }
-
- StringBuilder builder = new StringBuilder();
- builder.append('[');
-
- List<Annotation> annotationList = new ArrayList<Annotation>(annotations.size());
- annotationList.addAll(annotations);
- Collections.sort(annotationList, AnnotationComparator.INSTANCE);
-
- for (Annotation a : annotationList)
- {
- builder.append('@');
- builder.append(a.annotationType().getName());
- builder.append('(');
- Method[] declaredMethods = a.annotationType().getDeclaredMethods();
- List<Method> methods = new ArrayList<Method>(declaredMethods.length);
- for (Method m : declaredMethods)
- {
- methods.add(m);
- }
- Collections.sort(methods, MethodComparator.INSTANCE);
-
- for (int i = 0; i < methods.size(); ++i)
- {
- Method method = methods.get(i);
- try
- {
- Object value = method.invoke(a);
- builder.append(method.getName());
- builder.append('=');
- builder.append(value.toString());
- }
- catch (NullPointerException e)
- {
- throw new RuntimeException("NullPointerException accessing annotation member, annotation:" + a.annotationType().getName() + " member: " + method.getName(), e);
- }
- catch (IllegalArgumentException e)
- {
- throw new RuntimeException("IllegalArgumentException accessing annotation member, annotation:" + a.annotationType().getName() + " member: " + method.getName(), e);
- }
- catch (IllegalAccessException e)
- {
- throw new RuntimeException("IllegalAccessException accessing annotation member, annotation:" + a.annotationType().getName() + " member: " + method.getName(), e);
- }
- catch (InvocationTargetException e)
- {
- throw new RuntimeException("InvocationTargetException accessing annotation member, annotation:" + a.annotationType().getName() + " member: " + method.getName(), e);
- }
- if (i + 1 != methods.size())
- {
- builder.append(',');
- }
- }
- builder.append(')');
- }
- builder.append(']');
- return builder.toString();
- }
-
- public static <X> String createFieldId(AnnotatedField<X> field)
- {
- return createFieldId(field.getJavaMember(), field.getAnnotations());
- }
-
- public static <X> String createFieldId(Field field, Collection<Annotation> annotations)
- {
- StringBuilder builder = new StringBuilder();
- builder.append(field.getDeclaringClass().getName());
- builder.append('.');
- builder.append(field.getName());
- builder.append(createAnnotationCollectionId(annotations));
- return builder.toString();
- }
-
- public static <X> String createCallableId(AnnotatedCallable<X> method)
- {
- StringBuilder builder = new StringBuilder();
- builder.append(method.getJavaMember().getDeclaringClass().getName());
- builder.append('.');
- builder.append(method.getJavaMember().getName());
- builder.append(createAnnotationCollectionId(method.getAnnotations()));
- builder.append(createParameterListId(method.getParameters()));
- return builder.toString();
- }
-
- public static <X> String createMethodId(Method method, Set<Annotation> annotations, List<AnnotatedParameter<X>> parameters)
- {
- StringBuilder builder = new StringBuilder();
- builder.append(method.getDeclaringClass().getName());
- builder.append('.');
- builder.append(method.getName());
- builder.append(createAnnotationCollectionId(annotations));
- builder.append(createParameterListId(parameters));
- return builder.toString();
- }
-
- public static <X> String createConstructorId(Constructor<X> constructor, Set<Annotation> annotations, List<AnnotatedParameter<X>> parameters)
- {
- StringBuilder builder = new StringBuilder();
- builder.append(constructor.getDeclaringClass().getName());
- builder.append('.');
- builder.append(constructor.getName());
- builder.append(createAnnotationCollectionId(annotations));
- builder.append(createParameterListId(parameters));
- return builder.toString();
- }
-
- public static <X> String createParameterListId(List<AnnotatedParameter<X>> parameters)
- {
- StringBuilder builder = new StringBuilder();
- builder.append("(");
- for (int i = 0; i < parameters.size(); ++i)
- {
- AnnotatedParameter<X> ap = parameters.get(i);
- builder.append(createParameterId(ap));
- if (i + 1 != parameters.size())
- {
- builder.append(',');
- }
- }
- builder.append(")");
- return builder.toString();
- }
-
- public static <X> String createParameterId(AnnotatedParameter<X> annotatedParameter)
- {
- return createParameterId(annotatedParameter.getBaseType(), annotatedParameter.getAnnotations());
- }
-
- public static <X> String createParameterId(Type type, Set<Annotation> annotations)
- {
- StringBuilder builder = new StringBuilder();
- if (type instanceof Class<?>)
- {
- Class<?> c = (Class<?>) type;
- builder.append(c.getName());
- }
- else
- {
- builder.append(type.toString());
- }
- builder.append(createAnnotationCollectionId(annotations));
- return builder.toString();
- }
-
- /**
- * compares two annotated elemetes to see if they have the same annotations
- *
- * @param a1
- * @param a2
- * @return
- */
- private static boolean compareAnnotated(Annotated a1, Annotated a2)
- {
- return a1.getAnnotations().equals(a2.getAnnotations());
- }
-
- /**
- * compares two annotated elements to see if they have the same annotations
- *
- */
- private static boolean compareAnnotatedParameters(List<? extends AnnotatedParameter<?>> p1, List<? extends AnnotatedParameter<?>> p2)
- {
- if (p1.size() != p2.size())
- {
- return false;
- }
- for (int i = 0; i < p1.size(); ++i)
- {
- if (!compareAnnotated(p1.get(i), p2.get(i)))
- {
- return false;
- }
- }
- return true;
- }
-
- public static boolean compareAnnotatedField(AnnotatedField<?> f1, AnnotatedField<?> f2)
- {
- if (!f1.getJavaMember().equals(f2.getJavaMember()))
- {
- return false;
- }
- return compareAnnotated(f1, f2);
- }
-
- public static boolean compareAnnotatedCallable(AnnotatedCallable<?> m1, AnnotatedCallable<?> m2)
- {
- if (!m1.getJavaMember().equals(m2.getJavaMember()))
- {
- return false;
- }
- if(!compareAnnotated(m1, m2))
- {
- return false;
- }
- return compareAnnotatedParameters(m1.getParameters(), m2.getParameters());
- }
-
- /**
- * Compares two annotated types and returns true if they are the same
- */
- public static boolean compareAnnotatedTypes(AnnotatedType<?> t1, AnnotatedType<?> t2)
- {
- if (!t1.getJavaClass().equals(t2.getJavaClass()))
- {
- return false;
- }
- if (!compareAnnotated(t1, t2))
- {
- return false;
- }
-
- if (t1.getFields().size() != t2.getFields().size())
- {
- return false;
- }
- Map<Field, AnnotatedField<?>> fields = new HashMap<Field, AnnotatedField<?>>();
- for (AnnotatedField<?> f : t2.getFields())
- {
- fields.put(f.getJavaMember(), f);
- }
- for (AnnotatedField<?> f : t1.getFields())
- {
- if (fields.containsKey(f.getJavaMember()))
- {
- if (!compareAnnotatedField(f, fields.get(f.getJavaMember())))
- {
- return false;
- }
- }
- else
- {
- return false;
- }
- }
-
- if (t1.getMethods().size() != t2.getMethods().size())
- {
- return false;
- }
- Map<Method, AnnotatedMethod<?>> methods = new HashMap<Method, AnnotatedMethod<?>>();
- for (AnnotatedMethod<?> f : t2.getMethods())
- {
- methods.put(f.getJavaMember(), f);
- }
- for (AnnotatedMethod<?> f : t1.getMethods())
- {
- if (methods.containsKey(f.getJavaMember()))
- {
- if (!compareAnnotatedCallable(f, methods.get(f.getJavaMember())))
- {
- return false;
- }
- }
- else
- {
- return false;
- }
- }
- if (t1.getConstructors().size() != t2.getConstructors().size())
- {
- return false;
- }
- Map<Constructor<?>, AnnotatedConstructor<?>> constructors = new HashMap<Constructor<?>, AnnotatedConstructor<?>>();
- for (AnnotatedConstructor<?> f : t2.getConstructors())
- {
- constructors.put(f.getJavaMember(), f);
- }
- for (AnnotatedConstructor<?> f : t1.getConstructors())
- {
- if (constructors.containsKey(f.getJavaMember()))
- {
- if (!compareAnnotatedCallable(f, constructors.get(f.getJavaMember())))
- {
- return false;
- }
- }
- else
- {
- return false;
- }
- }
- return true;
-
- }
-
-
- private AnnotatedTypeUtils()
- {
- }
-
-}
More information about the weld-commits
mailing list