geotools-commits Mailing List for GeoTools, the Java GIS toolkit (Page 7)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Author: bencaradocdavies
Date: 2012-05-23 19:39:06 -0700 (Wed, 23 May 2012)
New Revision: 38746

Added:
   trunk/modules/library/data/src/test/java/org/
   trunk/modules/library/data/src/test/java/org/geotools/
   trunk/modules/library/data/src/test/java/org/geotools/data/
   trunk/modules/library/data/src/test/java/org/geotools/data/store/
   trunk/modules/library/data/src/test/java/org/geotools/data/store/ContentFeatureSourcePagingTest.java
Modified:
   trunk/modules/library/data/src/main/java/org/geotools/data/store/ContentFeatureSource.java
   trunk/modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/impl/GetFeatureTypeImpl.java
Log:
GEOS-5085: WFS 2.0 paging returns wrong features for startindex=0

Modified: trunk/modules/library/data/src/main/java/org/geotools/data/store/ContentFeatureSource.java
===================================================================

--- trunk/modules/library/data/src/main/java/org/geotools/data/store/ContentFeatureSource.java	2012-05-20 14:24:21 UTC (rev 38745)
+++ trunk/modules/library/data/src/main/java/org/geotools/data/store/ContentFeatureSource.java	2012-05-24 02:39:06 UTC (rev 38746)
@@ -547,10 +547,10 @@
         query = resolvePropertyNames(query);
         
         // see if we need to enable native sorting in order to support stable paging
-        final int offset = query.getStartIndex() != null ? query.getStartIndex() : 0;
-        if(offset > 0 & query.getSortBy() == null) {
+        if (query.getStartIndex() != null
+                && (query.getSortBy() == null || query.getSortBy().length == 0)) {
             Query dq = new Query(query);
-            dq.setSortBy(new SortBy[] {SortBy.NATURAL_ORDER});
+            dq.setSortBy(new SortBy[] { SortBy.NATURAL_ORDER });
             query = dq;
         }
 
@@ -601,6 +601,7 @@
 
         
         // offset
+        int offset = query.getStartIndex() != null ? query.getStartIndex() : 0;
         if( !canOffset() && offset > 0 ) {
             // skip the first n records
             for(int i = 0; i < offset && reader.hasNext(); i++) {

Added: trunk/modules/library/data/src/test/java/org/geotools/data/store/ContentFeatureSourcePagingTest.java
===================================================================
--- trunk/modules/library/data/src/test/java/org/geotools/data/store/ContentFeatureSourcePagingTest.java	                        (rev 0)
+++ trunk/modules/library/data/src/test/java/org/geotools/data/store/ContentFeatureSourcePagingTest.java	2012-05-24 02:39:06 UTC (rev 38746)
@@ -0,0 +1,447 @@
+/*
+ *    GeoTools - The Open Source Java GIS Toolkit
+ *    http://geotools.org
+ * 
+ *    (C) 2012, Open Source Geospatial Foundation (OSGeo)
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License as published by the Free Software Foundation;
+ *    version 2.1 of the License.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ */
+
+package org.geotools.data.store;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+
+import org.geotools.data.DataStore;
+import org.geotools.data.FeatureReader;
+import org.geotools.data.Query;
+import org.geotools.data.simple.SimpleFeatureCollection;
+import org.geotools.data.simple.SimpleFeatureIterator;
+import org.geotools.data.simple.SimpleFeatureReader;
+import org.geotools.feature.NameImpl;
+import org.geotools.feature.simple.SimpleFeatureBuilder;
+import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
+import org.geotools.geometry.jts.ReferencedEnvelope;
+import org.junit.Assert;
+import org.junit.Test;
+import org.opengis.feature.simple.SimpleFeature;
+import org.opengis.feature.simple.SimpleFeatureType;
+import org.opengis.feature.type.Name;
+import org.opengis.filter.sort.SortBy;
+
+/**
+ * Test the paging behaviour of {@link ContentFeatureSource}. To establish inter-page consistency,
+ * if no sorting order is specified in the query, the feature source should impose natural sorting.
+ * 
+ * @author Ben Caradoc-Davies (CSIRO Earth Science and Resource Engineering)
+ */
+public class ContentFeatureSourcePagingTest {
+
+    /**
+     * Mock feature type name.
+     */
+    private static final Name TYPENAME = new NameImpl("Mock");
+
+    /**
+     * Mock feature type.
+     */
+    private static final SimpleFeatureType TYPE = buildType();
+
+    /**
+     * The list of features on which paging is tested.
+     */
+    @SuppressWarnings("serial")
+    private static final List<SimpleFeature> FEATURES = new ArrayList<SimpleFeature>() {
+        {
+            add(buildFeature("mock.3"));
+            add(buildFeature("mock.1"));
+            add(buildFeature("mock.2"));
+        }
+    };
+
+    /**
+     * Test that the default query returns all features unsorted.
+     */
+    @Test
+    public void defaultFeatures() {
+        Query query = new Query();
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(3, features.size());
+        Assert.assertEquals("mock.3", features.get(0).getID());
+        Assert.assertEquals("mock.1", features.get(1).getID());
+        Assert.assertEquals("mock.2", features.get(2).getID());
+    }
+
+    /**
+     * Test natural sorting.
+     */
+    @Test
+    public void naturalSortedFeatures() {
+        Query query = new Query();
+        query.setSortBy(new SortBy[] { SortBy.NATURAL_ORDER });
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(3, features.size());
+        Assert.assertEquals("mock.1", features.get(0).getID());
+        Assert.assertEquals("mock.2", features.get(1).getID());
+        Assert.assertEquals("mock.3", features.get(2).getID());
+    }
+
+    /**
+     * Test reverse sorting.
+     */
+    @Test
+    public void reverseSortedFeatures() {
+        Query query = new Query();
+        query.setSortBy(new SortBy[] { SortBy.REVERSE_ORDER });
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(3, features.size());
+        Assert.assertEquals("mock.3", features.get(0).getID());
+        Assert.assertEquals("mock.2", features.get(1).getID());
+        Assert.assertEquals("mock.1", features.get(2).getID());
+    }
+
+    /**
+     * Test the first page of one feature per page.
+     */
+    @Test
+    public void oneFeatureFirstPage() {
+        Query query = new Query();
+        query.setMaxFeatures(1);
+        query.setStartIndex(0);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.1", features.get(0).getID());
+    }
+
+    /**
+     * Test the second page of one feature per page.
+     */
+    @Test
+    public void oneFeatureSecondPage() {
+        Query query = new Query();
+        query.setMaxFeatures(1);
+        query.setStartIndex(1);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.2", features.get(0).getID());
+    }
+
+    /**
+     * Test the third page of one feature per page.
+     */
+    @Test
+    public void oneFeatureThirdPage() {
+        Query query = new Query();
+        query.setMaxFeatures(1);
+        query.setStartIndex(2);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.3", features.get(0).getID());
+    }
+
+    /**
+     * Test the first page of one feature per page with natural sorting.
+     */
+    @Test
+    public void naturalSortedOneFeatureFirstPage() {
+        Query query = new Query();
+        query.setSortBy(new SortBy[] { SortBy.NATURAL_ORDER });
+        query.setMaxFeatures(1);
+        query.setStartIndex(0);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.1", features.get(0).getID());
+    }
+
+    /**
+     * Test the second page of one feature per page with natural sorting.
+     */
+    @Test
+    public void naturalSortedOneFeatureSecondPage() {
+        Query query = new Query();
+        query.setSortBy(new SortBy[] { SortBy.NATURAL_ORDER });
+        query.setMaxFeatures(1);
+        query.setStartIndex(1);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.2", features.get(0).getID());
+    }
+
+    /**
+     * Test the third page of one feature per page with natural sorting.
+     */
+    @Test
+    public void naturalSortedOneFeatureThirdPage() {
+        Query query = new Query();
+        query.setSortBy(new SortBy[] { SortBy.NATURAL_ORDER });
+        query.setMaxFeatures(1);
+        query.setStartIndex(2);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.3", features.get(0).getID());
+    }
+
+    /**
+     * Test the first page of one feature per page with reverse sorting.
+     */
+    @Test
+    public void reverseSortedOneFeatureFirstPage() {
+        Query query = new Query();
+        query.setSortBy(new SortBy[] { SortBy.REVERSE_ORDER });
+        query.setMaxFeatures(1);
+        query.setStartIndex(0);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.3", features.get(0).getID());
+    }
+
+    /**
+     * Test the second page of one feature per page with reverse sorting.
+     */
+    @Test
+    public void reverseSortedOneFeatureSecondPage() {
+        Query query = new Query();
+        query.setSortBy(new SortBy[] { SortBy.REVERSE_ORDER });
+        query.setMaxFeatures(1);
+        query.setStartIndex(1);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.2", features.get(0).getID());
+    }
+
+    /**
+     * Test the third page of one feature per page with reverse sorting.
+     */
+    @Test
+    public void reverseSortedOneFeatureThirdPage() {
+        Query query = new Query();
+        query.setSortBy(new SortBy[] { SortBy.REVERSE_ORDER });
+        query.setMaxFeatures(1);
+        query.setStartIndex(2);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.1", features.get(0).getID());
+    }
+
+    /**
+     * Test the first page of two features per page.
+     */
+    @Test
+    public void twoFeaturesFirstPage() {
+        Query query = new Query();
+        query.setMaxFeatures(2);
+        query.setStartIndex(0);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(2, features.size());
+        Assert.assertEquals("mock.1", features.get(0).getID());
+        Assert.assertEquals("mock.2", features.get(1).getID());
+    }
+
+    /**
+     * Test the page of two features per page that should contain the last two features.
+     */
+    @Test
+    public void twoFeaturesLastPage() {
+        Query query = new Query();
+        query.setMaxFeatures(2);
+        query.setStartIndex(1);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(2, features.size());
+        Assert.assertEquals("mock.2", features.get(0).getID());
+        Assert.assertEquals("mock.3", features.get(1).getID());
+    }
+
+    /**
+     * Test a page of two features that only contains one because startindex is too close to the
+     * end.
+     */
+    @Test
+    public void twoFeaturesReturnOne() {
+        Query query = new Query();
+        query.setMaxFeatures(2);
+        query.setStartIndex(2);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(1, features.size());
+        Assert.assertEquals("mock.3", features.get(0).getID());
+    }
+
+    /**
+     * Test a single page with three features.
+     */
+    @Test
+    public void threeFeatures() {
+        Query query = new Query();
+        query.setMaxFeatures(3);
+        query.setStartIndex(0);
+        List<SimpleFeature> features = readFeatures(query);
+        Assert.assertEquals(3, features.size());
+        Assert.assertEquals("mock.1", features.get(0).getID());
+        Assert.assertEquals("mock.2", features.get(1).getID());
+        Assert.assertEquals("mock.3", features.get(2).getID());
+    }
+
+    /**
+     * Read all the test features into a list, using the specified query.
+     */
+    private List<SimpleFeature> readFeatures(Query query) {
+        List<SimpleFeature> features = new ArrayList<SimpleFeature>();
+        DataStore store = new MockContentDataStore();
+        SimpleFeatureCollection collection;
+        try {
+            collection = store.getFeatureSource(TYPENAME).getFeatures(query);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        for (SimpleFeatureIterator iterator = collection.features(); iterator.hasNext();) {
+            features.add(iterator.next());
+        }
+        return features;
+    }
+
+    /**
+     * Build the test type.
+     */
+    private static SimpleFeatureType buildType() {
+        SimpleFeatureTypeBuilder builder = new SimpleFeatureTypeBuilder();
+        builder.setName(TYPENAME);
+        return builder.buildFeatureType();
+    }
+
+    /**
+     * Build a test feature with the specified id.
+     */
+    private static SimpleFeature buildFeature(String id) {
+        SimpleFeatureBuilder builder = new SimpleFeatureBuilder(TYPE);
+        return builder.buildFeature(id);
+    }
+
+    /**
+     * {@link ContentDataStore} for the test features.
+     * 
+     */
+    private static class MockContentDataStore extends ContentDataStore {
+
+        /**
+         * @see org.geotools.data.store.ContentDataStore#createTypeNames()
+         */
+        @SuppressWarnings("serial")
+        @Override
+        protected List<Name> createTypeNames() throws IOException {
+            return new ArrayList<Name>() {
+                {
+                    add(TYPENAME);
+                }
+            };
+        }
+
+        /**
+         * @see org.geotools.data.store.ContentDataStore#createFeatureSource(org.geotools.data.store.ContentEntry)
+         */
+        @Override
+        protected ContentFeatureSource createFeatureSource(ContentEntry entry) throws IOException {
+            return new MockContentFeatureSource(entry, null);
+        }
+
+    }
+
+    /**
+     * {@link ContentFeatureSource} that returns the test features.
+     */
+    @SuppressWarnings("unchecked")
+    private static class MockContentFeatureSource extends ContentFeatureSource {
+
+        public MockContentFeatureSource(ContentEntry entry, Query query) {
+            super(entry, query);
+        }
+
+        /**
+         * Not implemented.
+         */
+        @Override
+        protected ReferencedEnvelope getBoundsInternal(Query query) throws IOException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * Not implemented.
+         */
+        @Override
+        protected int getCountInternal(Query query) throws IOException {
+            throw new UnsupportedOperationException();
+        }
+
+        /**
+         * @see org.geotools.data.store.ContentFeatureSource#getReaderInternal(org.geotools.data.Query)
+         */
+        @Override
+        protected FeatureReader<SimpleFeatureType, SimpleFeature> getReaderInternal(Query query)
+                throws IOException {
+            return new MockSimpleFeatureReader();
+        }
+
+        /**
+         * @see org.geotools.data.store.ContentFeatureSource#buildFeatureType()
+         */
+        @Override
+        protected SimpleFeatureType buildFeatureType() throws IOException {
+            return TYPE;
+        }
+
+    }
+
+    /**
+     * Decorate the list of test features as a {@link SimpleFeatureReader}.
+     */
+    private static class MockSimpleFeatureReader implements SimpleFeatureReader {
+
+        /**
+         * Index of the next test feature to be returned.
+         */
+        private int index = 0;
+
+        /**
+         * @see org.geotools.data.FeatureReader#getFeatureType()
+         */
+        @Override
+        public SimpleFeatureType getFeatureType() {
+            return TYPE;
+        }
+
+        /**
+         * @see org.geotools.data.FeatureReader#next()
+         */
+        @Override
+        public SimpleFeature next() throws IOException, IllegalArgumentException,
+                NoSuchElementException {
+            return FEATURES.get(index++);
+        }
+
+        /**
+         * @see org.geotools.data.FeatureReader#hasNext()
+         */
+        @Override
+        public boolean hasNext() throws IOException {
+            return index < FEATURES.size();
+        }
+
+        /**
+         * @see org.geotools.data.FeatureReader#close()
+         */
+        @Override
+        public void close() throws IOException {
+            // ignored
+        }
+
+    }
+
+}


Property changes on: trunk/modules/library/data/src/test/java/org/geotools/data/store/ContentFeatureSourcePagingTest.java
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Id URL
Added: svn:eol-style
   + native

Modified: trunk/modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/impl/GetFeatureTypeImpl.java
===================================================================
--- trunk/modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/impl/GetFeatureTypeImpl.java	2012-05-20 14:24:21 UTC (rev 38745)
+++ trunk/modules/ogc/net.opengis.wfs/src/net/opengis/wfs20/impl/GetFeatureTypeImpl.java	2012-05-24 02:39:06 UTC (rev 38746)
@@ -240,7 +240,7 @@
      * @generated
      * @ordered
      */
-    protected static final BigInteger START_INDEX_EDEFAULT = new BigInteger("0");
+    protected static final BigInteger START_INDEX_EDEFAULT = null;
 
     /**
      * The cached value of the '{@link #getStartIndex() <em>Start Index</em>}' attribute.





2001	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (39)	Dec (70)
2002	Jan (52)	Feb (168)	Mar (248)	Apr (143)	May (418)	Jun (558)	Jul (702)	Aug (311)	Sep (141)	Oct (350)	Nov (172)	Dec (182)
2003	Jan (320)	Feb (362)	Mar (356)	Apr (218)	May (447)	Jun (203)	Jul (745)	Aug (494)	Sep (175)	Oct (422)	Nov (554)	Dec (162)
2004	Jan (217)	Feb (353)	Mar (228)	Apr (407)	May (211)	Jun (270)	Jul (264)	Aug (198)	Sep (268)	Oct (227)	Nov (118)	Dec (47)
2005	Jan (207)	Feb (243)	Mar (297)	Apr (197)	May (281)	Jun (166)	Jul (164)	Aug (92)	Sep (155)	Oct (196)	Nov (189)	Dec (114)
2006	Jan (129)	Feb (219)	Mar (274)	Apr (213)	May (245)	Jun (220)	Jul (376)	Aug (347)	Sep (179)	Oct (493)	Nov (448)	Dec (339)
2007	Jan (304)	Feb (273)	Mar (237)	Apr (186)	May (215)	Jun (320)	Jul (229)	Aug (313)	Sep (331)	Oct (279)	Nov (347)	Dec (266)
2008	Jan (332)	Feb (280)	Mar (203)	Apr (277)	May (301)	Jun (356)	Jul (292)	Aug (203)	Sep (277)	Oct (142)	Nov (210)	Dec (239)
2009	Jan (250)	Feb (193)	Mar (174)	Apr (183)	May (342)	Jun (230)	Jul (292)	Aug (161)	Sep (204)	Oct (280)	Nov (281)	Dec (175)
2010	Jan (113)	Feb (106)	Mar (199)	Apr (166)	May (298)	Jun (147)	Jul (175)	Aug (192)	Sep (71)	Oct (79)	Nov (58)	Dec (55)
2011	Jan (83)	Feb (169)	Mar (142)	Apr (207)	May (311)	Jun (183)	Jul (218)	Aug (190)	Sep (158)	Oct (197)	Nov (93)	Dec (74)
2012	Jan (92)	Feb (50)	Mar (64)	Apr (45)	May (100)	Jun (70)	Jul (3)	Aug (1)	Sep (2)	Oct (5)	Nov (7)	Dec (4)
2013	Jan (6)	Feb (2)	Mar (2)	Apr (4)	May (3)	Jun	Jul (2)	Aug	Sep	Oct (1)	Nov (1)	Dec
2014	Jan (2)	Feb (2)	Mar (2)	Apr (3)	May (3)	Jun (1)	Jul	Aug (4)	Sep	Oct (1)	Nov (1)	Dec
2015	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug (1)	Sep	Oct	Nov (1)	Dec (1)
2016	Jan	Feb	Mar	Apr	May (1)	Jun (1)	Jul	Aug (3)	Sep	Oct	Nov (1)	Dec
2017	Jan (1)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

geotools-commits Mailing List for GeoTools, the Java GIS toolkit (Page 7)

Toolkit for working with and mapping geospatial data

geotools-commits — A read only list to which all svn commit statments are posted