From c28a70d8290817d185a552d01e4c90e6e81350ca Mon Sep 17 00:00:00 2001 From: Josh Holland Date: Tue, 14 Jan 2025 16:56:22 +0000 Subject: [PATCH] ResponsibleParty: fix up regular expressions --- .../uk/ac/ceh/gateway/catalogue/model/ResponsibleParty.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/src/main/java/uk/ac/ceh/gateway/catalogue/model/ResponsibleParty.java b/java/src/main/java/uk/ac/ceh/gateway/catalogue/model/ResponsibleParty.java index 904106e39..fddcee06f 100644 --- a/java/src/main/java/uk/ac/ceh/gateway/catalogue/model/ResponsibleParty.java +++ b/java/src/main/java/uk/ac/ceh/gateway/catalogue/model/ResponsibleParty.java @@ -40,17 +40,17 @@ private ResponsibleParty( @JsonIgnore public boolean isOrcid() { - return nameIdentifier.matches("^http(|s)://orcid.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$"); + return nameIdentifier.matches("^https?://orcid\\.org/\\d{4}-\\d{4}-\\d{4}-\\d{3}(X|\\d)$"); } @JsonIgnore public boolean isIsni() { - return nameIdentifier.matches("^https://isni.org/isni/\\d{15}(X|\\d)$"); + return nameIdentifier.matches("^https://isni\\.org/isni/\\d{15}(X|\\d)$"); } @JsonIgnore public boolean isRor() { - return organisationIdentifier.matches("^https://ror.org/\\w{8,10}$"); + return organisationIdentifier.matches("^https://ror\\.org/\\w{8,10}$"); } public String getRoleDisplayName() {