This is an automated email from the ASF dual-hosted git repository. ntimofeev pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit d2169b442d4426de21315d50300b9ed24ca15fad Merge: 927b60945 208199e6a Author: Nikita Timofeev <[email protected]> AuthorDate: Tue Jul 30 11:46:58 2024 +0400 Merge pull request #621 from apache/5.0-FIX-CAY-2667-generic-inheritance CAY-2667 Fix Issues with Generic Vertical Inheritance .../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 +++++++++++ ...ectDescriptorFactory_VerticalInheritanceIT.java | 65 ++++++++++++++++++++++ .../test/resources/inheritance-vertical.map.xml | 39 +++++++++++++ 10 files changed, 172 insertions(+), 38 deletions(-)
