Merge branch 'dev' into #343_suggest_change_and_log

# Conflicts: # registry-integration-tests/src/test/java/org/gbif/registry/database/TestCaseDatabaseInitializer.java # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PersonIT.java # registry-integration-tests/src/test/java/org/gbif/registry/ws/it/collections/PrimaryCollectionEntityServiceIT.java # registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java
gbif · May 4, 2021 · 743ccb9 · 743ccb9
2 parents e47fac9 + 1f19447
commit 743ccb9
Show file tree

Hide file tree

Showing 69 changed files with 382 additions and 315 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,12 +6,12 @@
   <parent>
     <groupId>org.gbif</groupId>
     <artifactId>motherpom</artifactId>
-    <version>51</version>
+    <version>53</version>
   </parent>
 
   <groupId>org.gbif.registry</groupId>
   <artifactId>registry-parent</artifactId>
-  <version>3.56-SNAPSHOT</version>
+  <version>3.58-SNAPSHOT</version>
   <name>GBIF Registry Parent</name>
   <description>GBIF Registry project</description>
 
@@ -85,8 +85,8 @@
     <spring-cloud-sleuth.version>2.2.8.RELEASE</spring-cloud-sleuth.version>
 
     <!-- GBIF -->
-    <gbif-api.version>0.144-SNAPSHOT</gbif-api.version>
-    <gbif-common.version>0.40</gbif-common.version>
+    <gbif-api.version>0.144</gbif-api.version>
+    <gbif-common.version>0.50</gbif-common.version>
     <gbif-common-mybatis.version>1.1</gbif-common-mybatis.version>
     <gbif-common-ws.version>1.15</gbif-common-ws.version>
     <gbif-directory.version>1.10</gbif-directory.version>
@@ -95,7 +95,7 @@
     <gbif-httputils.version>0.10</gbif-httputils.version>
     <gbif-metrics.version>1.0</gbif-metrics.version>
     <gbif-parsers.version>0.36</gbif-parsers.version>
-    <gbif-postal-service.version>0.45</gbif-postal-service.version>
+    <gbif-postal-service.version>1.1</gbif-postal-service.version>
     <xoai.version>4.1.0-gbif-4</xoai.version>
 
     <!-- Third party -->
@@ -125,6 +125,7 @@
     <slf4j.version>1.7.30</slf4j.version>
     <woodstox.version>4.4.1</woodstox.version>
     <zookeeper.version>3.4.14</zookeeper.version>
+    <owasp-java-html-sanitizer.version>20200713.1</owasp-java-html-sanitizer.version>
 
     <!-- Test -->
     <junit.version>5.6.3</junit.version>
@@ -527,6 +528,11 @@
         <version>${okio.version}</version>
         <scope>runtime</scope>
       </dependency>
+      <dependency>
+        <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>
+        <artifactId>owasp-java-html-sanitizer</artifactId>
+        <version>${owasp-java-html-sanitizer.version}</version>
+      </dependency>
 
       <dependency>
         <groupId>janino</groupId>

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.56-SNAPSHOT</version>
+    <version>3.58-SNAPSHOT</version>
   </parent>
 
   <artifactId>registry-cli</artifactId>
@@ -26,6 +26,7 @@
     <metainf-services.version>1.5</metainf-services.version>
     <jersey.version>1.19.3</jersey.version>
     <javax.mail.version>1.4.7</javax.mail.version>
+    <guava.version>18.0</guava.version>
 
     <sonar.coverage.jacoco.xmlReportPaths>
       ${project.basedir}/../registry-integration-tests/target/site/jacoco-aggregate/jacoco.xml

diff --git a/registry-cli/src/test/java/org/gbif/registry/cli/datasetindex/DatasetBatchIndexerIT.java b/registry-cli/src/test/java/org/gbif/registry/cli/datasetindex/DatasetBatchIndexerIT.java
@@ -53,7 +53,7 @@ public class DatasetBatchIndexerIT {
 
   private static final String INDEX_NAME = IndexingConstants.ALIAS + '_' + new Date().getTime();
 
-  private static final String INDEX_ALIAS = INDEX_NAME + "_a" ;
+  private static final String INDEX_ALIAS = INDEX_NAME + "_a";
 
   @RegisterExtension
   public static SingleInstancePostgresExtension database =
@@ -124,12 +124,9 @@ public void indexTests() throws IOException {
     RestHighLevelClient restHighLevelClient = buildRestClient();
 
     SearchResponse searchResponse =
-      restHighLevelClient
-            .search(
-                new SearchRequest()
-                    .indices(INDEX_ALIAS)
-                    .source(new SearchSourceBuilder().size(0)),
-                RequestOptions.DEFAULT);
+        restHighLevelClient.search(
+            new SearchRequest().indices(INDEX_ALIAS).source(new SearchSourceBuilder().size(0)),
+            RequestOptions.DEFAULT);
 
     Assertions.assertEquals(
         DATASETS_TO_INDEX,

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.56-SNAPSHOT</version>
+    <version>3.58-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.56-SNAPSHOT</version>
+    <version>3.58-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.56-SNAPSHOT</version>
+    <version>3.58-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.56-SNAPSHOT</version>
+    <version>3.58-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 

diff --git a/registry-events/src/main/java/org/gbif/registry/events/CreateEvent.java b/registry-events/src/main/java/org/gbif/registry/events/CreateEvent.java
@@ -23,8 +23,7 @@ public class CreateEvent<T> {
   private final T newObject;
   private final Class<T> objectClass;
 
-  public static <T> CreateEvent<T> newInstance(
-      T newObject, Class<T> objectClass) {
+  public static <T> CreateEvent<T> newInstance(T newObject, Class<T> objectClass) {
     return new CreateEvent<>(newObject, objectClass);
   }
 

diff --git a/registry-events/src/main/java/org/gbif/registry/events/DeleteEvent.java b/registry-events/src/main/java/org/gbif/registry/events/DeleteEvent.java
@@ -15,15 +15,13 @@
  */
 package org.gbif.registry.events;
 
-
 /** This event is fired after a new network entity has been successfully deleted. */
 public class DeleteEvent<T> {
 
   private final T oldObject;
   private final Class<T> objectClass;
 
-  public static <T> DeleteEvent<T> newInstance(
-      T oldObject, Class<T> objectClass) {
+  public static <T> DeleteEvent<T> newInstance(T oldObject, Class<T> objectClass) {
     return new DeleteEvent<>(oldObject, objectClass);
   }
 

diff --git a/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java b/registry-events/src/main/java/org/gbif/registry/events/MessageSendingEventListener.java
@@ -156,31 +156,31 @@ public <T> void sendDeletedEvent(final DeleteEvent<T> event) {
   @Subscribe
   public final void updatedComponent(ChangedComponentEvent event) {
     final Message message =
-      new RegistryChangeMessage(
-        RegistryChangeMessage.ChangeType.UPDATED,
-        event.getTargetClass(),
-        event.getTargetEntityKey(),
-        null);
+        new RegistryChangeMessage(
+            RegistryChangeMessage.ChangeType.UPDATE_COMPONENT,
+            event.getComponentClass(),
+            event.getTargetEntityKey(),
+            null);
     LOG.debug(
-      "Scheduling notification of UpdateEvent [{}] with an embargo durations of {} seconds",
-      event.getTargetClass().getSimpleName(),
-      embargoSeconds);
+        "Scheduling notification of UpdateEvent [{}] with an embargo durations of {} seconds",
+        event.getTargetClass().getSimpleName(),
+        embargoSeconds);
 
     scheduler.schedule(
-      () -> {
-        try {
-          LOG.debug(
-            "Broadcasting to postal service UpdateEvent [{}]",
-            event.getTargetClass().getSimpleName());
-          messagePublisher.send(message);
-        } catch (IOException e) {
-          LOG.warn(
-            "Failed sending RegistryChangeMessage for UpdateEvent [{}]",
-            event.getTargetClass().getSimpleName(),
-            e);
-        }
-      },
-      embargoSeconds,
-      TimeUnit.SECONDS);
+        () -> {
+          try {
+            LOG.debug(
+                "Broadcasting to postal service UpdateEvent [{}]",
+                event.getTargetClass().getSimpleName());
+            messagePublisher.send(message);
+          } catch (IOException e) {
+            LOG.warn(
+                "Failed sending RegistryChangeMessage for UpdateEvent [{}]",
+                event.getTargetClass().getSimpleName(),
+                e);
+          }
+        },
+        embargoSeconds,
+        TimeUnit.SECONDS);
   }
 }
diff --git a/registry-events/src/main/java/org/gbif/registry/events/UpdateEvent.java b/registry-events/src/main/java/org/gbif/registry/events/UpdateEvent.java
@@ -22,8 +22,7 @@ public class UpdateEvent<T> {
   private final T oldObject;
   private final Class<T> objectClass;
 
-  public static <T> UpdateEvent<T> newInstance(
-      T newObject, T oldObject, Class<T> objectClass) {
+  public static <T> UpdateEvent<T> newInstance(T newObject, T oldObject, Class<T> objectClass) {
     return new UpdateEvent<>(newObject, oldObject, objectClass);
   }
 

diff --git a/registry-events/src/main/java/org/gbif/registry/events/VarnishPurgeListener.java b/registry-events/src/main/java/org/gbif/registry/events/VarnishPurgeListener.java
@@ -149,7 +149,8 @@ public VarnishPurgeListener(
   @Subscribe
   public final <T> void created(CreateEvent<T> event) {
     if (NetworkEntity.class.isAssignableFrom(event.getObjectClass())) {
-      purgeEntityAndBanLists(event.getObjectClass(), ((NetworkEntity)event.getNewObject()).getKey());
+      purgeEntityAndBanLists(
+          event.getObjectClass(), ((NetworkEntity) event.getNewObject()).getKey());
     }
 
     if (event.getObjectClass().equals(Organization.class)) {
@@ -159,15 +160,15 @@ public final <T> void created(CreateEvent<T> event) {
     } else if (event.getObjectClass().equals(Installation.class)) {
       cascadeInstallationChange((Installation) event.getNewObject());
     } else if (event.getObjectClass().equals(DerivedDataset.class)) {
-      cascadeDerivedDatasetChange((DerivedDataset)event.getNewObject());
+      cascadeDerivedDatasetChange((DerivedDataset) event.getNewObject());
     }
-
   }
 
   @Subscribe
   public final <T> void updated(UpdateEvent<T> event) {
     if (NetworkEntity.class.isAssignableFrom(event.getObjectClass())) {
-      purgeEntityAndBanLists(event.getObjectClass(), ((NetworkEntity)event.getOldObject()).getKey());
+      purgeEntityAndBanLists(
+          event.getObjectClass(), ((NetworkEntity) event.getOldObject()).getKey());
     }
 
     if (event.getObjectClass().equals(Organization.class)) {
@@ -179,14 +180,15 @@ public final <T> void updated(UpdateEvent<T> event) {
       cascadeInstallationChange(
           (Installation) event.getOldObject(), (Installation) event.getNewObject());
     } else if (event.getObjectClass().equals(DerivedDataset.class)) {
-      cascadeDerivedDatasetChange((DerivedDataset)event.getNewObject());
+      cascadeDerivedDatasetChange((DerivedDataset) event.getNewObject());
     }
   }
 
   @Subscribe
   public final <T> void deleted(DeleteEvent<T> event) {
     if (NetworkEntity.class.isAssignableFrom(event.getObjectClass())) {
-      purgeEntityAndBanLists(event.getObjectClass(), ((NetworkEntity)event.getOldObject()).getKey());
+      purgeEntityAndBanLists(
+          event.getObjectClass(), ((NetworkEntity) event.getOldObject()).getKey());
     }
 
     if (event.getObjectClass().equals(Organization.class)) {
@@ -196,7 +198,7 @@ public final <T> void deleted(DeleteEvent<T> event) {
     } else if (event.getObjectClass().equals(Installation.class)) {
       cascadeInstallationChange((Installation) event.getOldObject());
     } else if (event.getObjectClass().equals(DerivedDataset.class)) {
-      cascadeDerivedDatasetChange((DerivedDataset)event.getOldObject());
+      cascadeDerivedDatasetChange((DerivedDataset) event.getOldObject());
     }
   }
 
@@ -347,7 +349,10 @@ private void cascadePersonChange(Person... persons) {
   }
 
   private void cascadeDerivedDatasetChange(DerivedDataset derivedDataset) {
-    purger.ban(String.format("derivedDataset/%s/%s/*", derivedDataset.getDoi().getPrefix(), derivedDataset.getDoi().getSuffix()));
+    purger.ban(
+        String.format(
+            "derivedDataset/%s/%s/*",
+            derivedDataset.getDoi().getPrefix(), derivedDataset.getDoi().getSuffix()));
     purger.ban(String.format("derivedDataset/user/%s", derivedDataset.getCreatedBy()));
     purger.ban("derivedDataset/dataset/*");
   }

diff --git a/registry-events/src/main/java/org/gbif/registry/search/DatasetIndexUpdateListener.java b/registry-events/src/main/java/org/gbif/registry/search/DatasetIndexUpdateListener.java
@@ -73,23 +73,23 @@ public final <T> void updated(UpdateEvent<T> event) {
       // we only care about title & country changes
       Organization org1 = (Organization) event.getOldObject();
       Organization org2 = (Organization) event.getNewObject();
-      if (!Objects.equals(org1.getTitle(), org2.getTitle()) ||
-          !Objects.equals(org1.getCountry(), org2.getCountry())) {
+      if (!Objects.equals(org1.getTitle(), org2.getTitle())
+          || !Objects.equals(org1.getCountry(), org2.getCountry())) {
         indexService.index(org2);
       }
 
     } else if (event.getObjectClass().equals(Installation.class)) {
       // we only care about the hosting organization
       Installation i1 = (Installation) event.getOldObject();
       Installation i2 = (Installation) event.getNewObject();
-      if (!Objects.equals(i1.getOrganizationKey(), (i2.getOrganizationKey())) ||
-          !Objects.equals(i1.getTitle(), i2.getTitle())) {
+      if (!Objects.equals(i1.getOrganizationKey(), (i2.getOrganizationKey()))
+          || !Objects.equals(i1.getTitle(), i2.getTitle())) {
         indexService.index(i2);
       }
     } else if (event.getObjectClass().equals(Network.class)) {
       // we only care about title changes
-      Network network1 = (Network)event.getOldObject();
-      Network network2 = (Network)event.getNewObject();
+      Network network1 = (Network) event.getOldObject();
+      Network network2 = (Network) event.getNewObject();
       if (!Objects.equals(network1.getTitle(), network2.getTitle())) {
         indexService.index(network2);
       }
@@ -110,8 +110,10 @@ public final <T> void deleted(DeleteEvent<T> event) {
   @Subscribe
   public final void updatedComponent(ChangedComponentEvent event) {
     // only fire in case of tagged datasets
-    if ((event.getTargetClass().equals(Dataset.class) && event.getComponentClass().equals(Tag.class)) ||
-        (event.getTargetClass().equals(Network.class) && event.getComponentClass().equals(Dataset.class))) {
+    if ((event.getTargetClass().equals(Dataset.class)
+            && event.getComponentClass().equals(Tag.class))
+        || (event.getTargetClass().equals(Network.class)
+            && event.getComponentClass().equals(Dataset.class))) {
       // we only put tagged datasets onto the queue for this event type!
       UUID key = event.getTargetEntityKey();
       try {

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.56-SNAPSHOT</version>
+    <version>3.58-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
   <artifactId>registry-examples</artifactId>
-  <version>3.56-SNAPSHOT</version>
+  <version>3.58-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.56-SNAPSHOT</version>
+    <version>3.58-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.56-SNAPSHOT</version>
+    <version>3.58-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>