From 434ee8b726a084ff858ffee469415d94c4aa057f Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 00:36:10 -0500 Subject: [PATCH 01/10] spelling: concurrency --- src/main/java/com/rabbitmq/utility/IntAllocator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rabbitmq/utility/IntAllocator.java b/src/main/java/com/rabbitmq/utility/IntAllocator.java index b0f25075b7..6032a4dcc8 100644 --- a/src/main/java/com/rabbitmq/utility/IntAllocator.java +++ b/src/main/java/com/rabbitmq/utility/IntAllocator.java @@ -23,7 +23,7 @@ * {@link BitSet} representation of the free integers. *

* - *

Concurrecy Semantics:

+ *

Concurrency Semantics:

* This class is not thread safe. * *

Implementation notes:

From fe751963719d122567d31ac9014f839356023a56 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 00:36:26 -0500 Subject: [PATCH 02/10] spelling: connection --- src/main/java/com/rabbitmq/client/impl/ChannelN.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rabbitmq/client/impl/ChannelN.java b/src/main/java/com/rabbitmq/client/impl/ChannelN.java index 17bee9ffe7..aea0ee7a4b 100644 --- a/src/main/java/com/rabbitmq/client/impl/ChannelN.java +++ b/src/main/java/com/rabbitmq/client/impl/ChannelN.java @@ -602,7 +602,7 @@ public AMQCommand transformReply(AMQCommand command) { boolean notify = false; try { // Synchronize the block below to avoid race conditions in case - // connnection wants to send Connection-CloseOK + // connection wants to send Connection-CloseOK synchronized (_channelMutex) { startProcessShutdownSignal(signal, !initiatedByApplication, true); quiescingRpc(reason, k); From 74a7b39295238400b5c7182c5cba06c6fb546cf1 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 00:41:49 -0500 Subject: [PATCH 03/10] spelling: exchange --- .../rabbitmq/client/test/functional/AlternateExchange.java | 2 +- .../com/rabbitmq/client/test/functional/BindingLifecycle.java | 2 +- .../rabbitmq/client/test/server/DurableBindingLifecycle.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java b/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java index b408cffca0..242e95032b 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java +++ b/src/test/java/com/rabbitmq/client/test/functional/AlternateExchange.java @@ -96,7 +96,7 @@ public void handleReturn(int replyCode, * * @param name the name of the exchange to be created, and queue * to be bound - * @param ae the name of the alternate-exchage + * @param ae the name of the alternate-exchange */ protected void setupRouting(String name, String ae) throws IOException { Map args = new HashMap(); diff --git a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java index 0090d40a45..363bfaebf1 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java +++ b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java @@ -153,7 +153,7 @@ public class BindingLifecycle extends BindingLifecycleBase { * The unsubscribe should cause the queue to auto_delete, which in * turn should cause the exchange to auto_delete. * - * Then re-declare the queue again and try to rebind it to the same exhange. + * Then re-declare the queue again and try to rebind it to the same exchange. * * Because the exchange has been auto-deleted, the bind operation * should fail. diff --git a/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java index 4c4b6fd910..644c21d11a 100644 --- a/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java +++ b/src/test/java/com/rabbitmq/client/test/server/DurableBindingLifecycle.java @@ -85,9 +85,9 @@ private void restartPrimary() throws IOException, TimeoutException { /** * This tests whether the bindings attached to a durable exchange - * are correctly blown away when the exhange is nuked. + * are correctly blown away when the exchange is nuked. * - * This complements a unit test for testing non-durable exhanges. + * This complements a unit test for testing non-durable exchanges. * In that case, an exchange is deleted and you expect any * bindings hanging to it to be deleted as well. To verify this, * the exchange is deleted and then recreated. From a24af9c6c158c8f0a062e1505dbfb79adc012a1d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 00:42:02 -0500 Subject: [PATCH 04/10] spelling: execute --- src/main/java/com/rabbitmq/client/impl/AMQConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java index d65008d96a..48949b4ca4 100644 --- a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java +++ b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java @@ -851,7 +851,7 @@ public void handleConnectionClose(Command closeCommand) { SocketCloseWait scw = new SocketCloseWait(sse); // if shutdown executor is configured, use it. Otherwise - // execut socket close monitor the old fashioned way. + // execute socket close monitor the old fashioned way. // see rabbitmq/rabbitmq-java-client#91 if(shutdownExecutor != null) { shutdownExecutor.execute(scw); From 2cb02675e2cca0fcebc548d50d64fbc926ddbb12 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 00:43:30 -0500 Subject: [PATCH 05/10] spelling: fulfill --- RUNNING_TESTS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RUNNING_TESTS.md b/RUNNING_TESTS.md index a449a0d099..a6da665d52 100644 --- a/RUNNING_TESTS.md +++ b/RUNNING_TESTS.md @@ -21,7 +21,7 @@ can control the running node. `./mvnw verify` will start those nodes with the appropriate configuration. -To easily fullfil all those requirements, you should use `make deps` to +To easily fulfill all those requirements, you should use `make deps` to fetch the dependencies in the `deps` directory. You then run Maven with the `deps.dir` property set like this: From 2f684a878bd521be00a98987f5837972865e16ea Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 00:47:56 -0500 Subject: [PATCH 06/10] spelling: omitted --- src/main/java/com/rabbitmq/client/ConnectionFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java index 9a9ea410ac..87aeb5e945 100644 --- a/src/main/java/com/rabbitmq/client/ConnectionFactory.java +++ b/src/main/java/com/rabbitmq/client/ConnectionFactory.java @@ -307,7 +307,7 @@ public void setVirtualHost(String virtualHost) { /** * Convenience method for setting the fields in an AMQP URI: host, * port, username, password and virtual host. If any part of the - * URI is ommited, the ConnectionFactory's corresponding variable + * URI is omitted, the ConnectionFactory's corresponding variable * is left unchanged. * @param uri is the AMQP URI containing the data */ @@ -366,7 +366,7 @@ public void setUri(URI uri) /** * Convenience method for setting the fields in an AMQP URI: host, * port, username, password and virtual host. If any part of the - * URI is ommited, the ConnectionFactory's corresponding variable + * URI is omitted, the ConnectionFactory's corresponding variable * is left unchanged. Note that not all valid AMQP URIs are * accepted; in particular, the hostname must be given if the * port, username or password are given, and escapes in the From a810eba969c41c068abc8b8fe4dddc34a1936ef0 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 23:29:24 -0500 Subject: [PATCH 07/10] spelling: protocol --- src/main/java/com/rabbitmq/client/ConnectionFactory.java | 4 ++-- .../com/rabbitmq/client/test/SslContextFactoryTest.java | 2 +- .../client/test/ssl/ConnectionFactoryDefaultTlsVersion.java | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java index 87aeb5e945..cbc055bf99 100644 --- a/src/main/java/com/rabbitmq/client/ConnectionFactory.java +++ b/src/main/java/com/rabbitmq/client/ConnectionFactory.java @@ -674,7 +674,7 @@ public boolean isSSL(){ public void useSslProtocol() throws NoSuchAlgorithmException, KeyManagementException { - useSslProtocol(computeDefaultTlsProcotol(SSLContext.getDefault().getSupportedSSLParameters().getProtocols())); + useSslProtocol(computeDefaultTlsProtocol(SSLContext.getDefault().getSupportedSSLParameters().getProtocols())); } /** @@ -777,7 +777,7 @@ protected void enableHostnameVerificationForBlockingIo() { } } - public static String computeDefaultTlsProcotol(String[] supportedProtocols) { + public static String computeDefaultTlsProtocol(String[] supportedProtocols) { if(supportedProtocols != null) { for (String supportedProtocol : supportedProtocols) { if(PREFERRED_TLS_PROTOCOL.equalsIgnoreCase(supportedProtocol)) { diff --git a/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java b/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java index 68ed763cd0..ed930c111e 100644 --- a/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java +++ b/src/test/java/com/rabbitmq/client/test/SslContextFactoryTest.java @@ -129,7 +129,7 @@ private SslContextFactory sslContextFactory() throws Exception { } private String tlsProtocol() throws NoSuchAlgorithmException { - return ConnectionFactory.computeDefaultTlsProcotol(SSLContext.getDefault().getSupportedSSLParameters().getProtocols()); + return ConnectionFactory.computeDefaultTlsProtocol(SSLContext.getDefault().getSupportedSSLParameters().getProtocols()); } private static class TrustNothingTrustManager implements X509TrustManager { diff --git a/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java b/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java index 095c2cbb49..9d6546572b 100644 --- a/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java +++ b/src/test/java/com/rabbitmq/client/test/ssl/ConnectionFactoryDefaultTlsVersion.java @@ -24,19 +24,19 @@ public class ConnectionFactoryDefaultTlsVersion { @Test public void defaultTlsVersionJdk16ShouldTakeFallback() { String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1"}; - String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols); + String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols); Assert.assertEquals("TLSv1",tlsProtocol); } @Test public void defaultTlsVersionJdk17ShouldTakePrefered() { String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"}; - String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols); + String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols); Assert.assertEquals("TLSv1.2",tlsProtocol); } @Test public void defaultTlsVersionJdk18ShouldTakePrefered() { String [] supportedProtocols = {"SSLv2Hello", "SSLv3", "TLSv1", "TLSv1.1", "TLSv1.2"}; - String tlsProtocol = ConnectionFactory.computeDefaultTlsProcotol(supportedProtocols); + String tlsProtocol = ConnectionFactory.computeDefaultTlsProtocol(supportedProtocols); Assert.assertEquals("TLSv1.2",tlsProtocol); } From 8c8bdd30aafcd82c6fa76db32e7d2bcac35a975a Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 23:30:18 -0500 Subject: [PATCH 08/10] spelling: receive --- .../com/rabbitmq/client/test/functional/BindingLifecycle.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java index 363bfaebf1..0223c4c878 100644 --- a/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java +++ b/src/test/java/com/rabbitmq/client/test/functional/BindingLifecycle.java @@ -49,7 +49,7 @@ public class BindingLifecycle extends BindingLifecycleBase { Binding binding = setupExchangeBindings(false); channel.basicPublish(binding.x, binding.k, null, payload); - // Purge the queue, and test that we don't recieve a message + // Purge the queue, and test that we don't receive a message channel.queuePurge(binding.q); GetResponse response = channel.basicGet(binding.q, true); From 9658f446e8a2e6094ac0265581e2471a7720fb1d Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 23:31:36 -0500 Subject: [PATCH 09/10] spelling: targeting --- .../java/com/rabbitmq/client/impl/MethodArgumentWriter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java b/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java index 139f9eb5ea..db2005d32f 100644 --- a/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java +++ b/src/main/java/com/rabbitmq/client/impl/MethodArgumentWriter.java @@ -38,7 +38,7 @@ public class MethodArgumentWriter private int bitMask; /** - * Constructs a MethodArgumentWriter targetting the given DataOutputStream. + * Constructs a MethodArgumentWriter targeting the given DataOutputStream. */ public MethodArgumentWriter(ValueWriter out) { From cce132bfe822c61898a8532a58651e92a9b98565 Mon Sep 17 00:00:00 2001 From: Josh Soref Date: Tue, 12 Feb 2019 23:32:05 -0500 Subject: [PATCH 10/10] spelling: topology --- .../rabbitmq/client/impl/recovery/AutorecoveringConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java index bfd2336a5b..379961971c 100644 --- a/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java +++ b/src/main/java/com/rabbitmq/client/impl/recovery/AutorecoveringConnection.java @@ -681,7 +681,7 @@ private void recoverTopology(final ExecutorService executor) { recoverEntitiesAsynchronously(executor, Utility.copy(recordedBindings)); recoverEntitiesAsynchronously(executor, Utility.copy(consumers).values()); } catch (final Exception cause) { - final String message = "Caught an exception while recovering toplogy: " + cause.getMessage(); + final String message = "Caught an exception while recovering topology: " + cause.getMessage(); final TopologyRecoveryException e = new TopologyRecoveryException(message, cause); getExceptionHandler().handleTopologyRecoveryException(delegate, null, e); }