You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2019/04/24 14:54:02 UTC

[cayenne] 05/06: Merge PR #377

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 c43a3bd7817f1082a349373b4bcdc8f2850ad76e
Merge: 74ebe54 1e2d9bf
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Wed Apr 24 17:33:58 2019 +0300

    Merge PR #377

 .../dbsync/reverse/configuration/ToolsModule.java  |   8 +-
 .../event/JavaGroupsBridgeProviderTest.java        |   6 +
 .../cayenne/event/JMSBridgeProviderTest.java       |   6 +
 .../java/org/apache/cayenne/access/DataDomain.java |  12 +-
 .../cayenne/access/DataDomainDBDiffBuilder.java    |   2 +
 .../cayenne/access/DataDomainDeleteBucket.java     |   4 +-
 .../cayenne/access/DataDomainFlattenedBucket.java  |   6 +-
 .../cayenne/access/DataDomainFlushObserver.java    |   2 +
 .../access/DataDomainIndirectDiffBuilder.java      |   7 +-
 .../cayenne/access/DataDomainInsertBucket.java     |   7 +-
 .../cayenne/access/DataDomainSyncBucket.java       |   6 +-
 .../cayenne/access/DataDomainUpdateBucket.java     |   4 +-
 .../access/DataNodeSyncQualifierDescriptor.java    |   2 +
 .../java/org/apache/cayenne/access/DbArcId.java    |   2 +
 .../cayenne/access/DbEntityClassDescriptor.java    |   2 +
 .../org/apache/cayenne/access/FlattenedArcKey.java |   2 +
 ...ction.java => LegacyDataDomainFlushAction.java} |  11 +-
 .../LegacyDataDomainFlushActionFactory.java}       |  46 ++--
 .../java/org/apache/cayenne/access/ObjectDiff.java |  22 +-
 .../org/apache/cayenne/access/ObjectResolver.java  |   4 +-
 .../org/apache/cayenne/access/ObjectStore.java     |  38 ++-
 .../cayenne/access/ObjectStoreGraphDiff.java       |   4 +-
 .../apache/cayenne/access/OperationObserver.java   |   4 +-
 .../org/apache/cayenne/access/flush/ArcTarget.java |  87 +++++++
 .../access/flush/ArcValuesCreationHandler.java     | 275 +++++++++++++++++++++
 .../flush/DataDomainFlushAction.java}              |  38 +--
 .../flush/DataDomainFlushActionFactory.java}       |  33 +--
 .../flush/DataDomainIndirectDiffBuilder.java       | 106 ++++++++
 .../cayenne/access/flush/DbRowOpFactory.java       | 138 +++++++++++
 .../access/flush/DefaultDataDomainFlushAction.java | 210 ++++++++++++++++
 .../DefaultDataDomainFlushActionFactory.java}      |  43 ++--
 .../apache/cayenne/access/flush/EffectiveOpId.java |  63 +++++
 .../FlushObserver.java}                            |  35 +--
 .../access/flush/ObjectIdValueSupplier.java        |  82 ++++++
 .../flush/OptimisticLockQualifierBuilder.java      |  85 +++++++
 .../access/flush/PermanentObjectIdVisitor.java     | 139 +++++++++++
 .../cayenne/access/flush/PostprocessVisitor.java   | 143 +++++++++++
 .../cayenne/access/flush/QueryCreatorVisitor.java  | 121 +++++++++
 .../cayenne/access/flush/ReplacementIdVisitor.java | 106 ++++++++
 .../cayenne/access/flush/RootRowOpProcessor.java   |  82 ++++++
 .../access/flush/ValuesCreationHandler.java        |  77 ++++++
 .../access/flush/operation/BaseDbRowOp.java        |  77 ++++++
 .../flush/operation/DbRowOp.java}                  |  40 ++-
 .../access/flush/operation/DbRowOpMerger.java      |  82 ++++++
 .../flush/operation/DbRowOpSorter.java}            |  34 +--
 .../flush/operation/DbRowOpType.java}              |  49 ++--
 .../flush/operation/DbRowOpVisitor.java}           |  39 +--
 .../flush/operation/DbRowOpWithQualifier.java}     |  32 +--
 .../flush/operation/DbRowOpWithValues.java}        |  32 +--
 .../flush/operation/DefaultDbRowOpSorter.java      | 150 +++++++++++
 .../access/flush/operation/DeleteDbRowOp.java      |  72 ++++++
 .../flush/operation/DeleteInsertDbRowOp.java}      |  48 ++--
 .../access/flush/operation/InsertDbRowOp.java      |  71 ++++++
 .../cayenne/access/flush/operation/Qualifier.java  | 147 +++++++++++
 .../access/flush/operation/UpdateDbRowOp.java      |  74 ++++++
 .../cayenne/access/flush/operation/Values.java     | 151 +++++++++++
 .../cayenne/ashwood/AshwoodEntitySorter.java       | 140 ++++++-----
 .../cayenne/configuration/server/ServerModule.java |  14 +-
 .../main/java/org/apache/cayenne/map/DbEntity.java |   7 +-
 .../java/org/apache/cayenne/map/EntitySorter.java  |  21 ++
 .../org/apache/cayenne/query/DeleteBatchQuery.java |   7 +-
 .../DataContextEntityWithMeaningfulPKIT.java       |  15 ++
 .../access/DataContextFlattenedAttributesIT.java   |  66 +++++
 .../access/DefaultDataRowStoreFactoryIT.java       |   6 +
 .../cayenne/access/VerticalInheritanceIT.java      |  19 +-
 .../access/flush/ArcValuesCreationHandlerTest.java | 210 ++++++++++++++++
 .../flush/DefaultDataDomainFlushActionTest.java    | 158 ++++++++++++
 .../access/flush/DefaultDbRowOpSorterTest.java     | 215 ++++++++++++++++
 .../access/flush/operation/BaseDbRowOpTest.java    | 125 ++++++++++
 .../access/flush/operation/DbRowOpMergerTest.java  | 177 +++++++++++++
 .../access/flush/operation/QualifierTest.java      | 171 +++++++++++++
 .../cayenne/access/flush/operation/ValuesTest.java | 109 ++++++++
 .../server/DataContextFactoryTest.java             |  12 +
 .../test/resources/inheritance-vertical.map.xml    |   4 +-
 cayenne-server/src/test/resources/testmap.map.xml  |   4 +-
 .../cayenne/event/XMPPBridgeProviderTest.java      |   6 +
 76 files changed, 4218 insertions(+), 436 deletions(-)