From 74738731503dee46a533f20903b0c563ceb5d0f1 Mon Sep 17 00:00:00 2001 From: Jayanthy Chengan Date: Mon, 25 Jun 2018 13:25:04 -0400 Subject: [PATCH 1/2] Moved English strings to ValidationMessages.properties --- .../edu/harvard/iq/dataverse/CustomQuestion.java | 2 +- .../harvard/iq/dataverse/CustomQuestionValue.java | 2 +- .../java/edu/harvard/iq/dataverse/DataFile.java | 2 +- .../java/edu/harvard/iq/dataverse/Dataverse.java | 12 ++++++------ .../edu/harvard/iq/dataverse/DataverseContact.java | 4 ++-- .../edu/harvard/iq/dataverse/FileMetadata.java | 6 +++--- .../java/edu/harvard/iq/dataverse/Guestbook.java | 2 +- .../edu/harvard/iq/dataverse/MapLayerMetadata.java | 10 +++++----- .../java/edu/harvard/iq/dataverse/Template.java | 4 ++-- .../AuthenticatedUserDisplayInfo.java | 4 ++-- .../iq/dataverse/authorization/DataverseRole.java | 8 ++++---- .../groups/impl/explicit/ExplicitGroup.java | 2 +- .../providers/builtin/BuiltinUser.java | 14 +++++++------- .../providers/builtin/DataverseUserPage.java | 4 ++-- .../providers/oauth2/OAuth2FirstLoginPage.java | 6 +++--- .../authorization/users/AuthenticatedUser.java | 6 +++--- .../dataverse/harvest/client/HarvestingClient.java | 8 ++++---- .../iq/dataverse/harvest/server/OAISet.java | 6 +++--- .../dataverse/passwordreset/PasswordResetPage.java | 4 ++-- 19 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/main/java/edu/harvard/iq/dataverse/CustomQuestion.java b/src/main/java/edu/harvard/iq/dataverse/CustomQuestion.java index eceb22027d8..64723fff79a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/CustomQuestion.java +++ b/src/main/java/edu/harvard/iq/dataverse/CustomQuestion.java @@ -40,7 +40,7 @@ public void setId(Long id) { @Column( nullable = false ) private String questionType; - @NotBlank(message = "Please enter question text.") + @NotBlank(message = "{custom.questiontext}") @Column( nullable = false ) private String questionString; private boolean required; diff --git a/src/main/java/edu/harvard/iq/dataverse/CustomQuestionValue.java b/src/main/java/edu/harvard/iq/dataverse/CustomQuestionValue.java index 8fc826019e4..a5329c8b96d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/CustomQuestionValue.java +++ b/src/main/java/edu/harvard/iq/dataverse/CustomQuestionValue.java @@ -16,7 +16,7 @@ public class CustomQuestionValue implements Serializable { private Long id; @Column( nullable = false ) - @NotBlank(message = "Please enter a response.") + @NotBlank(message = "{custom.response}") private String valueString; private int displayOrder; diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java index d3b5a35c643..db373fae41f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java @@ -79,7 +79,7 @@ public class DataFile extends DvObject implements Comparable { @Expose @NotBlank @Column( nullable = false ) - @Pattern(regexp = "^.*/.*$", message = "Content-Type must contain a slash") + @Pattern(regexp = "^.*/.*$", message = "{contenttype.slash}") private String contentType; diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java index df656bb61b1..59b58c1dc7c 100644 --- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java +++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java @@ -65,25 +65,25 @@ public enum DataverseType { private static final long serialVersionUID = 1L; - @NotBlank(message = "Please enter a name.") + @NotBlank(message = "{dataverse.name}") @Column( nullable = false ) private String name; /** * @todo add @Column(nullable = false) for the database to enforce non-null */ - @NotBlank(message = "Please enter an alias.") + @NotBlank(message = "{dataverse.alias}") @Column(nullable = false, unique=true) - @Size(max = 60, message = "Alias must be at most 60 characters.") - @Pattern.List({@Pattern(regexp = "[a-zA-Z0-9\\_\\-]*", message = "Found an illegal character(s). Valid characters are a-Z, 0-9, '_', and '-'."), - @Pattern(regexp=".*\\D.*", message="Alias should not be a number")}) + @Size(max = 60, message = "{dataverse.aliasLength}") + @Pattern.List({@Pattern(regexp = "[a-zA-Z0-9\\_\\-]*", message = "{dataverse.nameIllegalCharacters}"), + @Pattern(regexp=".*\\D.*", message="{dataverse.aliasNotnumber}")}) private String alias; @Column(name = "description", columnDefinition = "TEXT") private String description; @Enumerated(EnumType.STRING) - @NotNull(message = "Please select a category for your dataverse.") + @NotNull(message = "{dataverse.category}") @Column( nullable = false ) private DataverseType dataverseType; diff --git a/src/main/java/edu/harvard/iq/dataverse/DataverseContact.java b/src/main/java/edu/harvard/iq/dataverse/DataverseContact.java index 52b0405da6e..d19f20d5ebd 100644 --- a/src/main/java/edu/harvard/iq/dataverse/DataverseContact.java +++ b/src/main/java/edu/harvard/iq/dataverse/DataverseContact.java @@ -59,8 +59,8 @@ public void setId(Long id) { @JoinColumn(name = "dataverse_id") private Dataverse dataverse; - @NotBlank(message = "Please enter a valid email address.") - @ValidateEmail(message = "Please enter a valid email address.") + @NotBlank(message = "{user.invalidEmail}") + @ValidateEmail(message = "{user.invalidEmail}") @Column( nullable = false ) private String contactEmail; private int displayOrder; diff --git a/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java b/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java index 0a125422745..b1c09cdcf04 100644 --- a/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java +++ b/src/main/java/edu/harvard/iq/dataverse/FileMetadata.java @@ -52,13 +52,13 @@ public class FileMetadata implements Serializable { @Expose @Pattern(regexp="^[^:<>;#/\"\\*\\|\\?\\\\]*$", - message = "File Name cannot contain any of the following characters: \\ / : * ? \" < > | ; # .") - @NotBlank(message = "Please specify a file name.") + message = "{filename.illegalCharacters}") + @NotBlank(message = "{filename.blank}") @Column( nullable=false ) private String label = ""; @Pattern(regexp="|[^/\\\\]|^[^/\\\\]+.*[^/\\\\]+$", - message = "Directory Name cannot contain leading or trailing file separators.") + message = "{directoryname.illegalCharacters}") @Expose @Column ( nullable=true ) private String directoryLabel; diff --git a/src/main/java/edu/harvard/iq/dataverse/Guestbook.java b/src/main/java/edu/harvard/iq/dataverse/Guestbook.java index 61e621b7090..70ef13c1023 100644 --- a/src/main/java/edu/harvard/iq/dataverse/Guestbook.java +++ b/src/main/java/edu/harvard/iq/dataverse/Guestbook.java @@ -46,7 +46,7 @@ public class Guestbook implements Serializable { @OrderBy("displayOrder") private List customQuestions; - @NotBlank(message="Enter a name for the guestbook") + @NotBlank(message="{guestbook.name}") private String name; private boolean enabled; diff --git a/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadata.java b/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadata.java index 6b058438eab..a7dd4d9eef1 100644 --- a/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadata.java +++ b/src/main/java/edu/harvard/iq/dataverse/MapLayerMetadata.java @@ -64,23 +64,23 @@ public class MapLayerMetadata implements Serializable { private Dataset dataset; @Column(nullable=false) - @NotBlank(message = "Please specify a layer name.") + @NotBlank(message = "{map.layername}") private String layerName; @Column(nullable=false) - @NotBlank(message = "Please specify a layer link.") + @NotBlank(message = "{map.layerlink}") private String layerLink; @Column(nullable=false) - @NotBlank(message = "Please specify am embedded map link.") + @NotBlank(message = "{map.link}") private String embedMapLink; @Column(nullable=true) - @NotBlank(message = "Please specify a map image link.") + @NotBlank(message = "{map.imagelink}") private String mapImageLink; @Column(nullable=false) - @NotBlank(message = "Please specify a WorldMap username.") + @NotBlank(message = "{map.username}") private String worldmapUsername; diff --git a/src/main/java/edu/harvard/iq/dataverse/Template.java b/src/main/java/edu/harvard/iq/dataverse/Template.java index 500dff7ea42..05307d89ff6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/Template.java +++ b/src/main/java/edu/harvard/iq/dataverse/Template.java @@ -55,8 +55,8 @@ public Long getId() { return this.id; } - @NotBlank(message = "Please add in a name for the dataset template.") - @Size(max = 255, message = "Name must be at most 255 characters.") + @NotBlank(message = "{dataset.templatename}") + @Size(max = 255, message = "{dataset.nameLength}") @Column( nullable = false ) private String name; diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java index 909e124e5bd..0bd1a81048a 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticatedUserDisplayInfo.java @@ -9,9 +9,9 @@ */ public class AuthenticatedUserDisplayInfo extends RoleAssigneeDisplayInfo { - @NotBlank(message = "Please enter your last name.") + @NotBlank(message = "{user.lastName}") private String lastName; - @NotBlank(message = "Please enter your first name.") + @NotBlank(message = "{user.firstName}") private String firstName; private String position; diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java index 0f36898f0e2..501a0db6414 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/DataverseRole.java @@ -89,15 +89,15 @@ public static Set permissionSet( Iterable roles ) { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Pattern(regexp=".+", message="A Role must have a name.") + @Pattern(regexp=".+", message="{role.name}") @Column( nullable = false ) private String name; - @Size(max = 255, message = "Description must be at most 255 characters.") + @Size(max = 255, message = "{desc.maxLength}") private String description; - @Size(max = 16, message = "Alias must be at most 16 characters.") - @Pattern(regexp = "[a-zA-Z0-9\\_\\-]+", message = "Alias cannot be empty. Valid characters are a-Z, 0-9, '_', and '-'.") + @Size(max = 16, message = "{alias.maxLength}") + @Pattern(regexp = "[a-zA-Z0-9\\_\\-]+", message = "{alias.illegalCharacters}") @Column(nullable = false, unique=true) private String alias; diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java index 33a29971906..018689ec524 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroup.java @@ -117,7 +117,7 @@ public class ExplicitGroup implements Group, java.io.Serializable { /** Given alias of the group, e.g by the user that created it. Unique in the owner. */ @NotBlank - @Pattern(regexp = "[a-zA-Z0-9\\_\\-]*", message = "Found an illegal character(s). Valid characters are a-Z, 0-9, '_', and '-'.") + @Pattern(regexp = "[a-zA-Z0-9\\_\\-]*", message = "{dataverse.nameIllegalCharacters}") private String groupAliasInOwner; /** Alias of the group. Calculated from the group's name and its owner id. Unique in the table. */ diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUser.java index 05abdf11974..1a7611e6a88 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUser.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/BuiltinUser.java @@ -41,21 +41,21 @@ public class BuiltinUser implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @NotBlank(message = "Please enter a username.") - @Size(min=2, max=60, message ="Username must be between 2 and 60 characters.") - @ValidateUserName(message = "Found an illegal character(s). Valid characters are a-Z, 0-9, '_', '-', and '.'.") + @NotBlank(message = "{user.enterUsername}") + @Size(min=2, max=60, message = "{user.usernameLength}") + @ValidateUserName(message = "{user.illegalCharacters}") @Column(nullable = false, unique=true) private String userName; - @NotBlank(message = "Please enter a valid email address.") - @ValidateEmail(message = "Please enter a valid email address.") + @NotBlank(message = "{user.invalidEmail}") + @ValidateEmail(message = "{user.invalidEmail}") @Column(nullable = false, unique=true) private String email; - @NotBlank(message = "Please enter your first name.") + @NotBlank(message = "{user.firstName}") private String firstName; - @NotBlank(message = "Please enter your last name.") + @NotBlank(message = "{user.lastName}") private String lastName; private int passwordEncryptionVersion; diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java index df2db501035..7be59a93ba6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java @@ -124,10 +124,10 @@ public enum EditMode { private EditMode editMode; private String redirectPage = "dataverse.xhtml"; - @NotBlank(message = "The new password is blank: re-type it again.") + @NotBlank(message = "{password.retype}") private String inputPassword; - @NotBlank(message = "Please enter your current password.") + @NotBlank(message = "{password.current}") private String currentPassword; private Long dataverseId; private List notificationsList; diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java index 9ca92466465..c62ea481a7d 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2FirstLoginPage.java @@ -74,11 +74,11 @@ public class OAuth2FirstLoginPage implements java.io.Serializable { OAuth2UserRecord newUser; - @NotBlank(message = "Please enter your username.") + @NotBlank(message = "{oauth.username}") String username; - @NotBlank(message = "Please enter a valid email address.") - @ValidateEmail(message = "Please enter a valid email address.") + @NotBlank(message = "{user.invalidEmail}") + @ValidateEmail(message = "{user.invalidEmail}") String selectedEmail; String password; diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java b/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java index 447a7b5b5e0..2169a53b2df 100644 --- a/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java +++ b/src/main/java/edu/harvard/iq/dataverse/authorization/users/AuthenticatedUser.java @@ -82,17 +82,17 @@ public class AuthenticatedUser implements User, Serializable { @Column(nullable = false, unique=true) private String userIdentifier; - @ValidateEmail(message = "Please enter a valid email address.") + @ValidateEmail(message = "{user.invalidEmail}") @NotNull @Column(nullable = false, unique=true) private String email; private String affiliation; private String position; - @NotBlank(message = "Please enter your last name.") + @NotBlank(message = "{user.lastName}") private String lastName; - @NotBlank(message = "Please enter your first name.") + @NotBlank(message = "{user.firstName}") private String firstName; @Column(nullable = true) diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java index 12d3ebac6f3..b4ed7c3d32f 100644 --- a/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java +++ b/src/main/java/edu/harvard/iq/dataverse/harvest/client/HarvestingClient.java @@ -142,11 +142,11 @@ public void setHarvestedDatasets(List harvestedDatasets) { this.harvestedDatasets = harvestedDatasets; } - @NotBlank(message = "Please enter a nickname.") + @NotBlank(message = "{user.enterNickname}") @Column(nullable = false, unique=true) - @Size(max = 30, message = "Nickname must be at most 30 characters.") - @Pattern.List({@Pattern(regexp = "[a-zA-Z0-9\\_\\-]*", message = "Found an illegal character(s). Valid characters are a-Z, 0-9, '_', and '-'."), - @Pattern(regexp=".*\\D.*", message="Nickname should not be a number")}) + @Size(max = 30, message = "{user.nicknameLength}") + @Pattern.List({@Pattern(regexp = "[a-zA-Z0-9\\_\\-]*", message = "{dataverse.nameIllegalCharacters}"), + @Pattern(regexp=".*\\D.*", message="{user.nicknameNotnumber}")}) private String name; public String getName() { diff --git a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISet.java b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISet.java index f455f6a0efb..5f7350fb3d3 100644 --- a/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISet.java +++ b/src/main/java/edu/harvard/iq/dataverse/harvest/server/OAISet.java @@ -61,9 +61,9 @@ public void setId(Long id) { @Column(columnDefinition="TEXT") private String name; @Column(columnDefinition="TEXT", nullable = false, unique=true) - @Size(max = 30, message = "Setspec must be at most 30 characters.") - @Pattern.List({@Pattern(regexp = "[a-zA-Z0-9\\_\\-]*", message = "Found an illegal character(s). Valid characters are a-Z, 0-9, '_', and '-'."), - @Pattern(regexp=".*\\D.*", message="Setspec should not be a number")}) + @Size(max = 30, message = "{setspec.maxLength}") + @Pattern.List({@Pattern(regexp = "[a-zA-Z0-9\\_\\-]*", message = "{dataverse.nameIllegalCharacters}"), + @Pattern(regexp=".*\\D.*", message="{setspec.notNumber}")}) private String spec; @Column(columnDefinition="TEXT", nullable = false) diff --git a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java index a0b3ec437c2..82be0562ee6 100644 --- a/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java +++ b/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java @@ -71,8 +71,8 @@ public class PasswordResetPage implements java.io.Serializable { * The email address that is entered to initiate the password reset process. */ - @NotBlank(message = "Please enter a valid email address.") - @ValidateEmail(message = "Password reset page default email message.") + @NotBlank(message = "{user.invalidEmail}") + @ValidateEmail(message = "{password.validate}") String emailAddress; /** From ada7863c558c72cac241efe8bfe1ba7157f0e3b7 Mon Sep 17 00:00:00 2001 From: Jayanthy Chengan Date: Mon, 25 Jun 2018 13:32:28 -0400 Subject: [PATCH 2/2] added ValidationMessages.properties --- src/main/java/ValidationMessages.properties | 49 +++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 src/main/java/ValidationMessages.properties diff --git a/src/main/java/ValidationMessages.properties b/src/main/java/ValidationMessages.properties new file mode 100644 index 00000000000..59b2492dcd1 --- /dev/null +++ b/src/main/java/ValidationMessages.properties @@ -0,0 +1,49 @@ +user.firstName=Please enter your first name. +user.lastName=Please enter your last name. +user.invalidEmail=Please enter a valid email address. +user.enterUsername=Please enter a username. +user.usernameLength=Username must be between 2 and 60 characters. +user.illegalCharacters=Found an illegal character(s). Valid characters are a-Z, 0-9, '_', '-', and '.'." + +user.enterNickname=Please enter a nickname. +user.nicknameLength=Nickname must be at most 30 characters. +user.nicknameNotnumber=Nickname should not be a number + +dataset.templatename=Please add in a name for the dataset template. +dataset.nameLength=Name must be at most 255 characters. + +dataverse.name=Please enter a name. +dataverse.alias=Please enter an alias. +dataverse.aliasLength=Alias must be at most 60 characters. +dataverse.aliasNotnumber=Alias should not be a number +dataverse.nameIllegalCharacters=Found an illegal character(s). Valid characters are a-Z, 0-9, '_', and '-'. +dataverse.category=Please select a category for your dataverse. +contenttype.slash=Content-Type must contain a slash +setspec.notNumber=Setspec should not be a number +setspec.maxLength=Setspec must be at most 30 characters. + +role.name=A Role must have a name. +desc.maxLength=Description must be at most 255 characters. +alias.maxLength=Alias must be at most 16 characters. +alias.illegalCharacters=Alias cannot be empty. Valid characters are a-Z, 0-9, '_', and '-'. + +custom.response=Please enter a response. +custom.questiontext=Please enter question text. +filename.illegalCharacters=File Name cannot contain any of the following characters: \ / : * ? " < > | ; # . +directoryname.illegalCharacters=Directory Name cannot contain leading or trailing file separators. +filename.blank=Please specify a file name. + + +map.layername=Please specify a layer name. +map.layerlink=Please specify a layer link. +map.link=Please specify am embedded map link. +map.imagelink=Please specify a map image link. +map.username=Please specify a WorldMap username. + +oauth.username=Please enter your username. + +password.retype=The new password is blank: re-type it again. +password.current=Please enter your current password. +password.validate=Password reset page default email message. + +guestbook.name=Enter a name for the guestbook \ No newline at end of file