Merge branch 'dev' into #343_suggest_change_and_log

# Conflicts: # pom.xml
gbif · May 27, 2021 · a9b9611 · a9b9611
2 parents 1a9af98 + b84da3d
commit a9b9611
Show file tree

Hide file tree

Showing 23 changed files with 29 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.gbif.registry</groupId>
   <artifactId>registry-parent</artifactId>
-  <version>3.61-SNAPSHOT</version>
+  <version>3.62-SNAPSHOT</version>
   <name>GBIF Registry Parent</name>
   <description>GBIF Registry project</description>
 

diff --git a/registry-cli/pom.xml b/registry-cli/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.gbif.registry</groupId>
     <artifactId>registry-parent</artifactId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
 
   <artifactId>registry-cli</artifactId>

diff --git a/registry-directory/pom.xml b/registry-directory/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-doi/pom.xml b/registry-doi/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-domain/pom.xml b/registry-domain/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-events/pom.xml b/registry-events/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-examples/pom.xml b/registry-examples/pom.xml
@@ -3,12 +3,12 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>registry-examples</artifactId>
-  <version>3.61-SNAPSHOT</version>
+  <version>3.62-SNAPSHOT</version>
 
   <packaging>jar</packaging>
 

diff --git a/registry-identity/pom.xml b/registry-identity/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-integration-tests/pom.xml b/registry-integration-tests/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-mail/pom.xml b/registry-mail/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-messaging/pom.xml b/registry-messaging/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-metadata/pom.xml b/registry-metadata/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-metasync/pom.xml b/registry-metasync/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-oaipmh/pom.xml b/registry-oaipmh/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-persistence/pom.xml b/registry-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-pipelines/pom.xml b/registry-pipelines/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-search/pom.xml b/registry-search/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/...y-search/src/main/java/org/gbif/registry/search/dataset/DatasetSearchResultConverter.java b/...y-search/src/main/java/org/gbif/registry/search/dataset/DatasetSearchResultConverter.java
@@ -62,14 +62,19 @@ public DatasetSearchResult toSearchResult(SearchHit hit) {
     getDatasetSubTypeValue(fields, "subtype").ifPresent(d::setSubtype);
     getHighlightOrStringValue(fields, hit.getHighlightFields(), "description")
         .ifPresent(d::setDescription);
+
     getUuidValue(fields, "publishingOrganizationKey").ifPresent(d::setPublishingOrganizationKey);
     getHighlightOrStringValue(fields, hit.getHighlightFields(), "publishingOrganizationTitle")
         .ifPresent(d::setPublishingOrganizationTitle);
+    getCountryValue(fields, "publishingCountry").ifPresent(d::setPublishingCountry);
+    getUuidValue(fields, "endorsingNodeKey").ifPresent(d::setEndorsingNodeKey);
+
     getUuidValue(fields, "hostingOrganizationKey").ifPresent(d::setHostingOrganizationKey);
     getHighlightOrStringValue(fields, hit.getHighlightFields(), "hostingOrganizationTitle")
         .ifPresent(d::setHostingOrganizationTitle);
+    getCountryValue(fields, "hostingCountry").ifPresent(d::setHostingCountry);
+
 
-    getCountryValue(fields, "publishingCountry").ifPresent(d::setPublishingCountry);
     getLicenceValue(fields, "license").ifPresent(d::setLicense);
     getStringValue(fields, "projectId").ifPresent(d::setProjectIdentifier);
 

diff --git a/registry-security/pom.xml b/registry-security/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-service/pom.xml b/registry-service/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-surety/pom.xml b/registry-surety/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-ws-client/pom.xml b/registry-ws-client/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>registry-parent</artifactId>
     <groupId>org.gbif.registry</groupId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-ws/pom.xml b/registry-ws/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.gbif.registry</groupId>
     <artifactId>registry-parent</artifactId>
-    <version>3.61-SNAPSHOT</version>
+    <version>3.62-SNAPSHOT</version>
   </parent>
   <artifactId>registry-ws</artifactId>
   <name>GBIF Registry Webservices</name>