Merge upstream 4.2.8 into georchestra

.env

@@ -1,6 +1,6 @@
 # docker-compose default environment variable values
 COMPOSE_PROJECT_NAME=gncloud
-TAG=0.3-SNAPSHOT
+TAG=4.2.8-0
 EUREKA_SERVER_URL=http://discovery:8761/eureka
 
 # gn metadta postgres environment variables

.github/dependabot.yml

@@ -0,0 +1,13 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      # Check for updates to GitHub Actions every week
+      interval: "weekly"

.github/workflows/ci.yaml

@@ -8,10 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: "Checking out"
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: "Setting up Java"
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution : 'temurin'
         java-version : '11'

modules/library/common-error/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.2</version>
+    <version>4.2.8-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

modules/library/common-index-model/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <artifactId>gn-cloud-lib</artifactId>
     <groupId>org.geonetwork-opensource.cloud</groupId>
-    <version>4.2.2</version>
+    <version>4.2.8-0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -32,6 +32,11 @@
       <groupId>org.locationtech.jts.io</groupId>
       <artifactId>jts-io-common</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

modules/library/common-index-model/src/main/java/org/fao/geonet/index/converter/DcatConverter.java

@@ -336,16 +336,17 @@ private Dataset getDataset(IndexRecord record, String uri, String resourceIdenti
 
     record.getLinks().stream().forEach(link -> {
       DcatDistributionBuilder dcatDistributionBuilder = DcatDistribution.builder()
-          .title(listOfNullable(link.getName()))
-          .description(listOfNullable(link.getDescription()))
+          .title(listOfNullable(link.getName().get(CommonField.defaultText)))
+          .description(listOfNullable(link.getDescription().get(CommonField.defaultText)))
           // TODO <dcat:accessService rdf:parseType="Resource">...
           // TODO: representation technique = gmd:MD_SpatialRepresentationTypeCode?
           .representationTechnique(Subject.builder()
               .skosConcept(SkosConcept.builder()
                   .prefLabel(link.getProtocol()).build()).build());
 
       // TODO: depending on function/protocol build page/accessUrl/downloadUrl
-      dcatDistributionBuilder.accessUrl(new RdfResource(null, link.getUrl()));
+      dcatDistributionBuilder.accessUrl(new RdfResource(null,
+          link.getUrl().get(CommonField.defaultText)));
 
       datasetBuilder.distribution(listOfNullable(DcatDistributionContainer.builder()
           .distribution(dcatDistributionBuilder.build()).build()));
@@ -355,7 +356,7 @@ private Dataset getDataset(IndexRecord record, String uri, String resourceIdenti
         record.getContactForResource().stream().map(contact ->
             DcatContactPoint.builder()
                 .contact(VcardContact.builder()
-                    .title(contact.getOrganisation())
+                    .title(contact.getOrganisation().get(CommonField.defaultText))
                     .role(contact.getRole())
                     .hasEmail(contact.getEmail()).build()).build()
         ).collect(Collectors.toList()));
@@ -488,7 +489,8 @@ private DataService getDataService(IndexRecord record, String uri, String resour
         }).collect(Collectors.toList()));
 
     dataServiceBuilder.endpointUrl(
-        record.getLinks().stream().map(l -> l.getUrl())
+        record.getLinks().stream().map(l ->
+            new RdfResource(null, l.getUrl().get(defaultText)))
             .collect(Collectors.toList()));
 
     dataServiceBuilder.servesDataset(
@@ -503,7 +505,7 @@ private DataService getDataService(IndexRecord record, String uri, String resour
         record.getContactForResource().stream().map(contact ->
             DcatContactPoint.builder()
                 .contact(VcardContact.builder()
-                    .title(contact.getOrganisation())
+                    .title(contact.getOrganisation().get(CommonField.defaultText))
                     .role(contact.getRole())
                     .hasEmail(contact.getEmail()).build()).build()
         ).collect(Collectors.toList()));

modules/library/common-index-model/src/main/java/org/fao/geonet/index/converter/GeoJsonConverter.java

@@ -20,6 +20,7 @@
 import org.fao.geonet.index.model.geojson.Record.RecordBuilder;
 import org.fao.geonet.index.model.gn.Contact;
 import org.fao.geonet.index.model.gn.IndexRecord;
+import org.fao.geonet.index.model.gn.IndexRecordFieldNames.CommonField;
 import org.fao.geonet.index.model.gn.ResourceDate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -61,9 +62,9 @@ public Record convert(IndexRecord record) {
     record.getLinks().stream().forEach(link -> {
 
       LinkBuilder linkBuilder = Link.builder()
-          .href(link.getUrl())
+          .href(link.getUrl().get(CommonField.defaultText))
           .rel("item")
-          .title(link.getName())
+          .title(link.getName().get(CommonField.defaultText))
           .type(link.getProtocol());
 
       recordLinks.add(linkBuilder.build());

modules/library/common-index-model/src/main/java/org/fao/geonet/index/converter/SchemaOrgConverter.java

@@ -203,7 +203,7 @@ public static ObjectNode convert(IndexRecord record) {
         ObjectNode distribution =
             createThing(null, Types.DataDownload, root);
         // Actual bytes of the media object, for example the image file or video file.
-        distribution.put("contentUrl", l.getUrl());
+        distribution.put("contentUrl", l.getUrl().get(CommonField.defaultText));
         addOptional(distribution, "name", l.getName());
         addOptional(distribution, "abstract", l.getDescription());
         addOptional(distribution, "encodingFormat", l.getProtocol());

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

@@ -5,7 +5,12 @@
 
 package org.fao.geonet.index.model.gn;
 
+import static org.fao.geonet.index.model.gn.IndexRecordFieldNames.organisationName;
+
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.Data;
 
 @Data
@@ -14,7 +19,9 @@ public class Contact {
 
   private String role;
   private String individual;
-  private String organisation;
+
+  @JsonProperty(organisationName)
+  private Map<String, String> organisation = new HashMap<>();
   private String email;
   private String logo;
   private String phone;

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

@@ -26,6 +26,7 @@ public class IndexRecordFieldNames {
   public static final String resourceDate = "resourceDate";
   public static final String org = "Org";
   public static final String orgForResource = "OrgForResource";
+  public static final String organisationName = "organisationObject";
   public static final String recordLink = "recordLink";
   public static final String link = "link";
   public static final String coordinateSystem = "coordinateSystem";
@@ -61,4 +62,10 @@ public class CommonField {
     public static final String key = "key";
     public static final String link = "link";
   }
+
+  public class LinkField {
+    public static final String url = "urlObject";
+    public static final String name = "nameObject";
+    public static final String description = "descriptionObject";
+  }
 }

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

@@ -5,18 +5,27 @@
 
 package org.fao.geonet.index.model.gn;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.Data;
+import org.fao.geonet.index.model.gn.IndexRecordFieldNames.LinkField;
 
 @Data
 public class Link {
 
   private String protocol;
-  private String url;
-  // TODO: Multilingual
-  private String name;
-  private String description;
+  @JsonProperty(IndexRecordFieldNames.LinkField.url)
+  private Map<String, String> url = new HashMap<>();
+
+  @JsonProperty(IndexRecordFieldNames.LinkField.name)
+  private Map<String, String> name = new HashMap<>();
+
+  @JsonProperty(LinkField.description)
+  private Map<String, String> description = new HashMap<>();
   private String function;
   private String applicationProfile;
   private String group;
   private String mimeType;
+  private String nilReason;
 }

modules/library/common-index-model/src/test/java/org/fao/geonet/index/model/gn/IndexRecordTest.java

@@ -1,24 +1,55 @@
 package org.fao.geonet.index.model.gn;
 
+import static org.fao.geonet.index.model.gn.IndexRecordFieldNames.CommonField.defaultText;
+import static org.mockito.BDDMockito.given;
+
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import java.io.IOException;
+import java.io.StringWriter;
 import java.nio.file.Files;
 import java.util.List;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.PropertyException;
 import org.fao.geonet.domain.MetadataType;
 import org.fao.geonet.index.JsonUtils;
+import org.fao.geonet.index.converter.DcatConverter;
+import org.fao.geonet.index.converter.FormatterConfiguration;
 import org.fao.geonet.index.converter.SchemaOrgConverter;
+import org.fao.geonet.index.model.dcat2.CatalogRecord;
+import org.fao.geonet.index.model.dcat2.DataService;
+import org.fao.geonet.index.model.dcat2.Dataset;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.runner.RunWith;
 import org.locationtech.jts.geom.Coordinate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.fao.geonet.index.model.gn.IndexRecordFieldNames.CommonField.defaultText;
-
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = {DcatConverter.class})
 public class IndexRecordTest {
 
+  @MockBean
+  FormatterConfiguration configuration;
+
+
+  @Autowired
+  DcatConverter dcatConverter;
+
+  @BeforeEach
+  public void setUp() {
+    given(this.configuration.buildLandingPageLink("")).willReturn("");
+  }
+
   @Test
   public void testJsonToPojo() throws IOException {
     ObjectMapper objectMapper = JsonUtils.getObjectMapper();
@@ -33,14 +64,16 @@ public void testJsonToPojo() throws IOException {
       Assert.assertEquals(
           "High Resolution Layer: Water and Wetness 2015 (raster 100m), Mar. 2018",
           record.resourceTitle.get(defaultText)
-          );
+      );
 
       Assert.assertEquals(49, record.getOtherProperties().size());
 
       Assert.assertEquals("gmd:MD_Metadata", record.getRoot());
 
       Overview o = record.getOverview().get(0);
-      Assert.assertEquals("https://sdi.eea.europa.eu/public/catalogue-graphic-overview/8108e203-59db-4672-b9e0-c1863fd6523b.png", o.getUrl());
+      Assert.assertEquals(
+          "https://sdi.eea.europa.eu/public/catalogue-graphic-overview/8108e203-59db-4672-b9e0-c1863fd6523b.png",
+          o.getUrl());
       Assert.assertEquals("Global overview", o.getLabel().get("default"));
 
       String org = record.getOrg().get(0);
@@ -56,20 +89,61 @@ public void testJsonToPojo() throws IOException {
 
       List<Link> links = record.getLinks();
       Assert.assertEquals(1, links.size());
-      Assert.assertEquals("https://land.copernicus.eu/pan-european/high-resolution-layers/water-wetness/status-maps/2015/view", links.get(0).getUrl());
+      Assert.assertEquals(
+          "https://land.copernicus.eu/pan-european/high-resolution-layers/water-wetness/status-maps/2015/view",
+          links.get(0).getUrl().get("default"));
 
       List<Coordinate> locations = record.getLocations();
       Assert.assertEquals(47.10185, locations.get(0).getX(), .0001);
       Assert.assertEquals(-22.3441, locations.get(0).getY(), .0001);
 
-      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]]]}",
+      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));
     } catch (JsonProcessingException e) {
       e.printStackTrace();
       Assert.fail();
     }
   }
 
+  @Test
+  public void testServiceJsonToDcatXML() throws IOException {
+    ObjectMapper objectMapper = JsonUtils.getObjectMapper();
+    String json = Files.readString(
+        new ClassPathResource("index-document-service.json").getFile().toPath());
+    JsonNode jsonNode = objectMapper.readTree(json);
+
+    try {
+      IndexRecord record = objectMapper.readValue(
+          jsonNode.get(IndexRecordFieldNames.source).toPrettyString(),
+          IndexRecord.class);
+      Assert.assertEquals(
+          "Zones de distribution en eau (ZDE) - Service de visualisation REST",
+          record.resourceTitle.get(defaultText)
+      );
+
+      JAXBContext context = null;
+      context = JAXBContext.newInstance(
+          CatalogRecord.class, Dataset.class, DataService.class);
+      Marshaller marshaller = context.createMarshaller();
+      marshaller.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
+      marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+
+      CatalogRecord catalogRecord = dcatConverter.convert(jsonNode);
+      StringWriter sw = new StringWriter();
+      marshaller.marshal(catalogRecord, sw);
+
+    } catch (JsonProcessingException e) {
+      e.printStackTrace();
+      Assert.fail();
+    } catch (PropertyException e) {
+      e.printStackTrace();
+      Assert.fail();
+    } catch (JAXBException e) {
+      e.printStackTrace();
+      Assert.fail();
+    }
+  }
 
 
   @Test