Return-Path: Delivered-To: apmail-incubator-chemistry-commits-archive@minotaur.apache.org Received: (qmail 11116 invoked from network); 26 Apr 2010 18:01:10 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 Apr 2010 18:01:10 -0000 Received: (qmail 38505 invoked by uid 500); 26 Apr 2010 18:01:10 -0000 Delivered-To: apmail-incubator-chemistry-commits-archive@incubator.apache.org Received: (qmail 38481 invoked by uid 500); 26 Apr 2010 18:01:10 -0000 Mailing-List: contact chemistry-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: chemistry-dev@incubator.apache.org Delivered-To: mailing list chemistry-commits@incubator.apache.org Received: (qmail 38473 invoked by uid 99); 26 Apr 2010 18:01:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Apr 2010 18:01:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Apr 2010 18:01:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 610A723888E3; Mon, 26 Apr 2010 18:00:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r938158 - in /incubator/chemistry/opencmis/trunk/chemistry-opencmis-client: chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/ chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/cli... Date: Mon, 26 Apr 2010 18:00:23 -0000 To: chemistry-commits@incubator.apache.org From: dcaruana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100426180023.610A723888E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dcaruana Date: Mon Apr 26 18:00:22 2010 New Revision: 938158 URL: http://svn.apache.org/viewvc?rev=938158&view=rev Log: Paging updates: - remove getIterator() from PagingIterable (added by mistake) - added getPageNumItems() to PagingIterable - updated tests Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterable.java incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterator.java incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/CollectionIterable.java incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/PageIterable.java incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/PagingListTest.java Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterable.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterable.java?rev=938158&r1=938157&r2=938158&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterable.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterable.java Mon Apr 26 18:00:22 2010 @@ -45,12 +45,4 @@ public interface PagingIterable exten * @see java.lang.Iterable#iterator() */ PagingIterator iterator(); - - /** - * Getter version of iterator() - * - * @see java.lang.Iterable#iterator() - * @return iterator - */ - PagingIterator getIterator(); } Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterator.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterator.java?rev=938158&r1=938157&r2=938158&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterator.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-api/src/main/java/org/apache/chemistry/opencmis/client/api/PagingIterator.java Mon Apr 26 18:00:22 2010 @@ -35,6 +35,13 @@ public interface PagingIterator exten long getPosition(); /** + * Returns the number of items fetched for the current page. + * + * @return number of items for currently fetched page + */ + long getPageNumItems(); + + /** * Returns whether the repository contains additional items beyond the page of * items already fetched. * Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java?rev=938158&r1=938157&r2=938158&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/AbstractIterator.java Mon Apr 26 18:00:22 2010 @@ -18,9 +18,12 @@ */ package org.apache.chemistry.opencmis.client.runtime.util; +import java.util.List; + import org.apache.chemistry.opencmis.client.api.PagingIterator; import org.apache.chemistry.opencmis.client.runtime.util.AbstractPageFetch.PageFetchResult; + /** * Abstract PagingIterator implementation. * @@ -50,8 +53,7 @@ public abstract class AbstractIterator page = getCurrentPage(); + if (page != null) { + List items = page.getPage(); + if (items != null) { + return items.size(); + } + } + return 0L; + } + + /* + * (non-Javadoc) * @see org.apache.chemistry.opencmis.client.api.PagingIterator#getTotalNumItems() */ public long getTotalNumItems() { @@ -95,7 +112,6 @@ public abstract class AbstractIterator imple /* * (non-Javadoc) * - * @see org.apache.chemistry.opencmis.client.api.PagingIterable#getIterator() - */ - public PagingIterator getIterator() { - return iterator(); - } - - /* - * (non-Javadoc) - * * @see org.apache.chemistry.opencmis.client.api.util.PagingIterable#skipTo(long) */ public PagingIterable skipTo(long position) { Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/PageIterable.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/PageIterable.java?rev=938158&r1=938157&r2=938158&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/PageIterable.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/main/java/org/apache/chemistry/opencmis/client/runtime/util/PageIterable.java Mon Apr 26 18:00:22 2010 @@ -61,15 +61,6 @@ public class PageIterable implements /* * (non-Javadoc) * - * @see org.apache.chemistry.opencmis.client.api.PagingIterable#getIterator() - */ - public PagingIterator getIterator() { - return iterator(); - } - - /* - * (non-Javadoc) - * * @see org.apache.chemistry.opencmis.client.api.util.PagingIterable#skipTo(long) */ public PagingIterable skipTo(long position) { Modified: incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/PagingListTest.java URL: http://svn.apache.org/viewvc/incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/PagingListTest.java?rev=938158&r1=938157&r2=938158&view=diff ============================================================================== --- incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/PagingListTest.java (original) +++ incubator/chemistry/opencmis/trunk/chemistry-opencmis-client/chemistry-opencmis-client-impl/src/test/java/org/apache/chemistry/opencmis/client/runtime/PagingListTest.java Mon Apr 26 18:00:22 2010 @@ -179,6 +179,23 @@ public class PagingListTest { assertEquals(false, i.getHasMoreItems()); } + @Test + public void totalPageNumItems() { + System.out.println("\ntotalPageNumItems"); + + int pageSize = 7; + PagingIterable p = this.getIterable(this.data10, pageSize); + assertNotNull(p); + PagingIterator i = (PagingIterator) p.iterator(); + assertNotNull(i); + assertEquals(pageSize, i.getPageNumItems()); + for (int idx = 0; i.hasNext() && idx < (pageSize + 1); idx++) { + i.next(); + } + assertEquals(pageSize + 1, i.getPosition()); + assertEquals(this.data10.length - pageSize, i.getPageNumItems()); + } + private void loopSkip(String[] data, int skipCount, int pageSize) { System.out.println("\nloopSkip (" + skipCount + ", " + pageSize + ")");