From ff8f25c4e6639ca5d89f96462df766f36a886ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Fri, 20 Jun 2014 15:45:45 +0300
Subject: [PATCH 1/3] Add generics test

---
 .../mysema/query/domain/Generic15Test.java    | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java

diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java
new file mode 100644
index 000000000..a789bfb8c
--- /dev/null
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java
@@ -0,0 +1,35 @@
+package com.mysema.query.domain;
+
+import javax.persistence.Entity;
+import javax.persistence.MappedSuperclass;
+
+import org.junit.Test;
+
+public class Generic15Test {
+
+    @MappedSuperclass
+    public static abstract class Compound<T extends Containable> {
+    }
+
+    @MappedSuperclass
+    public static abstract class Containable<T extends Compound> {
+
+        private T compound;
+    }
+
+    @Entity
+    public static class MyCompound extends Compound<MyContainable>{
+    }
+
+    @Entity
+    public static class MyContainable extends Containable<MyCompound> {
+
+        private String additionalField;
+    }
+
+    @Test
+    public void test() {
+        // QMyContainable
+        QGeneric15Test_MyContainable.myContainable.compound
+    }
+}

From b9157726217292084d39cf1c41ad40ff172ffe68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Fri, 20 Jun 2014 15:48:21 +0300
Subject: [PATCH 2/3] Fix test

---
 .../src/test/java/com/mysema/query/domain/Generic15Test.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java
index a789bfb8c..79731ca6e 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java
@@ -4,6 +4,7 @@ import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
 
 import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 public class Generic15Test {
 
@@ -30,6 +31,6 @@ public class Generic15Test {
     @Test
     public void test() {
         // QMyContainable
-        QGeneric15Test_MyContainable.myContainable.compound
+        assertEquals(MyCompound.class, QGeneric15Test_MyContainable.myContainable.compound.getType());
     }
 }

From 5d18bdef1d0746fbf9811a21242b54ad71a9a4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@gmail.com>
Date: Fri, 20 Jun 2014 16:35:52 +0300
Subject: [PATCH 3/3] Update test

---
 .../src/test/java/com/mysema/query/domain/Generic15Test.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java
index 79731ca6e..5b2fd39aa 100644
--- a/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java
+++ b/querydsl-apt/src/test/java/com/mysema/query/domain/Generic15Test.java
@@ -2,6 +2,8 @@ package com.mysema.query.domain;
 
 import javax.persistence.Entity;
 import javax.persistence.MappedSuperclass;
+import java.util.HashSet;
+import java.util.Set;
 
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
@@ -10,6 +12,8 @@ public class Generic15Test {
 
     @MappedSuperclass
     public static abstract class Compound<T extends Containable> {
+
+        private Set<T> containables = new HashSet<T>();
     }
 
     @MappedSuperclass