#2663 Basic metadata's contributors - fix saving and validation issues

Author: mike-podolskiy90

src/main/java/org/gbif/ipt/model/datapackage/metadata/FrictionlessContributor.java

@@ -21,7 +21,7 @@
 import java.util.Map;
 import java.util.StringJoiner;
 import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 
 import com.fasterxml.jackson.annotation.JsonAnyGetter;
@@ -47,7 +47,7 @@ public class FrictionlessContributor implements Contributor, Serializable {
    * (Required)
    */
   @JsonProperty("title")
-  @NotNull(message = "validation.input.required", groups = BasicMetadata.class)
+  @NotBlank(message = "validation.input.required", groups = BasicMetadata.class)
   private String title;
 
   /**

src/main/java/org/gbif/ipt/model/datapackage/metadata/camtrap/CamtrapContributor.java

@@ -22,6 +22,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.StringJoiner;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -86,6 +87,20 @@ public void setLastName(String lastName) {
     this.lastName = lastName;
   }
 
+  @Override
+  public String toString() {
+    return new StringJoiner(", ", CamtrapContributor.class.getSimpleName() + "[", "]")
+        .add("title='" + super.getTitle() + "'")
+        .add("path='" + super.getPath() + "'")
+        .add("email='" + super.getEmail() + "'")
+        .add("organization='" + super.getOrganization() + "'")
+        .add("role='" + super.getRole() + "'")
+        .add("firstName='" + firstName + "'")
+        .add("lastName='" + lastName + "'")
+        .add("additionalProperties=" + super.getAdditionalProperties())
+        .toString();
+  }
+
   public static class CamtrapContributorDeserializer extends JsonDeserializer<Contributor> {
     @Override
     public Contributor deserialize(JsonParser jsonParser, DeserializationContext ctxt) throws IOException {

src/main/java/org/gbif/ipt/validation/NotNullForPeopleContributorsValidator.java

@@ -13,15 +13,15 @@
  */
 package org.gbif.ipt.validation;
 
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang3.StringUtils;
-
 import javax.validation.ConstraintValidator;
 import javax.validation.ConstraintValidatorContext;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Arrays;
 import java.util.List;
 
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang3.StringUtils;
+
 public class NotNullForPeopleContributorsValidator implements ConstraintValidator<NotNullLastNameForPeopleContributors, Object> {
 
   private static final List<String> ROLES = Arrays.asList("contact", "principalInvestigator", "contributor");
@@ -30,7 +30,7 @@ public class NotNullForPeopleContributorsValidator implements ConstraintValidato
   public boolean isValid(Object value, ConstraintValidatorContext ctx) {
     try {
       String roleValue = BeanUtils.getProperty(value, "role");
-      String lastName = BeanUtils.getProperty(value, "lastName");
+      String lastName = StringUtils.trimToNull(BeanUtils.getProperty(value, "lastName"));
 
       // last name must not be null for the roles
       if ((ROLES.contains(roleValue) || StringUtils.isEmpty(roleValue)) && StringUtils.isEmpty(lastName)) {