WebSVN – javautils – Diff – /ViaThinkSoft Java Utils/src/de/viathinksoft/utils/mail/EMailAddress.java

 package de.viathinksoft.utils.mail;
 import java.net.IDN;
-import de.viathinksoft.utils.mail.syntaxchecker.MailSyntaxChecker;
 /**
+ *
  * This class parses an email address (trims whitespaces from it) and stores it
  * in its original form as well as store a RFC-compatible punycoded domainpart.
  * So, if you enter a Unicode-Mail-Address you can easily access the trimmed and
+         *
          * @param eMailAddress
          *            bare computer email address. e.g. roedyg@mindprod.com No
          *            "Roedy Green" <roedyg@mindprod.com> style addresses. No local
          *            addresses, e.g. roedy.
-         * @throws InvalidMailAddressException
          */
-        public EMailAddress(String eMailAddress) throws InvalidMailAddressException {
+        public EMailAddress(String eMailAddress) {
                 super();
-                if (eMailAddress == null) {
-                        throw new InvalidMailAddressException();
-                }
-                // Zuerst trimmen (z.B. für Formulardaten) Wir splitten dann beim
+                // Zuerst trimmen (z.B. für Formulardaten)
-                // At-Zeichen (@) und berücksichtigen ein escaped-At
-                // (\@)
-                String[] res = eMailAddress.trim().split("(?<!\\\\)@");
+                eMailAddress = eMailAddress.trim();
-                // @-sign was not used once
+                // Wir splitten dann beim At-Zeichen (@)
+                String localPart = "";
+                String domainPart = "";
+                int atIndex = eMailAddress.lastIndexOf('@');
-                if (res.length != 2) {
+                if (atIndex == -1) {
+                        localPart = eMailAddress;
+                        domainPart = "";
+                } else {
-                        throw new InvalidMailAddressException();
+                        localPart = eMailAddress.substring(0, atIndex);
+                        domainPart = eMailAddress.substring(atIndex + 1);
+                }
-                // Temporary we store the values here.
-                String localPart = res[0];
-                String domainPart = res[1];
                 // We parse the local part.
                 if (localPart == null)
                         localPart = "";
                 this.localPart = localPart;
+        }
         // Methods
         /**
-         * Returns the email address with punycoded domain name and TLD. You should use
+         * Returns the email address with punycoded domain name and TLD. You should
-         * this method to send emails.
+         * use this method to send emails.
+         *
          * @return The email address with punycoded domain name and TLD.
          */
         public String getMailAddressPunycodedDomain() {
+                if (this.domainPartPunycode.equals("")) {
+                        return this.localPart;
+                } else {
-                return this.localPart + "@" + this.domainPartPunycode;
+                        return this.localPart + "@" + this.domainPartPunycode;
+                }
+        }
         /**
          * Returns the email address with internationalized domain names and TLD.
+         *
          * @return The email address with internationalized domain name and TLD.
          */
         public String getMailAddressUnicode() {
+                if (this.domainPartUnicode.equals("")) {
+                        return this.localPart;
+                } else {
-                return this.localPart + "@" + this.domainPartUnicode;
+                        return this.localPart + "@" + this.domainPartUnicode;
+                }
+        }
         /**
          * Returns a string which represents the mail address. If the constant
          * USE_UNICODE_AS_STANDARD is true, the internationalized domain names will
          * not translated into the corresponding Punycode. If false, then not.
          * @return A new instance of the email address object with the same
          *         properties.
          */
         @Override
         protected EMailAddress clone() throws CloneNotSupportedException {
-                try {
-                        return new EMailAddress(this.toString());
+                return new EMailAddress(this.toString());
-                } catch (InvalidMailAddressException e) {
-                        return null;
-                }
-        }
-        /**
-         * Asks the mail syntax checker if the current mail address is valid or not.
-         * Warning! This check is NOT performed automatically. There is no guarantee
-         * that the syntax check is 100% correct. There might be mail address which
-         * are valid but marked as invalid (because server disobeyed RFC rules etc)
-         * and mail addresses which are invalid but marked valid (e.g. simply if
-         * they were not assigned).
-         *
-         * @return Boolean which represents if the mail address is valid or not.
-         */
-        public boolean isSyntaxValid() {
-                return MailSyntaxChecker.isMailValid(this);
+        }
         // ---------- STATIC FUNCTIONS ----------
         /**
          * @param str
          *            The string which should be checked
          * @return Boolean which shows if the string is not yet punicoded.
          */
         protected static boolean isUnicode(String str) {
-                if (str == null)
+                if (str == null) {
                         return false;
+                }
                 return (!IDN.toASCII(str).equals(str));
+        }
         /**
          * Determinates if a given string is in Punycode format.
          * @param str
          *            The string which should be checked
          * @return Boolean which shows if the string is punycoded or not.
          */
         protected static boolean isPunycode(String str) {
-                if (str == null)
+                if (str == null) {
                         return false;
+                }
                 return (!IDN.toUnicode(str).equals(str));
+        }
+}

Subversion Repositories javautils

javautils/ViaThinkSoft Java Utils/src/de/viathinksoft/utils/mail/EMailAddress.java – Rev 3 → 9