Fix #19: Check TLD length before checking for the - character

src/main/java/com/sanctionco/jmail/JMail.java

@@ -369,16 +369,16 @@ private static Optional<Email> internalTryParse(String email) {
     // Check that local-part does not end with '.'
     if (localPart.charAt(localPart.length() - 1) == '.') return Optional.empty();
 
+    // Ensure the TLD is not empty or greater than 63 chars
+    if (currentDomainPart.length() <= 0 || currentDomainPart.length() > 63) return Optional.empty();
+
     // Check that the final domain part does not start with '-'
     // We already checked to make sure it doesn't end with '-'
     if (currentDomainPart.charAt(0) == '-') return Optional.empty();
 
     // Ensure the last domain part (TLD) is not all numeric
     if (currentDomainPart.toString().chars().allMatch(Character::isDigit)) return Optional.empty();
 
-    // Ensure the TLD is not greater than 63 chars
-    if (currentDomainPart.length() > 63) return Optional.empty();
-
     domainParts.add(currentDomainPart.toString());
 
     return Optional.of(new Email(

src/test/java/com/sanctionco/jmail/helpers/AdditionalEmailProvider.java

@@ -28,7 +28,8 @@ public static Stream<String> provideInvalidWhitespaceEmails() {
         "\"test\rblah\"@test.org",
         "\"test\\\r\n blah\"@test.org",
         "Invalid \\\n Folding \\\n Whitespace@test.org",
-        "test.\r\n\r\n obs@syntax.com");
+        "test.\r\n\r\n obs@syntax.com",
+        "ABC.DEF@GHI.JKL . ");
   }
 
   // Valid emails with quotes

src/test/resources/invalid-addresses.csv

@@ -138,3 +138,4 @@ Joe A Smith email@example.com ;
 Joe A Smith <email@example.com-> ;                                                     The address part must be valid (cannot end with a dash)
 Joe A Smith <email@-example.com-> ;                                                    The address part must be valid (domain cannot start with a dash)
 Joe A Smith <email> ;                                                                  The address part must be valid (missing @ character and domain)
+ABC.DEF@GHI. (MNO) ;                                                                   The domain cannot end with the . character even with an ending comment

src/test/resources/valid-addresses.csv

@@ -122,3 +122,4 @@ abc\\@test.org,abc\\,test.org
 Joe A Smith <email@example.com>,email,example.com
 "John Michael" <tester@test.net>,tester,test.net
 A <apple@pie.com>,apple,pie.com
+ABC.DEF@GHI.JKL (MNO),ABC.DEF,GHI.JKL (MNO)