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 2017/04/26 19:21:54 UTC
svn commit: r1792797 -
/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpHost.java
Author: olegk
Date: Wed Apr 26 19:21:54 2017
New Revision: 1792797
URL: http://svn.apache.org/viewvc?rev=1792797&view=rev
Log:
HttpHost to use URIScheme
Modified:
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpHost.java
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpHost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpHost.java?rev=1792797&r1=1792796&r2=1792797&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpHost.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/http/HttpHost.java Wed Apr 26 19:21:54 2017
@@ -53,7 +53,7 @@ public final class HttpHost implements N
private static final long serialVersionUID = -7529410654042457626L;
/** The default scheme is "http". */
- public static final String DEFAULT_SCHEME_NAME = "http";
+ public static final URIScheme DEFAULT_SCHEME = URIScheme.HTTP;
/** The host to use. */
private final String hostname;
@@ -91,7 +91,7 @@ public final class HttpHost implements N
* {@code -1} indicates the scheme default port.
* @param scheme the name of the scheme.
* {@code null} indicates the
- * {@link #DEFAULT_SCHEME_NAME default scheme}
+ * {@link #DEFAULT_SCHEME default scheme}
*
* @throws IllegalArgumentException
* If the port parameter is outside the specified range of valid port values, which is between 0 and
@@ -104,7 +104,7 @@ public final class HttpHost implements N
if (scheme != null) {
this.schemeName = scheme.toLowerCase(Locale.ROOT);
} else {
- this.schemeName = DEFAULT_SCHEME_NAME;
+ this.schemeName = DEFAULT_SCHEME.id;
}
this.port = Ports.check(port);
this.address = null;
@@ -131,7 +131,7 @@ public final class HttpHost implements N
* @param hostname the hostname (IP or DNS name)
* @param scheme the name of the scheme.
* {@code null} indicates the
- * {@link #DEFAULT_SCHEME_NAME default scheme}
+ * {@link #DEFAULT_SCHEME default scheme}
*
* @throws IllegalArgumentException
* If the port parameter is outside the specified range of valid port values, which is between 0 and
@@ -174,7 +174,7 @@ public final class HttpHost implements N
return new HttpHost(
text.toLowerCase(Locale.ROOT),
port,
- scheme != null ? scheme.toLowerCase(Locale.ROOT) : DEFAULT_SCHEME_NAME, true);
+ scheme != null ? scheme.toLowerCase(Locale.ROOT) : DEFAULT_SCHEME.id, true);
}
/**
@@ -198,7 +198,7 @@ public final class HttpHost implements N
* {@code -1} indicates the scheme default port.
* @param scheme the name of the scheme.
* {@code null} indicates the
- * {@link #DEFAULT_SCHEME_NAME default scheme}
+ * {@link #DEFAULT_SCHEME default scheme}
*
* @throws IllegalArgumentException
* If the port parameter is outside the specified range of valid port values, which is between 0 and
@@ -219,7 +219,7 @@ public final class HttpHost implements N
* {@code -1} indicates the scheme default port.
* @param scheme the name of the scheme.
* {@code null} indicates the
- * {@link #DEFAULT_SCHEME_NAME default scheme}
+ * {@link #DEFAULT_SCHEME default scheme}
*
* @throws IllegalArgumentException
* If the port parameter is outside the specified range of valid port values, which is between 0 and
@@ -235,7 +235,7 @@ public final class HttpHost implements N
if (scheme != null) {
this.schemeName = scheme.toLowerCase(Locale.ROOT);
} else {
- this.schemeName = DEFAULT_SCHEME_NAME;
+ this.schemeName = DEFAULT_SCHEME.id;
}
this.port = Ports.check(port);
}