From 28216013dd3a6d1449a805c632c1d902a817e918 Mon Sep 17 00:00:00 2001 From: Artem Bilan Date: Thu, 11 Aug 2016 21:39:59 -0400 Subject: [PATCH] Fix some typos in IP module (JavaDocs, comments) --- .../ip/tcp/connection/CachingClientConnectionFactory.java | 2 +- .../ip/tcp/connection/ClientModeConnectionManager.java | 2 +- .../ip/tcp/connection/DefaultTcpNetSSLSocketFactorySupport.java | 2 +- .../ip/tcp/connection/DefaultTcpNioSSLConnectionSupport.java | 2 +- .../ip/tcp/connection/DefaultTcpSSLContextSupport.java | 2 +- .../ip/tcp/connection/MessageConvertingTcpMessageMapper.java | 2 +- .../integration/ip/tcp/connection/TcpNioSSLConnection.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java index e0262a0cc7..ba87ca838a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java @@ -420,7 +420,7 @@ public class CachingClientConnectionFactory extends AbstractClientConnectionFact } } else { - /** + /* * If the delegate is stopped, actually close the connection, but still release * it to the pool, it will be discarded/renewed the next time it is retrieved. */ diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ClientModeConnectionManager.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ClientModeConnectionManager.java index d50c261277..69332c7952 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ClientModeConnectionManager.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/ClientModeConnectionManager.java @@ -72,7 +72,7 @@ public class ClientModeConnectionManager implements Runnable { } public boolean isConnected() { - return this.lastConnection == null ? false : this.lastConnection.isOpen(); + return this.lastConnection != null && this.lastConnection.isOpen(); } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNetSSLSocketFactorySupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNetSSLSocketFactorySupport.java index 7eabe3c664..4e7a2d1b55 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNetSSLSocketFactorySupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNetSSLSocketFactorySupport.java @@ -53,7 +53,7 @@ public class DefaultTcpNetSSLSocketFactorySupport implements TcpSocketFactorySup public void afterPropertiesSet() throws Exception { this.sslContext = this.sslContextSupport.getSSLContext(); - Assert.notNull(this.sslContext, "SSLContex must not be null"); + Assert.notNull(this.sslContext, "SSLContext must not be null"); } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNioSSLConnectionSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNioSSLConnectionSupport.java index 21e978013a..fb679a1760 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNioSSLConnectionSupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpNioSSLConnectionSupport.java @@ -57,7 +57,7 @@ public class DefaultTcpNioSSLConnectionSupport implements TcpNioConnectionSuppor public void afterPropertiesSet() throws Exception { this.sslContext = this.sslContextSupport.getSSLContext(); - Assert.notNull(this.sslContext, "SSLContex must not be null"); + Assert.notNull(this.sslContext, "SSLContext must not be null"); } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpSSLContextSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpSSLContextSupport.java index 7dfe4a7374..bce4c44431 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpSSLContextSupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/DefaultTcpSSLContextSupport.java @@ -53,7 +53,7 @@ public class DefaultTcpSSLContextSupport implements TcpSSLContextSupport { * key/trust stores and passwords. * @param keyStore A {@link Resource} pattern pointing to the keyStore. * @param trustStore A {@link Resource} pattern pointing to the trustStore. - * @param keyStorePassword The passowrd for the keyStore. + * @param keyStorePassword The password for the keyStore. * @param trustStorePassword The password for the trustStore. */ public DefaultTcpSSLContextSupport(String keyStore, String trustStore, diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/MessageConvertingTcpMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/MessageConvertingTcpMessageMapper.java index 8c1f76cba2..332c300659 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/MessageConvertingTcpMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/MessageConvertingTcpMessageMapper.java @@ -31,7 +31,7 @@ public class MessageConvertingTcpMessageMapper extends TcpMessageMapper { private final MessageConverter messageConverter; public MessageConvertingTcpMessageMapper(MessageConverter messageConverter) { - Assert.notNull(messageConverter, "'messasgeConverter' must not be null"); + Assert.notNull(messageConverter, "'messageConverter' must not be null"); this.messageConverter = messageConverter; } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java index db6298fffa..8b75c59d00 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java @@ -166,7 +166,7 @@ public class TcpNioSSLConnection extends TcpNioConnection { } switch (result.getHandshakeStatus()) { case FINISHED: - resumeWriterIfNeeded(); //NOSONAR - fall-through inteded + resumeWriterIfNeeded(); //NOSONAR - fall-through intended // switch fall-through intended case NOT_HANDSHAKING: case NEED_UNWRAP: