From bdb64424f91fd6443eacb7cbf0f79f5097bf09fe Mon Sep 17 00:00:00 2001 From: erickgonzalez Date: Tue, 2 Jul 2024 10:22:21 -0600 Subject: [PATCH] #23131 include in 23.10.24 LTS --- dotCMS/hotfix_tracking.md | 3 ++- .../PushPublishigDependencyProcesor.java | 13 ++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dotCMS/hotfix_tracking.md b/dotCMS/hotfix_tracking.md index 716a0b7309b2..52e5dde6c3ad 100644 --- a/dotCMS/hotfix_tracking.md +++ b/dotCMS/hotfix_tracking.md @@ -118,4 +118,5 @@ This maintenance release includes the following code fixes: 111. https://github.com/dotCMS/core/issues/28769 : Language Fallback not working. #28769 112. https://github.com/dotCMS/core/issues/28204 : Search filter in the theme selection menu fails to load sites #28204 113. https://github.com/dotCMS/core/issues/28609 : Remove old vulnerability-scan.yml workflow #28609 -114. https://github.com/dotCMS/core/issues/23292 : Password validation failed for few characters #23292 \ No newline at end of file +114. https://github.com/dotCMS/core/issues/23292 : Password validation failed for few characters #23292 +115. https://github.com/dotCMS/core/issues/23131 : Remove 10k Push Publishing Limit #23131 \ No newline at end of file diff --git a/dotCMS/src/main/java/com/dotcms/publisher/util/dependencies/PushPublishigDependencyProcesor.java b/dotCMS/src/main/java/com/dotcms/publisher/util/dependencies/PushPublishigDependencyProcesor.java index 2f0d2fd030b0..8b1d8c1a1e4a 100644 --- a/dotCMS/src/main/java/com/dotcms/publisher/util/dependencies/PushPublishigDependencyProcesor.java +++ b/dotCMS/src/main/java/com/dotcms/publisher/util/dependencies/PushPublishigDependencyProcesor.java @@ -50,6 +50,7 @@ import com.dotmarketing.util.InodeUtils; import com.dotmarketing.util.Logger; import com.dotmarketing.util.UtilMethods; +import com.dotmarketing.util.contentet.pagination.PaginatedContentlets; import com.liferay.portal.model.User; import com.liferay.util.StringPool; import io.vavr.Lazy; @@ -190,10 +191,10 @@ private void proccessSiteDependency(final Host site) { .forEach(fileContainer -> dependencyProcessor.addAsset(fileContainer, PusheableAsset.CONTAINER)); + PaginatedContentlets contentletsPaginatedByHost = this.contentletAPI.get().findContentletsPaginatedByHost(site, + APILocator.systemUser(), false); // Content dependencies - tryToAddAllAndProcessDependencies(PusheableAsset.CONTENTLET, - pushPublishigDependencyProvider.getContentletByLuceneQuery( - "+conHost:" + site.getIdentifier()), + tryToAddAllAndProcessDependencies(PusheableAsset.CONTENTLET, contentletsPaginatedByHost, ManifestReason.INCLUDE_DEPENDENCY_FROM.getMessage(site)); // Structure dependencies @@ -918,11 +919,13 @@ private boolean add(final PusheableAsset pusheableAsset, final T asset, fina } private void tryToAddAllAndProcessDependencies( - final PusheableAsset pusheableAsset, final Collection assets, final String reason) + final PusheableAsset pusheableAsset, final Iterable assets, final String reason) throws DotDataException, DotSecurityException { if (UtilMethods.isSet(assets)) { - assets.stream().forEach(asset -> tryToAddAndProcessDependencies(pusheableAsset, asset, reason)); + for (T asset : assets) { + tryToAddAndProcessDependencies(pusheableAsset, asset, reason); + } } }