Collection description operation

geoserver · Jun 19, 2019 · ffb7f4f · ffb7f4f
1 parent c531975
commit ffb7f4f
Show file tree

Hide file tree

Showing 21 changed files with 413 additions and 172 deletions.
diff --git a/src/community/api/src/main/java/org/geoserver/api/APIBodyMethodProcessor.java b/src/community/api/src/main/java/org/geoserver/api/APIBodyMethodProcessor.java
@@ -2,7 +2,7 @@
  *  (c) 2019 Open Source Geospatial Foundation - all rights reserved
  *  This code is licensed under the GPL 2.0 license, available at the root
  *  application directory.
- *  
+ *
  */
 
 /*
@@ -14,6 +14,12 @@
 
 package org.geoserver.api;
 
+import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
 import org.geoserver.config.GeoServer;
 import org.geoserver.platform.GeoServerResourceLoader;
 import org.springframework.core.GenericTypeResolver;
@@ -32,15 +38,6 @@
 import org.springframework.web.servlet.mvc.method.annotation.JsonViewResponseBodyAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor;
 
-import java.io.IOException;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.print.attribute.standard.RequestingUserName;
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * Customized {@link RequestResponseBodyMethodProcessor} that uses its own content negotiation
  * manager and can handle HTML annotated responses
@@ -83,8 +80,7 @@ protected <T> void writeWithMessageConverters(
                     HttpMessageNotWritableException {
         HTMLResponseBody htmlResponseBody = returnType.getMethodAnnotation(HTMLResponseBody.class);
         MediaType mediaType = getMediaTypeToUse(value, returnType, inputMessage, outputMessage);
-        if (htmlResponseBody != null
-                && MediaType.TEXT_HTML.isCompatibleWith(mediaType)) {
+        if (htmlResponseBody != null && MediaType.TEXT_HTML.isCompatibleWith(mediaType)) {
             // direct HTML encoding based on annotations
             SimpleHTTPMessageConverter converter =
                     new SimpleHTTPMessageConverter(

diff --git a/src/community/api/src/main/java/org/geoserver/api/APIContentNegotiationManager.java b/src/community/api/src/main/java/org/geoserver/api/APIContentNegotiationManager.java
@@ -1,10 +1,16 @@
 /*
  *  (c) 2019 Open Source Geospatial Foundation - all rights reserved
- *  * This code is licensed under the GPL 2.0 license, available at the root
- *  * application directory.
+ *  This code is licensed under the GPL 2.0 license, available at the root
+ *  application directory.
  *
  */
 
+/*
+ *  (c) 2019 Open Source Geospatial Foundation - all rights reserved
+ *  This code is licensed under the GPL 2.0 license, available at the root
+ *  application directory.
+ */
+
 package org.geoserver.api;
 
 import java.util.ArrayList;

diff --git a/src/community/api/src/main/java/org/geoserver/api/APIDispatcher.java b/src/community/api/src/main/java/org/geoserver/api/APIDispatcher.java
@@ -2,12 +2,6 @@
  *  (c) 2019 Open Source Geospatial Foundation - all rights reserved
  *  This code is licensed under the GPL 2.0 license, available at the root
  *  application directory.
- *  
- */
-
-/* (c) 2019 Open Source Geospatial Foundation - all rights reserved
- * This code is licensed under the GPL 2.0 license, available at the root
- * application directory.
  */
 
 package org.geoserver.api;
@@ -18,6 +12,7 @@
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -26,8 +21,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
-
-import javax.print.attribute.standard.RequestingUserName;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.geoserver.config.GeoServer;
@@ -47,6 +40,7 @@
 import org.springframework.core.MethodParameter;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -87,7 +81,8 @@ public class APIDispatcher extends AbstractController
 
     protected RequestMappingHandlerAdapter handlerAdapter;
     protected HandlerMethodReturnValueHandlerComposite returnValueHandlers;
-    protected APIContentNegotiationManager contentNegotiationManager = new APIContentNegotiationManager();
+    protected APIContentNegotiationManager contentNegotiationManager =
+            new APIContentNegotiationManager();
     private List<HttpMessageConverter<?>> messageConverters;
 
     // SHARE
@@ -224,9 +219,10 @@ protected ModelAndView handleRequestInternal(
             // store it in the thread local
             Dispatcher.REQUEST.set(dr);
             // add a thread local with info on formats, base urls, and the like
-            RequestInfo requestInfo = new RequestInfo(httpRequest);
-            requestInfo.setRequestedMediaTypes(contentNegotiationManager.resolveMediaTypes(new ServletWebRequest(dr.getHttpRequest())));
-            requestInfo.setConverters(messageConverters);
+            RequestInfo requestInfo = new RequestInfo(httpRequest, this);
+            requestInfo.setRequestedMediaTypes(
+                    contentNegotiationManager.resolveMediaTypes(
+                            new ServletWebRequest(dr.getHttpRequest())));
             RequestInfo.set(requestInfo);
 
             // lookup the handler adapter (same as service and operation)
@@ -464,4 +460,30 @@ private static String getRequestUri(HttpServletRequest request) {
         }
         return uri;
     }
+
+    public List<HttpMessageConverter<?>> getConverters() {
+        return messageConverters;
+    }
+
+    public Collection<MediaType> getProducibleMediaTypes(Class<?> responseType, boolean addHTML) {
+        List<MediaType> result = new ArrayList<>();
+        for (HttpMessageConverter<?> converter : this.messageConverters) {
+            if (converter instanceof GenericHttpMessageConverter) {
+                if (((GenericHttpMessageConverter<?>) converter)
+                        .canWrite(responseType, responseType, null)) {
+                    result.addAll(converter.getSupportedMediaTypes());
+                }
+            } else if (converter.canWrite(responseType, null)) {
+                result.addAll(converter.getSupportedMediaTypes());
+            }
+        }
+        if (addHTML) {
+            result.add(MediaType.TEXT_HTML);
+        }
+
+        return result.stream()
+                .filter(mt -> mt.isConcrete())
+                .distinct()
+                .collect(Collectors.toList());
+    }
 }
diff --git a/src/community/api/src/main/java/org/geoserver/api/AbstractHTMLMessageConverter.java b/src/community/api/src/main/java/org/geoserver/api/AbstractHTMLMessageConverter.java
@@ -2,7 +2,7 @@
  *  (c) 2019 Open Source Geospatial Foundation - all rights reserved
  *  This code is licensed under the GPL 2.0 license, available at the root
  *  application directory.
- *  
+ *
  */
 
 /*

diff --git a/src/community/api/src/main/java/org/geoserver/api/FreemarkerTemplateSupport.java b/src/community/api/src/main/java/org/geoserver/api/FreemarkerTemplateSupport.java
@@ -2,7 +2,7 @@
  *  (c) 2019 Open Source Geospatial Foundation - all rights reserved
  *  This code is licensed under the GPL 2.0 license, available at the root
  *  application directory.
- *  
+ *
  */
 
 /*
@@ -12,6 +12,9 @@
  */
 package org.geoserver.api;
 
+import freemarker.template.Configuration;
+import freemarker.template.Template;
+import java.io.IOException;
 import org.geoserver.catalog.ResourceInfo;
 import org.geoserver.catalog.WorkspaceInfo;
 import org.geoserver.ows.LocalWorkspace;
@@ -21,11 +24,6 @@
 import org.geoserver.template.GeoServerTemplateLoader;
 import org.geoserver.template.TemplateUtils;
 
-import java.io.IOException;
-
-import freemarker.template.Configuration;
-import freemarker.template.Template;
-
 public class FreemarkerTemplateSupport {
 
     private static Configuration templateConfig = TemplateUtils.getSafeConfiguration();

diff --git a/src/community/api/src/main/java/org/geoserver/api/RequestInfo.java b/src/community/api/src/main/java/org/geoserver/api/RequestInfo.java
@@ -11,23 +11,17 @@
  */
 package org.geoserver.api;
 
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import javax.servlet.http.HttpServletRequest;
 import org.geoserver.ows.URLMangler;
 import org.geoserver.ows.util.ResponseUtils;
 import org.springframework.http.MediaType;
-import org.springframework.http.converter.GenericHttpMessageConverter;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * An object which contains information about the "page" or "resource" being accessed in a rest
  * request.
@@ -43,14 +37,14 @@
 public class RequestInfo {
 
     /** key to reference this object by */
-    public static final String KEY = "RequestInfo";
+    public static final String KEY = "APIRequestInfo";
 
     String baseURL;
     String servletPath;
     String pagePath;
     String extension;
     List<MediaType> requestedMediaTypes;
-    List<HttpMessageConverter<?>> converters;
+    APIDispatcher dispatcher;
 
     private Map<String, String[]> queryMap;
 
@@ -62,7 +56,9 @@ public RequestInfo() {}
      *
      * @param request
      */
-    public RequestInfo(HttpServletRequest request) {
+    public RequestInfo(HttpServletRequest request, APIDispatcher dispatcher) {
+        this.dispatcher = dispatcher;
+
         // http://host:port/appName
         baseURL =
                 request.getRequestURL()
@@ -184,37 +180,18 @@ public void setRequestedMediaTypes(List<MediaType> requestedMediaTypes) {
     }
 
     public List<HttpMessageConverter<?>> getConverters() {
-        return converters;
-    }
-
-    public void setConverters(List<HttpMessageConverter<?>> converters) {
-        this.converters = converters;
+        return dispatcher.getConverters();
     }
 
     public Collection<MediaType> getProducibleMediaTypes(Class<?> responseType, boolean addHTML) {
-        List<MediaType> result = new ArrayList<>();
-        for (HttpMessageConverter<?> converter : this.converters) {
-            if (converter instanceof GenericHttpMessageConverter) {
-                if (((GenericHttpMessageConverter<?>) converter)
-                        .canWrite(responseType, responseType, null)) {
-                    result.addAll(converter.getSupportedMediaTypes());
-                }
-            } else if (converter.canWrite(responseType, null)) {
-                result.addAll(converter.getSupportedMediaTypes());
-            }
-        }
-        if (addHTML) {
-            result.add(MediaType.TEXT_HTML);
-        }
-
-        return result.stream().filter(mt -> mt.isConcrete()).distinct().collect(Collectors.toList());
+        return dispatcher.getProducibleMediaTypes(responseType, addHTML);
     }
 
     public boolean isFormatRequested(MediaType mediaType) {
         if (requestedMediaTypes == null) {
             return false;
         }
-        
+
         return requestedMediaTypes.stream().anyMatch(curr -> mediaType.isCompatibleWith(curr));
     }
 }
diff --git a/src/community/api/src/main/java/org/geoserver/api/features/AbstractDocument.java b/src/community/api/src/main/java/org/geoserver/api/features/AbstractDocument.java
@@ -2,7 +2,7 @@
  *  (c) 2019 Open Source Geospatial Foundation - all rights reserved
  *  This code is licensed under the GPL 2.0 license, available at the root
  *  application directory.
- *  
+ *
  */
 
 /*
@@ -16,7 +16,6 @@
 
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;

diff --git a/src/community/api/src/main/java/org/geoserver/api/features/CollectionDocument.java b/src/community/api/src/main/java/org/geoserver/api/features/CollectionDocument.java
@@ -2,7 +2,7 @@
  *  (c) 2019 Open Source Geospatial Foundation - all rights reserved
  *  This code is licensed under the GPL 2.0 license, available at the root
  *  application directory.
- *  
+ *
  */
 
 /* (c) 2018 Open Source Geospatial Foundation - all rights reserved
@@ -16,7 +16,14 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
-
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.geoserver.api.RequestInfo;
 import org.geoserver.catalog.FeatureTypeInfo;
 import org.geoserver.config.GeoServer;
@@ -29,18 +36,9 @@
 import org.opengis.feature.type.FeatureType;
 import org.springframework.http.MediaType;
 
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 /** Description of a single collection, that will be serialized to JSON/XML/HTML */
 @JsonPropertyOrder({"name", "title", "description", "extent", "links"})
-@JacksonXmlRootElement(localName = "Collection")
+@JacksonXmlRootElement(localName = "Collection", namespace = "http://www.opengis.net/wfs/3.0")
 public class CollectionDocument extends AbstractDocument {
     static final Logger LOGGER = Logging.getLogger(CollectionDocument.class);
 
@@ -51,8 +49,7 @@ public class CollectionDocument extends AbstractDocument {
     FeatureTypeInfo featureType;
     String mapPreviewURL;
 
-    public CollectionDocument(
-            GeoServer geoServer, FeatureTypeInfo featureType) {
+    public CollectionDocument(GeoServer geoServer, FeatureTypeInfo featureType) {
         // basic info
         String collectionId = NCNameResourceCodec.encode(featureType);
         setName(collectionId);