* Changing this JMX domain is required if multiple ActiveMQ Artemis servers are run inside
* the same JVM and all servers are using the same MBeanServer.
*/
@@ -207,7 +207,7 @@ public interface Configuration
/**
* Sets the list of interceptors classes used by this server for incoming messages (i.e. those being delivered to
* the server from clients).
- *
* Modifying the returned list will modify the list of {@link ClusterConnectionConfiguration}
* used by this configuration.
*/
@@ -384,7 +384,7 @@ public interface Configuration
/**
* Returns the cluster user for this server.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}.
*/
int getPageMaxConcurrentIO();
/**
* The max number of concurrent reads allowed on paging.
- *
* Default = 5
*/
Configuration setPageMaxConcurrentIO(int maxIO);
/**
* Returns the file system directory used to store journal log.
* Sending is done here to avoid exposing the internal {@link org.apache.activemq.artemis.core.journal.SequentialFile}s.
*
* @param replicator
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
index 430211d56c..1706b825fc 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionCounterImpl.java
@@ -105,7 +105,6 @@ public class PageSubscriptionCounterImpl implements PageSubscriptionCounter
* This is used only on non transactional paging
* @param page
* @param increment
- * @param context
* @throws Exception
*/
@Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
index 9ac09228aa..f19363df7b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageSubscriptionImpl.java
@@ -189,7 +189,7 @@ final class PageSubscriptionImpl implements PageSubscription
/**
* A page marked as complete will be ignored until it's cleared.
- *
* Usually paging is a stream of messages but in certain scenarios (such as a pending prepared
* TX) we may have big holes on the page streaming, and we will need to ignore such pages on the
* cursor/subscription.
@@ -989,7 +989,7 @@ final class PageSubscriptionImpl implements PageSubscription
/**
* This will hold information about the pending ACKs towards a page.
- *
* This instance will be released as soon as the entire page is consumed, releasing the memory at
* that point The ref counts are increased also when a message is ignored for any reason.
*/
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
index 604d60d9bf..5196cccef9 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/StorageManager.java
@@ -349,7 +349,7 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent
/**
* Write message to page if we are paging.
- *
* This is primarily a {@link PagingStore} call, but as with any other call writing persistent
* data, it must go through here. Both for the sake of replication, and also to ensure that it
* takes the locks (storage manager and pagingStore) in the right order. Avoiding thus the
@@ -363,7 +363,7 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent
/**
* Stops the replication of data from the live to the backup.
- *
* Typical scenario is a broken connection.
*/
void stopReplication();
@@ -393,7 +393,7 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent
/**
* Read lock the StorageManager. USE WITH CARE!
- *
* The main lock is used to write lock the whole manager when starting replication. Sub-systems,
* say Paging classes, that use locks of their own AND also write through the StorageManager MUST
* first read lock the storageManager before taking their own locks. Otherwise, we may dead-lock
@@ -410,7 +410,7 @@ public interface StorageManager extends IDGenerator, ActiveMQComponent
/**
* Closes the {@link IDGenerator} persisting the current record ID.
- *
* Effectively a "pre-stop" method. Necessary due to the "stop"-order at
* {@link org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl}
*/
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedRoles.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedRoles.java
index 69b68b676c..ec5fe2bdc1 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedRoles.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedRoles.java
@@ -54,7 +54,6 @@ public class PersistedRoles implements EncodingSupport
}
/**
- * @param address
* @param addressMatch
* @param sendRoles
* @param consumeRoles
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
index abba9797db..b6972bad2d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java
@@ -80,7 +80,7 @@ import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalR
/**
* Outputs a String description of the Journals contents.
- *
* Meant to be used in debugging.
*/
public final class DescribeJournal
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
index 85aae7c26b..b3508f7cce 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/JournalStorageManager.java
@@ -130,14 +130,14 @@ import static org.apache.activemq.artemis.core.persistence.impl.journal.JournalR
* Controls access to the journals and other storage files such as the ones used to store pages and
* large messages. This class must control writing of any non-transient data, as it is the key point
* for synchronizing a replicating backup server.
- *
* Using this class also ensures that locks are acquired in the right order, avoiding dead-locks.
- *
* Notice that, turning on and off replication (on the live server side) is _mostly_ a matter of
* using {@link ReplicatedJournal}s instead of regular {@link JournalImpl}, and sync the existing
* data. For details see the Javadoc of
* {@link #startReplication(ReplicationManager, PagingManager, String, boolean)}.
- *
*/
public class JournalStorageManager implements StorageManager
{
@@ -342,17 +342,17 @@ public class JournalStorageManager implements StorageManager
/**
* Starts replication at the live-server side.
- *
+ * In practice that means 2 things:
* To achieve (1), we lock the entire journal while collecting the list of files to send to the
* backup. The journal does not remain locked during actual synchronization.
- *
* To achieve (2), instead of writing directly to instances of {@link JournalImpl}, we write to
* instances of {@link ReplicatedJournal}.
- *
* At the backup-side replication is handled by {@link org.apache.activemq.artemis.core.replication.ReplicationEndpoint}.
*
* @param replicationManager
@@ -606,9 +606,9 @@ public class JournalStorageManager implements StorageManager
/**
* Sets a list of large message files into the replicationManager for synchronization.
- *
* Collects a list of existing large messages and their current size, passing re.
- *
* So we know how much of a given message to sync with the backup. Further data appends to the
* messages will be replicated normally.
*
@@ -3569,7 +3569,7 @@ public class JournalStorageManager implements StorageManager
/**
* This is only used when loading a transaction.
- *
* it might be possible to merge the functionality of this class with
* {@link org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager.FinishPageMessageOperation}
*/
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Binding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Binding.java
index 3a39a60b41..338329ee9a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Binding.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/Binding.java
@@ -55,8 +55,8 @@ public interface Binding extends UnproposalListener
/**
* This method will create a string representation meant for management operations.
- *
+ * This is different from the toString() method that is meant for debugging and will
* contain information that regular users won't understand well.
*
* @return
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
index 9d3d2bc38b..0c85abfd63 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/BindingsImpl.java
@@ -358,8 +358,8 @@ public final class BindingsImpl implements Bindings
/**
* This code has a race on the assigned value to routing names.
- *
+ * This is not that much of an issue because
* In practice a subset of the methods necessary to have a {@link org.apache.activemq.artemis.core.server.LargeServerMessage}
*
* @see org.apache.activemq.artemis.core.persistence.impl.journal.LargeServerMessageInSync
@@ -48,7 +48,7 @@ public interface ReplicatedLargeMessage
void deleteFile() throws Exception;
/**
- * @see LargeServerMessage#addBytes(byte[])
+ * @see org.apache.activemq.artemis.core.server.LargeServerMessage#addBytes(byte[])
*/
void addBytes(byte[] body) throws Exception;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
index 15d2599e0c..f5c112f51d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationManager.java
@@ -68,7 +68,7 @@ import org.apache.activemq.artemis.utils.ExecutorFactory;
/**
* Manages replication tasks on the live server (that is the live server side of a "remote backup"
* use case).
- *
* Its equivalent in the backup server is {@link ReplicationEndpoint}.
*
* @see ReplicationEndpoint
@@ -309,7 +309,7 @@ public final class ReplicationManager implements ActiveMQComponent
/**
* Completes any pending operations.
- *
* This can be necessary in case the live loses connection to the backup (network failure, or
* backup crashing).
*/
@@ -607,7 +607,7 @@ public final class ReplicationManager implements ActiveMQComponent
/**
* Informs backup that data synchronization is done.
- *
* So if 'live' fails, the (up-to-date) backup now may take over its duties. To do so, it must
* know which is the live's {@code nodeID}.
*
@@ -624,7 +624,7 @@ public final class ReplicationManager implements ActiveMQComponent
/**
* Reserves several LargeMessage IDs in the backup.
- *
* Doing this before hand removes the need of synchronizing large-message deletes with the
* largeMessageSyncList.
*
@@ -641,7 +641,7 @@ public final class ReplicationManager implements ActiveMQComponent
/**
* Notifies the backup that the live server is stopping.
- *
* This notification allows the backup to skip quorum voting (or any other measure to avoid
* 'split-brain') and do a faster fail-over.
*
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
index bc5b9824c9..a8bd7e18d0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQMessageBundle.java
@@ -45,10 +45,10 @@ import java.io.File;
/**
* 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 119000 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-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
index bca5f8f772..6f738ca942 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ActiveMQServer.java
@@ -16,10 +16,12 @@
*/
package org.apache.activemq.artemis.core.server;
+import javax.management.MBeanServer;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
+
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.config.BridgeConfiguration;
import org.apache.activemq.artemis.core.config.Configuration;
@@ -48,8 +50,6 @@ import org.apache.activemq.artemis.spi.core.protocol.SessionCallback;
import org.apache.activemq.artemis.spi.core.security.ActiveMQSecurityManager;
import org.apache.activemq.artemis.utils.ExecutorFactory;
-import javax.management.MBeanServer;
-
/**
* This interface defines the internal interface of the ActiveMQ Artemis Server exposed to other components
* of the server.
@@ -152,9 +152,7 @@ public interface ActiveMQServer extends ActiveMQComponent
void setJMSQueueCreator(QueueCreator queueCreator);
/**
- * @see {@link org.apache.activemq.artemis.core.server.ActiveMQServer#setJMSQueueCreator(QueueCreator)} *
- * *
- * @return
+ * @see org.apache.activemq.artemis.core.server.ActiveMQServer#setJMSQueueCreator(QueueCreator)
*/
QueueCreator getJMSQueueCreator();
@@ -162,10 +160,11 @@ public interface ActiveMQServer extends ActiveMQComponent
* Wait for server initialization.
* @param timeout
* @param unit
- * @see CountDownLatch#await(long, TimeUnit)
* @return {@code true} if the server was already initialized or if it was initialized within the
* timeout period, {@code false} otherwise.
* @throws InterruptedException
+
+ * @see java.util.concurrent.CountDownLatch#await(long, java.util.concurrent.TimeUnit)
*/
boolean waitForActivation(long timeout, TimeUnit unit) throws InterruptedException;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Consumer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Consumer.java
index 2e0324fa5f..5cb06d2415 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Consumer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/Consumer.java
@@ -23,7 +23,7 @@ import org.apache.activemq.artemis.core.filter.Filter;
public interface Consumer
{
/**
- * There was a change on semantic during 2.3 here.
* Only used by replicating backups.
*
* @param nodeID
@@ -146,7 +146,7 @@ public abstract class NodeManager implements ActiveMQComponent
/**
* Ensures existence of persistent information about the server's nodeID.
- *
* Roughly the different use cases are:
*
* Note that {@link org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge}s extend Bridges but are controlled over through
* {@link ClusterConnectionImpl}. As a node is discovered a new {@link org.apache.activemq.artemis.core.server.cluster.impl.ClusterConnectionBridge} is
* deployed.
@@ -128,7 +128,7 @@ public final class ClusterManager implements ActiveMQComponent
/**
* Deployed means {@link ClusterManager#deploy()} was called but
* {@link ClusterManager#start()} was not called.
- *
* We need the distinction if {@link ClusterManager#stop()} is called before 'start'. As
* otherwise we would leak locators.
*/
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/MessageLoadBalancingType.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/MessageLoadBalancingType.java
index 38df1a23f0..61d06f1e51 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/MessageLoadBalancingType.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/MessageLoadBalancingType.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (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.apache.org/licenses/LICENSE-2.0
- *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
index 23b5f31111..bbb4b199ba 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/qourum/SharedNothingBackupQuorum.java
@@ -57,7 +57,7 @@ public class SharedNothingBackupQuorum implements Quorum, FailureListener
* This is a safety net in case the live sends the first {@link ReplicationLiveIsStoppingMessage}
* with code {@link org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#STOP_CALLED} and crashes before sending the second with
* {@link org.apache.activemq.artemis.core.protocol.core.impl.wireformat.ReplicationLiveIsStoppingMessage.LiveStopping#FAIL_OVER}.
- *
* If the second message does come within this dead line, we fail over anyway.
*/
public static final int WAIT_TIME_AFTER_FIRST_LIVE_STOPPING_MSG = 60;
@@ -186,7 +186,7 @@ public class SharedNothingBackupQuorum implements Quorum, FailureListener
/**
* Releases the latch, causing the backup activation thread to fail-over.
- *
* The use case is for when the 'live' has an orderly shutdown, in which case it informs the
* backup that it should fail-over.
*/
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java
index d6443e50de..c33a4f8cc7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/group/impl/RemoteGroupingHandler.java
@@ -40,7 +40,7 @@ import org.apache.activemq.artemis.utils.TypedProperties;
/**
* A remote Grouping handler.
- *
* This will use management notifications to communicate with the node that has the Local Grouping
* handler to make proposals.
*/
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java
index 5006247eb7..e591547f19 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AIOFileLockNodeManager.java
@@ -26,10 +26,10 @@ import org.apache.activemq.artemis.core.asyncio.impl.AsynchronousFileImpl;
* This is using the ActiveMQ Artemis Libaio Native to perform calls to flock on a Linux system. At the
* current version of RHEL there's a bug on GFS2 and because of that fctl is not functional what
* will cause issues on Failover over Shared Storage.
- *
* This will provide an alternative to perform locks through our native module until fctl is fixed
* on Linux.
- *
* https://bugzilla.redhat.com/show_bug.cgi?id=678585
*/
public final class AIOFileLockNodeManager extends FileLockNodeManager
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 6e4b6ca6ad..840c7e79d6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -814,7 +814,7 @@ public class ActiveMQServerImpl implements ActiveMQServer
/**
* Freeze all connections.
- *
* If replicating, avoid freezing the replication connection. Helper method for
* {@link #stop(boolean, boolean, boolean)}.
*/
@@ -1314,7 +1314,7 @@ public class ActiveMQServerImpl implements ActiveMQServer
/**
* Creates a transient queue. A queue that will exist as long as there are consumers.
* The queue will be deleted as soon as all the consumers are removed.
- *
* Notice: the queue won't be deleted until the first consumer arrives.
*
* @param address
@@ -1708,7 +1708,7 @@ public class ActiveMQServerImpl implements ActiveMQServer
/**
* Starts everything apart from RemotingService and loading the data.
- *
* After optional intermediary steps, Part 1 is meant to be followed by part 2
* {@link #initialisePart2(boolean)}.
* @param scalingDown
@@ -2350,7 +2350,7 @@ public class ActiveMQServerImpl implements ActiveMQServer
/**
* Move data away before starting data synchronization for fail-back.
- *
* Use case is a server, upon restarting, finding a former backup running in its place. It will
* move any older data away and log a warning about it.
*/
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForReplication.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForReplication.java
index 002da89eca..6983427375 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForReplication.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/AnyLiveNodeLocatorForReplication.java
@@ -113,7 +113,7 @@ public class AnyLiveNodeLocatorForReplication extends LiveNodeLocator
/**
* if a node goes down we try all the connectors again as one may now be available for
* replication
- *
* TODO: there will be a better way to do this by finding which nodes backup has gone down.
*/
@Override
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java
index c5b94fa40a..2c1afe2f08 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/InVMNodeManager.java
@@ -31,7 +31,7 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
/**
* NodeManager used to run multiple servers in the same VM.
- *
* We use the {@link org.apache.activemq.artemis.core.server.impl.InVMNodeManager} instead of {@link org.apache.activemq.artemis.core.server.impl.FileLockNodeManager} when
* multiple servers are run inside the same VM and File Locks can not be shared in the
* same VM (it would cause a shared lock violation).
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForReplication.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForReplication.java
index 7eb4809aca..3d7a370eb6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForReplication.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForReplication.java
@@ -31,7 +31,7 @@ import org.apache.activemq.artemis.core.server.cluster.qourum.SharedNothingBacku
/**
* NamedLiveNodeLocatorForReplication looks for a live server in the cluster with a specific backupGroupName
*
- * @see org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy#getGroupName()
+ * @see org.apache.activemq.artemis.core.server.cluster.ha.HAPolicy#getScaleDownGroupName()
*/
public class NamedLiveNodeLocatorForReplication extends LiveNodeLocator
{
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForScaleDown.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
index 3efdc69c0d..2c1efe66a2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/NamedLiveNodeLocatorForScaleDown.java
@@ -33,8 +33,6 @@ import org.apache.activemq.artemis.core.server.LiveNodeLocator;
/**
* NamedLiveNodeLocatorForScaleDown looks for a live server in the cluster with a specific scaleDownGroupName
- *
- * @see org.apache.activemq.artemis.core.config.Configuration#getScaleDownGroupName()
*/
public class NamedLiveNodeLocatorForScaleDown extends LiveNodeLocator
{
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index 803306b0d2..3fd5801fc8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -90,7 +90,7 @@ import org.apache.activemq.artemis.utils.TypedProperties;
/**
* Implementation of a Queue
- *
* Completely non blocking between adding to queue and delivering to consumers.
*/
public class QueueImpl implements Queue
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
index cb4ff659a1..b9c37b4667 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingBackupActivation.java
@@ -412,7 +412,7 @@ public final class SharedNothingBackupActivation extends Activation
/**
* Whether a remote backup server was in sync with its live server. If it was not in sync, it may
* not take over the live's functions.
- *
* A local backup server or a live server should always return {@code true}
*
* @return whether the backup is up-to-date, if the server is not a backup it always returns
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
index 68a4190d56..601927cf50 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/SharedNothingLiveActivation.java
@@ -305,7 +305,7 @@ public class SharedNothingLiveActivation extends LiveActivation
}
/**
* Determines whether there is another server already running with this server's nodeID.
- *
* This can happen in case of a successful fail-over followed by the live's restart
* (attempting a fail-back).
*
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java
index 55ac824961..0ebcf48018 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/settings/impl/HierarchicalObjectRepository.java
@@ -76,7 +76,7 @@ public class HierarchicalObjectRepository
- * Thread1: calls {@link #addMatch(String , T)}: i. cleans cache; ii. adds match to Map.
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
index 29d3f5c02b..2e2e90b906 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationParserTest.java
@@ -34,7 +34,7 @@ public class FileConfigurationParserTest extends ActiveMQTestBase
/**
* These "InvalidConfigurationTest*.xml" files are modified copies of {@value
* ConfigurationTest-full-config.xml}, so just diff it for changes, e.g.
- *
*
* Use this instead of just calling {@code latch.await()}. Otherwise your test may hang the whole
* test run if it fails to count-down the latch.
*
+ *
* Classes must implement {@link org.apache.activemq.artemis.api.core.Interceptor}.
*/
Configuration setIncomingInterceptorClassNames(List
+ *
* Classes must implement {@link org.apache.activemq.artemis.api.core.Interceptor}.
*/
Configuration setOutgoingInterceptorClassNames(List
* This value overrides the connection time to live sent by the client.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}.
*/
long getConnectionTTLOverride();
@@ -235,7 +235,7 @@ public interface Configuration
/**
* Returns whether code coming from connection is executed asynchronously or not.
* Default value is
- * {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}.
+ * {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}.
*/
boolean isAsyncConnectionExecutionEnabled();
@@ -330,7 +330,7 @@ public interface Configuration
/**
* Returns the cluster connections configured for this server.
- *
+ *
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_USER}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_USER}.
*/
String getClusterUser();
@@ -395,7 +395,7 @@ public interface Configuration
/**
* Returns the cluster password for this server.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}.
*/
String getClusterPassword();
@@ -406,7 +406,7 @@ public interface Configuration
/**
* Returns the size of the cache for pre-creating message IDs.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}.
*/
int getIDCacheSize();
@@ -417,7 +417,7 @@ public interface Configuration
/**
* Returns whether message ID cache is persisted.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}.
*/
boolean isPersistIDCache();
@@ -430,7 +430,7 @@ public interface Configuration
/**
* Returns the file system directory used to store bindings.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}.
*/
String getBindingsDirectory();
@@ -441,21 +441,21 @@ public interface Configuration
/**
* The max number of concurrent reads allowed on paging.
- *
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_DIR}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_DIR}.
*/
String getJournalDirectory();
@@ -478,7 +478,7 @@ public interface Configuration
/**
* Returns whether the journal is synchronized when receiving transactional data.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}.
*/
boolean isJournalSyncTransactional();
@@ -489,7 +489,7 @@ public interface Configuration
/**
* Returns whether the journal is synchronized when receiving non-transactional data.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}.
*/
boolean isJournalSyncNonTransactional();
@@ -500,7 +500,7 @@ public interface Configuration
/**
* Returns the size (in bytes) of each journal files.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}.
*/
int getJournalFileSize();
@@ -511,7 +511,7 @@ public interface Configuration
/**
* Returns the minimal number of journal files before compacting.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}.
*/
int getJournalCompactMinFiles();
@@ -522,7 +522,7 @@ public interface Configuration
/**
* Returns the percentage of live data before compacting the journal.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}.
*/
int getJournalCompactPercentage();
@@ -533,7 +533,7 @@ public interface Configuration
/**
* Returns the number of journal files to pre-create.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}.
*/
int getJournalMinFiles();
@@ -546,7 +546,7 @@ public interface Configuration
/**
* Returns the maximum number of write requests that can be in the AIO queue at any given time.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}.
*/
int getJournalMaxIO_AIO();
@@ -558,7 +558,7 @@ public interface Configuration
/**
* Returns the timeout (in nanoseconds) used to flush buffers in the AIO queue.
*
- * Default value is {@value org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}.
+ * Default value is {@link org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}.
*/
int getJournalBufferTimeout_AIO();
@@ -570,7 +570,7 @@ public interface Configuration
/**
* Returns the buffer size (in bytes) for AIO.
*
- * Default value is {@value org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}.
+ * Default value is {@link org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}.
*/
int getJournalBufferSize_AIO();
@@ -581,7 +581,7 @@ public interface Configuration
/**
* Returns the maximum number of write requests for NIO journal.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}.
*/
int getJournalMaxIO_NIO();
@@ -593,7 +593,7 @@ public interface Configuration
/**
* Returns the timeout (in nanoseconds) used to flush buffers in the NIO.
*
- * Default value is {@value org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}.
+ * Default value is {@link org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}.
*/
int getJournalBufferTimeout_NIO();
@@ -605,7 +605,7 @@ public interface Configuration
/**
* Returns the buffer size (in bytes) for NIO.
*
- * Default value is {@value org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}.
+ * Default value is {@link org.apache.activemq.artemis.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}.
*/
int getJournalBufferSize_NIO();
@@ -616,7 +616,7 @@ public interface Configuration
/**
* Returns whether the bindings directory is created on this server startup.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}.
*/
boolean isCreateBindingsDir();
@@ -627,7 +627,7 @@ public interface Configuration
/**
* Returns whether the journal directory is created on this server startup.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}.
*/
boolean isCreateJournalDir();
@@ -666,7 +666,7 @@ public interface Configuration
/**
* Returns the file system directory used to store paging files.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_PAGING_DIR}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_PAGING_DIR}.
*/
String getPagingDirectory();
@@ -679,7 +679,7 @@ public interface Configuration
/**
* Returns the file system directory used to store large messages.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}.
*/
String getLargeMessagesDirectory();
@@ -692,7 +692,7 @@ public interface Configuration
/**
* Returns whether wildcard routing is supported by this server.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}.
*/
boolean isWildcardRoutingEnabled();
@@ -704,7 +704,7 @@ public interface Configuration
/**
* Returns the timeout (in milliseconds) after which transactions is removed from the resource
* manager after it was created.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}.
*/
long getTransactionTimeout();
@@ -716,7 +716,7 @@ public interface Configuration
/**
* Returns whether message counter is enabled for this server.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}.
*/
boolean isMessageCounterEnabled();
@@ -727,7 +727,7 @@ public interface Configuration
/**
* Returns the sample period (in milliseconds) to take message counter snapshot.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}.
*/
long getMessageCounterSamplePeriod();
@@ -740,7 +740,7 @@ public interface Configuration
/**
* Returns the maximum number of days kept in memory for message counter.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}.
*/
int getMessageCounterMaxDayHistory();
@@ -754,7 +754,7 @@ public interface Configuration
/**
* Returns the frequency (in milliseconds) to scan transactions to detect which transactions have
* timed out.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}.
*/
long getTransactionTimeoutScanPeriod();
@@ -767,7 +767,7 @@ public interface Configuration
/**
* Returns the frequency (in milliseconds) to scan messages to detect which messages have
* expired.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}.
*/
long getMessageExpiryScanPeriod();
@@ -779,7 +779,7 @@ public interface Configuration
/**
* Returns the priority of the thread used to scan message expiration.
- * Default value is {@value org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}.
*/
int getMessageExpiryThreadPriority();
@@ -851,7 +851,7 @@ public interface Configuration
/*
* @see #setResolveProtocols()
* @return whether ActiveMQ Artemis should resolve and use any Protocols available on the classpath
- * Default value is {@value org.apache.activemq.artemis.api.config.org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}.
+ * Default value is {@link org.apache.activemq.artemis.api.config.org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}.
* */
boolean isResolveProtocols();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
index 24a6e4c161..aeb9c6a085 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ActiveMQServerControlImpl.java
@@ -1086,7 +1086,7 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
html.append("" + propstr.toString() + " ");
}
html.append("");
- html.append("
");
+ html.append("
");
}
return html.toString();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
index 9f31ed3fc8..c3ed030538 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/MessageCounter.java
@@ -557,7 +557,7 @@ public class MessageCounter
}
/**
- * Return day counter data as string with format
+ * Return day counter data as string with format
* "Date, hour counter 0, hour counter 1, ..., hour counter 23".
* @return String day counter data
*/
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
index e21fe86db6..735c6dbcea 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/PagingStore.java
@@ -156,7 +156,7 @@ public interface PagingStore extends ActiveMQComponent
/**
* Sends the pages with given IDs to the {@link ReplicationManager}.
- *
+ *
- * (1) all currently existing data must be sent to the backup.
+ *
+ * (1) all currently existing data must be sent to the backup.
* (2) every new persistent information is replicated (sent) to the backup.
- *
+ *
* Say you have the same queue name bound into two servers. The routing will load balance between
* these two servers. This will eventually send more messages to one server than the other
* (depending if you are using multi-thread), and not lose messages.
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java
index b1b54da111..48ff2895b8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/BackupReplicationStartFailedMessage.java
@@ -16,17 +16,16 @@
*/
package org.apache.activemq.artemis.core.protocol.core.impl.wireformat;
-import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
-import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
-
import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
+import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
+import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
+
/**
* Informs the Backup trying to start replicating of an error.
- * @see org.apache.activemq.artemis.core.server.impl.ReplicationError
*/
public final class BackupReplicationStartFailedMessage extends PacketImpl
{
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java
index ef62c1b795..c94c2169aa 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationStartSyncMessage.java
@@ -155,7 +155,6 @@ public class ReplicationStartSyncMessage extends PacketImpl
/**
* @return whether the server is configured to allow for fail-back
- * @see Configuration#isAllowAutoFailBack()
*/
public boolean isServerToFailBack()
{
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
index 144bba9204..2723198d5d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedJournal.java
@@ -433,7 +433,6 @@ public class ReplicatedJournal implements Journal
/**
* @param pages
- * @throws Exception
* @see org.apache.activemq.artemis.core.journal.Journal#perfBlast(int)
*/
public void perfBlast(final int pages)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedLargeMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedLargeMessage.java
index 7d12e9583e..47768dee17 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedLargeMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicatedLargeMessage.java
@@ -20,7 +20,7 @@ import org.apache.activemq.artemis.api.core.Message;
/**
* {@link org.apache.activemq.artemis.core.server.LargeServerMessage} methods used by the {@link ReplicationEndpoint}.
- *
+ * There was a change on semantic during 2.3 here.
* We now first accept the message, and the actual deliver is done as part of
* {@link #proceedDeliver(MessageReference)}. This is to avoid holding a lock on the queues while
* the delivery is being accomplished To avoid a lock on the queue in case of misbehaving
@@ -48,8 +48,7 @@ public interface Consumer
Filter getFilter();
/**
- * Add the in-deliver mode messages to the ref-list passed as parameter
- * @param refList the placeholder for where the output messages will be placed
+ * @return the list of messages being delivered
*/
List
*
- *
- * @throws Exception
- * @throws IOException
*/
protected final synchronized void setUpServerLockFile() throws IOException
{
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
index 51cedfef23..e3ad79fd0a 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/ClusterManager.java
@@ -69,7 +69,7 @@ import org.apache.activemq.artemis.utils.FutureLatch;
/**
* A ClusterManager manages {@link ClusterConnection}s, {@link BroadcastGroup}s and {@link Bridge}s.
- *
+ *
+ * Thread1: calls {@link #addMatch(String , T)}: i. cleans cache; ii. adds match to Map.
* Thread2: could add an (out-dated) entry to the cache between 'i. clean cache' and 'ii. add
* match to Map'.
*
* diff ConfigurationTest-full-config.xml InvalidConfigurationTest4.xml
*
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
index bb03d92629..c689cf207b 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ActiveMQTestBase.java
@@ -3006,7 +3006,7 @@ public abstract class ActiveMQTestBase extends Assert
/**
* Asserts that latch completes within a (rather large interval).
- *
+ *