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 6803646a2 Merge branch 'pr/535' into asf-master new ac5307ffb CAY-2774 Overriding service ordering in DI List causes DIRuntimeException new 9c094aa9c CAY-2772 Bootique-style module "extenders" for smoother configuration new f10ba77a9 Merge pull request #536 from andrus/CAY-2772 The 6965 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: UPGRADE.txt | 9 + .../invalidation/CacheInvalidationFilter.java | 15 +- .../invalidation/CacheInvalidationModule.java | 20 +- .../CacheInvalidationModuleExtender.java | 55 ++-- .../cache/invalidation/InvalidationHandler.java | 6 +- .../CacheInvalidationCacheGroupsHandlerIT.java | 7 - .../cache/invalidation/CacheInvalidationCase.java | 59 ++-- .../CacheInvalidationCustomHandlerIT.java | 8 +- .../java/org/apache/cayenne/gen/CgenModule.java | 7 +- .../org/apache/cayenne/gen/PropertyUtilsTest.java | 14 +- .../apache/cayenne/commitlog/CommitLogFilter.java | 16 +- .../apache/cayenne/commitlog/CommitLogModule.java | 23 +- .../cayenne/commitlog/CommitLogModuleExtender.java | 84 ++--- .../cayenne/commitlog/CommitLogFilterIT.java | 3 +- .../commitlog/CommitLogFilter_All_FlattenedIT.java | 3 +- .../commitlog/CommitLogFilter_FilteredIT.java | 2 +- .../CommitLogFilter_ListenerInducedChangesIT.java | 3 +- .../commitlog/CommitLogFilter_OutsideTxIT.java | 68 +++-- .../cayenne/commitlog/CommitLogFilter_TxIT.java | 4 +- .../commitlog/CommitLogModuleBuilderTest.java | 46 +-- .../dbsync/reverse/configuration/ToolsModule.java | 83 +++-- .../configuration/ToolsProjectModuleExtender.java | 19 +- .../configuration/ToolsServerModuleExtender.java | 19 +- .../dbsync/reverse/dbimport/DbImportModule.java | 3 +- .../java/org/apache/cayenne/di/spi/DIGraph.java | 1 + .../org/apache/cayenne/di/spi/DIGraphTest.java | 5 +- .../org/apache/cayenne/jcache/JCacheModule.java | 17 +- .../cayenne/jcache/JCacheModuleExtender.java | 24 +- .../jcache/unit/CacheServerRuntimeProvider.java | 11 +- .../compatibility/ProjectCompatibilityModule.java | 12 +- .../org/apache/cayenne/project/ProjectModule.java | 28 +- .../cayenne/project/ProjectModuleExtender.java | 55 ++++ .../project/extension/ProjectExtension.java | 2 +- .../org/apache/cayenne/DataChannelQueryFilter.java | 2 +- .../org/apache/cayenne/DataChannelSyncFilter.java | 2 +- .../apache/cayenne/configuration/Constants.java | 14 +- .../cayenne/configuration/server/ServerModule.java | 258 +++++++--------- .../configuration/server/ServerModuleExtender.java | 337 +++++++++++++++++++++ .../configuration/server/ServerRuntimeBuilder.java | 27 +- .../access/DefaultDataRowStoreFactoryIT.java | 17 +- .../server/DataDomainProviderTest.java | 134 ++++---- .../server/DefaultDbAdapterFactoryTest.java | 77 ++--- .../unit/di/server/ServerCaseContextsSync.java | 4 +- .../cayenne/unit/di/server/ServerCaseModule.java | 153 +++++----- .../unit/di/server/ServerRuntimeProvider.java | 12 +- .../server/ServerRuntimeProviderContextsSync.java | 10 +- ...WeakReferenceStrategyServerRuntimeProvider.java | 10 +- .../org/apache/cayenne/unit/jira/CAY_743Test.java | 2 +- .../cayenne/modeler/init/CayenneModelerModule.java | 10 +- 49 files changed, 1076 insertions(+), 724 deletions(-) copy cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModule.java => cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsProjectModuleExtender.java (67%) copy cayenne-velocity/src/main/java/org/apache/cayenne/velocity/VelocityModule.java => cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/configuration/ToolsServerModuleExtender.java (67%) rename cayenne-server/src/test/java/org/apache/cayenne/unit/di/server/WeakReferenceStrategyModule.java => cayenne-jcache/src/main/java/org/apache/cayenne/jcache/JCacheModuleExtender.java (71%) create mode 100644 cayenne-project/src/main/java/org/apache/cayenne/project/ProjectModuleExtender.java create mode 100644 cayenne-server/src/main/java/org/apache/cayenne/configuration/server/ServerModuleExtender.java