Take care of statements like "? extends X" when trying to translate a TypeMirror into a JClass

mathieuboniface · mathieuboniface · commit f718e34465c5 · 2013-01-13T11:51:46.000+01:00
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
@@ -34,9 +34,11 @@
 import javax.lang.model.type.ArrayType;
 import javax.lang.model.type.DeclaredType;
 import javax.lang.model.type.TypeMirror;
+import javax.lang.model.type.WildcardType;
 
 import org.androidannotations.processing.EBeanHolder;
 import org.androidannotations.processing.EBeansHolder.Classes;
+
 import com.sun.codemodel.JBlock;
 import com.sun.codemodel.JCatchBlock;
 import com.sun.codemodel.JClass;
@@ -78,6 +80,16 @@ public JClass typeMirrorToJClass(TypeMirror type, EBeanHolder holder) {
 			}
 
 			return declaredClass;
+		} else if (type instanceof WildcardType) {
+			// TODO : At his time (01/2013), it is not possible to handle the
+			// super bound because code model does not offer a way to model
+			// statement like " ? super X"
+			// (see http://java.net/jira/browse/CODEMODEL-11)
+			WildcardType wildcardType = (WildcardType) type;
+
+			TypeMirror extendsBound = wildcardType.getExtendsBound();
+
+			return typeMirrorToJClass(extendsBound, holder).wildcard();
 		} else if (type instanceof ArrayType) {
 			ArrayType arrayType = (ArrayType) type;
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ThreadActivity.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ThreadActivity.java
@@ -18,14 +18,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import android.app.Activity;
+import java.util.SortedSet;
 
 import org.androidannotations.annotations.Background;
 import org.androidannotations.annotations.EActivity;
 import org.androidannotations.annotations.UiThread;
+import org.androidannotations.test15.ebean.GenericBean;
+import org.androidannotations.test15.ebean.SomeBean;
 import org.androidannotations.test15.instancestate.MySerializableBean;
 
+import android.app.Activity;
+
 @EActivity
 public class ThreadActivity extends Activity {
 
@@ -59,6 +62,11 @@ void genericBackgroundMethod(List<Map<String, List<Set<MySerializableBean[]>>>>
 
 	}
 
+	@Background
+	void genericBackgroundMethod(Set<? extends GenericBean<? extends SomeBean>> param) {
+
+	}
+
 	@UiThread(delay = 1000)
 	void emptyUiDelayedMethod() {
 
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/GenericBean.java b/AndroidAnnotations/functional-test-1-5/src/main/java/org/androidannotations/test15/ebean/GenericBean.java
@@ -0,0 +1,21 @@
+/**
+ * Copyright (C) 2010-2012 eBusiness Information, Excilys Group
+ *
+ * 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.androidannotations.test15.ebean;
+
+
+public class GenericBean<T> {
+
+}
