diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java index 75e9d98bfe..4d0685d4d7 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/Base64.java @@ -19,7 +19,7 @@ import java.nio.charset.StandardCharsets; /** *

Encodes and decodes to and from Base64 notation.

*

Homepage: http://iharder.net/base64.

- *

The options parameter, which appears in a few places, is used to pass + *

The options parameter, which appears in a few places, is used to pass * several pieces of information to the encoder. In the "higher level" methods such as * encodeBytes( bytes, options ) the options parameter can be used to indicate such * things as first gzipping the bytes before encoding them, not inserting linefeeds @@ -66,9 +66,9 @@ import java.nio.charset.StandardCharsets; * when data that's being decoded is gzip-compressed and will decompress it * automatically. Generally things are cleaner. You'll probably have to * change some method calls that you were making to support the new - * options format (ints that you "OR" together). + * options format (ints that you "OR" together). *

  • v1.5.1 - Fixed bug when decompressing and decoding to a - * byte[] using decode( String s, boolean gzipCompressed ). + * byte[] using decode( String s, boolean gzipCompressed ). * Added the ability to "suspend" encoding in the Output Stream so * you can turn on and off the encoding if you need to embed base64 * data in an otherwise "normal" stream (like an XML file).
  • @@ -484,7 +484,7 @@ public class Base64 { * Serializes an object and returns the Base64-encoded * version of that serialized object. If the object * cannot be serialized or there is another error, - * the method will return null. + * the method will return null. * The object is not GZip-compressed before being encoded. * * @param serializableObject The object to encode @@ -499,7 +499,7 @@ public class Base64 { * Serializes an object and returns the Base64-encoded * version of that serialized object. If the object * cannot be serialized or there is another error, - * the method will return null. + * the method will return null. *

    * Valid options:

         *   GZIP: gzip-compresses object before encoding it.
    @@ -931,7 +931,7 @@ public class Base64 {
     
        /**
         * Attempts to decode Base64 data and deserialize a Java
    -    * Object within. Returns null if there was an error.
    +    * Object within. Returns null if there was an error.
         *
         * @param encodedObject The Base64 data to decode
         * @return The decoded and deserialized object
    @@ -972,7 +972,7 @@ public class Base64 {
         *
         * @param dataToEncode byte array of data to encode in base64 form
         * @param filename     Filename for saving encoded data
    -    * @return true if successful, false otherwise
    +    * @return true if successful, false otherwise
         * @since 2.1
         */
        public static boolean encodeToFile(final byte[] dataToEncode, final String filename) {
    @@ -1000,7 +1000,7 @@ public class Base64 {
         *
         * @param dataToDecode Base64-encoded data as a string
         * @param filename     Filename for saving decoded data
    -    * @return true if successful, false otherwise
    +    * @return true if successful, false otherwise
         * @since 2.1
         */
        public static boolean decodeToFile(final String dataToDecode, final String filename) {
    @@ -1116,7 +1116,7 @@ public class Base64 {
        } // end encodeFromFile
     
        /**
    -    * Reads infile and encodes it to outfile.
    +    * Reads infile and encodes it to outfile.
         *
         * @param infile  Input file
         * @param outfile Output file
    @@ -1153,7 +1153,7 @@ public class Base64 {
        } // end encodeFileToFile
     
        /**
    -    * Reads infile and decodes it to outfile.
    +    * Reads infile and decodes it to outfile.
         *
         * @param infile  Input file
         * @param outfile Output file
    @@ -1193,7 +1193,7 @@ public class Base64 {
     
        /**
         * A {@link Base64.InputStream} will read data from another
    -    * java.io.InputStream, given in the constructor,
    +    * java.io.InputStream, given in the constructor,
         * and encode/decode to/from Base64 notation on the fly.
         *
         * @see Base64
    @@ -1224,7 +1224,7 @@ public class Base64 {
           /**
            * Constructs a {@link Base64.InputStream} in DECODE mode.
            *
    -       * @param in the java.io.InputStream from which to read data.
    +       * @param in the java.io.InputStream from which to read data.
            * @since 1.3
            */
           public InputStream(final java.io.InputStream in) {
    @@ -1244,7 +1244,7 @@ public class Base64 {
            * 

    * Example: new Base64.InputStream( in, Base64.DECODE ) * - * @param in the java.io.InputStream from which to read data. + * @param in the java.io.InputStream from which to read data. * @param options Specified options * @see Base64#ENCODE * @see Base64#DECODE @@ -1404,7 +1404,7 @@ public class Base64 { /** * A {@link Base64.OutputStream} will write data to another - * java.io.OutputStream, given in the constructor, + * java.io.OutputStream, given in the constructor, * and encode/decode to/from Base64 notation on the fly. * * @see Base64 @@ -1437,7 +1437,7 @@ public class Base64 { /** * Constructs a {@link Base64.OutputStream} in ENCODE mode. * - * @param out the java.io.OutputStream to which data will be written. + * @param out the java.io.OutputStream to which data will be written. * @since 1.3 */ public OutputStream(final java.io.OutputStream out) { @@ -1457,7 +1457,7 @@ public class Base64 { *

    * Example: new Base64.OutputStream( out, Base64.ENCODE ) * - * @param out the java.io.OutputStream to which data will be written. + * @param out the java.io.OutputStream to which data will be written. * @param options Specified options. * @see Base64#ENCODE * @see Base64#DECODE diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/InetAddresses.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/InetAddresses.java index 3d4f089d2c..021d805b71 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/InetAddresses.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/InetAddresses.java @@ -44,21 +44,21 @@ import static org.apache.activemq.artemis.utils.ByteUtil.intFromBytes; * *

    Examples of IP addresses and their byte representations: *

    * diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java index d99871567d..e71c57ffcb 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/SpawnedVMSupport.java @@ -171,7 +171,7 @@ public class SpawnedVMSupport { * @param logOutput * @param logErrorOutput * @param useLogging - * @param debugPort if <=0 it means no debug + * @param debugPort if <=0 it means no debug * @param args * @return * @throws IOException diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedList.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedList.java index f55d9e1a0c..49981fdb52 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedList.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentAppendOnlyChunkedList.java @@ -64,7 +64,7 @@ public final class ConcurrentAppendOnlyChunkedList { private volatile long cachedLastIndex = 0; /** - * @throws IllegalArgumentException if {@code chunkSize} is <0 or not a power of 2 + * @throws IllegalArgumentException if {@code chunkSize} is <0 or not a power of 2 */ public ConcurrentAppendOnlyChunkedList(final int chunkSize) { if (chunkSize <= 0) { diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMap.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMap.java index 32dd819abe..e632f0249a 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMap.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashMap.java @@ -33,9 +33,9 @@ import static org.apache.activemq.artemis.utils.Preconditions.checkNotNull; /** * Map from long to an Object. * - * Provides similar methods as a ConcurrentMap with 2 differences: + * Provides similar methods as a {@literal ConcurrentMap} with 2 differences: *
      - *
    1. No boxing/unboxing from long -> Long + *
    2. No boxing/unboxing from {@literal long -> Long} *
    3. Open hash map with linear probing, no node allocations to store the values *
    * diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java index 90efca13f4..f46e602486 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/ConcurrentLongHashSet.java @@ -34,7 +34,7 @@ import static org.apache.activemq.artemis.utils.Preconditions.checkArgument; * Provides similar methods as a ConcurrentSet<Long> but since it's an open hash map with linear probing, no node * allocations are required to store the values. *

    - * Items MUST be >= 0. + * Items MUST be >= 0. */ public class ConcurrentLongHashSet { diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LongHashSet.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LongHashSet.java index a86a7f2b1f..201bb93ba9 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LongHashSet.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/LongHashSet.java @@ -28,7 +28,7 @@ import java.util.NoSuchElementException; import java.util.Set; /** - * A hash set implementation of {@link Set} that uses open addressing values. + * A hash set implementation of {@literal Set} that uses open addressing values. * To minimize the memory footprint, this class uses open addressing rather than chaining. * Collisions are resolved using linear probing. Deletions implement compaction, so cost of * remove can approach O(N) for full maps, which makes a small loadFactor recommended. diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SparseArrayLinkedList.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SparseArrayLinkedList.java index f6b2a518aa..e77fcbe3c8 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SparseArrayLinkedList.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/SparseArrayLinkedList.java @@ -28,7 +28,7 @@ import java.util.function.Predicate; * it's a linked list of arrays/chunks of {@code T}.
    * Differently from an {@code UnrolledLinkedList} this list doesn't optimize addition and removal to achieve a balanced * utilization among chunks ie a chunk is removed only if empty and chunks can't be merged. - * This list has been optimized for small-sized chunks (ideally <= 32 elements): this allow search/removal to + * This list has been optimized for small-sized chunks (ideally <= 32 elements): this allow search/removal to * be performed with a greedy approach despite a sparse chunk utilization (ie chunks contains few sparse elements).
    * * From the memory footprint's point of view, this list won't remove the last remaining array although empty to optimize diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/UpdatableIterator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/UpdatableIterator.java index d4e15fa50c..204f672697 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/UpdatableIterator.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/UpdatableIterator.java @@ -52,8 +52,6 @@ public class UpdatableIterator implements ResettableIterator, RepeatableIt * It is important that on nulling off the changedIterator, we atomically compare and set as the * changedIterator could be further updated by another thread whilst we are resetting, * the subsequent update simply would be picked up on the next reset. - * - * @return this (itself). */ @Override public void reset() { diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalComponent.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalComponent.java index 837b1ab346..39d46141b6 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalComponent.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/critical/CriticalComponent.java @@ -22,7 +22,7 @@ package org.apache.activemq.artemis.utils.critical; * You update a long every time you enter a critical path * you update a different long with a System.nanoTime every time you leave that path. * - * If the enterCritical > leaveCritical at any point, then you need to measure the timeout. + * If the enterCritical > leaveCritical at any point, then you need to measure the timeout. * if the system stops responding, then you have something irresponsive at the system. */ public interface CriticalComponent { diff --git a/artemis-core-client/pom.xml b/artemis-core-client/pom.xml index 3048279f51..058a90a686 100644 --- a/artemis-core-client/pom.xml +++ b/artemis-core-client/pom.xml @@ -146,7 +146,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9 true 128m diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java index f8053c9d7d..4ade8bb268 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/Message.java @@ -179,7 +179,7 @@ public interface Message { byte STREAM_TYPE = 6; - /** The message will contain another message persisted through {@link org.apache.activemq.artemis.spi.core.protocol.EmbedMessageUtil}*/ + /** The message will contain another message persisted through {@literal org.apache.activemq.artemis.spi.core.protocol.EmbedMessageUtil}*/ byte EMBEDDED_TYPE = 7; /** This is to embedd Large Messages from other protocol */ diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java index 7ad2c6becd..781e59e98d 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/message/impl/CoreMessage.java @@ -211,7 +211,6 @@ public class CoreMessage extends RefCountMessage implements ICoreMessage { * This will return the proper buffer to represent the data of the Message. If compressed it will decompress. * If large, it will read from the file or streaming. * @return - * @throws ActiveMQException */ @Override public ActiveMQBuffer getDataBuffer() { diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/ComponentConfigurationRoutingType.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/ComponentConfigurationRoutingType.java index 780572e574..d9ad4dd838 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/ComponentConfigurationRoutingType.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/server/ComponentConfigurationRoutingType.java @@ -18,7 +18,7 @@ package org.apache.activemq.artemis.core.server; /** * This class essentially mirrors {@code RoutingType} except it has some additional members to support special - * configuration semantics for diverts & bridges. These additional members weren't put in {@code RoutingType} + * configuration semantics for diverts and bridges. These additional members weren't put in {@code RoutingType} * so as to not confuse users. */ public enum ComponentConfigurationRoutingType { diff --git a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java index bf57e9ace5..ce6dc6f192 100644 --- a/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java +++ b/artemis-jdbc-store/src/main/java/org/apache/activemq/artemis/jdbc/store/drivers/JDBCUtils.java @@ -40,7 +40,7 @@ public class JDBCUtils { } /** - * Append to {@code errorMessage} a detailed description of the provided {@link SQLException}.
    + * Append to {@code errorMessage} a detailed description of the provided {@link SQLException}.
    * The information appended are: *

      *
    • SQL STATEMENTS
    • @@ -61,7 +61,7 @@ public class JDBCUtils { } /** - * Append to {@code errorMessage} a detailed description of the provided {@link SQLException}.
      + * Append to {@code errorMessage} a detailed description of the provided {@link SQLException}.
      * The information appended are: *
        *
      • SQL EXCEPTIONS details ({@link SQLException#getSQLState}, diff --git a/artemis-jms-client/pom.xml b/artemis-jms-client/pom.xml index c844950e91..01fdb4615e 100644 --- a/artemis-jms-client/pom.xml +++ b/artemis-jms-client/pom.xml @@ -89,7 +89,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9 true 128m diff --git a/artemis-jms-server/pom.xml b/artemis-jms-server/pom.xml index 82e54c41d7..905d249436 100644 --- a/artemis-jms-server/pom.xml +++ b/artemis-jms-server/pom.xml @@ -104,7 +104,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.9 true 128m diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java index 942f88ceaa..91f98953c3 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/buffer/TimedBuffer.java @@ -527,7 +527,6 @@ public final class TimedBuffer extends CriticalComponentImpl { * Sub classes (tests basically) can use this to override how the sleep is being done * * @param sleepNanos - * @throws InterruptedException */ protected void sleep(long sleepNanos) { LockSupport.parkNanos(sleepNanos); diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/ByteBufferPool.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/ByteBufferPool.java index bebb514186..7aac7506b6 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/ByteBufferPool.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/util/ByteBufferPool.java @@ -30,7 +30,7 @@ import java.nio.ByteBuffer; public interface ByteBufferPool { /** - * It returns a {@link ByteBuffer} with {@link ByteBuffer#capacity()}>={@code size}.
        + * It returns a {@link ByteBuffer} with {@link ByteBuffer#capacity()} >= {@code size}.
        * The {@code buffer} is zeroed until {@code size} if {@code zeroed=true}, with {@link ByteBuffer#position()}=0 and {@link ByteBuffer#limit()}={@code size}. */ ByteBuffer borrow(int size, boolean zeroed); diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java index d5d4a81e6f..af443c4644 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalImpl.java @@ -1846,7 +1846,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal /** *

        Load data accordingly to the record layouts

        *

        Basic record layout:

        - * + *
        + * * * * @@ -1860,7 +1861,8 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal *
        Field NameSize
        RecordTypeByte (1)
        FileIDInteger (4 bytes)
        *

        The check-size is used to validate if the record is valid and complete

        *

        Commit/Prepare record layout:

        - * + *
        + * * * * diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java index 967d971d06..8e8428ada6 100644 --- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java +++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQConsumerResource.java @@ -32,10 +32,10 @@ import org.apache.activemq.artemis.api.core.RoutingType; * *
        
          * public class SimpleTest {
        - *     @Rule
        + *     @Rule
          *     public ActiveMQConsumerResource client = new ActiveMQProducerResource( "vm://0", "test.queue" );
          *
        - *     @Test
        + *     @Test
          *     public void testSomething() throws Exception {
          *         // Use the embedded client here
          *         ClientMessage message = client.receiveMessage();
        diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
        index 612ab45018..027ada94d0 100644
        --- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
        +++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQDynamicProducerResource.java
        @@ -32,10 +32,10 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
          *
          * 
        
          * public class SimpleTest {
        - *     @Rule
        + *     @Rule
          *     public ActiveMQDynamicProducerResource producer = new ActiveMQDynamicProducerResource( "vm://0");
          *
        - *     @Test
        + *     @Test
          *     public void testSomething() throws Exception {
          *         // Use the embedded ClientProducer here
          *         producer.sendMessage( "test.address", "String Body" );
        diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
        index 33ae4d26d3..75d413e57f 100644
        --- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
        +++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/ActiveMQProducerResource.java
        @@ -33,10 +33,10 @@ import org.apache.activemq.artemis.api.core.client.ServerLocator;
          *
          * 
        
          * public class SimpleTest {
        - *     @Rule
        + *     @Rule
          *     public ActiveMQProducerResource producer = new ActiveMQProducerResource( "vm://0", "test.queue");
          *
        - *     @Test
        + *     @Test
          *     public void testSomething() throws Exception {
          *         // Use the embedded ClientProducer here
          *         producer.sendMessage( "String Body" );
        diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
        index 6ae3c6ab9c..6c038f295c 100644
        --- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
        +++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedActiveMQResource.java
        @@ -55,10 +55,10 @@ import org.slf4j.LoggerFactory;
          *
          * 
        
          * public class SimpleTest {
        - *     @Rule
        + *     @Rule
          *     public EmbeddedActiveMQResource server = new EmbeddedActiveMQResource();
          *
        - *     @Test
        + *     @Test
          *     public void testSomething() throws Exception {
          *         // Use the embedded server here
          *     }
        diff --git a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
        index be21a6f60d..acd98b87f4 100644
        --- a/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
        +++ b/artemis-junit/src/main/java/org/apache/activemq/artemis/junit/EmbeddedJMSResource.java
        @@ -66,10 +66,10 @@ import org.slf4j.LoggerFactory;
          *
          * 
        
          * public class SimpleTest {
        - *     @Rule
        + *     @Rule
          *     public EmbeddedJMSResource server = new EmbeddedJMSResource();
          *
        - *     @Test
        + *     @Test
          *     public void testSomething() throws Exception {
          *         // Use the embedded server here
          *     }
        diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageIdHelper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageIdHelper.java
        index e53d2cc5d6..baf08aeefb 100644
        --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageIdHelper.java
        +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/AMQPMessageIdHelper.java
        @@ -208,7 +208,7 @@ public class AMQPMessageIdHelper {
             *        the object to be converted
             * @return the AMQP messageId style object
             *
        -    * @throws IllegalArgument
        +    * @throws ActiveMQAMQPIllegalStateException
             *         if the provided baseId String indicates an encoded type but can't
             *         be converted to that type.
             */
        diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
        index 9f7d6f4951..fbc6d8aaa3 100644
        --- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
        +++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
        @@ -288,7 +288,6 @@ public class MQTTConnection implements RemotingConnection {
             * Sets the client ID associated with this connection
             *
             * @param cID
        -    * @return
             */
            @Override
            public void setClientID(String cID) {
        diff --git a/artemis-server/pom.xml b/artemis-server/pom.xml
        index f5436f39b1..d472cd0af8 100644
        --- a/artemis-server/pom.xml
        +++ b/artemis-server/pom.xml
        @@ -222,7 +222,6 @@
                        
                           org.apache.maven.plugins
                           maven-javadoc-plugin
        -                  2.9
                           
                              true
                              128m
        diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
        index 7b495dd355..884a5f9adf 100644
        --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
        +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/LegacyJMSConfiguration.java
        @@ -139,7 +139,6 @@ public class LegacyJMSConfiguration implements Deployable {
             * Parse the topic node as a TopicConfiguration object
             *
             * @param node
        -    * @return topic configuration
             * @throws Exception
             */
            public void parseTopicConfiguration(final Node node) throws Exception {
        @@ -153,7 +152,6 @@ public class LegacyJMSConfiguration implements Deployable {
             * Parse the Queue Configuration node as a QueueConfiguration object
             *
             * @param node
        -    * @return jms queue configuration
             * @throws Exception
             */
            public void parseQueueConfiguration(final Node node) throws Exception {
        diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
        index f42ae97c44..7fe293b476 100644
        --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
        +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/deployers/impl/FileConfigurationParser.java
        @@ -2362,7 +2362,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
         
            /**
             * @param e
        -    * @return
             */
            protected void parseWildcardConfiguration(final Element e, final Configuration mainConfig) {
               WildcardConfiguration conf = mainConfig.getWildcardConfiguration();
        diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
        index 206891e536..2510a913d6 100644
        --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
        +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/SimpleAddressManager.java
        @@ -55,12 +55,12 @@ public class SimpleAddressManager implements AddressManager {
            private final StorageManager storageManager;
         
            /**
        -    * HashMap
        +    * {@code HashMap}
             */
            protected final ConcurrentMap mappings = new ConcurrentHashMap<>();
         
            /**
        -    * HashMap
        +    * {@code HashMap}
             */
            private final ConcurrentMap nameMap = new ConcurrentHashMap<>();
         
        diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
        index 514f458897..aff59ec440 100644
        --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
        +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServerSession.java
        @@ -278,7 +278,7 @@ public interface ServerSession extends SecurityAuth {
             * This method invokes {@link ActiveMQServer#createQueue(QueueConfiguration)} with a few client-specific additions:
             * 

          *
        • set the routing type based on the prefixes configured on the acceptor used by the client - *
        • strip any prefixes from the address & queue names (if applicable) + *
        • strip any prefixes from the address and queue names (if applicable) *
        • check authorization based on the client's credentials *
        • enforce queue creation resource limit *
        • set up callbacks to clean up temporary queues once the client disconnects diff --git a/pom.xml b/pom.xml index 9a08153061..92913d2f11 100644 --- a/pom.xml +++ b/pom.xml @@ -882,13 +882,6 @@ - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - org.apache.maven.plugins maven-compiler-plugin @@ -916,17 +909,6 @@ 8 8 - - - - org.apache.maven.plugins - maven-javadoc-plugin - - -Xdoclint:none - - - - java9on @@ -1448,7 +1430,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 + 3.0.1 org.apache.maven.plugins @@ -1836,7 +1818,6 @@ org.apache.maven.plugins maven-javadoc-plugin - 2.10.4 128m 1024m diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java index ff23e67560..86309eb1cb 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpSession.java @@ -180,9 +180,9 @@ public class AmqpSession extends AmqpAbstractResource { * * @param address * the address to which the sender will produce its messages. - * @param senderSettlementMode + * @param senderMode * controls the settlement mode used by the created Sender - * @param receiverSettlementMode + * @param receiverMode * controls the desired settlement mode used by the remote Receiver * * @return a newly created sender that is ready for use. @@ -200,9 +200,9 @@ public class AmqpSession extends AmqpAbstractResource { * * @param address * the address to which the sender will produce its messages. - * @param senderSettlementMode + * @param senderMode * controls the settlement mode used by the created Sender - * @param receiverSettlementMode + * @param receiverMode * controls the desired settlement mode used by the remote Receiver * @param outcomes * specifies the outcomes supported by the sender @@ -387,9 +387,9 @@ public class AmqpSession extends AmqpAbstractResource { * * @param address * the address to which the receiver will subscribe for its messages. - * @param senderSettlementMode + * @param senderMode * controls the desired settlement mode used by the remote Sender - * @param receiverSettlementMode + * @param receiverMode * controls the settlement mode used by the created Receiver * * @return a newly created receiver that is ready for use. @@ -491,9 +491,8 @@ public class AmqpSession extends AmqpAbstractResource { } /** - * Create a receiver instance using the given Source + * Create a receiver instance using the given receiverId * - * @param source the caller created and configured Source used to create the receiver link. * @return a newly created receiver that is ready for use. * @throws Exception if an error occurs while creating the receiver. */ diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java index f93ca6ea8c..7a2017f475 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/util/IdGenerator.java @@ -231,7 +231,7 @@ public class IdGenerator { /** * When using the {@link java.net.InetAddress#getHostName()} method in an - * environment where neither a proper DNS lookup nor an /etc/hosts + * environment where neither a proper DNS lookup nor an /etc/hosts * entry exists for a given host, the following exception will be thrown: * * java.net.UnknownHostException: <hostname>: <hostname> @@ -241,7 +241,7 @@ public class IdGenerator { * Instead of just throwing an UnknownHostException and giving up, this * method grabs a suitable hostname from the exception and prevents the * exception from being thrown. If a suitable hostname cannot be acquired - * from the exception, only then is the UnknownHostException thrown. + * from the exception, only then is the UnknownHostException thrown. * * @return The hostname * @throws UnknownHostException if the given host cannot be looked up.
        Field NameSize
        RecordTypeByte (1)
        FileIDInteger (4 bytes)