Merge branch 'master' of github.com:rabbitmq/rabbitmq-java-client

Author: acogoluegnes

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/)

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

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 

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.
 

doc/channels/worktransition.graffle

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "https://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
 	<key>ActiveLayerIndex</key>

src/main/java/com/rabbitmq/client/Channel.java

@@ -32,11 +32,11 @@
  * this interface are part of the public API.
  *
  * <h2>Tutorials</h2>
- * <a href="http://www.rabbitmq.com/getstarted.html">RabbitMQ tutorials</a> demonstrate how
+ * <a href="https://www.rabbitmq.com/getstarted.html">RabbitMQ tutorials</a> demonstrate how
  * key methods of this interface are used.
  *
  * <h2>User Guide</h2>
- * See <a href="http://www.rabbitmq.com/api-guide.html">Java Client User Guide</a>.
+ * See <a href="https://www.rabbitmq.com/api-guide.html">Java Client User Guide</a>.
  *
  * <h2>Concurrency Considerations</h2>
  * <p>
@@ -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
- * <a href="http://www.rabbitmq.com/confirms.html">Publisher Confirms</a>.
+ * <a href="https://www.rabbitmq.com/confirms.html">Publisher Confirms</a>.
  *
  * As such, applications need to use a {@link Channel} per thread.
  * </p>
  *
- * @see <a href="http://www.rabbitmq.com/getstarted.html">RabbitMQ tutorials</a>
- * @see <a href="http://www.rabbitmq.com/api-guide.html">RabbitMQ Java Client User Guide</a>
+ * @see <a href="https://www.rabbitmq.com/getstarted.html">RabbitMQ tutorials</a>
+ * @see <a href="https://www.rabbitmq.com/api-guide.html">RabbitMQ Java Client User Guide</a>
  */
 public interface Channel extends ShutdownNotifier, AutoCloseable {
     /**
@@ -243,10 +243,10 @@ public interface Channel extends ShutdownNotifier, AutoCloseable {
      * protocol exception, which closes the channel.
      *
      * Invocations of <code>Channel#basicPublish</code> will eventually block if a
-     * <a href="http://www.rabbitmq.com/alarms.html">resource-driven alarm</a> is in effect.
+     * <a href="https://www.rabbitmq.com/alarms.html">resource-driven alarm</a> is in effect.
      *
      * @see com.rabbitmq.client.AMQP.Basic.Publish
-     * @see <a href="http://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
+     * @see <a href="https://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
      * @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 <code>Channel#basicPublish</code> will eventually block if a
-     * <a href="http://www.rabbitmq.com/alarms.html">resource-driven alarm</a> is in effect.
+     * <a href="https://www.rabbitmq.com/alarms.html">resource-driven alarm</a> is in effect.
      *
      * @see com.rabbitmq.client.AMQP.Basic.Publish
-     * @see <a href="http://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
+     * @see <a href="https://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
      * @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 <code>Channel#basicPublish</code> will eventually block if a
-     * <a href="http://www.rabbitmq.com/alarms.html">resource-driven alarm</a> is in effect.
+     * <a href="https://www.rabbitmq.com/alarms.html">resource-driven alarm</a> is in effect.
      *
      * @see com.rabbitmq.client.AMQP.Basic.Publish
-     * @see <a href="http://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
+     * @see <a href="https://www.rabbitmq.com/alarms.html">Resource-driven alarms</a>
      * @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

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 <a href="http://www.amqp.org/">spec</a> for details.
+ * Public API: Interface to an AMQ connection. See the see the <a href="https://www.amqp.org/">spec</a> for details.
  * <p>
  * 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 <a href="http://www.rabbitmq.com/api-guide.html#recovery">automatic connection recovery</a>
+     * If <a href="https://www.rabbitmq.com/api-guide.html#recovery">automatic connection recovery</a>
      * is enabled, the channel returned by this method will be {@link Recoverable}.
      * <p>
      * 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.
      * <p>
-     * If <a href="http://www.rabbitmq.com/api-guide.html#recovery">automatic connection recovery</a>
+     * If <a href="https://www.rabbitmq.com/api-guide.html#recovery">automatic connection recovery</a>
      * is enabled, the channel returned by this method will be {@link Recoverable}.
      * <p>
      * Use {@link #createChannel()} to return directly a {@link Channel} or {@code null}.