o Overhauling inheritance, adding a decent start of support for @MappedSuperclass.

8 files changed, 54 insertions, 8 deletions

diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Car.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/Car.java
index 4b80afc..2781712 100644
--- a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Car.java
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/Car.java
@@ -1,4 +1,4 @@
-package io.trygvis.persistence.test;
+package io.trygvis.persistence.test.basic;
 
 import javax.persistence.Entity;
 
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/ChildEntity.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/ChildEntity.java
index ff91680..208ee9a 100644
--- a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/ChildEntity.java
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/ChildEntity.java
@@ -1,4 +1,4 @@
-package io.trygvis.persistence.test;
+package io.trygvis.persistence.test.basic;
 
 import javax.persistence.Entity;
 
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/ParentEntity.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/ParentEntity.java
index 9925f7e..3dd2375 100644
--- a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/ParentEntity.java
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/ParentEntity.java
@@ -1,7 +1,9 @@
-package io.trygvis.persistence.test;
+package io.trygvis.persistence.test.basic;
 
 import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
 
+@MappedSuperclass
 public class ParentEntity {
     @Id
     public Long id;
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Person.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/Person.java
index 47a2fdd..3cbdb84 100644
--- a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/Person.java
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/Person.java
@@ -1,4 +1,4 @@
-package io.trygvis.persistence.test;
+package io.trygvis.persistence.test.basic;
 
 import javax.persistence.Entity;
 import javax.persistence.Id;
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/package-info.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/package-info.java
new file mode 100644
index 0000000..780fae5
--- /dev/null
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/basic/package-info.java
@@ -0,0 +1,4 @@
+@SqlEntitySet(name = "Basic")
+package io.trygvis.persistence.test.basic;
+
+import io.trygvis.persistence.SqlEntitySet;
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/inheritance/A.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/inheritance/A.java
new file mode 100644
index 0000000..99770da
--- /dev/null
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/inheritance/A.java
@@ -0,0 +1,40 @@
+package io.trygvis.persistence.test.inheritance;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.SequenceGenerator;
+
+public class A {
+    public Integer a;
+}
+
+@SequenceGenerator(name = "id", sequenceName = "id_seq")
+@MappedSuperclass
+class B extends A {
+    public Integer b;
+}
+
+class C extends B {
+    public Integer c;
+}
+
+@Entity
+class D extends C {
+    @Id
+    public Integer d;
+
+    private int d2;
+
+    public Integer getD2() {
+        return d2;
+    }
+
+    public void setD2(Integer d2) {
+        this.d2 = d2;
+    }
+}
+
+class E extends D {
+    public int e;
+}
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/inheritance/package-info.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/inheritance/package-info.java
new file mode 100644
index 0000000..7382c7a
--- /dev/null
+++ b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/inheritance/package-info.java
@@ -0,0 +1,4 @@
+@SqlEntitySet(name = "Inheritance")
+package io.trygvis.persistence.test.inheritance;
+
+import io.trygvis.persistence.SqlEntitySet;
diff --git a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/package-info.java b/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/package-info.java
deleted file mode 100644
index 5a80282..0000000
--- a/container-compiler-plugin/src/test/resources/io/trygvis/persistence/test/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-@SqlEntitySet(name = "Test")
-package io.trygvis.persistence.test;
-
-import io.trygvis.persistence.SqlEntitySet;