You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2014/08/27 19:11:19 UTC
svn commit: r1620942 - in /httpcomponents/httpclient/trunk/httpclient/src/main: java-deprecated/org/apache/http/client/utils/ java/org/apache/http/client/utils/ java/org/apache/http/impl/cookie/

Author: olegk
Date: Wed Aug 27 17:11:18 2014
New Revision: 1620942

URL: http://svn.apache.org/r1620942
Log:
Deprecated internal punycode implementation in favor of standard java.net.IDN

Added:
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Idn.java   (contents, props changed)
      - copied, changed from r1620941, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java   (contents, props changed)
      - copied, changed from r1620941, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java   (contents, props changed)
      - copied, changed from r1620941, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java   (contents, props changed)
      - copied, changed from r1620941, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
Removed:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Idn.java (from r1620941, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Idn.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Idn.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java&r1=1620941&r2=1620942&rev=1620942&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Idn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Idn.java Wed Aug 27 17:11:18 2014
@@ -29,8 +29,11 @@ package org.apache.http.client.utils;
 /**
  * Abstraction of international domain name (IDN) conversion.
  *
+ * @deprecated (4.4) use standard {@link java.net.IDN}.
+ *
  * @since 4.0
  */
+@Deprecated
 public interface Idn {
     /**
      * Converts a name from its punycode representation to Unicode.

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Idn.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Idn.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Idn.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java (from r1620941, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java&r1=1620941&r2=1620942&rev=1620942&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/JdkIdn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java Wed Aug 27 17:11:18 2014
@@ -34,9 +34,12 @@ import org.apache.http.annotation.Immuta
 /**
  * Uses the java.net.IDN class through reflection.
  *
+ * @deprecated (4.4) use standard {@link java.net.IDN}.
+ *
  * @since 4.0
  */
 @Immutable
+@Deprecated
 public class JdkIdn implements Idn {
     private final Method toUnicode;
 

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/JdkIdn.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java (from r1620941, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java&r1=1620941&r2=1620942&rev=1620942&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Punycode.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java Wed Aug 27 17:11:18 2014
@@ -32,9 +32,12 @@ import org.apache.http.annotation.Immuta
  * Facade that provides conversion between Unicode and Punycode domain names.
  * It will use an appropriate implementation.
  *
+ * @deprecated (4.4) use standard {@link java.net.IDN}.
+ *
  * @since 4.0
  */
 @Immutable
+@Deprecated
 public class Punycode {
     private static final Idn impl;
     static {

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Punycode.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java (from r1620941, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java&r1=1620941&r2=1620942&rev=1620942&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java Wed Aug 27 17:11:18 2014
@@ -33,9 +33,12 @@ import org.apache.http.annotation.Immuta
 /**
  * Implementation from pseudo code in RFC 3492.
  *
+ * @deprecated (4.4) use standard {@link java.net.IDN}.
+ *
  * @since 4.0
  */
 @Immutable
+@Deprecated
 public class Rfc3492Idn implements Idn {
     private static final int base = 36;
     private static final int tmin = 1;

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java-deprecated/org/apache/http/client/utils/Rfc3492Idn.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java?rev=1620942&r1=1620941&r2=1620942&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java Wed Aug 27 17:11:18 2014
@@ -26,11 +26,11 @@
  */
 package org.apache.http.impl.cookie;
 
+import java.net.IDN;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.http.client.utils.Punycode;
 import org.apache.http.cookie.Cookie;
 import org.apache.http.cookie.CookieAttributeHandler;
 import org.apache.http.cookie.CookieOrigin;
@@ -101,7 +101,7 @@ public class PublicSuffixFilter implemen
         if (domain.startsWith(".")) {
             domain = domain.substring(1);
         }
-        domain = Punycode.toUnicode(domain);
+        domain = IDN.toUnicode(domain);
 
         // An exception rule takes priority over any other matching rule.
         if (this.exceptions != null) {