December 2009 - weld-commits - Jboss List Archives

Weld SVN: r5192 - doc/trunk/reference/en-US.

by weld-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2009-12-02 09:59:26 -0500 (Wed, 02 Dec 2009) New Revision: 5192 Modified: doc/trunk/reference/en-US/extend.xml Log: @Observes Modified: doc/trunk/reference/en-US/extend.xml =================================================================== --- doc/trunk/reference/en-US/extend.xml 2009-12-02 13:37:11 UTC (rev 5191) +++ doc/trunk/reference/en-US/extend.xml 2009-12-02 14:59:26 UTC (rev 5192) @@ -1,6 +1,6 @@ <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]> - + <chapter id="extend"> <title>Portable extensions</title> @@ -136,16 +136,16 @@ </para> <programlisting role="JAVA"><![CDATA[class MyExtension implements Extension { - - void beforeBeanDiscovery(BeforeBeanDiscovery bbd) { + + void beforeBeanDiscovery(@Observes BeforeBeanDiscovery bbd) { Logger.global.debug("beginning the scanning process"); } - <T> void processAnnotatedType(ProcessAnnotatedType<T> pat) { + <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) { Logger.global.debug("scanning type: " + pat.getAnnotatedType().getJavaClass().getName()); } - void afterBeanDiscovery(AfterBeanDiscovery abd) { + void afterBeanDiscovery(@Observes AfterBeanDiscovery abd) { Logger.global.debug("finished the scanning process"); } @@ -158,7 +158,7 @@ <programlisting role="JAVA"><![CDATA[class MyExtension implements Extension { - <T> void processAnnotatedType(ProcessAnnotatedType<T> pat) { + <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) { //tell the container to ignore the type if it is annotated @Ignore if ( pat.getAnnotatedType().isAnnotionPresent(Ignore.class) ) pat.veto(); } @@ -169,7 +169,7 @@ The observer method may inject a <literal>BeanManager</literal> </para> - <programlisting role="JAVA"><![CDATA[<T> void processAnnotatedType(ProcessAnnotatedType<T> pat, BeanManager beanManager) { ... }]]></programlisting> + <programlisting role="JAVA"><![CDATA[<T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat, BeanManager beanManager) { ... }]]></programlisting> </section> @@ -525,7 +525,7 @@ <programlisting role="JAVA"><![CDATA[class ServiceAlternativeExtension implements Extension { - <T> void processAnnotatedType(ProcessAnnotatedType<T> pat) { + <T> void processAnnotatedType(@Observes ProcessAnnotatedType<T> pat) { final AnnotatedType<T> type = pat.getAnnotatedType(); @@ -584,7 +584,7 @@ <programlisting role="JAVA"><![CDATA[public class ConfigExtension implements Extension { - <X> void processInjectionTarget(ProcessInjectionTarget<X> pit) { + <X> void processInjectionTarget(@Observes ProcessInjectionTarget<X> pit) { //wrap this to intercept the component lifecycle final InjectionTarget<X> it = pit.getInjectionTarget();

16 years, 4 months

1
0
0 / 0

Weld SVN: r5191 - in java-se/trunk: src/main/java/org/jboss/weld/environment/se and 2 other directories.

by weld-commits＠lists.jboss.org

Author: peteroyle Date: 2009-12-02 08:37:11 -0500 (Wed, 02 Dec 2009) New Revision: 5191 Added: java-se/trunk/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java java-se/trunk/src/main/resources/META-INF/services/ java-se/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension Removed: java-se/trunk/src/main/resources/META-INF/beans.xml Modified: java-se/trunk/pom.xml java-se/trunk/src/main/java/org/jboss/weld/environment/se/StartMain.java Log: Weld Se produces a shaded jar with all Weld dependencies bundled for easier usage in SE apps. Modified: java-se/trunk/pom.xml =================================================================== --- java-se/trunk/pom.xml 2009-12-02 12:08:07 UTC (rev 5190) +++ java-se/trunk/pom.xml 2009-12-02 13:37:11 UTC (rev 5191) @@ -58,16 +58,16 @@ </snapshots> </repository> <repository> - <id>oss.sonatype.org/jboss-snapshots</id> - <name>JBoss (Nexus) Snapshots Repository</name> - <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> + <id>oss.sonatype.org/jboss-snapshots</id> + <name>JBoss (Nexus) Snapshots Repository</name> + <url>http://oss.sonatype.org/content/repositories/jboss-snapshots</url> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> </repository> </repositories> @@ -144,7 +144,6 @@ <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-core</artifactId> - <scope>provided</scope> </dependency> <dependency> @@ -168,6 +167,25 @@ </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </project> Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/StartMain.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/StartMain.java 2009-12-02 12:08:07 UTC (rev 5190) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/StartMain.java 2009-12-02 13:37:11 UTC (rev 5191) @@ -20,9 +20,11 @@ import org.jboss.weld.environment.se.events.ContainerInitialized; /** - * This is the main class that should always be called from the command line for - * a WeldContainer SE app. Something like: <code> - * java -jar MyApp.jar org.jboss.weld.environment.se.StarMain arguments + * This is the main class that can be called from the command line for + * a WeldContainer SE app which makes use of the ContainerInitialized event. + * Something like: + * <code> + * java -cp weld-se.jar:my-app.jar org.jboss.weld.environment.se.StartMain arg1 arg2 * </code> * * @author Peter Royle Added: java-se/trunk/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java (rev 0) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/WeldSEBeanRegistrant.java 2009-12-02 13:37:11 UTC (rev 5191) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, 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.environment.se; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.BeanManager; +import javax.enterprise.inject.spi.BeforeBeanDiscovery; +import javax.enterprise.inject.spi.Extension; +import org.jboss.weld.environment.se.beans.InstanceManager; +import org.jboss.weld.environment.se.beans.ParametersFactory; + +/** + * Explicitly registers all of the 'built-in' Java SE related beans. + * @author Peter Royle + */ +public class WeldSEBeanRegistrant implements Extension +{ + + public void registerWeldSEBeans(@Observes BeforeBeanDiscovery event, BeanManager beanManager) + { + event.addAnnotatedType(beanManager.createAnnotatedType(ShutdownManager.class)); + event.addAnnotatedType(beanManager.createAnnotatedType(ParametersFactory.class)); + event.addAnnotatedType(beanManager.createAnnotatedType(InstanceManager.class)); + } + +} Deleted: java-se/trunk/src/main/resources/META-INF/beans.xml =================================================================== --- java-se/trunk/src/main/resources/META-INF/beans.xml 2009-12-02 12:08:07 UTC (rev 5190) +++ java-se/trunk/src/main/resources/META-INF/beans.xml 2009-12-02 13:37:11 UTC (rev 5191) @@ -1,19 +0,0 @@ - -<beans></beans> Added: java-se/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- java-se/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension (rev 0) +++ java-se/trunk/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2009-12-02 13:37:11 UTC (rev 5191) @@ -0,0 +1 @@ +org.jboss.weld.environment.se.WeldSEBeanRegistrant

16 years, 4 months

1
0
0 / 0

Weld SVN: r5190 - in extensions/trunk/core/src/main/java/org/jboss/weld/extensions: util and 2 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-12-02 07:08:07 -0500 (Wed, 02 Dec 2009) New Revision: 5190 Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedCallable.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedElement.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedMember.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AnnotationStore.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedConstructor.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedField.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedMethod.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedParameter.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedType.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/TypeStore.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/AnnotationRedefinition.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/Reannotated.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedCallable.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedConstructor.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedField.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMember.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMethod.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedParameter.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedType.java Removed: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationRedefinition.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/Reannotated.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedCallable.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedConstructor.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedField.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMember.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMethod.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedParameter.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedType.java Modified: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/CoreExtension.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/BeanImpl.java Log: Reorg, WELDX-54 Modified: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/CoreExtension.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/CoreExtension.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/CoreExtension.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -21,11 +21,11 @@ import javax.inject.Named; import javax.inject.Qualifier; -import org.jboss.weld.extensions.util.AnnotationRedefinition; import org.jboss.weld.extensions.util.BeanImpl; -import org.jboss.weld.extensions.util.Reannotated; -import org.jboss.weld.extensions.util.ReannotatedMember; -import org.jboss.weld.extensions.util.ReannotatedType; +import org.jboss.weld.extensions.util.reannotated.AnnotationRedefinition; +import org.jboss.weld.extensions.util.reannotated.Reannotated; +import org.jboss.weld.extensions.util.reannotated.ReannotatedMember; +import org.jboss.weld.extensions.util.reannotated.ReannotatedType; public class CoreExtension implements Extension { Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationRedefinition.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationRedefinition.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationRedefinition.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,8 +0,0 @@ -package org.jboss.weld.extensions.util; - -import java.lang.annotation.Annotation; - -public interface AnnotationRedefinition<X extends Annotation> -{ - public X redefine(X annotation, Reannotated reannotated); -} Modified: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/BeanImpl.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/BeanImpl.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/BeanImpl.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -15,6 +15,8 @@ import javax.inject.Qualifier; import javax.inject.Scope; +import org.jboss.weld.extensions.util.reannotated.ReannotatedType; + /** * This implementation of Bean is immutable and threadsafe. * Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/Reannotated.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/Reannotated.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/Reannotated.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,158 +0,0 @@ -package org.jboss.weld.extensions.util; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.AbstractSet; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.enterprise.inject.spi.Annotated; - -/** - * This class is not thread-safe, and the client must provide any synchronization needed - * - * @author Gavin King - * @author Pete Muir - * - * - */ -public abstract class Reannotated implements Annotated -{ - - private static class AnnotationSet extends AbstractSet<Annotation> - { - - List<Annotation> list = new ArrayList<Annotation>(); - - AnnotationSet(Map<Class<? extends Annotation>, Annotation> annotations, Set<Annotation> delegateAnnotations) - { - list.addAll(annotations.values()); - for (Annotation ann : delegateAnnotations) - { - if (!annotations.containsKey(ann.annotationType())) - { - list.add(ann); - } - } - } - - @Override - public Iterator<Annotation> iterator() - { - return list.iterator(); - } - - @Override - public int size() - { - return list.size(); - } - - } - - - protected abstract Annotated delegate(); - - private final Map<Class<? extends Annotation>, Annotation> annotations; - - public Reannotated() - { - this.annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - } - - public <X extends Annotation> void redefine(Class<X> annotationType, AnnotationRedefinition<X> visitor) - { - if (isAnnotationPresent(annotationType)) - { - X redefined = visitor.redefine(getAnnotation(annotationType), this); - if (redefined == null) - { - annotations.remove(annotationType); - } - else - { - annotations.put(annotationType, redefined); - } - } - } - - /* - * public void undefine(Class<? extends Annotation> annotationType) { - * annotations.put(annotationType, null); } - */ - - public void define(Annotation ann) - { - annotations.put(ann.annotationType(), ann); - } - - public boolean isAnnotationWithMetatypePresent(Class<? extends Annotation> metaannotationType) - { - for (Annotation ann : getAnnotations()) - { - if (ann.annotationType().isAnnotationPresent(metaannotationType)) - { - return true; - } - } - return false; - } - - public Set<Annotation> getAnnotationsWithMetatype(Class<? extends Annotation> metaannotationType) - { - Set<Annotation> set = new HashSet<Annotation>(); - for (Annotation ann : getAnnotations()) - { - if (ann.annotationType().isAnnotationPresent(metaannotationType)) - { - set.add(ann); - } - } - return set; - } - - public abstract Class<?> getJavaClass(); - - public <T extends Annotation> T getAnnotation(Class<T> annotationType) - { - if (annotationType == null) - { - throw new IllegalArgumentException("annotationType argument must not be null"); - } - Annotation ann = annotations.get(annotationType); - if (ann != null) - { - return annotationType.cast(ann); - } - else - { - return delegate().getAnnotation(annotationType); - } - } - - public Set<Annotation> getAnnotations() - { - return new AnnotationSet(annotations, delegate().getAnnotations()); - } - - public Type getBaseType() - { - return delegate().getBaseType(); - } - - public Set<Type> getTypeClosure() - { - return delegate().getTypeClosure(); - } - - public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) - { - return annotations.containsKey(annotationType) || delegate().isAnnotationPresent(annotationType); - } - -} Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedCallable.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedCallable.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedCallable.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,60 +0,0 @@ -package org.jboss.weld.extensions.util; - -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.List; - -import javax.enterprise.inject.spi.AnnotatedCallable; -import javax.enterprise.inject.spi.AnnotatedParameter; - -/** - * This implementation of {@link AnnotatedCallable} is not threadsafe and any synchronization should be performed by the client - * - * @author Gavin King - * @author Pete Muir - * - * @param <X> - */ -public abstract class ReannotatedCallable<X> extends ReannotatedMember<X> implements AnnotatedCallable<X> -{ - - private final List<ReannotatedParameter<X>> parameters = new ArrayList<ReannotatedParameter<X>>(); - - public ReannotatedCallable(ReannotatedType<X> declaringType, List<AnnotatedParameter<X>> params) - { - super(declaringType); - for (AnnotatedParameter<X> param : params) - { - parameters.add(new ReannotatedParameter<X>(param, this, param.getPosition())); - } - } - - @Override - protected abstract AnnotatedCallable<X> delegate(); - - public List<AnnotatedParameter<X>> getParameters() - { - return new ArrayList<AnnotatedParameter<X>>(parameters); - } - - public ReannotatedParameter<X> getParameter(int pos) - { - return parameters.get(pos); - } - - public <Y extends Annotation> void redefineParameters(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - for (ReannotatedParameter<X> param : parameters) - { - param.redefine(annotationType, visitor); - } - } - - @Override - public <Y extends Annotation> void redefineAll(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - redefine(annotationType, visitor); - redefineParameters(annotationType, visitor); - } - -} Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedConstructor.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedConstructor.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedConstructor.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,43 +0,0 @@ -package org.jboss.weld.extensions.util; - -import java.lang.reflect.Constructor; - -import javax.enterprise.inject.spi.AnnotatedConstructor; - -/** - * This implementation of {@link AnnotatedConstructor} is not threadsafe and any synchronization must be performed by the client - * - * @author Gavin King - * - * @param <X> - */ -public class ReannotatedConstructor<X> extends ReannotatedCallable<X> implements AnnotatedConstructor<X> -{ - - private final AnnotatedConstructor<X> constructor; - - ReannotatedConstructor(ReannotatedType<X> declaringType, AnnotatedConstructor<X> constructor) - { - super(declaringType, constructor.getParameters()); - this.constructor = constructor; - } - - @Override - protected AnnotatedConstructor<X> delegate() - { - return constructor; - } - - @Override - public Constructor<X> getJavaMember() - { - return constructor.getJavaMember(); - } - - @Override - public boolean isStatic() - { - return constructor.isStatic(); - } - -} Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedField.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedField.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedField.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,50 +0,0 @@ -package org.jboss.weld.extensions.util; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Field; - -import javax.enterprise.inject.spi.AnnotatedField; - -/** - * This implementation of {@link AnnotatedField} is not threadsafe and any synchronization must be performed by the client - * - * @author Gavin King - * - * @param <X> - */ -public class ReannotatedField<X> extends ReannotatedMember<X> implements AnnotatedField<X> -{ - - private final AnnotatedField<X> field; - - ReannotatedField(ReannotatedType<X> declaringType, AnnotatedField<X> field) - { - super(declaringType); - this.field = field; - } - - @Override - protected AnnotatedField<X> delegate() - { - return field; - } - - @Override - public Field getJavaMember() - { - return field.getJavaMember(); - } - - @Override - public boolean isStatic() - { - return field.isStatic(); - } - - @Override - public <Y extends Annotation> void redefineAll(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - redefine(annotationType, visitor); - } - -} Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMember.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMember.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMember.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,51 +0,0 @@ -package org.jboss.weld.extensions.util; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Member; - -import javax.enterprise.inject.spi.AnnotatedMember; - -/** - * This implementation of {@link AnnotatedMember} is not threadsafe and any synchronization must be performed by the client - * - * @author Gavin King - * - * @param <X> - */ -public abstract class ReannotatedMember<X> extends Reannotated implements AnnotatedMember<X> -{ - - private final ReannotatedType<X> declaringType; - - ReannotatedMember(ReannotatedType<X> declaringType) - { - this.declaringType = declaringType; - } - - public ReannotatedType<X> getDeclaringType() - { - return declaringType; - } - - @Override - protected abstract AnnotatedMember<X> delegate(); - - public Member getJavaMember() - { - return delegate().getJavaMember(); - } - - public boolean isStatic() - { - return delegate().isStatic(); - } - - @Override - public Class<?> getJavaClass() - { - return getJavaMember().getDeclaringClass(); - } - - public abstract <Y extends Annotation> void redefineAll(Class<Y> annotationType, AnnotationRedefinition<Y> visitor); - -} Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMethod.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMethod.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMethod.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,43 +0,0 @@ -package org.jboss.weld.extensions.util; - -import java.lang.reflect.Method; - -import javax.enterprise.inject.spi.AnnotatedMethod; - -/** - * This implementation of {@link AnnotatedMethod} is not threadsafe and any synchronization must be performed by the client - * - * @author Gavin King - * - * @param <X> - */ -public class ReannotatedMethod<X> extends ReannotatedCallable<X> implements AnnotatedMethod<X> -{ - - private final AnnotatedMethod<X> method; - - ReannotatedMethod(ReannotatedType<X> declaringType, AnnotatedMethod<X> method) - { - super(declaringType, method.getParameters()); - this.method = method; - } - - @Override - protected AnnotatedMethod<X> delegate() - { - return method; - } - - @Override - public Method getJavaMember() - { - return method.getJavaMember(); - } - - @Override - public boolean isStatic() - { - return method.isStatic(); - } - -} Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedParameter.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedParameter.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedParameter.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,60 +0,0 @@ -package org.jboss.weld.extensions.util; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Member; -import java.lang.reflect.Method; - -import javax.enterprise.inject.spi.AnnotatedParameter; - -/** - * This implementation of {@link AnnotatedParameter} is not threadsafe and any synchronization must be performed by the client - * - * @author Gavin King - * - * @param <X> - */ -public class ReannotatedParameter<X> extends Reannotated implements AnnotatedParameter<X> -{ - - private final AnnotatedParameter<X> parameter; - private final ReannotatedCallable<X> callable; - private final int pos; - - public ReannotatedParameter(AnnotatedParameter<X> parameter, ReannotatedCallable<X> callable, int pos) - { - this.parameter = parameter; - this.callable = callable; - this.pos = pos; - } - - @Override - protected AnnotatedParameter<X> delegate() - { - return parameter; - } - - public ReannotatedCallable<X> getDeclaringCallable() - { - return callable; - } - - public int getPosition() - { - return pos; - } - - @Override - public Class<?> getJavaClass() - { - Member member = callable.getJavaMember(); - if (member instanceof Method) - { - return Method.class.cast(member).getParameterTypes()[pos]; - } - else - { - return Constructor.class.cast(member).getParameterTypes()[pos]; - } - } - -} Deleted: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedType.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedType.java 2009-12-02 11:39:20 UTC (rev 5189) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedType.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -1,239 +0,0 @@ -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.Member; -import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - -import javax.enterprise.inject.spi.AnnotatedConstructor; -import javax.enterprise.inject.spi.AnnotatedField; -import javax.enterprise.inject.spi.AnnotatedMember; -import javax.enterprise.inject.spi.AnnotatedMethod; -import javax.enterprise.inject.spi.AnnotatedType; - -/** - * This implementation of {@link AnnotatedType} is not threadsafe and any synchronization must be performed by the client - * - * @author Gavin King - * - * @param <X> - */ -public class ReannotatedType<X> extends Reannotated implements AnnotatedType<X> -{ - - private final AnnotatedType<X> type; - private final HashMap<Class<?>, ReannotatedType<?>> types; - - private final Map<Member, ReannotatedField<? super X>> fields; - private final Map<Member, ReannotatedMethod<? super X>> methods; - private final Map<Member, ReannotatedConstructor<X>> constructors; - - public ReannotatedType(AnnotatedType<X> type) - { - this(type, new HashMap<Class<?>, ReannotatedType<?>>()); - } - - public ReannotatedType(AnnotatedType<X> type, HashMap<Class<?>, ReannotatedType<?>> types) - { - this.type = type; - this.types = types; - - fields = new HashMap<Member, ReannotatedField<? super X>>(); - methods = new HashMap<Member, ReannotatedMethod<? super X>>(); - constructors = new HashMap<Member, ReannotatedConstructor<X>>(); - - for (AnnotatedField<? super X> field : type.getFields()) - { - addField(field); - } - for (AnnotatedMethod<? super X> method : type.getMethods()) - { - addMethod(method); - } - for (AnnotatedConstructor<X> constructor : type.getConstructors()) - { - addConstructor(constructor); - } - } - - private <Y> ReannotatedType<Y> getDeclaringType(AnnotatedMember<Y> member) - { - return getSupertype(member.getDeclaringType()); - } - - @SuppressWarnings("unchecked") - private <Y> ReannotatedType<Y> getSupertype(AnnotatedType<Y> supertype) - { - Class<Y> memberJavaClass = supertype.getJavaClass(); - if (memberJavaClass == type.getJavaClass()) - { - return (ReannotatedType<Y>) this; - } - else - { - ReannotatedType<Y> result = (ReannotatedType<Y>) types.get(memberJavaClass); - if (result == null) - { - result = new ReannotatedType<Y>(supertype, types); - types.put(memberJavaClass, result); - } - return result; - } - } - - private void addConstructor(AnnotatedConstructor<X> constructor) - { - constructors.put(constructor.getJavaMember(), new ReannotatedConstructor<X>(this, constructor)); - } - - @SuppressWarnings("unchecked") - private void addMethod(AnnotatedMethod<? super X> method) - { - Class<? super X> methodJavaClass = method.getDeclaringType().getJavaClass(); - if (methodJavaClass.isAssignableFrom(type.getJavaClass())) - { - final ReannotatedMethod<? super X> reannotated; - if (methodJavaClass == type.getJavaClass()) - { - reannotated = new ReannotatedMethod(getDeclaringType(method), method); - } - else - { - reannotated = getInheritedMethod(method); - } - methods.put(method.getJavaMember(), reannotated); - } - } - - @SuppressWarnings("unchecked") - private void addField(AnnotatedField<? super X> field) - { - Class<? super X> fieldJavaClass = field.getDeclaringType().getJavaClass(); - final ReannotatedField<? super X> reannotated; - if (fieldJavaClass.isAssignableFrom(type.getJavaClass())) - { - if (fieldJavaClass == type.getJavaClass()) - { - reannotated = new ReannotatedField(getDeclaringType(field), field); - } - else - { - reannotated = getInheritedField(field); - } - fields.put(field.getJavaMember(), reannotated); - } - } - - private <Y> ReannotatedField<? super Y> getInheritedField(AnnotatedField<Y> field) - { - return getDeclaringType(field).getField(field.getJavaMember()); - } - - private <Y> ReannotatedMethod<? super Y> getInheritedMethod(AnnotatedMethod<Y> method) - { - return getDeclaringType(method).getMethod(method.getJavaMember()); - } - - @Override - protected AnnotatedType<X> delegate() - { - return type; - } - - public Set<AnnotatedConstructor<X>> getConstructors() - { - return new HashSet<AnnotatedConstructor<X>>(constructors.values()); - } - - public Set<AnnotatedMethod<? super X>> getMethods() - { - return new HashSet<AnnotatedMethod<? super X>>(methods.values()); - } - - public Set<AnnotatedField<? super X>> getFields() - { - return new HashSet<AnnotatedField<? super X>>(fields.values()); - } - - public ReannotatedConstructor<X> getConstructor(Constructor<X> constructor) - { - return constructors.get(constructor); - } - - public ReannotatedMethod<? super X> getMethod(Method constructor) - { - return methods.get(constructor); - } - - public ReannotatedField<? super X> getField(Field field) - { - return fields.get(field); - } - - public <Y extends Annotation> void redefineConstructors(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - for (ReannotatedConstructor<X> constructor : constructors.values()) - { - constructor.redefine(annotationType, visitor); - } - } - - public <Y extends Annotation> void redefineMethods(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - for (ReannotatedMethod<? super X> method : methods.values()) - { - method.redefine(annotationType, visitor); - } - } - - public <Y extends Annotation> void redefineFields(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - for (ReannotatedField<? super X> field : fields.values()) - { - field.redefine(annotationType, visitor); - } - } - - public <Y extends Annotation> void redefineMembers(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - redefineFields(annotationType, visitor); - redefineMethods(annotationType, visitor); - redefineConstructors(annotationType, visitor); - } - - public <Y extends Annotation> void redefineMembersAndParameters(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - redefineMembers(annotationType, visitor); - redefineParameters(annotationType, visitor); - } - - public <Y extends Annotation> void redefineParameters(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - for (ReannotatedMethod<? super X> method : methods.values()) - { - method.redefineParameters(annotationType, visitor); - } - for (ReannotatedConstructor<X> constructor : constructors.values()) - { - constructor.redefineParameters(annotationType, visitor); - } - } - - public <Y extends Annotation> void redefineAll(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) - { - redefine(annotationType, visitor); - redefineMembersAndParameters(annotationType, visitor); - } - - @Override - public Class<X> getJavaClass() - { - return type.getJavaClass(); - } - -} Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedCallable.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedCallable.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedCallable.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,73 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Member; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.enterprise.inject.spi.AnnotatedCallable; +import javax.enterprise.inject.spi.AnnotatedParameter; +import javax.enterprise.inject.spi.AnnotatedType; + +/** + * + * @author Stuart Douglas + * + */ +public abstract class AbstractNewAnnotatedCallable<X, Y extends Member> extends AbstractNewAnnotatedMember<X, Y> implements AnnotatedCallable<X> +{ + + private final List<NewAnnotatedParameter<X>> parameters = new ArrayList<NewAnnotatedParameter<X>>(); + + protected AbstractNewAnnotatedCallable(AnnotatedType<X> type, Method method, boolean readAnnotations) + { + super(type, (Y) method, method.getReturnType(), readAnnotations); + int len = method.getTypeParameters().length; + for (int i = 0; i < len; ++i) + { + NewAnnotatedParameter<X> p = new NewAnnotatedParameter<X>(this, method.getParameterTypes()[i], i, readAnnotations); + parameters.add(p); + } + } + + protected AbstractNewAnnotatedCallable(AnnotatedType<X> type, Constructor<X> constructor, boolean readAnnotations) + { + super(type, (Y) constructor, constructor.getDeclaringClass(), readAnnotations); + int len = constructor.getTypeParameters().length; + for (int i = 0; i < len; ++i) + { + NewAnnotatedParameter<X> p = new NewAnnotatedParameter<X>(this, constructor.getParameterTypes()[i], i, readAnnotations); + parameters.add(p); + } + } + + + @Override + public void clearAllAnnotations() + { + super.clearAllAnnotations(); + for (NewAnnotatedParameter<X> p : parameters) + { + p.clearAllAnnotations(); + } + } + + public List<AnnotatedParameter<X>> getParameters() + { + return (List) Collections.unmodifiableList(parameters); + } + + public List<NewAnnotatedParameter<X>> getNewAnnotatedParameters() + { + return Collections.unmodifiableList(parameters); + } + + public NewAnnotatedParameter<X> getParameter(int index) + { + return parameters.get(index); + + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedCallable.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedElement.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedElement.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedElement.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,77 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Set; + +import javax.enterprise.inject.spi.Annotated; + +/** + * The base class for all New Annotated types. + * + * @author Stuart Douglas + * + */ +public abstract class AbstractNewAnnotatedElement implements Annotated +{ + + private final Class<?> type; + + private final TypeStore typeStore = new TypeStore(); + private final AnnotationStore annotations = new AnnotationStore(); + + /** + * Clears all annotation data from the the class. Useful if we are not + * interested in the annotations that are actually on the class but instead + * want to apply our own + */ + public void clearAllAnnotations() + { + annotations.clear(); + } + + protected AbstractNewAnnotatedElement(Class<?> type, boolean readAnnotations) + { + typeStore.add(type); + this.type = type; + if (readAnnotations) + { + annotations.addAll(type); + } + } + + public void addAnnotation(Annotation a) + { + annotations.addAnnotation(a); + } + + public void removeAnnotation(Class<? extends Annotation> c) + { + annotations.removeAnnotation(c); + } + + public <T extends Annotation> T getAnnotation(Class<T> annotationType) + { + return annotations.getAnnotation(annotationType); + } + + public Set<Annotation> getAnnotations() + { + return annotations.getAnnotations(); + } + + public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) + { + return annotations.isAnnotationPresent(annotationType); + } + + public Set<Type> getTypeClosure() + { + return typeStore.getTypes(); + } + + public Type getBaseType() + { + return type; + } +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedElement.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedMember.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedMember.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedMember.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,41 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.reflect.Member; +import java.lang.reflect.Modifier; + +import javax.enterprise.inject.spi.AnnotatedMember; +import javax.enterprise.inject.spi.AnnotatedType; + +/** + * + * @author Stuart Douglas + * + */ +public abstract class AbstractNewAnnotatedMember<X, M extends Member> extends AbstractNewAnnotatedElement implements AnnotatedMember<X> +{ + private final AnnotatedType<X> declaringType; + private final M javaMember; + + protected AbstractNewAnnotatedMember(AnnotatedType<X> declaringType, M member, Class<?> memberType, boolean readAnnotations) + { + super(memberType, readAnnotations); + this.declaringType = declaringType; + this.javaMember = member; + } + + public AnnotatedType<X> getDeclaringType() + { + return declaringType; + } + + public M getJavaMember() + { + return javaMember; + } + + public boolean isStatic() + { + return Modifier.isStatic(javaMember.getModifiers()); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AbstractNewAnnotatedMember.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AnnotationStore.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AnnotationStore.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AnnotationStore.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,65 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; + +/** + * + * @author Stuart Douglas + * + */ +class AnnotationStore +{ + HashMap<Class<? extends Annotation>, Annotation> annotationMap = new HashMap<Class<? extends Annotation>, Annotation>(); + Set<Annotation> annotations = new HashSet<Annotation>(); + + public void clear() + { + annotationMap.clear(); + annotations.clear(); + } + + public void addAnnotation(Annotation a) + { + annotations.add(a); + annotationMap.put(a.getClass(), a); + } + + public void removeAnnotation(Class a) + { + Annotation an = annotationMap.get(a); + if (an != null) + { + annotations.remove(an); + annotationMap.remove(a); + } + } + + public <T extends Annotation> T getAnnotation(Class<T> type) + { + return (T) annotationMap.get(type); + } + + public Set<Annotation> getAnnotations() + { + return Collections.unmodifiableSet(annotations); + } + + public boolean isAnnotationPresent(Class<? extends Annotation> type) + { + return annotationMap.containsKey(type); + } + + public void addAll(AnnotatedElement element) + { + for (Annotation a : element.getAnnotations()) + { + addAnnotation(a); + } + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/AnnotationStore.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedConstructor.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedConstructor.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedConstructor.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,21 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.reflect.Constructor; + +import javax.enterprise.inject.spi.AnnotatedConstructor; + +/** + * + * @author Stuart Douglas + * + */ +class NewAnnotatedConstructor<X> extends AbstractNewAnnotatedCallable<X, Constructor<X>> + implements AnnotatedConstructor<X> +{ + + NewAnnotatedConstructor(NewAnnotatedType<X> type, Constructor<?> constructor, boolean readAnnotations) + { + super(type, (Constructor<X>) constructor, readAnnotations); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedConstructor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedField.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedField.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedField.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,22 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.reflect.Field; + +import javax.enterprise.inject.spi.AnnotatedField; +import javax.enterprise.inject.spi.AnnotatedType; + +/** + * + * @author Stuart Douglas + * + */ +class NewAnnotatedField<X> extends AbstractNewAnnotatedMember<X, Field> implements + AnnotatedField<X> +{ + + NewAnnotatedField(AnnotatedType<X> declaringType, Field field, boolean readAnnotations) + { + super(declaringType, field, field.getType(), readAnnotations); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedField.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedMethod.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedMethod.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedMethod.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,25 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.reflect.Method; + +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedType; + +/** + * + * @author Stuart Douglas + * + */ +class NewAnnotatedMethod<X> extends AbstractNewAnnotatedCallable<X, Method> implements AnnotatedMethod<X> +{ + NewAnnotatedMethod(AnnotatedType<X> type, Method method, boolean readAnnotations) + { + super(type, method, readAnnotations); + int count = 0; + for (Class<?> c : method.getParameterTypes()) + { + NewAnnotatedParameter<X> mp = new NewAnnotatedParameter<X>(this, c, count++, readAnnotations); + getParameters().add(mp); + } + } +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedMethod.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedParameter.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedParameter.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedParameter.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,34 @@ +package org.jboss.weld.extensions.util.annotated; + +import javax.enterprise.inject.spi.AnnotatedCallable; +import javax.enterprise.inject.spi.AnnotatedParameter; + +/** + * + * @author Stuart Douglas + * + */ +class NewAnnotatedParameter<X> extends AbstractNewAnnotatedElement implements AnnotatedParameter<X> +{ + + private final int position; + private final AnnotatedCallable<X> declaringCallable; + + NewAnnotatedParameter(AnnotatedCallable<X> declaringCallable, Class type, int position, boolean readAnnotations) + { + super(type, readAnnotations); + this.declaringCallable = declaringCallable; + this.position = position; + } + + public AnnotatedCallable<X> getDeclaringCallable() + { + return declaringCallable; + } + + public int getPosition() + { + return position; + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedParameter.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedType.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedType.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedType.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,112 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.enterprise.inject.spi.AnnotatedConstructor; +import javax.enterprise.inject.spi.AnnotatedField; +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedType; + +/** + * AnnotatedType implementation for adding beans in the BeforeBeanDiscovery + * event + * + * @author Stuart Douglas + * + */ +public class NewAnnotatedType<X> extends AbstractNewAnnotatedElement implements AnnotatedType<X> +{ + + private final Set<NewAnnotatedConstructor<X>> constructors = new HashSet<NewAnnotatedConstructor<X>>(); + private final Set<NewAnnotatedField<? super X>> fields = new HashSet<NewAnnotatedField<? super X>>(); + private final Set<NewAnnotatedMethod<? super X>> methods = new HashSet<NewAnnotatedMethod<? super X>>(); + + // maps fields to the field objects + private final Map<Field, NewAnnotatedField<X>> fieldMap = new HashMap<Field, NewAnnotatedField<X>>(); + // maps method names to the method objects + private final Map<Method, NewAnnotatedMethod<X>> methodMap = new HashMap<Method, NewAnnotatedMethod<X>>(); + + private final Class<X> javaClass; + + public NewAnnotatedType(Class<X> clazz, boolean readAnnotations) + { + super(clazz, readAnnotations); + javaClass = clazz; + for (Constructor<?> c : clazz.getConstructors()) + { + constructors.add(new NewAnnotatedConstructor<X>(this, c, readAnnotations)); + } + for (Method m : clazz.getMethods()) + { + NewAnnotatedMethod<X> met = new NewAnnotatedMethod<X>(this, m, readAnnotations); + methods.add(met); + methodMap.put(m, met); + } + for (Field f : clazz.getFields()) + { + NewAnnotatedField<X> b = new NewAnnotatedField<X>(this, f, readAnnotations); + fields.add(b); + fieldMap.put(f, b); + } + + } + + /** + * clears all existing annotation data from a type + */ + @Override + public void clearAllAnnotations() + { + super.clearAllAnnotations(); + for (AbstractNewAnnotatedElement c : constructors) + { + c.clearAllAnnotations(); + } + for (AbstractNewAnnotatedElement c : fields) + { + c.clearAllAnnotations(); + } + for (AbstractNewAnnotatedElement c : methods) + { + c.clearAllAnnotations(); + } + } + + public Set<AnnotatedConstructor<X>> getConstructors() + { + return (Set) Collections.unmodifiableSet(constructors); + } + + public Set<AnnotatedField<? super X>> getFields() + { + return (Set) Collections.unmodifiableSet(fields); + } + + public Class<X> getJavaClass() + { + return javaClass; + } + + public Set<AnnotatedMethod<? super X>> getMethods() + { + return (Set) Collections.unmodifiableSet(methods); + } + + public NewAnnotatedField<X> getField(Field field) + { + return fieldMap.get(field); + } + + public NewAnnotatedMethod<X> getMethod(Method m) + { + return methodMap.get(m); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/NewAnnotatedType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/TypeStore.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/TypeStore.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/TypeStore.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,45 @@ +package org.jboss.weld.extensions.util.annotated; + +import java.lang.reflect.Type; +import java.util.HashSet; +import java.util.Set; + +/** + * + * @author Stuart Douglas + * + */ +class TypeStore +{ + + final Set<Type> types = new HashSet<Type>(); + + public void add(Class<?> beanType) + { + Class<?> c = beanType; + do + { + types.add(c); + c = c.getSuperclass(); + } + while (c != null); + for (Class<?> i : beanType.getInterfaces()) + { + types.add(i); + } + } + + public void addInterfaces(Class<?> beanType) + { + for (Class<?> i : beanType.getInterfaces()) + { + types.add(i); + } + } + + public Set<Type> getTypes() + { + return types; + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/annotated/TypeStore.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/AnnotationRedefinition.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationRedefinition.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/AnnotationRedefinition.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/AnnotationRedefinition.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,8 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.annotation.Annotation; + +public interface AnnotationRedefinition<X extends Annotation> +{ + public X redefine(X annotation, Reannotated reannotated); +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/AnnotationRedefinition.java ___________________________________________________________________ Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/Reannotated.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/Reannotated.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/Reannotated.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/Reannotated.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,158 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.AbstractSet; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.enterprise.inject.spi.Annotated; + +/** + * This class is not thread-safe, and the client must provide any synchronization needed + * + * @author Gavin King + * @author Pete Muir + * + * + */ +public abstract class Reannotated implements Annotated +{ + + private static class AnnotationSet extends AbstractSet<Annotation> + { + + List<Annotation> list = new ArrayList<Annotation>(); + + AnnotationSet(Map<Class<? extends Annotation>, Annotation> annotations, Set<Annotation> delegateAnnotations) + { + list.addAll(annotations.values()); + for (Annotation ann : delegateAnnotations) + { + if (!annotations.containsKey(ann.annotationType())) + { + list.add(ann); + } + } + } + + @Override + public Iterator<Annotation> iterator() + { + return list.iterator(); + } + + @Override + public int size() + { + return list.size(); + } + + } + + + protected abstract Annotated delegate(); + + private final Map<Class<? extends Annotation>, Annotation> annotations; + + public Reannotated() + { + this.annotations = new HashMap<Class<? extends Annotation>, Annotation>(); + } + + public <X extends Annotation> void redefine(Class<X> annotationType, AnnotationRedefinition<X> visitor) + { + if (isAnnotationPresent(annotationType)) + { + X redefined = visitor.redefine(getAnnotation(annotationType), this); + if (redefined == null) + { + annotations.remove(annotationType); + } + else + { + annotations.put(annotationType, redefined); + } + } + } + + /* + * public void undefine(Class<? extends Annotation> annotationType) { + * annotations.put(annotationType, null); } + */ + + public void define(Annotation ann) + { + annotations.put(ann.annotationType(), ann); + } + + public boolean isAnnotationWithMetatypePresent(Class<? extends Annotation> metaannotationType) + { + for (Annotation ann : getAnnotations()) + { + if (ann.annotationType().isAnnotationPresent(metaannotationType)) + { + return true; + } + } + return false; + } + + public Set<Annotation> getAnnotationsWithMetatype(Class<? extends Annotation> metaannotationType) + { + Set<Annotation> set = new HashSet<Annotation>(); + for (Annotation ann : getAnnotations()) + { + if (ann.annotationType().isAnnotationPresent(metaannotationType)) + { + set.add(ann); + } + } + return set; + } + + public abstract Class<?> getJavaClass(); + + public <T extends Annotation> T getAnnotation(Class<T> annotationType) + { + if (annotationType == null) + { + throw new IllegalArgumentException("annotationType argument must not be null"); + } + Annotation ann = annotations.get(annotationType); + if (ann != null) + { + return annotationType.cast(ann); + } + else + { + return delegate().getAnnotation(annotationType); + } + } + + public Set<Annotation> getAnnotations() + { + return new AnnotationSet(annotations, delegate().getAnnotations()); + } + + public Type getBaseType() + { + return delegate().getBaseType(); + } + + public Set<Type> getTypeClosure() + { + return delegate().getTypeClosure(); + } + + public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) + { + return annotations.containsKey(annotationType) || delegate().isAnnotationPresent(annotationType); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/Reannotated.java ___________________________________________________________________ Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedCallable.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedCallable.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedCallable.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedCallable.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,60 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.List; + +import javax.enterprise.inject.spi.AnnotatedCallable; +import javax.enterprise.inject.spi.AnnotatedParameter; + +/** + * This implementation of {@link AnnotatedCallable} is not threadsafe and any synchronization should be performed by the client + * + * @author Gavin King + * @author Pete Muir + * + * @param <X> + */ +public abstract class ReannotatedCallable<X> extends ReannotatedMember<X> implements AnnotatedCallable<X> +{ + + private final List<ReannotatedParameter<X>> parameters = new ArrayList<ReannotatedParameter<X>>(); + + public ReannotatedCallable(ReannotatedType<X> declaringType, List<AnnotatedParameter<X>> params) + { + super(declaringType); + for (AnnotatedParameter<X> param : params) + { + parameters.add(new ReannotatedParameter<X>(param, this, param.getPosition())); + } + } + + @Override + protected abstract AnnotatedCallable<X> delegate(); + + public List<AnnotatedParameter<X>> getParameters() + { + return new ArrayList<AnnotatedParameter<X>>(parameters); + } + + public ReannotatedParameter<X> getParameter(int pos) + { + return parameters.get(pos); + } + + public <Y extends Annotation> void redefineParameters(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + for (ReannotatedParameter<X> param : parameters) + { + param.redefine(annotationType, visitor); + } + } + + @Override + public <Y extends Annotation> void redefineAll(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + redefine(annotationType, visitor); + redefineParameters(annotationType, visitor); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedCallable.java ___________________________________________________________________ Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedConstructor.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedConstructor.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedConstructor.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedConstructor.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,43 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.reflect.Constructor; + +import javax.enterprise.inject.spi.AnnotatedConstructor; + +/** + * This implementation of {@link AnnotatedConstructor} is not threadsafe and any synchronization must be performed by the client + * + * @author Gavin King + * + * @param <X> + */ +public class ReannotatedConstructor<X> extends ReannotatedCallable<X> implements AnnotatedConstructor<X> +{ + + private final AnnotatedConstructor<X> constructor; + + ReannotatedConstructor(ReannotatedType<X> declaringType, AnnotatedConstructor<X> constructor) + { + super(declaringType, constructor.getParameters()); + this.constructor = constructor; + } + + @Override + protected AnnotatedConstructor<X> delegate() + { + return constructor; + } + + @Override + public Constructor<X> getJavaMember() + { + return constructor.getJavaMember(); + } + + @Override + public boolean isStatic() + { + return constructor.isStatic(); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedConstructor.java ___________________________________________________________________ Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedField.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedField.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedField.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedField.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,50 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Field; + +import javax.enterprise.inject.spi.AnnotatedField; + +/** + * This implementation of {@link AnnotatedField} is not threadsafe and any synchronization must be performed by the client + * + * @author Gavin King + * + * @param <X> + */ +public class ReannotatedField<X> extends ReannotatedMember<X> implements AnnotatedField<X> +{ + + private final AnnotatedField<X> field; + + ReannotatedField(ReannotatedType<X> declaringType, AnnotatedField<X> field) + { + super(declaringType); + this.field = field; + } + + @Override + protected AnnotatedField<X> delegate() + { + return field; + } + + @Override + public Field getJavaMember() + { + return field.getJavaMember(); + } + + @Override + public boolean isStatic() + { + return field.isStatic(); + } + + @Override + public <Y extends Annotation> void redefineAll(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + redefine(annotationType, visitor); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedField.java ___________________________________________________________________ Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMember.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMember.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMember.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMember.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,51 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Member; + +import javax.enterprise.inject.spi.AnnotatedMember; + +/** + * This implementation of {@link AnnotatedMember} is not threadsafe and any synchronization must be performed by the client + * + * @author Gavin King + * + * @param <X> + */ +public abstract class ReannotatedMember<X> extends Reannotated implements AnnotatedMember<X> +{ + + private final ReannotatedType<X> declaringType; + + ReannotatedMember(ReannotatedType<X> declaringType) + { + this.declaringType = declaringType; + } + + public ReannotatedType<X> getDeclaringType() + { + return declaringType; + } + + @Override + protected abstract AnnotatedMember<X> delegate(); + + public Member getJavaMember() + { + return delegate().getJavaMember(); + } + + public boolean isStatic() + { + return delegate().isStatic(); + } + + @Override + public Class<?> getJavaClass() + { + return getJavaMember().getDeclaringClass(); + } + + public abstract <Y extends Annotation> void redefineAll(Class<Y> annotationType, AnnotationRedefinition<Y> visitor); + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMember.java ___________________________________________________________________ Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMethod.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedMethod.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMethod.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMethod.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,43 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.reflect.Method; + +import javax.enterprise.inject.spi.AnnotatedMethod; + +/** + * This implementation of {@link AnnotatedMethod} is not threadsafe and any synchronization must be performed by the client + * + * @author Gavin King + * + * @param <X> + */ +public class ReannotatedMethod<X> extends ReannotatedCallable<X> implements AnnotatedMethod<X> +{ + + private final AnnotatedMethod<X> method; + + ReannotatedMethod(ReannotatedType<X> declaringType, AnnotatedMethod<X> method) + { + super(declaringType, method.getParameters()); + this.method = method; + } + + @Override + protected AnnotatedMethod<X> delegate() + { + return method; + } + + @Override + public Method getJavaMember() + { + return method.getJavaMember(); + } + + @Override + public boolean isStatic() + { + return method.isStatic(); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedMethod.java ___________________________________________________________________ Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedParameter.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedParameter.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedParameter.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedParameter.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,60 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Member; +import java.lang.reflect.Method; + +import javax.enterprise.inject.spi.AnnotatedParameter; + +/** + * This implementation of {@link AnnotatedParameter} is not threadsafe and any synchronization must be performed by the client + * + * @author Gavin King + * + * @param <X> + */ +public class ReannotatedParameter<X> extends Reannotated implements AnnotatedParameter<X> +{ + + private final AnnotatedParameter<X> parameter; + private final ReannotatedCallable<X> callable; + private final int pos; + + public ReannotatedParameter(AnnotatedParameter<X> parameter, ReannotatedCallable<X> callable, int pos) + { + this.parameter = parameter; + this.callable = callable; + this.pos = pos; + } + + @Override + protected AnnotatedParameter<X> delegate() + { + return parameter; + } + + public ReannotatedCallable<X> getDeclaringCallable() + { + return callable; + } + + public int getPosition() + { + return pos; + } + + @Override + public Class<?> getJavaClass() + { + Member member = callable.getJavaMember(); + if (member instanceof Method) + { + return Method.class.cast(member).getParameterTypes()[pos]; + } + else + { + return Constructor.class.cast(member).getParameterTypes()[pos]; + } + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedParameter.java ___________________________________________________________________ Name: svn:eol-style + native Copied: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedType.java (from rev 5183, extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/ReannotatedType.java) =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedType.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedType.java 2009-12-02 12:08:07 UTC (rev 5190) @@ -0,0 +1,239 @@ +package org.jboss.weld.extensions.util.reannotated; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.lang.reflect.Member; +import java.lang.reflect.Method; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import javax.enterprise.inject.spi.AnnotatedConstructor; +import javax.enterprise.inject.spi.AnnotatedField; +import javax.enterprise.inject.spi.AnnotatedMember; +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedType; + +/** + * This implementation of {@link AnnotatedType} is not threadsafe and any synchronization must be performed by the client + * + * @author Gavin King + * + * @param <X> + */ +public class ReannotatedType<X> extends Reannotated implements AnnotatedType<X> +{ + + private final AnnotatedType<X> type; + private final HashMap<Class<?>, ReannotatedType<?>> types; + + private final Map<Member, ReannotatedField<? super X>> fields; + private final Map<Member, ReannotatedMethod<? super X>> methods; + private final Map<Member, ReannotatedConstructor<X>> constructors; + + public ReannotatedType(AnnotatedType<X> type) + { + this(type, new HashMap<Class<?>, ReannotatedType<?>>()); + } + + public ReannotatedType(AnnotatedType<X> type, HashMap<Class<?>, ReannotatedType<?>> types) + { + this.type = type; + this.types = types; + + fields = new HashMap<Member, ReannotatedField<? super X>>(); + methods = new HashMap<Member, ReannotatedMethod<? super X>>(); + constructors = new HashMap<Member, ReannotatedConstructor<X>>(); + + for (AnnotatedField<? super X> field : type.getFields()) + { + addField(field); + } + for (AnnotatedMethod<? super X> method : type.getMethods()) + { + addMethod(method); + } + for (AnnotatedConstructor<X> constructor : type.getConstructors()) + { + addConstructor(constructor); + } + } + + private <Y> ReannotatedType<Y> getDeclaringType(AnnotatedMember<Y> member) + { + return getSupertype(member.getDeclaringType()); + } + + @SuppressWarnings("unchecked") + private <Y> ReannotatedType<Y> getSupertype(AnnotatedType<Y> supertype) + { + Class<Y> memberJavaClass = supertype.getJavaClass(); + if (memberJavaClass == type.getJavaClass()) + { + return (ReannotatedType<Y>) this; + } + else + { + ReannotatedType<Y> result = (ReannotatedType<Y>) types.get(memberJavaClass); + if (result == null) + { + result = new ReannotatedType<Y>(supertype, types); + types.put(memberJavaClass, result); + } + return result; + } + } + + private void addConstructor(AnnotatedConstructor<X> constructor) + { + constructors.put(constructor.getJavaMember(), new ReannotatedConstructor<X>(this, constructor)); + } + + @SuppressWarnings("unchecked") + private void addMethod(AnnotatedMethod<? super X> method) + { + Class<? super X> methodJavaClass = method.getDeclaringType().getJavaClass(); + if (methodJavaClass.isAssignableFrom(type.getJavaClass())) + { + final ReannotatedMethod<? super X> reannotated; + if (methodJavaClass == type.getJavaClass()) + { + reannotated = new ReannotatedMethod(getDeclaringType(method), method); + } + else + { + reannotated = getInheritedMethod(method); + } + methods.put(method.getJavaMember(), reannotated); + } + } + + @SuppressWarnings("unchecked") + private void addField(AnnotatedField<? super X> field) + { + Class<? super X> fieldJavaClass = field.getDeclaringType().getJavaClass(); + final ReannotatedField<? super X> reannotated; + if (fieldJavaClass.isAssignableFrom(type.getJavaClass())) + { + if (fieldJavaClass == type.getJavaClass()) + { + reannotated = new ReannotatedField(getDeclaringType(field), field); + } + else + { + reannotated = getInheritedField(field); + } + fields.put(field.getJavaMember(), reannotated); + } + } + + private <Y> ReannotatedField<? super Y> getInheritedField(AnnotatedField<Y> field) + { + return getDeclaringType(field).getField(field.getJavaMember()); + } + + private <Y> ReannotatedMethod<? super Y> getInheritedMethod(AnnotatedMethod<Y> method) + { + return getDeclaringType(method).getMethod(method.getJavaMember()); + } + + @Override + protected AnnotatedType<X> delegate() + { + return type; + } + + public Set<AnnotatedConstructor<X>> getConstructors() + { + return new HashSet<AnnotatedConstructor<X>>(constructors.values()); + } + + public Set<AnnotatedMethod<? super X>> getMethods() + { + return new HashSet<AnnotatedMethod<? super X>>(methods.values()); + } + + public Set<AnnotatedField<? super X>> getFields() + { + return new HashSet<AnnotatedField<? super X>>(fields.values()); + } + + public ReannotatedConstructor<X> getConstructor(Constructor<X> constructor) + { + return constructors.get(constructor); + } + + public ReannotatedMethod<? super X> getMethod(Method constructor) + { + return methods.get(constructor); + } + + public ReannotatedField<? super X> getField(Field field) + { + return fields.get(field); + } + + public <Y extends Annotation> void redefineConstructors(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + for (ReannotatedConstructor<X> constructor : constructors.values()) + { + constructor.redefine(annotationType, visitor); + } + } + + public <Y extends Annotation> void redefineMethods(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + for (ReannotatedMethod<? super X> method : methods.values()) + { + method.redefine(annotationType, visitor); + } + } + + public <Y extends Annotation> void redefineFields(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + for (ReannotatedField<? super X> field : fields.values()) + { + field.redefine(annotationType, visitor); + } + } + + public <Y extends Annotation> void redefineMembers(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + redefineFields(annotationType, visitor); + redefineMethods(annotationType, visitor); + redefineConstructors(annotationType, visitor); + } + + public <Y extends Annotation> void redefineMembersAndParameters(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + redefineMembers(annotationType, visitor); + redefineParameters(annotationType, visitor); + } + + public <Y extends Annotation> void redefineParameters(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + for (ReannotatedMethod<? super X> method : methods.values()) + { + method.redefineParameters(annotationType, visitor); + } + for (ReannotatedConstructor<X> constructor : constructors.values()) + { + constructor.redefineParameters(annotationType, visitor); + } + } + + public <Y extends Annotation> void redefineAll(Class<Y> annotationType, AnnotationRedefinition<Y> visitor) + { + redefine(annotationType, visitor); + redefineMembersAndParameters(annotationType, visitor); + } + + @Override + public Class<X> getJavaClass() + { + return type.getJavaClass(); + } + +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/reannotated/ReannotatedType.java ___________________________________________________________________ Name: svn:eol-style + native

16 years, 4 months

1
0
0 / 0

Weld SVN: r5189 - in extensions/trunk/core/src: test/java/org/jboss/weld/test and 2 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-12-02 06:39:20 -0500 (Wed, 02 Dec 2009) New Revision: 5189 Added: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/ extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/ extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotatedClass.java extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotationInstanceProviderTest.java extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/IntMemberAnnotation.java extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/MultipleMembers.java extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/SimpleAnnotation.java Modified: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java Log: WELDX-53, thanks to Stuart Douglas Modified: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java 2009-12-02 11:27:44 UTC (rev 5188) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java 2009-12-02 11:39:20 UTC (rev 5189) @@ -86,44 +86,50 @@ else { Object val = valueMap.get(method.getName()); - if (val != null) + Class<?> r = method.getReturnType(); + val = performTypeCoercion(val, r); + return val; + } + + } + + private Object performTypeCoercion(Object val, Class<?> type) + { + if (val != null) + { + if (Integer.class.isAssignableFrom(type) || type == int.class) { - Class r = method.getReturnType(); - if (Integer.class.isAssignableFrom(r) || r == int.class) + return ((Number) val).intValue(); + } + else if (Long.class.isAssignableFrom(type) || type == long.class) + { + return ((Number) val).longValue(); + } + else if (Short.class.isAssignableFrom(type) || type == short.class) + { + return ((Number) val).shortValue(); + } + else if (Byte.class.isAssignableFrom(type) || type == byte.class) + { + return ((Number) val).byteValue(); + } + else if (Double.class.isAssignableFrom(type) || type == double.class) + { + return ((Number) val).doubleValue(); + } + else if (Float.class.isAssignableFrom(type) || type == float.class) + { + return ((Number) val).floatValue(); + } + else if (Character.class.isAssignableFrom(type) || type == char.class) + { + if (String.class.isAssignableFrom(val.getClass())) { - val = ((Number) val).intValue(); + return val.toString().charAt(0); } - else if (Long.class.isAssignableFrom(r) || r == long.class) - { - val = ((Number) val).longValue(); - } - else if (Short.class.isAssignableFrom(r) || r == short.class) - { - val = ((Number) val).shortValue(); - } - else if (Byte.class.isAssignableFrom(r) || r == byte.class) - { - val = ((Number) val).shortValue(); - } - else if (Double.class.isAssignableFrom(r) || r == double.class) - { - val = ((Number) val).doubleValue(); - } - else if (Float.class.isAssignableFrom(r) || r == float.class) - { - val = ((Number) val).floatValue(); - } - else if (Character.class.isAssignableFrom(r) || r == char.class) - { - if (String.class.isAssignableFrom(val.getClass())) - { - val = val.toString().charAt(0); - } - } } - return val; } - + return val; } @Override @@ -134,7 +140,7 @@ for (int i = 0; i < members.length; i++) { string.append(members[i].getName()).append('='); - Object value = invoke(members[i], this); + Object value = performTypeCoercion(valueMap.get(members[i].getName()), members[i].getReturnType()); if (value instanceof boolean[]) { appendInBraces(string, Arrays.toString((boolean[]) value)); @@ -226,7 +232,7 @@ { for (Method member : members) { - Object thisValue = valueMap.get(member.getName()); + Object thisValue = performTypeCoercion(valueMap.get(member.getName()), member.getReturnType()); Object thatValue = invoke(member, that); if (thisValue instanceof byte[] && thatValue instanceof byte[]) { @@ -276,7 +282,9 @@ else { if (!thisValue.equals(thatValue)) + { return false; + } } } return true; @@ -292,7 +300,7 @@ for (Method member : members) { int memberNameHashCode = 127 * member.getName().hashCode(); - Object value = valueMap.get(member.getName()); + Object value = performTypeCoercion(valueMap.get(member.getName()), member.getReturnType()); int memberValueHashCode; if (value instanceof boolean[]) { Added: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotatedClass.java =================================================================== --- extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotatedClass.java (rev 0) +++ extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotatedClass.java 2009-12-02 11:39:20 UTC (rev 5189) @@ -0,0 +1,9 @@ +package org.jboss.weld.test.extensions.util; + +@SimpleAnnotation +@IntMemberAnnotation(someMember = 0, value = 1) +@MultipleMembers(booleanMember = true, byteMember = 1, charMember = 'c', doubleMember = 0, floatMember = 0, intMember = 1, intArrayMember = { 0, 1 }, longMember = 1, shortMember = 1) +public class AnnotatedClass +{ + +} Property changes on: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotatedClass.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotationInstanceProviderTest.java =================================================================== --- extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotationInstanceProviderTest.java (rev 0) +++ extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotationInstanceProviderTest.java 2009-12-02 11:39:20 UTC (rev 5189) @@ -0,0 +1,90 @@ +package org.jboss.weld.test.extensions.util; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + +import org.jboss.weld.extensions.util.AnnotationInstanceProvider; +import org.testng.annotations.Test; + +/** + * Test of dynamic annotation creation + * + * @author Stuart Douglas + * + */ +public class AnnotationInstanceProviderTest +{ + + /** + * basic test to make sure the annotation creator can create an annotation + */ + @Test + public void testSimpleAnnotationCreation() + { + AnnotationInstanceProvider provider = new AnnotationInstanceProvider(); + SimpleAnnotation an = provider.get(SimpleAnnotation.class, Collections.<String, Object>emptyMap()); + assert an != null : "Annotation was null"; + assert an.annotationType() == SimpleAnnotation.class : "Annotation returned wrong result for annotationType()"; + SimpleAnnotation realAn = AnnotatedClass.class.getAnnotation(SimpleAnnotation.class); + assert an.equals(realAn) : "Equality between declared annotation failed"; + } + + /** + * Test with int members + */ + @Test + public void testIntMemberAnnotationCreation() + { + AnnotationInstanceProvider provider = new AnnotationInstanceProvider(); + Map<String, Object> values = new HashMap<String, Object>(); + values.put("value", Long.valueOf(1)); + values.put("someMember", Integer.valueOf(0)); + IntMemberAnnotation an = provider.get(IntMemberAnnotation.class, values); + assert an != null : "Annotation was null"; + assert an.annotationType() == IntMemberAnnotation.class : "Annotation returned wrong result for annotationType()"; + IntMemberAnnotation realAn = AnnotatedClass.class.getAnnotation(IntMemberAnnotation.class); + assert an.equals(realAn) : "Equality between declared annotation failed"; + } + + /** + * Test with int members + */ + @Test + public void testNotEqualIntMemberAnnotationCreation() + { + AnnotationInstanceProvider provider = new AnnotationInstanceProvider(); + Map<String, Object> values = new HashMap<String, Object>(); + values.put("value", Long.valueOf(6)); + values.put("someMember", Integer.valueOf(0)); + IntMemberAnnotation an = provider.get(IntMemberAnnotation.class, values); + assert an != null : "Annotation was null"; + assert an.annotationType() == IntMemberAnnotation.class : "Annotation returned wrong result for annotationType()"; + IntMemberAnnotation realAn = AnnotatedClass.class.getAnnotation(IntMemberAnnotation.class); + assert !an.equals(realAn) : "Equality between declared annotation failed, annotations were not equal but equals returned true"; + } + + /** + * Test with multiple members + */ + @Test + public void testMultipleMemberAnnotationCreation() + { + AnnotationInstanceProvider provider = new AnnotationInstanceProvider(); + Map<String, Object> values = new HashMap<String, Object>(); + values.put("intMember", 1); + values.put("longMember", 1); + values.put("shortMember", 1); + values.put("floatMember", 0); + values.put("doubleMember", 0); + values.put("byteMember", ((byte) 1)); + values.put("charMember", 'c'); + values.put("booleanMember", true); + values.put("intArrayMember", new int[] { 0, 1 }); + MultipleMembers an = provider.get(MultipleMembers.class, values); + assert an != null : "Annotation was null"; + assert an.annotationType() == MultipleMembers.class : "Annotation returned wrong result for annotationType()"; + MultipleMembers realAn = AnnotatedClass.class.getAnnotation(MultipleMembers.class); + assert an.equals(realAn) : "Equality between declared annotation failed"; + } +} Property changes on: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/AnnotationInstanceProviderTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/IntMemberAnnotation.java =================================================================== --- extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/IntMemberAnnotation.java (rev 0) +++ extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/IntMemberAnnotation.java 2009-12-02 11:39:20 UTC (rev 5189) @@ -0,0 +1,12 @@ +package org.jboss.weld.test.extensions.util; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +(a)Retention(RetentionPolicy.RUNTIME) +public @interface IntMemberAnnotation +{ + int value(); + + int someMember(); +} Property changes on: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/IntMemberAnnotation.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/MultipleMembers.java =================================================================== --- extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/MultipleMembers.java (rev 0) +++ extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/MultipleMembers.java 2009-12-02 11:39:20 UTC (rev 5189) @@ -0,0 +1,26 @@ +package org.jboss.weld.test.extensions.util; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +(a)Retention(RetentionPolicy.RUNTIME) +public @interface MultipleMembers +{ + int intMember(); + + long longMember(); + + short shortMember(); + + float floatMember(); + + double doubleMember(); + + byte byteMember(); + + char charMember(); + + boolean booleanMember(); + + int[] intArrayMember(); +} Property changes on: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/MultipleMembers.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/SimpleAnnotation.java =================================================================== --- extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/SimpleAnnotation.java (rev 0) +++ extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/SimpleAnnotation.java 2009-12-02 11:39:20 UTC (rev 5189) @@ -0,0 +1,10 @@ +package org.jboss.weld.test.extensions.util; + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +(a)Retention(RetentionPolicy.RUNTIME) +public @interface SimpleAnnotation +{ + +} Property changes on: extensions/trunk/core/src/test/java/org/jboss/weld/test/extensions/util/SimpleAnnotation.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native

16 years, 4 months

1
0
0 / 0

Weld SVN: r5188 - extensions/trunk/core/src/test/java/org/jboss.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-12-02 06:27:44 -0500 (Wed, 02 Dec 2009) New Revision: 5188 Removed: extensions/trunk/core/src/test/java/org/jboss/webbeans/ Log: cleanup

16 years, 4 months

1
0
0 / 0

Weld SVN: r5187 - doc/trunk/reference/en-US.

by weld-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2009-12-01 19:27:01 -0500 (Tue, 01 Dec 2009) New Revision: 5187 Modified: doc/trunk/reference/en-US/resources.xml Log: more explanation Modified: doc/trunk/reference/en-US/resources.xml =================================================================== --- doc/trunk/reference/en-US/resources.xml 2009-12-02 00:02:39 UTC (rev 5186) +++ doc/trunk/reference/en-US/resources.xml 2009-12-02 00:27:01 UTC (rev 5187) @@ -30,6 +30,26 @@ <section> <title>Defining a resource</title> + <para>The CDI specification uses the term <emphasis>resource</emphasis> to refer, generically, to any of + the following kinds of object which might be available in the Java EE component environment:</para> + + <itemizedlist> + <listitem> + <para>JDBC <literal>Datasource</literal>s, JMS <literal>Queue</literal>s, <literal>Topic</literal>s + and <literal>ConnectionFactory</literal>s, JavaMail <literal>Session</literal>s and other transactional + resources including JCA connectors,</para> + </listitem> + <listitem> + <para>JPA <literal>EntityManager</literal>s and <literal>EntityManagerFactory</literal>s,</para> + </listitem> + <listitem> + <para>remote EJBs, and</para> + </listitem> + <listitem> + <para>web services</para> + </listitem> + </itemizedlist> + <para>We declare a resource by annotating a producer field with a component environment injection annotation: <literal>@Resource</literal>, <literal>@EJB</literal>, <literal>@PersistenceContext</literal>, <literal>@PersistenceUnit</literal> or <literal>@WebServiceRef</literal>.</para> @@ -51,9 +71,23 @@ <para>The field may be static (but not final).</para> - <para>It might feel strange to be declaring resources in Java code. Isn't this stuff that might be - deployment-specific? Certainly, and that's why it makes sense to declare your resources in a class - annotated <literal>@Alternative</literal>.</para> + <para>A resource declaration really contains two pieces of information:</para> + + <itemizedlist> + <listitem> + <para>the JNDI name, EJB link, persistence unit name, or other metadata needed to obtain a + reference to the resource from the component environment, and</para> + </listitem> + <listitem> + <para>the type and qualifiers that we will use to inject the reference into our beans.</para> + </listitem> + </itemizedlist> + + <tip> + <para>It might feel strange to be declaring resources in Java code. Isn't this stuff that might be + deployment-specific? Certainly, and that's why it makes sense to declare your resources in a class + annotated <literal>@Alternative</literal>.</para> + </tip> </section>

16 years, 4 months

1
0
0 / 0

Weld SVN: r5186 - doc/trunk/reference/en-US.

by weld-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2009-12-01 19:02:39 -0500 (Tue, 01 Dec 2009) New Revision: 5186 Modified: doc/trunk/reference/en-US/resources.xml Log: grammar Modified: doc/trunk/reference/en-US/resources.xml =================================================================== --- doc/trunk/reference/en-US/resources.xml 2009-12-01 15:51:23 UTC (rev 5185) +++ doc/trunk/reference/en-US/resources.xml 2009-12-02 00:02:39 UTC (rev 5186) @@ -53,7 +53,7 @@ <para>It might feel strange to be declaring resources in Java code. Isn't this stuff that might be deployment-specific? Certainly, and that's why it makes sense to declare your resources in a class - annotation <literal>@Alternative</literal>.</para> + annotated <literal>@Alternative</literal>.</para> </section>

16 years, 4 months

1
0
0 / 0

Weld SVN: r5185 - in archetypes/trunk: jsf/jee and 2 other directories.

by weld-commits＠lists.jboss.org

Author: sboscarine Date: 2009-12-01 10:51:23 -0500 (Tue, 01 Dec 2009) New Revision: 5185 Modified: archetypes/trunk/jsf/jee-minimal/pom.xml archetypes/trunk/jsf/jee/pom.xml archetypes/trunk/jsf/servlet-minimal/pom.xml archetypes/trunk/pom.xml Log: updated version number Modified: archetypes/trunk/jsf/jee/pom.xml =================================================================== --- archetypes/trunk/jsf/jee/pom.xml 2009-12-01 13:51:33 UTC (rev 5184) +++ archetypes/trunk/jsf/jee/pom.xml 2009-12-01 15:51:23 UTC (rev 5185) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>0.0.2-SNAPSHOT</version> + <version>1.0.0-BETA-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/jsf/jee-minimal/pom.xml =================================================================== --- archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-01 13:51:33 UTC (rev 5184) +++ archetypes/trunk/jsf/jee-minimal/pom.xml 2009-12-01 15:51:23 UTC (rev 5185) @@ -4,7 +4,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>0.0.2-SNAPSHOT</version> + <version>1.0.0-BETA-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/jsf/servlet-minimal/pom.xml =================================================================== --- archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-01 13:51:33 UTC (rev 5184) +++ archetypes/trunk/jsf/servlet-minimal/pom.xml 2009-12-01 15:51:23 UTC (rev 5185) @@ -5,7 +5,7 @@ <parent> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>0.0.2-SNAPSHOT</version> + <version>1.0.0-BETA-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> Modified: archetypes/trunk/pom.xml =================================================================== --- archetypes/trunk/pom.xml 2009-12-01 13:51:33 UTC (rev 5184) +++ archetypes/trunk/pom.xml 2009-12-01 15:51:23 UTC (rev 5185) @@ -27,7 +27,7 @@ </repositories> <groupId>org.jboss.weld.archetypes</groupId> <artifactId>weld-archetype-parent</artifactId> - <version>0.0.2-SNAPSHOT</version> + <version>1.0.0-BETA-SNAPSHOT</version> <packaging>pom</packaging> <name>Weld Archetypes</name>

16 years, 4 months

1
0
0 / 0

Weld SVN: r5184 - core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-12-01 08:51:33 -0500 (Tue, 01 Dec 2009) New Revision: 5184 Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java Log: WELD-316 Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java 2009-12-01 13:26:57 UTC (rev 5183) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/InjectionPointTest.java 2009-12-01 13:51:33 UTC (rev 5184) @@ -1,6 +1,7 @@ package org.jboss.weld.tests.injectionPoint; import javax.enterprise.inject.IllegalProductException; +import javax.enterprise.inject.spi.InjectionPoint; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.weld.test.AbstractWeldTest; @@ -24,5 +25,16 @@ assert e.getMessage().contains("Injection Point: field org.jboss.weld.tests.injectionPoint.DoubleGenerator.timer"); } } + + @Test(description="WELD-316") + public void testFieldInjectionPointSerializability() throws Throwable + { + getCurrentManager().getInstanceByType(StringConsumer.class).ping(); + InjectionPoint ip = StringGenerator.getInjectionPoint(); + assert ip != null; + assert ip.getMember().getName().equals("str"); + InjectionPoint ip1 = deserialize(serialize(ip)); + assert ip1.getMember().getName().equals("str"); + } } Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java 2009-12-01 13:51:33 UTC (rev 5184) @@ -0,0 +1,12 @@ +package org.jboss.weld.tests.injectionPoint; + +import javax.inject.Inject; + +public class StringConsumer +{ + + @Inject String str; + + public void ping() {} + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringConsumer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java (rev 0) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java 2009-12-01 13:51:33 UTC (rev 5184) @@ -0,0 +1,27 @@ +package org.jboss.weld.tests.injectionPoint; + +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.InjectionPoint; + +public class StringGenerator +{ + + private static InjectionPoint injectionPoint; + + public static InjectionPoint getInjectionPoint() + { + return injectionPoint; + } + + public static void reset() + { + injectionPoint = null; + } + + @Produces String getString(InjectionPoint ip) + { + injectionPoint = ip; + return ""; + } + +} Property changes on: core/trunk/tests/src/test/java/org/jboss/weld/tests/injectionPoint/StringGenerator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native

16 years, 4 months

1
0
0 / 0

Weld SVN: r5183 - extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-12-01 08:26:57 -0500 (Tue, 01 Dec 2009) New Revision: 5183 Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInstanceProvider.java extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java Log: Add Stuart's dynamic annotation code Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInstanceProvider.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInstanceProvider.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInstanceProvider.java 2009-12-01 13:26:57 UTC (rev 5183) @@ -0,0 +1,79 @@ +package org.jboss.weld.extensions.util; + +import java.io.Serializable; +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Proxy; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +/** + * Provide an instance of an annotation with member values + * + * @author Stuart Douglas + * @author Pete Muir + * + */ +public class AnnotationInstanceProvider +{ + + protected final ConcurrentMap<Class<?>, Class<?>> cache; + + public AnnotationInstanceProvider() + { + cache = new ConcurrentHashMap<Class<?>, Class<?>>(); + } + + /** + * Returns an instance of the given annotation type with member values + * specified in the map. + */ + public <T extends Annotation> T get(Class<T> annotation, Map<String, Object> values) + { + if (annotation == null) + { + throw new IllegalArgumentException("Must specify an annotation"); + } + Class<?> clazz = cache.get(annotation); + // Not safe against data race, but doesn't matter, we can recompute and + // get the same value + if (clazz == null) + { + // create the proxy class + clazz = Proxy.getProxyClass(annotation.getClassLoader(), annotation, Serializable.class); + cache.put(annotation, clazz); + } + AnnotationInvocationHandler handler = new AnnotationInvocationHandler(values, annotation); + // create a new instance by obtaining the constructor via relection + try + { + return annotation.cast(clazz.getConstructor(new Class[] { InvocationHandler.class }).newInstance(new Object[] { handler })); + } + catch (IllegalArgumentException e) + { + throw new IllegalStateException("Error instantiating proxy for annotation. Annotation type: " + annotation, e); + } + catch (InstantiationException e) + { + throw new IllegalStateException("Error instantiating proxy for annotation. Annotation type: " + annotation, e); + } + catch (IllegalAccessException e) + { + throw new IllegalStateException("Error instantiating proxy for annotation. Annotation type: " + annotation, e); + } + catch (InvocationTargetException e) + { + throw new IllegalStateException("Error instantiating proxy for annotation. Annotation type: " + annotation, e.getCause()); + } + catch (SecurityException e) + { + throw new IllegalStateException("Error accessing proxy constructor for annotation. Annotation type: " + annotation, e); + } + catch (NoSuchMethodException e) + { + throw new IllegalStateException("Error accessing proxy constructor for annotation. Annotation type: " + annotation, e); + } + } +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInstanceProvider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java =================================================================== --- extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java (rev 0) +++ extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java 2009-12-01 13:26:57 UTC (rev 5183) @@ -0,0 +1,373 @@ +package org.jboss.weld.extensions.util; + +import java.io.IOException; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.Arrays; +import java.util.Map; + +/** + * Class that handles the method calls for a java.lang.reflect.Proxy that + * implements an annotation. + * + * The generated handler takes a Map<String,Object> as a constructor argument + * with the keys equal to the annotation method names. For Annotation, array and + * Enum types the values must exactly match the return type or a + * ClassCastException will result. + * + * For character types the the value must be an instance of java.lang.Character + * or String. + * + * Numeric types do not have to match exactly, as they are converted using + * java.lang.Number's xxxValue methods. + * + * + * @author Stuart Douglas + * + */ +class AnnotationInvocationHandler implements InvocationHandler, Serializable +{ + + private static class SerializationProxy + { + private final Map<String, Object> valueMap; + private final Class<? extends Annotation> annotationType; + + private SerializationProxy(Map<String, Object> valueMap, Class<? extends Annotation> annotationType) + { + this.valueMap = valueMap; + this.annotationType = annotationType; + } + + private Object readResolve() throws ObjectStreamException + { + return new AnnotationInvocationHandler(valueMap, annotationType); + } + + } + + private static final long serialVersionUID = 4801508041776645033L; + + private final Map<String, Object> valueMap; + + private final Class<? extends Annotation> annotationType; + + private final Method[] members; + + AnnotationInvocationHandler(Map<String, Object> valueMap, Class<? extends Annotation> annotationType) + { + this.valueMap = valueMap; + this.annotationType = annotationType; + this.members = annotationType.getDeclaredMethods(); + } + + public Object invoke(Object proxy, Method method, Object[] args) throws Throwable + { + if (method.getName().equals("equals")) + { + return equals(args[0]); + } + else if (method.getName().equals("hashCode")) + { + return hashCode(); + } + else if (method.getName().equals("toString")) + { + return toString(); + } + else if (method.getName().equals("annotationType")) + { + return annotationType; + } + else + { + Object val = valueMap.get(method.getName()); + if (val != null) + { + Class r = method.getReturnType(); + if (Integer.class.isAssignableFrom(r) || r == int.class) + { + val = ((Number) val).intValue(); + } + else if (Long.class.isAssignableFrom(r) || r == long.class) + { + val = ((Number) val).longValue(); + } + else if (Short.class.isAssignableFrom(r) || r == short.class) + { + val = ((Number) val).shortValue(); + } + else if (Byte.class.isAssignableFrom(r) || r == byte.class) + { + val = ((Number) val).shortValue(); + } + else if (Double.class.isAssignableFrom(r) || r == double.class) + { + val = ((Number) val).doubleValue(); + } + else if (Float.class.isAssignableFrom(r) || r == float.class) + { + val = ((Number) val).floatValue(); + } + else if (Character.class.isAssignableFrom(r) || r == char.class) + { + if (String.class.isAssignableFrom(val.getClass())) + { + val = val.toString().charAt(0); + } + } + } + return val; + } + + } + + @Override + public String toString() + { + StringBuilder string = new StringBuilder(); + string.append('@').append(annotationType.getName()).append('('); + for (int i = 0; i < members.length; i++) + { + string.append(members[i].getName()).append('='); + Object value = invoke(members[i], this); + if (value instanceof boolean[]) + { + appendInBraces(string, Arrays.toString((boolean[]) value)); + } + else if (value instanceof byte[]) + { + appendInBraces(string, Arrays.toString((byte[]) value)); + } + else if (value instanceof short[]) + { + appendInBraces(string, Arrays.toString((short[]) value)); + } + else if (value instanceof int[]) + { + appendInBraces(string, Arrays.toString((int[]) value)); + } + else if (value instanceof long[]) + { + appendInBraces(string, Arrays.toString((long[]) value)); + } + else if (value instanceof float[]) + { + appendInBraces(string, Arrays.toString((float[]) value)); + } + else if (value instanceof double[]) + { + appendInBraces(string, Arrays.toString((double[]) value)); + } + else if (value instanceof char[]) + { + appendInBraces(string, Arrays.toString((char[]) value)); + } + else if (value instanceof String[]) + { + String[] strings = (String[]) value; + String[] quoted = new String[strings.length]; + for (int j = 0; j < strings.length; j++) + { + quoted[j] = "\"" + strings[j] + "\""; + } + appendInBraces(string, Arrays.toString(quoted)); + } + else if (value instanceof Class<?>[]) + { + Class<?>[] classes = (Class<?>[]) value; + String[] names = new String[classes.length]; + for (int j = 0; j < classes.length; j++) + { + names[j] = classes[j].getName() + ".class"; + } + appendInBraces(string, Arrays.toString(names)); + } + else if (value instanceof Object[]) + { + appendInBraces(string, Arrays.toString((Object[]) value)); + } + else if (value instanceof String) + { + string.append('"').append(value).append('"'); + } + else if (value instanceof Class<?>) + { + string.append(((Class<?>) value).getName()).append(".class"); + } + else + { + string.append(value); + } + if (i < members.length - 1) + { + string.append(", "); + } + } + return string.append(')').toString(); + } + + private void appendInBraces(StringBuilder buf, String s) + { + buf.append('{').append(s.substring(1, s.length() - 1)).append('}'); + } + + @Override + public boolean equals(Object other) + { + if (other instanceof Annotation) + { + Annotation that = (Annotation) other; + if (this.annotationType.equals(that.annotationType())) + { + for (Method member : members) + { + Object thisValue = valueMap.get(member.getName()); + Object thatValue = invoke(member, that); + if (thisValue instanceof byte[] && thatValue instanceof byte[]) + { + if (!Arrays.equals((byte[]) thisValue, (byte[]) thatValue)) + return false; + } + else if (thisValue instanceof short[] && thatValue instanceof short[]) + { + if (!Arrays.equals((short[]) thisValue, (short[]) thatValue)) + return false; + } + else if (thisValue instanceof int[] && thatValue instanceof int[]) + { + if (!Arrays.equals((int[]) thisValue, (int[]) thatValue)) + return false; + } + else if (thisValue instanceof long[] && thatValue instanceof long[]) + { + if (!Arrays.equals((long[]) thisValue, (long[]) thatValue)) + return false; + } + else if (thisValue instanceof float[] && thatValue instanceof float[]) + { + if (!Arrays.equals((float[]) thisValue, (float[]) thatValue)) + return false; + } + else if (thisValue instanceof double[] && thatValue instanceof double[]) + { + if (!Arrays.equals((double[]) thisValue, (double[]) thatValue)) + return false; + } + else if (thisValue instanceof char[] && thatValue instanceof char[]) + { + if (!Arrays.equals((char[]) thisValue, (char[]) thatValue)) + return false; + } + else if (thisValue instanceof boolean[] && thatValue instanceof boolean[]) + { + if (!Arrays.equals((boolean[]) thisValue, (boolean[]) thatValue)) + return false; + } + else if (thisValue instanceof Object[] && thatValue instanceof Object[]) + { + if (!Arrays.equals((Object[]) thisValue, (Object[]) thatValue)) + return false; + } + else + { + if (!thisValue.equals(thatValue)) + return false; + } + } + return true; + } + } + return false; + } + + @Override + public int hashCode() + { + int hashCode = 0; + for (Method member : members) + { + int memberNameHashCode = 127 * member.getName().hashCode(); + Object value = valueMap.get(member.getName()); + int memberValueHashCode; + if (value instanceof boolean[]) + { + memberValueHashCode = Arrays.hashCode((boolean[]) value); + } + else if (value instanceof short[]) + { + memberValueHashCode = Arrays.hashCode((short[]) value); + } + else if (value instanceof int[]) + { + memberValueHashCode = Arrays.hashCode((int[]) value); + } + else if (value instanceof long[]) + { + memberValueHashCode = Arrays.hashCode((long[]) value); + } + else if (value instanceof float[]) + { + memberValueHashCode = Arrays.hashCode((float[]) value); + } + else if (value instanceof double[]) + { + memberValueHashCode = Arrays.hashCode((double[]) value); + } + else if (value instanceof byte[]) + { + memberValueHashCode = Arrays.hashCode((byte[]) value); + } + else if (value instanceof char[]) + { + memberValueHashCode = Arrays.hashCode((char[]) value); + } + else if (value instanceof Object[]) + { + memberValueHashCode = Arrays.hashCode((Object[]) value); + } + else + { + memberValueHashCode = value.hashCode(); + } + hashCode += memberNameHashCode ^ memberValueHashCode; + } + return hashCode; + } + + private Object writeReplace() throws ObjectStreamException + { + return new SerializationProxy(valueMap, annotationType); + } + + private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException + { + throw new UnsupportedOperationException("Must use SerializationProxy"); + } + + private static Object invoke(Method method, Object instance) + { + try + { + if (!method.isAccessible()) + method.setAccessible(true); + return method.invoke(instance); + } + catch (IllegalArgumentException e) + { + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + catch (IllegalAccessException e) + { + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + catch (InvocationTargetException e) + { + throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e); + } + } +} Property changes on: extensions/trunk/core/src/main/java/org/jboss/weld/extensions/util/AnnotationInvocationHandler.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native

16 years, 4 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits December 2009