[BZ 959455] - Confusing number of total rows in Administration->Agent…

…s page - calling setPagingInfo(response, result); solves the issue. I fixed that also for StorageNodeDatasource, AffinityGroupWithCountsDatasource, FailoverListItemDatasource, PartitionEventDatasource, ServerDatasource and ServerWithAgentCountDatasource
rhq-project · Aug 5, 2014 · d539c8b · d539c8b
1 parent 1431fac
commit d539c8b
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 18 deletions.
diff --git a/...gui/coregui/src/main/java/org/rhq/coregui/client/admin/storage/StorageNodeDatasource.java b/...gui/coregui/src/main/java/org/rhq/coregui/client/admin/storage/StorageNodeDatasource.java
@@ -193,7 +193,7 @@ protected void executeFetch(final DSRequest request, final DSResponse response,
             new AsyncCallback<PageList<StorageNodeLoadComposite>>() {
                 public void onSuccess(PageList<StorageNodeLoadComposite> result) {
                     response.setData(buildRecords(result));
-                    response.setTotalRows(result.size());
+                    setPagingInfo(response, result);
                     processResponse(request.getRequestId(), response);
                 }
 

diff --git a/...rc/main/java/org/rhq/coregui/client/admin/topology/AffinityGroupWithCountsDatasource.java b/...rc/main/java/org/rhq/coregui/client/admin/topology/AffinityGroupWithCountsDatasource.java
@@ -120,7 +120,7 @@ protected void executeFetch(final DSRequest request, final DSResponse response,
             new AsyncCallback<PageList<AffinityGroupCountComposite>>() {
                 public void onSuccess(PageList<AffinityGroupCountComposite> result) {
                     response.setData(buildRecords(result));
-                    response.setTotalRows(result.size());
+                    setPagingInfo(response, result);
                     processResponse(request.getRequestId(), response);
                 }
 

diff --git a/...rise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/AgentDatasource.java b/...rise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/AgentDatasource.java
@@ -130,7 +130,7 @@ protected void executeFetch(final DSRequest request, final DSResponse response,
         GWTServiceLookup.getTopologyService().findAgentsByCriteria(criteria, new AsyncCallback<PageList<Agent>>() {
             public void onSuccess(PageList<Agent> result) {
                 response.setData(buildRecords(result));
-                response.setTotalRows(result.size());
+                setPagingInfo(response, result);
                 processResponse(request.getRequestId(), response);
             }
 

diff --git a/...regui/src/main/java/org/rhq/coregui/client/admin/topology/FailoverListItemDatasource.java b/...regui/src/main/java/org/rhq/coregui/client/admin/topology/FailoverListItemDatasource.java
@@ -43,6 +43,7 @@
 import org.rhq.core.domain.cloud.FailoverListDetails;
 import org.rhq.core.domain.criteria.Criteria;
 import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
 import org.rhq.coregui.client.CoreGUI;
 import org.rhq.coregui.client.components.table.TimestampCellFormatter;
 import org.rhq.coregui.client.gwt.GWTServiceLookup;
@@ -104,10 +105,10 @@ protected void executeFetch(final DSRequest request, final DSResponse response,
 
         // if agentId == null all FailoverListDetails are returned
         GWTServiceLookup.getTopologyService().getFailoverListDetailsByAgentId(agentId, pc,
-            new AsyncCallback<List<FailoverListDetails>>() {
-                public void onSuccess(List<FailoverListDetails> result) {
+            new AsyncCallback<PageList<FailoverListDetails>>() {
+                public void onSuccess(PageList<FailoverListDetails> result) {
                     response.setData(buildRecords(result));
-                    response.setTotalRows(result.size());
+                    setPagingInfo(response, result);
                     processResponse(request.getRequestId(), response);
                 }
 

diff --git a/...coregui/src/main/java/org/rhq/coregui/client/admin/topology/PartitionEventDatasource.java b/...coregui/src/main/java/org/rhq/coregui/client/admin/topology/PartitionEventDatasource.java
@@ -104,7 +104,7 @@ protected void executeFetch(final DSRequest request, final DSResponse response,
             new AsyncCallback<PageList<PartitionEvent>>() {
                 public void onSuccess(PageList<PartitionEvent> result) {
                     response.setData(buildRecords(result));
-                    response.setTotalRows(result.size());
+                    setPagingInfo(response, result);
                     processResponse(request.getRequestId(), response);
                 }
 

diff --git a/...ise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/ServerDatasource.java b/...ise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/ServerDatasource.java
@@ -122,7 +122,7 @@ protected void executeFetch(final DSRequest request, final DSResponse response,
         GWTServiceLookup.getTopologyService().findServersByCriteria(criteria, new AsyncCallback<PageList<Server>>() {
             public void onSuccess(PageList<Server> result) {
                 response.setData(buildRecords(result));
-                response.setTotalRows(result.size());
+                setPagingInfo(response, result);
                 processResponse(request.getRequestId(), response);
             }
 

diff --git a/...i/src/main/java/org/rhq/coregui/client/admin/topology/ServerWithAgentCountDatasource.java b/...i/src/main/java/org/rhq/coregui/client/admin/topology/ServerWithAgentCountDatasource.java
@@ -34,6 +34,7 @@
 import org.rhq.core.domain.cloud.composite.ServerWithAgentCountComposite;
 import org.rhq.core.domain.criteria.Criteria;
 import org.rhq.core.domain.util.PageControl;
+import org.rhq.core.domain.util.PageList;
 import org.rhq.coregui.client.CoreGUI;
 import org.rhq.coregui.client.gwt.GWTServiceLookup;
 
@@ -78,10 +79,10 @@ public String hoverHTML(Object value, ListGridRecord record, int rowNum, int col
     protected void executeFetch(final DSRequest request, final DSResponse response, Criteria criteria) {
         final PageControl pc = getPageControl(request);
 
-        GWTServiceLookup.getTopologyService().getServers(pc, new AsyncCallback<List<ServerWithAgentCountComposite>>() {
-            public void onSuccess(List<ServerWithAgentCountComposite> result) {
+        GWTServiceLookup.getTopologyService().getServers(pc, new AsyncCallback<PageList<ServerWithAgentCountComposite>>() {
+            public void onSuccess(PageList<ServerWithAgentCountComposite> result) {
                 response.setData(buildRecords(result));
-                response.setTotalRows(result.size());
+                setPagingInfo(response, result);
                 processResponse(request.getRequestId(), response);
             }
 

diff --git a/...s/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/TopologyGWTService.java b/...s/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/TopologyGWTService.java
@@ -22,8 +22,6 @@
  */
 package org.rhq.coregui.client.gwt;
 
-import java.util.List;
-
 import com.google.gwt.user.client.rpc.RemoteService;
 
 import org.rhq.core.domain.cloud.AffinityGroup;
@@ -55,7 +53,7 @@ public interface TopologyGWTService extends RemoteService {
      * @return a list of all available servers (the servers in <code>MAINTENANCE</code> or <code>DOWN</code> mode are included as well)
      * @throws RuntimeException
      */
-    List<ServerWithAgentCountComposite> getServers(PageControl pageControl) throws RuntimeException;
+    PageList<ServerWithAgentCountComposite> getServers(PageControl pageControl) throws RuntimeException;
 
     /**
      * Deletes the servers with provided ids.
@@ -90,7 +88,7 @@ public interface TopologyGWTService extends RemoteService {
      * @return a list of <code>FailoverListDetails</code> instances
      * @throws RuntimeException
      */
-    List<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pageControl) throws RuntimeException;;
+    PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pageControl) throws RuntimeException;;
 
     /**
      * Finder for <code>PartitionEvent</code> instances

diff --git a/...terprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/TopologyGWTServiceImpl.java b/...terprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/TopologyGWTServiceImpl.java
@@ -22,8 +22,6 @@
  */
 package org.rhq.coregui.server.gwt;
 
-import java.util.List;
-
 import org.apache.commons.lang.ArrayUtils;
 import org.rhq.core.domain.cloud.AffinityGroup;
 import org.rhq.core.domain.cloud.FailoverListDetails;
@@ -92,7 +90,7 @@ public void updateServerManualMaintenance(int[] serverIds, boolean manualMainten
     }
 
     @Override
-    public List<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc)
+    public PageList<FailoverListDetails> getFailoverListDetailsByAgentId(int agentId, PageControl pc)
         throws RuntimeException {
         try {
             return SerialUtility.prepare(