#23 - @DBArray with Set<out XXX> does not work

Author: rbygrave

src/main/java/io/ebean/querybean/generator/ProcessingContext.java

@@ -132,9 +132,9 @@ String generatedSourcesDir() {
   private String typeDef(TypeMirror typeMirror) {
     if (typeMirror.getKind() == TypeKind.DECLARED) {
       DeclaredType declaredType = (DeclaredType) typeMirror;
-      return declaredType.asElement().toString();
+      return Split.trimType(declaredType.asElement().toString());
     } else {
-      return typeMirror.toString();
+      return Split.trimType(typeMirror.toString());
     }
   }
 

src/main/java/io/ebean/querybean/generator/Split.java

@@ -31,4 +31,14 @@ static String shortName(String className) {
     return className.substring(startPos + 1);
   }
 
+  /**
+   * Trim "? extends" from a Kotlin "out" collection type.
+   */
+  static String trimType(String fullType) {
+    if (fullType.startsWith("? ")) {
+      return fullType.substring(10);
+    }
+    return fullType;
+  }
+
 }

src/test/java/io/ebean/querybean/generator/SplitTest.java

@@ -8,14 +8,19 @@
 public class SplitTest {
 
   @Test
-  public void shortName() throws Exception {
+  public void trimType() {
+    assertEquals(Split.trimType("com.foo.domain.Customer"), "com.foo.domain.Customer");
+    assertEquals(Split.trimType("? extends com.foo.domain.Customer"), "com.foo.domain.Customer");
+  }
 
+  @Test
+  public void shortName() {
     assertEquals(Split.shortName("com.foo.domain.Customer"), "Customer");
     assertEquals(Split.shortName("Customer"), "Customer");
   }
 
   @Test
-  public void split_normal() throws Exception {
+  public void split_normal() {
 
     String[] split = Split.split("com.foo.domain.Customer");
 
@@ -24,7 +29,7 @@ public void split_normal() throws Exception {
   }
 
   @Test
-  public void split_noPackage() throws Exception {
+  public void split_noPackage() {
 
     String[] split = Split.split("Customer");