Improve java.lang.reflect.Type implementations

impl/src/main/java/org/jboss/weld/util/reflection/GenericArrayTypeImpl.java

@@ -15,6 +15,10 @@ public GenericArrayTypeImpl(Type genericComponentType) {
         this.genericComponentType = genericComponentType;
     }
 
+    public GenericArrayTypeImpl(Class<?> rawType, Type... actualTypeArguments) {
+        this.genericComponentType = new ParameterizedTypeImpl(rawType, actualTypeArguments);
+    }
+
     public Type getGenericComponentType() {
         return genericComponentType;
     }

impl/src/main/java/org/jboss/weld/util/reflection/ParameterizedTypeImpl.java

@@ -16,15 +16,15 @@
  */
 package org.jboss.weld.util.reflection;
 
-import org.jboss.weld.util.collections.Arrays2;
-
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
-
 import java.io.Serializable;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Arrays;
 
+import org.jboss.weld.util.collections.Arrays2;
+
+import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+
 public class ParameterizedTypeImpl implements ParameterizedType, Serializable {
 
     private static final long serialVersionUID = -3005183010706452884L;
@@ -33,6 +33,11 @@ public class ParameterizedTypeImpl implements ParameterizedType, Serializable {
     private final Type rawType;
     private final Type ownerType;
 
+    @SuppressWarnings("EI_EXPOSE_REP")
+    public ParameterizedTypeImpl(Type rawType, Type... actualTypeArguments) {
+        this(rawType, actualTypeArguments, null);
+    }
+
     @SuppressWarnings("EI_EXPOSE_REP")
     public ParameterizedTypeImpl(Type rawType, Type[] actualTypeArguments, Type ownerType) {
         this.actualTypeArguments = actualTypeArguments;

impl/src/main/java/org/jboss/weld/util/reflection/WildcardTypeImpl.java

@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2014, Red Hat, Inc., and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.weld.util.reflection;
+
+import java.lang.reflect.Type;
+import java.lang.reflect.WildcardType;
+
+/**
+ * Implementation of {@link WildcardType}.
+ *
+ * Per JLS a wildcard may define either the upper bound or the lower bound. A wildcard may not have multiple bounds.
+ *
+ * @author Jozef Hartinger
+ *
+ */
+public class WildcardTypeImpl implements WildcardType {
+
+    public static WildcardType defaultInstance() {
+        return DEFAULT_INSTANCE;
+    }
+
+    public static WildcardType withUpperBound(Type type) {
+        return new WildcardTypeImpl(new Type[] { type }, DEFAULT_LOWER_BOUND);
+    }
+
+    public static WildcardType withLowerBound(Type type) {
+        return new WildcardTypeImpl(DEFAULT_UPPER_BOUND, new Type[] { type });
+    }
+
+    private static final Type[] DEFAULT_UPPER_BOUND = new Type[] { Object.class };
+    private static final Type[] DEFAULT_LOWER_BOUND = new Type[0];
+    private static final WildcardType DEFAULT_INSTANCE = new WildcardTypeImpl(DEFAULT_UPPER_BOUND, DEFAULT_LOWER_BOUND);
+
+    private Type[] upperBound;
+    private Type[] lowerBound;
+
+    private WildcardTypeImpl(Type[] upperBound, Type[] lowerBound) {
+        this.upperBound = upperBound;
+        this.lowerBound = lowerBound;
+    }
+
+    @Override
+    public Type[] getUpperBounds() {
+        return upperBound;
+    }
+
+    @Override
+    public Type[] getLowerBounds() {
+        return lowerBound;
+    }
+}