From a02668003ddf32c1b16f3e5a213396e6bc9bbfe4 Mon Sep 17 00:00:00 2001
From: Filipe Dias Lewandowski <diasf@users.noreply.github.com>
Date: Wed, 17 Apr 2024 16:03:55 +0200
Subject: [PATCH 1/3] Closes #2425: Adding ORCID and affiliation ROR
 identifiers to the user profile (#2449)

* Closes #2425: Adding ORCID and affiliation ROR identifiers to the user profile

* Deduplicate validation/suggestion code

* review comments
---
 .../persistence/user/AuthenticatedUser.java   | 26 ++++++-
 .../user/AuthenticatedUserDisplayInfo.java    | 34 ++++++--
 .../user/RoleAssigneeDisplayInfo.java         | 22 ++++--
 .../src/main/resources/Bundle_en.properties   | 10 +++
 .../src/main/resources/Bundle_pl.properties   | 10 +++
 .../db/migration/V72__addUserORCIDAndROR.sql  |  1 +
 .../user/AuthenticatedUserTest.java           | 12 ++-
 dataverse-webapp/pom.xml                      | 12 +++
 .../authorization/EditableAccountField.java   |  4 +-
 .../EditableAccountFieldSets.java             |  3 +-
 .../providers/builtin/DataverseUserPage.java  |  3 +-
 .../providers/common/BaseUserPage.java        | 64 +++++++++++++++
 .../common/ExternalIdpFirstLoginPage.java     |  6 +-
 .../dataverse/validation/OrcidValidator.java  | 49 ++++++++++++
 .../{field/validators => }/RorValidator.java  | 30 +++-----
 .../validation/field/ValidationResult.java    | 27 +++++--
 .../field/validators/RorFieldValidator.java   | 39 ++++++++++
 .../src/main/webapp/dataverseuser.xhtml       | 77 +++++++++++++++++++
 .../src/main/webapp/firstLogin.xhtml          | 48 ++++++++++++
 .../AuthenticatedUserDisplayInfoTest.java     |  9 ++-
 .../mocks/MockAuthenticatedUser.java          |  4 +-
 .../validation/OrcidValidatorTest.java        | 32 ++++++++
 .../validation/RorValidatorTest.java          | 39 ++++++++++
 .../validators/RorFieldValidatorTest.java     | 65 ++++++++++++++++
 .../field/validators/RorValidatorTest.java    | 47 -----------
 25 files changed, 575 insertions(+), 98 deletions(-)
 create mode 100644 dataverse-persistence/src/main/resources/db/migration/V72__addUserORCIDAndROR.sql
 create mode 100644 dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/BaseUserPage.java
 create mode 100644 dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/OrcidValidator.java
 rename dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/{field/validators => }/RorValidator.java (62%)
 create mode 100644 dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidator.java
 create mode 100644 dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/OrcidValidatorTest.java
 create mode 100644 dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/RorValidatorTest.java
 create mode 100644 dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidatorTest.java
 delete mode 100644 dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorValidatorTest.java

diff --git a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java
index cbc82dbef0..94a7e63f70 100644
--- a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java
+++ b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java
@@ -83,7 +83,9 @@ public class AuthenticatedUser implements User, Serializable, JpaEntity<Long> {
     @NotNull
     @Column(nullable = false, unique = true)
     private String email;
+    private String orcid;
     private String affiliation;
+    private String affiliationROR;
     private String position;
 
     @NotBlank(message = "{user.lastName}")
@@ -148,10 +150,18 @@ public String getEmail() {
         return email;
     }
 
+    public String getOrcid() {
+        return orcid;
+    }
+
     public String getAffiliation() {
         return affiliation;
     }
 
+    public String getAffiliationROR() {
+        return affiliationROR;
+    }
+
     public String getPosition() {
         return position;
     }
@@ -214,7 +224,7 @@ public String getIdentifier() {
 
     @Override
     public AuthenticatedUserDisplayInfo getDisplayInfo() {
-        return new AuthenticatedUserDisplayInfo(firstName, lastName, email, affiliation, position);
+        return new AuthenticatedUserDisplayInfo(firstName, lastName, email, orcid, affiliation, affiliationROR, position);
     }
 
     /**
@@ -233,6 +243,12 @@ public void applyDisplayInfo(AuthenticatedUserDisplayInfo inf) {
         if (StringUtils.isNotBlank(inf.getPosition())) {
             setPosition(inf.getPosition());
         }
+        if (StringUtils.isNotBlank(inf.getOrcid())) {
+            setOrcid(inf.getOrcid());
+        }
+        if (StringUtils.isNotBlank(inf.getAffiliationROR())) {
+            setAffiliationROR(inf.getAffiliationROR());
+        }
     }
 
     @Override
@@ -277,10 +293,18 @@ public void setEmail(String email) {
         this.email = email.trim();
     }
 
+    public void setOrcid(String orcid) {
+        this.orcid = orcid;
+    }
+
     public void setAffiliation(String affiliation) {
         this.affiliation = affiliation;
     }
 
+    public void setAffiliationROR(String affiliationROR) {
+        this.affiliationROR = affiliationROR;
+    }
+
     public void setPosition(String position) {
         this.position = position;
     }
diff --git a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUserDisplayInfo.java b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUserDisplayInfo.java
index 68cdf59432..8f4b65edef 100644
--- a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUserDisplayInfo.java
+++ b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUserDisplayInfo.java
@@ -14,23 +14,35 @@ public class AuthenticatedUserDisplayInfo extends RoleAssigneeDisplayInfo {
     @NotBlank(message = "{user.firstName}")
     private String firstName;
     private String position;
+    private String orcid;
 
     /*
      * @todo Shouldn't we persist the displayName too? It still exists on the
      * authenticateduser table.
      */
-    public AuthenticatedUserDisplayInfo(String firstName, String lastName, String emailAddress, String affiliation, String position) {
-        super(firstName + " " + lastName, emailAddress, affiliation);
+    public AuthenticatedUserDisplayInfo(String firstName, String lastName, String emailAddress,
+                                        String affiliation, String position) {
+        super(firstName + " " + lastName, emailAddress, affiliation, null);
         this.firstName = firstName;
         this.lastName = lastName;
         this.position = position;
     }
 
+    public AuthenticatedUserDisplayInfo(String firstName, String lastName, String emailAddress, String orcid,
+                                        String affiliation, String affiliationROR, String position) {
+        super(firstName + " " + lastName, emailAddress, affiliation, affiliationROR);
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.position = position;
+        this.orcid = orcid;
+    }
+
     public AuthenticatedUserDisplayInfo() {
-        super("", "", "");
+        super("", "", "", "");
         firstName = "";
         lastName = "";
         position = "";
+        orcid = "";
     }
 
 
@@ -40,7 +52,8 @@ public AuthenticatedUserDisplayInfo() {
      * @param src the display info {@code this} will be a copy of.
      */
     public AuthenticatedUserDisplayInfo(AuthenticatedUserDisplayInfo src) {
-        this(src.getFirstName(), src.getLastName(), src.getEmailAddress(), src.getAffiliation(), src.getPosition());
+        this(src.getFirstName(), src.getLastName(), src.getEmailAddress(), src.getOrcid(), src.getAffiliation(),
+                src.getAffiliationROR(), src.getPosition());
     }
 
     public String getLastName() {
@@ -67,9 +80,18 @@ public void setPosition(String position) {
         this.position = position;
     }
 
+    public String getOrcid() {
+        return orcid;
+    }
+
+    public void setOrcid(String orcid) {
+        this.orcid = orcid;
+    }
+
     @Override
     public String toString() {
-        return "AuthenticatedUserDisplayInfo{firstName=" + firstName + ", lastName=" + lastName + ", position=" + position + ", email=" + getEmailAddress() + '}';
+        return "AuthenticatedUserDisplayInfo{firstName=" + firstName + ", lastName=" + lastName +
+                ", position=" + position + ", email=" + getEmailAddress() + ", orcid=" + getOrcid() + '}';
     }
 
     @Override
@@ -97,7 +119,7 @@ public boolean equals(Object obj) {
         if (!Objects.equals(this.firstName, other.firstName)) {
             return false;
         }
-        return Objects.equals(this.position, other.position) && super.equals(obj);
+        return Objects.equals(this.position, other.position) && Objects.equals(this.orcid, other.orcid) && super.equals(obj);
     }
 
 }
diff --git a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/RoleAssigneeDisplayInfo.java b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/RoleAssigneeDisplayInfo.java
index 8975b57796..4177fb195b 100644
--- a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/RoleAssigneeDisplayInfo.java
+++ b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/RoleAssigneeDisplayInfo.java
@@ -13,15 +13,17 @@ public class RoleAssigneeDisplayInfo implements java.io.Serializable {
     private String title;
     private String emailAddress;
     private String affiliation;
+    private String affiliationROR;
 
     public RoleAssigneeDisplayInfo(String title, String emailAddress) {
-        this(title, emailAddress, null);
+        this(title, emailAddress, null, null);
     }
 
-    public RoleAssigneeDisplayInfo(String title, String emailAddress, String anAffiliation) {
+    public RoleAssigneeDisplayInfo(String title, String emailAddress, String anAffiliation, String affiliationROR) {
         this.title = title;
         this.emailAddress = emailAddress;
-        affiliation = anAffiliation;
+        this.affiliation = anAffiliation;
+        this.affiliationROR = affiliationROR;
     }
 
     public String getTitle() {
@@ -36,6 +38,10 @@ public String getAffiliation() {
         return affiliation;
     }
 
+    public String getAffiliationROR() {
+        return affiliationROR;
+    }
+
     public void setTitle(String title) {
         this.title = title;
     }
@@ -48,9 +54,14 @@ public void setAffiliation(String affiliation) {
         this.affiliation = affiliation;
     }
 
+    public void setAffiliationROR(String affiliationROR) {
+        this.affiliationROR = affiliationROR;
+    }
+
     @Override
     public String toString() {
-        return "RoleAssigneeDisplayInfo{" + "title=" + title + ", emailAddress=" + emailAddress + ", affiliation=" + affiliation + '}';
+        return "RoleAssigneeDisplayInfo{" + "title=" + title + ", emailAddress=" + emailAddress +
+                ", affiliation=" + affiliation + ", affiliationROR=" + affiliationROR + '}';
     }
 
     @Override
@@ -78,7 +89,8 @@ public boolean equals(Object obj) {
         if (!Objects.equals(this.emailAddress, other.emailAddress)) {
             return false;
         }
-        return Objects.equals(this.affiliation, other.affiliation);
+        return Objects.equals(this.affiliation, other.affiliation)
+                && Objects.equals(this.affiliationROR, other.affiliationROR);
     }
 
 }
diff --git a/dataverse-persistence/src/main/resources/Bundle_en.properties b/dataverse-persistence/src/main/resources/Bundle_en.properties
index f095fb13ab..98ca5c4b87 100755
--- a/dataverse-persistence/src/main/resources/Bundle_en.properties
+++ b/dataverse-persistence/src/main/resources/Bundle_en.properties
@@ -331,7 +331,17 @@ user.lastName=Family Name
 user.lastName.tip=The last name you would like to use for this account.
 user.email.tip=A valid email address you have access to in order to be contacted.
 user.email.taken=This email address is already taken.
+user.orcid=ORCID
+user.orcid.tip=ORCID is an open digital identifier allowing distinction between researchers having the same or similar name and surname.
+user.orcid.invalid.format=Invalid ORCID format.
+user.orcid.invalid.checksum=Invalid ORCID checksum.
 user.affiliation.tip=The organization with which you are affiliated.
+user.affiliationror=Affiliation ROR
+user.affiliationror.tip=ROR identifier of the affiliating institution. The identifier must be provided in its URL form, for instance "https://ror.org/039bjqg32" for the University of Warsaw. You can also enter the name of the institution and select its ROR ID from the list.
+user.affiliationror.suggestionDisplay.valueHeader=ROR
+user.affiliationror.suggestionDisplay.detailsHeader=Institution
+user.affiliationror.ror.invalid.format=Invalid ROR format.
+user.affiliationror.ror.invalid.checksum=Invalid ROR checksum.
 user.position=Position
 user.position.tip=Your role or title at the organization you are affiliated with; such as staff, faculty, student, etc.
 user.notificationsLanguage=E-mail notifications language
diff --git a/dataverse-persistence/src/main/resources/Bundle_pl.properties b/dataverse-persistence/src/main/resources/Bundle_pl.properties
index 7d9482f13c..de0a92eb4f 100644
--- a/dataverse-persistence/src/main/resources/Bundle_pl.properties
+++ b/dataverse-persistence/src/main/resources/Bundle_pl.properties
@@ -331,7 +331,17 @@ user.lastName=Nazwisko
 user.lastName.tip=Nazwisko, kt\u00F3re chcesz u\u017Cy\u0107 dla tego konta.
 user.email.tip=Aktualny adres e-mail, do kt\u00F3rego posiadasz dost\u0119p i kt\u00F3rego mo\u017Cna u\u017Cy\u0107, by si\u0119 z Tob\u0105 skontaktowa\u0107.
 user.email.taken=Ten adres e-mail jest ju\u017C przypisany do innego konta.
+user.orcid=ORCID
+user.orcid.tip=ORCID to otwarty identyfikator cyfrowy umo\u017Cliwiaj\u0105cy rozr\u00F3\u017Cnienie naukowc\u00F3w o tym samym lub podobnym imieniu i nazwisku.
+user.orcid.invalid.format=Nieprawid\u0142owo zbudowany identyfikator.
+user.orcid.invalid.checksum=Nieprawid\u0142owy identyfikator.
 user.affiliation.tip=Instytucja przy kt\u00F3rej jeste\u015B afiliowana/afiliowany.
+user.affiliationror=ROR instytucji afiliuj\u0105cej
+user.affiliationror.tip=Identyfikator ROR instytucji afiliuj\u0105cej. Identyfikator musi zosta\u0107 podany w formie adresu URL, np. "https://ror.org/039bjqg32" dla Uniwersytetu Warszawskiego. W to pole mo\u017Cesz r\u00F3wnie\u017C wprowadzi\u0107 nazw\u0119 instytucji i wybra\u0107 jej identyfikator ROR z listy.
+user.affiliationror.suggestionDisplay.valueHeader=ROR
+user.affiliationror.suggestionDisplay.detailsHeader=Instytucja
+user.affiliationror.ror.invalid.format=Nieprawid\u0142owo zbudowany identyfikator ROR.
+user.affiliationror.ror.invalid.checksum=Nieprawid\u0142owy identyfikator ROR.
 user.position=Stanowisko
 user.position.tip=Stanowisko lub rola jak\u0105 pe\u0142nisz w instytucji, przy kt\u00F3rej jeste\u015B afiliowana/afiliowany, na przyk\u0142ad "pracownik naukowy", "student", "pracownik administracyjny" itp.
 user.notificationsLanguage=J\u0119zyk powiadomie\u0144 e-mailowych
diff --git a/dataverse-persistence/src/main/resources/db/migration/V72__addUserORCIDAndROR.sql b/dataverse-persistence/src/main/resources/db/migration/V72__addUserORCIDAndROR.sql
new file mode 100644
index 0000000000..4822df480e
--- /dev/null
+++ b/dataverse-persistence/src/main/resources/db/migration/V72__addUserORCIDAndROR.sql
@@ -0,0 +1 @@
+ALTER TABLE authenticateduser ADD COLUMN orcid TEXT, ADD COLUMN affiliationror TEXT;
diff --git a/dataverse-persistence/src/test/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUserTest.java b/dataverse-persistence/src/test/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUserTest.java
index 87f45622d8..0ef2bd15d1 100644
--- a/dataverse-persistence/src/test/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUserTest.java
+++ b/dataverse-persistence/src/test/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUserTest.java
@@ -45,7 +45,8 @@ public void testGetIdentifier() {
     @Test
     public void testApplyDisplayInfo() {
         System.out.println("applyDisplayInfo");
-        AuthenticatedUserDisplayInfo inf = new AuthenticatedUserDisplayInfo("Homer", "Simpson", "Homer.Simpson@someU.edu", "UnitTester", "In-Memory user");
+        AuthenticatedUserDisplayInfo inf = new AuthenticatedUserDisplayInfo("Homer", "Simpson", "Homer.Simpson@someU.edu",
+                "0000-0001-2345-6789", "UnitTester", "https://ror.org/04k0tth05", "In-Memory user");
         testUser.applyDisplayInfo(inf);
         assertEquals(inf, testUser.getDisplayInfo());
     }
@@ -53,8 +54,15 @@ public void testApplyDisplayInfo() {
     @Test
     public void testGetDisplayInfo() {
         System.out.println("getDisplayInfo");
-        AuthenticatedUserDisplayInfo expResult = new AuthenticatedUserDisplayInfo("Homer", "Simpson", "Homer.Simpson@someU.edu", "UnitTester", "In-Memory user");
+        // given
+        testUser.setOrcid("0000-0001-2345-6789");
+        testUser.setAffiliationROR("https://ror.org/04k0tth05");
+        AuthenticatedUserDisplayInfo expResult = new AuthenticatedUserDisplayInfo("Homer", "Simpson", "Homer.Simpson@someU.edu",
+                "0000-0001-2345-6789", "UnitTester", "https://ror.org/04k0tth05", "In-Memory user");
+        // when
         AuthenticatedUserDisplayInfo result = testUser.getDisplayInfo();
+
+        // then
         assertEquals(expResult, result);
 
     }
diff --git a/dataverse-webapp/pom.xml b/dataverse-webapp/pom.xml
index 362fed94ec..43dd125548 100644
--- a/dataverse-webapp/pom.xml
+++ b/dataverse-webapp/pom.xml
@@ -45,6 +45,12 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>fluent-hc</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -431,6 +437,12 @@
             <groupId>com.onelogin</groupId>
             <artifactId>java-saml</artifactId>
             <version>2.8.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.santuario</groupId>
+                    <artifactId>xmlsec</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- OpenID Connect library -->
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/EditableAccountField.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/EditableAccountField.java
index 336df4eb9b..44fbb8e642 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/EditableAccountField.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/EditableAccountField.java
@@ -9,6 +9,8 @@ public enum EditableAccountField {
     FAMILY_NAME,
     EMAIL,
     AFFILIATION,
+    AFFILIATION_ROR,
     POSITION,
-    NOTIFICATIONS_LANG
+    NOTIFICATIONS_LANG,
+    ORCID
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/EditableAccountFieldSets.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/EditableAccountFieldSets.java
index 930b2e8bd9..780659d69f 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/EditableAccountFieldSets.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/EditableAccountFieldSets.java
@@ -33,7 +33,8 @@ public static Set<EditableAccountField> createAllFieldsSet() {
 
         public static Set<EditableAccountField> createSecondaryFieldsSet() {
             return Collections.unmodifiableSet(
-                    Stream.of(EditableAccountField.AFFILIATION, EditableAccountField.POSITION, EditableAccountField.NOTIFICATIONS_LANG)
+                    Stream.of(EditableAccountField.AFFILIATION, EditableAccountField.POSITION, EditableAccountField.NOTIFICATIONS_LANG,
+                                    EditableAccountField.ORCID, EditableAccountField.AFFILIATION_ROR)
                             .collect(Collectors.toSet()));
         }
 
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
index f90f39aaf0..546081781c 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
@@ -8,6 +8,7 @@
 import edu.harvard.iq.dataverse.authorization.AuthenticationServiceBean;
 import edu.harvard.iq.dataverse.authorization.EditableAccountField;
 import edu.harvard.iq.dataverse.authorization.UserRecordIdentifier;
+import edu.harvard.iq.dataverse.authorization.providers.common.BaseUserPage;
 import edu.harvard.iq.dataverse.authorization.providers.shib.ShibAuthenticationProvider;
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.consent.ConsentDto;
@@ -60,7 +61,7 @@
 
 @ViewScoped
 @Named("DataverseUserPage")
-public class DataverseUserPage implements java.io.Serializable {
+public class DataverseUserPage extends BaseUserPage {
 
     private static final Logger logger = Logger.getLogger(DataverseUserPage.class.getCanonicalName());
 
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/BaseUserPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/BaseUserPage.java
new file mode 100644
index 0000000000..7d36658f67
--- /dev/null
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/BaseUserPage.java
@@ -0,0 +1,64 @@
+package edu.harvard.iq.dataverse.authorization.providers.common;
+
+import edu.harvard.iq.dataverse.common.BundleUtil;
+import edu.harvard.iq.dataverse.dataset.metadata.inputRenderer.Suggestion;
+import edu.harvard.iq.dataverse.dataset.metadata.inputRenderer.suggestion.SuggestionHandler;
+import edu.harvard.iq.dataverse.validation.OrcidValidator;
+import edu.harvard.iq.dataverse.validation.RorValidator;
+import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.ejb.EJB;
+import javax.faces.application.FacesMessage;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UIInput;
+import javax.faces.context.FacesContext;
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Provides common functionality for the user account details page.
+ */
+public abstract class BaseUserPage  implements Serializable  {
+
+    @EJB
+    RorValidator rorValidator;
+
+    @EJB
+    OrcidValidator orcidValidator;
+
+    @EJB(beanName = "RorSuggestionHandler")
+    SuggestionHandler suggestionHandler;
+
+    public void validateOrcid(FacesContext context, UIComponent toValidate, Object value) {
+        String orcid = (String) value;
+        if (StringUtils.isEmpty(orcid)) {
+            return;
+        }
+        ValidationResult result = orcidValidator.validate(orcid);
+        if (!result.isOk()) {
+            ((UIInput) toValidate).setValid(false);
+            context.addMessage(toValidate.getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                    BundleUtil.getStringFromBundle("user." + result.getErrorCode()), null));
+        }
+    }
+
+    public void validateAffiliationRor(FacesContext context, UIComponent toValidate, Object value) {
+        String ror = (String) value;
+        if (StringUtils.isEmpty(ror)) {
+            return;
+        }
+
+        ValidationResult result = rorValidator.validate(ror);
+        if (!result.isOk()) {
+            ((UIInput) toValidate).setValid(false);
+            context.addMessage(toValidate.getClientId(context), new FacesMessage(FacesMessage.SEVERITY_ERROR,
+                    BundleUtil.getStringFromBundle("user.affiliationror." + result.getErrorCode()), null));
+        }
+    }
+
+    public List<Suggestion> processAffiliationRorSuggestions(String query) {
+        return suggestionHandler.generateSuggestions(Collections.emptyMap(), query);
+    }
+}
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/ExternalIdpFirstLoginPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/ExternalIdpFirstLoginPage.java
index 9414024fee..31896f9f97 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/ExternalIdpFirstLoginPage.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/ExternalIdpFirstLoginPage.java
@@ -43,7 +43,6 @@
 import javax.inject.Named;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
-import java.io.Serializable;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -65,7 +64,7 @@
  */
 @Named("ExternalIdpFirstLoginPage")
 @SessionScoped
-public class ExternalIdpFirstLoginPage implements Serializable {
+public class ExternalIdpFirstLoginPage extends BaseUserPage {
 
     private static final Logger logger = Logger.getLogger(ExternalIdpFirstLoginPage.class.getCanonicalName());
 
@@ -235,7 +234,8 @@ public String init() throws IOException {
     public String createNewAccount() {
         AuthenticatedUserDisplayInfo displayInfo = newUser.getDisplayInfo();
         AuthenticatedUserDisplayInfo newAuthenticatedUserDisplayInfo = new AuthenticatedUserDisplayInfo(
-                displayInfo.getFirstName(), displayInfo.getLastName(), getSelectedEmail(), displayInfo.getAffiliation(),
+                displayInfo.getFirstName(), displayInfo.getLastName(), getSelectedEmail(), displayInfo.getOrcid(),
+                displayInfo.getAffiliation(), displayInfo.getAffiliationROR(),
                 displayInfo.getPosition());
 
         final AuthenticatedUser user = authenticationSvc.createAuthenticatedUser(newUser.toUserRecordIdentifier(),
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/OrcidValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/OrcidValidator.java
new file mode 100644
index 0000000000..f398e4c2cd
--- /dev/null
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/OrcidValidator.java
@@ -0,0 +1,49 @@
+package edu.harvard.iq.dataverse.validation;
+
+import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.ejb.Stateless;
+import java.util.Arrays;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@Stateless
+public class OrcidValidator {
+
+    public static final String INVALID_FORMAT_ERROR_CODE = "orcid.invalid.format";
+    public static final String INVALID_CHECKSUM_ERROR_CODE = "orcid.invalid.checksum";
+
+    private static final Pattern ORCID_FORMAT_PATTERN = Pattern.compile("([0-9]{4})-([0-9]{4})-([0-9]{4})-([0-9]{3})([0-9X])");
+
+    // -------------------- LOGIC --------------------
+
+    public ValidationResult validate(String orcid) {
+        if (StringUtils.isEmpty(orcid)) {
+            return ValidationResult.invalid(INVALID_FORMAT_ERROR_CODE);
+        }
+
+        Matcher matcher = ORCID_FORMAT_PATTERN.matcher(orcid);
+        if (StringUtils.isBlank(orcid) || !matcher.matches()) {
+            return ValidationResult.invalid(INVALID_FORMAT_ERROR_CODE);
+        }
+
+        String encoded = matcher.group(1) + matcher.group(2) + matcher.group(3) + matcher.group(4);
+        String checksum = matcher.group(5);
+
+        return checksum.equals(computeChecksum(encoded))
+                ? ValidationResult.ok()
+                : ValidationResult.invalid(INVALID_CHECKSUM_ERROR_CODE);
+    }
+
+    // -------------------- PRIVATE --------------------
+
+    public String computeChecksum(String baseDigits) {
+        int total = Arrays.stream(baseDigits.split(""))
+                .mapToInt(Integer::parseInt)
+                .reduce(0, (accumulated, digit) -> (accumulated + digit) * 2);
+
+        int result = (12 - total % 11) % 11;
+        return result == 10 ? "X" : String.valueOf(result);
+    }
+}
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/RorValidator.java
similarity index 62%
rename from dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorValidator.java
rename to dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/RorValidator.java
index 7c64f6f7de..656eaa9855 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/RorValidator.java
@@ -1,46 +1,34 @@
-package edu.harvard.iq.dataverse.validation.field.validators;
+package edu.harvard.iq.dataverse.validation;
 
-import edu.harvard.iq.dataverse.common.BundleUtil;
-import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
 import edu.harvard.iq.dataverse.validation.field.ValidationResult;
 import org.apache.commons.lang3.StringUtils;
-import org.omnifaces.cdi.Eager;
 
-import javax.enterprise.context.ApplicationScoped;
+import javax.ejb.Stateless;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-@Eager
-@ApplicationScoped
-public class RorValidator extends MultiValueValidatorBase {
-
+@Stateless
+public class RorValidator {
+    public static final String INVALID_FORMAT_ERROR_CODE = "ror.invalid.format";
+    public static final String INVALID_CHECKSUM_ERROR_CODE = "ror.invalid.checksum";
     private static final Map<String, Integer> DECODE_SYMBOL_VALUES = Initializer.initializeDecodeSymbolValues();
 
     // -------------------- LOGIC --------------------
 
-    @Override
-    public String getName() {
-        return "ror_validator";
-    }
-
-    @Override
-    public ValidationResult validateValue(String fullRor, ValidatableField field, Map<String, Object> params,
-                                          Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
-        String fieldName = field.getDatasetFieldType().getDisplayName();
+    public ValidationResult validate(String fullRor) {
         if (StringUtils.isBlank(fullRor)
             || !fullRor.matches("https://ror\\.org/0[a-hjkmnp-tv-z0-9]{6}[0-9]{2}")) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("ror.invalid.format", fieldName));
+            return ValidationResult.invalid(INVALID_FORMAT_ERROR_CODE);
         }
         String value = fullRor.substring(fullRor.lastIndexOf("/") + 1);
         String encoded = value.substring(0, 7);
         long checksum = Long.parseLong(value.substring(7));
         return checksum == computeChecksum(encoded)
                 ? ValidationResult.ok()
-                : ValidationResult.invalid(field, BundleUtil.getStringFromBundle("ror.invalid.checksum", fieldName));
+                : ValidationResult.invalid(INVALID_CHECKSUM_ERROR_CODE);
     }
 
     // -------------------- PRIVATE --------------------
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/ValidationResult.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/ValidationResult.java
index f43102a15e..1285e54263 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/ValidationResult.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/ValidationResult.java
@@ -4,16 +4,19 @@
 import org.apache.commons.lang3.StringUtils;
 
 public class ValidationResult {
-    public static ValidationResult OK = new ValidationResult(true,null, StringUtils.EMPTY);
 
-    private boolean ok;
-    private ValidatableField field;
-    private String message;
+    public static ValidationResult OK = new ValidationResult(true, null, null, StringUtils.EMPTY);
+
+    private final boolean ok;
+    private final String errorCode;
+    private final ValidatableField field;
+    private final String message;
 
     // -------------------- CONSTRUCTORS --------------------
 
-    private ValidationResult(boolean ok, ValidatableField field, String validationMessage) {
+    private ValidationResult(boolean ok, String errorCode, ValidatableField field, String validationMessage) {
         this.ok = ok;
+        this.errorCode = errorCode;
         this.field = field;
         this.message = validationMessage;
     }
@@ -28,14 +31,26 @@ public String getMessage() {
         return message;
     }
 
+    public String getErrorCode() {
+        return errorCode;
+    }
+
     // -------------------- LOGIC --------------------
 
+    public ValidationResult withInfo(ValidatableField field, String validationMessage) {
+        return new ValidationResult(ok, errorCode, field, validationMessage);
+    }
+
     public static ValidationResult ok() {
         return OK;
     }
 
     public static ValidationResult invalid(ValidatableField field, String message) {
-        return new ValidationResult(false, field, message);
+        return new ValidationResult(false, null, field, message);
+    }
+
+    public static ValidationResult invalid(String errorCode) {
+        return new ValidationResult(false, errorCode, null, StringUtils.EMPTY);
     }
 
     public boolean isOk() {
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidator.java
new file mode 100644
index 0000000000..8c9dc36546
--- /dev/null
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidator.java
@@ -0,0 +1,39 @@
+package edu.harvard.iq.dataverse.validation.field.validators;
+
+import edu.harvard.iq.dataverse.common.BundleUtil;
+import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
+import edu.harvard.iq.dataverse.validation.RorValidator;
+import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import org.omnifaces.cdi.Eager;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import java.util.List;
+import java.util.Map;
+
+@Eager
+@ApplicationScoped
+public class RorFieldValidator extends MultiValueValidatorBase {
+
+    @Inject
+    private RorValidator rorValidator;
+
+    // -------------------- LOGIC --------------------
+
+    @Override
+    public String getName() {
+        return "ror_validator";
+    }
+
+    @Override
+    public ValidationResult validateValue(String fullRor, ValidatableField field, Map<String, Object> params,
+                                               Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+        String fieldName = field.getDatasetFieldType().getDisplayName();
+        ValidationResult result = rorValidator.validate(fullRor);
+        if (result.isOk()) {
+            return result;
+        } else {
+            return result.withInfo(field, BundleUtil.getStringFromBundle(result.getErrorCode(), fieldName));
+        }
+    }
+}
diff --git a/dataverse-webapp/src/main/webapp/dataverseuser.xhtml b/dataverse-webapp/src/main/webapp/dataverseuser.xhtml
index 6da1236322..fbbc2e8f70 100644
--- a/dataverse-webapp/src/main/webapp/dataverseuser.xhtml
+++ b/dataverse-webapp/src/main/webapp/dataverseuser.xhtml
@@ -475,6 +475,19 @@
                                         </p>
                                     </div>
                                 </div>
+                                <!-- ORCID -->
+                                <div class="form-group" jsf:rendered="#{!empty DataverseUserPage.currentUser.orcid}">
+                                    <label for="affiliation" class="col-sm-3 control-label">
+                                        #{bundle['user.orcid']}
+                                    </label>
+                                    <div class="col-sm-9">
+                                        <p class="form-control-static">
+                                            <h:outputLink value="https://orcid.org/#{DataverseUserPage.currentUser.orcid}" target="_blank">
+                                                <h:outputText value="#{DataverseUserPage.currentUser.orcid}"/>
+                                            </h:outputLink>
+                                        </p>
+                                    </div>
+                                </div>
                                 <!-- Affiliation -->
                                 <div class="form-group" jsf:rendered="#{!empty DataverseUserPage.currentUser.affiliation}">
                                     <label for="affiliation" class="col-sm-3 control-label">
@@ -484,6 +497,19 @@
                                         <p class="form-control-static">#{DataverseUserPage.currentUser.affiliation}</p>
                                     </div>
                                 </div>
+                                <!-- Affiliation ROR -->
+                                <div class="form-group" jsf:rendered="#{!empty DataverseUserPage.currentUser.affiliationROR}">
+                                    <label for="affiliation" class="col-sm-3 control-label">
+                                        #{bundle['user.affiliationror']}
+                                    </label>
+                                    <div class="col-sm-9">
+                                        <p class="form-control-static">
+                                            <h:outputLink value="#{DataverseUserPage.currentUser.affiliationROR}" target="_blank">
+                                                <h:outputText value="#{DataverseUserPage.currentUser.affiliationROR}"/>
+                                            </h:outputLink>
+                                        </p>
+                                    </div>
+                                </div>
                                 <!-- Position (not populated for Shibboleth users) -->
                                 <div class="form-group" jsf:rendered="#{!empty DataverseUserPage.currentUser.position}">
                                     <label for="position" class="col-sm-3 control-label">
@@ -670,6 +696,21 @@
                                         </p>
                                     </div>
                                 </div>
+                                <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
+                                    <!-- ORCID -->
+                                    <label for="orcid" class="col-sm-3 control-label">
+                                        #{bundle['user.orcid']}
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon" tabindex="0" role="button"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.orcid.tip']}"></span>
+                                    </label>
+                                    <div class="col-sm-4">
+                                        <p:inputText id="orcid" styleClass="form-control"
+                                                     value="#{DataverseUserPage.userDisplayInfo.orcid}"
+                                                     validator="#{DataverseUserPage.validateOrcid}"
+                                                     disabled="#{DataverseUserPage.editMode == 'EDIT' and DataverseUserPage.isDisabledForEdit(editableField.ORCID)}"/>
+                                        <p:message for="orcid" display="text" />
+                                    </div>
+                                </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                     <!-- Affiliation -->
                                     <label for="affiliation" class="col-sm-3 control-label">
@@ -684,6 +725,42 @@
                                         <p:message for="affiliation" display="text" />
                                     </div>
                                 </div>
+                                <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
+                                    <!-- Affiliation ROR -->
+                                    <label for="affiliationror" class="col-sm-3 control-label">
+                                        #{bundle['user.affiliationror']}
+                                        <span class="glyphicon glyphicon-question-sign tooltip-icon" tabindex="0" role="button"
+                                              data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliationror.tip']}"></span>
+                                    </label>
+                                    <div class="col-sm-4">
+                                        <p:autoComplete
+                                                id="affiliationror"
+                                                value="#{DataverseUserPage.userDisplayInfo.affiliationROR}"
+                                                completeMethod="#{DataverseUserPage.processAffiliationRorSuggestions}"
+                                                validator="#{DataverseUserPage.validateAffiliationRor}"
+                                                styleClass="autocomplete-form-control"
+                                                panelStyleClass="autocomplete-panel-maxwidth"
+                                                minQueryLength="2" queryDelay="1000" size="36"
+                                                resultsMessage="#{bundle['common.forms.autocomplete.resultsMessage']}"
+                                                emptyMessage="#{bundle['common.forms.autocomplete.emptySuggestionMessage']}"
+                                                var="suggestion" itemLabel="#{suggestion}" itemValue="#{suggestion.value}"
+                                                autoSelection="false"
+                                                autoHighlight="false"
+                                                disabled="#{DataverseUserPage.editMode == 'EDIT' and DataverseUserPage.isDisabledForEdit(editableField.AFFILIATION_ROR)}"
+                                        >
+                                            <p:column headerText="#{bundle['user.affiliationror.suggestionDisplay.valueHeader']}">
+                                                <h:outputText value="#{suggestion.value}"/>
+                                            </p:column>
+                                            <p:column headerText="#{bundle['user.affiliationror.suggestionDisplay.detailsHeader']}">
+                                                <h:outputText value="#{suggestion.details}"/>
+                                            </p:column>
+
+                                            <p:ajax process="@this" event="itemSelect" />
+                                            <p:ajax process="@this" event="itemUnselect" />
+                                        </p:autoComplete>
+                                        <p:message for="affiliationror" display="text" />
+                                    </div>
+                                </div>
                                 <div class="form-group" jsf:rendered="#{DataverseUserPage.editMode == 'CREATE' or DataverseUserPage.editMode == 'EDIT'}">
                                 <!-- Position -->
                                     <label for="position" class="col-sm-3 control-label">
diff --git a/dataverse-webapp/src/main/webapp/firstLogin.xhtml b/dataverse-webapp/src/main/webapp/firstLogin.xhtml
index ae2ef36671..139c3f7551 100644
--- a/dataverse-webapp/src/main/webapp/firstLogin.xhtml
+++ b/dataverse-webapp/src/main/webapp/firstLogin.xhtml
@@ -116,6 +116,19 @@
                                     </p>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label for="ocrid" class="col-sm-3 control-label">
+                                    #{bundle['user.orcid']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon" tabindex="0" role="button"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.orcid.tip']}"></span>
+                                </label>
+                                <div class="col-sm-4">
+                                    <p:inputText id="orcid" styleClass="form-control"
+                                                 value="#{ExternalIdpFirstLoginPage.newUser.displayInfo.orcid}"
+                                                 validator="#{ExternalIdpFirstLoginPage.validateOrcid}"/>
+                                    <p:message for="orcid" display="text" />
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label for="affiliation" class="col-sm-3 control-label">
                                     #{bundle['affiliation']}
@@ -127,6 +140,41 @@
                                     <p:inputText id="affiliation" styleClass="form-control" value="#{ExternalIdpFirstLoginPage.newUser.displayInfo.affiliation}"/>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <!-- Affiliation ROR -->
+                                <label for="affiliationror" class="col-sm-3 control-label">
+                                    #{bundle['user.affiliationror']}
+                                    <span class="glyphicon glyphicon-question-sign tooltip-icon" tabindex="0" role="button"
+                                          data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['user.affiliationror.tip']}"></span>
+                                </label>
+                                <div class="col-sm-4">
+                                    <p:autoComplete
+                                            id="affiliationror"
+                                            value="#{ExternalIdpFirstLoginPage.newUser.displayInfo.affiliationROR}"
+                                            completeMethod="#{ExternalIdpFirstLoginPage.processAffiliationRorSuggestions}"
+                                            validator="#{ExternalIdpFirstLoginPage.validateAffiliationRor}"
+                                            styleClass="autocomplete-form-control"
+                                            panelStyleClass="autocomplete-panel-maxwidth"
+                                            minQueryLength="2" queryDelay="1000" size="36"
+                                            resultsMessage="#{bundle['common.forms.autocomplete.resultsMessage']}"
+                                            emptyMessage="#{bundle['common.forms.autocomplete.emptySuggestionMessage']}"
+                                            var="suggestion" itemLabel="#{suggestion}" itemValue="#{suggestion.value}"
+                                            autoSelection="false"
+                                            autoHighlight="false"
+                                    >
+                                        <p:column headerText="#{bundle['user.affiliationror.suggestionDisplay.valueHeader']}">
+                                            <h:outputText value="#{suggestion.value}"/>
+                                        </p:column>
+                                        <p:column headerText="#{bundle['user.affiliationror.suggestionDisplay.detailsHeader']}">
+                                            <h:outputText value="#{suggestion.details}"/>
+                                        </p:column>
+
+                                        <p:ajax process="@this" event="itemSelect" />
+                                        <p:ajax process="@this" event="itemUnselect" />
+                                    </p:autoComplete>
+                                    <p:message for="affiliationror" display="text" />
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label for="position" class="col-sm-3 control-label">
                                     #{bundle['user.position']}
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfoTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfoTest.java
index 89d11db1ec..69cefc8f6a 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfoTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfoTest.java
@@ -14,11 +14,14 @@ public class AuthenticatedUserDisplayInfoTest {
 
     @Test
     public void testCopyConstructor() {
-        AuthenticatedUserDisplayInfo src = new AuthenticatedUserDisplayInfo("fn", "ln", "email@address.com", "Harvard", "test");
-        AuthenticatedUserDisplayInfo src2 = new AuthenticatedUserDisplayInfo("fn", "ln", "email@address.com", "Harvard", "test");
+        AuthenticatedUserDisplayInfo src = new AuthenticatedUserDisplayInfo("fn", "ln",
+                "email@address.com", "0000-0001-2345-6789", "Harvard", "https://ror.org/04k0tth05", "test");
+        AuthenticatedUserDisplayInfo src2 = new AuthenticatedUserDisplayInfo("fn", "ln",
+                "email@address.com", "0000-0001-2345-6789", "Harvard", "https://ror.org/04k0tth05", "test");
         assertEquals(src, src2);
 
-        AuthenticatedUserDisplayInfo otherSrc = new AuthenticatedUserDisplayInfo("xfn", "ln", "email@address.com", "Harvard", "test");
+        AuthenticatedUserDisplayInfo otherSrc = new AuthenticatedUserDisplayInfo("xfn", "ln",
+                "email@address.com", "0000-0001-2345-6789", "Harvard", "https://ror.org/04k0tth05", "test");
         assertFalse(src.equals(otherSrc));
         final AuthenticatedUserDisplayInfo copyOfSrc = new AuthenticatedUserDisplayInfo(src);
 
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/mocks/MockAuthenticatedUser.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/mocks/MockAuthenticatedUser.java
index 6ecfd1e724..2ac458269b 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/mocks/MockAuthenticatedUser.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/mocks/MockAuthenticatedUser.java
@@ -9,6 +9,8 @@
 public class MockAuthenticatedUser extends AuthenticatedUser {
     @Override
     public AuthenticatedUserDisplayInfo getDisplayInfo() {
-        return new AuthenticatedUserDisplayInfo("FirstMock", "LastMock", "EmailMock@email.com", "AffilMock", "PositionMock");
+        return new AuthenticatedUserDisplayInfo("FirstMock", "LastMock",
+                "EmailMock@email.com", "0000-0001-2345-6789", "AffilMock",
+                "https://ror.org/04k0tth05", "PositionMock");
     }
 }
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/OrcidValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/OrcidValidatorTest.java
new file mode 100644
index 0000000000..ae77a7c19c
--- /dev/null
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/OrcidValidatorTest.java
@@ -0,0 +1,32 @@
+package edu.harvard.iq.dataverse.validation;
+
+import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class OrcidValidatorTest {
+
+    private final OrcidValidator validator = new OrcidValidator();
+
+    @ParameterizedTest
+    @CsvSource({
+            "0000-0002-1825-0097, true,",
+            "0000-0001-5109-3700, true,",
+            "0000-0002-1694-233X, true,",
+            "000000021694233X, false, orcid.invalid.format",
+            "0000-B002-1694-233X, false, orcid.invalid.format",
+            "000-80029-1694-233X, false, orcid.invalid.format",
+            ", false, orcid.invalid.format",
+            "0000-0002-1694-2331, false, orcid.invalid.checksum"
+    })
+    void validate(String value, boolean expectedResult, String expectedErrorCode) {
+        // when
+        ValidationResult result = validator.validate(value);
+
+        // then
+        assertThat(result.isOk()).isEqualTo(expectedResult);
+        assertThat(result.getErrorCode()).isEqualTo(expectedErrorCode);
+    }
+}
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/RorValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/RorValidatorTest.java
new file mode 100644
index 0000000000..6518509c10
--- /dev/null
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/RorValidatorTest.java
@@ -0,0 +1,39 @@
+package edu.harvard.iq.dataverse.validation;
+
+import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class RorValidatorTest {
+
+    private RorValidator validator = new RorValidator();
+
+    @ParameterizedTest
+    @CsvSource({
+            "https://ror.org/01q8f6705, true,",
+            "https://ror.org/01pp8nd67, true,",
+            "https://ror.org/00kv9pj15, true,",
+            "https://ror.org/019wvm592, true,",
+            "https://ror.org/05cggb038, true,",
+            "https://ror.org/04xfq0f34, true,",
+            "https://ror.org/04xfq0f34, true,",
+            "https://ror.org/14xfq0f34, false, ror.invalid.format",
+            "https://ror.org/04XFQ0F34, false, ror.invalid.format",
+            ", false, ror.invalid.format",
+            "https://ror.org/ZENNEZ12345, false, ror.invalid.format",
+            "https://ror.org/012222233, false, ror.invalid.checksum",
+            "https://ror.org/0m12t2p21, false, ror.invalid.checksum",
+            "https://ror.org/, false, ror.invalid.format",
+            "11abcde12, false, ror.invalid.format"
+    })
+    void validate(String value, boolean expectedResult, String expectedErrorCode) {
+        // when
+        ValidationResult result = validator.validate(value);
+
+        // then
+        assertThat(result.isOk()).isEqualTo(expectedResult);
+        assertThat(result.getErrorCode()).isEqualTo(expectedErrorCode);
+    }
+}
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidatorTest.java
new file mode 100644
index 0000000000..db7773f7d8
--- /dev/null
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidatorTest.java
@@ -0,0 +1,65 @@
+package edu.harvard.iq.dataverse.validation.field.validators;
+
+import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
+import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
+import edu.harvard.iq.dataverse.validation.RorValidator;
+import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public class RorFieldValidatorTest {
+
+    @Mock
+    private RorValidator rorValidator;
+
+    @InjectMocks
+    private RorFieldValidator validator;
+
+    @Test
+    public void validateValue() {
+        // given
+        String ror = "https://ror.org/04xfq0f34";
+        DatasetField datasetField = new DatasetField();
+        datasetField.setDatasetFieldType(new DatasetFieldType());
+        datasetField.setValue(ror);
+        datasetField.getDatasetFieldType().setName("ror");
+
+        when(rorValidator.validate(ror)).thenReturn(ValidationResult.ok());
+
+        // when
+        ValidationResult result = validator.validateValue(ror, datasetField, Collections.emptyMap(), Collections.emptyMap());
+
+        // then
+        assertThat(result.isOk()).isTrue();
+        assertThat(result.getField()).isNull();
+        assertThat(result.getMessage()).isEmpty();
+    }
+
+    @Test
+    public void validateValue__invalid() {
+        // given
+        String ror = "INVALID";
+        DatasetField datasetField = new DatasetField();
+        datasetField.setDatasetFieldType(new DatasetFieldType());
+        datasetField.setValue(ror);
+        datasetField.getDatasetFieldType().setName("ror");
+
+        when(rorValidator.validate(ror)).thenReturn(ValidationResult.invalid("INVALID_ROR"));
+
+        // when
+        ValidationResult result = validator.validateValue(ror, datasetField, Collections.emptyMap(), Collections.emptyMap());
+
+        // then
+        assertThat(result.isOk()).isFalse();
+        assertThat(result.getField()).isEqualTo(datasetField);
+    }
+}
\ No newline at end of file
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorValidatorTest.java
deleted file mode 100644
index 72c42cdf9c..0000000000
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorValidatorTest.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package edu.harvard.iq.dataverse.validation.field.validators;
-
-import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
-import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-
-import java.util.Collections;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-class RorValidatorTest {
-
-    private RorValidator validator = new RorValidator();
-
-    @ParameterizedTest
-    @CsvSource({
-            "https://ror.org/01q8f6705, true",
-            "https://ror.org/01pp8nd67, true",
-            "https://ror.org/00kv9pj15, true",
-            "https://ror.org/019wvm592, true",
-            "https://ror.org/05cggb038, true",
-            "https://ror.org/04xfq0f34, true",
-            "https://ror.org/04xfq0f34, true",
-            "https://ror.org/14xfq0f34, false",
-            "https://ror.org/04XFQ0F34, false",
-            ", false",
-            "https://ror.org/ZENNEZ12345, false",
-            "https://ror.org/112222233, false",
-            "https://ror.org/qq12321pp, false",
-            "https://ror.org/, false",
-            "11abcde12, false"
-    })
-    void validate(String value, boolean expectedResult) {
-        // given
-        DatasetField datasetField = new DatasetField();
-        datasetField.setDatasetFieldType(new DatasetFieldType());
-        datasetField.setValue(value);
-
-        // when
-        ValidationResult result = validator.validateValue(value, datasetField, Collections.emptyMap(), Collections.emptyMap());
-
-        // then
-        assertThat(result.isOk()).isEqualTo(expectedResult);
-    }
-}
\ No newline at end of file

From 1cdb9636999b99377a437539574c918976b4e454 Mon Sep 17 00:00:00 2001
From: Filipe Dias Lewandowski <diasf@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:08:06 +0200
Subject: [PATCH 2/3] Refs #2425: refactor ValidationResult (#2454)

---
 .../datadeposit/MediaResourceManagerImpl.java |  8 +--
 .../api/imports/ImportServiceBean.java        |  8 +--
 .../providers/common/BaseUserPage.java        |  2 +-
 .../iq/dataverse/datafile/FileService.java    | 14 ++---
 .../dataverse/dataset/CreateDatasetPage.java  |  6 +-
 .../DatasetVersionServiceBean.java            |  8 +--
 .../dataset/tab/DatasetFilesTab.java          |  6 +-
 .../datasetutility/AddReplaceFileHelper.java  |  8 +--
 .../command/impl/AbstractDatasetCommand.java  | 12 ++--
 .../dataverse/search/AdvancedSearchPage.java  |  6 +-
 .../DatasetFieldValidationService.java        | 10 ++--
 .../dataverse/validation/OrcidValidator.java  |  1 -
 .../iq/dataverse/validation/RorValidator.java |  1 -
 .../SearchFormValidationService.java          | 12 ++--
 .../validation/ValidationResult.java          | 37 ++++++++++++
 .../DatasetFieldValidationDispatcher.java     | 10 ++--
 .../field/FieldValidationResult.java          | 41 +++++++++++++
 .../validation/field/FieldValidator.java      |  4 +-
 .../field/SearchFormValidationDispatcher.java |  8 +--
 .../validation/field/ValidationResult.java    | 59 -------------------
 .../field/validators/DateRangeValidator.java  | 14 ++---
 .../validators/MultiValueValidatorBase.java   | 10 ++--
 .../field/validators/RorFieldValidator.java   |  9 +--
 .../validators/StandardDateValidator.java     | 10 ++--
 .../validators/StandardEmailValidator.java    | 10 ++--
 .../validators/StandardInputValidator.java    | 12 ++--
 .../validators/StandardIntegerValidator.java  | 10 ++--
 .../validators/StandardNumberValidator.java   | 10 ++--
 .../validators/StandardUrlValidator.java      | 10 ++--
 .../geobox/GeoboxComponentValidator.java      |  8 +--
 .../geobox/GeoboxFillValidator.java           | 10 ++--
 .../GeoboxLatitudeRelationValidator.java      | 12 ++--
 .../geobox/GeoboxValueValidator.java          | 18 +++---
 .../validation/OrcidValidatorTest.java        |  1 -
 .../validation/RorValidatorTest.java          |  1 -
 .../DatasetFieldValidationDispatcherTest.java | 34 +++++------
 .../SearchFormValidationDispatcherTest.java   | 26 ++++----
 .../validators/DateRangeValidatorTest.java    |  4 +-
 .../MultiValueValidatorBaseTest.java          | 12 ++--
 .../validators/RorFieldValidatorTest.java     | 10 ++--
 .../validators/StandardDateValidatorTest.java |  4 +-
 .../StandardEmailValidatorTest.java           |  4 +-
 .../StandardInputValidatorTest.java           |  4 +-
 .../StandardIntegerValidatorTest.java         |  4 +-
 .../StandardNumberValidatorTest.java          |  4 +-
 .../validators/StandardUrlValidatorTest.java  |  4 +-
 .../geobox/GeoboxComponentValidatorTest.java  |  4 +-
 .../geobox/GeoboxFillValidatorTest.java       |  4 +-
 .../GeoboxLatitudeRelationValidatorTest.java  |  4 +-
 .../geobox/GeoboxValueValidatorTest.java      |  4 +-
 50 files changed, 274 insertions(+), 258 deletions(-)
 create mode 100644 dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/ValidationResult.java
 create mode 100644 dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/FieldValidationResult.java
 delete mode 100644 dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/ValidationResult.java

diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
index 5dfb217772..b41b13dfa7 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/datadeposit/MediaResourceManagerImpl.java
@@ -23,7 +23,7 @@
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.validation.DatasetFieldValidationService;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.swordapp.server.AuthCredentials;
 import org.swordapp.server.Deposit;
 import org.swordapp.server.DepositReceipt;
@@ -322,10 +322,10 @@ DepositReceipt replaceOrAddFiles(String uri, Deposit deposit, AuthCredentials au
                 throw new SwordError(UriRegistry.ERROR_BAD_REQUEST, "Unable to add file(s) to dataset: Unknown error");
             }
             if (!dataFiles.isEmpty()) {
-                List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(editVersion);
+                List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(editVersion);
                 Set<ConstraintViolation<FileMetadata>> constraintViolations = editVersion.validateFileMetadata();
-                if (!validationResults.isEmpty()) {
-                    ValidationResult firstError = validationResults.get(0);
+                if (!fieldValidationResults.isEmpty()) {
+                    FieldValidationResult firstError = fieldValidationResults.get(0);
                     throw new SwordError(UriRegistry.ERROR_BAD_REQUEST,
                             String.format("Unable to add file(s) to dataset: %s The invalid value was \"%s\".", firstError.getMessage(), firstError.getField().getSingleValue()));
                 } else if (!constraintViolations.isEmpty()) {
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
index b008cb3c05..84f9944217 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/imports/ImportServiceBean.java
@@ -18,7 +18,7 @@
 import edu.harvard.iq.dataverse.search.index.IndexServiceBean;
 import edu.harvard.iq.dataverse.util.json.JsonParseException;
 import edu.harvard.iq.dataverse.validation.DatasetFieldValidationService;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 
@@ -137,10 +137,10 @@ public Dataset doImportHarvestedDataset(DataverseRequest dataverseRequest, Harve
 
             // Check data against validation contraints
             DatasetVersion versionToValidate = ds.getVersions().get(0);
-            List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(versionToValidate);
-            if (!validationResults.isEmpty()) {
+            List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(versionToValidate);
+            if (!fieldValidationResults.isEmpty()) {
                 // For migration and harvest, add NA for missing required values
-                validationResults.forEach(r -> ((DatasetField) r.getField()).setFieldValue(DatasetField.NA_VALUE));
+                fieldValidationResults.forEach(r -> ((DatasetField) r.getField()).setFieldValue(DatasetField.NA_VALUE));
             }
 
             // A Global ID is required, in order for us to be able to harvest and import
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/BaseUserPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/BaseUserPage.java
index 7d36658f67..b2f102397f 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/BaseUserPage.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/common/BaseUserPage.java
@@ -5,7 +5,7 @@
 import edu.harvard.iq.dataverse.dataset.metadata.inputRenderer.suggestion.SuggestionHandler;
 import edu.harvard.iq.dataverse.validation.OrcidValidator;
 import edu.harvard.iq.dataverse.validation.RorValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.ValidationResult;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.ejb.EJB;
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/datafile/FileService.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/datafile/FileService.java
index 5bb7705e5a..ea987c752a 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/datafile/FileService.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/datafile/FileService.java
@@ -16,7 +16,7 @@
 import edu.harvard.iq.dataverse.persistence.dataset.Dataset;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetVersion;
 import edu.harvard.iq.dataverse.validation.DatasetFieldValidationService;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import io.vavr.control.Option;
 import io.vavr.control.Try;
 import org.apache.commons.lang.StringUtils;
@@ -75,11 +75,11 @@ public Dataset deleteFile(FileMetadata fileToDelete) {
         Dataset datasetFileOwner = fileToDelete.getDataFile().getOwner();
 
         DatasetVersion versionToValidate = fileToDelete.getDatasetVersion();
-        List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(versionToValidate);
+        List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(versionToValidate);
         Set<ConstraintViolation<FileMetadata>> constraintViolations = versionToValidate.validateFileMetadata();
 
-        if (!validationResults.isEmpty() || !constraintViolations.isEmpty()) {
-            validationResults.forEach(r -> logger.warn(r.getMessage()));
+        if (!fieldValidationResults.isEmpty() || !constraintViolations.isEmpty()) {
+            fieldValidationResults.forEach(r -> logger.warn(r.getMessage()));
             constraintViolations.forEach(constraintViolation -> logger.warn(constraintViolation.getMessage()));
             throw new ValidationException("There was validation error during deletion attempt with the dataFile id: " + fileToDelete.getDataFile().getId());
 
@@ -112,11 +112,11 @@ public Dataset saveProvenanceFileWithDesc(FileMetadata editedFile, DataFile uplo
         .getOrElseThrow(throwable -> new RuntimeException("There was a problem with persisting provenance file", throwable));
 
         DatasetVersion versionToValidate = editedFile.getDatasetVersion();
-        List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(versionToValidate);
+        List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(versionToValidate);
         Set<ConstraintViolation<FileMetadata>> constraintViolations = versionToValidate.validateFileMetadata();
 
-        if (!validationResults.isEmpty() || !constraintViolations.isEmpty()) {
-            validationResults.forEach(r -> logger.warn(r.getMessage()));
+        if (!fieldValidationResults.isEmpty() || !constraintViolations.isEmpty()) {
+            fieldValidationResults.forEach(r -> logger.warn(r.getMessage()));
             constraintViolations.forEach(constraintViolation -> logger.warn(constraintViolation.getMessage()));
             throw new ValidationException("There was validation error during deletion attempt with the dataFile id: " + editedFile.getDataFile().getId());
         }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/CreateDatasetPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/CreateDatasetPage.java
index 663082ac31..b3a112a09c 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/CreateDatasetPage.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/CreateDatasetPage.java
@@ -31,7 +31,7 @@
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.JsfHelper;
 import edu.harvard.iq.dataverse.validation.DatasetFieldValidationService;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import io.vavr.control.Try;
 import org.apache.commons.lang3.StringUtils;
 import org.omnifaces.cdi.ViewScoped;
@@ -194,9 +194,9 @@ public void updateSelectedTemplate(AjaxBehaviorEvent event) {
     public String save() {
         workingVersion.setDatasetFields(DatasetFieldUtil.flattenDatasetFieldsFromBlocks(metadataBlocksForEdit));
 
-        List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(workingVersion);
+        List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(workingVersion);
         Set<ConstraintViolation<FileMetadata>> constraintViolations = workingVersion.validateFileMetadata();
-        if (!validationResults.isEmpty() || !constraintViolations.isEmpty()) {
+        if (!fieldValidationResults.isEmpty() || !constraintViolations.isEmpty()) {
             JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.validationError"),
                     BundleUtil.getStringFromBundle("dataset.message.validationErrorDetails"));
             return StringUtils.EMPTY;
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/datasetversion/DatasetVersionServiceBean.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/datasetversion/DatasetVersionServiceBean.java
index b10f7e7233..b79dad7feb 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/datasetversion/DatasetVersionServiceBean.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/datasetversion/DatasetVersionServiceBean.java
@@ -23,7 +23,7 @@
 import edu.harvard.iq.dataverse.search.index.IndexServiceBean;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import edu.harvard.iq.dataverse.validation.DatasetFieldValidationService;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1081,10 +1081,10 @@ public Dataset updateDatasetVersion(DatasetVersion editVersion, boolean validate
     }
 
     public Dataset updateDatasetVersion(DatasetVersion editVersion, List<DataFile> filesToDelete, boolean validateLenient) {
-        List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(editVersion);
+        List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(editVersion);
         Set<ConstraintViolation<FileMetadata>> constraintViolations = editVersion.validateFileMetadata();
-        if (!validationResults.isEmpty() || !constraintViolations.isEmpty()) {
-            validationResults.forEach(r -> log.warn(r.getMessage()));
+        if (!fieldValidationResults.isEmpty() || !constraintViolations.isEmpty()) {
+            fieldValidationResults.forEach(r -> log.warn(r.getMessage()));
             constraintViolations.forEach(constraintViolation -> log.warn(constraintViolation.getMessage()));
             throw new ValidationException("There was validation error during updating dataset attempt with id: " + editVersion.getDataset().getId());
         }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/tab/DatasetFilesTab.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/tab/DatasetFilesTab.java
index f1c1ed488e..b629ee12c2 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/tab/DatasetFilesTab.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/tab/DatasetFilesTab.java
@@ -46,7 +46,7 @@
 import edu.harvard.iq.dataverse.util.PrimefacesUtil;
 import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.validation.DatasetFieldValidationService;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
 import org.apache.commons.lang3.StringUtils;
@@ -901,9 +901,9 @@ private String save(DatasetVersion updatedVersion) {
     private String save(DatasetVersion updatedVersion, boolean printBannerMessage) {
 
         // Validate
-        List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(updatedVersion);
+        List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(updatedVersion);
         Set<ConstraintViolation<FileMetadata>> constraintViolations = updatedVersion.validateFileMetadata();
-        if (!validationResults.isEmpty() || !constraintViolations.isEmpty()) {
+        if (!fieldValidationResults.isEmpty() || !constraintViolations.isEmpty()) {
             JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("dataset.message.validationError"), "");
             return "";
         }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
index 52cb5d409b..2d00d502cd 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/datasetutility/AddReplaceFileHelper.java
@@ -18,7 +18,7 @@
 import edu.harvard.iq.dataverse.persistence.dataset.Dataset;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetVersion;
 import edu.harvard.iq.dataverse.validation.DatasetFieldValidationService;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.ocpsoft.common.util.Strings;
@@ -1007,13 +1007,13 @@ private boolean step_050_checkForConstraintViolations() {
         //  Gather all error messages
         // -----------------------------------------------------------
         DatasetFieldValidationService fieldValidationService = commandEngine.getContext().fieldValidationService();
-        List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(workingVersion);
+        List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(workingVersion);
         Set<ConstraintViolation<FileMetadata>> constraintViolations = workingVersion.validateFileMetadata();
 
         // -----------------------------------------------------------
         // No violations found
         // -----------------------------------------------------------
-        if (validationResults.isEmpty() && constraintViolations.isEmpty()) {
+        if (fieldValidationResults.isEmpty() && constraintViolations.isEmpty()) {
             return true;
         }
 
@@ -1021,7 +1021,7 @@ private boolean step_050_checkForConstraintViolations() {
         // violations found: gather all error messages
         // -----------------------------------------------------------
         Stream.concat(
-                validationResults.stream().map(ValidationResult::getMessage),
+                fieldValidationResults.stream().map(FieldValidationResult::getMessage),
                 constraintViolations.stream().map(ConstraintViolation::getMessage))
                 .forEach(this::addError);
         return this.hasError();
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
index 9144195e49..843c824532 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/AbstractDatasetCommand.java
@@ -19,7 +19,7 @@
 import edu.harvard.iq.dataverse.persistence.dataverse.Dataverse;
 import edu.harvard.iq.dataverse.persistence.user.AuthenticatedUser;
 import edu.harvard.iq.dataverse.validation.DatasetFieldValidationService;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import io.vavr.control.Try;
 
 import javax.validation.ConstraintViolation;
@@ -108,18 +108,18 @@ protected void createDatasetUser(CommandContext ctxt) {
      */
     protected void validateOrDie(DatasetVersion dsv, Boolean lenient, CommandContext context) {
         DatasetFieldValidationService fieldValidationService = context.fieldValidationService();
-        List<ValidationResult> validationResults = fieldValidationService.validateFieldsOfDatasetVersion(dsv);
-        if (!validationResults.isEmpty()) {
+        List<FieldValidationResult> fieldValidationResults = fieldValidationService.validateFieldsOfDatasetVersion(dsv);
+        if (!fieldValidationResults.isEmpty()) {
             if (lenient) {
                 // populate invalid fields with N/A
-                validationResults.stream()
-                        .map(ValidationResult::getField)
+                fieldValidationResults.stream()
+                        .map(FieldValidationResult::getField)
                         .map(DatasetField.class::cast)
                         .forEach(f -> f.setFieldValue(DatasetField.NA_VALUE));
 
             } else {
                 // explode with a helpful message
-                String validationMessage = validationResults.stream()
+                String validationMessage = fieldValidationResults.stream()
                         .map(r -> String.format("%s (Invalid value:%s)", r.getMessage(), r.getField().getSingleValue()))
                         .collect(joining(", ", "Validation Failed: ", "."));
                 throw new IllegalCommandException(validationMessage, this);
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
index 709af67438..49db93c8eb 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/search/AdvancedSearchPage.java
@@ -25,7 +25,7 @@
 import edu.harvard.iq.dataverse.validation.SearchFormValidationService;
 import edu.harvard.iq.dataverse.validation.ValidationEnhancer;
 import edu.harvard.iq.dataverse.validation.field.ValidationDescriptor;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import edu.harvard.iq.dataverse.validation.field.validators.DateRangeValidator;
 import io.vavr.Tuple;
 import org.apache.commons.lang3.StringUtils;
@@ -114,9 +114,9 @@ public void init() {
 
     /** Composes query and redirects to the page with results. */
     public String find() throws IOException {
-        List<ValidationResult> validationResults
+        List<FieldValidationResult> fieldValidationResults
                 = validationService.validateSearchForm(searchFieldIndex, nonSearchFieldIndex);
-        if (!validationResults.isEmpty()) {
+        if (!fieldValidationResults.isEmpty()) {
             JsfHelper.addErrorMessage(BundleUtil.getStringFromBundle("advanced.search.validation"), StringUtils.EMPTY);
             return StringUtils.EMPTY;
         }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/DatasetFieldValidationService.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/DatasetFieldValidationService.java
index c46e21a4af..ba06d0d0ca 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/DatasetFieldValidationService.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/DatasetFieldValidationService.java
@@ -3,7 +3,7 @@
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetVersion;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
 import edu.harvard.iq.dataverse.validation.field.DatasetFieldValidationDispatcherFactory;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
@@ -25,15 +25,15 @@ public DatasetFieldValidationService(DatasetFieldValidationDispatcherFactory dis
 
 // -------------------- LOGIC --------------------
 
-    public List<ValidationResult> validateFieldsOfDatasetVersion(DatasetVersion datasetVersion) {
+    public List<FieldValidationResult> validateFieldsOfDatasetVersion(DatasetVersion datasetVersion) {
         datasetVersion.getFlatDatasetFields()
                 .forEach(f -> f.setValidationMessage(null));
-        List<ValidationResult> validationResults = dispatcherFactory.create(datasetVersion.getFlatDatasetFields())
+        List<FieldValidationResult> fieldValidationResults = dispatcherFactory.create(datasetVersion.getFlatDatasetFields())
                 .executeValidations();
-        validationResults.forEach(r -> {
+        fieldValidationResults.forEach(r -> {
                     ValidatableField field = r.getField();
                     field.setValidationMessage(r.getMessage());
                 });
-        return validationResults;
+        return fieldValidationResults;
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/OrcidValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/OrcidValidator.java
index f398e4c2cd..cf2788a8e1 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/OrcidValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/OrcidValidator.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.validation;
 
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.ejb.Stateless;
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/RorValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/RorValidator.java
index 656eaa9855..1947fee10c 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/RorValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/RorValidator.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.validation;
 
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.ejb.Stateless;
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/SearchFormValidationService.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/SearchFormValidationService.java
index af150d8ee0..ef1eb4ad6a 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/SearchFormValidationService.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/SearchFormValidationService.java
@@ -3,7 +3,7 @@
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
 import edu.harvard.iq.dataverse.search.advanced.field.SearchField;
 import edu.harvard.iq.dataverse.validation.field.SearchFormValidationDispatcherFactory;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 
 import javax.ejb.Stateless;
 import javax.inject.Inject;
@@ -26,15 +26,15 @@ public SearchFormValidationService(SearchFormValidationDispatcherFactory dispatc
 
     // -------------------- LOGIC --------------------
 
-    public List<ValidationResult> validateSearchForm(Map<String, SearchField> searchFields,
-                                                     Map<String, SearchField> nonSearchFields) {
+    public List<FieldValidationResult> validateSearchForm(Map<String, SearchField> searchFields,
+                                                          Map<String, SearchField> nonSearchFields) {
         searchFields.forEach((k, v) -> v.setValidationMessage(null));
-        List<ValidationResult> validationResults = dispatcherFactory.create(searchFields, nonSearchFields)
+        List<FieldValidationResult> fieldValidationResults = dispatcherFactory.create(searchFields, nonSearchFields)
                 .executeValidations();
-        validationResults.forEach(r -> {
+        fieldValidationResults.forEach(r -> {
             ValidatableField field = r.getField();
             field.setValidationMessage(r.getMessage());
         });
-        return validationResults;
+        return fieldValidationResults;
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/ValidationResult.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/ValidationResult.java
new file mode 100644
index 0000000000..757e013a38
--- /dev/null
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/ValidationResult.java
@@ -0,0 +1,37 @@
+package edu.harvard.iq.dataverse.validation;
+
+public class ValidationResult {
+
+    public static ValidationResult OK = new ValidationResult(true, null);
+
+    private final boolean ok;
+
+    private final String errorCode;
+
+    // -------------------- CONSTRUCTORS --------------------
+
+    protected ValidationResult(boolean ok, String errorCode) {
+        this.ok = ok;
+        this.errorCode = errorCode;
+    }
+
+    // -------------------- GETTERS --------------------
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    // -------------------- LOGIC --------------------
+
+    public static ValidationResult ok() {
+        return OK;
+    }
+
+    public static ValidationResult invalid(String errorCode) {
+        return new ValidationResult(false, errorCode);
+    }
+
+    public boolean isOk() {
+        return ok;
+    }
+}
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/DatasetFieldValidationDispatcher.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/DatasetFieldValidationDispatcher.java
index 5f19d9f474..13808d0446 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/DatasetFieldValidationDispatcher.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/DatasetFieldValidationDispatcher.java
@@ -37,7 +37,7 @@ DatasetFieldValidationDispatcher init(List<DatasetField> parentAndChildrenFields
         return this;
     }
 
-    public List<ValidationResult> executeValidations() {
+    public List<FieldValidationResult> executeValidations() {
         return fieldIndex.values().stream()
                 .flatMap(Collection::stream)
                 .filter(this::isNotTemplateField)
@@ -52,10 +52,10 @@ private boolean isNotTemplateField(DatasetField field) {
         return field.getTopParentDatasetField().getTemplate() == null;
     }
 
-    private ValidationResult validateField(DatasetField field) {
+    private FieldValidationResult validateField(DatasetField field) {
         DatasetFieldType fieldType = field.getDatasetFieldType();
         if (StringUtils.isBlank(field.getValue()) && fieldType.isPrimitive() && isRequiredInDataverse(field)) {
-            return ValidationResult.invalid(field,
+            return FieldValidationResult.invalid(field,
                     BundleUtil.getStringFromBundle("isrequired", fieldType.getDisplayName()));
         }
         boolean effectivelyEmptyValue = StringUtils.isBlank(field.getValue())
@@ -68,12 +68,12 @@ private ValidationResult validateField(DatasetField field) {
                 continue;
             }
             FieldValidator validator = registry.getOrThrow(descriptor.getName());
-            ValidationResult result = validator.validate(field, parameters, fieldIndex);
+            FieldValidationResult result = validator.validate(field, parameters, fieldIndex);
             if (!result.isOk()) {
                 return result;
             }
         }
-        return ValidationResult.ok();
+        return FieldValidationResult.ok();
     }
 
     private boolean isRequiredInDataverse(DatasetField field) {
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/FieldValidationResult.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/FieldValidationResult.java
new file mode 100644
index 0000000000..426c0d466b
--- /dev/null
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/FieldValidationResult.java
@@ -0,0 +1,41 @@
+package edu.harvard.iq.dataverse.validation.field;
+
+import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
+import edu.harvard.iq.dataverse.validation.ValidationResult;
+import org.apache.commons.lang3.StringUtils;
+
+public class FieldValidationResult extends ValidationResult {
+
+    public static FieldValidationResult OK = new FieldValidationResult(true, null, null, StringUtils.EMPTY);
+
+    private final ValidatableField field;
+    private final String message;
+
+    // -------------------- CONSTRUCTORS --------------------
+
+    private FieldValidationResult(boolean ok, String errorCode, ValidatableField field, String validationMessage) {
+        super(ok, errorCode);
+        this.field = field;
+        this.message = validationMessage;
+    }
+
+    // -------------------- GETTERS --------------------
+
+    public ValidatableField getField() {
+        return field;
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    // -------------------- LOGIC --------------------
+
+    public static FieldValidationResult ok() {
+        return OK;
+    }
+
+    public static FieldValidationResult invalid(ValidatableField field, String message) {
+        return new FieldValidationResult(false, null, field, message);
+    }
+}
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/FieldValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/FieldValidator.java
index 9827c3b21a..83f62c1b94 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/FieldValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/FieldValidator.java
@@ -9,7 +9,7 @@ public interface FieldValidator {
 
     String getName();
 
-    ValidationResult validate(ValidatableField field, Map<String, Object> params,
-                              Map<String, ? extends List<? extends ValidatableField>> fieldIndex);
+    FieldValidationResult validate(ValidatableField field, Map<String, Object> params,
+                                   Map<String, ? extends List<? extends ValidatableField>> fieldIndex);
 
 }
\ No newline at end of file
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/SearchFormValidationDispatcher.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/SearchFormValidationDispatcher.java
index 02a3ffd857..7663965642 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/SearchFormValidationDispatcher.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/SearchFormValidationDispatcher.java
@@ -45,7 +45,7 @@ SearchFormValidationDispatcher init(Map<String, SearchField> searchFields,
         return this;
     }
 
-    public List<ValidationResult> executeValidations() {
+    public List<FieldValidationResult> executeValidations() {
         return fieldsToValidate.values().stream()
                 .flatMap(Collection::stream)
                 .map(this::validateField)
@@ -55,7 +55,7 @@ public List<ValidationResult> executeValidations() {
 
     // -------------------- PRIVATE --------------------
 
-    private ValidationResult validateField(ValidatableField field) {
+    private FieldValidationResult validateField(ValidatableField field) {
         boolean effectivelyEmptyValue = field.getValidatableValues().stream()
                 .allMatch(StringUtils::isBlank);
         for (ValidationDescriptor descriptor : retrieveDescriptors(field)) {
@@ -66,12 +66,12 @@ private ValidationResult validateField(ValidatableField field) {
                 continue;
             }
             FieldValidator validator = registry.getOrThrow(descriptor.getName());
-            ValidationResult result = validator.validate(field, parameters, fieldIndex);
+            FieldValidationResult result = validator.validate(field, parameters, fieldIndex);
             if (!result.isOk()) {
                 return result;
             }
         }
-        return ValidationResult.ok();
+        return FieldValidationResult.ok();
     }
 
     private List<ValidationDescriptor> retrieveDescriptors(ValidatableField field) {
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/ValidationResult.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/ValidationResult.java
deleted file mode 100644
index 1285e54263..0000000000
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/ValidationResult.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package edu.harvard.iq.dataverse.validation.field;
-
-import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import org.apache.commons.lang3.StringUtils;
-
-public class ValidationResult {
-
-    public static ValidationResult OK = new ValidationResult(true, null, null, StringUtils.EMPTY);
-
-    private final boolean ok;
-    private final String errorCode;
-    private final ValidatableField field;
-    private final String message;
-
-    // -------------------- CONSTRUCTORS --------------------
-
-    private ValidationResult(boolean ok, String errorCode, ValidatableField field, String validationMessage) {
-        this.ok = ok;
-        this.errorCode = errorCode;
-        this.field = field;
-        this.message = validationMessage;
-    }
-
-    // -------------------- GETTERS --------------------
-
-    public ValidatableField getField() {
-        return field;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public String getErrorCode() {
-        return errorCode;
-    }
-
-    // -------------------- LOGIC --------------------
-
-    public ValidationResult withInfo(ValidatableField field, String validationMessage) {
-        return new ValidationResult(ok, errorCode, field, validationMessage);
-    }
-
-    public static ValidationResult ok() {
-        return OK;
-    }
-
-    public static ValidationResult invalid(ValidatableField field, String message) {
-        return new ValidationResult(false, null, field, message);
-    }
-
-    public static ValidationResult invalid(String errorCode) {
-        return new ValidationResult(false, errorCode, null, StringUtils.EMPTY);
-    }
-
-    public boolean isOk() {
-        return ok;
-    }
-}
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/DateRangeValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/DateRangeValidator.java
index 39917d2a36..2554a47dba 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/DateRangeValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/DateRangeValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import io.vavr.Tuple;
 import io.vavr.Tuple2;
 import org.apache.commons.lang.StringUtils;
@@ -32,8 +32,8 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validate(ValidatableField field, Map<String, Object> params,
-                                     Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validate(ValidatableField field, Map<String, Object> params,
+                                          Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         List<String> validatableValues = field.getValidatableValues();
         if (validatableValues.size() != 2) {
             throw new IllegalArgumentException("The field is wrongly configured – exactly two values are expected!");
@@ -44,16 +44,16 @@ public ValidationResult validate(ValidatableField field, Map<String, Object> par
 
         Tuple2<LocalDate, Boolean> dateFrom = validateAndParse(dateFromValue);
         if (!dateFrom._2()) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("advanced.search.wrong.daterange.format", dateFromValue));
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("advanced.search.wrong.daterange.format", dateFromValue));
         }
         Tuple2<LocalDate, Boolean> dateTo = validateAndParse(dateToValue);
         if (!dateTo._2()) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("advanced.search.wrong.daterange.format", dateToValue));
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("advanced.search.wrong.daterange.format", dateToValue));
         }
         if (!isValidDateRange(dateFrom._1(), dateTo._1(), dateToValue)) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("advanced.search.wrong.daterange.badRange"));
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("advanced.search.wrong.daterange.badRange"));
         }
-        return ValidationResult.ok();
+        return FieldValidationResult.ok();
     }
 
     // -------------------- PRIVATE ---------------------
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/MultiValueValidatorBase.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/MultiValueValidatorBase.java
index cbf0f9ef0b..afd022b083 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/MultiValueValidatorBase.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/MultiValueValidatorBase.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.validation.field.validators;
 
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;
@@ -14,18 +14,18 @@
 public abstract class MultiValueValidatorBase extends FieldValidatorBase {
 
     @Override
-    public ValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         for (String value : field.getValidatableValues()) {
             if (StringUtils.isBlank(value)) {
                 continue;
             }
-            ValidationResult result = validateValue(value, field, params, fieldIndex);
+            FieldValidationResult result = validateValue(value, field, params, fieldIndex);
             if (!result.isOk()) {
                 return result;
             }
         }
-        return ValidationResult.ok();
+        return FieldValidationResult.ok();
     }
 
-    public abstract ValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex);
+    public abstract FieldValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex);
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidator.java
index 8c9dc36546..ba0725d444 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidator.java
@@ -3,7 +3,8 @@
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
 import edu.harvard.iq.dataverse.validation.RorValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.omnifaces.cdi.Eager;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -26,14 +27,14 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validateValue(String fullRor, ValidatableField field, Map<String, Object> params,
+    public FieldValidationResult validateValue(String fullRor, ValidatableField field, Map<String, Object> params,
                                                Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         String fieldName = field.getDatasetFieldType().getDisplayName();
         ValidationResult result = rorValidator.validate(fullRor);
         if (result.isOk()) {
-            return result;
+            return FieldValidationResult.ok();
         } else {
-            return result.withInfo(field, BundleUtil.getStringFromBundle(result.getErrorCode(), fieldName));
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle(result.getErrorCode(), fieldName));
         }
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardDateValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardDateValidator.java
index 2dcd922ec4..ebeebc49be 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardDateValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardDateValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.omnifaces.cdi.Eager;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -32,16 +32,16 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
-                                          Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
+                                               Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         value = value.startsWith("-") ? value.substring(1) : value;
 
         for (DateTimeFormatter parser : PARSERS) {
             if (isValidDate(value, parser)) {
-                return ValidationResult.ok();
+                return FieldValidationResult.ok();
             }
         }
-        return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidDate",
+        return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidDate",
                 field.getDatasetFieldType().getDisplayName(), YYYY_MM_DD_FORMAT, YYYY_MM_FORMAT, YYYY_FORMAT));
     }
 
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardEmailValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardEmailValidator.java
index 85e7a0090a..c65a9b1221 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardEmailValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardEmailValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.apache.commons.validator.routines.EmailValidator;
 import org.omnifaces.cdi.Eager;
 
@@ -20,11 +20,11 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
-                                          Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
+                                               Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         return EmailValidator.getInstance().isValid(value)
-                ? ValidationResult.ok()
-                : ValidationResult.invalid(field,
+                ? FieldValidationResult.ok()
+                : FieldValidationResult.invalid(field,
                 String.format("%s %s", value, BundleUtil.getStringFromBundle("email.invalid")));
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardInputValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardInputValidator.java
index e8548cd1ed..e8e09221fd 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardInputValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardInputValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.apache.commons.lang.StringUtils;
 import org.omnifaces.cdi.Eager;
 
@@ -20,15 +20,15 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
-                                          Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
+                                               Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         String validationFormat = (String) params.get("format");
         if (StringUtils.isNotBlank(validationFormat)) {
             return value.matches(validationFormat)
-                    ? ValidationResult.ok()
-                    : ValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidEntry",
+                    ? FieldValidationResult.ok()
+                    : FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidEntry",
                     field.getDatasetFieldType().getDisplayName()));
         }
-        return ValidationResult.ok();
+        return FieldValidationResult.ok();
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardIntegerValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardIntegerValidator.java
index 07242ccc52..897d8dc60f 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardIntegerValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardIntegerValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.omnifaces.cdi.Eager;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -19,13 +19,13 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
-                                          Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
+                                               Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         try {
             Integer.parseInt(value);
-            return ValidationResult.ok();
+            return FieldValidationResult.ok();
         } catch (NumberFormatException nfe) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidInteger",
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidInteger",
                     field.getDatasetFieldType().getDisplayName()));
         }
     }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardNumberValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardNumberValidator.java
index 84fd7cfe48..1855e6c5b6 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardNumberValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardNumberValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.omnifaces.cdi.Eager;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -19,13 +19,13 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
-                                          Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
+                                               Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         try {
             Double.parseDouble(value);
-            return ValidationResult.ok();
+            return FieldValidationResult.ok();
         } catch (NumberFormatException nfe) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidNumber",
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidNumber",
                     field.getDatasetFieldType().getDisplayName()));
         }
     }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardUrlValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardUrlValidator.java
index 6adb865e0d..91160edf1c 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardUrlValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/StandardUrlValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.omnifaces.cdi.Eager;
 
 import javax.enterprise.context.ApplicationScoped;
@@ -21,13 +21,13 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
-                                          Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
+                                               Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         try {
             new URL(value);
-            return ValidationResult.ok();
+            return FieldValidationResult.ok();
         } catch (MalformedURLException e) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidUrl",
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidUrl",
                     field.getDatasetFieldType().getDisplayName(), value));
         }
     }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxComponentValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxComponentValidator.java
index 120c112918..152bb16bbf 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxComponentValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxComponentValidator.java
@@ -1,7 +1,7 @@
 package edu.harvard.iq.dataverse.validation.field.validators.geobox;
 
 import edu.harvard.iq.dataverse.validation.field.FieldValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import edu.harvard.iq.dataverse.validation.field.validators.FieldValidatorBase;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
 import org.omnifaces.cdi.Eager;
@@ -29,13 +29,13 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         for (FieldValidator validator : INTERNAL_VALIDATORS) {
-            ValidationResult intermediateResult = validator.validate(field, params, fieldIndex);
+            FieldValidationResult intermediateResult = validator.validate(field, params, fieldIndex);
             if (!intermediateResult.isOk()) {
                 return intermediateResult;
             }
         }
-        return ValidationResult.ok();
+        return FieldValidationResult.ok();
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxFillValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxFillValidator.java
index ea59a3f6f3..7f1ea01f9c 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxFillValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxFillValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.validation.field.FieldValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
 import org.apache.commons.lang3.StringUtils;
 
@@ -18,9 +18,9 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         if (field.hasNonUniqueValue()) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("validation.nonunique"));
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("validation.nonunique"));
         }
         List<? extends ValidatableField> allGeoboxFields = field.getParent()
                 .map(ValidatableField::getChildren)
@@ -28,7 +28,7 @@ public ValidationResult validate(ValidatableField field, Map<String, Object> par
 
         return allGeoboxFields.stream().allMatch(f -> StringUtils.isBlank(f.getSingleValue()))
                 || StringUtils.isNotBlank(field.getSingleValue())
-                ? ValidationResult.ok()
-                : ValidationResult.invalid(field, BundleUtil.getStringFromBundle("geobox.invalid.empty"));
+                ? FieldValidationResult.ok()
+                : FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("geobox.invalid.empty"));
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxLatitudeRelationValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxLatitudeRelationValidator.java
index 9deef31f02..2d7a6fca1a 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxLatitudeRelationValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxLatitudeRelationValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.validation.field.FieldValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -24,9 +24,9 @@ public String getName() {
      * correctly (i.e. value can be safely converted to a number).
      */
     @Override
-    public ValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         if (!(GeoboxFields.Y1.is(field) || GeoboxFields.Y2.is(field))) {
-            return ValidationResult.ok();
+            return FieldValidationResult.ok();
         }
         GeoboxFields otherCoord = GeoboxFields.Y1.is(field) ? GeoboxFields.Y2 : GeoboxFields.Y1;
         ValidatableField other = field.getParent()
@@ -38,12 +38,12 @@ public ValidationResult validate(ValidatableField field, Map<String, Object> par
                 .orElse(null);
         if (other == null || StringUtils.isBlank(other.getSingleValue()) || !NumberUtils.isParsable(other.getSingleValue())
                 || StringUtils.isBlank(field.getSingleValue())) {
-            return ValidationResult.ok();
+            return FieldValidationResult.ok();
         }
         BigDecimal y1 = new BigDecimal(otherCoord == GeoboxFields.Y2 ? field.getSingleValue() : other.getSingleValue());
         BigDecimal y2 = new BigDecimal(otherCoord == GeoboxFields.Y1 ? field.getSingleValue() : other.getSingleValue());
         return y1.compareTo(y2) <= 0
-                ? ValidationResult.ok()
-                : ValidationResult.invalid(field, BundleUtil.getStringFromBundle("geobox.invalid.latitude.relation"));
+                ? FieldValidationResult.ok()
+                : FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("geobox.invalid.latitude.relation"));
     }
 }
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxValueValidator.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxValueValidator.java
index 9a66a68a5a..b6996a1866 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxValueValidator.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxValueValidator.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.common.BundleUtil;
 import edu.harvard.iq.dataverse.validation.field.FieldValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -22,27 +22,27 @@ public String getName() {
     }
 
     @Override
-    public ValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+    public FieldValidationResult validate(ValidatableField field, Map<String, Object> params, Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
         if (field.hasNonUniqueValue()) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("validation.nonunique"));
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("validation.nonunique"));
         }
         String value = field.getSingleValue();
         if (StringUtils.isBlank(value)) {
-            return ValidationResult.ok();
+            return FieldValidationResult.ok();
         }
         if (!NumberUtils.isParsable(value)) {
-            return ValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidNumber",
+            return FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("isNotValidNumber",
                     field.getDatasetFieldType().getDisplayName()));
         }
         BigDecimal number = new BigDecimal(value);
         if (GeoboxFields.X1.is(field) || GeoboxFields.X2.is(field)) {
             return number.abs().compareTo(MAX_LONGITUDE) <= 0
-                    ? ValidationResult.ok()
-                    : ValidationResult.invalid(field, BundleUtil.getStringFromBundle("geobox.invalid.longitude"));
+                    ? FieldValidationResult.ok()
+                    : FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("geobox.invalid.longitude"));
         } else {
             return number.abs().compareTo(MAX_LATITUDE) <= 0
-                    ? ValidationResult.ok()
-                    : ValidationResult.invalid(field, BundleUtil.getStringFromBundle("geobox.invalid.latitude"));
+                    ? FieldValidationResult.ok()
+                    : FieldValidationResult.invalid(field, BundleUtil.getStringFromBundle("geobox.invalid.latitude"));
         }
     }
 }
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/OrcidValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/OrcidValidatorTest.java
index ae77a7c19c..6f5ba2a4b5 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/OrcidValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/OrcidValidatorTest.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.validation;
 
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/RorValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/RorValidatorTest.java
index 6518509c10..56d78e8472 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/RorValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/RorValidatorTest.java
@@ -1,6 +1,5 @@
 package edu.harvard.iq.dataverse.validation;
 
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/DatasetFieldValidationDispatcherTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/DatasetFieldValidationDispatcherTest.java
index 2c6c04e1e2..e83cb47e5d 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/DatasetFieldValidationDispatcherTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/DatasetFieldValidationDispatcherTest.java
@@ -41,9 +41,9 @@ public String getName() {
         }
 
         @Override
-        public ValidationResult validate(ValidatableField field, Map<String, Object> params,
-                                         Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
-            return ValidationResult.invalid(field, "message");
+        public FieldValidationResult validate(ValidatableField field, Map<String, Object> params,
+                                              Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+            return FieldValidationResult.invalid(field, "message");
         }
     };
 
@@ -78,10 +78,10 @@ void executeValidations() {
         datasetField.setValue("44.5");
 
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
-        assertThat(results).extracting(ValidationResult::isOk).containsExactly(false);
+        assertThat(results).extracting(FieldValidationResult::isOk).containsExactly(false);
     }
 
     @Test
@@ -92,7 +92,7 @@ void executeValidations__ok() {
         datasetField.setValue("1024");
 
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
         assertThat(results).isEmpty();
@@ -106,11 +106,11 @@ void executeValidations__chain() {
                 "{\"name\":\"standard_input\",\"parameters\":{\"format\":\"[0-9]\"}}]");
         datasetField.setValue("44");
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
         assertThat(results)
-                .extracting(ValidationResult::getMessage, ValidationResult::isOk)
+                .extracting(FieldValidationResult::getMessage, FieldValidationResult::isOk)
                 .containsExactly(tuple("testField is not a valid entry.", false));
     }
 
@@ -124,11 +124,11 @@ void executeValidations_context() {
         datasetField.setValue("abc");
 
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
         assertThat(results)
-                .extracting(ValidationResult::getMessage, ValidationResult::isOk)
+                .extracting(FieldValidationResult::getMessage, FieldValidationResult::isOk)
                 .containsExactly(tuple("testField is not a valid entry.", false));
     }
 
@@ -138,11 +138,11 @@ void executeValidations__emptyRequiredField() {
         datasetFieldType.setRequired(true);
 
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
         assertThat(results)
-                .extracting(ValidationResult::getMessage, ValidationResult::isOk)
+                .extracting(FieldValidationResult::getMessage, FieldValidationResult::isOk)
                 .containsExactly(tuple("testField is required.", false));
     }
 
@@ -154,7 +154,7 @@ void executeValidations__nonEmptyRequired() {
         datasetFieldType.setValidation("[]");
 
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
         assertThat(results).isEmpty();
@@ -172,7 +172,7 @@ void executeValidations__NAValue(String value) {
         datasetFieldType.setValidation("[{\"name\":\"failing_validator\"}]");
 
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
         assertThat(results).isEmpty();
@@ -190,11 +190,11 @@ void executeValidations__NAValue_runOnEmpty(String value) {
         datasetFieldType.setValidation("[{\"name\":\"failing_validator\", \"parameters\":{\"runOnEmpty\":\"true\"}}]");
 
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
         assertThat(results)
-                .extracting(ValidationResult::isOk, ValidationResult::getField)
+                .extracting(FieldValidationResult::isOk, FieldValidationResult::getField)
                 .containsExactly(tuple(false, datasetField));
     }
 
@@ -207,7 +207,7 @@ void templatesBypassesValidation() {
         datasetField.setTemplate(new Template());
 
         // when
-        List<ValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
+        List<FieldValidationResult> results = dispatcher.init(Collections.singletonList(datasetField)).executeValidations();
 
         // then
         assertThat(results).isEmpty();
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/SearchFormValidationDispatcherTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/SearchFormValidationDispatcherTest.java
index e330665bcb..741b99c820 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/SearchFormValidationDispatcherTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/SearchFormValidationDispatcherTest.java
@@ -41,9 +41,9 @@ public String getName() {
         }
 
         @Override
-        public ValidationResult validate(ValidatableField field, Map<String, Object> params,
-                                         Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
-            return ValidationResult.invalid(field, "message");
+        public FieldValidationResult validate(ValidatableField field, Map<String, Object> params,
+                                              Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+            return FieldValidationResult.invalid(field, "message");
         }
     };
 
@@ -70,10 +70,10 @@ void executeValidations() {
         field.setValues("44.5", "44");
 
         // when
-        List<ValidationResult> results = initDispatcher().executeValidations();
+        List<FieldValidationResult> results = initDispatcher().executeValidations();
 
         // then
-        assertThat(results).extracting(ValidationResult::isOk).containsExactly(false);
+        assertThat(results).extracting(FieldValidationResult::isOk).containsExactly(false);
     }
 
     @Test
@@ -84,7 +84,7 @@ void executeValidations__ok() {
         field.setValues("1024", "2048");
 
         // when
-        List<ValidationResult> results = initDispatcher().executeValidations();
+        List<FieldValidationResult> results = initDispatcher().executeValidations();
 
         // then
         assertThat(results).isEmpty();
@@ -98,11 +98,11 @@ void executeValidations__chain() {
                 "{\"name\":\"standard_input\",\"parameters\":{\"format\":\"[0-9]\"}}]");
         field.setValues("44", "321", "123535");
         // when
-        List<ValidationResult> results = initDispatcher().executeValidations();
+        List<FieldValidationResult> results = initDispatcher().executeValidations();
 
         // then
         assertThat(results)
-                .extracting(ValidationResult::getMessage, ValidationResult::isOk)
+                .extracting(FieldValidationResult::getMessage, FieldValidationResult::isOk)
                 .containsExactly(tuple("testField is not a valid entry.", false));
     }
 
@@ -116,11 +116,11 @@ void executeValidations_context() {
         field.setValues("abc");
 
         // when
-        List<ValidationResult> results = initDispatcher().executeValidations();
+        List<FieldValidationResult> results = initDispatcher().executeValidations();
 
         // then
         assertThat(results)
-                .extracting(ValidationResult::getMessage, ValidationResult::isOk)
+                .extracting(FieldValidationResult::getMessage, FieldValidationResult::isOk)
                 .containsExactly(tuple("testField is not a valid entry.", false));
     }
 
@@ -136,7 +136,7 @@ void executeValidations__NAValue(String value) {
         datasetFieldType.setValidation("[{\"name\":\"failing_validator\"}]");
 
         // when
-        List<ValidationResult> results = initDispatcher().executeValidations();
+        List<FieldValidationResult> results = initDispatcher().executeValidations();
 
         // then
         assertThat(results).isEmpty();
@@ -154,11 +154,11 @@ void executeValidations__NAValue_runOnEmpty(String value) {
         datasetFieldType.setValidation("[{\"name\":\"failing_validator\", \"parameters\":{\"runOnEmpty\":\"true\"}}]");
 
         // when
-        List<ValidationResult> results = initDispatcher().executeValidations();
+        List<FieldValidationResult> results = initDispatcher().executeValidations();
 
         // then
         assertThat(results)
-                .extracting(ValidationResult::isOk, ValidationResult::getField)
+                .extracting(FieldValidationResult::isOk, FieldValidationResult::getField)
                 .containsExactly(tuple(false, field));
     }
 
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/DateRangeValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/DateRangeValidatorTest.java
index ed46642eca..f1afc54568 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/DateRangeValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/DateRangeValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.search.advanced.field.SearchField;
 import edu.harvard.iq.dataverse.search.advanced.query.QueryPart;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -47,7 +47,7 @@ void validate(String from, String to, boolean expected) {
         };
 
         // when
-        ValidationResult result = validator.validate(field, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validate(field, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isEqualTo(expected);
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/MultiValueValidatorBaseTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/MultiValueValidatorBaseTest.java
index 85f35534bc..341d4aa11f 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/MultiValueValidatorBaseTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/MultiValueValidatorBaseTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
 import edu.harvard.iq.dataverse.persistence.dataset.ValidatableField;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import io.vavr.control.Option;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -19,11 +19,11 @@ class MultiValueValidatorBaseTest {
 
     private MultiValueValidatorBase validator = new MultiValueValidatorBase() {
         @Override
-        public ValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
-                                              Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
+        public FieldValidationResult validateValue(String value, ValidatableField field, Map<String, Object> params,
+                                                   Map<String, ? extends List<? extends ValidatableField>> fieldIndex) {
             return !"INVALID".equals(value)
-                    ? ValidationResult.ok()
-                    : ValidationResult.invalid(field, "Invalid value");
+                    ? FieldValidationResult.ok()
+                    : FieldValidationResult.invalid(field, "Invalid value");
         }
 
         @Override
@@ -49,7 +49,7 @@ void validate(String l1, String l2, String l3, boolean expected) {
         TestField field = new TestField(l1, l2, l3);
 
         // when
-        ValidationResult result = validator.validate(field, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validate(field, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isEqualTo(expected);
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidatorTest.java
index db7773f7d8..f24a1717cb 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/RorFieldValidatorTest.java
@@ -3,7 +3,7 @@
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
 import edu.harvard.iq.dataverse.validation.RorValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;
@@ -33,10 +33,10 @@ public void validateValue() {
         datasetField.setValue(ror);
         datasetField.getDatasetFieldType().setName("ror");
 
-        when(rorValidator.validate(ror)).thenReturn(ValidationResult.ok());
+        when(rorValidator.validate(ror)).thenReturn(FieldValidationResult.ok());
 
         // when
-        ValidationResult result = validator.validateValue(ror, datasetField, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validateValue(ror, datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isTrue();
@@ -53,10 +53,10 @@ public void validateValue__invalid() {
         datasetField.setValue(ror);
         datasetField.getDatasetFieldType().setName("ror");
 
-        when(rorValidator.validate(ror)).thenReturn(ValidationResult.invalid("INVALID_ROR"));
+        when(rorValidator.validate(ror)).thenReturn(FieldValidationResult.invalid("INVALID_ROR"));
 
         // when
-        ValidationResult result = validator.validateValue(ror, datasetField, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validateValue(ror, datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isFalse();
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardDateValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardDateValidatorTest.java
index 57ad00f36c..647fb367da 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardDateValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardDateValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -43,7 +43,7 @@ void validate(String value, boolean expectedResult) {
         datasetField.setValue(value);
 
         // when
-        ValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isEqualTo(expectedResult);
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardEmailValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardEmailValidatorTest.java
index bd23a690cd..b220283ae7 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardEmailValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardEmailValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -28,7 +28,7 @@ void validate(String value, boolean expectedResult) {
         datasetField.setValue(value);
 
         // when
-        ValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isEqualTo(expectedResult);
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardInputValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardInputValidatorTest.java
index 8beb913863..158ab431d7 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardInputValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardInputValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
@@ -28,7 +28,7 @@ void validate(String value, String format, boolean expectedResult) {
         datasetField.setValue(value);
 
         // when
-        ValidationResult result =
+        FieldValidationResult result =
                 validator.validate(datasetField,
                         StringUtils.isNotBlank(format)
                                 ? Collections.singletonMap("format", format)
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardIntegerValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardIntegerValidatorTest.java
index 83316292bf..19e8680c11 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardIntegerValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardIntegerValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -27,7 +27,7 @@ void validate(String value, boolean expectedResult) {
         datasetField.setValue(value);
 
         // when
-        ValidationResult result =
+        FieldValidationResult result =
                 validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardNumberValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardNumberValidatorTest.java
index ddbf9fe849..17cbbd627e 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardNumberValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardNumberValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -27,7 +27,7 @@ void validate(String value, boolean expectedResult) {
         datasetField.setValue(value);
 
         // when
-        ValidationResult result =
+        FieldValidationResult result =
                 validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardUrlValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardUrlValidatorTest.java
index 9a76d95590..41764ceaa6 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardUrlValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/StandardUrlValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetFieldType;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -25,7 +25,7 @@ void validate(String value, boolean expectedResult) {
         datasetField.setValue(value);
 
         // when
-        ValidationResult result =
+        FieldValidationResult result =
                 validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxComponentValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxComponentValidatorTest.java
index af97aa7393..5881806abb 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxComponentValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxComponentValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.validation.field.FieldValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -43,7 +43,7 @@ void validate(String x1, String y1, String x2, String y2, boolean expX1, boolean
             DatasetField datasetField = geoboxUtil.selectFromGeobox(components[i], geobox);
 
             // when
-            ValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
+            FieldValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
 
             // then
             assertThat(result.isOk()).isEqualTo(expected[i]);
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxFillValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxFillValidatorTest.java
index d385f954e8..a0f6e10c44 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxFillValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxFillValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.validation.field.FieldValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -31,7 +31,7 @@ void validate(String x1, String y1, String x2, String y2, boolean expected) {
         DatasetField fieldX1 = geoboxUtil.selectFromGeobox(GeoboxFields.X1, geoboxUtil.buildGeobox(x1, y1, x2, y2));
 
         // when
-        ValidationResult result = validator.validate(fieldX1, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validate(fieldX1, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isEqualTo(expected);
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxLatitudeRelationValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxLatitudeRelationValidatorTest.java
index 9ffe569cdd..8faedcb025 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxLatitudeRelationValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxLatitudeRelationValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.validation.field.FieldValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -42,7 +42,7 @@ void validate(GeoboxFields field, String y1, String y2, boolean expected) {
         DatasetField datasetField = geoboxUtil.selectFromGeobox(field, geoboxUtil.buildGeobox("1", y1, "1", y2));
 
         // when
-        ValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isEqualTo(expected);
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxValueValidatorTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxValueValidatorTest.java
index 6157d532ea..601860a0e3 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxValueValidatorTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/validation/field/validators/geobox/GeoboxValueValidatorTest.java
@@ -2,7 +2,7 @@
 
 import edu.harvard.iq.dataverse.persistence.dataset.DatasetField;
 import edu.harvard.iq.dataverse.validation.field.FieldValidator;
-import edu.harvard.iq.dataverse.validation.field.ValidationResult;
+import edu.harvard.iq.dataverse.validation.field.FieldValidationResult;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -40,7 +40,7 @@ void validate(GeoboxFields field, String value, boolean expected) {
         DatasetField datasetField = geoboxUtil.buildSingle(field, value);
 
         // when
-        ValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
+        FieldValidationResult result = validator.validate(datasetField, Collections.emptyMap(), Collections.emptyMap());
 
         // then
         assertThat(result.isOk()).isEqualTo(expected);

From c482a8a44b4d5f2c8505a04846129a5e49ffd0ed Mon Sep 17 00:00:00 2001
From: Filipe Dias Lewandowski <diasf@users.noreply.github.com>
Date: Thu, 18 Apr 2024 10:30:14 +0200
Subject: [PATCH 3/3] Closes #2444: Fill author ORCID and ROR citation fields
 from user profile (#2453)

* Closes #2444: Fill author ORCID and ROR citation fields from user profile

* review comments
---
 .../dataverse/persistence/user/AuthenticatedUser.java  |  6 ------
 .../providers/oauth2/impl/OrcidOAuth2AP.java           |  1 +
 .../iq/dataverse/dataset/UserDataFieldFiller.java      |  6 +++++-
 .../iq/dataverse/dataset/UserDataFieldFillerTest.java  | 10 ++++++----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java
index 94a7e63f70..962faf462e 100644
--- a/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java
+++ b/dataverse-persistence/src/main/java/edu/harvard/iq/dataverse/persistence/user/AuthenticatedUser.java
@@ -264,12 +264,6 @@ public String getSortByString() {
         return String.format("%s %s %s", getLastName(), getFirstName(), getUserIdentifier());
     }
 
-    public String getOrcidId() {
-        String authProviderId = getAuthenticatedUserLookup().getAuthenticationProviderId();
-        return AuthenticatedUserLookup.ORCID_PROVIDER_ID_PRODUCTION.equals(authProviderId)
-                ? getAuthenticatedUserLookup().getPersistentUserId() : null;
-    }
-
     // -------------------- SETTERS --------------------
 
     public void setDatasetLocks(List<DatasetLock> datasetLocks) {
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
index d5e2a1baa7..e86798de37 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/impl/OrcidOAuth2AP.java
@@ -108,6 +108,7 @@ public ExternalIdpUserRecord getUserRecord(String code, String state, String red
             AuthenticatedUserDisplayInfo orgData = getOrganizationalData(userEndpoint, accessToken.getAccessToken(), service);
             parsed.displayInfo.setAffiliation(orgData.getAffiliation());
             parsed.displayInfo.setPosition(orgData.getPosition());
+            parsed.displayInfo.setOrcid(orcidNumber);
 
             return new ExternalIdpUserRecord(getId(), orcidNumber,
                                         parsed.username,
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/UserDataFieldFiller.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/UserDataFieldFiller.java
index a6cee4c8a7..341c1ebb4a 100644
--- a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/UserDataFieldFiller.java
+++ b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/dataset/UserDataFieldFiller.java
@@ -36,8 +36,9 @@ public void fillUserDataInDatasetFields(List<DatasetField> datasetFields, Authen
 
         String userFullName = user.getLastName() + ", " + user.getFirstName();
         String userAffiliation = user.getAffiliation();
+        String userAffiliationROR = user.getAffiliationROR();
         String userEmail = user.getEmail();
-        String userOrcidId = user.getOrcidId();
+        String userOrcidId = user.getOrcid();
         String todayDate = LocalDate.now(clock).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
 
         for (DatasetField dsf : datasetFields) {
@@ -70,6 +71,9 @@ public void fillUserDataInDatasetFields(List<DatasetField> datasetFields, Authen
                         if (subField.getTypeName().equals(DatasetFieldConstant.authorAffiliation)) {
                             subField.setFieldValue(userAffiliation);
                         }
+                        if (subField.getTypeName().equals(DatasetFieldConstant.authorAffiliationIdentifier)) {
+                            subField.setFieldValue(userAffiliationROR);
+                        }
                         if (userOrcidId != null) {
                             if (subField.getTypeName().equals(DatasetFieldConstant.authorIdValue)) {
                                 subField.setFieldValue(userOrcidId);
diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/dataset/UserDataFieldFillerTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/dataset/UserDataFieldFillerTest.java
index b34da00d34..05625e1191 100644
--- a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/dataset/UserDataFieldFillerTest.java
+++ b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/dataset/UserDataFieldFillerTest.java
@@ -189,10 +189,11 @@ public void fillUserDataInDatasetFields__FILL_AUTHOR() {
     }
     
     @Test
-    public void fillUserDataInDatasetFields__FILL_AUTHOR_WITH_ORCID() {
+    public void fillUserDataInDatasetFields__FILL_AUTHOR_WITH_ORCID_AND_ROR() {
         // given
-        user.setAuthenticatedUserLookup(new AuthenticatedUserLookup("orcid_id", "orcid"));
-        
+        user.setOrcid("0000-0001-2345-6789");
+        user.setAffiliationROR("https://ror.org/04k0tth05");
+
         DatasetFieldType authorIdTypeDatasetFieldType = new DatasetFieldType(DatasetFieldConstant.authorIdType, FieldType.TEXT, false);
         Mockito.when(fieldService.findByName(DatasetFieldConstant.authorIdType)).thenReturn(authorIdTypeDatasetFieldType);
         
@@ -209,6 +210,7 @@ public void fillUserDataInDatasetFields__FILL_AUTHOR_WITH_ORCID() {
         authorType.getChildDatasetFieldTypes().addAll(Lists.newArrayList(
                 new DatasetFieldType(DatasetFieldConstant.authorName, FieldType.TEXT, false),
                 new DatasetFieldType(DatasetFieldConstant.authorAffiliation, FieldType.TEXT, false),
+                new DatasetFieldType(DatasetFieldConstant.authorAffiliationIdentifier, FieldType.TEXT, false),
                 new DatasetFieldType(DatasetFieldConstant.authorIdValue, FieldType.TEXT, false),
                 authorIdType
                 ));
@@ -222,7 +224,7 @@ public void fillUserDataInDatasetFields__FILL_AUTHOR_WITH_ORCID() {
         
         // then
         assertEquals(1, datasetFields.size());
-        assertEquals("Doe, John; Aff; orcid_id; ORCID", datasetFields.get(0).getCompoundRawValue());
+        assertEquals("Doe, John; Aff; https://ror.org/04k0tth05; 0000-0001-2345-6789; ORCID", datasetFields.get(0).getCompoundRawValue());
     }
     
     @Test