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 9c7f4187a Merge pull request #597 from
stariy95/5.0-CAY-2833-cayenne-path
new ae23480a9 CAY-2845 Deprecate DataObject in favour of Persistent -
initial pass
new cdcf53982 CAY-2845 Deprecate DataObject in favour of Persistent -
refactor persistent descriptor factory
new 2944693c1 CAY-2845 Deprecate DataObject in favour of Persistent - fix
JavaDocs and main documentation - fix naming and messages
new f8cc09b8f CAY-2845 Deprecate DataObject in favour of Persistent -
update test classes
new 8b58c6465 CAY-2845 Deprecate DataObject in favour of Persistent -
remove mentions of DataObject
new 0ca71e2a7 CAY-2845 Deprecate DataObject in favour of Persistent -
release and upgrade notes
The 6 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:
RELEASE-NOTES.txt | 1 +
UPGRADE.txt | 3 +
...enneGeneratorTaskCrossMapRelationshipsTest.java | 2 +-
.../cayenne/tools/CayenneGeneratorTaskTest.java | 14 +-
.../org/apache/cayenne/tools/velotemplate.vm | 2 +-
cayenne-ant/src/test/resources/testmap.map.xml | 12 +-
.../cayenne/cache/invalidation/db/auto/_E1.java | 4 +-
.../cayenne/cache/invalidation/db/auto/_E2.java | 4 +-
.../org/apache/cayenne/gen/EntityArtifact.java | 4 +-
.../java/org/apache/cayenne/gen/ImportUtils.java | 2 +-
.../templates/v4_1/datamap-singleclass.vm | 2 +-
.../resources/templates/v4_1/datamap-subclass.vm | 2 +-
.../resources/templates/v4_1/datamap-superclass.vm | 2 +-
.../main/resources/templates/v4_1/singleclass.vm | 2 +-
.../src/main/resources/templates/v4_1/subclass.vm | 2 +-
.../main/resources/templates/v4_1/superclass.vm | 2 +-
.../cayenne/gen/ClassGenerationActionTest.java | 2 +-
.../resources/templateTest/_auto/_ObjEntity.java | 4 +-
.../org/apache/cayenne/commitlog/CommitLog.java | 2 +-
.../cayenne/commitlog/db/auto/_AuditLog.java | 10 +-
.../cayenne/commitlog/db/auto/_Auditable1.java | 10 +-
.../cayenne/commitlog/db/auto/_Auditable2.java | 10 +-
.../cayenne/commitlog/db/auto/_Auditable3.java | 10 +-
.../cayenne/commitlog/db/auto/_Auditable4.java | 10 +-
.../commitlog/db/auto/_AuditableChild1.java | 10 +-
.../commitlog/db/auto/_AuditableChild1x.java | 10 +-
.../commitlog/db/auto/_AuditableChild3.java | 10 +-
.../org/apache/cayenne/commitlog/db/auto/_E1.java | 11 +-
.../org/apache/cayenne/commitlog/db/auto/_E2.java | 11 +-
.../org/apache/cayenne/commitlog/db/auto/_E3.java | 10 +-
.../org/apache/cayenne/commitlog/db/auto/_E4.java | 10 +-
.../org/apache/cayenne/crypto/db/auto/_Table1.java | 4 +-
.../org/apache/cayenne/crypto/db/auto/_Table2.java | 4 +-
.../org/apache/cayenne/crypto/db/auto/_Table3.java | 4 +-
.../org/apache/cayenne/crypto/db/auto/_Table4.java | 4 +-
.../org/apache/cayenne/crypto/db/auto/_Table5.java | 4 +-
.../org/apache/cayenne/crypto/db/auto/_Table6.java | 4 +-
.../org/apache/cayenne/crypto/db/auto/_Table7.java | 4 +-
.../org/apache/cayenne/crypto/db/auto/_Table8.java | 4 +-
.../cayenne/dbsync/merge/MergerFactoryIT.java | 4 +-
.../cayenne/dbsync/merge/token/ValueForNullIT.java | 9 +-
.../lifecycle/relationship/ObjectIdBatchFault.java | 14 +-
.../relationship/ObjectIdBatchSourceItem.java | 8 +-
.../ObjectIdRelationshipBatchFaultingStrategy.java | 9 +-
.../ObjectIdRelationshipFaultingStrategy.java | 4 +-
.../relationship/ObjectIdRelationshipFilter.java | 8 +-
.../relationship/ObjectIdRelationshipHandler.java | 10 +-
.../org/apache/cayenne/lifecycle/db/auto/_E1.java | 4 +-
.../org/apache/cayenne/lifecycle/db/auto/_E2.java | 4 +-
.../org/apache/cayenne/lifecycle/db/auto/_E3.java | 4 +-
.../org/apache/cayenne/lifecycle/db/auto/_E4.java | 4 +-
.../apache/cayenne/lifecycle/db/auto/_SortDep.java | 4 +-
.../cayenne/lifecycle/db/auto/_SortRoot.java | 4 +-
.../cayenne/lifecycle/db/auto/_UuidRoot1.java | 4 +-
.../project/validation/NameValidationHelper.java | 18 +-
.../project/validation/ObjAttributeValidator.java | 2 +-
.../project/validation/ObjEntityValidator.java | 4 +-
.../validation/ObjRelationshipValidator.java | 2 +-
.../org/apache/cayenne/velocity/BindDirective.java | 4 +-
.../velocity/VelocitySQLTemplateProcessorTest.java | 16 +-
.../java/org/apache/cayenne/BaseDataObject.java | 704 +-------------------
.../src/main/java/org/apache/cayenne/Cayenne.java | 70 +-
.../main/java/org/apache/cayenne/DataObject.java | 178 +-----
.../src/main/java/org/apache/cayenne/DataRow.java | 9 +-
.../java/org/apache/cayenne/EmbeddableObject.java | 2 +-
...ataObject.java => GenericPersistentObject.java} | 16 +-
...DataObject.java => HybridPersistentObject.java} | 15 +-
.../main/java/org/apache/cayenne/Persistent.java | 177 ++++-
.../java/org/apache/cayenne/PersistentObject.java | 709 ++++++++++++++++++++-
.../org/apache/cayenne/access/DataContext.java | 30 +-
.../apache/cayenne/access/DataContextDelegate.java | 16 +-
.../org/apache/cayenne/access/DataDomainQuery.java | 2 +-
.../org/apache/cayenne/access/DataRowStore.java | 6 +-
.../cayenne/access/HierarchicalObjectResolver.java | 2 +-
.../cayenne/access/IncrementalFaultList.java | 18 +-
.../org/apache/cayenne/access/NoopDelegate.java | 18 +-
.../org/apache/cayenne/access/ObjectResolver.java | 18 +-
.../org/apache/cayenne/access/ObjectStore.java | 72 +--
.../java/org/apache/cayenne/access/ToManyList.java | 16 +-
.../java/org/apache/cayenne/access/ToManyMap.java | 8 +-
.../java/org/apache/cayenne/access/ToManySet.java | 16 +-
.../java/org/apache/cayenne/access/ToOneFault.java | 2 +-
.../cayenne/access/flush/PostprocessVisitor.java | 10 +-
.../cayenne/access/jdbc/LimitResultIterator.java | 1 -
.../cayenne/ashwood/AshwoodEntitySorter.java | 2 +-
.../org/apache/cayenne/exp/parser/ASTDbIdPath.java | 7 +-
.../org/apache/cayenne/exp/parser/ASTObjPath.java | 16 +-
.../org/apache/cayenne/graph/ChildDiffLoader.java | 8 +-
.../main/java/org/apache/cayenne/map/DataMap.java | 2 +-
.../org/apache/cayenne/map/EntityResolver.java | 4 +-
.../java/org/apache/cayenne/map/ObjEntity.java | 22 +-
.../org/apache/cayenne/query/DeleteBatchQuery.java | 4 +-
.../org/apache/cayenne/query/InsertBatchQuery.java | 2 +-
.../java/org/apache/cayenne/query/Ordering.java | 2 +-
.../org/apache/cayenne/query/QueryMetadata.java | 2 +-
.../java/org/apache/cayenne/query/SQLSelect.java | 2 +-
.../java/org/apache/cayenne/reflect/Accessor.java | 2 +-
.../apache/cayenne/reflect/BaseToManyProperty.java | 4 +-
.../apache/cayenne/reflect/BaseToOneProperty.java | 2 +-
.../cayenne/reflect/PersistentDescriptor.java | 11 +-
.../reflect/generic/DataObjectDescriptor.java | 48 --
...Accessor.java => PersistentObjectAccessor.java} | 41 +-
...java => PersistentObjectAttributeProperty.java} | 4 +-
...erty.java => PersistentObjectBaseProperty.java} | 28 +-
...java => PersistentObjectDescriptorFactory.java} | 38 +-
...java => PersistentObjectToManyMapProperty.java} | 6 +-
...ty.java => PersistentObjectToManyProperty.java} | 12 +-
...rty.java => PersistentObjectToOneProperty.java} | 12 +-
.../apache/cayenne/template/parser/ASTMethod.java | 2 +
.../apache/cayenne/util/PersistentObjectList.java | 4 +-
.../apache/cayenne/util/PersistentObjectSet.java | 4 +-
.../apache/cayenne/util/ShallowMergeOperation.java | 2 +-
.../test/java/org/apache/cayenne/CayenneIT.java | 4 +-
... => CayennePersistentObjectFlattenedRelIT.java} | 2 +-
...bjectIT.java => CayennePersistentObjectIT.java} | 10 +-
...ava => CayennePersistentObjectInContextIT.java} | 8 +-
...ava => CayennePersistentObjectReflexiveIT.java} | 2 +-
...=> CayennePersistentObjectRelationshipsIT.java} | 2 +-
...ennePersistentObjectSetToManyCollectionIT.java} | 2 +-
...=> CayennePersistentObjectSetToManyListIT.java} | 8 +-
... => CayennePersistentObjectSetToManyMapIT.java} | 2 +-
... => CayennePersistentObjectSetToManySetIT.java} | 2 +-
...va => CayennePersistentObjectValidationIT.java} | 2 +-
.../java/org/apache/cayenne/GenericMappingIT.java | 12 +-
...ObjectIT.java => HybridPersistentObjectIT.java} | 2 +-
.../java/org/apache/cayenne/MockDataObject.java | 147 -----
.../org/apache/cayenne/MockPersistentObject.java | 3 +-
...T.java => PersistentObjectSerializationIT.java} | 30 +-
.../access/DataContextDelegateSharedCacheIT.java | 10 +-
.../apache/cayenne/access/DataContextExtrasIT.java | 5 +-
.../org/apache/cayenne/access/DataContextIT.java | 6 +-
.../access/DataContextObjectTrackingIT.java | 6 +-
.../access/DataContextPrefetchExtrasIT.java | 18 +-
.../access/DataContextProcedureQueryIT.java | 2 +-
.../cayenne/access/DataContextQueryCachingIT.java | 8 +-
.../cayenne/access/DataContextSQLTemplateIT.java | 2 +-
.../org/apache/cayenne/access/JointPrefetchIT.java | 10 +-
.../cayenne/access/MockDataContextDelegate.java | 16 +-
.../cayenne/access/NestedDataContextReadIT.java | 5 +-
.../org/apache/cayenne/access/ObjectStoreIT.java | 12 +-
.../access/SimpleIdIncrementalFaultListIT.java | 6 +-
.../SimpleIdIncrementalFaultListPrefetchIT.java | 12 +-
.../org/apache/cayenne/access/ToManyListIT.java | 6 +-
.../apache/cayenne/exp/Expression_ParamsTest.java | 12 +-
.../org/apache/cayenne/exp/parser/ASTDbPathIT.java | 4 +-
.../org/apache/cayenne/exp/parser/ASTEqualIT.java | 2 +-
.../apache/cayenne/exp/parser/ASTObjPathTest.java | 4 +-
.../cayenne/map/EntityResolverGenericStackIT.java | 4 +-
.../org/apache/cayenne/map/EntityResolverIT.java | 2 +-
.../org/apache/cayenne/map/MockEntityResolver.java | 4 +-
.../java/org/apache/cayenne/map/ObjEntityIT.java | 4 +-
.../apache/cayenne/query/ObjectIdQueryTest.java | 2 +-
.../org/apache/cayenne/query/ProcedureCallIT.java | 2 +-
.../cayenne/query/RelationshipQueryTest.java | 2 +-
... => PersistentObjectAttributePropertyTest.java} | 6 +-
...va => PersistentObjectDescriptorFactoryIT.java} | 6 +-
...ObjectDescriptorFactory_InheritanceMapsIT.java} | 10 +-
.../template/CayenneSQLTemplateProcessorTest.java | 16 +-
.../testdo/annotation/auto/_ArtistAnnotation.java | 12 +-
.../testdo/array_type/auto/_ArrayTestEntity.java | 15 +-
.../testdo/binary_pk/auto/_BinaryPKTest1.java | 15 +-
.../testdo/binary_pk/auto/_BinaryPKTest2.java | 15 +-
.../apache/cayenne/testdo/cay_2032/auto/_Team.java | 15 +-
.../cayenne/testdo/cay_2032/auto/_Users.java | 15 +-
.../cayenne/testdo/cay_2641/auto/_ArtistLazy.java | 12 +-
.../testdo/cay_2641/auto/_PaintingLazy.java | 12 +-
.../cayenne/testdo/cay_2666/auto/_CAY2666.java | 10 +-
.../testdo/compound/auto/_CharFkTestEntity.java | 12 +-
.../testdo/compound/auto/_CharPkTestEntity.java | 10 +-
.../compound/auto/_CompoundFkTestEntity.java | 12 +-
.../testdo/compound/auto/_CompoundIntPk.java | 10 +-
.../testdo/compound/auto/_CompoundOrder.java | 12 +-
.../testdo/compound/auto/_CompoundOrderLine.java | 48 +-
.../compound/auto/_CompoundOrderLineInfo.java | 15 +-
.../compound/auto/_CompoundPkTestEntity.java | 10 +-
.../testdo/date_time/auto/_CalendarEntity.java | 15 +-
.../testdo/date_time/auto/_DateTestEntity.java | 15 +-
.../cayenne/testdo/db1/auto/_CrossdbM1E1.java | 12 +-
.../cayenne/testdo/db2/auto/_CrossdbM2E1.java | 12 +-
.../cayenne/testdo/db2/auto/_CrossdbM2E2.java | 12 +-
.../testdo/deleterules/auto/_DeleteCascade.java | 15 +-
.../testdo/deleterules/auto/_DeleteDeny.java | 15 +-
.../testdo/deleterules/auto/_DeleteNullify.java | 15 +-
.../testdo/deleterules/auto/_DeleteRule.java | 15 +-
.../testdo/embeddable/auto/_EmbedChild.java | 6 +-
.../testdo/embeddable/auto/_EmbedEntity1.java | 10 +-
.../testdo/embeddable/auto/_EmbedEntity2.java | 9 +-
.../cayenne/testdo/embeddable/auto/_EmbedRoot.java | 10 +-
.../cayenne/testdo/enum_test/auto/_EnumEntity.java | 15 +-
.../testdo/enum_test/auto/_EnumEntity2.java | 15 +-
.../testdo/enum_test/auto/_EnumEntity3.java | 12 +-
.../extended_type/auto/_ExtendedTypeEntity.java | 15 +-
.../generated/auto/_GeneratedColumnCompKey.java | 12 +-
.../generated/auto/_GeneratedColumnCompMaster.java | 10 +-
.../testdo/generated/auto/_GeneratedColumnDep.java | 10 +-
.../generated/auto/_GeneratedColumnTest2.java | 10 +-
.../generated/auto/_GeneratedColumnTestEntity.java | 10 +-
.../testdo/generated/auto/_GeneratedF1.java | 10 +-
.../testdo/generated/auto/_GeneratedF2.java | 10 +-
.../testdo/generated/auto/_GeneratedReflexive.java | 9 +-
.../cayenne/testdo/hybrid/auto/_HybridEntity1.java | 14 +-
.../cayenne/testdo/hybrid/auto/_HybridEntity2.java | 14 +-
.../testdo/inheritance/auto/_BaseEntity.java | 15 +-
.../inheritance/auto/_DirectToSubEntity.java | 15 +-
.../testdo/inheritance/auto/_RelatedEntity.java | 15 +-
.../testdo/inheritance/auto/_SubEntity.java | 11 +-
.../testdo/inheritance_flat/auto/_Group.java | 8 +-
.../inheritance_flat/auto/_GroupProperties.java | 11 +-
.../testdo/inheritance_flat/auto/_Role.java | 11 +-
.../testdo/inheritance_flat/auto/_User.java | 8 +-
.../inheritance_flat/auto/_UserProperties.java | 11 +-
.../auto/_AbstractSuperEntity.java | 4 +-
.../inheritance_people/auto/_AbstractPerson.java | 15 +-
.../testdo/inheritance_people/auto/_Address.java | 15 +-
.../inheritance_people/auto/_ClientCompany.java | 15 +-
.../auto/_CustomerRepresentative.java | 11 +-
.../inheritance_people/auto/_Department.java | 15 +-
.../testdo/inheritance_people/auto/_Employee.java | 10 +-
.../testdo/inheritance_people/auto/_Manager.java | 11 +-
.../inheritance_people/auto/_PersonNotes.java | 15 +-
.../testdo/inheritance_vertical/auto/_Iv1Root.java | 10 +-
.../testdo/inheritance_vertical/auto/_Iv1Sub1.java | 6 +-
.../testdo/inheritance_vertical/auto/_Iv2Root.java | 10 +-
.../testdo/inheritance_vertical/auto/_Iv2Sub1.java | 5 +-
.../testdo/inheritance_vertical/auto/_Iv2X.java | 10 +-
.../inheritance_vertical/auto/_IvAbstract.java | 10 +-
.../testdo/inheritance_vertical/auto/_IvBase.java | 12 +-
.../inheritance_vertical/auto/_IvBaseWithLock.java | 10 +-
.../inheritance_vertical/auto/_IvConcrete.java | 5 +-
.../inheritance_vertical/auto/_IvGenKeyRoot.java | 10 +-
.../inheritance_vertical/auto/_IvGenKeySub.java | 6 +-
.../testdo/inheritance_vertical/auto/_IvImpl.java | 5 +-
.../inheritance_vertical/auto/_IvImplWithLock.java | 5 +-
.../testdo/inheritance_vertical/auto/_IvOther.java | 9 +-
.../testdo/inheritance_vertical/auto/_IvRoot.java | 10 +-
.../testdo/inheritance_vertical/auto/_IvSub1.java | 6 +-
.../inheritance_vertical/auto/_IvSub1Sub1.java | 6 +-
.../testdo/inheritance_vertical/auto/_IvSub2.java | 6 +-
.../testdo/inheritance_vertical/auto/_IvSub3.java | 5 +-
.../inheritance_with_enum/auto/_Dependent.java | 15 +-
.../testdo/inheritance_with_enum/auto/_Root.java | 14 +-
.../testdo/inheritance_with_enum/auto/_Sub.java | 11 +-
.../testdo/java8/auto/_DurationTestEntity.java | 116 ++--
.../testdo/java8/auto/_LocalDateTestEntity.java | 15 +-
.../java8/auto/_LocalDateTimeTestEntity.java | 15 +-
.../testdo/java8/auto/_LocalTimeTestEntity.java | 15 +-
.../testdo/java8/auto/_PeriodTestEntity.java | 12 +-
.../cayenne/testdo/json/auto/_JsonOther.java | 23 +-
.../cayenne/testdo/json/auto/_JsonVarchar.java | 23 +-
.../apache/cayenne/testdo/lazy/auto/_Lazyblob.java | 12 +-
.../lifecycle_callbacks_order/auto/_Lifecycle.java | 15 +-
.../testdo/lifecycles/auto/_Lifecycles.java | 15 +-
.../cayenne/testdo/lob/auto/_BlobTestEntity.java | 15 +-
.../cayenne/testdo/lob/auto/_ClobTestEntity.java | 15 +-
.../cayenne/testdo/lob/auto/_ClobTestRelation.java | 11 +-
.../cayenne/testdo/lob/auto/_NClobTestEntity.java | 15 +-
.../testdo/locking/auto/_LockingHelper.java | 15 +-
.../testdo/locking/auto/_RelLockingTestEntity.java | 15 +-
.../locking/auto/_SimpleLockingTestEntity.java | 14 +-
.../testdo/map_to_many/auto/_IdMapToMany.java | 15 +-
.../map_to_many/auto/_IdMapToManyTarget.java | 15 +-
.../testdo/map_to_many/auto/_MapToMany.java | 15 +-
.../testdo/map_to_many/auto/_MapToManyTarget.java | 15 +-
.../meaningful_pk/auto/_MeaningfulPKDep.java | 8 +-
.../meaningful_pk/auto/_MeaningfulPKTest1.java | 8 +-
.../testdo/meaningful_pk/auto/_MeaningfulPk.java | 8 +-
.../meaningful_pk/auto/_MeaningfulPkDep2.java | 8 +-
.../meaningful_pk/auto/_MeaningfulPkTest2.java | 8 +-
.../testdo/misc_types/auto/_ArraysEntity.java | 15 +-
.../testdo/misc_types/auto/_CharacterEntity.java | 15 +-
.../misc_types/auto/_SerializableEntity.java | 15 +-
.../auto/_MixedPersistenceStrategy.java | 15 +-
.../auto/_MixedPersistenceStrategy2.java | 15 +-
.../apache/cayenne/testdo/mt/auto/_MtTable1.java | 15 +-
.../cayenne/testdo/mt/auto/_MtTable1Subclass1.java | 11 +-
.../cayenne/testdo/mt/auto/_MtTable1Subclass2.java | 11 +-
.../apache/cayenne/testdo/mt/auto/_MtTable2.java | 15 +-
.../apache/cayenne/testdo/mt/auto/_MtTable3.java | 14 +-
.../apache/cayenne/testdo/mt/auto/_MtTable4.java | 15 +-
.../apache/cayenne/testdo/mt/auto/_MtTable5.java | 15 +-
.../cayenne/testdo/no_pk/auto/_NoPkTestEntity.java | 11 +-
.../numeric_types/auto/_BigDecimalEntity.java | 12 +-
.../numeric_types/auto/_BigIntegerEntity.java | 12 +-
.../numeric_types/auto/_BitNumberTestEntity.java | 12 +-
.../testdo/numeric_types/auto/_BitTestEntity.java | 12 +-
.../numeric_types/auto/_BooleanTestEntity.java | 12 +-
.../testdo/numeric_types/auto/_DecimalPKTest1.java | 10 +-
.../numeric_types/auto/_DecimalPKTestEntity.java | 10 +-
.../testdo/numeric_types/auto/_LongEntity.java | 12 +-
.../numeric_types/auto/_SmallintTestEntity.java | 12 +-
.../numeric_types/auto/_TinyintTestEntity.java | 12 +-
.../cayenne/testdo/oneway/auto/_OnewayTable1.java | 15 +-
.../cayenne/testdo/oneway/auto/_OnewayTable2.java | 11 +-
.../cayenne/testdo/oneway/auto/_OnewayTable3.java | 15 +-
.../cayenne/testdo/oneway/auto/_OnewayTable4.java | 15 +-
.../primitive/auto/_PrimitivesTestEntity.java | 14 +-
.../cayenne/testdo/qualified/auto/_Qualified1.java | 15 +-
.../cayenne/testdo/qualified/auto/_Qualified2.java | 15 +-
.../cayenne/testdo/qualified/auto/_Qualified3.java | 15 +-
.../cayenne/testdo/qualified/auto/_Qualified4.java | 15 +-
.../cayenne/testdo/quotemap/auto/_QuoteAdress.java | 15 +-
.../testdo/quotemap/auto/_Quote_Person.java | 14 +-
.../cayenne/testdo/reflexive/auto/_Other.java | 19 +-
.../cayenne/testdo/reflexive/auto/_Reflexive.java | 14 +-
.../cayenne/testdo/relationships/auto/_E1.java | 10 +-
.../cayenne/testdo/relationships/auto/_E2.java | 10 +-
.../relationships/auto/_FkOfDifferentType.java | 12 +-
.../testdo/relationships/auto/_MeaningfulFK.java | 12 +-
.../relationships/auto/_ReflexiveAndToOne.java | 11 +-
.../relationships/auto/_RelationshipHelper.java | 12 +-
.../relationships_activity/auto/_Activity.java | 15 +-
.../auto/_ActivityResult.java | 10 +-
.../relationships_child_master/auto/_Child.java | 15 +-
.../relationships_child_master/auto/_Master.java | 15 +-
.../relationships_clob/auto/_ClobDetail.java | 15 +-
.../relationships_clob/auto/_ClobMaster.java | 15 +-
.../auto/_CollectionToMany.java | 12 +-
.../auto/_CollectionToManyTarget.java | 12 +-
.../auto/_DeleteRuleFlatA.java | 15 +-
.../auto/_DeleteRuleFlatB.java | 15 +-
.../auto/_DeleteRuleTest1.java | 15 +-
.../auto/_DeleteRuleTest2.java | 15 +-
.../auto/_DeleteRuleTest3.java | 15 +-
.../relationships_flattened/auto/_Entity1.java | 12 +-
.../relationships_flattened/auto/_Entity2.java | 13 +-
.../relationships_flattened/auto/_Entity3.java | 13 +-
.../auto/_FlattenedCircular.java | 11 +-
.../auto/_FlattenedTest1.java | 12 +-
.../auto/_FlattenedTest2.java | 12 +-
.../auto/_FlattenedTest3.java | 12 +-
.../auto/_FlattenedTest4.java | 15 +-
.../auto/_FlattenedTest5.java | 12 +-
.../auto/_Author.java | 10 +-
.../auto/_SelfRelationship.java | 10 +-
.../auto/_SelfRelationshipSub.java | 6 +
.../auto/_Song.java | 10 +-
.../relationships_set_to_many/auto/_SetToMany.java | 15 +-
.../auto/_SetToManyTarget.java | 15 +-
.../auto/_ToManyFkDep.java | 14 +-
.../auto/_ToManyFkRoot.java | 14 +-
.../auto/_ToManyRoot2.java | 15 +-
.../relationships_to_one_fk/auto/_ToOneFK1.java | 15 +-
.../relationships_to_one_fk/auto/_ToOneFK2.java | 15 +-
.../testdo/return_types/auto/_ReturnTypesMap1.java | 14 +-
.../testdo/return_types/auto/_ReturnTypesMap2.java | 15 +-
.../return_types/auto/_ReturnTypesMapLobs1.java | 15 +-
.../testdo/soft_delete/auto/_SoftDelete.java | 15 +-
.../table_primitives/auto/_TablePrimitives.java | 14 +-
...ArtDataObject.java => ArtPersistentObject.java} | 4 +-
.../cayenne/testdo/testmap/auto/_ArtGroup.java | 4 +-
.../cayenne/testdo/testmap/auto/_Artist.java | 4 +-
.../testdo/testmap/auto/_ArtistCallback.java | 4 +-
.../testdo/testmap/auto/_ArtistExhibit.java | 4 +-
.../apache/cayenne/testdo/testmap/auto/_Award.java | 7 +-
.../testdo/testmap/auto/_CompoundPainting.java | 4 +-
.../testmap/auto/_CompoundPaintingLongNames.java | 4 +-
.../cayenne/testdo/testmap/auto/_Exhibit.java | 4 +-
.../cayenne/testdo/testmap/auto/_Gallery.java | 4 +-
.../auto/_MeaningfulGeneratedColumnTestEntity.java | 4 +-
.../testdo/testmap/auto/_NullTestEntity.java | 4 +-
.../cayenne/testdo/testmap/auto/_Painting.java | 4 +-
.../cayenne/testdo/testmap/auto/_Painting1.java | 4 +-
.../cayenne/testdo/testmap/auto/_PaintingInfo.java | 4 +-
.../cayenne/testdo/testmap/auto/_ROArtist.java | 4 +-
.../cayenne/testdo/testmap/auto/_ROPainting.java | 4 +-
.../testdo/testmap/auto/_RWCompoundPainting.java | 4 +-
.../cayenne/testdo/testmap/auto/_SubPainting.java | 4 +-
.../apache/cayenne/testdo/things/auto/_Bag.java | 31 +-
.../apache/cayenne/testdo/things/auto/_Ball.java | 14 +-
.../apache/cayenne/testdo/things/auto/_Box.java | 23 +-
.../cayenne/testdo/things/auto/_BoxInfo.java | 15 +-
.../apache/cayenne/testdo/things/auto/_Thing.java | 22 +-
.../cayenne/testdo/toone/auto/_TooneDep.java | 15 +-
.../cayenne/testdo/toone/auto/_TooneMaster.java | 15 +-
.../unsupported_distinct_types/auto/_Customer.java | 15 +-
.../unsupported_distinct_types/auto/_Product.java | 14 +-
.../cayenne/testdo/uuid/auto/_UuidPkEntity.java | 12 +-
.../cayenne/testdo/uuid/auto/_UuidTestEntity.java | 15 +-
.../testdo/weighted_sort/auto/_SortDep.java | 15 +-
.../testdo/weighted_sort/auto/_SortRoot.java | 15 +-
.../org/apache/cayenne/unit/jira/CAY_743Test.java | 3 +-
cayenne/src/test/resources/array-type.map.xml | 2 +-
cayenne/src/test/resources/binary-pk.map.xml | 2 +-
.../src/test/resources/cay2641/datamapLazy.map.xml | 13 -
cayenne/src/test/resources/compound.map.xml | 8 +-
cayenne/src/test/resources/date-time.map.xml | 2 +-
cayenne/src/test/resources/extended-type.map.xml | 2 +-
cayenne/src/test/resources/generated.map.xml | 8 +-
.../src/test/resources/hybrid-data-object.map.xml | 6 +-
cayenne/src/test/resources/json.map.xml | 2 +-
cayenne/src/test/resources/lob.map.xml | 2 +-
cayenne/src/test/resources/misc-types.map.xml | 2 +-
.../resources/mixed-persistence-strategy.map.xml | 2 +-
cayenne/src/test/resources/no-pk.map.xml | 2 +-
cayenne/src/test/resources/numeric-types.map.xml | 2 +-
.../configuration/xml/testConfigMap4.map.xml | 6 +-
cayenne/src/test/resources/primitive.map.xml | 2 +-
cayenne/src/test/resources/return-types.map.xml | 8 +-
cayenne/src/test/resources/testmap.map.xml | 6 +-
cayenne/src/test/resources/things.map.xml | 11 +-
cayenne/src/test/resources/uuid.map.xml | 1 -
.../asciidoc/_cayenne-guide/part1/modeler.adoc | 6 +-
.../asciidoc/_cayenne-guide/part2/expressions.adoc | 2 +-
.../asciidoc/_cayenne-guide/part2/lifecycle.adoc | 4 +-
.../_cayenne-guide/part2/objectContext.adoc | 10 +-
.../_cayenne-guide/part2/queries/ejbql.adoc | 4 +-
.../_getting-started-guide/persistent-objects.adoc | 4 +-
.../tools/CayenneGeneratorIntegrationTest.java | 14 +-
.../org/apache/cayenne/tools/velotemplate.vm | 2 +-
.../src/test/resources/testmap.map.xml | 12 +-
.../dialog/datamap/SuperclassUpdateController.java | 2 +-
.../modeler/editor/RawQueryPropertiesPanel.java | 22 +-
.../cayenne/modeler/editor/SQLTemplateMainTab.java | 6 +-
.../cayenne/tutorial/persistent/auto/_Artist.java | 4 +-
.../cayenne/tutorial/persistent/auto/_Gallery.java | 4 +-
.../tutorial/persistent/auto/_Painting.java | 4 +-
416 files changed, 3368 insertions(+), 2841 deletions(-)
rename cayenne/src/main/java/org/apache/cayenne/{CayenneDataObject.java =>
GenericPersistentObject.java} (89%)
rename cayenne/src/main/java/org/apache/cayenne/{HybridDataObject.java =>
HybridPersistentObject.java} (88%)
delete mode 100644
cayenne/src/main/java/org/apache/cayenne/reflect/generic/DataObjectDescriptor.java
rename
cayenne/src/main/java/org/apache/cayenne/reflect/generic/{DataObjectAccessor.java
=> PersistentObjectAccessor.java} (71%)
rename
cayenne/src/main/java/org/apache/cayenne/reflect/generic/{DataObjectAttributeProperty.java
=> PersistentObjectAttributeProperty.java} (90%)
rename
cayenne/src/main/java/org/apache/cayenne/reflect/generic/{DataObjectBaseProperty.java
=> PersistentObjectBaseProperty.java} (75%)
rename
cayenne/src/main/java/org/apache/cayenne/reflect/generic/{DataObjectDescriptorFactory.java
=> PersistentObjectDescriptorFactory.java} (79%)
rename
cayenne/src/main/java/org/apache/cayenne/reflect/generic/{DataObjectToManyMapProperty.java
=> PersistentObjectToManyMapProperty.java} (85%)
rename
cayenne/src/main/java/org/apache/cayenne/reflect/generic/{DataObjectToManyProperty.java
=> PersistentObjectToManyProperty.java} (87%)
rename
cayenne/src/main/java/org/apache/cayenne/reflect/generic/{DataObjectToOneProperty.java
=> PersistentObjectToOneProperty.java} (88%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectFlattenedRelIT.java
=> CayennePersistentObjectFlattenedRelIT.java} (99%)
rename cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectIT.java =>
CayennePersistentObjectIT.java} (94%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectInContextIT.java =>
CayennePersistentObjectInContextIT.java} (97%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectReflexiveIT.java =>
CayennePersistentObjectReflexiveIT.java} (98%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectRelationshipsIT.java
=> CayennePersistentObjectRelationshipsIT.java} (99%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectSetToManyCollectionIT.java
=> CayennePersistentObjectSetToManyCollectionIT.java} (97%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectSetToManyListIT.java
=> CayennePersistentObjectSetToManyListIT.java} (97%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectSetToManyMapIT.java
=> CayennePersistentObjectSetToManyMapIT.java} (97%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectSetToManySetIT.java
=> CayennePersistentObjectSetToManySetIT.java} (97%)
rename
cayenne/src/test/java/org/apache/cayenne/{CayenneDataObjectValidationIT.java =>
CayennePersistentObjectValidationIT.java} (98%)
rename cayenne/src/test/java/org/apache/cayenne/{HybridDataObjectIT.java =>
HybridPersistentObjectIT.java} (99%)
delete mode 100644 cayenne/src/test/java/org/apache/cayenne/MockDataObject.java
rename
cayenne/src/test/java/org/apache/cayenne/{DataObjectSerializationIT.java =>
PersistentObjectSerializationIT.java} (85%)
rename
cayenne/src/test/java/org/apache/cayenne/reflect/generic/{DataObjectAttributePropertyTest.java
=> PersistentObjectAttributePropertyTest.java} (84%)
rename
cayenne/src/test/java/org/apache/cayenne/reflect/generic/{DataObjectDescriptorFactoryIT.java
=> PersistentObjectDescriptorFactoryIT.java} (95%)
rename
cayenne/src/test/java/org/apache/cayenne/reflect/generic/{DataObjectDescriptorFactory_InheritanceMapsIT.java
=> PersistentObjectDescriptorFactory_InheritanceMapsIT.java} (88%)
rename
cayenne/src/test/java/org/apache/cayenne/testdo/testmap/{ArtDataObject.java =>
ArtPersistentObject.java} (92%)
