This is an automated email from the ASF dual-hosted git repository. danhaywood pushed a commit to branch CAUSEWAY-3745 in repository https://gitbox.apache.org/repos/asf/causeway.git
commit ccfb0c6e6222a90f6e4222aae32ab300edfd1249 Author: Dan Haywood <[email protected]> AuthorDate: Thu May 23 18:09:00 2024 +0100 CAUSEWAY-3745: renames RepositoryServiceDefault's 'bulkMode' thread local... ... to 'suppressFlush', because that's what it does --- .../repository/RepositoryServiceDefault.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/repository/RepositoryServiceDefault.java b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/repository/RepositoryServiceDefault.java index 23ff36c813..cafb081453 100644 --- a/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/repository/RepositoryServiceDefault.java +++ b/persistence/commons/src/main/java/org/apache/causeway/persistence/commons/integration/repository/RepositoryServiceDefault.java @@ -80,7 +80,7 @@ implements RepositoryService, HasMetaModelContext { @Getter(onMethod_ = {@Override}) final MetaModelContext metaModelContext; - private ThreadLocal<Boolean> threadLocalBulkMode = ThreadLocal.withInitial(() -> Boolean.FALSE); + private ThreadLocal<Boolean> suppressFlush = ThreadLocal.withInitial(() -> Boolean.FALSE); private boolean autoFlush; @PostConstruct @@ -106,17 +106,17 @@ implements RepositoryService, HasMetaModelContext { @Override public <T> T execInBulk(Callable<T> callable) { try { - setBulkMode(Boolean.TRUE); + setSuppressFlush(Boolean.TRUE); return callable.call(); } finally { - setBulkMode(Boolean.FALSE); + setSuppressFlush(Boolean.FALSE); } } - private void setBulkMode(final Boolean bulkMode) { - threadLocalBulkMode.set(bulkMode); - if (!bulkMode) { - threadLocalBulkMode.remove(); + private void setSuppressFlush(final Boolean suppressFlush) { + this.suppressFlush.set(suppressFlush); + if (!suppressFlush) { + this.suppressFlush.remove(); transactionService.flushTransaction(); } } @@ -142,7 +142,7 @@ implements RepositoryService, HasMetaModelContext { @Override public <T> T persistAndFlush(final T object) { persist(object); - if (!threadLocalBulkMode.get()) { + if (!suppressFlush.get()) { transactionService.flushTransaction(); } return object; @@ -162,7 +162,7 @@ implements RepositoryService, HasMetaModelContext { @Override public void removeAndFlush(final Object domainObject) { remove(domainObject); - if (!threadLocalBulkMode.get()) { + if (!suppressFlush.get()) { transactionService.flushTransaction(); } } @@ -197,7 +197,7 @@ implements RepositoryService, HasMetaModelContext { @Override public <T> List<T> allMatches(final Query<T> query) { - if(autoFlush && !FlushMgmt.isAutoFlushSuppressed() && !threadLocalBulkMode.get()) { + if(autoFlush && !FlushMgmt.isAutoFlushSuppressed() && !suppressFlush.get()) { transactionService.flushTransaction(); } return submitQuery(query);
