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/03 18:22:30 UTC
svn commit: r1790030 - in /httpcomponents/httpcore/trunk:
httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/
httpcore5/src/main/java/org/apache/hc/core5/ssl/
httpcore5/src/test/java/org/apache/hc/core5/ssl/
Author: olegk
Date: Mon Apr 3 18:22:30 2017
New Revision: 1790030
URL: http://svn.apache.org/viewvc?rev=1790030&view=rev
Log:
useProtocol -> setProtocol for consistency
Modified:
httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java
httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java
httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
Modified: httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java?rev=1790030&r1=1790029&r2=1790030&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5-ab/src/main/java/org/apache/hc/core5/http/benchmark/HttpBenchmark.java Mon Apr 3 18:22:30 2017
@@ -184,7 +184,7 @@ public class HttpBenchmark {
SocketFactory socketFactory = null;
if ("https".equals(host.getSchemeName())) {
final SSLContextBuilder sslContextBuilder = new SSLContextBuilder();
- sslContextBuilder.useProtocol("SSL");
+ sslContextBuilder.setProtocol("SSL");
if (config.isDisableSSLVerification()) {
sslContextBuilder.loadTrustMaterial(null, new TrustStrategy() {
Modified: httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java?rev=1790030&r1=1790029&r2=1790030&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/main/java/org/apache/hc/core5/ssl/SSLContextBuilder.java Mon Apr 3 18:22:30 2017
@@ -94,7 +94,7 @@ public class SSLContextBuilder {
this.trustmanagers = new LinkedHashSet<>();
}
- public SSLContextBuilder useProtocol(final String protocol) {
+ public SSLContextBuilder setProtocol(final String protocol) {
this.protocol = protocol;
return this;
}
Modified: httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java?rev=1790030&r1=1790029&r2=1790030&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java (original)
+++ httpcomponents/httpcore/trunk/httpcore5/src/test/java/org/apache/hc/core5/ssl/TestSSLContextBuilder.java Mon Apr 3 18:22:30 2017
@@ -94,7 +94,7 @@ public class TestSSLContextBuilder {
@Test
public void testBuildAllNull() throws Exception {
final SSLContext sslContext = SSLContextBuilder.create()
- .useProtocol(null)
+ .setProtocol(null)
.setSecureRandom(null)
.loadTrustMaterial((KeyStore) null, null)
.loadKeyMaterial((KeyStore) null, null, null)