Update to a newer javax.inject api and tck, various small cleanups

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3824 1c488680-804c-0410-94cd-c6b725194a0e
weld · Sep 30, 2009 · e5797ca · e5797ca
1 parent d30ec9c
commit e5797ca
Show file tree

Hide file tree

Showing 26 changed files with 103 additions and 83 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -28,7 +28,7 @@
 
       <dependency>
          <groupId>javax.inject</groupId>
-         <artifactId>inject-api</artifactId>
+         <artifactId>javax.inject</artifactId>
       </dependency>
 	</dependencies>
 </project>
diff --git a/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java b/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java
@@ -877,7 +877,7 @@ public Object getReference(Bean<?> bean, CreationalContext<?> creationalContext)
       }
       if (getServices().get(MetaAnnotationStore.class).getScopeModel(bean.getScope()).isNormal())
       {
-         if (creationalContext != null || (creationalContext == null && getContext(bean.getScope()).get(bean) != null))
+         if (creationalContext != null || getContext(bean.getScope()).get(bean) != null)
          {
             return clientProxyProvider.getClientProxy(this, bean);
          }

diff --git a/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java b/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java
@@ -96,10 +96,7 @@ public AbstractBeanDeployer deploy()
       for (ObserverMethodImpl<?, ?> observer : getEnvironment().getObservers())
       {
          log.debug("Observer : " + observer);
-         if (observer instanceof ObserverMethodImpl<?, ?>)
-         {
-            observer.initialize();
-         }
+         observer.initialize();
          manager.addObserver(observer);
       }
 

diff --git a/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java b/impl/src/main/java/org/jboss/webbeans/context/AbstractMapContext.java
@@ -92,7 +92,7 @@ else if (creationalContext != null)
          boolean needCreationLock = isCreationLockRequired();
          try
          {
-            if(needCreationLock)
+            if (needCreationLock)
             {
                creationLock.lock();
                beanInstance = getBeanStore().get(id);

diff --git a/impl/src/main/java/org/jboss/webbeans/context/AbstractThreadLocalMapContext.java b/impl/src/main/java/org/jboss/webbeans/context/AbstractThreadLocalMapContext.java
@@ -56,6 +56,7 @@ public void setBeanStore(BeanStore beanStore)
       this.beanStore.set(beanStore);
    }
 
+   @Override
    protected boolean isCreationLockRequired()
    {
       return true;

diff --git a/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java b/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java
@@ -40,7 +40,7 @@
 public class ContextLifecycle implements Lifecycle, Service
 {
 
-   public static LogProvider log = Logging.getLogProvider(ContextLifecycle.class);
+   public static final LogProvider log = Logging.getLogProvider(ContextLifecycle.class);
 
    private final AbstractApplicationContext applicationContext;
    private final AbstractApplicationContext singletonContext;

diff --git a/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java b/impl/src/main/java/org/jboss/webbeans/conversation/JavaSEConversationTerminator.java
@@ -40,7 +40,7 @@ public class JavaSEConversationTerminator implements ConversationTerminator, Ser
 
    private static LogProvider log = Logging.getLogProvider(JavaSEConversationTerminator.class);
 
-   private ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
+   private transient ScheduledExecutorService executor = Executors.newScheduledThreadPool(1);
 
    public Future<?> scheduleForTermination(Runnable terminationTask, long timeoutInMilliseconds)
    {

diff --git a/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java b/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java
@@ -19,6 +19,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
@@ -259,7 +260,7 @@ public Class<T> getJavaClass()
 
    public Type[] getActualTypeArguments()
    {
-      return actualTypeArguments;
+      return Arrays.copyOf(actualTypeArguments, actualTypeArguments.length);
    }
 
    public Set<Type> getInterfaceOnlyFlattenedTypeHierarchy()

diff --git a/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java b/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java
@@ -19,12 +19,13 @@
 import java.util.Arrays;
 
 import org.jboss.webbeans.introspector.ConstructorSignature;
-import org.jboss.webbeans.introspector.MethodSignature;
 import org.jboss.webbeans.introspector.WBConstructor;
 
 public class ConstructorSignatureImpl implements ConstructorSignature
 {
 
+   private static final long serialVersionUID = -9111642596078876778L;
+
    private final String[] parameterTypes;
 
    public ConstructorSignatureImpl(WBConstructor<?> method)
@@ -40,9 +41,9 @@ public ConstructorSignatureImpl(WBConstructor<?> method)
    @Override
    public boolean equals(Object obj)
    {
-      if (obj instanceof ConstructorSignatureImpl)
+      if (obj instanceof ConstructorSignature)
       {
-         MethodSignature that = (MethodSignature) obj;
+         ConstructorSignature that = (ConstructorSignature) obj;
          return Arrays.equals(this.getParameterTypes(), that.getParameterTypes());
       }
       else
@@ -59,7 +60,7 @@ public int hashCode()
 
    public String[] getParameterTypes()
    {
-      return parameterTypes;
+      return Arrays.copyOf(parameterTypes, parameterTypes.length);
    }
 
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java b/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java
@@ -81,7 +81,7 @@ public String getMethodName()
 
    public String[] getParameterTypes()
    {
-      return parameterTypes;
+      return Arrays.copyOf(parameterTypes, parameterTypes.length);
    }
 
    @Override

diff --git a/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java b/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java
@@ -30,6 +30,7 @@
 import org.jboss.webbeans.introspector.WBClass;
 import org.jboss.webbeans.introspector.WBMethod;
 import org.jboss.webbeans.resources.ClassTransformer;
+import org.jboss.webbeans.util.Names;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.Multimaps;
@@ -57,7 +58,7 @@ public class WBAnnotationImpl<T extends Annotation> extends WBClassImpl<T> imple
    private final Map<String, WBMethod<?, ?>> namedMembers;
 
    // Cached string representation
-   private String toString;
+   private final String toString;
 
    public static <A extends Annotation> WBAnnotation<A> of(Class<A> annotationType, ClassTransformer classTransformer)
    {
@@ -75,6 +76,7 @@ protected WBAnnotationImpl(Class<T> annotationType, ClassTransformer classTransf
    {
       super(annotationType, annotationType, null, AnnotationStore.of(annotationType, classTransformer.getTypeStore().get(annotationType), classTransformer.getTypeStore().get(annotationType), classTransformer.getTypeStore()), classTransformer);
       this.clazz = annotationType;
+      this.toString = "class " + Names.classToString(getDelegate());
       members = new HashSet<WBMethod<?, ?>>();
       annotatedMembers = Multimaps.newSetMultimap(new HashMap<Class<? extends Annotation>, Collection<WBMethod<?, ?>>>(), new Supplier<Set<WBMethod<?, ?>>>()
       {
@@ -141,13 +143,10 @@ protected WBAnnotationImpl(Class<T> annotationType, ClassTransformer classTransf
    @Override
    public String toString()
    {
-      if (toString != null)
-      {
-         return toString;
-      }
       return toString;
    }
 
+   @Override
    public Class<T> getDelegate()
    {
       return clazz;

diff --git a/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java b/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java
@@ -118,7 +118,7 @@ public class WBClassImpl<T> extends AbstractWBAnnotated<T, Class<T>> implements
    private final SetMultimap<Class<? extends Annotation>, WBConstructor<?>> constructorsByAnnotatedParameters;
 
    // Cached string representation
-   private String toString;
+   private final String toString;
 
    private final boolean _nonStaticMemberClass;
    private final boolean _abstract;
@@ -139,6 +139,7 @@ public static <T> WBClass<T> of(AnnotatedType<T> annotatedType, ClassTransformer
    protected WBClassImpl(Class<T> rawType, Type type, AnnotatedType<T> annotatedType, AnnotationStore annotationStore, ClassTransformer classTransformer)
    {
       super(annotationStore, rawType, type);
+      this.toString = "class " + Names.classToString(rawType);
       this.name = rawType.getName();
       this._simpleName = rawType.getSimpleName();
       if (rawType.getSuperclass() != null)
@@ -448,6 +449,7 @@ public Class<? extends T> getAnnotatedClass()
     * 
     * @return The class
     */
+   @Override
    public Class<T> getDelegate()
    {
       return getJavaClass();
@@ -650,11 +652,6 @@ public Set<WBMethod<?, T>> getWBDeclaredMethodsWithAnnotatedParameters(Class<? e
    @Override
    public String toString()
    {
-      if (toString != null)
-      {
-         return toString;
-      }
-      toString = "Annotated class " + Names.classToString(getDelegate());
       return toString;
    }
 

diff --git a/impl/src/main/java/org/jboss/webbeans/util/Reflections.java b/impl/src/main/java/org/jboss/webbeans/util/Reflections.java
@@ -387,7 +387,7 @@ public static <T> Constructor<T> getDeclaredConstructor(Class<T> clazz, Class<?>
       }
       catch (Exception e)
       {
-         throw new RuntimeException("Error accessing constructor (with parameters " + parameterTypes + ") of " + clazz, e);
+         throw new RuntimeException("Error accessing constructor (with parameters " + Arrays.toString(parameterTypes) + ") of " + clazz, e);
       }
    }
 

diff --git a/impl/src/main/java/org/jboss/webbeans/util/Strings.java b/impl/src/main/java/org/jboss/webbeans/util/Strings.java
@@ -20,6 +20,8 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.StringTokenizer;
+import java.util.Map.Entry;
+
 
 /**
  * String utilities
@@ -79,26 +81,26 @@ public static String mapToString(String header, Map<?, ?> map)
       StringBuilder buffer = new StringBuilder();
       if (map == null)
       {
-         buffer.append(header + "null\n");
+         buffer.append(header).append("null\n");
          return buffer.toString();
       }
-      buffer.append(header + "[" + map.size() + " entries]\n");
+      buffer.append(header).append("[").append(map.size()).append(" entries]\n");
       int i = 0;
-      for (Object key : map.keySet())
+      for (Entry<?, ?> entry: map.entrySet())
       {
-         Object value = map.get(key);
-         buffer.append("  #" + ++i + ": " + key.toString() + " -> ");
-         if (value instanceof Iterable)
+         Object value = entry.getValue();
+         buffer.append("  #").append(++i).append(": ").append(entry.getKey()).append(" -> ");
+         if (value instanceof Iterable<?>)
          {
             buffer.append("\n");
             for (Object subValue : (Iterable<?>) value)
             {
-               buffer.append("    " + subValue.toString() + "\n");
+               buffer.append("    ").append(subValue.toString()).append("\n");
             }
          }
          else
          {
-            buffer.append(value.toString() + "\n");
+            buffer.append(value.toString()).append("\n");
          }
       }
       return buffer.toString();

diff --git a/impl/src/main/java/org/jboss/webbeans/util/reflection/ParameterizedTypeImpl.java b/impl/src/main/java/org/jboss/webbeans/util/reflection/ParameterizedTypeImpl.java
@@ -28,14 +28,14 @@ public class ParameterizedTypeImpl implements ParameterizedType
 
    public ParameterizedTypeImpl(Type rawType, Type[] actualTypeArguments, Type ownerType)
    {
-      this.actualTypeArguments = actualTypeArguments;
+      this.actualTypeArguments = Arrays.copyOf(actualTypeArguments, actualTypeArguments.length);
       this.rawType = rawType;
       this.ownerType = ownerType;
    }
 
    public Type[] getActualTypeArguments()
    {
-      return actualTypeArguments;
+      return Arrays.copyOf(actualTypeArguments, actualTypeArguments.length);
    }
 
    public Type getOwnerType()
@@ -75,6 +75,7 @@ else if (obj instanceof ParameterizedType)
 
    }
 
+   @Override
    public String toString()
    {
       StringBuilder sb = new StringBuilder();

diff --git a/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/AtInjectTCK.java b/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/AtInjectTCK.java
@@ -10,8 +10,8 @@
 import org.atinject.tck.Tck;
 import org.atinject.tck.auto.Car;
 import org.atinject.tck.auto.Convertible;
-import org.atinject.tck.auto.DriversSeat;
 import org.atinject.tck.auto.FuelTank;
+import org.atinject.tck.auto.Seat;
 import org.atinject.tck.auto.V8Engine;
 import org.atinject.tck.auto.accessories.Cupholder;
 import org.atinject.tck.auto.accessories.SpareTire;
@@ -21,7 +21,7 @@
 public class AtInjectTCK
 {
 
-   private static final List<Class<?>> classes = Arrays.<Class<?>>asList(Convertible.class, DriversSeat.class, DriversSeatProducer.class, V8Engine.class, Cupholder.class, FuelTank.class, SpareTireProducer.class, SpareTire.class);
+   private static final List<Class<?>> classes = Arrays.<Class<?>>asList(Convertible.class, Seat.class, DriversSeatProducer.class, V8Engine.class, Cupholder.class, FuelTank.class, SpareTireProducer.class, SpareTire.class);
 
    public static Test suite()
    {

diff --git a/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/DriversSeatProducer.java b/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/DriversSeatProducer.java
@@ -1,18 +1,31 @@
 package org.jboss.webbeans.atinject.tck;
 
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
+import javax.inject.Inject;
 
 import org.atinject.tck.auto.Drivers;
 import org.atinject.tck.auto.DriversSeat;
 import org.atinject.tck.auto.Seat;
 
 public class DriversSeatProducer
 {
+
+   private final InjectionTarget<DriversSeat> injectionTarget;
+   private final BeanManager beanManager;
+
+   @Inject
+   public DriversSeatProducer(BeanManager beanManager)
+   {
+      this.injectionTarget = beanManager.createInjectionTarget(beanManager.createAnnotatedType(DriversSeat.class));
+      this.beanManager = beanManager;
+   }
 
    @Produces @Drivers
-   public Seat produceDriversSeat(DriversSeat seat)
+   public Seat produceDriversSeat()
    {
-      return seat;
+      return injectionTarget.produce(beanManager.<DriversSeat>createCreationalContext(null));
    }
 
 }
diff --git a/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/SpareTireProducer.java b/inject-tck-runner/src/test/java/org/jboss/webbeans/atinject/tck/SpareTireProducer.java
@@ -1,18 +1,31 @@
 package org.jboss.webbeans.atinject.tck;
 
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.InjectionTarget;
+import javax.inject.Inject;
 import javax.inject.Named;
 
 import org.atinject.tck.auto.Tire;
 import org.atinject.tck.auto.accessories.SpareTire;
 
 public class SpareTireProducer
 {
+
+   private final InjectionTarget<SpareTire> injectionTarget;
+   private final BeanManager beanManager;
+
+   @Inject
+   public SpareTireProducer(BeanManager beanManager)
+   {
+      this.injectionTarget = beanManager.createInjectionTarget(beanManager.createAnnotatedType(SpareTire.class));
+      this.beanManager = beanManager;
+   }
 
    @Produces @Named("spare")
-   public Tire produceSpareTire(SpareTire spareTire)
+   public Tire produceSpareTire()
    {
-      return spareTire;
+      return injectionTarget.produce(beanManager.<SpareTire>createCreationalContext(null));
    }
 
 }
diff --git a/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java b/porting-package/src/main/java/org/jboss/webbeans/tck/ManagersImpl.java
@@ -14,15 +14,7 @@
 public class ManagersImpl implements Managers
 {
 
-   public static ThreadLocal<ServletContext> SERVLET_CONTEXT = new ThreadLocal<ServletContext>()
-   {
-
-      protected ServletContext initialValue() 
-      {
-         return new MockServletContext("");
-      }
-
-   };
+   private static final ServletContext SERVLET_CONTEXT = new MockServletContext("");
 
    public BeanManager getManager()
    {
@@ -32,7 +24,7 @@ public BeanManager getManager()
       }
       else
       {
-         return ServletHelper.getModuleBeanManager(SERVLET_CONTEXT.get());
+         return ServletHelper.getModuleBeanManager(SERVLET_CONTEXT);
       }
    }