#23131 include in 23.10.24 LTS

dotCMS · Jul 2, 2024 · bdb6442 · bdb6442
1 parent 80fa268
commit bdb6442
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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
+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
diff --git a/...src/main/java/com/dotcms/publisher/util/dependencies/PushPublishigDependencyProcesor.java b/...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 <T> boolean add(final PusheableAsset pusheableAsset, final T asset, fina
     }
 
     private <T> void tryToAddAllAndProcessDependencies(
-            final PusheableAsset pusheableAsset, final Collection<T> assets, final String reason)
+            final PusheableAsset pusheableAsset, final Iterable<T> 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);
+            }
         }
     }