Refactor People Project & Inheritance Projects
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/0b6a4240 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/0b6a4240 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/0b6a4240 Branch: refs/heads/CAY-1946 Commit: 0b6a42405d96ec44c718fc088999a309628f32fc Parents: 4baf598 Author: Savva Kolbechev <[email protected]> Authored: Mon Nov 10 14:59:19 2014 +0300 Committer: Savva Kolbechev <[email protected]> Committed: Mon Nov 10 14:59:19 2014 +0300 ---------------------------------------------------------------------- .../DataContextEJBQLConditionsPeopleIT.java | 6 +- .../access/DataContextEJBQLInheritanceIT.java | 6 +- .../access/DataContextQualifiedEntityIT.java | 8 +- .../cayenne/access/EntityInheritanceIT.java | 77 ++++++++++++++++++++ .../access/SingleTableInheritance1IT.java | 2 +- .../access/SingleTableInheritanceIT.java | 77 ++------------------ .../cayenne/access/VerticalInheritanceIT.java | 18 ++--- .../apache/cayenne/map/ObjRelationshipIT.java | 2 +- ...ryPrefetchRouterActionQualifiedEntityIT.java | 6 +- ...LifecycleCallbackRegistry_InheritanceIT.java | 2 +- ...jectDescriptorFactory_InheritanceMapsIT.java | 2 +- .../cayenne/testdo/inherit/AbstractPerson.java | 26 ------- .../apache/cayenne/testdo/inherit/Address.java | 26 ------- .../cayenne/testdo/inherit/BaseEntity.java | 25 ------- .../cayenne/testdo/inherit/ClientCompany.java | 26 ------- .../testdo/inherit/CustomerRepresentative.java | 26 ------- .../cayenne/testdo/inherit/Department.java | 26 ------- .../testdo/inherit/DirectToSubEntity.java | 25 ------- .../apache/cayenne/testdo/inherit/Employee.java | 26 ------- .../apache/cayenne/testdo/inherit/Manager.java | 26 ------- .../apache/cayenne/testdo/inherit/People.java | 36 --------- .../cayenne/testdo/inherit/PersonNotes.java | 25 ------- .../cayenne/testdo/inherit/RelatedEntity.java | 25 ------- .../cayenne/testdo/inherit/SubEntity.java | 25 ------- .../testdo/inherit/auto/_AbstractPerson.java | 48 ------------ .../cayenne/testdo/inherit/auto/_Address.java | 35 --------- .../testdo/inherit/auto/_BaseEntity.java | 46 ------------ .../testdo/inherit/auto/_ClientCompany.java | 40 ---------- .../inherit/auto/_CustomerRepresentative.java | 35 --------- .../testdo/inherit/auto/_Department.java | 51 ------------- .../testdo/inherit/auto/_DirectToSubEntity.java | 32 -------- .../cayenne/testdo/inherit/auto/_Employee.java | 51 ------------- .../cayenne/testdo/inherit/auto/_Manager.java | 32 -------- .../cayenne/testdo/inherit/auto/_People.java | 12 --- .../testdo/inherit/auto/_PersonNotes.java | 35 --------- .../testdo/inherit/auto/_RelatedEntity.java | 46 ------------ .../cayenne/testdo/inherit/auto/_SubEntity.java | 16 ---- .../cayenne/testdo/inheritance/BaseEntity.java | 25 +++++++ .../testdo/inheritance/DirectToSubEntity.java | 25 +++++++ .../testdo/inheritance/RelatedEntity.java | 25 +++++++ .../cayenne/testdo/inheritance/SubEntity.java | 25 +++++++ .../testdo/inheritance/auto/_BaseEntity.java | 46 ++++++++++++ .../inheritance/auto/_DirectToSubEntity.java | 32 ++++++++ .../testdo/inheritance/auto/_RelatedEntity.java | 46 ++++++++++++ .../testdo/inheritance/auto/_SubEntity.java | 16 ++++ .../vertical/InheritanceVertical.java | 36 --------- .../testdo/inheritance/vertical/Iv1Root.java | 25 ------- .../testdo/inheritance/vertical/Iv1Sub1.java | 25 ------- .../testdo/inheritance/vertical/Iv2Root.java | 25 ------- .../testdo/inheritance/vertical/Iv2Sub1.java | 25 ------- .../testdo/inheritance/vertical/Iv2X.java | 25 ------- .../testdo/inheritance/vertical/IvRoot.java | 25 ------- .../testdo/inheritance/vertical/IvSub1.java | 25 ------- .../testdo/inheritance/vertical/IvSub1Sub1.java | 25 ------- .../testdo/inheritance/vertical/IvSub2.java | 25 ------- .../vertical/auto/_InheritanceVertical.java | 12 --- .../inheritance/vertical/auto/_Iv1Root.java | 32 -------- .../inheritance/vertical/auto/_Iv1Sub1.java | 24 ------ .../inheritance/vertical/auto/_Iv2Root.java | 24 ------ .../inheritance/vertical/auto/_Iv2Sub1.java | 27 ------- .../testdo/inheritance/vertical/auto/_Iv2X.java | 16 ---- .../inheritance/vertical/auto/_IvRoot.java | 32 -------- .../inheritance/vertical/auto/_IvSub1.java | 24 ------ .../inheritance/vertical/auto/_IvSub1Sub1.java | 24 ------ .../inheritance/vertical/auto/_IvSub2.java | 32 -------- .../inheritance_people/AbstractPerson.java | 26 +++++++ .../testdo/inheritance_people/Address.java | 26 +++++++ .../inheritance_people/ClientCompany.java | 26 +++++++ .../CustomerRepresentative.java | 26 +++++++ .../testdo/inheritance_people/Department.java | 26 +++++++ .../testdo/inheritance_people/Employee.java | 26 +++++++ .../testdo/inheritance_people/Manager.java | 26 +++++++ .../testdo/inheritance_people/People.java | 36 +++++++++ .../testdo/inheritance_people/PersonNotes.java | 25 +++++++ .../auto/_AbstractPerson.java | 48 ++++++++++++ .../inheritance_people/auto/_Address.java | 35 +++++++++ .../inheritance_people/auto/_ClientCompany.java | 40 ++++++++++ .../auto/_CustomerRepresentative.java | 35 +++++++++ .../inheritance_people/auto/_Department.java | 51 +++++++++++++ .../inheritance_people/auto/_Employee.java | 51 +++++++++++++ .../inheritance_people/auto/_Manager.java | 32 ++++++++ .../testdo/inheritance_people/auto/_People.java | 12 +++ .../inheritance_people/auto/_PersonNotes.java | 35 +++++++++ .../InheritanceVertical.java | 36 +++++++++ .../testdo/inheritance_vertical/Iv1Root.java | 25 +++++++ .../testdo/inheritance_vertical/Iv1Sub1.java | 25 +++++++ .../testdo/inheritance_vertical/Iv2Root.java | 25 +++++++ .../testdo/inheritance_vertical/Iv2Sub1.java | 25 +++++++ .../testdo/inheritance_vertical/Iv2X.java | 25 +++++++ .../testdo/inheritance_vertical/IvRoot.java | 25 +++++++ .../testdo/inheritance_vertical/IvSub1.java | 25 +++++++ .../testdo/inheritance_vertical/IvSub1Sub1.java | 25 +++++++ .../testdo/inheritance_vertical/IvSub2.java | 25 +++++++ .../auto/_InheritanceVertical.java | 12 +++ .../inheritance_vertical/auto/_Iv1Root.java | 32 ++++++++ .../inheritance_vertical/auto/_Iv1Sub1.java | 24 ++++++ .../inheritance_vertical/auto/_Iv2Root.java | 24 ++++++ .../inheritance_vertical/auto/_Iv2Sub1.java | 27 +++++++ .../testdo/inheritance_vertical/auto/_Iv2X.java | 16 ++++ .../inheritance_vertical/auto/_IvRoot.java | 32 ++++++++ .../inheritance_vertical/auto/_IvSub1.java | 24 ++++++ .../inheritance_vertical/auto/_IvSub1Sub1.java | 24 ++++++ .../inheritance_vertical/auto/_IvSub2.java | 32 ++++++++ .../cayenne/unit/di/server/SchemaBuilder.java | 2 +- .../cayenne/unit/di/server/ServerCase.java | 5 +- .../cayenne/unit/jira/CAY_207Manager1.java | 2 +- .../cayenne/unit/jira/CAY_207Manager2.java | 2 +- .../util/DeepMergeOperationInheritanceIT.java | 6 +- .../src/test/resources/cayenne-inheritance.xml | 4 + .../test/resources/inheritance-vertical.map.xml | 18 ++--- .../src/test/resources/inheritance.map.xml | 46 ++++++++++++ .../src/test/resources/people.map.xml | 57 +++------------ 112 files changed, 1518 insertions(+), 1490 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java index 7c62217..2dd5dde 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLConditionsPeopleIT.java @@ -23,9 +23,9 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; -import org.apache.cayenne.testdo.inherit.Address; -import org.apache.cayenne.testdo.inherit.Department; -import org.apache.cayenne.testdo.inherit.Manager; +import org.apache.cayenne.testdo.inheritance_people.Address; +import org.apache.cayenne.testdo.inheritance_people.Department; +import org.apache.cayenne.testdo.inheritance_people.Manager; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java index f67632b..ca5f763 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextEJBQLInheritanceIT.java @@ -23,9 +23,9 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.EJBQLQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; -import org.apache.cayenne.testdo.inherit.CustomerRepresentative; -import org.apache.cayenne.testdo.inherit.Employee; -import org.apache.cayenne.testdo.inherit.Manager; +import org.apache.cayenne.testdo.inheritance_people.CustomerRepresentative; +import org.apache.cayenne.testdo.inheritance_people.Employee; +import org.apache.cayenne.testdo.inheritance_people.Manager; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java index 7e7c16e..ab8ac03 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/DataContextQualifiedEntityIT.java @@ -24,10 +24,10 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; -import org.apache.cayenne.testdo.inherit.AbstractPerson; -import org.apache.cayenne.testdo.inherit.CustomerRepresentative; -import org.apache.cayenne.testdo.inherit.Employee; -import org.apache.cayenne.testdo.inherit.Manager; +import org.apache.cayenne.testdo.inheritance_people.AbstractPerson; +import org.apache.cayenne.testdo.inheritance_people.CustomerRepresentative; +import org.apache.cayenne.testdo.inheritance_people.Employee; +import org.apache.cayenne.testdo.inheritance_people.Manager; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/access/EntityInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/EntityInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/EntityInheritanceIT.java new file mode 100644 index 0000000..e17295e --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/EntityInheritanceIT.java @@ -0,0 +1,77 @@ +package org.apache.cayenne.access; + +import org.apache.cayenne.di.Inject; +import org.apache.cayenne.testdo.inheritance.BaseEntity; +import org.apache.cayenne.testdo.inheritance.RelatedEntity; +import org.apache.cayenne.testdo.inheritance.SubEntity; +import org.apache.cayenne.unit.di.server.ServerCase; +import org.apache.cayenne.unit.di.server.UseServerRuntime; +import org.junit.Test; + +import static org.junit.Assert.assertEquals; + +@UseServerRuntime(ServerCase.INHERITANCE_PROJECT) +public class EntityInheritanceIT extends ServerCase { + + @Inject + private DataContext context; + + /** + * Test for CAY-1008: Reverse relationships may not be correctly set if inheritance is + * used. + */ + @Test + public void testCAY1008() { + RelatedEntity related = context.newObject(RelatedEntity.class); + + BaseEntity base = context.newObject(BaseEntity.class); + base.setToRelatedEntity(related); + + assertEquals(1, related.getBaseEntities().size()); + assertEquals(0, related.getSubEntities().size()); + + SubEntity sub = context.newObject(SubEntity.class); + sub.setToRelatedEntity(related); + + assertEquals(2, related.getBaseEntities().size()); + + // TODO: andrus 2008/03/28 - this fails... + // assertEquals(1, related.getSubEntities().size()); + } + + /** + * Test for CAY-1009: Bogus runtime relationships can mess up commit. + */ + @Test + public void testCAY1009() { + + // We should have only one relationship. DirectToSubEntity -> SubEntity. + + // this fails as a result of 'EntityResolver().applyObjectLayerDefaults()' + // creating incorrect relationships + // assertEquals(1, context + // .getEntityResolver() + // .getObjEntity("DirectToSubEntity") + // .getRelationships() + // .size()); + + // We should still just have the one mapped relationship, but we in fact now have + // two: + // DirectToSubEntity -> BaseEntity and DirectToSubEntity -> SubEntity. + + // TODO: andrus 2008/03/28 - this fails... + // assertEquals(1, context.getEntityResolver().getObjEntity("DirectToSubEntity") + // .getRelationships().size()); + // + // DirectToSubEntity direct = context.newObject(DirectToSubEntity.class); + // + // SubEntity sub = context.newObject(SubEntity.class); + // sub.setToDirectToSubEntity(direct); + // + // assertEquals(1, direct.getSubEntities().size()); + // + // context.deleteObject(sub); + // assertEquals(0, direct.getSubEntities().size()); + } + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java index 02b2c41..c9dd4aa 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritance1IT.java @@ -36,7 +36,7 @@ import static org.junit.Assert.assertTrue; /** * Special test cases per CAY-1378, CAY-1379. */ -@UseServerRuntime(ServerCase.INHERTITANCE_SINGLE_TABLE1_PROJECT) +@UseServerRuntime(ServerCase.INHERITANCE_SINGLE_TABLE1_PROJECT) public class SingleTableInheritance1IT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java index 8f8cd39..c2ce9c3 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/SingleTableInheritanceIT.java @@ -28,17 +28,14 @@ import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.query.SortOrder; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; -import org.apache.cayenne.testdo.inherit.AbstractPerson; -import org.apache.cayenne.testdo.inherit.Address; -import org.apache.cayenne.testdo.inherit.BaseEntity; -import org.apache.cayenne.testdo.inherit.ClientCompany; -import org.apache.cayenne.testdo.inherit.CustomerRepresentative; -import org.apache.cayenne.testdo.inherit.Department; -import org.apache.cayenne.testdo.inherit.Employee; -import org.apache.cayenne.testdo.inherit.Manager; -import org.apache.cayenne.testdo.inherit.PersonNotes; -import org.apache.cayenne.testdo.inherit.RelatedEntity; -import org.apache.cayenne.testdo.inherit.SubEntity; +import org.apache.cayenne.testdo.inheritance_people.AbstractPerson; +import org.apache.cayenne.testdo.inheritance_people.Address; +import org.apache.cayenne.testdo.inheritance_people.ClientCompany; +import org.apache.cayenne.testdo.inheritance_people.CustomerRepresentative; +import org.apache.cayenne.testdo.inheritance_people.Department; +import org.apache.cayenne.testdo.inheritance_people.Employee; +import org.apache.cayenne.testdo.inheritance_people.Manager; +import org.apache.cayenne.testdo.inheritance_people.PersonNotes; import org.apache.cayenne.unit.di.DataChannelInterceptor; import org.apache.cayenne.unit.di.UnitTestClosure; import org.apache.cayenne.unit.di.server.ServerCase; @@ -483,64 +480,6 @@ public class SingleTableInheritanceIT extends ServerCase { } /** - * Test for CAY-1008: Reverse relationships may not be correctly set if inheritance is - * used. - */ - @Test - public void testCAY1008() { - RelatedEntity related = context.newObject(RelatedEntity.class); - - BaseEntity base = context.newObject(BaseEntity.class); - base.setToRelatedEntity(related); - - assertEquals(1, related.getBaseEntities().size()); - assertEquals(0, related.getSubEntities().size()); - - SubEntity sub = context.newObject(SubEntity.class); - sub.setToRelatedEntity(related); - - assertEquals(2, related.getBaseEntities().size()); - - // TODO: andrus 2008/03/28 - this fails... - // assertEquals(1, related.getSubEntities().size()); - } - - /** - * Test for CAY-1009: Bogus runtime relationships can mess up commit. - */ - @Test - public void testCAY1009() { - - // We should have only one relationship. DirectToSubEntity -> SubEntity. - - // this fails as a result of 'EntityResolver().applyObjectLayerDefaults()' - // creating incorrect relationships - // assertEquals(1, context - // .getEntityResolver() - // .getObjEntity("DirectToSubEntity") - // .getRelationships() - // .size()); - - // We should still just have the one mapped relationship, but we in fact now have - // two: - // DirectToSubEntity -> BaseEntity and DirectToSubEntity -> SubEntity. - - // TODO: andrus 2008/03/28 - this fails... - // assertEquals(1, context.getEntityResolver().getObjEntity("DirectToSubEntity") - // .getRelationships().size()); - // - // DirectToSubEntity direct = context.newObject(DirectToSubEntity.class); - // - // SubEntity sub = context.newObject(SubEntity.class); - // sub.setToDirectToSubEntity(direct); - // - // assertEquals(1, direct.getSubEntities().size()); - // - // context.deleteObject(sub); - // assertEquals(0, direct.getSubEntities().size()); - } - - /** * Returns a number of objects of a particular class and subclasses in the list. */ private int countObjectOfClass(List<?> objects, Class<?> aClass) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java index f93f140..a1669d1 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/access/VerticalInheritanceIT.java @@ -23,14 +23,14 @@ import org.apache.cayenne.di.Inject; import org.apache.cayenne.query.SelectQuery; import org.apache.cayenne.test.jdbc.DBHelper; import org.apache.cayenne.test.jdbc.TableHelper; -import org.apache.cayenne.testdo.inheritance.vertical.Iv1Root; -import org.apache.cayenne.testdo.inheritance.vertical.Iv1Sub1; -import org.apache.cayenne.testdo.inheritance.vertical.Iv2Sub1; -import org.apache.cayenne.testdo.inheritance.vertical.Iv2X; -import org.apache.cayenne.testdo.inheritance.vertical.IvRoot; -import org.apache.cayenne.testdo.inheritance.vertical.IvSub1; -import org.apache.cayenne.testdo.inheritance.vertical.IvSub1Sub1; -import org.apache.cayenne.testdo.inheritance.vertical.IvSub2; +import org.apache.cayenne.testdo.inheritance_vertical.Iv1Root; +import org.apache.cayenne.testdo.inheritance_vertical.Iv1Sub1; +import org.apache.cayenne.testdo.inheritance_vertical.Iv2Sub1; +import org.apache.cayenne.testdo.inheritance_vertical.Iv2X; +import org.apache.cayenne.testdo.inheritance_vertical.IvRoot; +import org.apache.cayenne.testdo.inheritance_vertical.IvSub1; +import org.apache.cayenne.testdo.inheritance_vertical.IvSub1Sub1; +import org.apache.cayenne.testdo.inheritance_vertical.IvSub2; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; @@ -46,7 +46,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -@UseServerRuntime(ServerCase.INHERTITANCE_VERTICAL_PROJECT) +@UseServerRuntime(ServerCase.INHERITANCE_VERTICAL_PROJECT) public class VerticalInheritanceIT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java index ce66e0c..354de81 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/map/ObjRelationshipIT.java @@ -25,7 +25,7 @@ import org.apache.cayenne.configuration.server.ServerRuntime; import org.apache.cayenne.di.Inject; import org.apache.cayenne.exp.ExpressionException; import org.apache.cayenne.resource.URLResource; -import org.apache.cayenne.testdo.inheritance.vertical.Iv2Sub1; +import org.apache.cayenne.testdo.inheritance_vertical.Iv2Sub1; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.apache.cayenne.util.Util; http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java index fa9010e..09a9c83 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/query/SelectQueryPrefetchRouterActionQualifiedEntityIT.java @@ -24,9 +24,9 @@ import org.apache.cayenne.exp.Expression; import org.apache.cayenne.exp.ExpressionFactory; import org.apache.cayenne.map.EntityResolver; import org.apache.cayenne.map.ObjEntity; -import org.apache.cayenne.testdo.inherit.Department; -import org.apache.cayenne.testdo.inherit.Employee; -import org.apache.cayenne.testdo.inherit.Manager; +import org.apache.cayenne.testdo.inheritance_people.Department; +import org.apache.cayenne.testdo.inheritance_people.Employee; +import org.apache.cayenne.testdo.inheritance_people.Manager; import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java index 8f5fa32..b4f4792 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/LifecycleCallbackRegistry_InheritanceIT.java @@ -34,7 +34,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; -@UseServerRuntime(ServerCase.INHERTITANCE_SINGLE_TABLE1_PROJECT) +@UseServerRuntime(ServerCase.INHERITANCE_SINGLE_TABLE1_PROJECT) public class LifecycleCallbackRegistry_InheritanceIT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java index 22f2d06..f30511f 100644 --- a/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java +++ b/cayenne-server/src/test/java/org/apache/cayenne/reflect/generic/DataObjectDescriptorFactory_InheritanceMapsIT.java @@ -32,7 +32,7 @@ import org.apache.cayenne.unit.di.server.ServerCase; import org.apache.cayenne.unit.di.server.UseServerRuntime; import org.junit.Test; -@UseServerRuntime(ServerCase.INHERTITANCE_SINGLE_TABLE1_PROJECT) +@UseServerRuntime(ServerCase.INHERITANCE_SINGLE_TABLE1_PROJECT) public class DataObjectDescriptorFactory_InheritanceMapsIT extends ServerCase { @Inject http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/AbstractPerson.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/AbstractPerson.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/AbstractPerson.java deleted file mode 100644 index 6968553..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/AbstractPerson.java +++ /dev/null @@ -1,26 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -public abstract class AbstractPerson extends org.apache.cayenne.testdo.inherit.auto._AbstractPerson { - -} - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Address.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Address.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Address.java deleted file mode 100644 index ce30ffc..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Address.java +++ /dev/null @@ -1,26 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -public class Address extends org.apache.cayenne.testdo.inherit.auto._Address { - -} - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/BaseEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/BaseEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/BaseEntity.java deleted file mode 100644 index 7d96cb3..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/BaseEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -import org.apache.cayenne.testdo.inherit.auto._BaseEntity; - -public class BaseEntity extends _BaseEntity { - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/ClientCompany.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/ClientCompany.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/ClientCompany.java deleted file mode 100644 index 1df2cfa..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/ClientCompany.java +++ /dev/null @@ -1,26 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -public class ClientCompany extends org.apache.cayenne.testdo.inherit.auto._ClientCompany { - -} - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/CustomerRepresentative.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/CustomerRepresentative.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/CustomerRepresentative.java deleted file mode 100644 index 5fd137d..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/CustomerRepresentative.java +++ /dev/null @@ -1,26 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -public class CustomerRepresentative extends org.apache.cayenne.testdo.inherit.auto._CustomerRepresentative { - -} - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Department.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Department.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Department.java deleted file mode 100644 index 547f5f2..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Department.java +++ /dev/null @@ -1,26 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -public class Department extends org.apache.cayenne.testdo.inherit.auto._Department { - -} - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/DirectToSubEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/DirectToSubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/DirectToSubEntity.java deleted file mode 100644 index fa5d4f8..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/DirectToSubEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -import org.apache.cayenne.testdo.inherit.auto._DirectToSubEntity; - -public class DirectToSubEntity extends _DirectToSubEntity { - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Employee.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Employee.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Employee.java deleted file mode 100644 index d9b15b7..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Employee.java +++ /dev/null @@ -1,26 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -public class Employee extends org.apache.cayenne.testdo.inherit.auto._Employee { - -} - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Manager.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Manager.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Manager.java deleted file mode 100644 index a6ed92d..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/Manager.java +++ /dev/null @@ -1,26 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -public class Manager extends org.apache.cayenne.testdo.inherit.auto._Manager { - -} - - - http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/People.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/People.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/People.java deleted file mode 100644 index e73f3e0..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/People.java +++ /dev/null @@ -1,36 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -import org.apache.cayenne.testdo.inherit.auto._People; - -public class People extends _People { - - private static People instance; - - private People() {} - - public static People getInstance() { - if(instance == null) { - instance = new People(); - } - - return instance; - } -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/PersonNotes.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/PersonNotes.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/PersonNotes.java deleted file mode 100644 index 3b8cfe3..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/PersonNotes.java +++ /dev/null @@ -1,25 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -import org.apache.cayenne.testdo.inherit.auto._PersonNotes; - -public class PersonNotes extends _PersonNotes { - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/RelatedEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/RelatedEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/RelatedEntity.java deleted file mode 100644 index 49427dc..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/RelatedEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -import org.apache.cayenne.testdo.inherit.auto._RelatedEntity; - -public class RelatedEntity extends _RelatedEntity { - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/SubEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/SubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/SubEntity.java deleted file mode 100644 index b55fb35..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/SubEntity.java +++ /dev/null @@ -1,25 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inherit; - -import org.apache.cayenne.testdo.inherit.auto._SubEntity; - -public class SubEntity extends _SubEntity { - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java deleted file mode 100644 index 65fae97..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_AbstractPerson.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import java.util.List; - -import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.testdo.inherit.PersonNotes; - -/** - * Class _AbstractPerson was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _AbstractPerson extends CayenneDataObject { - - public static final String NAME_PROPERTY = "name"; - public static final String PERSON_TYPE_PROPERTY = "personType"; - public static final String NOTES_PROPERTY = "notes"; - - public static final String PERSON_ID_PK_COLUMN = "PERSON_ID"; - - public void setName(String name) { - writeProperty(NAME_PROPERTY, name); - } - public String getName() { - return (String)readProperty(NAME_PROPERTY); - } - - public void setPersonType(String personType) { - writeProperty(PERSON_TYPE_PROPERTY, personType); - } - public String getPersonType() { - return (String)readProperty(PERSON_TYPE_PROPERTY); - } - - public void addToNotes(PersonNotes obj) { - addToManyTarget(NOTES_PROPERTY, obj, true); - } - public void removeFromNotes(PersonNotes obj) { - removeToManyTarget(NOTES_PROPERTY, obj, true); - } - @SuppressWarnings("unchecked") - public List<PersonNotes> getNotes() { - return (List<PersonNotes>)readProperty(NOTES_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java deleted file mode 100644 index a8f3017..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Address.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.testdo.inherit.Employee; - -/** - * Class _Address was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _Address extends CayenneDataObject { - - public static final String CITY_PROPERTY = "city"; - public static final String TO_EMPLOYEE_PROPERTY = "toEmployee"; - - public static final String ADDRESS_ID_PK_COLUMN = "ADDRESS_ID"; - - public void setCity(String city) { - writeProperty(CITY_PROPERTY, city); - } - public String getCity() { - return (String)readProperty(CITY_PROPERTY); - } - - public void setToEmployee(Employee toEmployee) { - setToOneTarget(TO_EMPLOYEE_PROPERTY, toEmployee, true); - } - - public Employee getToEmployee() { - return (Employee)readProperty(TO_EMPLOYEE_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java deleted file mode 100644 index 606860c..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_BaseEntity.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.testdo.inherit.DirectToSubEntity; -import org.apache.cayenne.testdo.inherit.RelatedEntity; - -/** - * Class _BaseEntity was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _BaseEntity extends CayenneDataObject { - - public static final String ENTITY_TYPE_PROPERTY = "entityType"; - public static final String TO_DIRECT_TO_SUB_ENTITY_PROPERTY = "toDirectToSubEntity"; - public static final String TO_RELATED_ENTITY_PROPERTY = "toRelatedEntity"; - - public static final String BASE_ENTITY_ID_PK_COLUMN = "BASE_ENTITY_ID"; - - public void setEntityType(String entityType) { - writeProperty(ENTITY_TYPE_PROPERTY, entityType); - } - public String getEntityType() { - return (String)readProperty(ENTITY_TYPE_PROPERTY); - } - - public void setToDirectToSubEntity(DirectToSubEntity toDirectToSubEntity) { - setToOneTarget(TO_DIRECT_TO_SUB_ENTITY_PROPERTY, toDirectToSubEntity, true); - } - - public DirectToSubEntity getToDirectToSubEntity() { - return (DirectToSubEntity)readProperty(TO_DIRECT_TO_SUB_ENTITY_PROPERTY); - } - - - public void setToRelatedEntity(RelatedEntity toRelatedEntity) { - setToOneTarget(TO_RELATED_ENTITY_PROPERTY, toRelatedEntity, true); - } - - public RelatedEntity getToRelatedEntity() { - return (RelatedEntity)readProperty(TO_RELATED_ENTITY_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java deleted file mode 100644 index 4112ad8..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_ClientCompany.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import java.util.List; - -import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.testdo.inherit.CustomerRepresentative; - -/** - * Class _ClientCompany was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _ClientCompany extends CayenneDataObject { - - public static final String NAME_PROPERTY = "name"; - public static final String REPRESENTATIVES_PROPERTY = "representatives"; - - public static final String CLIENT_COMPANY_ID_PK_COLUMN = "CLIENT_COMPANY_ID"; - - public void setName(String name) { - writeProperty(NAME_PROPERTY, name); - } - public String getName() { - return (String)readProperty(NAME_PROPERTY); - } - - public void addToRepresentatives(CustomerRepresentative obj) { - addToManyTarget(REPRESENTATIVES_PROPERTY, obj, true); - } - public void removeFromRepresentatives(CustomerRepresentative obj) { - removeToManyTarget(REPRESENTATIVES_PROPERTY, obj, true); - } - @SuppressWarnings("unchecked") - public List<CustomerRepresentative> getRepresentatives() { - return (List<CustomerRepresentative>)readProperty(REPRESENTATIVES_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java deleted file mode 100644 index f09dddd..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_CustomerRepresentative.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import org.apache.cayenne.testdo.inherit.AbstractPerson; -import org.apache.cayenne.testdo.inherit.ClientCompany; - -/** - * Class _CustomerRepresentative was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _CustomerRepresentative extends AbstractPerson { - - public static final String CLIENT_CONTACT_TYPE_PROPERTY = "clientContactType"; - public static final String TO_CLIENT_COMPANY_PROPERTY = "toClientCompany"; - - public static final String PERSON_ID_PK_COLUMN = "PERSON_ID"; - - public void setClientContactType(String clientContactType) { - writeProperty(CLIENT_CONTACT_TYPE_PROPERTY, clientContactType); - } - public String getClientContactType() { - return (String)readProperty(CLIENT_CONTACT_TYPE_PROPERTY); - } - - public void setToClientCompany(ClientCompany toClientCompany) { - setToOneTarget(TO_CLIENT_COMPANY_PROPERTY, toClientCompany, true); - } - - public ClientCompany getToClientCompany() { - return (ClientCompany)readProperty(TO_CLIENT_COMPANY_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java deleted file mode 100644 index 985b5fa..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Department.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import java.util.List; - -import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.testdo.inherit.Employee; -import org.apache.cayenne.testdo.inherit.Manager; - -/** - * Class _Department was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _Department extends CayenneDataObject { - - public static final String NAME_PROPERTY = "name"; - public static final String EMPLOYEES_PROPERTY = "employees"; - public static final String TO_MANAGER_PROPERTY = "toManager"; - - public static final String DEPARTMENT_ID_PK_COLUMN = "DEPARTMENT_ID"; - - public void setName(String name) { - writeProperty(NAME_PROPERTY, name); - } - public String getName() { - return (String)readProperty(NAME_PROPERTY); - } - - public void addToEmployees(Employee obj) { - addToManyTarget(EMPLOYEES_PROPERTY, obj, true); - } - public void removeFromEmployees(Employee obj) { - removeToManyTarget(EMPLOYEES_PROPERTY, obj, true); - } - @SuppressWarnings("unchecked") - public List<Employee> getEmployees() { - return (List<Employee>)readProperty(EMPLOYEES_PROPERTY); - } - - - public void setToManager(Manager toManager) { - setToOneTarget(TO_MANAGER_PROPERTY, toManager, true); - } - - public Manager getToManager() { - return (Manager)readProperty(TO_MANAGER_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java deleted file mode 100644 index 462b457..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_DirectToSubEntity.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import java.util.List; - -import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.testdo.inherit.SubEntity; - -/** - * Class _DirectToSubEntity was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _DirectToSubEntity extends CayenneDataObject { - - public static final String SUB_ENTITIES_PROPERTY = "subEntities"; - - public static final String ID_PK_COLUMN = "ID"; - - public void addToSubEntities(SubEntity obj) { - addToManyTarget(SUB_ENTITIES_PROPERTY, obj, true); - } - public void removeFromSubEntities(SubEntity obj) { - removeToManyTarget(SUB_ENTITIES_PROPERTY, obj, true); - } - @SuppressWarnings("unchecked") - public List<SubEntity> getSubEntities() { - return (List<SubEntity>)readProperty(SUB_ENTITIES_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java deleted file mode 100644 index ffc5d33..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Employee.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import java.util.List; - -import org.apache.cayenne.testdo.inherit.AbstractPerson; -import org.apache.cayenne.testdo.inherit.Address; -import org.apache.cayenne.testdo.inherit.Department; - -/** - * Class _Employee was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _Employee extends AbstractPerson { - - public static final String SALARY_PROPERTY = "salary"; - public static final String ADDRESSES_PROPERTY = "addresses"; - public static final String TO_DEPARTMENT_PROPERTY = "toDepartment"; - - public static final String PERSON_ID_PK_COLUMN = "PERSON_ID"; - - public void setSalary(Float salary) { - writeProperty(SALARY_PROPERTY, salary); - } - public Float getSalary() { - return (Float)readProperty(SALARY_PROPERTY); - } - - public void addToAddresses(Address obj) { - addToManyTarget(ADDRESSES_PROPERTY, obj, true); - } - public void removeFromAddresses(Address obj) { - removeToManyTarget(ADDRESSES_PROPERTY, obj, true); - } - @SuppressWarnings("unchecked") - public List<Address> getAddresses() { - return (List<Address>)readProperty(ADDRESSES_PROPERTY); - } - - - public void setToDepartment(Department toDepartment) { - setToOneTarget(TO_DEPARTMENT_PROPERTY, toDepartment, true); - } - - public Department getToDepartment() { - return (Department)readProperty(TO_DEPARTMENT_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java deleted file mode 100644 index 071fe66..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_Manager.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import java.util.List; - -import org.apache.cayenne.testdo.inherit.Department; -import org.apache.cayenne.testdo.inherit.Employee; - -/** - * Class _Manager was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _Manager extends Employee { - - public static final String MANAGED_DEPARTMENTS_PROPERTY = "managedDepartments"; - - public static final String PERSON_ID_PK_COLUMN = "PERSON_ID"; - - public void addToManagedDepartments(Department obj) { - addToManyTarget(MANAGED_DEPARTMENTS_PROPERTY, obj, true); - } - public void removeFromManagedDepartments(Department obj) { - removeToManyTarget(MANAGED_DEPARTMENTS_PROPERTY, obj, true); - } - @SuppressWarnings("unchecked") - public List<Department> getManagedDepartments() { - return (List<Department>)readProperty(MANAGED_DEPARTMENTS_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_People.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_People.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_People.java deleted file mode 100644 index 25fb3f6..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_People.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - - - -/** - * This class was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public class _People { -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java deleted file mode 100644 index 2cb9e5b..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_PersonNotes.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.testdo.inherit.AbstractPerson; - -/** - * Class _PersonNotes was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _PersonNotes extends CayenneDataObject { - - public static final String NOTES_PROPERTY = "notes"; - public static final String PERSON_PROPERTY = "person"; - - public static final String ID_PK_COLUMN = "ID"; - - public void setNotes(String notes) { - writeProperty(NOTES_PROPERTY, notes); - } - public String getNotes() { - return (String)readProperty(NOTES_PROPERTY); - } - - public void setPerson(AbstractPerson person) { - setToOneTarget(PERSON_PROPERTY, person, true); - } - - public AbstractPerson getPerson() { - return (AbstractPerson)readProperty(PERSON_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java deleted file mode 100644 index b85b741..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_RelatedEntity.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import java.util.List; - -import org.apache.cayenne.CayenneDataObject; -import org.apache.cayenne.testdo.inherit.BaseEntity; -import org.apache.cayenne.testdo.inherit.SubEntity; - -/** - * Class _RelatedEntity was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _RelatedEntity extends CayenneDataObject { - - public static final String BASE_ENTITIES_PROPERTY = "baseEntities"; - public static final String SUB_ENTITIES_PROPERTY = "subEntities"; - - public static final String RELATED_ENTITY_ID_PK_COLUMN = "RELATED_ENTITY_ID"; - - public void addToBaseEntities(BaseEntity obj) { - addToManyTarget(BASE_ENTITIES_PROPERTY, obj, true); - } - public void removeFromBaseEntities(BaseEntity obj) { - removeToManyTarget(BASE_ENTITIES_PROPERTY, obj, true); - } - @SuppressWarnings("unchecked") - public List<BaseEntity> getBaseEntities() { - return (List<BaseEntity>)readProperty(BASE_ENTITIES_PROPERTY); - } - - - public void addToSubEntities(SubEntity obj) { - addToManyTarget(SUB_ENTITIES_PROPERTY, obj, true); - } - public void removeFromSubEntities(SubEntity obj) { - removeToManyTarget(SUB_ENTITIES_PROPERTY, obj, true); - } - @SuppressWarnings("unchecked") - public List<SubEntity> getSubEntities() { - return (List<SubEntity>)readProperty(SUB_ENTITIES_PROPERTY); - } - - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_SubEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_SubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_SubEntity.java deleted file mode 100644 index aad546e..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inherit/auto/_SubEntity.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.apache.cayenne.testdo.inherit.auto; - -import org.apache.cayenne.testdo.inherit.BaseEntity; - -/** - * Class _SubEntity was generated by Cayenne. - * It is probably a good idea to avoid changing this class manually, - * since it may be overwritten next time code is regenerated. - * If you need to make any customizations, please use subclass. - */ -public abstract class _SubEntity extends BaseEntity { - - - public static final String BASE_ENTITY_ID_PK_COLUMN = "BASE_ENTITY_ID"; - -} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/BaseEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/BaseEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/BaseEntity.java new file mode 100644 index 0000000..41bdae1 --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/BaseEntity.java @@ -0,0 +1,25 @@ +/***************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.cayenne.testdo.inheritance; + +import org.apache.cayenne.testdo.inheritance.auto._BaseEntity; + +public class BaseEntity extends _BaseEntity { + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/DirectToSubEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/DirectToSubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/DirectToSubEntity.java new file mode 100644 index 0000000..64ef4bb --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/DirectToSubEntity.java @@ -0,0 +1,25 @@ +/***************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.cayenne.testdo.inheritance; + +import org.apache.cayenne.testdo.inheritance.auto._DirectToSubEntity; + +public class DirectToSubEntity extends _DirectToSubEntity { + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/RelatedEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/RelatedEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/RelatedEntity.java new file mode 100644 index 0000000..13e56e4 --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/RelatedEntity.java @@ -0,0 +1,25 @@ +/***************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.cayenne.testdo.inheritance; + +import org.apache.cayenne.testdo.inheritance.auto._RelatedEntity; + +public class RelatedEntity extends _RelatedEntity { + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/SubEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/SubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/SubEntity.java new file mode 100644 index 0000000..84c48d0 --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/SubEntity.java @@ -0,0 +1,25 @@ +/***************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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.apache.cayenne.testdo.inheritance; + +import org.apache.cayenne.testdo.inheritance.auto._SubEntity; + +public class SubEntity extends _SubEntity { + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java new file mode 100644 index 0000000..50f239c --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_BaseEntity.java @@ -0,0 +1,46 @@ +package org.apache.cayenne.testdo.inheritance.auto; + +import org.apache.cayenne.CayenneDataObject; +import org.apache.cayenne.testdo.inheritance.DirectToSubEntity; +import org.apache.cayenne.testdo.inheritance.RelatedEntity; + +/** + * Class _BaseEntity was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _BaseEntity extends CayenneDataObject { + + public static final String ENTITY_TYPE_PROPERTY = "entityType"; + public static final String TO_DIRECT_TO_SUB_ENTITY_PROPERTY = "toDirectToSubEntity"; + public static final String TO_RELATED_ENTITY_PROPERTY = "toRelatedEntity"; + + public static final String BASE_ENTITY_ID_PK_COLUMN = "BASE_ENTITY_ID"; + + public void setEntityType(String entityType) { + writeProperty(ENTITY_TYPE_PROPERTY, entityType); + } + public String getEntityType() { + return (String)readProperty(ENTITY_TYPE_PROPERTY); + } + + public void setToDirectToSubEntity(DirectToSubEntity toDirectToSubEntity) { + setToOneTarget(TO_DIRECT_TO_SUB_ENTITY_PROPERTY, toDirectToSubEntity, true); + } + + public DirectToSubEntity getToDirectToSubEntity() { + return (DirectToSubEntity)readProperty(TO_DIRECT_TO_SUB_ENTITY_PROPERTY); + } + + + public void setToRelatedEntity(RelatedEntity toRelatedEntity) { + setToOneTarget(TO_RELATED_ENTITY_PROPERTY, toRelatedEntity, true); + } + + public RelatedEntity getToRelatedEntity() { + return (RelatedEntity)readProperty(TO_RELATED_ENTITY_PROPERTY); + } + + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java new file mode 100644 index 0000000..d731b06 --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_DirectToSubEntity.java @@ -0,0 +1,32 @@ +package org.apache.cayenne.testdo.inheritance.auto; + +import org.apache.cayenne.CayenneDataObject; +import org.apache.cayenne.testdo.inheritance.SubEntity; + +import java.util.List; + +/** + * Class _DirectToSubEntity was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _DirectToSubEntity extends CayenneDataObject { + + public static final String SUB_ENTITIES_PROPERTY = "subEntities"; + + public static final String ID_PK_COLUMN = "ID"; + + public void addToSubEntities(SubEntity obj) { + addToManyTarget(SUB_ENTITIES_PROPERTY, obj, true); + } + public void removeFromSubEntities(SubEntity obj) { + removeToManyTarget(SUB_ENTITIES_PROPERTY, obj, true); + } + @SuppressWarnings("unchecked") + public List<SubEntity> getSubEntities() { + return (List<SubEntity>)readProperty(SUB_ENTITIES_PROPERTY); + } + + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java new file mode 100644 index 0000000..4cd2462 --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_RelatedEntity.java @@ -0,0 +1,46 @@ +package org.apache.cayenne.testdo.inheritance.auto; + +import org.apache.cayenne.CayenneDataObject; +import org.apache.cayenne.testdo.inheritance.BaseEntity; +import org.apache.cayenne.testdo.inheritance.SubEntity; + +import java.util.List; + +/** + * Class _RelatedEntity was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _RelatedEntity extends CayenneDataObject { + + public static final String BASE_ENTITIES_PROPERTY = "baseEntities"; + public static final String SUB_ENTITIES_PROPERTY = "subEntities"; + + public static final String RELATED_ENTITY_ID_PK_COLUMN = "RELATED_ENTITY_ID"; + + public void addToBaseEntities(BaseEntity obj) { + addToManyTarget(BASE_ENTITIES_PROPERTY, obj, true); + } + public void removeFromBaseEntities(BaseEntity obj) { + removeToManyTarget(BASE_ENTITIES_PROPERTY, obj, true); + } + @SuppressWarnings("unchecked") + public List<BaseEntity> getBaseEntities() { + return (List<BaseEntity>)readProperty(BASE_ENTITIES_PROPERTY); + } + + + public void addToSubEntities(SubEntity obj) { + addToManyTarget(SUB_ENTITIES_PROPERTY, obj, true); + } + public void removeFromSubEntities(SubEntity obj) { + removeToManyTarget(SUB_ENTITIES_PROPERTY, obj, true); + } + @SuppressWarnings("unchecked") + public List<SubEntity> getSubEntities() { + return (List<SubEntity>)readProperty(SUB_ENTITIES_PROPERTY); + } + + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_SubEntity.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_SubEntity.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_SubEntity.java new file mode 100644 index 0000000..8ede368 --- /dev/null +++ b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/auto/_SubEntity.java @@ -0,0 +1,16 @@ +package org.apache.cayenne.testdo.inheritance.auto; + +import org.apache.cayenne.testdo.inheritance.BaseEntity; + +/** + * Class _SubEntity was generated by Cayenne. + * It is probably a good idea to avoid changing this class manually, + * since it may be overwritten next time code is regenerated. + * If you need to make any customizations, please use subclass. + */ +public abstract class _SubEntity extends BaseEntity { + + + public static final String BASE_ENTITY_ID_PK_COLUMN = "BASE_ENTITY_ID"; + +} http://git-wip-us.apache.org/repos/asf/cayenne/blob/0b6a4240/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/InheritanceVertical.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/InheritanceVertical.java b/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/InheritanceVertical.java deleted file mode 100644 index b22fbc2..0000000 --- a/cayenne-server/src/test/java/org/apache/cayenne/testdo/inheritance/vertical/InheritanceVertical.java +++ /dev/null @@ -1,36 +0,0 @@ -/***************************************************************** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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.apache.cayenne.testdo.inheritance.vertical; - -import org.apache.cayenne.testdo.inheritance.vertical.auto._InheritanceVertical; - -public class InheritanceVertical extends _InheritanceVertical { - - private static InheritanceVertical instance; - - private InheritanceVertical() {} - - public static InheritanceVertical getInstance() { - if(instance == null) { - instance = new InheritanceVertical(); - } - - return instance; - } -}
