Fix Javadoc errors on JDK 8/Maven 3.3

Author: michaelklishin

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

@@ -891,10 +891,11 @@ void basicNack(long deliveryTag, boolean multiple, boolean requeue)
     void basicCancel(String consumerTag) throws IOException;
 
     /**
-     * Ask the broker to resend unacknowledged messages.  In 0-8
+     * <p>
+     *  Ask the broker to resend unacknowledged messages.  In 0-8
      * basic.recover is asynchronous; in 0-9-1 it is synchronous, and
      * the new, deprecated method basic.recover_async is asynchronous.
-     * <p/>
+     * </p>
      * Equivalent to calling <code>basicRecover(true)</code>, messages
      * will be requeued and possibly delivered to a different consumer.
      * @see #basicRecover(boolean)

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

@@ -18,15 +18,16 @@
 import java.io.IOException;
 
 /**
- * Interface for application callback objects to receive notifications and messages from
+ * <p>Interface for application callback objects to receive notifications and messages from
  * a queue by subscription.
  * Most implementations will subclass {@link DefaultConsumer}.
- * <p/>
+ * </p>
+ * <p>
  * The methods of this interface are invoked in a dispatch
  * thread which is separate from the {@link Connection}'s thread. This
  * allows {@link Consumer}s to call {@link Channel} or {@link
  * Connection} methods without causing a deadlock.
- * <p/>
+ * </p>
  * The {@link Consumer}s on a particular {@link Channel} are invoked serially on one or more
  * dispatch threads. {@link Consumer}s should avoid executing long-running code
  * because this will delay dispatch of messages to other {@link Consumer}s on the same

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

@@ -30,24 +30,24 @@ public interface LongString
     public static final long MAX_LENGTH = 0xffffffffL;
 
     /**
-     * @return the length of the {@link LongString} in bytes >= 0 <= MAX_LENGTH
+     * @return the length of the string in bytes between 0 and MAX_LENGTH (inclusive)
      */
     public long length();
 
     /**
      * Get the content stream.
      * Repeated calls to this function return the same stream,
      * which may not support rewind.
-     * @return An input stream that reads the content of the {@link LongString}
+     * @return An input stream that reads the content of the string
      * @throws IOException if an error is encountered
      */
     public DataInputStream getStream() throws IOException;
 
     /**
      * Get the content as a byte array.  This need not be a copy. Updates to the
-     * returned array may change the value of the {@link LongString}.
+     * returned array may change the value of the string.
      * Repeated calls to this function may return the same array.
-     * This function will fail if <code><b>this</b>.length() > Integer.MAX_VALUE</code>,
+     * This function will fail if this string's length is greater than {@link Integer#MAX_VALUE},
      * throwing an {@link IllegalStateException}.
      * @return the array of bytes containing the content of the {@link LongString}
      */

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

@@ -74,7 +74,7 @@ public static byte[] encode(Map<String, Object> reply)
     }
 
     /**
-     * Delegates to handleMapCall(Map<String, Object>).
+     * Delegates to {@link MapRpcServer#handleMapCall(Map)}.
      */
     public Map<String, Object> handleMapCall(Map<String, Object> request,
                                              AMQP.BasicProperties replyProperties)
@@ -83,7 +83,7 @@ public Map<String, Object> handleMapCall(Map<String, Object> request,
     }
 
     /**
-     * Default implementation - override in subclasses. Returns the empty string.
+     * Default implementation override in subclasses. Returns the empty string.
      */
     public Map<String, Object> handleMapCall(Map<String, Object> request)
     {
@@ -103,7 +103,7 @@ public void handleCast(byte[] requestBody)
     }
 
     /**
-     * Default implementation - override in subclasses. Does nothing.
+     * Default implementation override in subclasses. Does nothing.
      */
     public void handleMapCast(Map<String, Object> requestBody) {
         // Do nothing.

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

@@ -55,9 +55,8 @@
  *
  * <p>For a more complete example, see LogTail in the <code>test/src/com/rabbitmq/examples</code>
  * directory of the source distribution.</p>
- * <p/>
  *
- * <h4>Historical Perspective</h4>
+ * <h3>Historical Perspective</h3>
  *
  * <p><code>QueueingConsumer</code> was introduced to allow
  * applications to overcome a limitation in the way <code>Connection</code>

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

@@ -125,9 +125,11 @@ public RpcClient(Channel channel, String exchange, String routingKey) throws IOE
 
 
     /**
+     * <p>
      * Construct a new RpcClient that will communicate on the given channel, sending
      * requests to the given exchange with the given routing key.
-     * <p/>
+     * </p>
+     *
      * Causes the creation of a temporary private autodelete queue. The name of this queue will be
      * "amq.rabbitmq.reply-to".
      * @param channel the channel to use for communication

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

@@ -34,7 +34,6 @@ public interface SaslMechanism {
      * @param username name of user
      * @param password for username
      * @return response
-     * @throws IOException
      */
     LongString handleChallenge(LongString challenge, String username, String password);
 }

src/main/java/com/rabbitmq/client/impl/AMQCommand.java

@@ -23,10 +23,10 @@
 import com.rabbitmq.client.Command;
 
 /**
- * AMQ-specific implementation of {@link Command} which accumulates
+ * AMQP 0-9-1-specific implementation of {@link Command} which accumulates
  * method, header and body from a series of frames, unless these are
  * supplied at construction time.
- * <p/><b>Concurrency</b><br/>
+ * <h2>Concurrency</h2>
  * This class is thread-safe.
  */
 public class AMQCommand implements Command {

src/main/java/com/rabbitmq/client/impl/Frame.java

@@ -307,7 +307,7 @@ else if(value == null) {
         return acc;
     }
 
-    /** Computes the AMQP wire-protocol length of an encoded field-array of type List<?> */
+    /** Computes the AMQP 0-9-1 wire-protocol length of an encoded field-array of type List */
     public static long arraySize(List<?> values)
         throws UnsupportedEncodingException
     {

src/main/java/com/rabbitmq/client/impl/FrameHandler.java

@@ -22,8 +22,7 @@
 
 /**
  * Interface to a frame handler.
- * <p/>
- * <b>Concurrency</b><br/>
+ * <h2>Concurrency</h2>
  * Implementations must be thread-safe, and not allow frames to be interleaved, either while reading or writing.
  */