[GEOS-8426] WFS 2.0 (CITE specific): a service exception should be th…

…rown if the resourceId is not a match for the specified typenames - follow up for the matching case
geoserver · Nov 24, 2017 · 25b471f · 25b471f
1 parent 3ade7e0
commit 25b471f
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/src/wfs/src/main/java/org/geoserver/wfs/kvp/GetFeatureKvpRequestReader.java b/src/wfs/src/main/java/org/geoserver/wfs/kvp/GetFeatureKvpRequestReader.java
@@ -177,7 +177,7 @@ public Object read(Object request, Map kvp, Map rawKvp) throws Exception {
 
                 Set<List> hTypeNames = new HashSet<>();
                 for (int i = 0; i < featureId.size(); i++) {
-                    QName typeName = getTypeNameFromFeaturId((String) featureId.get(i));
+                    QName typeName = getTypeNameFromFeatureId((String) featureId.get(i));
                     if(typeName != null) {
                         hTypeNames.add(Arrays.asList(typeName));
                     }
@@ -222,9 +222,9 @@ public Object read(Object request, Map kvp, Map rawKvp) throws Exception {
                 String fid = (String) i.next();
                 // check consistency between resourceId and typeName (per WFS 2.0 CITE tests) 
                 if (getWFS().isCiteCompliant() && typeNames != null && !typeNames.isEmpty()) {
-                    QName qName = getTypeNameFromFeaturId(fid);
+                    QName qName = getTypeNameFromFeatureId(fid);
                     if (qName != null) {
-                        if (!typeNames.stream().flatMap(List::stream).anyMatch(q -> qName.equals(q))) {
+                        if (!typeNames.stream().flatMap(List::stream).anyMatch(q -> typeNameMatch(qName, q))) {
                             String locator = isFeatureId ? "FEATUREID" : "RESOURCEID";
                             WFSException exception = new WFSException(eObject, "ResourceId is incosistent with typenames");
                             exception.setCode(ServiceException.INVALID_PARAMETER_VALUE);
@@ -343,8 +343,13 @@ else if( kvp.get("propertyName") != null && kvp.get("propertyName") instanceof S
 
         return request;
     }
-
+
-    QName getTypeNameFromFeaturId(String fid) throws Exception {
+    public boolean typeNameMatch(QName maybeUnqualified, QName qualified) {
+        return maybeUnqualified.equals(qualified) || ((maybeUnqualified.getNamespaceURI() == null || maybeUnqualified
+                .getNamespaceURI().isEmpty()) && qualified.getLocalPart().equals(maybeUnqualified.getLocalPart()));
+    }
+
+    QName getTypeNameFromFeatureId(String fid) throws Exception {
         int pos = fid.indexOf(".");
 
         if (pos != -1) {

diff --git a/src/wfs/src/test/java/org/geoserver/wfs/v2_0/GetFeatureTest.java b/src/wfs/src/test/java/org/geoserver/wfs/v2_0/GetFeatureTest.java
@@ -196,7 +196,7 @@ public void testGetWithFeatureId() throws Exception {
     @Test
     public void testGetWithResourceId() throws Exception {
         Document doc = 
-                getAsDOM("wfs?request=GetFeature&typeName=cdf:Fifteen&version=2.0.0&service=wfs&resourceid=Fifteen.2");
+                getAsDOM("wfs?request=GetFeature&typeNames=cdf:Fifteen&version=2.0.0&service=wfs&resourceid=Fifteen.2");
         assertGML32(doc);
 
         XMLAssert.assertXpathEvaluatesTo("1", "count(//wfs:FeatureCollection/wfs:member/cdf:Fifteen)",
@@ -233,6 +233,29 @@ public void testGetWithInconsistentResourceId() throws Exception {
 
     }
 
+    @Test
+    public void testGetWithConsistentResourceId() throws Exception {
+        GeoServer gs = getGeoServer();
+        WFSInfo wfs = gs.getService(WFSInfo.class);
+        wfs.setCiteCompliant(true);
+        gs.save(wfs);
+
+        try {
+            Document doc =
+                    getAsDOM("wfs?request=GetFeature&typeNames=cdf:Fifteen&version=2.0.0&service=wfs&resourceid=Fifteen.2");
+            assertGML32(doc);
+
+            XMLAssert.assertXpathEvaluatesTo("1", "count(//wfs:FeatureCollection/wfs:member/cdf:Fifteen)",
+                    doc);
+            XMLAssert.assertXpathEvaluatesTo("Fifteen.2",
+                    "//wfs:FeatureCollection/wfs:member/cdf:Fifteen/@gml:id", doc);
+        } finally {
+            wfs.setCiteCompliant(false);
+            gs.save(wfs);
+        }
+
+    }
+
     @Test
     public void testGetWithBBOX() throws Exception {
         Document dom =