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 2019/11/11 08:29:56 UTC
[httpcomponents-client] 01/01: HTTPCLIENT-2026: Fixed
URIBuilder#isOpaque() logic
This is an automated email from the ASF dual-hosted git repository.
olegk pushed a commit to branch HTTPCLIENT-2026
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git
commit 232ed81d560c95670eef32b0edf09c16f1eba0ea
Author: Oleg Kalnichevski <ol...@apache.org>
AuthorDate: Mon Nov 11 09:29:27 2019 +0100
HTTPCLIENT-2026: Fixed URIBuilder#isOpaque() logic
---
.../src/main/java/org/apache/http/client/utils/URIBuilder.java | 3 ++-
.../src/test/java/org/apache/http/client/utils/TestURIBuilder.java | 7 +++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
index b95ae4c..f7b6a92 100644
--- a/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
+++ b/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
@@ -34,6 +34,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+
import org.apache.http.Consts;
import org.apache.http.NameValuePair;
import org.apache.http.conn.util.InetAddressUtils;
@@ -497,7 +498,7 @@ public class URIBuilder {
* @since 4.3
*/
public boolean isOpaque() {
- return isPathEmpty();
+ return this.pathSegments == null && this.encodedPath == null;
}
public String getScheme() {
diff --git a/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java b/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java
index d9bdaa3..ac9b5b1 100644
--- a/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java
+++ b/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java
@@ -348,4 +348,11 @@ public class TestURIBuilder {
Assert.assertThat(uri, CoreMatchers.equalTo(URI.create("ftp:/blah")));
}
+ @Test
+ public void testOpaque() throws Exception {
+ final URIBuilder uriBuilder = new URIBuilder("http://host.com");
+ final URI uri = uriBuilder.build();
+ Assert.assertThat(uriBuilder.isOpaque(), CoreMatchers.equalTo(uri.isOpaque()));
+ }
+
}