This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 927b60945 Merge pull request #603 from
stariy95/5.0-FEATURE-CAY-2816-exists-expression
add 208199e6a CAY-2667 Fix Issues with Generic Vertical Inheritance
new d2169b442 Merge pull request #621 from
apache/5.0-FIX-CAY-2667-generic-inheritance
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cayenne/access/DataContextObjectCreator.java | 2 +-
.../org/apache/cayenne/reflect/ArcProperty.java | 3 +-
.../apache/cayenne/reflect/ClassDescriptor.java | 17 +++++--
.../reflect/LazyClassDescriptorDecorator.java | 5 +-
.../cayenne/reflect/PersistentDescriptor.java | 35 ++++---------
.../reflect/PersistentDescriptorFactory.java | 8 +--
.../apache/cayenne/util/DeepMergeOperation.java | 2 +-
.../cayenne/access/VerticalInheritanceIT.java | 34 +++++++++++++
...ctDescriptorFactory_VerticalInheritanceIT.java} | 57 +++++++---------------
.../test/resources/inheritance-vertical.map.xml | 39 +++++++++++++++
10 files changed, 125 insertions(+), 77 deletions(-)
copy
cayenne/src/test/java/org/apache/cayenne/reflect/generic/{PersistentObjectDescriptorFactory_InheritanceMapsIT.java
=> PersistentObjectDescriptorFactory_VerticalInheritanceIT.java} (51%)
