primefaces#11506 lazyModel.load() can optionally set the rowCount

Travelcompositor · May 5, 2024 · ffa4d6a · ffa4d6a
1 parent 7a60525
commit ffa4d6a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/primefaces/src/main/java/org/primefaces/component/datagrid/DataGrid.java b/primefaces/src/main/java/org/primefaces/component/datagrid/DataGrid.java
@@ -90,11 +90,13 @@ public void loadLazyData() {
                 calculateFirst();
             }
             List<?> data = lazyModel.load(getFirst(), getRows(), Collections.emptyMap(), Collections.emptyMap());
-            if (data.size() < getRows() && getFirst() == 0) {
-                lazyModel.setRowCount(data.size());
-            }
-            else if (getFirst() == 0) {
-                lazyModel.setRowCount(lazyModel.count(Collections.emptyMap()));
+            if (lazyModel.getRowCount() == 0) {
+                if (data.size() < getRows() && getFirst() == 0) {
+                    lazyModel.setRowCount(data.size());
+                }
+                else if (getFirst() == 0) {
+                    lazyModel.setRowCount(lazyModel.count(Collections.emptyMap()));
+                }
             }
 
             lazyModel.setPageSize(getRows());

diff --git a/primefaces/src/main/java/org/primefaces/component/datalist/DataList.java b/primefaces/src/main/java/org/primefaces/component/datalist/DataList.java
@@ -123,11 +123,13 @@ public void loadLazyData() {
             }
 
             List<?> data = lazyModel.load(getFirst(), getRows(), Collections.emptyMap(),  Collections.emptyMap());
-            if (data.size() < getRows() && getFirst() == 0) {
-                lazyModel.setRowCount(data.size());
-            }
-            else if (getFirst() == 0) {
-                lazyModel.setRowCount(lazyModel.count(Collections.emptyMap()));
+            if (lazyModel.getRowCount() == 0) {
+                if (data.size() < getRows() && getFirst() == 0) {
+                    lazyModel.setRowCount(data.size());
+                }
+                else if (getFirst() == 0) {
+                    lazyModel.setRowCount(lazyModel.count(Collections.emptyMap()));
+                }
             }
 
             lazyModel.setPageSize(getRows());

diff --git a/primefaces/src/main/java/org/primefaces/component/datatable/DataTable.java b/primefaces/src/main/java/org/primefaces/component/datatable/DataTable.java
@@ -508,11 +508,13 @@ public void loadLazyScrollData(int offset, int rows) {
         }
 
         List<?> data = model.load(offset, rows, getActiveSortMeta(), getActiveFilterMeta());
-        if (data.size() < getRows() && getFirst() == 0) {
-            model.setRowCount(data.size());
-        }
-        else if (getFirst() == 0) {
-            model.setRowCount(model.count(filterBy));
+        if (model.getRowCount() == 0) {
+            if (data.size() < getRows() && getFirst() == 0) {
+                model.setRowCount(data.size());
+            }
+            else if (getFirst() == 0) {
+                model.setRowCount(model.count(filterBy));
+            }
         }
         model.setPageSize(rows);
         // set empty list if model returns null; this avoids multiple calls while visiting the component+rows

diff --git a/primefaces/src/main/java/org/primefaces/component/dataview/DataView.java b/primefaces/src/main/java/org/primefaces/component/dataview/DataView.java
@@ -155,11 +155,13 @@ public void loadLazyData() {
             }
 
             List<?> data = lazyModel.load(getFirst(), getRows(), Collections.emptyMap(), Collections.emptyMap());
-            if (data.size() < getRows() && getFirst() == 0) {
-                lazyModel.setRowCount(data.size());
-            }
-            else if (getFirst() == 0) {
-                lazyModel.setRowCount(lazyModel.count(Collections.emptyMap()));
+            if (lazyModel.getRowCount() == 0) {
+                if (data.size() < getRows() && getFirst() == 0) {
+                    lazyModel.setRowCount(data.size());
+                }
+                else if (getFirst() == 0) {
+                    lazyModel.setRowCount(lazyModel.count(Collections.emptyMap()));
+                }
             }
 
             lazyModel.setPageSize(getRows());