From 309ce4324c4ab4edfb66470abf9a55d2386732a3 Mon Sep 17 00:00:00 2001 From: Clebert Suconic Date: Tue, 9 Jun 2015 21:09:42 -0400 Subject: [PATCH] Fixing javadoc and removing the -Xdoclint option from the pom.xml Also, since JDK 1.8 is no longer required I'm downgrading the JDK to 1.7 minimal. We can review that back to 1.8 when we really need 1.8 features. --- .../cli/commands/tools/XmlDataImporter.java | 4 ++-- .../org/apache/activemq/artemis/utils/UUID.java | 4 ++-- .../core/client/impl/ClientConsumerImpl.java | 4 ++-- .../wireformat/SessionSendContinuationMessage.java | 2 +- .../core/impl/wireformat/SessionSendMessage.java | 2 +- .../artemis/utils/OrderedExecutorFactory.java | 2 +- .../core/asyncio/impl/AsynchronousFileImpl.java | 6 +++--- .../core/journal/impl/JournalFilesRepository.java | 2 +- .../artemis/core/journal/impl/JournalImpl.java | 6 +++--- .../protocol/openwire/amq/AMQSubscription.java | 1 - .../openwire/amq/AMQTransportConnectionState.java | 3 --- .../org/proton/plug/AMQPConnectionContext.java | 4 ---- .../plug/context/AbstractConnectionContext.java | 5 ----- .../logger/ActiveMQAMQPProtocolMessageBundle.java | 4 ++-- .../java/org/proton/plug/util/ReusableLatch.java | 5 ----- .../activemq/artemis/ra/ActiveMQRALogger.java | 6 +++--- .../artemis/ra/ActiveMQRAMCFProperties.java | 2 +- .../ra/ActiveMQRAManagedConnectionFactory.java | 2 +- .../activemq/artemis/ra/ActiveMQRASession.java | 7 ------- .../artemis/ra/ActiveMQResourceAdapter.java | 7 ++----- .../aerogear/ActiveMQAeroGearBundle.java | 4 ++-- pom.xml | 13 ++++--------- .../java/org/apache/activemq/bugs/AMQ3167Test.java | 8 ++++---- .../java/org/apache/activemq/bugs/AMQ4636Test.java | 4 ++-- .../java/org/apache/activemq/bugs/AMQ4952Test.java | 14 +++++++------- .../java/org/apache/activemq/bugs/AMQ5266Test.java | 2 +- .../bugs/TransactionNotStartedErrorTest.java | 2 +- .../java/org/apache/activemq/security/DoSTest.java | 2 +- .../store/jdbc/JDBCStoreAutoCommitTest.java | 2 +- .../NetworkBridgeProducerFlowControlTest.java | 12 ++++++------ .../extras/jms/bridge/JMSBridgeClusteredTest.java | 2 +- .../artemis/tests/integration/SimpleTest.java | 4 ++-- .../tests/integration/SingleServerSimpleTest.java | 4 ++-- .../integration/client/JmsNettyNioStressTest.java | 8 ++++---- .../client/LargeMessageCompressTest.java | 2 +- .../tests/integration/client/PagingSyncTest.java | 2 +- .../tests/integration/client/PagingTest.java | 2 +- .../cluster/distribution/ClusterTestBase.java | 2 +- .../cluster/failover/AsynchronousFailoverTest.java | 2 +- .../cluster/failover/PagingFailoverTest.java | 2 +- .../cluster/util/RemoteServerConfiguration.java | 2 +- .../tests/integration/discovery/DiscoveryTest.java | 10 +++++----- .../jms/cluster/JMSFailoverListenerTest.java | 2 +- .../integration/jms/cluster/JMSFailoverTest.java | 2 +- .../jms/server/management/JMSQueueControlTest.java | 2 +- .../integration/server/SimpleStartStopTest.java | 2 +- .../stomp/util/StompFrameFactoryV11.java | 2 +- .../artemis/tests/util/JournalExample.java | 2 +- .../artemis/jms/tests/DurableSubscriptionTest.java | 4 ++-- .../jms/tests/MessageWithReadResolveTest.java | 2 +- .../artemis/jms/tests/ReferenceableTest.java | 2 +- .../activemq/artemis/jms/tests/SecurityTest.java | 2 +- .../artemis/jms/tests/selector/SelectorTest.java | 2 +- .../journal/MultiThreadConsumerStressTest.java | 2 +- .../core/client/impl/LargeMessageBufferTest.java | 4 ++-- 55 files changed, 90 insertions(+), 123 deletions(-) diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java index c48bd88948..be42039502 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/XmlDataImporter.java @@ -140,7 +140,7 @@ public final class XmlDataImporter implements Action * This is the normal constructor for programmatic access to the * org.apache.activemq.artemis.core.persistence.impl.journal.XmlDataImporter if the session passed * in uses auto-commit for sends. - *

+ *
* If the session needs to be transactional then use the constructor which takes 2 sessions. * * @param inputStream the stream from which to read the XML for import @@ -154,7 +154,7 @@ public final class XmlDataImporter implements Action /** * This is the constructor to use if you wish to import all messages transactionally. - *

+ *
* Pass in a session which doesn't use auto-commit for sends, and one that does (for management * operations necessary during import). * diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java index af2aab83f2..296f363e83 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUID.java @@ -119,10 +119,10 @@ public final class UUID * identity hash (ie. same contents generate same hash) manually, without * sacrificing speed too much. Although multiplications with modulos would * generate better hashing, let's use just shifts, and do 2 bytes at a time. - *

+ *
* Of course, assuming UUIDs are randomized enough, even simpler approach * might be good enough? - *

+ *
* Is this a good hash? ... one of these days I better read more about basic * hashing techniques I swear! */ diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java index 90eae118c9..0d54e169a2 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientConsumerImpl.java @@ -628,10 +628,10 @@ public final class ClientConsumerImpl implements ClientConsumerInternal * Such messages come from message senders who are configured to compress large messages, and * if some of the messages are compressed below the min-large-message-size limit, they are sent * as regular messages. - *

+ *
* However when decompressing the message, we are not sure how large the message could be.. * for that reason we fake a large message controller that will deal with the message as it was a large message - *

+ *
* Say that you sent a 1G message full of spaces. That could be just bellow 100K compressed but you wouldn't have * enough memory to decompress it */ diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java index ba2a96c139..fd8d50d07c 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage.java @@ -31,7 +31,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage private MessageInternal message; /** * In case, we are using a different handler than the one set on the {@link org.apache.activemq.artemis.api.core.client.ClientSession} - *

+ *
* This field is only used at the client side. * * @see org.apache.activemq.artemis.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java index 86b5cb1f21..f0fd112a91 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendMessage.java @@ -29,7 +29,7 @@ public class SessionSendMessage extends MessagePacket /** * In case, we are using a different handler than the one set on the {@link org.apache.activemq.artemis.api.core.client.ClientSession} - *

+ *
* This field is only used at the client side. * * @see org.apache.activemq.artemis.api.core.client.ClientSession#setSendAcknowledgementHandler(SendAcknowledgementHandler) diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java index 7f3447ff3a..b9f92fb8a7 100644 --- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java +++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/OrderedExecutorFactory.java @@ -52,7 +52,7 @@ public final class OrderedExecutorFactory implements ExecutorFactory /** * An executor that always runs all tasks in order, using a delegate executor to run the tasks. - *

+ *
* More specifically, any call B to the {@link #execute(Runnable)} method that happens-after another call A to the * same method, will result in B's task running after A's. */ diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/AsynchronousFileImpl.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/AsynchronousFileImpl.java index fdb047b721..be4d885f51 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/AsynchronousFileImpl.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/asyncio/impl/AsynchronousFileImpl.java @@ -54,7 +54,7 @@ public class AsynchronousFileImpl implements AsynchronousFile /** * This definition needs to match Version.h on the native sources. - *

+ *
* Or else the native module won't be loaded because of version mismatches */ private static final int EXPECTED_NATIVE_VERSION = 52; @@ -72,7 +72,7 @@ public class AsynchronousFileImpl implements AsynchronousFile /** * AIO can't guarantee ordering over callbacks. - *

+ *
* We use this {@link PriorityQueue} to hold values until they are in order */ private final PriorityQueue pendingCallbacks = new PriorityQueue(); @@ -699,7 +699,7 @@ public class AsynchronousFileImpl implements AsynchronousFile /** * Explicitly adding a compare to clause that returns 0 for at least the same object. - *

+ *
* If {@link Comparable#compareTo(Object)} does not return 0 -for at least the same object- some * Collection classes methods will fail (example {@link PriorityQueue#remove(Object)}. If it * returns 0, then {@link #equals(Object)} must return {@code true} for the exact same cases, diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java index 5cf68ebeb9..052dc254a6 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalFilesRepository.java @@ -45,7 +45,7 @@ public class JournalFilesRepository /** * Used to debug the consistency of the journal ordering. - *

+ *
* This is meant to be false as these extra checks would cause performance issues */ private static final boolean CHECK_CONSISTENCE = false; 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 a661f68dc0..8f74327f12 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 @@ -2576,12 +2576,12 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal // ----------------------------------------------------------------------------- /** - *

+ *
* Checks for holes on the transaction (a commit written but with an incomplete transaction). - *

+ *
* This method will validate if the transaction (PREPARE/COMMIT) is complete as stated on the * COMMIT-RECORD. - *

+ *
* For details see {@link JournalCompleteRecordTX} about how the transaction-summary is recorded. * * @param journalTransaction diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java index b6f5a80f36..03436d1ac7 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSubscription.java @@ -201,7 +201,6 @@ public interface AMQSubscription extends AMQSubscriptionRecovery /** * Informs the Broker if the subscription needs to intervention to recover it's state * e.g. DurableTopicSubscriber may do - * @see org.apache.activemq.broker.region.cursors.PendingMessageCursor * @return true if recovery required */ boolean isRecoveryRequired(); diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionState.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionState.java index 8b25940a3e..a8e5973807 100644 --- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionState.java +++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQTransportConnectionState.java @@ -22,9 +22,6 @@ import org.apache.activemq.command.ConnectionInfo; import org.apache.activemq.state.ConnectionState; import org.apache.activemq.artemis.core.protocol.openwire.OpenWireConnection; -/** - * @See org.apache.activemq.broker.TransportConnectionState - */ public class AMQTransportConnectionState extends ConnectionState { diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java index 20800e5387..f76addcf4e 100644 --- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java +++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/AMQPConnectionContext.java @@ -39,7 +39,6 @@ public interface AMQPConnectionContext * This is for future use and should be kept returning false. * * We will have to do some testing before we make this return true - * @return */ boolean isSyncOnFlush(); @@ -48,9 +47,6 @@ public interface AMQPConnectionContext /** * This is for the Remoting layer to push bytes on the AMQP Connection * The buffer readerIndex should be at the latest read byte after this method is called - * - * @param buffer - * @return */ void inputBuffer(ByteBuf buffer); diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java index 6f5c6a7020..051d8fe337 100644 --- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java +++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java @@ -34,9 +34,6 @@ import org.proton.plug.handler.impl.DefaultEventHandler; import org.proton.plug.util.ByteUtil; import org.proton.plug.util.DebugInfo; -/** - * Clebert Suconic - */ public abstract class AbstractConnectionContext extends ProtonInitializable implements AMQPConnectionContext { @@ -79,8 +76,6 @@ public abstract class AbstractConnectionContext extends ProtonInitializable impl /** * See comment at {@link org.proton.plug.AMQPConnectionContext#isSyncOnFlush()} - * @return - * @See {@link org.proton.plug.AMQPConnectionContext#isSyncOnFlush()} */ public boolean isSyncOnFlush() { diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java index a62659740c..978f00fd49 100644 --- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java +++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/logger/ActiveMQAMQPProtocolMessageBundle.java @@ -25,10 +25,10 @@ import org.jboss.logging.Messages; /** * Logger Code 11 - *

+ *

* Each message id must be 6 digits long starting with 10, the 3rd digit should be 9. So the range * is from 219000 to 119999. - *

+ *

* Once released, methods should not be deleted as they may be referenced by knowledge base * articles. Unused methods should be marked as deprecated. */ diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java index 2936be9b8c..5b16131180 100644 --- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java +++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ReusableLatch.java @@ -22,15 +22,10 @@ import java.util.concurrent.locks.AbstractQueuedSynchronizer; /** *

This class will use the framework provided to by AbstractQueuedSynchronizer.

*

AbstractQueuedSynchronizer is the framework for any sort of concurrent synchronization, such as Semaphores, events, etc, based on AtomicIntegers.

- *

*

This class works just like CountDownLatch, with the difference you can also increase the counter

- *

*

It could be used for sync points when one process is feeding the latch while another will wait when everything is done. (e.g. waiting IO completions to finish)

- *

*

On ActiveMQ Artemis we have the requirement of increment and decrement a counter until the user fires a ready handler (commit). At that point we just act as a regular countDown.

- *

*

Note: This latch is reusable. Once it reaches zero, you can call up again, and reuse it on further waits.

- *

*

For example: prepareTransaction will wait for the current completions, and further adds will be called on the latch. Later on when commit is called you can reuse the same latch.

*/ public class ReusableLatch diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java index d79ee2db59..4497c3cfad 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALogger.java @@ -26,10 +26,10 @@ import org.jboss.logging.annotations.MessageLogger; /** * Logger Code 15 - *

+ *
* each message id must be 6 digits long starting with 15, the 3rd digit donates * the level so - *

+ *
* 

  * INF0  1
  * WARN  2
@@ -38,7 +38,7 @@ import org.jboss.logging.annotations.MessageLogger;
  * TRACE 5
  * FATAL 6
  *
- *

+ *
* so an INFO message would be 151000 to 151999 */ @MessageLogger(projectCode = "AMQ") diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java index 00a10c5da0..192c120484 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMCFProperties.java @@ -23,7 +23,7 @@ import javax.jms.Topic; /** - * The MCF default properties - these are set in the at the jms-ds.xml + * The MCF default properties - these are set in the tx-connection-factory at the jms-ds.xml */ public class ActiveMQRAMCFProperties extends ConnectionFactoryProperties implements Serializable { diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java index dbc3cfcf5c..8621cc2443 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java @@ -294,7 +294,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti /** * Set the resource adapter - *

+ *
* This should ensure that when the RA is stopped, this MCF will be stopped as well. * * @param ra The resource adapter diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java index 30ae0d17d7..9efa574974 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRASession.java @@ -1243,9 +1243,6 @@ public final class ActiveMQRASession implements QueueSession, TopicSession, XAQu /** * Get the XA resource - * - * @return The XA resource - * @throws IllegalStateException If non XA connection */ public XAResource getXAResource() { @@ -1889,10 +1886,6 @@ public final class ActiveMQRASession implements QueueSession, TopicSession, XAQu return (TopicSession) s; } - /** - * @throws SystemException - * @throws RollbackException - */ public void checkState() throws JMSException { if (mc != null) diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java index 53297ca323..f34682e66a 100644 --- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java +++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQResourceAdapter.java @@ -1808,7 +1808,6 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable } /** - * @return * @see ActiveMQRAProperties#getJgroupsChannelLocatorClass() */ public String getJgroupsChannelLocatorClass() @@ -1817,8 +1816,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable } /** - * @return - * @see ActiveMQRAProperties#setJgroupsChannelLocatorClass() + * @see ActiveMQRAProperties#setJgroupsChannelLocatorClass(String) */ public void setJgroupsChannelLocatorClass(String jgroupsChannelLocatorClass) { @@ -1835,8 +1833,7 @@ public class ActiveMQResourceAdapter implements ResourceAdapter, Serializable } /** - * @return - * @see ActiveMQRAProperties#setJgroupsChannelRefName() + * @see ActiveMQRAProperties#setJgroupsChannelRefName(java.lang.String) */ public void setJgroupsChannelRefName(String jgroupsChannelRefName) { diff --git a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java index 68f5f2fdd5..cad01222b9 100644 --- a/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java +++ b/integration/activemq-aerogear-integration/src/main/java/org/apache/activemq/artemis/integration/aerogear/ActiveMQAeroGearBundle.java @@ -23,9 +23,9 @@ import org.jboss.logging.Messages; /** * Logger Code 23 - *

+ *
* each message id must be 6 digits long starting with 10, the 3rd digit should be 9 - *

+ *
* so 239000 to 239999 */ @MessageBundle(projectCode = "AMQ") diff --git a/pom.xml b/pom.xml index 5e566ac6ab..73af2bd8d7 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ true true 1.0-alpha-1 - + javac-with-errorprone @@ -451,12 +451,12 @@ m2e.version - + javac - + dev @@ -848,7 +848,7 @@ - 1.8.0 + 1.7.0 @@ -858,10 +858,6 @@ org.apache.maven.plugins maven-javadoc-plugin - - - -Xdoclint:none - org.apache.maven.plugins @@ -1021,7 +1017,6 @@ true com.restfully.*:org.jboss.resteasy.examples.*:org.jboss.resteasy.tests.* - -Xdoclint:none diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3167Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3167Test.java index 7e3048abe9..1a633d2c38 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3167Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ3167Test.java @@ -41,13 +41,13 @@ import org.junit.Test; /** * Test the loss of messages detected during testing with ActiveMQ 5.4.1 and 5.4.2. - *

+ *
* Symptoms: - 1 record is lost "early" in the stream. - no more records lost. - *

+ *
* Test Configuration: - Broker Settings: - Destination Policy - Occurs with "Destination Policy" using Store Cursor and * a memory limit - Not reproduced without "Destination Policy" defined - Persistence Adapter - Memory: Does not occur. * - KahaDB: Occurs. - Messages - Occurs with TextMessage and BinaryMessage - Persistent messages. - *

+ *
* Notes: - Lower memory limits increase the rate of occurrence. - Higher memory limits may prevent the problem * (probably because memory limits not reached). - Producers sending a number of messages before consumers come online * increases rate of occurrence. @@ -75,7 +75,7 @@ public class AMQ3167Test { /** * Create a new, unsecured, client connection to the test broker using the given username and password. This * connection bypasses all security. - *

+ *
* Don't forget to start the connection or no messages will be received by consumers even though producers will work * fine. * diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java index 014d86a525..b9246fbe00 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4636Test.java @@ -49,7 +49,7 @@ import static org.junit.Assert.fail; /** * Testing how the broker reacts when a SQL Exception is thrown from * org.apache.activemq.store.jdbc.TransactionContext.executeBatch(). - *

+ *
* see https://issues.apache.org/jira/browse/AMQ-4636 */ public class AMQ4636Test { @@ -123,7 +123,7 @@ public class AMQ4636Test { /** * adding a TestTransactionContext (wrapper to TransactionContext) so an SQLException is triggered * during TransactionContext.executeBatch() when called in the broker. - *

+ *
* Expectation: SQLException triggers a connection shutdown and failover should kick and try to redeliver the * message. SQLException should NOT be returned to client */ diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java index 6a52e46bba..882bbaa41b 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ4952Test.java @@ -71,27 +71,27 @@ import static org.junit.Assert.*; /** * Test creates a broker network with two brokers - producerBroker (with a * message producer attached) and consumerBroker (with consumer attached) - *

+ *
* Simulates network duplicate message by stopping and restarting the * consumerBroker after message (with message ID ending in 120) is persisted to * consumerBrokerstore BUT BEFORE ack sent to the producerBroker over the * network connection. When the network connection is reestablished the * producerBroker resends message (with messageID ending in 120). - *

+ *
* Expectation: - *

+ *
* With the following policy entries set, would expect the duplicate message to * be read from the store and dispatched to the consumer - where the duplicate * could be detected by consumer. - *

+ *
* PolicyEntry policy = new PolicyEntry(); policy.setQueue(">"); * policy.setEnableAudit(false); policy.setUseCache(false); * policy.setExpireMessagesPeriod(0); - *

- *

+ *
+ *
* Note 1: Network needs to use replaywhenNoConsumers so enabling the * networkAudit to avoid this scenario is not feasible. - *

+ *
* NOTE 2: Added a custom plugin to the consumerBroker so that the * consumerBroker shutdown will occur after a message has been persisted to * consumerBroker store but before an ACK is sent back to ProducerBroker. This diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java index e180746939..1ddf605369 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/AMQ5266Test.java @@ -54,7 +54,7 @@ import static org.junit.Assert.assertEquals; /** * Stuck messages test client. - *

+ *
* Will kick of publisher and consumer simultaneously, and will usually result in stuck messages on the queue. */ @RunWith(Parameterized.class) diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java index 1baff9a709..af2b992519 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/bugs/TransactionNotStartedErrorTest.java @@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory; /* * simulate message flow which cause the following exception in the broker - * (exception logged by client)

2007-07-24 13:51:23,624 + * (exception logged by client)
2007-07-24 13:51:23,624 * com.easynet.halo.Halo ERROR (LoggingErrorHandler.java: 23) JMS failure * javax.jms.JMSException: Transaction 'TX:ID:dmt-53625-1185281414694-1:0:344' * has not been started. at diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/DoSTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/DoSTest.java index c236822bd9..6b55595639 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/DoSTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/security/DoSTest.java @@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory; * The configuration is set to except a maximum of 2 concurrent connections * As the exception is deliberately ignored, the ActiveMQConnection would continue to * attempt to connect unless the connection's transport was also stopped on an error. - *

+ *
* As the maximum connections allowed is 2, no more connections would be allowed unless * the transport was adequately destroyed on the broker side. */ diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreAutoCommitTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreAutoCommitTest.java index b9e6e98bdd..6a19628c57 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreAutoCommitTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/store/jdbc/JDBCStoreAutoCommitTest.java @@ -57,7 +57,7 @@ import org.junit.Test; * to be compliant with JDBC spec; officially commit is not supposed to be * called on a connection that uses autocommit.The oracle v12 driver does a * check for autocommitSpecCompliance and it causes issues - *

+ *
* To test; wrap the datasource used by the broker and check for autocommit * before delegating to real datasource. If commit is called on connection with * autocommit, wrapper throws a SQLException. diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java index e950b7dc85..3a8388c798 100644 --- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java +++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/usecases/NetworkBridgeProducerFlowControlTest.java @@ -41,18 +41,18 @@ import org.junit.Assert; * This test demonstrates and verifies the behaviour of a network bridge when it * forwards a message to a queue that is full and producer flow control is * enabled. - *

+ *
* The expected behaviour is that the bridge will stop forwarding messages to * the full queue once the associated demand consumer's prefetch is full, but * will continue to forward messages to the other queues that are not full. - *

+ *
* In actuality, a message that is sent asynchronously to a local queue, * but blocked by producer flow control on the remote queue, will stop the * bridge from forwarding all subsequent messages, even those destined for * remote queues that are not full. In the same scenario, but with a message * that is sent synchronously to the local queue, the bridge continues * forwarding messages to remote queues that are not full. - *

+ *
* This test demonstrates the differing behaviour via the following scenario: *