hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r1763839 - in /httpcomponents/httpcore/trunk/httpcore5/src: main/java/org/apache/hc/core5/util/ test/java/org/apache/hc/core5/util/
Date Fri, 07 Oct 2016 21:28:54 GMT
Author: olegk
Date: Fri Oct  7 21:28:54 2016
New Revision: 1763839

URL: http://svn.apache.org/viewvc?rev=1763839&view=rev
Log:
Moved URLEncodedUtils, InetAddressUtils and URIBuilder from HttpClient

Added:
    httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java
  (contents, props changed)
      - copied, changed from r1763836, httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java
    httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java
  (contents, props changed)
      - copied, changed from r1763834, httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java
    httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java
  (contents, props changed)
      - copied, changed from r1763834, httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java
    httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java
  (contents, props changed)
      - copied, changed from r1763837, httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java
    httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java
  (contents, props changed)
      - copied, changed from r1763837, httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java
    httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java
  (contents, props changed)
      - copied, changed from r1763837, httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java

Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java
(from r1763836, httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java&p1=httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java&r1=1763836&r2=1763839&rev=1763839&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java
Fri Oct  7 21:28:54 2016
@@ -25,18 +25,15 @@
  *
  */
 
-package org.apache.hc.client5.http.utils;
+package org.apache.hc.core5.util;
 
 import java.util.regex.Pattern;
 
-import org.apache.hc.core5.annotation.Immutable;
-
 /**
  * A collection of utilities relating to InetAddresses.
  *
  * @since 4.0
  */
-@Immutable
 public class InetAddressUtils {
 
     private InetAddressUtils() {

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  7 21:28:54 2016
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/main/java/org/apache/hc/client5/http/utils/InetAddressUtils.java:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/InetAddressUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java
(from r1763834, httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java&p1=httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java&r1=1763834&r2=1763839&rev=1763839&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java
Fri Oct  7 21:28:54 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.utils;
+package org.apache.hc.core5.util;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -34,7 +34,6 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.hc.core5.annotation.NotThreadSafe;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 
@@ -43,7 +42,6 @@ import org.apache.hc.core5.http.message.
  *
  * @since 4.2
  */
-@NotThreadSafe
 public class URIBuilder {
 
     private String scheme;

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  7 21:28:54 2016
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URIBuilder.java:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URIBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java
(from r1763834, httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java&p1=httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java&r1=1763834&r2=1763839&rev=1763839&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java
Fri Oct  7 21:28:54 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.utils;
+package org.apache.hc.core5.util;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,22 +41,18 @@ import java.util.BitSet;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.hc.core5.annotation.Immutable;
 import org.apache.hc.core5.http.HttpEntity;
 import org.apache.hc.core5.http.NameValuePair;
 import org.apache.hc.core5.http.entity.ContentType;
 import org.apache.hc.core5.http.message.BasicNameValuePair;
 import org.apache.hc.core5.http.message.ParserCursor;
 import org.apache.hc.core5.http.message.TokenParser;
-import org.apache.hc.core5.util.Args;
-import org.apache.hc.core5.util.CharArrayBuffer;
 
 /**
  * A collection of utilities for encoding URLs.
  *
  * @since 4.0
  */
-@Immutable
 public class URLEncodedUtils {
 
     /**

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  7 21:28:54 2016
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/main/java/org/apache/hc/client5/http/utils/URLEncodedUtils.java:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/util/URLEncodedUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java
(from r1763837, httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java&p1=httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java&r1=1763837&r2=1763839&rev=1763839&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java
Fri Oct  7 21:28:54 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.utils;
+package org.apache.hc.core5.util;
 
 import org.junit.Assert;
 import org.junit.Test;

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  7 21:28:54 2016
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestInetAddressUtils.java:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestInetAddressUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java
(from r1763837, httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java&p1=httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java&r1=1763837&r2=1763839&rev=1763839&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java
Fri Oct  7 21:28:54 2016
@@ -24,7 +24,7 @@
  * <http://www.apache.org/>.
  *
  */
-package org.apache.hc.client5.http.utils;
+package org.apache.hc.core5.util;
 
 import java.net.URI;
 import java.net.URLEncoder;

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  7 21:28:54 2016
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURIBuilder.java:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURIBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java
(from r1763837, httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java?p2=httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java&p1=httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java&r1=1763837&r2=1763839&rev=1763839&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java
(original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java
Fri Oct  7 21:28:54 2016
@@ -25,7 +25,7 @@
  *
  */
 
-package org.apache.hc.client5.http.utils;
+package org.apache.hc.core5.util;
 
 import java.net.URI;
 import java.nio.charset.StandardCharsets;

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct  7 21:28:54 2016
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient5/src/test/java/org/apache/hc/client5/http/utils/TestURLEncodedUtils.java:1024348-1031454

Propchange: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/util/TestURLEncodedUtils.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message