[GEOS-8406] WFS 2.0 does not support GetFeature with alternate namesp…

…ace prefixes

src/main/src/main/java/org/geoserver/ows/kvp/NamespaceKvpParser.java

@@ -7,6 +7,7 @@
 
 import java.net.URI;
 import java.net.URISyntaxException;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.xml.XMLConstants;
@@ -20,14 +21,24 @@
  * Parses a list of namespace declarations of the form {@code
  * <xmlns(foo=http://name.space1)[,xmlns(bar=http://name.space2)]+> } into a
  * {@link NamespaceSupport}.
+ * Using the {@link PrefixNamespaceSeparator#COMMA} it's also possible to handle
+ * the WFS 2.0 suggested syntax, {@code
+ * <xmlns(foo,http://name.space1)[,xmlns(bar,http://name.space2)]+> }
  * 
  * @author groldan
  * 
  */
 public class NamespaceKvpParser extends KvpParser {
 
+    private final boolean useComma;
+
     public NamespaceKvpParser(String key) {
+        this(key, false);
+    }
+
+    public NamespaceKvpParser(String key, boolean useComma) {
         super(key, NamespaceSupport.class);
+        this.useComma = useComma;
     }
 
     /**
@@ -39,21 +50,28 @@ public NamespaceKvpParser(String key) {
     @SuppressWarnings("unchecked")
     @Override
     public NamespaceSupport parse(final String value) throws Exception {
-        List<String> decls = (List<String>) new FlatKvpParser("", String.class).parse(value);
+        List<String> declarations;
+        if (useComma) {
+            String[] parts = value.split(",(?![^()]*+\\))");
+            declarations = Arrays.asList(parts);
+        } else {
+            declarations = (List<String>) new FlatKvpParser("", String.class).parse(value);
+        }
         NamespaceSupport ctx = new NamespaceSupport();
 
         String[] parts;
         String prefix;
         String uri;
-        for (String decl : decls) {
+        for (String decl : declarations) {
             decl = decl.trim();
             if (!decl.startsWith("xmlns(") || !decl.endsWith(")")) {
                 throw new ServiceException("Illegal namespace declaration, "
                         + "should be of the form xmlns(<prefix>=<ns uri>): " + decl, ServiceException.INVALID_PARAMETER_VALUE, getKey());
             }
             decl = decl.substring("xmlns(".length());
             decl = decl.substring(0, decl.length() - 1);
-            parts = decl.split("=");
+            String separator = useComma ? "," : "=";
+            parts = decl.split(separator);
             if (parts.length == 1) {
                 prefix = XMLConstants.DEFAULT_NS_PREFIX;
                 uri = parts[0];
@@ -62,7 +80,7 @@ public NamespaceSupport parse(final String value) throws Exception {
                 uri = parts[1];
             } else {
                 throw new ServiceException("Illegal namespace declaration, "
-                        + "should be of the form prefix=<namespace uri>: " + decl, ServiceException.INVALID_PARAMETER_VALUE, getKey());
+                        + "should be of the form prefix" + separator + "<namespace uri>: " + decl, ServiceException.INVALID_PARAMETER_VALUE, getKey());
             }
 
             try {

src/main/src/test/java/org/geoserver/ows/kvp/NamespaceKvpParserTest.java

@@ -98,4 +98,14 @@ private List<String> getPrefixes(NamespaceSupport ctx) {
         }
         return l;
     }
+
+    @Test
+    public void testWfs20Syntax() throws Exception {
+        NamespaceKvpParser parser = new NamespaceKvpParser("namespaces", true);
+        NamespaceSupport ctx = parser
+                .parse("xmlns(http://bar), xmlns(ex,http://example.com),xmlns(gs,http://geoserver.org)");
+        assertEquals("http://bar", ctx.getURI(""));
+        assertEquals("http://example.com", ctx.getURI("ex"));
+        assertEquals("http://geoserver.org", ctx.getURI("gs"));
+    }
 }

src/wfs/src/main/java/applicationContext.xml

@@ -309,7 +309,8 @@
     <property name="request"><value>GetFeature</value></property>
   </bean>
   <bean id="getFeature20NamespaceKvpParser" class="org.geoserver.ows.kvp.NamespaceKvpParser">
-    <constructor-arg value="namespace"/>
+    <constructor-arg value="namespaces"/>
+    <constructor-arg value="true"/>
     <property name="service"><value>WFS</value></property>
     <property name="version"><value>2.0.0</value></property>
     <property name="request"><value>GetFeature</value></property>
@@ -321,7 +322,8 @@
     <property name="request"><value>DescribeFeatureType</value></property>
   </bean>
   <bean id="dft20NamespaceKvpParser" class="org.geoserver.ows.kvp.NamespaceKvpParser">
-    <constructor-arg value="namespace"/>
+    <constructor-arg value="namespaces"/>
+    <constructor-arg value="true"/>
     <property name="service"><value>WFS</value></property>
     <property name="version"><value>2.0.0</value></property>
     <property name="request"><value>DescribeFeatureType</value></property>

src/wfs/src/main/java/org/geoserver/wfs/kvp/DescribeFeatureTypeKvpRequestReader.java

@@ -58,9 +58,11 @@ public Object read(Object request, Map kvp, Map rawKvp) throws Exception {
 
         // did the user supply alternate namespace prefixes?
         NamespaceSupport namespaces = null;
-        if (kvp.containsKey("NAMESPACE")) {
+        if (kvp.containsKey("NAMESPACE") || kvp.containsKey("NAMESPACES")) {
             if (kvp.get("NAMESPACE") instanceof NamespaceSupport) {
                 namespaces = (NamespaceSupport) kvp.get("namespace");
+            } else if (kvp.get("NAMESPACES") instanceof NamespaceSupport) {
+                    namespaces = (NamespaceSupport) kvp.get("namespaces");
             } else {
                 LOGGER.warning("There's a namespace parameter but it seems it wasn't parsed to a "
                         + NamespaceSupport.class.getName() + ": " + kvp.get("namespace"));

src/wfs/src/main/java/org/geoserver/wfs/kvp/GetFeatureKvpRequestReader.java

@@ -119,9 +119,11 @@ public Object read(Object request, Map kvp, Map rawKvp) throws Exception {
 
         // did the user supply alternate namespace prefixes?
         NamespaceSupport namespaces = null;
-        if (kvp.containsKey("namespace")) {
+        if (kvp.containsKey("namespace") || kvp.containsKey("namespaces")) {
             if (kvp.get("namespace") instanceof NamespaceSupport) {
                 namespaces = (NamespaceSupport) kvp.get("namespace");
+            } else if (kvp.get("namespaces") instanceof NamespaceSupport) {
+                namespaces = (NamespaceSupport) kvp.get("namespaces");
             } else {
                 LOGGER.warning("There's a namespace parameter but it seems it wasn't parsed to a "
                         + NamespaceSupport.class.getName() + ": " + kvp.get("namespace"));

src/wfs/src/test/java/org/geoserver/wfs/v2_0/DescribeFeatureTypeTest.java

@@ -234,7 +234,7 @@ public void testUserSuppliedTypeNameNamespace() throws Exception {
         final QName typeName = CiteTestData.POLYGONS;
         String path = "ows?service=WFS&version=2.0.0&request=DescribeFeatureType&" +
             "typeName=myPrefix:" + typeName.getLocalPart() + 
-            "&namespace=xmlns(myPrefix%3D" + URLEncoder.encode(typeName.getNamespaceURI(), "UTF-8") + ")";
+            "&namespaces=xmlns(myPrefix," + URLEncoder.encode(typeName.getNamespaceURI(), "UTF-8") + ")";
 
         Document doc = getAsDOM(path);
         assertSchema(doc, CiteTestData.POLYGONS);

src/wfs/src/test/java/org/geoserver/wfs/v2_0/GetFeatureTest.java

@@ -77,6 +77,13 @@ public void testGet() throws Exception {
     	testGetFifteenAll("wfs?request=GetFeature&typenames=cdf:Fifteen&version=2.0.0&service=wfs");
     	testGetFifteenAll("wfs?request=GetFeature&typenames=(cdf:Fifteen)&version=2.0.0&service=wfs");
     }
+
+    @Test
+    public void testAlternatePrefix() throws Exception {
+        testGetFifteenAll("wfs?request=GetFeature&typenames=abc:Fifteen&version=2.0.0&service=wfs&namespaces=xmlns(abc," + MockData.CDF_URI + ")");
+        testGetFifteenAll("wfs?request=GetFeature&typenames=abc:Fifteen&version=2.0.0&service=wfs&namespaces=xmlns(abc," + MockData.CDF_URI + "),xmlns(wfs," + WFS.NAMESPACE + ")");
+        testGetFifteenAll("wfs?request=GetFeature&typenames=Fifteen&version=2.0.0&service=wfs&namespaces=xmlns(" + MockData.CDF_URI + "),xmlns(wfs," + WFS.NAMESPACE + ")");
+    }
 
     @Test
     public void testConcurrentGet() throws Exception {
@@ -699,8 +706,7 @@ public void testLayerQualified() throws Exception {
     @Test
     public void testUserSuppliedNamespacePrefix() throws Exception {
         testGetFifteenAll("wfs?request=GetFeature&typename=myPrefix:Fifteen&version=2.0.0&service=wfs&"
-                + "namespace=xmlns(myPrefix%3D" // the '=' sign shall be encoded, hence '%3D'
-                + URLEncoder.encode(MockData.FIFTEEN.getNamespaceURI(), "UTF-8") + ")");
+                + "namespaces=xmlns(myPrefix," + URLEncoder.encode(MockData.FIFTEEN.getNamespaceURI(), "UTF-8") + ")");
     }
 
     @Test