Merge branch 'dev' into #343_suggest_change_and_log

# Conflicts: # registry-service/src/main/java/org/gbif/registry/service/collections/PrimaryCollectionEntityService.java # registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java # registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java
gbif · Apr 29, 2021 · 49cb02c · 49cb02c
2 parents 4e10530 + 6717f1f
commit 49cb02c
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 25 deletions.
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
@@ -29,6 +29,7 @@
 import org.gbif.registry.search.dataset.indexing.DatasetRealtimeIndexer;
 import org.gbif.ws.NotFoundException;
 
+import java.util.Objects;
 import java.util.UUID;
 
 import org.slf4j.Logger;
@@ -72,22 +73,24 @@ 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 (!org1.getTitle().equals(org2.getTitle()) || 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 (!i1.getOrganizationKey().equals(i2.getOrganizationKey())) {
+      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();
-      if (!network1.getTitle().equals(network2.getTitle())) {
+      if (!Objects.equals(network1.getTitle(), network2.getTitle())) {
         indexService.index(network2);
       }
     }

diff --git a/...ation-tests/src/test/java/org/gbif/registry/ws/it/collections/BaseCollectionEntityIT.java b/...ation-tests/src/test/java/org/gbif/registry/ws/it/collections/BaseCollectionEntityIT.java
@@ -184,7 +184,7 @@ public void updateInvalidEntityTest(ServiceType serviceType) {
 
     T newEntity = newInvalidEntity();
     newEntity.setKey(key);
-    assertThrows(Exception.class, () -> service.update(newEntity));
+    assertThrows(ValidationException.class, () -> service.update(newEntity));
   }
 
   @ParameterizedTest

diff --git a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NetworkEntityClient.java b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/NetworkEntityClient.java
@@ -58,9 +58,16 @@ public interface NetworkEntityClient<T extends NetworkEntity> extends NetworkEnt
   @Override
   PagingResponse<T> list(@SpringQueryMap Pageable page);
 
-  @RequestMapping(method = RequestMethod.PUT, consumes = MediaType.APPLICATION_JSON_VALUE)
   @Override
-  void update(@RequestBody T entity);
+  default void update(@RequestBody T entity) {
+    updateResource(entity.getKey(), entity);
+  }
+
+  @RequestMapping(
+      method = RequestMethod.PUT,
+      value = "{key}",
+      consumes = MediaType.APPLICATION_JSON_VALUE)
+  void updateResource(@PathVariable("key") UUID key, @RequestBody T entity);
 
   @RequestMapping(
       method = RequestMethod.GET,

diff --git a/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java b/registry-ws-client/src/main/java/org/gbif/registry/ws/client/collections/CrudClient.java
@@ -43,12 +43,12 @@ public interface CrudClient<T extends CollectionEntity> extends CrudService<T> {
 
   @Override
   default void update(@RequestBody T entity) {
-    updateEntity(entity.getKey(), entity);
+    updateResource(entity.getKey(), entity);
   }
 
   @RequestMapping(
-      method = RequestMethod.PUT,
-      value = "{key}",
-      consumes = MediaType.APPLICATION_JSON_VALUE)
-  void updateEntity(@PathVariable("key") UUID key, @RequestBody T entity);
+    method = RequestMethod.PUT,
+    value = "{key}",
+    consumes = MediaType.APPLICATION_JSON_VALUE)
+  void updateResource(@PathVariable("key") UUID key, @RequestBody T entity);
 }
diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/BaseNetworkEntityResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/BaseNetworkEntityResource.java
@@ -53,6 +53,7 @@
 import java.util.UUID;
 
 import javax.annotation.Nullable;
+import javax.validation.Valid;
 import javax.validation.groups.Default;
 
 import org.slf4j.Logger;
@@ -76,6 +77,7 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
 
+import static com.google.common.base.Preconditions.checkArgument;
 import static org.gbif.registry.security.UserRoles.ADMIN_ROLE;
 import static org.gbif.registry.security.UserRoles.APP_ROLE;
 import static org.gbif.registry.security.UserRoles.EDITOR_ROLE;
@@ -229,15 +231,18 @@ public PagingResponse<T> listByIdentifier(String identifier, Pageable page) {
    *
    * @param entity entity that extends NetworkEntity
    */
-  @PutMapping(
-      value = {"", "{key}"},
-      consumes = MediaType.APPLICATION_JSON_VALUE)
+  @PutMapping(value = "{key}", consumes = MediaType.APPLICATION_JSON_VALUE)
   @Validated({PostPersist.class, Default.class})
   @Trim
   @Transactional
   @Secured({ADMIN_ROLE, EDITOR_ROLE, IPT_ROLE})
+  public void update(@PathVariable("key") UUID key, @Valid @RequestBody @Trim T entity) {
+    checkArgument(key.equals(entity.getKey()));
+    update(entity);
+  }
+
   @Override
-  public void update(@RequestBody @Trim T entity) {
+  public void update(T entity) {
     Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
     if (authentication != null) {
       entity.setModifiedBy(authentication.getName());

diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/DatasetResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/DatasetResource.java
@@ -31,7 +31,6 @@
 import org.gbif.api.model.registry.LenientEquals;
 import org.gbif.api.model.registry.Metadata;
 import org.gbif.api.model.registry.Network;
-import org.gbif.api.model.registry.PostPersist;
 import org.gbif.api.model.registry.PrePersist;
 import org.gbif.api.model.registry.Tag;
 import org.gbif.api.model.registry.search.DatasetSearchParameter;
@@ -551,14 +550,8 @@ public UUID create(@RequestBody @Trim Dataset dataset) {
     return key;
   }
 
-  @PutMapping(
-      value = {"", "{key}"},
-      consumes = MediaType.APPLICATION_JSON_VALUE)
-  @Validated({PostPersist.class, Default.class})
-  @Trim
-  @Secured({ADMIN_ROLE, EDITOR_ROLE, IPT_ROLE})
   @Override
-  public void update(@RequestBody @Trim Dataset dataset) {
+  public void update(Dataset dataset) {
     Dataset old = super.get(dataset.getKey());
     if (old == null) {
       throw new IllegalArgumentException("Dataset " + dataset.getKey() + " not existing");

diff --git a/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java b/registry-ws/src/main/java/org/gbif/registry/ws/resources/collections/PersonResource.java
@@ -20,12 +20,16 @@
 import org.gbif.api.model.collections.Person;
 import org.gbif.api.model.common.paging.Pageable;
 import org.gbif.api.model.common.paging.PagingResponse;
+import org.gbif.api.model.registry.PostPersist;
 import org.gbif.api.model.registry.search.collections.PersonSuggestResult;
 import org.gbif.registry.service.collections.DefaultPersonService;
 
 import java.util.List;
 import java.util.UUID;
 
+import javax.validation.Valid;
+import javax.validation.groups.Default;
+
 import org.springframework.http.MediaType;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.validation.annotation.Validated;
@@ -68,9 +72,10 @@ public UUID create(@RequestBody @Trim Person person) {
   }
 
   @PutMapping(value = "{key}", consumes = MediaType.APPLICATION_JSON_VALUE)
+  @Validated({PostPersist.class, Default.class})
   @Trim
   @Secured({GRSCICOLL_ADMIN_ROLE, GRSCICOLL_EDITOR_ROLE})
-  public void update(@PathVariable("key") UUID key, @RequestBody @Trim Person person) {
+  public void update(@PathVariable("key") UUID key, @Valid @RequestBody @Trim Person person) {
     checkArgument(key.equals(person.getKey()));
     personService.update(person);
   }

diff --git a/roadmap-grscicoll.md b/roadmap-grscicoll.md
@@ -14,7 +14,7 @@ The connection with Index Herbariorum and import of iDigBio enriched the catalog
 
 The current processes are weak, and don’t capture the proposed change in a structured manner.
 
-*   Develop an interface allowing anyone to propose a change to any/all fields and state whether they have authority to approve it. Changes are then to be reviewed and applied by the editorial team [[REG-299](https://github.com/gbif/registry/issues/299)]. 
+*   Develop an interface allowing anyone to propose a change to any/all fields and state whether they have authority to approve it. Changes are then to be reviewed and applied by the editorial team [[REG-CONSOLE-376](https://github.com/gbif/registry-console/issues/376)]. 
 
 ## Improve documentation