OSEO admin REST API, products read only portion

src/community/oseo/oseo-core/src/main/java/org/geoserver/opensearch/eo/DefaultOpenSearchEoService.java

@@ -14,19 +14,16 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.geoserver.catalog.DataStoreInfo;
 import org.geoserver.catalog.Predicates;
 import org.geoserver.config.GeoServer;
 import org.geoserver.opensearch.eo.store.OpenSearchAccess;
 import org.geoserver.opensearch.eo.store.OpenSearchAccess.ProductClass;
 import org.geoserver.platform.OWS20Exception;
 import org.geoserver.platform.OWS20Exception.OWSExceptionCode;
-import org.geotools.data.DataAccess;
 import org.geotools.data.DataUtilities;
 import org.geotools.data.FeatureSource;
 import org.geotools.data.Parameter;
 import org.geotools.data.Query;
-import org.geotools.data.memory.MemoryFeatureCollection;
 import org.geotools.factory.CommonFactoryFinder;
 import org.geotools.feature.FeatureCollection;
 import org.geotools.feature.NameImpl;
@@ -300,7 +297,12 @@ public QuicklookResults quicklook(QuicklookRequest request) throws IOException {
         return new QuicklookResults(request, payload, guessImageMimeType(payload));
     }
 
-    private String guessImageMimeType(byte[] payload) {
+    /**
+     * Used to guess the mime type of an encoded image until we start storing the mime in the db
+     * @param payload
+     * @return
+     */
+    public static String guessImageMimeType(byte[] payload) {
         // guesses jpeg and png by the magic number
         if (payload.length >= 4 && //
                 (payload[0] == (byte) 0xFF) && //

src/community/oseo/oseo-core/src/test/java/org/geoserver/opensearch/eo/SearchTest.java

@@ -390,7 +390,6 @@ public void testSpecificProduct() throws Exception {
 
         // check the HTML
         String summary = getXPath().compile("/at:feed/at:entry[1]/at:summary").evaluate(dom);
-        System.out.println(summary);
         // parse html using JSoup (DOM not usable, HTML is not valid/well formed XML in general
         org.jsoup.nodes.Document sd = Jsoup.parse(summary);
         String isoHRef = sd.select("a[title=O&M format]").attr("href");

src/community/oseo/oseo-core/src/test/resources/product_h2_data.sql

@@ -1052,7 +1052,7 @@ VALUES(353, '<?xml version="1.0" encoding="UTF-8"?>
   </om:result>
   <eop:metaDataProperty>
     <eop:EarthObservationMetaData>
-      <eop:identifier></eop:identifier>
+      <eop:identifier>S2A_OPER_MSI_L1C_TL_SGS__20160117T141030_A002979_T32TPL_N02.01</eop:identifier>
       <eop:creationDate>2016-01-18T21:05:18.000706Z</eop:creationDate>
       <eop:modificationDate></eop:modificationDate>
       <eop:parentIdentifier>S2_MSI_L1C</eop:parentIdentifier>

src/community/oseo/oseo-rest/src/main/java/org/geoserver/opensearch/rest/AbstractOpenSearchController.java

@@ -5,15 +5,23 @@
 package org.geoserver.opensearch.rest;
 
 import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 import org.geoserver.opensearch.eo.OpenSearchAccessProvider;
+import org.geoserver.opensearch.eo.response.LinkFeatureComparator;
 import org.geoserver.opensearch.eo.store.OpenSearchAccess;
 import org.geoserver.opensearch.eo.store.OpenSearchAccess.ProductClass;
+import org.geoserver.rest.ResourceNotFoundException;
 import org.geoserver.rest.RestBaseController;
 import org.geoserver.rest.RestException;
+import org.geotools.data.DataUtilities;
+import org.geotools.data.FeatureSource;
+import org.geotools.data.Query;
 import org.geotools.data.simple.SimpleFeatureCollection;
 import org.geotools.data.simple.SimpleFeatureIterator;
 import org.geotools.factory.CommonFactoryFinder;
@@ -68,6 +76,44 @@ protected void validateMax(Integer value, int max, String name) {
         }
     }
 
+    protected void setupQueryPaging(Query query, Integer offset, Integer limit) {
+        if (offset != null) {
+            validateMin(offset, 0, "offset");
+            query.setStartIndex(offset);
+        }
+        final int maximumRecordsPerPage = accessProvider.getService().getMaximumRecordsPerPage();
+        if (limit != null) {
+            validateMin(limit, 0, "limit");
+            validateMax(limit, maximumRecordsPerPage, "limit");
+            query.setMaxFeatures(limit);
+        } else {
+            query.setMaxFeatures(maximumRecordsPerPage);
+        }
+    }
+
+    protected FeatureCollection<FeatureType, Feature> queryCollections(Query query)
+            throws IOException {
+        OpenSearchAccess access = accessProvider.getOpenSearchAccess();
+        FeatureSource<FeatureType, Feature> fs = access.getCollectionSource();
+        FeatureCollection<FeatureType, Feature> fc = fs.getFeatures(query);
+        return fc;
+    }
+
+    protected Feature queryCollection(String collectionName, Consumer<Query> queryDecorator)
+            throws IOException {
+        Query query = new Query();
+        query.setFilter(FF.equal(FF.property("name"), FF.literal(collectionName), true));
+        queryDecorator.accept(query);
+        FeatureCollection<FeatureType, Feature> fc = queryCollections(query);
+        Feature feature = DataUtilities.first(fc);
+        if (feature == null) {
+            throw new ResourceNotFoundException(
+                    "Could not find a collection named '" + collectionName + "'");
+        }
+
+        return feature;
+    }
+
     protected SimpleFeatureType mapFeatureTypeToSimple(FeatureType schema,
             Consumer<SimpleFeatureTypeBuilder> extraAttributeBuilder) {
         SimpleFeatureTypeBuilder tb = new SimpleFeatureTypeBuilder();
@@ -108,6 +154,25 @@ protected SimpleFeatureType mapFeatureTypeToSimple(FeatureType schema,
         SimpleFeatureType targetSchema = tb.buildFeatureType();
         return targetSchema;
     }
+
+    protected OgcLinks buildOgcLinksFromFeature(Feature feature) {
+        // map to a list of beans
+        List<OgcLink> links = Collections.emptyList();
+        Collection<Property> linkProperties = feature
+                .getProperties(OpenSearchAccess.OGC_LINKS_PROPERTY_NAME);
+        if (linkProperties != null) {
+            links = linkProperties.stream().map(p -> (SimpleFeature) p)
+                    .sorted(LinkFeatureComparator.INSTANCE).map(sf -> {
+                        String offering = (String) sf.getAttribute("offering");
+                        String method = (String) sf.getAttribute("method");
+                        String code = (String) sf.getAttribute("code");
+                        String type = (String) sf.getAttribute("type");
+                        String href = (String) sf.getAttribute("href");
+                        return new OgcLink(offering, method, code, type, href);
+                    }).collect(Collectors.toList());
+        }
+        return new OgcLinks(links);
+    }
 
     protected SimpleFeature mapFeatureToSimple(Feature f, SimpleFeatureType targetSchema,
             Consumer<SimpleFeatureBuilder> extraValueBuilder) {
@@ -121,7 +186,9 @@ protected SimpleFeature mapFeatureToSimple(Feature f, SimpleFeatureType targetSc
                 Object value = p.getValue();
                 if (value != null) {
                     fb.set(ad.getLocalName(), value);
-                    if ("eo:identifier".equals(ad.getLocalName()) && value instanceof String) {
+                    if (("eo:identifier".equals(ad.getLocalName())
+                            || "eop:identifier".equals(ad.getLocalName()))
+                            && value instanceof String) {
                         identifier = (String) value;
                     }
                 }

src/community/oseo/oseo-rest/src/main/java/org/geoserver/opensearch/rest/CollectionsController.java

@@ -10,7 +10,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
@@ -23,7 +22,6 @@
 import org.geoserver.ows.util.ResponseUtils;
 import org.geoserver.rest.ResourceNotFoundException;
 import org.geoserver.rest.RestBaseController;
-import org.geotools.data.DataUtilities;
 import org.geotools.data.FeatureSource;
 import org.geotools.data.Query;
 import org.geotools.feature.FeatureCollection;
@@ -65,18 +63,7 @@ public CollectionReferences getCollections(HttpServletRequest request,
             @RequestParam(name = "limit", required = false) Integer limit) throws IOException {
         // query the collections for their names
         Query query = new Query();
-        if (offset != null) {
-            validateMin(offset, 0, "offset");
-            query.setStartIndex(offset);
-        }
-        final int maximumRecordsPerPage = accessProvider.getService().getMaximumRecordsPerPage();
-        if (limit != null) {
-            validateMin(limit, 0, "limit");
-            validateMax(limit, maximumRecordsPerPage, "limit");
-            query.setMaxFeatures(limit);
-        } else {
-            query.setMaxFeatures(maximumRecordsPerPage);
-        }
+        setupQueryPaging(query, offset, limit);
         query.setSortBy(new SortBy[] { FF.sort("name", SortOrder.ASCENDING) });
         query.setPropertyNames(new String[] { "name" });
         OpenSearchAccess access = accessProvider.getOpenSearchAccess();
@@ -144,22 +131,8 @@ public OgcLinks getCollectionOgcLinks(HttpServletRequest request,
                     .singletonList(FF.property(OpenSearchAccess.OGC_LINKS_PROPERTY_NAME)));
         });
 
-        // map to a list of beans
-        List<OgcLink> links = Collections.emptyList();
-        Collection<Property> linkProperties = feature
-                .getProperties(OpenSearchAccess.OGC_LINKS_PROPERTY_NAME);
-        if (linkProperties != null) {
-            links = linkProperties.stream().map(p -> (SimpleFeature) p)
-                    .sorted(LinkFeatureComparator.INSTANCE).map(sf -> {
-                        String offering = (String) sf.getAttribute("offering");
-                        String method = (String) sf.getAttribute("method");
-                        String code = (String) sf.getAttribute("code");
-                        String type = (String) sf.getAttribute("type");
-                        String href = (String) sf.getAttribute("href");
-                        return new OgcLink(offering, method, code, type, href);
-                    }).collect(Collectors.toList());
-        }
-        return new OgcLinks(links);
+        OgcLinks links = buildOgcLinksFromFeature(feature);
+        return links;
     }
 
     @GetMapping(path = "{collection}/metadata", produces = { MediaType.TEXT_XML_VALUE })
@@ -204,27 +177,5 @@ public void getCollectionDescription(@PathVariable(name = "collection", required
         }
     }
 
-    protected FeatureCollection<FeatureType, Feature> queryCollections(Query query)
-            throws IOException {
-        OpenSearchAccess access = accessProvider.getOpenSearchAccess();
-        FeatureSource<FeatureType, Feature> fs = access.getCollectionSource();
-        FeatureCollection<FeatureType, Feature> fc = fs.getFeatures(query);
-        return fc;
-    }
-
-    protected Feature queryCollection(String collectionName, Consumer<Query> queryDecorator)
-            throws IOException {
-        Query query = new Query();
-        query.setFilter(FF.equal(FF.property("name"), FF.literal(collectionName), true));
-        queryDecorator.accept(query);
-        FeatureCollection<FeatureType, Feature> fc = queryCollections(query);
-        Feature feature = DataUtilities.first(fc);
-        if (feature == null) {
-            throw new ResourceNotFoundException(
-                    "Could not find a collection named '" + collectionName + "'");
-        }
-
-        return feature;
-    }
 
 }

src/community/oseo/oseo-rest/src/main/java/org/geoserver/opensearch/rest/OseoJSONConverter.java

@@ -21,24 +21,30 @@
 
 @Component
 public class OseoJSONConverter extends BaseMessageConverter<Object> {
-
+
+    private XStream xs;
+
     public OseoJSONConverter() {
         super(MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON_UTF8);
+
+        xs = new SecureXStream(new JsonHierarchicalStreamDriver() {
+            public HierarchicalStreamWriter createWriter(Writer writer) {
+                return new JsonWriter(writer, JsonWriter.DROP_ROOT_MODE | JsonWriter.STRICT_MODE);
+            }
+        });
+
     }
 
     @Override
     protected boolean supports(Class clazz) {
-        return CollectionReferences.class.isAssignableFrom(clazz) || OgcLinks.class.isAssignableFrom(clazz);
+        return CollectionReferences.class.isAssignableFrom(clazz)
+                || ProductReferences.class.isAssignableFrom(clazz)
+                || OgcLinks.class.isAssignableFrom(clazz);
     }
-    
+
     @Override
     protected void writeInternal(Object t, HttpOutputMessage outputMessage)
             throws IOException, HttpMessageNotWritableException {
-        XStream xs = new SecureXStream(new JsonHierarchicalStreamDriver() {
-            public HierarchicalStreamWriter createWriter(Writer writer) {
-                return new JsonWriter(writer, JsonWriter.DROP_ROOT_MODE | JsonWriter.STRICT_MODE );
-            }
-        });
         xs.toXML(t, outputMessage.getBody());
     }
 

src/community/oseo/oseo-rest/src/main/java/org/geoserver/opensearch/rest/ProductReference.java

@@ -0,0 +1,39 @@
+/* (c) 2017 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.opensearch.rest;
+
+/**
+ * Bean used for JSON serialization
+ *
+ * @author Andrea Aime - GeoSolutions
+ */
+class ProductReference {
+
+    String id;
+
+    String href;
+
+    String rss;
+
+    public ProductReference(String id, String href, String search) {
+        super();
+        this.id = id ;
+        this.href = href;
+        this.rss = search;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public String getHref() {
+        return href;
+    }
+
+    public String getRss() {
+        return rss;
+    }
+
+}

src/community/oseo/oseo-rest/src/main/java/org/geoserver/opensearch/rest/ProductReferences.java

@@ -0,0 +1,22 @@
+/* (c) 2017 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.opensearch.rest;
+
+import java.util.List;
+
+class ProductReferences {
+
+    List<ProductReference> products;
+
+    public ProductReferences(List<ProductReference> products) {
+        super();
+        this.products = products;
+    }
+
+    public List<ProductReference> getProducts() {
+        return products;
+    }
+
+}