Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 05D0F200C82 for ; Fri, 12 May 2017 10:04:29 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 04A3D160BA3; Fri, 12 May 2017 08:04:29 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id DFA5B160BCE for ; Fri, 12 May 2017 10:04:26 +0200 (CEST) Received: (qmail 31533 invoked by uid 500); 12 May 2017 08:04:26 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 31347 invoked by uid 99); 12 May 2017 08:04:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 May 2017 08:04:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8E467ED49E; Fri, 12 May 2017 08:04:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: olegk@apache.org To: commits@hc.apache.org Date: Fri, 12 May 2017 08:04:29 -0000 Message-Id: In-Reply-To: <663d46d94cd04b02bfdd46a09d55228d@git.apache.org> References: <663d46d94cd04b02bfdd46a09d55228d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/19] httpcomponents-core git commit: Rename variables "sslcontext" to "sslContext". archived-at: Fri, 12 May 2017 08:04:29 -0000 Rename variables "sslcontext" to "sslContext". Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/repo Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/commit/5ed14a72 Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/tree/5ed14a72 Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-core/diff/5ed14a72 Branch: refs/heads/4.4.x Commit: 5ed14a72996e1b4b545f2f52a59517cca8964f7e Parents: 3cc3cff Author: Gary D. Gregory Authored: Thu May 4 17:44:37 2017 +0000 Committer: Oleg Kalnichevski Committed: Fri May 12 09:46:26 2017 +0200 ---------------------------------------------------------------------- .../http/examples/nio/NHttpFileServer.java | 6 ++-- .../http/impl/nio/SSLClientIOEventDispatch.java | 20 ++++++------ .../http/impl/nio/SSLServerIOEventDispatch.java | 20 ++++++------ .../impl/nio/reactor/SSLIOSessionHandler.java | 2 +- .../http/impl/nio/reactor/SSLSetupHandler.java | 2 +- .../impl/nio/ssl/SSLClientIOEventDispatch.java | 24 +++++++-------- .../impl/nio/ssl/SSLServerIOEventDispatch.java | 24 +++++++-------- .../impl/nio/DefaultHttpClientIODispatch.java | 16 +++++----- .../impl/nio/DefaultHttpServerIODispatch.java | 16 +++++----- .../apache/http/impl/nio/SSLContextUtils.java | 10 +++--- .../nio/SSLNHttpClientConnectionFactory.java | 32 ++++++++++---------- .../nio/SSLNHttpServerConnectionFactory.java | 32 ++++++++++---------- .../http/impl/nio/pool/BasicNIOConnFactory.java | 16 +++++----- .../http/nio/reactor/ssl/SSLIOSession.java | 6 ++-- .../http/nio/reactor/ssl/SSLSetupHandler.java | 2 +- .../nio/testserver/ClientConnectionFactory.java | 14 ++++----- .../nio/testserver/ServerConnectionFactory.java | 14 ++++----- .../apache/http/examples/HttpFileServer.java | 6 ++-- .../org/apache/http/ssl/SSLContextBuilder.java | 16 +++++----- .../java/org/apache/http/ssl/SSLContexts.java | 6 ++-- 20 files changed, 142 insertions(+), 142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpFileServer.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpFileServer.java b/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpFileServer.java index c8bb1a2..612c02e 100644 --- a/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpFileServer.java +++ b/httpcore-nio/src/examples/org/apache/http/examples/nio/NHttpFileServer.java @@ -75,7 +75,7 @@ public class NHttpFileServer { port = Integer.parseInt(args[1]); } - SSLContext sslcontext = null; + SSLContext sslContext = null; if (port == 8443) { // Initialize SSL context URL url = NHttpFileServer.class.getResource("/my.keystore"); @@ -83,7 +83,7 @@ public class NHttpFileServer { System.out.println("Keystore not found"); System.exit(1); } - sslcontext = SSLContexts.custom() + sslContext = SSLContexts.custom() .loadKeyMaterial(url, "secret".toCharArray(), "secret".toCharArray()) .build(); } @@ -97,7 +97,7 @@ public class NHttpFileServer { .setListenerPort(port) .setServerInfo("Test/1.1") .setIOReactorConfig(config) - .setSslContext(sslcontext) + .setSslContext(sslContext) .setExceptionLogger(ExceptionLogger.STD_ERR) .registerHandler("*", new HttpFileHandler(docRoot)) .create(); http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java index 741b374..852f246 100644 --- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java +++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLClientIOEventDispatch.java @@ -72,22 +72,22 @@ public class SSLClientIOEventDispatch implements IOEventDispatch { * protocol aspects for HTTP connections. * * @param handler the client protocol handler. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param sslHandler the SSL handler. * @param params HTTP parameters. */ public SSLClientIOEventDispatch( final NHttpClientHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLIOSessionHandler sslHandler, final HttpParams params) { super(); Args.notNull(handler, "HTTP client handler"); - Args.notNull(sslcontext, "SSL context"); + Args.notNull(sslContext, "SSL context"); Args.notNull(params, "HTTP parameters"); this.handler = handler; this.params = params; - this.sslcontext = sslcontext; + this.sslcontext = sslContext; this.sslHandler = sslHandler; } @@ -98,14 +98,14 @@ public class SSLClientIOEventDispatch implements IOEventDispatch { * protocol aspects for HTTP connections. * * @param handler the client protocol handler. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param params HTTP parameters. */ public SSLClientIOEventDispatch( final NHttpClientHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final HttpParams params) { - this(handler, sslcontext, null, params); + this(handler, sslContext, null, params); } /** @@ -162,15 +162,15 @@ public class SSLClientIOEventDispatch implements IOEventDispatch { * a different implementation of SSL I/O session. * * @param session the underlying I/O session. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param sslHandler the SSL handler. * @return newly created SSL I/O session. */ protected SSLIOSession createSSLIOSession( final IOSession session, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLIOSessionHandler sslHandler) { - return new SSLIOSession(session, sslcontext, sslHandler); + return new SSLIOSession(session, sslContext, sslHandler); } @Override http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java index 38f5af6..1e901dc 100644 --- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java +++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/SSLServerIOEventDispatch.java @@ -72,22 +72,22 @@ public class SSLServerIOEventDispatch implements IOEventDispatch { * protocol aspects for HTTP connections. * * @param handler the server protocol handler. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param sslHandler the SSL handler. * @param params HTTP parameters. */ public SSLServerIOEventDispatch( final NHttpServiceHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLIOSessionHandler sslHandler, final HttpParams params) { super(); Args.notNull(handler, "HTTP service handler"); - Args.notNull(sslcontext, "SSL context"); + Args.notNull(sslContext, "SSL context"); Args.notNull(params, "HTTP parameters"); this.handler = handler; this.params = params; - this.sslcontext = sslcontext; + this.sslcontext = sslContext; this.sslHandler = sslHandler; } @@ -98,14 +98,14 @@ public class SSLServerIOEventDispatch implements IOEventDispatch { * protocol aspects for HTTP connections. * * @param handler the server protocol handler. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param params HTTP parameters. */ public SSLServerIOEventDispatch( final NHttpServiceHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final HttpParams params) { - this(handler, sslcontext, null, params); + this(handler, sslContext, null, params); } /** @@ -162,15 +162,15 @@ public class SSLServerIOEventDispatch implements IOEventDispatch { * a different implementation of SSL I/O session. * * @param session the underlying I/O session. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param sslHandler the SSL handler. * @return newly created SSL I/O session. */ protected SSLIOSession createSSLIOSession( final IOSession session, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLIOSessionHandler sslHandler) { - return new SSLIOSession(session, sslcontext, sslHandler); + return new SSLIOSession(session, sslContext, sslHandler); } @Override http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java index 518939b..a0b464a 100644 --- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java +++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLIOSessionHandler.java @@ -37,7 +37,7 @@ import org.apache.http.params.HttpParams; /** * Callback interface that can be used to customize various aspects of - * the TLS/SSl protocol. + * the TLS/SSL protocol. * * @since 4.0 * http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java index d68e4b2..fc867a7 100644 --- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java +++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/reactor/SSLSetupHandler.java @@ -36,7 +36,7 @@ import org.apache.http.params.HttpParams; /** * Callback interface that can be used to customize various aspects of - * the TLS/SSl protocol. + * the TLS/SSL protocol. * * @since 4.1 * http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java index 578f54a..d7d87ab 100644 --- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java +++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLClientIOEventDispatch.java @@ -51,7 +51,7 @@ import org.apache.http.util.Args; @Deprecated public class SSLClientIOEventDispatch extends DefaultClientIOEventDispatch { - private final SSLContext sslcontext; + private final SSLContext sslContext; private final SSLSetupHandler sslHandler; /** @@ -61,19 +61,19 @@ public class SSLClientIOEventDispatch extends DefaultClientIOEventDispatch { * protocol aspects for HTTP connections. * * @param handler the client protocol handler. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param sslHandler the SSL setup handler. * @param params HTTP parameters. */ public SSLClientIOEventDispatch( final NHttpClientHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final HttpParams params) { super(handler, params); - Args.notNull(sslcontext, "SSL context"); + Args.notNull(sslContext, "SSL context"); Args.notNull(params, "HTTP parameters"); - this.sslcontext = sslcontext; + this.sslContext = sslContext; this.sslHandler = sslHandler; } @@ -84,14 +84,14 @@ public class SSLClientIOEventDispatch extends DefaultClientIOEventDispatch { * protocol aspects for HTTP connections. * * @param handler the client protocol handler. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param params HTTP parameters. */ public SSLClientIOEventDispatch( final NHttpClientHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final HttpParams params) { - this(handler, sslcontext, null, params); + this(handler, sslContext, null, params); } /** @@ -102,15 +102,15 @@ public class SSLClientIOEventDispatch extends DefaultClientIOEventDispatch { * a different implementation of SSL I/O session. * * @param session the underlying I/O session. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param sslHandler the SSL setup handler. * @return newly created SSL I/O session. */ protected SSLIOSession createSSLIOSession( final IOSession session, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler) { - return new SSLIOSession(session, sslcontext, sslHandler); + return new SSLIOSession(session, sslContext, sslHandler); } protected NHttpClientIOTarget createSSLConnection(final SSLIOSession ssliosession) { @@ -119,7 +119,7 @@ public class SSLClientIOEventDispatch extends DefaultClientIOEventDispatch { @Override protected NHttpClientIOTarget createConnection(final IOSession session) { - final SSLIOSession ssliosession = createSSLIOSession(session, this.sslcontext, this.sslHandler); + final SSLIOSession ssliosession = createSSLIOSession(session, this.sslContext, this.sslHandler); session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession); final NHttpClientIOTarget conn = createSSLConnection(ssliosession); try { http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java index c3a4c37..cf1d413 100644 --- a/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java +++ b/httpcore-nio/src/main/java-deprecated/org/apache/http/impl/nio/ssl/SSLServerIOEventDispatch.java @@ -51,7 +51,7 @@ import org.apache.http.util.Args; @Deprecated public class SSLServerIOEventDispatch extends DefaultServerIOEventDispatch { - private final SSLContext sslcontext; + private final SSLContext sslContext; private final SSLSetupHandler sslHandler; /** @@ -61,19 +61,19 @@ public class SSLServerIOEventDispatch extends DefaultServerIOEventDispatch { * protocol aspects for HTTP connections. * * @param handler the server protocol handler. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param sslHandler the SSL setup handler. * @param params HTTP parameters. */ public SSLServerIOEventDispatch( final NHttpServiceHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final HttpParams params) { super(handler, params); - Args.notNull(sslcontext, "SSL context"); + Args.notNull(sslContext, "SSL context"); Args.notNull(params, "HTTP parameters"); - this.sslcontext = sslcontext; + this.sslContext = sslContext; this.sslHandler = sslHandler; } @@ -84,14 +84,14 @@ public class SSLServerIOEventDispatch extends DefaultServerIOEventDispatch { * protocol aspects for HTTP connections. * * @param handler the server protocol handler. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param params HTTP parameters. */ public SSLServerIOEventDispatch( final NHttpServiceHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final HttpParams params) { - this(handler, sslcontext, null, params); + this(handler, sslContext, null, params); } /** @@ -102,15 +102,15 @@ public class SSLServerIOEventDispatch extends DefaultServerIOEventDispatch { * a different implementation of SSL I/O session. * * @param session the underlying I/O session. - * @param sslcontext the SSL context. + * @param sslContext the SSL context. * @param sslHandler the SSL setup handler. * @return newly created SSL I/O session. */ protected SSLIOSession createSSLIOSession( final IOSession session, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler) { - return new SSLIOSession(session, sslcontext, sslHandler); + return new SSLIOSession(session, sslContext, sslHandler); } protected NHttpServerIOTarget createSSLConnection(final SSLIOSession ssliosession) { @@ -119,7 +119,7 @@ public class SSLServerIOEventDispatch extends DefaultServerIOEventDispatch { @Override protected NHttpServerIOTarget createConnection(final IOSession session) { - final SSLIOSession ssliosession = createSSLIOSession(session, this.sslcontext, this.sslHandler); + final SSLIOSession ssliosession = createSSLIOSession(session, this.sslContext, this.sslHandler); session.setAttribute(SSLIOSession.SESSION_KEY, ssliosession); final NHttpServerIOTarget conn = createSSLConnection(ssliosession); try { http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java index e62ccdf..cfc0a10 100644 --- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java +++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpClientIODispatch.java @@ -90,10 +90,10 @@ public class DefaultHttpClientIODispatch @Deprecated public DefaultHttpClientIODispatch( final NHttpClientEventHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final HttpParams params) { - this(handler, new SSLNHttpClientConnectionFactory(sslcontext, sslHandler, params)); + this(handler, new SSLNHttpClientConnectionFactory(sslContext, sslHandler, params)); } /** @@ -103,9 +103,9 @@ public class DefaultHttpClientIODispatch @Deprecated public DefaultHttpClientIODispatch( final NHttpClientEventHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final HttpParams params) { - this(handler, sslcontext, null, params); + this(handler, sslContext, null, params); } /** @@ -120,10 +120,10 @@ public class DefaultHttpClientIODispatch */ public DefaultHttpClientIODispatch( final NHttpClientEventHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final ConnectionConfig config) { - this(handler, new SSLNHttpClientConnectionFactory(sslcontext, sslHandler, config)); + this(handler, new SSLNHttpClientConnectionFactory(sslContext, sslHandler, config)); } /** @@ -131,9 +131,9 @@ public class DefaultHttpClientIODispatch */ public DefaultHttpClientIODispatch( final NHttpClientEventHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final ConnectionConfig config) { - this(handler, new SSLNHttpClientConnectionFactory(sslcontext, null, config)); + this(handler, new SSLNHttpClientConnectionFactory(sslContext, null, config)); } @Override http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java index e109b64..a49b1b3 100644 --- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java +++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/DefaultHttpServerIODispatch.java @@ -83,10 +83,10 @@ public class DefaultHttpServerIODispatch @Deprecated public DefaultHttpServerIODispatch( final NHttpServerEventHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final HttpParams params) { - this(handler, new SSLNHttpServerConnectionFactory(sslcontext, sslHandler, params)); + this(handler, new SSLNHttpServerConnectionFactory(sslContext, sslHandler, params)); } /** @@ -96,9 +96,9 @@ public class DefaultHttpServerIODispatch @Deprecated public DefaultHttpServerIODispatch( final NHttpServerEventHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final HttpParams params) { - this(handler, sslcontext, null, params); + this(handler, sslContext, null, params); } /** @@ -113,10 +113,10 @@ public class DefaultHttpServerIODispatch */ public DefaultHttpServerIODispatch( final NHttpServerEventHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final ConnectionConfig config) { - this(handler, new SSLNHttpServerConnectionFactory(sslcontext, sslHandler, config)); + this(handler, new SSLNHttpServerConnectionFactory(sslContext, sslHandler, config)); } /** @@ -124,9 +124,9 @@ public class DefaultHttpServerIODispatch */ public DefaultHttpServerIODispatch( final NHttpServerEventHandler handler, - final SSLContext sslcontext, + final SSLContext sslContext, final ConnectionConfig config) { - this(handler, new SSLNHttpServerConnectionFactory(sslcontext, null, config)); + this(handler, new SSLNHttpServerConnectionFactory(sslContext, null, config)); } @Override http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLContextUtils.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLContextUtils.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLContextUtils.java index fea5a4e..079a31f 100644 --- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLContextUtils.java +++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLContextUtils.java @@ -33,18 +33,18 @@ import java.security.NoSuchAlgorithmException; class SSLContextUtils { static SSLContext getDefault() { - SSLContext sslcontext; + SSLContext sslContext; try { try { - sslcontext = SSLContext.getInstance("Default"); + sslContext = SSLContext.getInstance("Default"); } catch (final NoSuchAlgorithmException ex) { - sslcontext = SSLContext.getInstance("TLS"); + sslContext = SSLContext.getInstance("TLS"); } - sslcontext.init(null, null, null); + sslContext.init(null, null, null); } catch (final Exception ex) { throw new IllegalStateException("Failure initializing default SSL context", ex); } - return sslcontext; + return sslContext; } } http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java index 5b28579..6c3af86 100644 --- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java +++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpClientConnectionFactory.java @@ -70,7 +70,7 @@ public class SSLNHttpClientConnectionFactory private final NHttpMessageParserFactory responseParserFactory; private final NHttpMessageWriterFactory requestWriterFactory; private final ByteBufferAllocator allocator; - private final SSLContext sslcontext; + private final SSLContext sslContext; private final SSLSetupHandler sslHandler; private final ConnectionConfig cconfig; @@ -82,7 +82,7 @@ public class SSLNHttpClientConnectionFactory */ @Deprecated public SSLNHttpClientConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final HttpResponseFactory responseFactory, final ByteBufferAllocator allocator, @@ -91,7 +91,7 @@ public class SSLNHttpClientConnectionFactory Args.notNull(responseFactory, "HTTP response factory"); Args.notNull(allocator, "Byte buffer allocator"); Args.notNull(params, "HTTP parameters"); - this.sslcontext = sslcontext != null ? sslcontext : SSLContexts.createSystemDefault(); + this.sslContext = sslContext != null ? sslContext : SSLContexts.createSystemDefault(); this.sslHandler = sslHandler; this.allocator = allocator; this.incomingContentStrategy = null; @@ -108,10 +108,10 @@ public class SSLNHttpClientConnectionFactory */ @Deprecated public SSLNHttpClientConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final HttpParams params) { - this(sslcontext, sslHandler, DefaultHttpResponseFactory.INSTANCE, + this(sslContext, sslHandler, DefaultHttpResponseFactory.INSTANCE, HeapByteBufferAllocator.INSTANCE, params); } @@ -128,7 +128,7 @@ public class SSLNHttpClientConnectionFactory * @since 4.3 */ public SSLNHttpClientConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final ContentLengthStrategy incomingContentStrategy, final ContentLengthStrategy outgoingContentStrategy, @@ -137,7 +137,7 @@ public class SSLNHttpClientConnectionFactory final ByteBufferAllocator allocator, final ConnectionConfig cconfig) { super(); - this.sslcontext = sslcontext != null ? sslcontext : SSLContexts.createSystemDefault(); + this.sslContext = sslContext != null ? sslContext : SSLContexts.createSystemDefault(); this.sslHandler = sslHandler; this.incomingContentStrategy = incomingContentStrategy; this.outgoingContentStrategy = outgoingContentStrategy; @@ -151,13 +151,13 @@ public class SSLNHttpClientConnectionFactory * @since 4.3 */ public SSLNHttpClientConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final NHttpMessageParserFactory responseParserFactory, final NHttpMessageWriterFactory requestWriterFactory, final ByteBufferAllocator allocator, final ConnectionConfig cconfig) { - this(sslcontext, sslHandler, + this(sslContext, sslHandler, null, null, responseParserFactory, requestWriterFactory, allocator, cconfig); } @@ -165,12 +165,12 @@ public class SSLNHttpClientConnectionFactory * @since 4.3 */ public SSLNHttpClientConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final NHttpMessageParserFactory responseParserFactory, final NHttpMessageWriterFactory requestWriterFactory, final ConnectionConfig cconfig) { - this(sslcontext, sslHandler, + this(sslContext, sslHandler, null, null, responseParserFactory, requestWriterFactory, null, cconfig); } @@ -178,10 +178,10 @@ public class SSLNHttpClientConnectionFactory * @since 4.3 */ public SSLNHttpClientConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final ConnectionConfig config) { - this(sslcontext, sslHandler, null, null, null, null, null, config); + this(sslContext, sslHandler, null, null, null, null, null, config); } /** @@ -215,16 +215,16 @@ public class SSLNHttpClientConnectionFactory */ protected SSLIOSession createSSLIOSession( final IOSession iosession, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler) { final SSLIOSession ssliosession = new SSLIOSession(iosession, SSLMode.CLIENT, - sslcontext, sslHandler); + sslContext, sslHandler); return ssliosession; } @Override public DefaultNHttpClientConnection createConnection(final IOSession iosession) { - final SSLIOSession ssliosession = createSSLIOSession(iosession, this.sslcontext, this.sslHandler); + final SSLIOSession ssliosession = createSSLIOSession(iosession, this.sslContext, this.sslHandler); iosession.setAttribute(SSLIOSession.SESSION_KEY, ssliosession); return new DefaultNHttpClientConnection( ssliosession, http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java index 99576f3..294f8af 100644 --- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java +++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/SSLNHttpServerConnectionFactory.java @@ -63,7 +63,7 @@ import org.apache.http.util.Args; public class SSLNHttpServerConnectionFactory implements NHttpConnectionFactory { - private final SSLContext sslcontext; + private final SSLContext sslContext; private final SSLSetupHandler sslHandler; private final ContentLengthStrategy incomingContentStrategy; private final ContentLengthStrategy outgoingContentStrategy; @@ -80,7 +80,7 @@ public class SSLNHttpServerConnectionFactory */ @Deprecated public SSLNHttpServerConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final HttpRequestFactory requestFactory, final ByteBufferAllocator allocator, @@ -89,7 +89,7 @@ public class SSLNHttpServerConnectionFactory Args.notNull(requestFactory, "HTTP request factory"); Args.notNull(allocator, "Byte buffer allocator"); Args.notNull(params, "HTTP parameters"); - this.sslcontext = sslcontext != null ? sslcontext : SSLContexts.createSystemDefault(); + this.sslContext = sslContext != null ? sslContext : SSLContexts.createSystemDefault(); this.sslHandler = sslHandler; this.incomingContentStrategy = null; this.outgoingContentStrategy = null; @@ -106,10 +106,10 @@ public class SSLNHttpServerConnectionFactory */ @Deprecated public SSLNHttpServerConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final HttpParams params) { - this(sslcontext, sslHandler, DefaultHttpRequestFactory.INSTANCE, + this(sslContext, sslHandler, DefaultHttpRequestFactory.INSTANCE, HeapByteBufferAllocator.INSTANCE, params); } @@ -126,7 +126,7 @@ public class SSLNHttpServerConnectionFactory * @since 4.3 */ public SSLNHttpServerConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final ContentLengthStrategy incomingContentStrategy, final ContentLengthStrategy outgoingContentStrategy, @@ -135,7 +135,7 @@ public class SSLNHttpServerConnectionFactory final ByteBufferAllocator allocator, final ConnectionConfig cconfig) { super(); - this.sslcontext = sslcontext != null ? sslcontext : SSLContexts.createSystemDefault(); + this.sslContext = sslContext != null ? sslContext : SSLContexts.createSystemDefault(); this.sslHandler = sslHandler; this.incomingContentStrategy = incomingContentStrategy; this.outgoingContentStrategy = outgoingContentStrategy; @@ -149,13 +149,13 @@ public class SSLNHttpServerConnectionFactory * @since 4.3 */ public SSLNHttpServerConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final NHttpMessageParserFactory requestParserFactory, final NHttpMessageWriterFactory responseWriterFactory, final ByteBufferAllocator allocator, final ConnectionConfig cconfig) { - this(sslcontext, sslHandler, + this(sslContext, sslHandler, null, null, requestParserFactory, responseWriterFactory, allocator, cconfig); } @@ -163,12 +163,12 @@ public class SSLNHttpServerConnectionFactory * @since 4.3 */ public SSLNHttpServerConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final NHttpMessageParserFactory requestParserFactory, final NHttpMessageWriterFactory responseWriterFactory, final ConnectionConfig cconfig) { - this(sslcontext, sslHandler, + this(sslContext, sslHandler, null, null, requestParserFactory, responseWriterFactory, null, cconfig); } @@ -176,10 +176,10 @@ public class SSLNHttpServerConnectionFactory * @since 4.3 */ public SSLNHttpServerConnectionFactory( - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler, final ConnectionConfig config) { - this(sslcontext, sslHandler, null, null, null, null, null, config); + this(sslContext, sslHandler, null, null, null, null, null, config); } /** @@ -213,16 +213,16 @@ public class SSLNHttpServerConnectionFactory */ protected SSLIOSession createSSLIOSession( final IOSession iosession, - final SSLContext sslcontext, + final SSLContext sslContext, final SSLSetupHandler sslHandler) { final SSLIOSession ssliosession = new SSLIOSession(iosession, SSLMode.SERVER, - sslcontext, sslHandler); + sslContext, sslHandler); return ssliosession; } @Override public DefaultNHttpServerConnection createConnection(final IOSession iosession) { - final SSLIOSession ssliosession = createSSLIOSession(iosession, this.sslcontext, this.sslHandler); + final SSLIOSession ssliosession = createSSLIOSession(iosession, this.sslContext, this.sslHandler); iosession.setAttribute(SSLIOSession.SESSION_KEY, ssliosession); return new DefaultNHttpServerConnection(ssliosession, this.cconfig.getBufferSize(), http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java b/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java index e3bdb7f..274897f 100644 --- a/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java +++ b/httpcore-nio/src/main/java/org/apache/http/impl/nio/pool/BasicNIOConnFactory.java @@ -87,7 +87,7 @@ public class BasicNIOConnFactory implements NIOConnFactory responseParserFactory, final NHttpMessageWriterFactory requestWriterFactory, @@ -132,7 +132,7 @@ public class BasicNIOConnFactory implements NIOConnFactory - * SSLContext sslcontext = SSLContext.getInstance("SSL"); - * sslcontext.init(null, null, null); + * SSLContext sslContext = SSLContext.getInstance("SSL"); + * sslContext.init(null, null, null); * SSLIOSession sslsession = new SSLIOSession( - * iosession, SSLMode.CLIENT, sslcontext, null); + * iosession, SSLMode.CLIENT, sslContext, null); * iosession.setAttribute(SSLIOSession.SESSION_KEY, sslsession); * * http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLSetupHandler.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLSetupHandler.java b/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLSetupHandler.java index 4724fc4..9c81b74 100644 --- a/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLSetupHandler.java +++ b/httpcore-nio/src/main/java/org/apache/http/nio/reactor/ssl/SSLSetupHandler.java @@ -35,7 +35,7 @@ import org.apache.http.nio.reactor.IOSession; /** * Callback interface that can be used to customize various aspects of - * the TLS/SSl protocol. + * the TLS/SSL protocol. * * @since 4.2 */ http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore-nio/src/test/java/org/apache/http/nio/testserver/ClientConnectionFactory.java ---------------------------------------------------------------------- diff --git a/httpcore-nio/src/test/java/org/apache/http/nio/testserver/ClientConnectionFactory.java b/httpcore-nio/src/test/java/org/apache/http/nio/testserver/ClientConnectionFactory.java index 22bf4dc..0042772 100644 --- a/httpcore-nio/src/test/java/org/apache/http/nio/testserver/ClientConnectionFactory.java +++ b/httpcore-nio/src/test/java/org/apache/http/nio/testserver/ClientConnectionFactory.java @@ -37,18 +37,18 @@ import org.apache.http.nio.reactor.ssl.SSLSetupHandler; public class ClientConnectionFactory implements NHttpConnectionFactory { - private final SSLContext sslcontext; + private final SSLContext sslContext; private final SSLSetupHandler setupHandler; public ClientConnectionFactory( - final SSLContext sslcontext, final SSLSetupHandler setupHandler) { + final SSLContext sslContext, final SSLSetupHandler setupHandler) { super(); - this.sslcontext = sslcontext; + this.sslContext = sslContext; this.setupHandler = setupHandler; } - public ClientConnectionFactory(final SSLContext sslcontext) { - this(sslcontext, null); + public ClientConnectionFactory(final SSLContext sslContext) { + this(sslContext, null); } public ClientConnectionFactory() { @@ -57,9 +57,9 @@ public class ClientConnectionFactory implements NHttpConnectionFactory { - private final SSLContext sslcontext; + private final SSLContext sslContext; private final SSLSetupHandler setupHandler; public ServerConnectionFactory( - final SSLContext sslcontext, final SSLSetupHandler setupHandler) { + final SSLContext sslContext, final SSLSetupHandler setupHandler) { super(); - this.sslcontext = sslcontext; + this.sslContext = sslContext; this.setupHandler = setupHandler; } - public ServerConnectionFactory(final SSLContext sslcontext) { - this(sslcontext, null); + public ServerConnectionFactory(final SSLContext sslContext) { + this(sslContext, null); } public ServerConnectionFactory() { @@ -57,9 +57,9 @@ public class ServerConnectionFactory implements NHttpConnectionFactory keyManagers, final Collection trustManagers, final SecureRandom secureRandom) throws KeyManagementException { - sslcontext.init( + sslContext.init( !keyManagers.isEmpty() ? keyManagers.toArray(new KeyManager[keyManagers.size()]) : null, !trustManagers.isEmpty() ? trustManagers.toArray(new TrustManager[trustManagers.size()]) : null, secureRandom); } public SSLContext build() throws NoSuchAlgorithmException, KeyManagementException { - final SSLContext sslcontext; + final SSLContext sslContext; final String protocolStr = this.protocol != null ? this.protocol : TLS; if (this.provider != null) { - sslcontext = SSLContext.getInstance(protocolStr, this.provider); + sslContext = SSLContext.getInstance(protocolStr, this.provider); } else { - sslcontext = SSLContext.getInstance(protocolStr); + sslContext = SSLContext.getInstance(protocolStr); } - initSSLContext(sslcontext, keymanagers, trustmanagers, secureRandom); - return sslcontext; + initSSLContext(sslContext, keymanagers, trustmanagers, secureRandom); + return sslContext; } static class TrustManagerDelegate implements X509TrustManager { http://git-wip-us.apache.org/repos/asf/httpcomponents-core/blob/5ed14a72/httpcore/src/main/java/org/apache/http/ssl/SSLContexts.java ---------------------------------------------------------------------- diff --git a/httpcore/src/main/java/org/apache/http/ssl/SSLContexts.java b/httpcore/src/main/java/org/apache/http/ssl/SSLContexts.java index 3c0f35c..19a40df 100644 --- a/httpcore/src/main/java/org/apache/http/ssl/SSLContexts.java +++ b/httpcore/src/main/java/org/apache/http/ssl/SSLContexts.java @@ -48,9 +48,9 @@ public class SSLContexts { */ public static SSLContext createDefault() throws SSLInitializationException { try { - final SSLContext sslcontext = SSLContext.getInstance(SSLContextBuilder.TLS); - sslcontext.init(null, null, null); - return sslcontext; + final SSLContext sslContext = SSLContext.getInstance(SSLContextBuilder.TLS); + sslContext.init(null, null, null); + return sslContext; } catch (final NoSuchAlgorithmException ex) { throw new SSLInitializationException(ex.getMessage(), ex); } catch (final KeyManagementException ex) {