Added paging on all find commands.

The find commands in some REST services have been modified to support
paging to be consistent with others. The other find commands have been
cleaned up as well.

21 files changed, 135 insertions, 69 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java
index 7f8eb75f1..97a76d793 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertFindCLI.java
@@ -21,6 +21,7 @@ package com.netscape.cmstools.cert;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.Date;
 
 import javax.xml.bind.JAXBException;
@@ -29,7 +30,6 @@ import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.ParseException;
 
-import com.netscape.certsrv.base.PKIException;
 import com.netscape.certsrv.cert.CertDataInfo;
 import com.netscape.certsrv.cert.CertDataInfos;
 import com.netscape.certsrv.cert.CertSearchRequest;
@@ -118,24 +118,15 @@ public class CertFindCLI extends CLI {
 
         addSearchAttribute(cmd, searchData);
 
-        CertDataInfos certs = null;
-        try {
-            certs = certCLI.certClient.findCerts(searchData, start, size);
-        } catch (PKIException e) {
-            System.err.println("Error: Cannot list certificates. " + e.getMessage());
-            System.exit(1);
-        }
-
-        if (certs.getCertInfos() == null || certs.getCertInfos().isEmpty()) {
-            MainCLI.printMessage("No certificates found");
-            System.exit(0); // valid result
-        }
+        CertDataInfos certs = certCLI.certClient.findCerts(searchData, start, size);
 
-        MainCLI.printMessage(certs.getCertInfos().size() + " certificate(s) found");
+        MainCLI.printMessage(certs.getTotal() + " entries found");
+        if (certs.getTotal() == 0) return;
 
         boolean first = true;
 
-        for (CertDataInfo cert : certs.getCertInfos()) {
+        Collection<CertDataInfo> entries = certs.getEntries();
+        for (CertDataInfo cert : entries) {
             if (first) {
                 first = false;
             } else {
@@ -145,7 +136,7 @@ public class CertFindCLI extends CLI {
             CertCLI.printCertInfo(cert);
         }
 
-        MainCLI.printMessage("Number of entries returned " + certs.getCertInfos().size());
+        MainCLI.printMessage("Number of entries returned " + certs.getEntries().size());
     }
 
     public void addOptions() {
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestFindCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestFindCLI.java
index 79970393c..d09c7698f 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestFindCLI.java
@@ -18,11 +18,12 @@
 
 package com.netscape.cmstools.cert;
 
+import java.util.Collection;
+
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.ParseException;
 
-import com.netscape.certsrv.base.PKIException;
 import com.netscape.certsrv.cert.CertRequestInfo;
 import com.netscape.certsrv.cert.CertRequestInfos;
 import com.netscape.certsrv.request.RequestId;
@@ -50,7 +51,6 @@ public class CertRequestFindCLI extends CLI {
         addOptions();
 
         CommandLine cmd = null;
-        CertRequestInfos certRequests = null;
         try {
             cmd = parser.parse(options, args);
         } catch (ParseException e) {
@@ -82,19 +82,15 @@ public class CertRequestFindCLI extends CLI {
         String requestType = cmd.getOptionValue("type");
         if (requestType != null && requestType.equals("all")) requestType = null;
 
-        try {
-            certRequests = certCLI.certClient.certRequestClient.listRequests(requestState, requestType, start, size, maxResults, maxTime);
-        } catch (PKIException e) {
-            System.err.println("Error: Cannot list certificate requests. " + e.getMessage());
-            System.exit(-1);
-        }
-        if (certRequests.getRequests() == null || certRequests.getRequests().isEmpty()) {
-            MainCLI.printMessage("No matches found.");
-            System.exit(-1);
-        }
+        CertRequestInfos response = certCLI.certClient.certRequestClient.listRequests(requestState, requestType, start, size, maxResults, maxTime);
 
+        MainCLI.printMessage(response.getTotal() + " entries matched");
+        if (response.getTotal() == 0) return;
+
+        Collection<CertRequestInfo> entries = response.getEntries();
         boolean first = true;
-        for (CertRequestInfo certRequest : certRequests.getRequests()) {
+
+        for (CertRequestInfo certRequest : entries) {
             if (first) {
                 first = false;
             } else {
@@ -104,7 +100,7 @@ public class CertRequestFindCLI extends CLI {
             CertCLI.printCertRequestInfo(certRequest);
         }
 
-        MainCLI.printMessage("Number of entries returned " + certRequests.getRequests().size());
+        MainCLI.printMessage("Number of entries returned " + entries.size());
     }
 
     public void addOptions() {
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestProfileFindCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestProfileFindCLI.java
index 48c051905..72172535a 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestProfileFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestProfileFindCLI.java
@@ -2,7 +2,12 @@ package com.netscape.cmstools.cert;
 
 import java.util.Collection;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.ParseException;
+
 import com.netscape.certsrv.profile.ProfileDataInfo;
+import com.netscape.certsrv.profile.ProfileDataInfos;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 import com.netscape.cmstools.profile.ProfileCLI;
@@ -21,7 +26,38 @@ public class CertRequestProfileFindCLI extends CLI {
     }
 
     public void execute(String[] args) throws Exception {
-        Collection<ProfileDataInfo> infos = certCLI.certClient.listEnrollmentTemplates().getProfileInfos();
+
+        Option option = new Option(null, "start", true, "Page start");
+        option.setArgName("start");
+        options.addOption(option);
+
+        option = new Option(null, "size", true, "Page size");
+        option.setArgName("size");
+        options.addOption(option);
+
+        CommandLine cmd = null;
+
+        try {
+            cmd = parser.parse(options, args);
+
+        } catch (ParseException e) {
+            System.err.println("Error: " + e.getMessage());
+            printHelp();
+            System.exit(1);
+        }
+
+        String s = cmd.getOptionValue("start");
+        Integer start = s == null ? null : Integer.valueOf(s);
+
+        s = cmd.getOptionValue("size");
+        Integer size = s == null ? null : Integer.valueOf(s);
+
+        ProfileDataInfos response = certCLI.certClient.listEnrollmentTemplates(start, size);
+
+        MainCLI.printMessage(response.getTotal() + " entries matched");
+        if (response.getTotal() == 0) return;
+
+        Collection<ProfileDataInfo> infos = response.getEntries();
         boolean first = true;
 
         for (ProfileDataInfo info: infos) {
diff --git a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
index d43763f11..205e2884d 100644
--- a/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/cert/CertRequestSubmitCLI.java
@@ -73,7 +73,7 @@ public class CertRequestSubmitCLI extends CLI {
     }
 
     private void printRequestInformation(CertRequestInfos cri) {
-        Collection<CertRequestInfo> allRequests = cri.getRequests();
+        Collection<CertRequestInfo> allRequests = cri.getEntries();
         boolean first = true;
         for (CertRequestInfo x : allRequests) {
             if (first) {
diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java
index 45c2acf16..b7bc81d90 100644
--- a/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/group/GroupFindCLI.java
@@ -76,11 +76,10 @@ public class GroupFindCLI extends CLI {
 
         GroupCollection response = groupCLI.groupClient.findGroups(filter, start, size);
 
-        Collection<GroupData> entries = response.getEntries();
-
-        MainCLI.printMessage(response.getTotal() + " group(s) matched");
+        MainCLI.printMessage(response.getTotal() + " entries matched");
         if (response.getTotal() == 0) return;
 
+        Collection<GroupData> entries = response.getEntries();
         boolean first = true;
 
         for (GroupData groupData : entries) {
diff --git a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java
index ee694912d..841a0f8c4 100644
--- a/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/group/GroupMemberFindCLI.java
@@ -82,11 +82,10 @@ public class GroupMemberFindCLI extends CLI {
 
         GroupMemberCollection response = groupMemberCLI.groupClient.findGroupMembers(groupID, start, size);
 
-        Collection<GroupMemberData> entries = response.getEntries();
-
-        MainCLI.printMessage(response.getTotal() + " group member(s) matched");
+        MainCLI.printMessage(response.getTotal() + " entries matched");
         if (response.getTotal() == 0) return;
 
+        Collection<GroupMemberData> entries = response.getEntries();
         boolean first = true;
 
         for (GroupMemberData groupMemberData : entries) {
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java
index 9a91f37e2..25fe6af3c 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyFindCLI.java
@@ -63,6 +63,14 @@ public class KeyFindCLI extends CLI {
         option.setArgName("max time");
         options.addOption(option);
 
+        option = new Option(null, "start", true, "Page start");
+        option.setArgName("start");
+        options.addOption(option);
+
+        option = new Option(null, "size", true, "Page size");
+        option.setArgName("size");
+        options.addOption(option);
+
         CommandLine cmd = null;
 
         try {
@@ -83,7 +91,13 @@ public class KeyFindCLI extends CLI {
         s = cmd.getOptionValue("maxTime");
         Integer maxTime = s == null ? null : Integer.valueOf(s);
 
-        KeyDataInfos keys = keyCLI.keyClient.findKeys(clientID, status, maxResults, maxTime);
+        s = cmd.getOptionValue("start");
+        Integer start = s == null ? null : Integer.valueOf(s);
+
+        s = cmd.getOptionValue("size");
+        Integer size = s == null ? null : Integer.valueOf(s);
+
+        KeyDataInfos keys = keyCLI.keyClient.findKeys(clientID, status, maxResults, maxTime, start, size);
 
         Collection<KeyDataInfo> entries = keys.getKeyInfos();
 
diff --git a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestFindCLI.java b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestFindCLI.java
index d74a2c2f1..5ed2bf729 100644
--- a/base/java-tools/src/com/netscape/cmstools/key/KeyRequestFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/key/KeyRequestFindCLI.java
@@ -106,10 +106,10 @@ public class KeyRequestFindCLI extends CLI {
         KeyRequestInfos keys = keyCLI.keyClient.findKeyRequests(
                 status, type, clientID, start, pageSize, maxResults, maxTime);
 
-        Collection<KeyRequestInfo> entries = keys.getRequests();
-
-        MainCLI.printMessage(entries.size() + " key request(s) matched");
+        MainCLI.printMessage(keys.getTotal() + " entries matched");
+        if (keys.getTotal() == 0) return;
 
+        Collection<KeyRequestInfo> entries = keys.getEntries();
         boolean first = true;
 
         for (KeyRequestInfo info : entries) {
diff --git a/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java b/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java
index 08c8496ca..88b817798 100644
--- a/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/logging/ActivityFindCLI.java
@@ -72,11 +72,11 @@ public class ActivityFindCLI extends CLI {
         Integer size = s == null ? null : Integer.valueOf(s);
 
         ActivityCollection result = activityCLI.activityClient.findActivities(start, size);
-        Collection<ActivityData> activities = result.getEntries();
 
-        MainCLI.printMessage(result.getTotal() + " activity(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
+        Collection<ActivityData> activities = result.getEntries();
         boolean first = true;
 
         for (ActivityData activityData : activities) {
diff --git a/base/java-tools/src/com/netscape/cmstools/profile/ProfileFindCLI.java b/base/java-tools/src/com/netscape/cmstools/profile/ProfileFindCLI.java
index 1370319f9..21559551c 100644
--- a/base/java-tools/src/com/netscape/cmstools/profile/ProfileFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/profile/ProfileFindCLI.java
@@ -2,7 +2,11 @@ package com.netscape.cmstools.profile;
 
 import java.util.Collection;
 
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+
 import com.netscape.certsrv.profile.ProfileDataInfo;
+import com.netscape.certsrv.profile.ProfileDataInfos;
 import com.netscape.cmstools.cli.CLI;
 import com.netscape.cmstools.cli.MainCLI;
 
@@ -21,7 +25,37 @@ public class ProfileFindCLI extends CLI {
 
     public void execute(String[] args) throws Exception {
 
-        Collection<ProfileDataInfo> infos = profileCLI.profileClient.listProfiles().getProfileInfos();
+        Option option = new Option(null, "start", true, "Page start");
+        option.setArgName("start");
+        options.addOption(option);
+
+        option = new Option(null, "size", true, "Page size");
+        option.setArgName("size");
+        options.addOption(option);
+
+        CommandLine cmd = null;
+
+        try {
+            cmd = parser.parse(options, args);
+
+        } catch (Exception e) {
+            System.err.println("Error: " + e.getMessage());
+            printHelp();
+            System.exit(1);
+        }
+
+        String s = cmd.getOptionValue("start");
+        Integer start = s == null ? null : Integer.valueOf(s);
+
+        s = cmd.getOptionValue("size");
+        Integer size = s == null ? null : Integer.valueOf(s);
+
+        ProfileDataInfos response = profileCLI.profileClient.listProfiles(start, size);
+
+        MainCLI.printMessage(response.getTotal() + " entries matched");
+        if (response.getTotal() == 0) return;
+
+        Collection<ProfileDataInfo> infos = response.getEntries();
         boolean first = true;
 
         for (ProfileDataInfo info: infos) {
diff --git a/base/java-tools/src/com/netscape/cmstools/selftests/SelfTestFindCLI.java b/base/java-tools/src/com/netscape/cmstools/selftests/SelfTestFindCLI.java
index 4570d9a91..241f6c300 100644
--- a/base/java-tools/src/com/netscape/cmstools/selftests/SelfTestFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/selftests/SelfTestFindCLI.java
@@ -72,11 +72,11 @@ public class SelfTestFindCLI extends CLI {
         Integer size = s == null ? null : Integer.valueOf(s);
 
         SelfTestCollection result = selfTestCLI.selfTestClient.findSelfTests(start, size);
-        Collection<SelfTestData> selfTests = result.getEntries();
 
-        MainCLI.printMessage(result.getTotal() + " self test(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
+        Collection<SelfTestData> selfTests = result.getEntries();
         boolean first = true;
 
         for (SelfTestData selfTestInfo : selfTests) {
diff --git a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java
index 737851704..a210d3ab3 100644
--- a/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/system/TPSConnectorFindCLI.java
@@ -72,7 +72,7 @@ public class TPSConnectorFindCLI extends CLI {
 
         TPSConnectorCollection result = tpsConnectorCLI.tpsConnectorClient.findConnectors(start, size);
 
-        MainCLI.printMessage(result.getTotal() + " TPS connector(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
         Collection<TPSConnectorData> conns = result.getEntries();
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorFindCLI.java
index 81724bb31..683d2891c 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/authenticator/AuthenticatorFindCLI.java
@@ -72,11 +72,11 @@ public class AuthenticatorFindCLI extends CLI {
         Integer size = s == null ? null : Integer.valueOf(s);
 
         AuthenticatorCollection result = authenticatorCLI.authenticatorClient.findAuthenticators(start, size);
-        Collection<AuthenticatorData> authenticators = result.getEntries();
 
-        MainCLI.printMessage(result.getTotal() + " authenticator(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
+        Collection<AuthenticatorData> authenticators = result.getEntries();
         boolean first = true;
 
         for (AuthenticatorData authenticatorData : authenticators) {
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java
index 9ba66a62a..12ec1b9da 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/cert/TPSCertFindCLI.java
@@ -72,11 +72,11 @@ public class TPSCertFindCLI extends CLI {
         Integer size = s == null ? null : Integer.valueOf(s);
 
         TPSCertCollection result = certCLI.certClient.findCerts(start, size);
-        Collection<TPSCertData> certs = result.getEntries();
 
-        MainCLI.printMessage(result.getTotal() + " certificate(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
+        Collection<TPSCertData> certs = result.getEntries();
         boolean first = true;
 
         for (TPSCertData certData : certs) {
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionFindCLI.java
index 7cb4c1b16..d78727d7b 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/connection/ConnectionFindCLI.java
@@ -72,11 +72,11 @@ public class ConnectionFindCLI extends CLI {
         Integer size = s == null ? null : Integer.valueOf(s);
 
         ConnectionCollection result = connectionCLI.connectionClient.findConnections(start, size);
-        Collection<ConnectionData> connections = result.getEntries();
 
-        MainCLI.printMessage(result.getTotal() + " connection(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
+        Collection<ConnectionData> connections = result.getEntries();
         boolean first = true;
 
         for (ConnectionData connectionData : connections) {
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileFindCLI.java
index 907641462..cabacaacd 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileFindCLI.java
@@ -72,11 +72,11 @@ public class ProfileFindCLI extends CLI {
         Integer size = s == null ? null : Integer.valueOf(s);
 
         ProfileCollection result = profileCLI.profileClient.findProfiles(start, size);
-        Collection<ProfileData> profiles = result.getEntries();
 
-        MainCLI.printMessage(result.getTotal() + " profile(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
+        Collection<ProfileData> profiles = result.getEntries();
         boolean first = true;
 
         for (ProfileData profileData : profiles) {
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingFindCLI.java
index 6e101a049..9d87cc43c 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/profile/ProfileMappingFindCLI.java
@@ -72,11 +72,11 @@ public class ProfileMappingFindCLI extends CLI {
         Integer size = s == null ? null : Integer.valueOf(s);
 
         ProfileMappingCollection result = profileMappingCLI.profileMappingClient.findProfileMappings(start, size);
-        Collection<ProfileMappingData> profileMappings = result.getEntries();
 
-        MainCLI.printMessage(result.getTotal() + " profile mapping(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
+        Collection<ProfileMappingData> profileMappings = result.getEntries();
         boolean first = true;
 
         for (ProfileMappingData profileMappingData : profileMappings) {
diff --git a/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java
index 2e43f3cdd..6cfb1fb00 100644
--- a/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/tps/token/TokenFindCLI.java
@@ -72,11 +72,11 @@ public class TokenFindCLI extends CLI {
         Integer size = s == null ? null : Integer.valueOf(s);
 
         TokenCollection result = tokenCLI.tokenClient.findTokens(start, size);
-        Collection<TokenData> tokens = result.getEntries();
 
-        MainCLI.printMessage(result.getTotal() + " token(s) matched");
+        MainCLI.printMessage(result.getTotal() + " entries matched");
         if (result.getTotal() == 0) return;
 
+        Collection<TokenData> tokens = result.getEntries();
         boolean first = true;
 
         for (TokenData tokenData : tokens) {
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java
index db7c0304b..dd8f68762 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserCertFindCLI.java
@@ -82,11 +82,10 @@ public class UserCertFindCLI extends CLI {
 
         UserCertCollection response = userCertCLI.userClient.findUserCerts(userID, start, size);
 
-        Collection<UserCertData> entries = response.getEntries();
-
-        MainCLI.printMessage(response.getTotal() + " user cert(s) matched");
+        MainCLI.printMessage(response.getTotal() + " entries matched");
         if (response.getTotal() == 0) return;
 
+        Collection<UserCertData> entries = response.getEntries();
         boolean first = true;
 
         for (UserCertData userCertData : entries) {
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java
index ed49d1c65..6142a3712 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserFindCLI.java
@@ -76,11 +76,10 @@ public class UserFindCLI extends CLI {
 
         UserCollection response = userCLI.userClient.findUsers(filter, start, size);
 
-        Collection<UserData> entries = response.getEntries();
-
-        MainCLI.printMessage(response.getTotal() + " user(s) matched");
+        MainCLI.printMessage(response.getTotal() + " entries matched");
         if (response.getTotal() == 0) return;
 
+        Collection<UserData> entries = response.getEntries();
         boolean first = true;
 
         for (UserData userData : entries) {
diff --git a/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java
index 66b8f36bb..33ea72d21 100644
--- a/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java
+++ b/base/java-tools/src/com/netscape/cmstools/user/UserMembershipFindCLI.java
@@ -82,11 +82,10 @@ public class UserMembershipFindCLI extends CLI {
 
         UserMembershipCollection response = userMembershipCLI.userClient.findUserMemberships(userID, start, size);
 
-        Collection<UserMembershipData> entries = response.getEntries();
-
-        MainCLI.printMessage(response.getTotal() + " membership(s) matched");
+        MainCLI.printMessage(response.getTotal() + " entries matched");
         if (response.getTotal() == 0) return;
 
+        Collection<UserMembershipData> entries = response.getEntries();
         boolean first = true;
 
         for (UserMembershipData userMembershipData : entries) {