Merge pull request #119 from davidblasby/_ogcapi_json

Change GeoJSON to be used for f=json, add f=elastic-json for old format

Author: davidblasby

modules/library/common-search/src/main/java/org/fao/geonet/common/search/GnMediaType.java

@@ -43,6 +43,9 @@ public GnMediaType(String type) {
   public static final String APPLICATION_GEOJSON_VALUE = "application/geo+json";
   public static final MediaType APPLICATION_GEOJSON;
 
+  public static final String APPLICATION_ELASTICJSON_VALUE = "application/gnindex+json";
+  public static final MediaType APPLICATION_ELASTICJSON;
+
 
   static {
     TEXT_TURTLE = new MediaType("text", "turtle");
@@ -55,5 +58,6 @@ public GnMediaType(String type) {
     APPLICATION_GN_XML = new MediaType("application", "gn+xml");
     APPLICATION_JSON_LD = new MediaType("application", "ld+json");
     APPLICATION_GEOJSON = new MediaType("application", "geo+json");
+    APPLICATION_ELASTICJSON = new MediaType("application", "gnindex+json");
   }
 }

modules/library/common-search/src/main/resources/application.yml

@@ -60,7 +60,7 @@ gn:
       -
         name: json
         mimeType: application/json
-        responseProcessor: JsonUserAndSelectionAwareResponseProcessorImpl
+        responseProcessor: GeoJsonResponseProcessorImpl
         operations:
           - root
           - conformance
@@ -111,6 +111,12 @@ gn:
         responseProcessor: RssResponseProcessorImpl
         operations:
           - items
+      - name : gnindex-json
+        mimeType : application/gnindex+json
+        responseProcessor : JsonUserAndSelectionAwareResponseProcessorImpl
+        operations :
+          - items
+          - item
       -
         name : geojson
         mimeType : application/geo+json
@@ -130,4 +136,4 @@ gn:
       - "allKeywords"
       - "contactForResource"
       - "cl_status"
-      - "edit"
+      - "edit"

modules/services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/controller/ItemApiController.java

@@ -134,7 +134,8 @@ public class ItemApiController {
           GnMediaType.APPLICATION_RDF_XML_VALUE,
           GnMediaType.APPLICATION_DCAT2_XML_VALUE,
           GnMediaType.TEXT_TURTLE_VALUE,
-          GnMediaType.APPLICATION_GEOJSON_VALUE})
+          GnMediaType.APPLICATION_GEOJSON_VALUE,
+          GnMediaType.APPLICATION_ELASTICJSON_VALUE})
   @ResponseStatus(HttpStatus.OK)
   @ApiResponses(value = {
       @ApiResponse(responseCode = "200", description = "Describe a collection item.")
@@ -216,6 +217,7 @@ public ResponseEntity<Void> collectionsCollectionIdItemsRecordIdGet(
           GnMediaType.APPLICATION_DCAT2_XML_VALUE,
           MediaType.TEXT_HTML_VALUE,
           GnMediaType.APPLICATION_GEOJSON_VALUE,
+          GnMediaType.APPLICATION_ELASTICJSON_VALUE
       })
   @ResponseStatus(HttpStatus.OK)
   @ApiResponses(value = {
@@ -284,15 +286,19 @@ public ResponseEntity<Void> collectionsCollectionIdItemsGet(
         || mediaType.equals(GnMediaType.APPLICATION_DCAT2_XML)
         || mediaType.equals(GnMediaType.APPLICATION_RDF_XML)
         || mediaType.equals(MediaType.APPLICATION_RSS_XML)
-        || mediaType.equals(GnMediaType.APPLICATION_GEOJSON)) {
+        || mediaType.equals(GnMediaType.APPLICATION_GEOJSON)
+        || mediaType.equals(GnMediaType.APPLICATION_ELASTICJSON)) {
 
       boolean allSourceFields =
           mediaType.equals(GnMediaType.APPLICATION_DCAT2_XML)
           || mediaType.equals(GnMediaType.APPLICATION_RDF_XML)
+          || mediaType.equals(GnMediaType.APPLICATION_RDF_XML)
           || mediaType.equals(GnMediaType.APPLICATION_GEOJSON)
           || mediaType.equals(GnMediaType.APPLICATION_JSON_LD)
           || mediaType.equals(MediaType.APPLICATION_JSON)
-          || mediaType.equals(GnMediaType.APPLICATION_RDF_XML);
+          || mediaType.equals(GnMediaType.APPLICATION_RDF_XML)
+          || mediaType.equals(GnMediaType.APPLICATION_ELASTICJSON);
+
 
       return collectionsCollectionIdItemsGetInternal(
           query,