Merge pull request #120 from davidblasby/_ogcapi_test_clean

ogcapi - clean up + test cases

Author: davidblasby

modules/library/common-index-model/src/main/java/org/fao/geonet/index/model/gn/IndexRecord.java

@@ -210,7 +210,7 @@ public IndexRecord() {
    */
   public List<String> getGeometriesAsJsonString() {
     if (geometries == null || geometries.isEmpty()) {
-      return null;
+      return new ArrayList<>();
     }
     List<String> result = new ArrayList<>();
 

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

@@ -55,6 +55,15 @@
 @Slf4j(topic = "org.fao.geonet.searching")
 public class ElasticSearchProxy {
 
+  /**
+   * ACCEPT_OVERRIDE_ATTRIBUTE.
+   *
+   * <p>request.setVariable(ACCEPT_OVERRIDE_ATTRIBUTE, "gnindex");
+   * This will force this to return the underlying gnindex json instead of the format in the
+   * request.
+   * This allows a GeoJSON to still get the underlying gnindex json.
+   */
+  public static final String ACCEPT_OVERRIDE_ATTRIBUTE = "accepts-override";
   public static final String[] validContentTypes = {
       "application/json", "text/plain", "application/rss+xml"
   };
@@ -745,6 +754,9 @@ private void processResponse(
 
     // TODO: Header can contain a list of ... So get the first which match a processor
     String acceptHeader = getAcceptValue(request);
+    if (request.getAttribute(ACCEPT_OVERRIDE_ATTRIBUTE) != null) {
+      acceptHeader = request.getAttribute(ACCEPT_OVERRIDE_ATTRIBUTE).toString();
+    }
 
     boolean isDcatOnItem =
         request.getRequestURI().matches(".*/collections/.*/items/.*")

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

@@ -111,7 +111,7 @@ gn:
         responseProcessor: RssResponseProcessorImpl
         operations:
           - items
-      - name : gnindex-json
+      - name : gnindex
         mimeType : application/gnindex+json
         responseProcessor : JsonUserAndSelectionAwareResponseProcessorImpl
         operations :

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

@@ -1,3 +1,8 @@
+/**
+ * (c) 2024 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.fao.geonet.ogcapi.records;
 
 import static springfox.documentation.builders.PathSelectors.regex;

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

@@ -1,3 +1,8 @@
+/**
+ * (c) 2024 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.fao.geonet.ogcapi.records.controller;
 
 import java.io.IOException;

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

@@ -12,6 +12,7 @@
 import java.util.Locale;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.fao.geonet.common.search.GnMediaType;
 import org.fao.geonet.common.search.SearchConfiguration;
 import org.fao.geonet.common.search.SearchConfiguration.Operations;
 import org.fao.geonet.domain.Source;

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

@@ -162,14 +162,17 @@ public ResponseEntity<Void> collectionsCollectionIdItemsRecordIdGet(
         ListUtils.union(MediaTypeUtil.defaultSupportedMediaTypes,
             MediaTypeUtil.ldSupportedMediaTypes);
     allowedMediaTypes.add(GnMediaType.APPLICATION_GEOJSON);
+    allowedMediaTypes.add(GnMediaType.APPLICATION_ELASTICJSON);
 
     MediaType mediaType =
         mediaTypeUtil.calculatePriorityMediaTypeFromRequest(request, allowedMediaTypes);
 
     if (mediaType.equals(MediaType.APPLICATION_JSON)
-        || mediaType.equals(GnMediaType.APPLICATION_GEOJSON)) {
+        || mediaType.equals(GnMediaType.APPLICATION_GEOJSON)
+        || mediaType.equals(GnMediaType.APPLICATION_ELASTICJSON)) {
       try {
-        String type = mediaType.equals(MediaType.APPLICATION_JSON) ? "json" : "geojson";
+        String type = getSimplifiedMediaType(mediaType);
+
         JsonNode recordAsJson = recordService.getRecordAsJson(collectionId, recordId,
             request, source, type);
 
@@ -198,6 +201,22 @@ public ResponseEntity<Void> collectionsCollectionIdItemsRecordIdGet(
     }
   }
 
+  private String getSimplifiedMediaType(MediaType mediaType) {
+    String type = "gnindex";
+    if (mediaType.equals(MediaType.APPLICATION_JSON)) {
+      type = "json";
+    } else {
+      if (mediaType.equals(GnMediaType.APPLICATION_GEOJSON)) {
+        type = "geojson";
+      } else {
+        if (mediaType.equals(GnMediaType.APPLICATION_ELASTICJSON)) {
+          type = "gnindex";
+        }
+      }
+    }
+    return type;
+  }
+
 
   /**
    * Describe the collection items.

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

@@ -1,3 +1,8 @@
+/**
+ * (c) 2024 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.fao.geonet.ogcapi.records.controller.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,3 +1,8 @@
+/**
+ * (c) 2024 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.fao.geonet.ogcapi.records.controller.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,3 +1,8 @@
+/**
+ * (c) 2024 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.fao.geonet.ogcapi.records.controller.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,3 +1,8 @@
+/**
+ * (c) 2024 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.fao.geonet.ogcapi.records.controller.model;
 
 import com.fasterxml.jackson.annotation.JsonProperty;

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

@@ -1,3 +1,8 @@
+/**
+ * (c) 2024 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.fao.geonet.ogcapi.records.controller.model;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

modules/services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/service/CollectionService.java

@@ -1,3 +1,8 @@
+/**
+ * (c) 2024 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.fao.geonet.ogcapi.records.service;
 
 

modules/services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/service/QueryBuilder.java

@@ -93,7 +93,7 @@ public Query buildFromRequest(String collectionId,
    */
   private void injectExtraFromRequest(String collectionId, Query result,
       Map<String, String[]> parameterMap) {
-    var queryables = queryablesService.buildQueryables(collectionId)
+    var queryables = queryablesService.getFullQueryables(collectionId)
         .getProperties();
 
     result.setPropValues(new LinkedHashMap<>());

modules/services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/service/QueryToElastic.java

@@ -70,7 +70,7 @@ public void augmentWithQueryables(SearchSourceBuilder sourceBuilder,
     }
     var boolQuery = (BoolQueryBuilder) mainQuery;
 
-    var jsonSchema = queryablesService.buildQueryables(query.getCollectionId());
+    var jsonSchema = queryablesService.getFullQueryables(query.getCollectionId());
 
     for (var prop : query.getPropValues().entrySet()) {
       var jsonProp = jsonSchema.getProperties().get(prop.getKey());
@@ -196,9 +196,9 @@ private QueryBuilder createGeo(GnElasticInfo gnElasticInfo, String userSearchTer
 
     Rectangle rectangle = new Rectangle(
         Double.parseDouble(nums[0]),
-        Double.parseDouble(nums[1]),
+        Double.parseDouble(nums[2]),
         Double.parseDouble(nums[3]),
-        Double.parseDouble(nums[2]));
+        Double.parseDouble(nums[1]));
 
     try {
       var geoQuery = QueryBuilders