Skip to content

Spelling #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Feb 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RUNNING_TESTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/rabbitmq/client/ConnectionFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()));
}

/**
Expand Down Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/rabbitmq/client/impl/AMQConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/rabbitmq/client/impl/ChannelN.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/rabbitmq/utility/IntAllocator.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* {@link BitSet} representation of the free integers.
* </p>
*
* <h2>Concurrecy Semantics:</h2>
* <h2>Concurrency Semantics:</h2>
* This class is <b><i>not</i></b> thread safe.
*
* <h2>Implementation notes:</h2>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, Object> args = new HashMap<String, Object>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down