diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1f6ef1c576..08697906fd 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -40,5 +40,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden with regard to the reporter of an incident. This Code of Conduct is adapted from the -[Contributor Covenant](http://contributor-covenant.org), version 1.3.0, available at -[contributor-covenant.org/version/1/3/0/](http://contributor-covenant.org/version/1/3/0/) +[Contributor Covenant](https://contributor-covenant.org), version 1.3.0, available at +[contributor-covenant.org/version/1/3/0/](https://contributor-covenant.org/version/1/3/0/) diff --git a/LICENSE-MPL-RabbitMQ b/LICENSE-MPL-RabbitMQ index 02ee669400..b237a959b0 100644 --- a/LICENSE-MPL-RabbitMQ +++ b/LICENSE-MPL-RabbitMQ @@ -437,7 +437,7 @@ EXHIBIT A -Mozilla Public License. ``The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.mozilla.org/MPL/ + https://www.mozilla.org/MPL/ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the diff --git a/README.in b/README.in index e9ccd32f24..c00367a7ab 100644 --- a/README.in +++ b/README.in @@ -1,4 +1,4 @@ -Please see http://www.rabbitmq.com/build-java-client.html for build +Please see https://www.rabbitmq.com/build-java-client.html for build instructions. For your convenience, a text copy of these instructions is available diff --git a/README.md b/README.md index 6bd933a167..18bc738950 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # RabbitMQ Java Client -This repository contains source code of the [RabbitMQ Java client](http://www.rabbitmq.com/api-guide.html). -The client is maintained by the [RabbitMQ team at Pivotal](http://github.com/rabbitmq/). +This repository contains source code of the [RabbitMQ Java client](https://www.rabbitmq.com/api-guide.html). +The client is maintained by the [RabbitMQ team at Pivotal](https://github.com/rabbitmq/). ## Dependency (Maven Artifact) -Maven artifacts are [released to Maven Central](http://search.maven.org/#search%7Cga%7C1%7Cg%3Acom.rabbitmq%20a%3Aamqp-client) +Maven artifacts are [released to Maven Central](https://search.maven.org/#search%7Cga%7C1%7Cg%3Acom.rabbitmq%20a%3Aamqp-client) via [RabbitMQ Maven repository on Bintray](https://bintray.com/rabbitmq/maven). There's also a [Maven repository with milestone releases](https://bintray.com/rabbitmq/maven-milestones). [Snapshots are available](https://oss.sonatype.org/content/repositories/snapshots/com/rabbitmq/amqp-client/) as well. diff --git a/doc/channels/worktransition.graffle b/doc/channels/worktransition.graffle index a8c2d6ce8e..a1feddfa7f 100644 --- a/doc/channels/worktransition.graffle +++ b/doc/channels/worktransition.graffle @@ -1,5 +1,5 @@ - + ActiveLayerIndex diff --git a/src/main/java/com/rabbitmq/client/Channel.java b/src/main/java/com/rabbitmq/client/Channel.java index 6279bf881f..c4312e041a 100644 --- a/src/main/java/com/rabbitmq/client/Channel.java +++ b/src/main/java/com/rabbitmq/client/Channel.java @@ -32,11 +32,11 @@ * this interface are part of the public API. * *

Tutorials

- * RabbitMQ tutorials demonstrate how + * RabbitMQ tutorials demonstrate how * key methods of this interface are used. * *

User Guide

- * See Java Client User Guide. + * See Java Client User Guide. * *

Concurrency Considerations

*

@@ -47,13 +47,13 @@ * multiple threads. While some operations on channels are safe to invoke * concurrently, some are not and will result in incorrect frame interleaving * on the wire. Sharing channels between threads will also interfere with - * Publisher Confirms. + * Publisher Confirms. * * As such, applications need to use a {@link Channel} per thread. *

* - * @see RabbitMQ tutorials - * @see RabbitMQ Java Client User Guide + * @see RabbitMQ tutorials + * @see RabbitMQ Java Client User Guide */ public interface Channel extends ShutdownNotifier, AutoCloseable { /** @@ -243,10 +243,10 @@ public interface Channel extends ShutdownNotifier, AutoCloseable { * protocol exception, which closes the channel. * * Invocations of Channel#basicPublish will eventually block if a - * resource-driven alarm is in effect. + * resource-driven alarm is in effect. * * @see com.rabbitmq.client.AMQP.Basic.Publish - * @see Resource-driven alarms + * @see Resource-driven alarms * @param exchange the exchange to publish the message to * @param routingKey the routing key * @param props other properties for the message - routing headers etc @@ -259,10 +259,10 @@ public interface Channel extends ShutdownNotifier, AutoCloseable { * Publish a message. * * Invocations of Channel#basicPublish will eventually block if a - * resource-driven alarm is in effect. + * resource-driven alarm is in effect. * * @see com.rabbitmq.client.AMQP.Basic.Publish - * @see Resource-driven alarms + * @see Resource-driven alarms * @param exchange the exchange to publish the message to * @param routingKey the routing key * @param mandatory true if the 'mandatory' flag is to be set @@ -280,10 +280,10 @@ void basicPublish(String exchange, String routingKey, boolean mandatory, BasicPr * protocol exception, which closes the channel. * * Invocations of Channel#basicPublish will eventually block if a - * resource-driven alarm is in effect. + * resource-driven alarm is in effect. * * @see com.rabbitmq.client.AMQP.Basic.Publish - * @see Resource-driven alarms + * @see Resource-driven alarms * @param exchange the exchange to publish the message to * @param routingKey the routing key * @param mandatory true if the 'mandatory' flag is to be set diff --git a/src/main/java/com/rabbitmq/client/Connection.java b/src/main/java/com/rabbitmq/client/Connection.java index 3bde680075..2b1c9281ee 100644 --- a/src/main/java/com/rabbitmq/client/Connection.java +++ b/src/main/java/com/rabbitmq/client/Connection.java @@ -23,7 +23,7 @@ import java.util.concurrent.ExecutorService; /** - * Public API: Interface to an AMQ connection. See the see the spec for details. + * Public API: Interface to an AMQ connection. See the see the spec for details. *

* To connect to a broker, fill in a {@link ConnectionFactory} and use a {@link ConnectionFactory} as follows: * @@ -116,7 +116,7 @@ public interface Connection extends ShutdownNotifier, Closeable { // rename to A /** * Create a new channel, using an internally allocated channel number. - * If automatic connection recovery + * If automatic connection recovery * is enabled, the channel returned by this method will be {@link Recoverable}. *

* Use {@link #openChannel()} if you want to use an {@link Optional} to deal @@ -143,7 +143,7 @@ public interface Connection extends ShutdownNotifier, Closeable { // rename to A * Create a new channel wrapped in an {@link Optional}. * The channel number is allocated internally. *

- * If automatic connection recovery + * If automatic connection recovery * is enabled, the channel returned by this method will be {@link Recoverable}. *

* Use {@link #createChannel()} to return directly a {@link Channel} or {@code null}. diff --git a/src/main/java/com/rabbitmq/client/ConnectionFactory.java b/src/main/java/com/rabbitmq/client/ConnectionFactory.java index cbc055bf99..06037b6e24 100644 --- a/src/main/java/com/rabbitmq/client/ConnectionFactory.java +++ b/src/main/java/com/rabbitmq/client/ConnectionFactory.java @@ -493,7 +493,7 @@ public int getShutdownTimeout() { * If server heartbeat timeout is configured to a non-zero value, this method can only be used * to lower the value; otherwise any value provided by the client will be used. * @param requestedHeartbeat the initially requested heartbeat timeout, in seconds; zero for none - * @see RabbitMQ Heartbeats Guide + * @see RabbitMQ Heartbeats Guide */ public void setRequestedHeartbeat(int requestedHeartbeat) { this.requestedHeartbeat = requestedHeartbeat; @@ -789,19 +789,19 @@ public static String computeDefaultTlsProtocol(String[] supportedProtocols) { } /** - * Returns true if automatic connection recovery + * Returns true if automatic connection recovery * is enabled, false otherwise * @return true if automatic connection recovery is enabled, false otherwise - * @see Automatic Recovery + * @see Automatic Recovery */ public boolean isAutomaticRecoveryEnabled() { return automaticRecovery; } /** - * Enables or disables automatic connection recovery. + * Enables or disables automatic connection recovery. * @param automaticRecovery if true, enables connection recovery - * @see Automatic Recovery + * @see Automatic Recovery */ public void setAutomaticRecoveryEnabled(boolean automaticRecovery) { this.automaticRecovery = automaticRecovery; @@ -810,7 +810,7 @@ public void setAutomaticRecoveryEnabled(boolean automaticRecovery) { /** * Returns true if topology recovery is enabled, false otherwise * @return true if topology recovery is enabled, false otherwise - * @see Automatic Recovery + * @see Automatic Recovery */ public boolean isTopologyRecoveryEnabled() { return topologyRecovery; @@ -819,7 +819,7 @@ public boolean isTopologyRecoveryEnabled() { /** * Enables or disables topology recovery * @param topologyRecovery if true, enables topology recovery - * @see Automatic Recovery + * @see Automatic Recovery */ public void setTopologyRecoveryEnabled(boolean topologyRecovery) { this.topologyRecovery = topologyRecovery; @@ -873,7 +873,7 @@ protected synchronized FrameHandlerFactory createFrameHandlerFactory() throws IO * Create a new broker connection, picking the first available address from * the list. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address from the provided list. * @@ -889,14 +889,14 @@ public Connection newConnection(Address[] addrs) throws IOException, TimeoutExce * Create a new broker connection, picking the first available address from * the list provided by the {@link AddressResolver}. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address provided by the {@link AddressResolver}. * * @param addressResolver discovery service to list potential addresses (hostname/port pairs) to connect to * @return an interface to the connection * @throws IOException if it encounters a problem - * @see Automatic Recovery + * @see Automatic Recovery */ public Connection newConnection(AddressResolver addressResolver) throws IOException, TimeoutException { return newConnection(this.sharedExecutor, addressResolver, null); @@ -907,7 +907,7 @@ public Connection newConnection(AddressResolver addressResolver) throws IOExcept * Create a new broker connection with a client-provided name, picking the first available address from * the list. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address from the provided list. * @@ -928,7 +928,7 @@ public Connection newConnection(Address[] addrs, String clientProvidedName) thro * Create a new broker connection, picking the first available address from * the list. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address from the provided list. * @@ -944,7 +944,7 @@ public Connection newConnection(List

addrs) throws IOException, Timeout * Create a new broker connection with a client-provided name, picking the first available address from * the list. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address from the provided list. * @@ -965,7 +965,7 @@ public Connection newConnection(List
addrs, String clientProvidedName) * Create a new broker connection, picking the first available address from * the list. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address from the provided list. * @@ -973,7 +973,7 @@ public Connection newConnection(List
addrs, String clientProvidedName) * @param addrs an array of known broker addresses (hostname/port pairs) to try in order * @return an interface to the connection * @throws java.io.IOException if it encounters a problem - * @see Automatic Recovery + * @see Automatic Recovery */ public Connection newConnection(ExecutorService executor, Address[] addrs) throws IOException, TimeoutException { return newConnection(executor, Arrays.asList(addrs), null); @@ -984,7 +984,7 @@ public Connection newConnection(ExecutorService executor, Address[] addrs) throw * Create a new broker connection with a client-provided name, picking the first available address from * the list. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address from the provided list. * @@ -997,7 +997,7 @@ public Connection newConnection(ExecutorService executor, Address[] addrs) throw * This value is supposed to be human-readable. * @return an interface to the connection * @throws java.io.IOException if it encounters a problem - * @see Automatic Recovery + * @see Automatic Recovery */ public Connection newConnection(ExecutorService executor, Address[] addrs, String clientProvidedName) throws IOException, TimeoutException { return newConnection(executor, Arrays.asList(addrs), clientProvidedName); @@ -1007,7 +1007,7 @@ public Connection newConnection(ExecutorService executor, Address[] addrs, Strin * Create a new broker connection, picking the first available address from * the list. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address from the provided list. * @@ -1015,7 +1015,7 @@ public Connection newConnection(ExecutorService executor, Address[] addrs, Strin * @param addrs a List of known broker addrs (hostname/port pairs) to try in order * @return an interface to the connection * @throws java.io.IOException if it encounters a problem - * @see Automatic Recovery + * @see Automatic Recovery */ public Connection newConnection(ExecutorService executor, List
addrs) throws IOException, TimeoutException { return newConnection(executor, addrs, null); @@ -1025,7 +1025,7 @@ public Connection newConnection(ExecutorService executor, List
addrs) t * Create a new broker connection, picking the first available address from * the list provided by the {@link AddressResolver}. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address provided by the {@link AddressResolver}. * @@ -1033,7 +1033,7 @@ public Connection newConnection(ExecutorService executor, List
addrs) t * @param addressResolver discovery service to list potential addresses (hostname/port pairs) to connect to * @return an interface to the connection * @throws java.io.IOException if it encounters a problem - * @see Automatic Recovery + * @see Automatic Recovery */ public Connection newConnection(ExecutorService executor, AddressResolver addressResolver) throws IOException, TimeoutException { return newConnection(executor, addressResolver, null); @@ -1043,7 +1043,7 @@ public Connection newConnection(ExecutorService executor, AddressResolver addres * Create a new broker connection with a client-provided name, picking the first available address from * the list. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address from the provided list. * @@ -1056,7 +1056,7 @@ public Connection newConnection(ExecutorService executor, AddressResolver addres * This value is supposed to be human-readable. * @return an interface to the connection * @throws java.io.IOException if it encounters a problem - * @see Automatic Recovery + * @see Automatic Recovery */ public Connection newConnection(ExecutorService executor, List
addrs, String clientProvidedName) throws IOException, TimeoutException { @@ -1067,7 +1067,7 @@ public Connection newConnection(ExecutorService executor, List
addrs, S * Create a new broker connection with a client-provided name, picking the first available address from * the list provided by the {@link AddressResolver}. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Future * reconnection attempts will pick a random accessible address provided by the {@link AddressResolver}. * @@ -1080,7 +1080,7 @@ public Connection newConnection(ExecutorService executor, List
addrs, S * This value is supposed to be human-readable. * @return an interface to the connection * @throws java.io.IOException if it encounters a problem - * @see Automatic Recovery + * @see Automatic Recovery */ public Connection newConnection(ExecutorService executor, AddressResolver addressResolver, String clientProvidedName) throws IOException, TimeoutException { @@ -1171,7 +1171,7 @@ protected AMQConnection createConnection(ConnectionParams params, FrameHandler f /** * Create a new broker connection. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Reconnection * attempts will always use the address configured on {@link ConnectionFactory}. * @@ -1185,7 +1185,7 @@ public Connection newConnection() throws IOException, TimeoutException { /** * Create a new broker connection. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Reconnection * attempts will always use the address configured on {@link ConnectionFactory}. * @@ -1201,7 +1201,7 @@ public Connection newConnection(String connectionName) throws IOException, Timeo /** * Create a new broker connection. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Reconnection * attempts will always use the address configured on {@link ConnectionFactory}. * @@ -1216,7 +1216,7 @@ public Connection newConnection(ExecutorService executor) throws IOException, Ti /** * Create a new broker connection. * - * If automatic connection recovery + * If automatic connection recovery * is enabled, the connection returned by this method will be {@link Recoverable}. Reconnection * attempts will always use the address configured on {@link ConnectionFactory}. * diff --git a/src/main/java/com/rabbitmq/client/Method.java b/src/main/java/com/rabbitmq/client/Method.java index 46afe1f459..393f64cc1b 100644 --- a/src/main/java/com/rabbitmq/client/Method.java +++ b/src/main/java/com/rabbitmq/client/Method.java @@ -18,7 +18,7 @@ /** * Public interface to objects representing an AMQP 0-9-1 method - * @see http://www.rabbitmq.com/specification.html. + * @see https://www.rabbitmq.com/specification.html. */ public interface Method { diff --git a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java index 5f059edff9..80ea32bb3d 100644 --- a/src/main/java/com/rabbitmq/client/impl/AMQConnection.java +++ b/src/main/java/com/rabbitmq/client/impl/AMQConnection.java @@ -36,7 +36,7 @@ final class Copyright { final static String COPYRIGHT="Copyright (c) 2007-2019 Pivotal Software, Inc."; - final static String LICENSE="Licensed under the MPL. See http://www.rabbitmq.com/"; + final static String LICENSE="Licensed under the MPL. See https://www.rabbitmq.com/"; } /** diff --git a/src/main/java/com/rabbitmq/client/impl/VariableLinkedBlockingQueue.java b/src/main/java/com/rabbitmq/client/impl/VariableLinkedBlockingQueue.java index 3447b07e34..33b4303294 100644 --- a/src/main/java/com/rabbitmq/client/impl/VariableLinkedBlockingQueue.java +++ b/src/main/java/com/rabbitmq/client/impl/VariableLinkedBlockingQueue.java @@ -21,7 +21,7 @@ /* * Written by Doug Lea with assistance from members of JCP JSR-166 * Expert Group and released to the public domain, as explained at - * http://creativecommons.org/licenses/publicdomain + * https://creativecommons.org/licenses/publicdomain */ package com.rabbitmq.client.impl; diff --git a/src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java b/src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java index 514e4d9843..88f3939fef 100644 --- a/src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java +++ b/src/main/java/com/rabbitmq/tools/jsonrpc/JsonRpcClient.java @@ -31,8 +31,8 @@ import java.util.concurrent.TimeoutException; /** - * JSON-RPC is a lightweight - * RPC mechanism using JSON + * JSON-RPC is a lightweight + * RPC mechanism using JSON * as a data language for request and reply messages. It is * rapidly becoming a standard in web development, where it is * used to make RPC requests over HTTP. RabbitMQ provides an diff --git a/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java b/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java index c99dc3eb7b..11cd5bf248 100644 --- a/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java +++ b/src/test/java/com/rabbitmq/client/test/AmqpUriTest.java @@ -63,7 +63,7 @@ public class AmqpUriTest extends BrokerTestCase "user", "pass", "[::1]", 100, "/"); /* Various failure cases */ - parseFail("http://www.rabbitmq.com"); + parseFail("https://www.rabbitmq.com"); parseFail("amqp://foo[::1]"); parseFail("amqp://foo:[::1]"); parseFail("amqp://[::1]foo"); diff --git a/src/test/java/com/rabbitmq/client/test/TestUtils.java b/src/test/java/com/rabbitmq/client/test/TestUtils.java index adc5ffb759..b385c73fde 100644 --- a/src/test/java/com/rabbitmq/client/test/TestUtils.java +++ b/src/test/java/com/rabbitmq/client/test/TestUtils.java @@ -221,7 +221,7 @@ private static void wait(CountDownLatch latch) throws InterruptedException { } /** - * http://stackoverflow.com/questions/6701948/efficient-way-to-compare-version-strings-in-java + * https://stackoverflow.com/questions/6701948/efficient-way-to-compare-version-strings-in-java */ static int versionCompare(String str1, String str2) { String[] vals1 = str1.split("\\.");