[direct-certificate-discovery-tool] push by Elizabet...@esacinc.com - - Updated Direct address validation... on 2014-05-22 15:39 GMT

[direct-certifica...@googlecode.com]

Revision: d68b07b58cc7
Branch: default
Author: Elizab...@esacinc.com
Date: Thu May 22 15:30:23 2014 UTC
Log: - Updated Direct address validation
- Updated Direct address error message displayed to the web front-end and
changed validation so only Direct addresses that are mail addresses are
accepted
http://code.google.com/p/direct-certificate-discovery-tool/source/detail?r=d68b07b58cc7

Modified:
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/mail/DirectAddress.java

/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/discovery/mail/DiscoveryTestcaseMailMappingJsonDto.java

/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/hosting/HostingTestcaseSubmissionJsonDto.java

/dcdt-core/src/main/resources/META-INF/core/core-messages-validation.properties

=======================================
--- /dcdt-core/src/main/java/gov/hhs/onc/dcdt/mail/DirectAddress.java Wed
May 21 19:44:24 2014 UTC
+++ /dcdt-core/src/main/java/gov/hhs/onc/dcdt/mail/DirectAddress.java Thu
May 22 15:30:23 2014 UTC
@@ -61,7 +61,7 @@
DirectAddress[] value();
}

- String message()
default "{dcdt.mail.validation.constraints.DirectAddress.msg} " +
ToolMailAddressUtils.PATTERN_STR_MAIL_ADDR_DIRECT;
+ String message()
default "{dcdt.mail.validation.constraints.DirectAddress.msg}";

Class<?>[] groups() default {};

=======================================
---
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/discovery/mail/DiscoveryTestcaseMailMappingJsonDto.java
Sun Apr 6 03:15:28 2014 UTC
+++
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/discovery/mail/DiscoveryTestcaseMailMappingJsonDto.java
Thu May 22 15:30:23 2014 UTC
@@ -12,7 +12,7 @@
@JsonSubTypes({ @Type(DiscoveryTestcaseMailMappingJsonDtoImpl.class) })
public interface DiscoveryTestcaseMailMappingJsonDto extends
ToolBeanJsonDto<DiscoveryTestcaseMailMapping> {
@HasMxRecord
- @MailAddress
+ @MailAddress(message
= "{dcdt.mail.validation.constraints.DirectAddress.msg}")
@JsonProperty("directAddr")
@Nullable
public String getDirectAddress();
=======================================
---
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/hosting/HostingTestcaseSubmissionJsonDto.java
Sat Apr 19 21:27:53 2014 UTC
+++
/dcdt-core/src/main/java/gov/hhs/onc/dcdt/testcases/hosting/HostingTestcaseSubmissionJsonDto.java
Thu May 22 15:30:23 2014 UTC
@@ -4,7 +4,7 @@
import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonSubTypes.Type;
import gov.hhs.onc.dcdt.beans.NamedBeanName;
-import gov.hhs.onc.dcdt.mail.DirectAddress;
+import gov.hhs.onc.dcdt.mail.DirectAddress.MailAddress;
import gov.hhs.onc.dcdt.mail.HasMxRecord;
import gov.hhs.onc.dcdt.testcases.ToolTestcaseSubmissionJsonDto;
import
gov.hhs.onc.dcdt.testcases.hosting.impl.HostingTestcaseSubmissionJsonDtoImpl;
@@ -12,7 +12,7 @@

@JsonSubTypes({ @Type(HostingTestcaseSubmissionJsonDtoImpl.class) })
public interface HostingTestcaseSubmissionJsonDto extends
ToolTestcaseSubmissionJsonDto<HostingTestcaseDescription, HostingTestcase,
HostingTestcaseSubmission> {
- @DirectAddress
+ @MailAddress(message
= "{dcdt.mail.validation.constraints.DirectAddress.msg}")
@HasMxRecord
@JsonProperty("directAddr")
@Nullable
=======================================
---
/dcdt-core/src/main/resources/META-INF/core/core-messages-validation.properties
Wed May 21 19:44:24 2014 UTC
+++
/dcdt-core/src/main/resources/META-INF/core/core-messages-validation.properties
Thu May 22 15:30:23 2014 UTC
@@ -32,9 +32,9 @@

#====================================================================================================
# MAIL

#====================================================================================================
-dcdt.mail.validation.constraints.DirectAddress.msg=Must be a Direct
address (domain-bound or address-bound). \
- A Direct address can only contain letters, numbers, hyphens, periods,
and underscores. \
- The regex matching pattern is:
+dcdt.mail.validation.constraints.DirectAddress.msg=Must be a valid Direct
address. \
+ DCDT allows letters, numbers, hyphens, periods, and underscores. \
+ For more information, please see the DCDT documentation.
dcdt.mail.validation.constraints.DirectAddress.MailAddress.msg=Must be an
email address.
dcdt.mail.validation.constraints.HasMxRecord.msg=No DNS MX records were
found for the email address domain.
dcdt.mail.validation.constraints.HasMxRecord.lookup.msg=DNS MX record
lookup failed for the email address domain.