Merge remote-tracking branch 'origin/main' into _ogcapi_test_clean

geonetwork · Oct 23, 2024 · 2312ad6 · 2312ad6
2 parents cbdada8 + 266cf36
commit 2312ad6
Show file tree

Hide file tree

Showing 21 changed files with 522 additions and 44 deletions.
diff --git a/...ibrary/common-index-model/src/main/java/org/fao/geonet/index/converter/DcatConverter.java b/...ibrary/common-index-model/src/main/java/org/fao/geonet/index/converter/DcatConverter.java
@@ -316,7 +316,7 @@ private Dataset getDataset(IndexRecord record, String uri, String resourceIdenti
     }
 
     // <dct:spatial rdf:parseType="Resource">
-    datasetBuilder.spatial(record.getGeometries().stream().map(g -> DctSpatial.builder()
+    datasetBuilder.spatial(record.getGeometriesAsJsonString().stream().map(g -> DctSpatial.builder()
         .location(DctLocation.builder().geometry(g).build()).build()).collect(
         Collectors.toList()));
 
@@ -470,7 +470,8 @@ private DataService getDataService(IndexRecord record, String uri, String resour
               .getProperties().get(CommonField.key));
     }
 
-    dataServiceBuilder.spatial(record.getGeometries().stream().map(g -> DctSpatial.builder()
+    dataServiceBuilder.spatial(record.getGeometriesAsJsonString().stream()
+        .map(g -> DctSpatial.builder()
         .location(DctLocation.builder().geometry(g).build()).build()).collect(
         Collectors.toList()));
 

diff --git a/...ary/common-index-model/src/main/java/org/fao/geonet/index/converter/GeoJsonConverter.java b/...ary/common-index-model/src/main/java/org/fao/geonet/index/converter/GeoJsonConverter.java
@@ -29,7 +29,7 @@
  * Index document to GeoJSON mapping.
  */
 @Component
-public class GeoJsonConverter {
+public class GeoJsonConverter implements IGeoJsonConverter {
 
   @Autowired
   FormatterConfiguration formatterConfiguration;
@@ -50,7 +50,7 @@ public Record convert(IndexRecord record) {
         ObjectMapper objectMapper = JsonUtils.getObjectMapper();
 
         recordBuilder.geometry(objectMapper.readValue(
-            record.getGeometries().get(0),
+            record.getGeometriesAsJsonString().get(0),
             Geometry.class));
       } catch (Exception ex) {
         // TODO: Process the exception

diff --git a/...ry/common-index-model/src/main/java/org/fao/geonet/index/converter/IGeoJsonConverter.java b/...ry/common-index-model/src/main/java/org/fao/geonet/index/converter/IGeoJsonConverter.java
@@ -0,0 +1,7 @@
+package org.fao.geonet.index.converter;
+
+import org.fao.geonet.index.model.gn.IndexRecord;
+
+public interface IGeoJsonConverter {
+  Object convert(IndexRecord record);
+}
diff --git a/...y/common-index-model/src/main/java/org/fao/geonet/index/converter/SchemaOrgConverter.java b/...y/common-index-model/src/main/java/org/fao/geonet/index/converter/SchemaOrgConverter.java
@@ -14,6 +14,7 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.stream.Collectors;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.fao.geonet.index.model.gn.Contact;
 import org.fao.geonet.index.model.gn.IndexRecord;
@@ -35,6 +36,7 @@
  *
  * <p>TODO: Add support to translation https://bib.schema.org/workTranslation
  */
+@Slf4j(topic = "org.fao.geonet.ogcapi.records")
 public class SchemaOrgConverter {
 
   public static Map<String, String> dateMapping = Map.ofEntries(
@@ -246,7 +248,7 @@ public static ObjectNode convert(IndexRecord record) {
     if (record.getGeometries().size() > 0) {
       ObjectNode spatialCoverage = root.putObject("spatialCoverage");
       ArrayNode geo = spatialCoverage.putArray("geo");
-      record.getGeometries().forEach(g -> {
+      record.getGeometriesAsJsonString().forEach(g -> {
         GeoJsonReader geoJsonReader = new GeoJsonReader();
         try {
           ObjectNode shape = createThing(null, Types.GeoShape, root);
@@ -259,7 +261,7 @@ public static ObjectNode convert(IndexRecord record) {
                   envelope.getMaxY(), envelope.getMaxX()));
           geo.add(shape);
         } catch (ParseException e) {
-          e.printStackTrace();
+          log.debug(e.getMessage(),e);
         }
       });
     }

diff --git a/...s/library/common-index-model/src/main/java/org/fao/geonet/index/model/gn/IndexRecord.java b/...s/library/common-index-model/src/main/java/org/fao/geonet/index/model/gn/IndexRecord.java
@@ -9,8 +9,11 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.sql.Array;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -151,14 +154,14 @@ public class IndexRecord extends IndexDocument {
   // TODO XML
   @XmlTransient
   @JsonProperty(IndexRecordFieldNames.geom)
-  @JsonDeserialize(using = NodeTreeAsStringDeserializer.class)
-  private List<String> geometries = new ArrayList<>();
+  //@JsonDeserialize(using = NodeTreeAsStringDeserializer.class)
+  private List<Object> geometries = new ArrayList<>();
 
   @JsonProperty(IndexRecordFieldNames.specificationConformance)
   private List<SpecificationConformance> specificationConformance = new ArrayList();
 
   //  @JsonAnyGetter
-  private Map<String, ArrayList<String>> otherProperties = new HashMap<>();
+  private Map<String,  Object> otherProperties = new HashMap<>();
 
   private Map<String, ArrayList<Codelist>> codelists = new HashMap<>();
 
@@ -202,6 +205,28 @@ public IndexRecord(AbstractMetadata r) {
   public IndexRecord() {
   }
 
+  /**
+   * get the #geometries as a JSON string.
+   */
+  public List<String> getGeometriesAsJsonString() {
+    if (geometries == null || geometries.isEmpty()) {
+      return null;
+    }
+    List<String> result = new ArrayList<>();
+
+    for (var g:geometries) {
+      String s = null;
+      try {
+        s = (new ObjectMapper()).writeValueAsString(g);
+      } catch (JsonProcessingException e) {
+        continue;
+      }
+      result.add(s);
+    }
+    return result;
+
+  }
+
   /**
    * Collect all other properties in a map.
    */
@@ -222,13 +247,18 @@ public void ignored(String name, Object value) {
               new Codelist(c)).collect(Collectors.toList()));
         }
       } else {
-        ArrayList<String> s = otherProperties.get(name);
+        var s = otherProperties.get(name);
         if (s == null) {
-          s = new ArrayList<>(1);
-          s.add(value.toString());
-          otherProperties.put(name, s);
+          otherProperties.put(name, value);
         } else {
-          s.add(value.toString());
+          if (s instanceof List) {
+            ((List) s).add(value.toString());
+          } else {
+            var list = new ArrayList<Object>();
+            list.add(s);
+            list.add(value);
+            otherProperties.put(name, list);
+          }
         }
       }
     }

diff --git a/...ry/common-index-model/src/main/java/org/fao/geonet/index/model/gn/LocationSerializer.java b/...ry/common-index-model/src/main/java/org/fao/geonet/index/model/gn/LocationSerializer.java
@@ -20,6 +20,7 @@ public void serialize(
       JsonGenerator gen,
       SerializerProvider serializers)
       throws IOException {
+    gen.writeStartObject();
     gen.writeArrayFieldStart(IndexRecordFieldNames.location);
     coordinate.forEach(c -> {
       try {

diff --git a/...brary/common-index-model/src/test/java/org/fao/geonet/index/model/gn/IndexRecordTest.java b/...brary/common-index-model/src/test/java/org/fao/geonet/index/model/gn/IndexRecordTest.java
@@ -99,7 +99,7 @@ public void testJsonToPojo() throws IOException {
 
       Assert.assertEquals(
           "{\"type\":\"Polygon\",\"coordinates\":[[[-31.2684,27.6375],[-13.4198,27.6375],[-13.4198,66.5662],[-31.2684,66.5662],[-31.2684,27.6375]]]}",
-          record.getGeometries().get(0));
+          record.getGeometriesAsJsonString().get(0));
     } catch (JsonProcessingException e) {
       e.printStackTrace();
       Assert.fail();

diff --git a/modules/library/common-search/src/main/java/org/fao/geonet/common/search/GnMediaType.java b/modules/library/common-search/src/main/java/org/fao/geonet/common/search/GnMediaType.java
@@ -43,7 +43,7 @@ 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/elastic+json";
+  public static final String APPLICATION_ELASTICJSON_VALUE = "application/gnindex+json";
   public static final MediaType APPLICATION_ELASTICJSON;
 
 
@@ -58,6 +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", "elastic+json");
+    APPLICATION_ELASTICJSON = new MediaType("application", "gnindex+json");
   }
 }
diff --git a/...c/main/java/org/fao/geonet/common/search/processor/impl/GeoJsonResponseProcessorImpl.java b/...c/main/java/org/fao/geonet/common/search/processor/impl/GeoJsonResponseProcessorImpl.java
@@ -6,13 +6,14 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.time.Instant;
+import java.util.concurrent.atomic.AtomicInteger;
 import javax.servlet.http.HttpSession;
 import lombok.extern.slf4j.Slf4j;
 import org.fao.geonet.common.search.domain.ReservedOperation;
 import org.fao.geonet.common.search.domain.UserInfo;
 import org.fao.geonet.index.JsonUtils;
-import org.fao.geonet.index.converter.GeoJsonConverter;
-import org.fao.geonet.index.model.geojson.Record;
+import org.fao.geonet.index.converter.IGeoJsonConverter;
 import org.fao.geonet.index.model.gn.IndexRecord;
 import org.fao.geonet.index.model.gn.IndexRecordFieldNames;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,7 +26,7 @@ public class GeoJsonResponseProcessorImpl
     extends JsonUserAndSelectionAwareResponseProcessorImpl {
 
   @Autowired
-  GeoJsonConverter geoJsonConverter;
+  IGeoJsonConverter geoJsonConverter;
 
   @Override
   public void processResponse(HttpSession httpSession,
@@ -37,13 +38,14 @@ public void processResponse(HttpSession httpSession,
     JsonGenerator generator = ResponseParser.jsonFactory.createGenerator(streamToClient);
 
     try {
-      ResponseParser responseParser = new ResponseParser();
+      ResponseParser elasticJsonResponseParser = new ResponseParser();
       generator.writeStartObject();
 
       generator.writeStringField("type", "FeatureCollection");
       generator.writeArrayFieldStart("features");
+      AtomicInteger numbFeatures = new AtomicInteger(0);
       {
-        responseParser.matchHits(parser, generator, doc -> {
+        elasticJsonResponseParser.matchHits(parser, generator, doc -> {
 
           // Remove fields with privileges info
           if (doc.has(IndexRecordFieldNames.source)) {
@@ -57,8 +59,9 @@ public void processResponse(HttpSession httpSession,
                 doc.get(IndexRecordFieldNames.source).toPrettyString(),
                 IndexRecord.class);
             try {
-              Record geojsonRecord = geoJsonConverter.convert(indexRecord);
+              Object geojsonRecord =   geoJsonConverter.convert(indexRecord);
               generator.writeRawValue(objectMapper.writeValueAsString(geojsonRecord));
+              numbFeatures.incrementAndGet();
             } catch (Exception ex) {
               log.error(String.format(
                   "GeoJSON conversion returned null result for uuid %s. Check http://localhost:9901/collections/main/items/%s?f=geojson",
@@ -68,7 +71,15 @@ public void processResponse(HttpSession httpSession,
         }, false);
       }
       generator.writeEndArray();
-      generator.writeNumberField("size", responseParser.total);
+      generator.writeNumberField("numberMatched", elasticJsonResponseParser.total);
+      generator.writeNumberField("numberReturned", numbFeatures.intValue());
+
+      generator.writeStringField("timeStamp", Instant.now().toString());
+
+      generator.writeArrayFieldStart("links");
+      //TO DO ADD LINKS
+      generator.writeEndArray();
+
       generator.writeEndObject();
       generator.flush();
     } finally {

diff --git a/modules/library/common-search/src/main/resources/application.yml b/modules/library/common-search/src/main/resources/application.yml
@@ -111,8 +111,8 @@ gn:
         responseProcessor: RssResponseProcessorImpl
         operations:
           - items
-      - name : elastic-json
-        mimeType : application/elastic+json
+      - name : gnindex-json
+        mimeType : application/gnindex+json
         responseProcessor : JsonUserAndSelectionAwareResponseProcessorImpl
         operations :
           - items
@@ -136,4 +136,4 @@ gn:
       - "allKeywords"
       - "contactForResource"
       - "cl_status"
-      - "edit"
+      - "edit"
diff --git a/...services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/OgcApiRecordApp.java b/...services/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/OgcApiRecordApp.java
@@ -5,6 +5,7 @@
 
 package org.fao.geonet.ogcapi.records;
 
+import org.fao.geonet.index.converter.GeoJsonConverter;
 import org.fao.geonet.ogcapi.records.controller.CapabilitiesApiController;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,6 +14,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.servlet.config.annotation.CorsRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -21,7 +23,10 @@
 @SpringBootApplication
 @RefreshScope
 @Import({CapabilitiesApiController.class})
-@ComponentScan({"org.fao.geonet", "org.fao.geonet.domain"})
+@ComponentScan(
+    value = {"org.fao.geonet", "org.fao.geonet.domain"}, excludeFilters =
+    {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = GeoJsonConverter.class)}
+)
 @Configuration
 @EnableCaching
 public class OgcApiRecordApp {
@@ -30,9 +35,9 @@ public static void main(String[] args) {
     SpringApplication.run(OgcApiRecordApp.class, args);
   }
 
-
   /**
    * Configure CORS to allow all connections.
+   *
    * @return CORS configuration.
    */
   @Bean

diff --git a/...vices/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/OgcApiRecordWebApp.java b/...vices/ogc-api-records/src/main/java/org/fao/geonet/ogcapi/records/OgcApiRecordWebApp.java
@@ -5,18 +5,33 @@
 
 package org.fao.geonet.ogcapi.records;
 
+import org.fao.geonet.index.converter.GeoJsonConverter;
 import org.fao.geonet.ogcapi.records.controller.CapabilitiesApiController;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Import;
 
+
+/**
+ * We remove the "GeoJsonConverter" from the scanned components so this will app will use the
+ * "OgcApiGeoJsonConverter".
+ */
 @SpringBootApplication
 @Import({CapabilitiesApiController.class})
-@ComponentScan({"org.fao.geonet", "org.fao.geonet.domain"})
+@ComponentScan(
+    value = {"org.fao.geonet", "org.fao.geonet.domain"}, excludeFilters =
+    {@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = GeoJsonConverter.class)}
+)
+//@ComponentScan(
+//    value = {"org.fao.geonet", "org.fao.geonet.domain"}
+//)
 @Configuration
 @EnableCaching
 public class OgcApiRecordWebApp extends SpringBootServletInitializer {
+
+
 }
diff --git a/...api-records/src/main/java/org/fao/geonet/ogcapi/records/controller/ItemApiController.java b/...api-records/src/main/java/org/fao/geonet/ogcapi/records/controller/ItemApiController.java
@@ -506,7 +506,8 @@ private List<String> setDefaultRssSortBy(List<String> sortby, HttpServletRequest
 
   private String search(
       Query requestQuery,
-      HttpServletRequest request, boolean allSourceFields) {
+      HttpServletRequest request,
+      boolean allSourceFields) {
 
     Source source = collectionService.retrieveSourceForCollection(requestQuery.getCollectionId());
 
@@ -644,4 +645,4 @@ private String getResponseContentType(HttpServletRequest request) {
 
     return mediaType;
   }
-}
+}