diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
index 1daf213627..f53aad1c9a 100644
--- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
+++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/tools/xml/XmlDataExporter.java
@@ -456,8 +456,6 @@ public final class XmlDataExporter extends DBOption {
return queues;
}
- // Inner classes -------------------------------------------------
-
/**
* Proxy to handle indenting the XML since javax.xml.stream.XMLStreamWriter doesn't support that.
*/
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
index 33b00eb522..bce501c5fe 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/api/core/SimpleString.java
@@ -38,8 +38,6 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
private static final SimpleString EMPTY = new SimpleString("");
private static final long serialVersionUID = 4204223851422244307L;
- // Attributes
- // ------------------------------------------------------------------------
private final byte[] data;
private transient int hash;
@@ -49,8 +47,6 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
private transient String[] paths;
- // Static
- // ----------------------------------------------------------------------
/**
* Returns a SimpleString constructed from the {@code string} parameter.
@@ -74,8 +70,6 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
return pool.getOrCreate(string);
}
- // Constructors
- // ----------------------------------------------------------------------
/**
* creates a SimpleString from a conventional String
@@ -226,9 +220,6 @@ public final class SimpleString implements CharSequence, Serializable, Comparabl
return toString().compareTo(o.toString());
}
- // Public
- // ---------------------------------------------------------------------------
-
/**
* returns the underlying byte array of this SimpleString
*
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
index 766c1d6783..2253190839 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/RandomUtil.java
@@ -24,7 +24,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffers;
import org.apache.activemq.artemis.api.core.SimpleString;
public class RandomUtil {
- // Constants -----------------------------------------------------
+
protected static final Random random = new Random();
@@ -32,9 +32,6 @@ public class RandomUtil {
return random;
}
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
public static String randomString() {
return java.util.UUID.randomUUID().toString();
@@ -131,15 +128,4 @@ public class RandomUtil {
return RandomUtil.random.nextFloat();
}
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
index 64475810cd..c59ca1c83d 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDGenerator.java
@@ -206,7 +206,6 @@ public final class UUIDGenerator {
return null;
}
- // Private -------------------------------------------------------
private static boolean isBlackList(final byte[] address) {
for (byte[] blackList : UUIDGenerator.BLACK_LIST) {
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
index d96313b71a..add7c12602 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/UUIDTimer.java
@@ -66,8 +66,6 @@ import java.util.Random;
* lock), and so has no method synchronization.
*/
public class UUIDTimer {
- // // // Constants
-
/**
* Since System.longTimeMillis() returns time from january 1st 1970, and
* UUIDs need time from the beginning of gregorian calendar (15-oct-1582),
@@ -245,11 +243,6 @@ public class UUIDTimer {
uuidData[UUID.INDEX_CLOCK_LO + 3] = (byte) clockLo;
}
- /*
- * /////////////////////////////////////////////////////////// // Private
- * methods ///////////////////////////////////////////////////////////
- */
-
private static final int MAX_WAIT_COUNT = 50;
/**
diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
index 4c5190db47..cde5e1e783 100644
--- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
+++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/collections/TypedProperties.java
@@ -630,8 +630,6 @@ public class TypedProperties {
return sb.append("]").toString();
}
- // Private ------------------------------------------------------------------------------------
-
private synchronized void doPutValue(final SimpleString key, final PropertyValue value) {
if (!internalProperties && internalPropertyPredicate != null && internalPropertyPredicate.test(key)) {
internalProperties = true;
@@ -676,8 +674,6 @@ public class TypedProperties {
}
}
- // Inner classes ------------------------------------------------------------------------------
-
private abstract static class PropertyValue {
abstract Object getValue();
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
index 8e0c8c835f..7dbc96c57b 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/ConcurrentHashSetTest.java
@@ -25,19 +25,12 @@ import org.junit.Before;
import org.junit.Test;
public class ConcurrentHashSetTest extends Assert {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private ConcurrentSet set;
private String element;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testAdd() throws Exception {
@@ -119,12 +112,4 @@ public class ConcurrentHashSetTest extends Assert {
set = new ConcurrentHashSet<>();
element = RandomUtil.randomString();
}
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesConversionTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesConversionTest.java
index a2917ff562..5eee3e98e4 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesConversionTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesConversionTest.java
@@ -25,9 +25,6 @@ import org.junit.Test;
public class TypedPropertiesConversionTest {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private TypedProperties props;
@@ -35,12 +32,6 @@ public class TypedPropertiesConversionTest {
private final SimpleString unknownKey = new SimpleString("this.key.is.never.used");
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
@Before
public void setUp() throws Exception {
key = RandomUtil.randomSimpleString();
@@ -298,12 +289,4 @@ public class TypedPropertiesConversionTest {
Assert.assertNull(props.getBytesProperty(unknownKey));
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
index 0786dad96e..1955e361fc 100644
--- a/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
+++ b/artemis-commons/src/test/java/org/apache/activemq/artemis/utils/TypedPropertiesTest.java
@@ -56,9 +56,7 @@ public class TypedPropertiesTest {
}
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
private TypedProperties props;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
index 5e488d906a..ebe030b3be 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/AddressSettingsInfo.java
@@ -137,7 +137,6 @@ public final class AddressSettingsInfo {
private final boolean enableMetrics;
- // Static --------------------------------------------------------
public static AddressSettingsInfo from(final String jsonString) {
JsonObject object = JsonUtil.readJsonObject(jsonString);
@@ -200,7 +199,6 @@ public final class AddressSettingsInfo {
object.getBoolean("enableMetrics"));
}
- // Constructors --------------------------------------------------
public AddressSettingsInfo(String addressFullMessagePolicy,
long maxSizeBytes,
@@ -318,8 +316,6 @@ public final class AddressSettingsInfo {
this.enableMetrics = enableMetrics;
}
- // Public --------------------------------------------------------
-
public int getPageCacheMaxSize() {
return pageCacheMaxSize;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
index 1dce276be5..3955a8b633 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/DayCounterInfo.java
@@ -34,7 +34,6 @@ public final class DayCounterInfo {
private final long[] counters;
- // Static --------------------------------------------------------
public static String toJSON(final DayCounterInfo[] infos) {
JsonObjectBuilder json = JsonLoader.createObjectBuilder();
@@ -73,15 +72,12 @@ public final class DayCounterInfo {
return infos;
}
- // Constructors --------------------------------------------------
public DayCounterInfo(final String date, final long[] counters) {
this.date = date;
this.counters = counters;
}
- // Public --------------------------------------------------------
-
/**
* Returns the date of the counter.
*/
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
index 53cb08716a..462a7b74fb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ManagementHelper.java
@@ -28,7 +28,6 @@ import org.apache.activemq.artemis.core.message.impl.CoreMessage;
* Helper class to use ActiveMQ Artemis Core messages to manage server resources.
*/
public final class ManagementHelper {
- // Constants -----------------------------------------------------
public static final SimpleString HDR_RESOURCE_NAME = new SimpleString("_AMQ_ResourceName");
@@ -88,9 +87,6 @@ public final class ManagementHelper {
public static final SimpleString HDR_CLIENT_ID = new SimpleString("_AMQ_Client_ID");
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
/**
* Stores a resource attribute in a message to retrieve the value from the server resource.
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
index aa2b0b3c03..528238771a 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/MessageCounterInfo.java
@@ -66,7 +66,6 @@ public final class MessageCounterInfo {
return new MessageCounterInfo(name, subscription, durable, count, countDelta, depth, depthDelta, lastAddTimestamp, lastAckTimestamp, updateTimestamp);
}
- // Constructors --------------------------------------------------
public MessageCounterInfo(final String name,
final String subscription,
@@ -90,8 +89,6 @@ public final class MessageCounterInfo {
this.updateTimestamp = updateTimestamp;
}
- // Public --------------------------------------------------------
-
/**
* Returns the name of the queue.
*/
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
index a97ff7cefe..559f740af8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/api/core/management/ObjectNameBuilder.java
@@ -27,14 +27,12 @@ import org.apache.activemq.artemis.api.core.RoutingType;
*/
public final class ObjectNameBuilder {
- // Constants -----------------------------------------------------
/**
* Default JMX domain for ActiveMQ Artemis resources.
*/
public static final ObjectNameBuilder DEFAULT = new ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain(), "localhost", true);
- // Attributes ----------------------------------------------------
private final String domain;
@@ -42,7 +40,6 @@ public final class ObjectNameBuilder {
private final boolean jmxUseBrokerName;
- // Static --------------------------------------------------------
public static ObjectNameBuilder create(final String domain) {
if (domain == null) {
@@ -68,7 +65,7 @@ public final class ObjectNameBuilder {
}
}
- // Constructors --------------------------------------------------
+
private ObjectNameBuilder(final String domain, final String brokerName, boolean jmxUseBrokerName) {
this.domain = domain;
@@ -76,8 +73,6 @@ public final class ObjectNameBuilder {
this.jmxUseBrokerName = jmxUseBrokerName;
}
- // Public --------------------------------------------------------
-
/**
* Returns the ObjectName used by the single {@link ActiveMQServerControl}.
*/
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 83ee890a81..5000159ed9 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
@@ -47,8 +47,7 @@ import org.apache.activemq.artemis.utils.collections.PriorityLinkedListImpl;
import org.jboss.logging.Logger;
public final class ClientConsumerImpl implements ClientConsumerInternal {
- // Constants
- // ------------------------------------------------------------------------------------
+
private static final Logger logger = Logger.getLogger(ClientConsumerImpl.class);
@@ -58,9 +57,6 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
public static final SimpleString FORCED_DELIVERY_MESSAGE = new SimpleString("_hornetq.forced.delivery.seq");
- // Attributes
- // -----------------------------------------------------------------------------------
-
private final ClientSessionInternal session;
private final SessionContext sessionContext;
@@ -135,8 +131,7 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
private final ClassLoader contextClassLoader;
- // Constructors
- // ---------------------------------------------------------------------------------
+
public ClientConsumerImpl(final ClientSessionInternal session,
final ConsumerContext consumerContext,
@@ -862,18 +857,6 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
}
}
- // Public
- // ---------------------------------------------------------------------------------------
-
- // Package protected
- // ---------------------------------------------------------------------------------------
-
- // Protected
- // ---------------------------------------------------------------------------------------
-
- // Private
- // ---------------------------------------------------------------------------------------
-
/**
* Sending an initial credit for slow consumers
*/
@@ -1142,9 +1125,6 @@ public final class ClientConsumerImpl implements ClientConsumerInternal {
'}';
}
- // Inner classes
- // --------------------------------------------------------------------------------
-
private class Runner implements Runnable {
@Override
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java
index 92a808ac79..ca57a70201 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientLargeMessageImpl.java
@@ -55,8 +55,6 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C
super();
}
- // Public --------------------------------------------------------
-
@Override
public int getEncodeSize() {
if (writableBuffer != null) {
@@ -160,8 +158,6 @@ public final class ClientLargeMessageImpl extends ClientMessageImpl implements C
}
}
- // Inner classes -------------------------------------------------
-
private static class ActiveMQOutputStream extends OutputStream {
private final ActiveMQBuffer bufferOut;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
index 06cacd2ebb..59e29c390c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientProducerImpl.java
@@ -64,9 +64,6 @@ public class ClientProducerImpl implements ClientProducerInternal {
private final ClientProducerCredits producerCredits;
- // Static ---------------------------------------------------------------------------------------
-
- // Constructors ---------------------------------------------------------------------------------
public ClientProducerImpl(final ClientSessionInternal session,
final SimpleString address,
@@ -195,8 +192,6 @@ public class ClientProducerImpl implements ClientProducerInternal {
return rateLimiter == null ? -1 : rateLimiter.getRate();
}
- // Public ---------------------------------------------------------------------------------------
-
@Override
public ClientProducerCredits getProducerCredits() {
return producerCredits;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
index 5d831daf79..5f1d6e5547 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/ClientSessionImpl.java
@@ -1959,9 +1959,6 @@ public final class ClientSessionImpl implements ClientSessionInternal, FailureLi
connectionFailed(me, failedOver);
}
- // Public
- // ----------------------------------------------------------------------------
-
@Override
public void setForceNotSameRM(final boolean force) {
forceNotSameRM = force;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
index a6913879da..eae68326be 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/CompressedLargeMessageControllerImpl.java
@@ -718,8 +718,6 @@ final class CompressedLargeMessageControllerImpl implements LargeMessageControll
throw new UnsupportedOperationException();
}
- // Inner classes -------------------------------------------------
-
@Override
public ByteBuf byteBuf() {
return null;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
index be2bb788e1..4b9ba0ce41 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/client/impl/LargeMessageControllerImpl.java
@@ -50,11 +50,9 @@ import org.apache.activemq.artemis.utils.UTF8Util;
* saveStream are called.
*/
public class LargeMessageControllerImpl implements LargeMessageController {
- // Constants -----------------------------------------------------
private static final String READ_ONLY_ERROR_MESSAGE = "This is a read-only buffer, setOperations are not supported";
- // Attributes ----------------------------------------------------
private final ClientConsumerInternal consumerInternal;
@@ -94,9 +92,6 @@ public class LargeMessageControllerImpl implements LargeMessageController {
private final FileCache fileCache;
private boolean local = false;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public LargeMessageControllerImpl(final ClientConsumerInternal consumerInternal,
final long totalSize,
@@ -127,8 +122,6 @@ public class LargeMessageControllerImpl implements LargeMessageController {
this.bufferSize = bufferSize;
}
- // Public --------------------------------------------------------
-
public void setLocal(boolean local) {
this.local = local;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
index 43844455d4..23e20fe6cc 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/PacketImpl.java
@@ -26,7 +26,7 @@ import org.apache.activemq.artemis.core.protocol.core.Packet;
import org.apache.activemq.artemis.utils.DataConstants;
public class PacketImpl implements Packet {
- // Constants -------------------------------------------------------------------------
+
// 2.0.0
@@ -287,14 +287,12 @@ public class PacketImpl implements Packet {
public static final byte DISCONNECT_V3 = -19;
- // Static --------------------------------------------------------
+
public PacketImpl(final byte type) {
this.type = type;
}
- // Public --------------------------------------------------------
-
public SimpleString convertName(SimpleString name) {
if (name == null) {
return null;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
index 5af391862c..cec722c971 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/RemotingConnectionImpl.java
@@ -85,8 +85,6 @@ public class RemotingConnectionImpl extends AbstractRemotingConnection implement
flush();
}
- // Constructors
- // ---------------------------------------------------------------------------------
/*
* Create a client side connection
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
index a38975800b..eaf348c2a8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage.java
@@ -25,9 +25,6 @@ public class ActiveMQExceptionMessage extends PacketImpl {
protected ActiveMQException exception;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public ActiveMQExceptionMessage(final ActiveMQException exception) {
super(EXCEPTION);
@@ -39,8 +36,6 @@ public class ActiveMQExceptionMessage extends PacketImpl {
super(EXCEPTION);
}
- // Public --------------------------------------------------------
-
@Override
public boolean isResponse() {
return true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java
index e0ba6d7e2c..174a822a98 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ActiveMQExceptionMessage_V2.java
@@ -24,9 +24,7 @@ public class ActiveMQExceptionMessage_V2 extends ActiveMQExceptionMessage {
private long correlationID;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public ActiveMQExceptionMessage_V2(final long correlationID, final ActiveMQException exception) {
super(exception);
@@ -37,8 +35,6 @@ public class ActiveMQExceptionMessage_V2 extends ActiveMQExceptionMessage {
super();
}
- // Public --------------------------------------------------------
-
@Override
public boolean isResponse() {
return true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java
index 35aca2c635..578ecac375 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ClusterTopologyChangeMessage.java
@@ -31,9 +31,6 @@ public class ClusterTopologyChangeMessage extends PacketImpl {
protected boolean last;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public ClusterTopologyChangeMessage(final String nodeID,
final Pair pair,
@@ -61,8 +58,6 @@ public class ClusterTopologyChangeMessage extends PacketImpl {
super(CLUSTER_TOPOLOGY);
}
- // Public --------------------------------------------------------
-
/**
* @param clusterTopologyV2
*/
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java
index d77e9765ee..2d97d449c1 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateAddressMessage.java
@@ -49,8 +49,6 @@ public class CreateAddressMessage extends PacketImpl {
super(CREATE_ADDRESS);
}
- // Public --------------------------------------------------------
-
@Override
protected String getPacketString() {
StringBuffer buff = new StringBuffer(super.getPacketString());
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java
index 0b3950558b..054147d059 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage.java
@@ -59,7 +59,6 @@ public class CreateQueueMessage extends PacketImpl {
super(CREATE_QUEUE);
}
- // Public --------------------------------------------------------
/**
* @param createQueueMessageV2
*/
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
index f376f82076..bdee02f34f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateQueueMessage_V2.java
@@ -188,8 +188,6 @@ public class CreateQueueMessage_V2 extends CreateQueueMessage {
super(CREATE_QUEUE_V2);
}
- // Public --------------------------------------------------------
-
public QueueConfiguration toQueueConfiguration() {
return new QueueConfiguration(queueName)
.setAddress(address)
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java
index d38618c5f3..b2e22d69c6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage.java
@@ -108,8 +108,6 @@ public class CreateSessionMessage extends PacketImpl {
super(type);
}
- // Public --------------------------------------------------------
-
public String getName() {
return name;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java
index aed5e31798..fb3fee565b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSessionMessage_V2.java
@@ -44,8 +44,6 @@ public class CreateSessionMessage_V2 extends CreateSessionMessage {
super(CREATESESSION_V2);
}
- // Public --------------------------------------------------------
-
public String getClientID() {
return clientID;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java
index 14bc679e70..b8c45ccf96 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/CreateSharedQueueMessage.java
@@ -54,8 +54,6 @@ public class CreateSharedQueueMessage extends PacketImpl {
super(packetType);
}
- // Public --------------------------------------------------------
-
@Override
protected String getPacketString() {
StringBuffer buff = new StringBuffer(super.getPacketString());
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java
index f09a2de7e0..a2333f1272 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage.java
@@ -21,15 +21,10 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
public class DisconnectMessage extends PacketImpl {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
protected SimpleString nodeID;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public DisconnectMessage(final SimpleString nodeID) {
super(DISCONNECT);
@@ -45,8 +40,6 @@ public class DisconnectMessage extends PacketImpl {
super(disconnectV2);
}
- // Public --------------------------------------------------------
-
public SimpleString getNodeID() {
return nodeID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java
index 5196ef1b71..99461597fb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V2.java
@@ -35,8 +35,6 @@ public class DisconnectMessage_V2 extends DisconnectMessage {
super(DISCONNECT_V2);
}
- // Public --------------------------------------------------------
-
public SimpleString getScaleDownNodeID() {
return scaleDownNodeID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java
index 35c9eaaf7c..f6ebcdf562 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/DisconnectMessage_V3.java
@@ -46,8 +46,6 @@ public class DisconnectMessage_V3 extends DisconnectMessage {
super(DISCONNECT_V3);
}
- // Public --------------------------------------------------------
-
public DisconnectReason getReason() {
return reason;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java
index c69b1628a9..b5d1132c26 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NullResponseMessage_V2.java
@@ -32,8 +32,6 @@ public class NullResponseMessage_V2 extends NullResponseMessage {
super();
}
- // Public --------------------------------------------------------
-
@Override
public long getCorrelationID() {
return correlationID;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java
index a909af7f64..08cf738913 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/PacketsConfirmedMessage.java
@@ -33,8 +33,6 @@ public class PacketsConfirmedMessage extends PacketImpl {
super(PACKETS_CONFIRMED);
}
- // Public --------------------------------------------------------
-
public int getCommandID() {
return commandID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java
index 9f7e5a9bb1..6807cca20b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReattachSessionResponseMessage.java
@@ -37,8 +37,6 @@ public class ReattachSessionResponseMessage extends PacketImpl {
super(REATTACH_SESSION_RESP);
}
- // Public --------------------------------------------------------
-
public int getLastConfirmedCommandID() {
return lastConfirmedCommandID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java
index a8e10bd195..e5d698f4e6 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionAcknowledgeMessage.java
@@ -41,8 +41,6 @@ public class SessionAcknowledgeMessage extends PacketImpl {
super(SESS_ACKNOWLEDGE);
}
- // Public --------------------------------------------------------
-
public long getConsumerID() {
return consumerID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java
index 3024e87a06..4492519cff 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionCloseMessage.java
@@ -24,8 +24,6 @@ public class SessionCloseMessage extends PacketImpl {
super(SESS_CLOSE);
}
- // Public --------------------------------------------------------
-
@Override
public boolean equals(final Object other) {
if (other instanceof SessionCloseMessage == false) {
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java
index df51265f38..72b03ead39 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerCloseMessage.java
@@ -33,8 +33,6 @@ public class SessionConsumerCloseMessage extends PacketImpl {
super(SESS_CONSUMER_CLOSE);
}
- // Public --------------------------------------------------------
-
public long getConsumerID() {
return consumerID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java
index 8b1aa0e5b7..05649e63bb 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionConsumerFlowCreditMessage.java
@@ -34,8 +34,6 @@ public class SessionConsumerFlowCreditMessage extends PacketImpl {
super(SESS_FLOWTOKEN);
}
- // Public --------------------------------------------------------
-
public long getConsumerID() {
return consumerID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
index d5e48c5b1d..b02c724818 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionContinuationMessage.java
@@ -41,8 +41,6 @@ public abstract class SessionContinuationMessage extends PacketImpl {
super(type);
}
- // Public --------------------------------------------------------
-
/**
* @return the body
*/
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java
index 91064d431a..1ae076070f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionExpireMessage.java
@@ -20,17 +20,12 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
public class SessionExpireMessage extends PacketImpl {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private long consumerID;
private long messageID;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public SessionExpireMessage(final long consumerID, final long messageID) {
super(SESS_EXPIRED);
@@ -44,8 +39,6 @@ public class SessionExpireMessage extends PacketImpl {
super(SESS_EXPIRED);
}
- // Public --------------------------------------------------------
-
public long getConsumerID() {
return consumerID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java
index 72f56b6ab2..ffee84eb93 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionIndividualAcknowledgeMessage.java
@@ -20,9 +20,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
public class SessionIndividualAcknowledgeMessage extends PacketImpl {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private long consumerID;
@@ -30,9 +28,6 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl {
private boolean requiresResponse;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public SessionIndividualAcknowledgeMessage(final long consumerID,
final long messageID,
@@ -50,8 +45,6 @@ public class SessionIndividualAcknowledgeMessage extends PacketImpl {
super(SESS_INDIVIDUAL_ACKNOWLEDGE);
}
- // Public --------------------------------------------------------
-
public long getConsumerID() {
return consumerID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java
index bbb1261224..98e1af8a7f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveContinuationMessage.java
@@ -21,17 +21,12 @@ import org.apache.activemq.artemis.utils.DataConstants;
public class SessionReceiveContinuationMessage extends SessionContinuationMessage {
- // Constants -----------------------------------------------------
public static final int SESSION_RECEIVE_CONTINUATION_BASE_SIZE = SESSION_CONTINUATION_BASE_SIZE + DataConstants.SIZE_LONG;
- // Attributes ----------------------------------------------------
private long consumerID;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public SessionReceiveContinuationMessage() {
super(SESS_RECEIVE_CONTINUATION);
@@ -67,15 +62,11 @@ public class SessionReceiveContinuationMessage extends SessionContinuationMessag
return consumerID;
}
- // Protected -----------------------------------------------------
-
@Override
public int expectedEncodeSize() {
return super.expectedEncodeSize() + DataConstants.SIZE_LONG;
}
- // Public --------------------------------------------------------
-
@Override
public void encodeRest(final ActiveMQBuffer buffer) {
super.encodeRest(buffer);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java
index 32e41e465e..8edbcac65b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionReceiveMessage.java
@@ -23,9 +23,6 @@ import org.apache.activemq.artemis.core.message.impl.CoreMessage;
import org.apache.activemq.artemis.utils.DataConstants;
public class SessionReceiveMessage extends MessagePacket {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected long consumerID;
@@ -43,8 +40,6 @@ public class SessionReceiveMessage extends MessagePacket {
super(SESS_RECEIVE_MSG, message);
}
- // Public --------------------------------------------------------
-
public long getConsumerID() {
return consumerID;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java
index 38a8d0e35e..a2fe99531f 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionRequestProducerCreditsMessage.java
@@ -38,8 +38,6 @@ public class SessionRequestProducerCreditsMessage extends PacketImpl {
super(SESS_PRODUCER_REQUEST_CREDITS);
}
- // Public --------------------------------------------------------
-
public int getCredits() {
return credits;
}
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 40f9721bb1..1aa521650e 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
@@ -45,9 +45,7 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage {
*/
protected long messageBodySize = -1;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public SessionSendContinuationMessage() {
super(SESS_SEND_CONTINUATION);
@@ -96,8 +94,6 @@ public class SessionSendContinuationMessage extends SessionContinuationMessage {
this.messageBodySize = messageBodySize;
}
- // Public --------------------------------------------------------
-
/**
* @return the requiresResponse
*/
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java
index 3e7629a92c..9fd09684cf 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendContinuationMessage_V2.java
@@ -28,9 +28,7 @@ public class SessionSendContinuationMessage_V2 extends SessionSendContinuationMe
private long correlationID;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public SessionSendContinuationMessage_V2() {
super();
@@ -50,8 +48,6 @@ public class SessionSendContinuationMessage_V2 extends SessionSendContinuationMe
super(message, body, continues, requiresResponse, messageBodySize, handler);
}
- // Public --------------------------------------------------------
-
@Override
public int expectedEncodeSize() {
return super.expectedEncodeSize() + DataConstants.SIZE_LONG;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java
index 73b07d331a..d187f7229b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionSendLargeMessage.java
@@ -28,9 +28,6 @@ public class SessionSendLargeMessage extends PacketImpl implements MessagePacket
*/
private Message largeMessage;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public SessionSendLargeMessage(final Message largeMessage) {
super(SESS_SEND_LARGE);
@@ -38,8 +35,6 @@ public class SessionSendLargeMessage extends PacketImpl implements MessagePacket
this.largeMessage = largeMessage;
}
- // Public --------------------------------------------------------
-
public Message getLargeMessage() {
return largeMessage;
}
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 e3f9766cbd..dafcb8fc6d 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
@@ -67,8 +67,6 @@ public class SessionSendMessage extends MessagePacket {
this.handler = null;
}
- // Public --------------------------------------------------------
-
@Override
public boolean isRequiresResponse() {
return requiresResponse;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java
index e367a8a8bc..57e167ed1d 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionUniqueAddMetaDataMessage.java
@@ -18,13 +18,6 @@ package org.apache.activemq.artemis.core.protocol.core.impl.wireformat;
public class SessionUniqueAddMetaDataMessage extends SessionAddMetaDataMessageV2 {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public SessionUniqueAddMetaDataMessage() {
super(SESS_UNIQUE_ADD_METADATA);
@@ -34,14 +27,4 @@ public class SessionUniqueAddMetaDataMessage extends SessionAddMetaDataMessageV2
super(SESS_UNIQUE_ADD_METADATA, key, data);
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java
index c74ddae7d9..1e637cb6fd 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAAfterFailedMessage.java
@@ -26,15 +26,10 @@ import org.apache.activemq.artemis.utils.XidCodecSupport;
* to be called after a failure on an XA Session
*/
public class SessionXAAfterFailedMessage extends PacketImpl {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private Xid xid;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public SessionXAAfterFailedMessage(final Xid xid) {
super(SESS_XA_FAILED);
@@ -46,8 +41,6 @@ public class SessionXAAfterFailedMessage extends PacketImpl {
super(SESS_XA_FAILED);
}
- // Public --------------------------------------------------------
-
public Xid getXid() {
return xid;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java
index a62425c560..2841c8c6d9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage.java
@@ -41,8 +41,6 @@ public class SessionXAResponseMessage extends PacketImpl {
super(SESS_XA_RESP);
}
- // Public --------------------------------------------------------
-
@Override
public boolean isResponse() {
return true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java
index c157e70e5a..c9bf965835 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResponseMessage_V2.java
@@ -32,8 +32,6 @@ public class SessionXAResponseMessage_V2 extends SessionXAResponseMessage {
super();
}
- // Public --------------------------------------------------------
-
@Override
public long getCorrelationID() {
return correlationID;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java
index 7342a9abed..02b8359bf8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAResumeMessage.java
@@ -36,8 +36,6 @@ public class SessionXAResumeMessage extends PacketImpl {
super(SESS_XA_RESUME);
}
- // Public --------------------------------------------------------
-
public Xid getXid() {
return xid;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java
index 1ad5db60ef..8187af945b 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXARollbackMessage.java
@@ -36,8 +36,6 @@ public class SessionXARollbackMessage extends PacketImpl {
super(SESS_XA_ROLLBACK);
}
- // Public --------------------------------------------------------
-
public Xid getXid() {
return xid;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java
index 63c6718d96..04f5bd49ad 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutMessage.java
@@ -33,8 +33,6 @@ public class SessionXASetTimeoutMessage extends PacketImpl {
super(SESS_XA_SET_TIMEOUT);
}
- // Public --------------------------------------------------------
-
public int getTimeoutSeconds() {
return timeoutSeconds;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java
index efb26d74ce..12620426cf 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXASetTimeoutResponseMessage.java
@@ -33,8 +33,6 @@ public class SessionXASetTimeoutResponseMessage extends PacketImpl {
super(SESS_XA_SET_TIMEOUT_RESP);
}
- // Public --------------------------------------------------------
-
@Override
public boolean isResponse() {
return true;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java
index 16926c4cce..b7336964e5 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SessionXAStartMessage.java
@@ -23,15 +23,10 @@ import org.apache.activemq.artemis.core.protocol.core.impl.PacketImpl;
import org.apache.activemq.artemis.utils.XidCodecSupport;
public class SessionXAStartMessage extends PacketImpl {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private Xid xid;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public SessionXAStartMessage(final Xid xid) {
super(SESS_XA_START);
@@ -43,8 +38,6 @@ public class SessionXAStartMessage extends PacketImpl {
super(SESS_XA_START);
}
- // Public --------------------------------------------------------
-
public Xid getXid() {
return xid;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java
index 862d4d65e4..87d8bc46a0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessage.java
@@ -43,8 +43,6 @@ public class SubscribeClusterTopologyUpdatesMessage extends PacketImpl {
super(packetType);
}
- // Public --------------------------------------------------------
-
public boolean isClusterConnection() {
return clusterConnection;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java
index e91f3fc952..eb24665c16 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/SubscribeClusterTopologyUpdatesMessageV2.java
@@ -32,8 +32,6 @@ public class SubscribeClusterTopologyUpdatesMessageV2 extends SubscribeClusterTo
super(SUBSCRIBE_TOPOLOGY_V2);
}
- // Public --------------------------------------------------------
-
@Override
public void encodeRest(final ActiveMQBuffer buffer) {
super.encodeRest(buffer);
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
index 814a920fe6..b1d183a6fe 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyConnector.java
@@ -134,7 +134,6 @@ public class NettyConnector extends AbstractConnector {
private static final Logger logger = Logger.getLogger(NettyConnector.class);
- // Constants -----------------------------------------------------
public static final String JAVAX_KEYSTORE_PATH_PROP_NAME = "javax.net.ssl.keyStore";
public static final String JAVAX_KEYSTORE_PASSWORD_PROP_NAME = "javax.net.ssl.keyStorePassword";
public static final String JAVAX_KEYSTORE_TYPE_PROP_NAME = "javax.net.ssl.keyStoreType";
@@ -176,7 +175,6 @@ public class NettyConnector extends AbstractConnector {
DEFAULT_CONFIG = Collections.unmodifiableMap(config);
}
- // Attributes ----------------------------------------------------
private final boolean serverConnection;
@@ -303,11 +301,6 @@ public class NettyConnector extends AbstractConnector {
private final ClientProtocolManager protocolManager;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
public NettyConnector(final Map configuration,
final BufferHandler handler,
final BaseConnectionLifeCycleListener listener,
@@ -966,8 +959,6 @@ public class NettyConnector extends AbstractConnector {
}
}
- // Public --------------------------------------------------------
-
public int getConnectTimeoutMillis() {
return connectTimeoutMillis;
}
@@ -976,14 +967,6 @@ public class NettyConnector extends AbstractConnector {
this.connectTimeoutMillis = connectTimeoutMillis;
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
private static final class ActiveMQClientChannelHandler extends ActiveMQChannelHandler {
ActiveMQClientChannelHandler(final ChannelGroup group,
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
index 5506181acd..21f4d8a402 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/remoting/impl/ssl/SSLSupport.java
@@ -241,7 +241,6 @@ public class SSLSupport {
return supportedSuites.delete(supportedSuites.length() - 2, supportedSuites.length()).toString();
}
- // Private -------------------------------------------------------
private TrustManagerFactory loadTrustManagerFactory() throws Exception {
if (trustManagerFactoryPlugin != null) {
return AccessController.doPrivileged((PrivilegedAction) () -> ((TrustManagerFactoryPlugin) ClassloadingUtil.newInstanceFromClassLoader(SSLSupport.class, trustManagerFactoryPlugin)).getTrustManagerFactory());
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
index a191cbd6c2..cd368edaa9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/transaction/impl/XidImpl.java
@@ -39,7 +39,6 @@ public class XidImpl implements Xid, Serializable {
private boolean hashCalculated;
- // Static --------------------------------------------------------
public static String toBase64String(final Xid xid) {
byte[] data = XidImpl.toByteArray(xid);
@@ -62,7 +61,7 @@ public class XidImpl implements Xid, Serializable {
return hashBytes;
}
- // Constructors --------------------------------------------------
+
/**
* Standard constructor
@@ -88,8 +87,6 @@ public class XidImpl implements Xid, Serializable {
globalTransactionId = copyBytes(other.getGlobalTransactionId());
}
- // Xid implementation ------------------------------------------------------------------
-
@Override
public byte[] getBranchQualifier() {
return branchQualifier;
@@ -105,8 +102,6 @@ public class XidImpl implements Xid, Serializable {
return globalTransactionId;
}
- // Public -------------------------------------------------------------------------------
-
@Override
public int hashCode() {
if (!hashCalculated) {
@@ -160,7 +155,6 @@ public class XidImpl implements Xid, Serializable {
" base64:" + toBase64String(this);
}
- // Private -------------------------------------------------------------------------------
private String stringRep(final byte[] bytes) {
StringBuffer buff = new StringBuffer();
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
index 4ec3ed157f..757c14eb60 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/core/version/impl/VersionImpl.java
@@ -37,7 +37,7 @@ public class VersionImpl implements Version, Serializable {
private final int[] compatibleVersionList;
- // Constructors --------------------------------------------------
+
public VersionImpl(final String versionName,
final int majorVersion,
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java
index 25c7585569..aaf09bce76 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ActiveMQBufferInputStream.java
@@ -29,16 +29,9 @@ public class ActiveMQBufferInputStream extends InputStream {
/* (non-Javadoc)
* @see java.io.InputStream#read()
*/
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private ActiveMQBuffer bb;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
public ActiveMQBufferInputStream(final ActiveMQBuffer paramByteBuffer) {
bb = paramByteBuffer;
@@ -137,12 +130,6 @@ public class ActiveMQBufferInputStream extends InputStream {
return false;
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
/**
* @return
*/
@@ -150,6 +137,4 @@ public class ActiveMQBufferInputStream extends InputStream {
return bb.writerIndex() - bb.readerIndex();
}
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java
index 83a15101ea..97c3574c08 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/JNDIUtil.java
@@ -24,9 +24,6 @@ import javax.naming.NamingException;
import java.util.StringTokenizer;
public class JNDIUtil {
- // Constants -----------------------------------------------------
-
- // Static --------------------------------------------------------
/**
* Create a context path recursively.
@@ -89,17 +86,4 @@ public class JNDIUtil {
}
}
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java
index 31d7a4710f..f15f2286f8 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/ObjectInputStreamWithClassLoader.java
@@ -30,7 +30,6 @@ import java.util.List;
public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
- // Constants ------------------------------------------------------------------------------------
/**
* Value used to indicate that all classes should be white or black listed,
@@ -40,14 +39,10 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
public static final String WHITELIST_PROPERTY = "org.apache.activemq.artemis.jms.deserialization.whitelist";
public static final String BLACKLIST_PROPERTY = "org.apache.activemq.artemis.jms.deserialization.blacklist";
- // Attributes -----------------------------------------------------------------------------------
private List whiteList = new ArrayList<>();
private List blackList = new ArrayList<>();
- // Static ---------------------------------------------------------------------------------------
-
- // Constructors ---------------------------------------------------------------------------------
public ObjectInputStreamWithClassLoader(final InputStream in) throws IOException {
super(in);
@@ -58,8 +53,6 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
setBlackList(blackList);
}
- // Public ---------------------------------------------------------------------------------------
-
/**
* @return the whiteList configured on this policy instance.
*/
@@ -98,10 +91,6 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
this.blackList = StringUtil.splitStringList(blackList, ",");
}
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
@Override
protected Class resolveClass(final ObjectStreamClass desc) throws IOException, ClassNotFoundException {
if (System.getSecurityManager() == null) {
@@ -138,7 +127,6 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
}
}
- // Private --------------------------------------------------------------------------------------
private Class resolveClass0(final ObjectStreamClass desc) throws IOException, ClassNotFoundException {
String name = desc.getName();
@@ -273,6 +261,4 @@ public class ObjectInputStreamWithClassLoader extends ObjectInputStream {
return false;
}
- // Inner classes --------------------------------------------------------------------------------
-
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java
index 02143746f2..23b151706c 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SizeFormatterUtil.java
@@ -18,7 +18,6 @@ package org.apache.activemq.artemis.utils;
public class SizeFormatterUtil {
- // Constants -----------------------------------------------------
private static long oneKiB = 1024;
@@ -26,10 +25,6 @@ public class SizeFormatterUtil {
private static long oneGiB = SizeFormatterUtil.oneMiB * 1024;
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
public static String sizeof(final long size) {
double s = Long.valueOf(size).doubleValue();
String suffix = "B";
@@ -45,16 +40,4 @@ public class SizeFormatterUtil {
}
return String.format("%.2f %s", s, suffix);
}
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueLongObjectHashMap.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueLongObjectHashMap.java
index 45be1a2d81..fed5616966 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueLongObjectHashMap.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/SoftValueLongObjectHashMap.java
@@ -44,25 +44,19 @@ public class SoftValueLongObjectHashMap extends SoftReference {
final long key;
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java
index 806f1f4d89..58213e8ac9 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/TimeAndCounterIDGenerator.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicLong;
*
*/
public class TimeAndCounterIDGenerator implements IDGenerator {
- // Constants ----------------------------------------------------
+
/**
* Bits to move the date accordingly to MASK_TIME
@@ -40,7 +40,6 @@ public class TimeAndCounterIDGenerator implements IDGenerator {
private static final long TIME_ID_MASK = 0x7fffffffff000000L;
- // Attributes ----------------------------------------------------
private final AtomicLong counter = new AtomicLong(0);
@@ -48,17 +47,12 @@ public class TimeAndCounterIDGenerator implements IDGenerator {
private volatile long tmMark;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public TimeAndCounterIDGenerator() {
refresh();
}
- // Public --------------------------------------------------------
- // Public --------------------------------------------------------
@Override
public long generateID() {
@@ -136,12 +130,6 @@ public class TimeAndCounterIDGenerator implements IDGenerator {
")";
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
private long newTM() {
return (System.currentTimeMillis() & TimeAndCounterIDGenerator.MASK_TIME) << TimeAndCounterIDGenerator.BITS_TO_MOVE;
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
index b1a90a8728..4c660d05da 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XMLUtil.java
@@ -392,6 +392,4 @@ public final class XMLUtil {
});
}
- // Inner classes --------------------------------------------------------------------------------
-
}
diff --git a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java
index 32e5194454..f746483fa0 100644
--- a/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java
+++ b/artemis-core-client/src/main/java/org/apache/activemq/artemis/utils/XidCodecSupport.java
@@ -23,11 +23,6 @@ import org.apache.activemq.artemis.core.transaction.impl.XidImpl;
public class XidCodecSupport {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
public static void encodeXid(final Xid xid, final ActiveMQBuffer out) {
out.writeInt(xid.getFormatId());
@@ -50,15 +45,4 @@ public class XidCodecSupport {
return DataConstants.SIZE_INT * 3 + xid.getBranchQualifier().length + xid.getGlobalTransactionId().length;
}
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
index cd55e92f96..081996ab08 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/TimeAndCounterIDGeneratorTest.java
@@ -26,16 +26,6 @@ import org.junit.Test;
public class TimeAndCounterIDGeneratorTest extends Assert {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
@Test
public void testCalculation() {
TimeAndCounterIDGenerator seq = new TimeAndCounterIDGenerator();
diff --git a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
index 9d8bbfcb73..c7bafd9bc3 100644
--- a/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
+++ b/artemis-core-client/src/test/java/org/apache/activemq/artemis/util/XMLUtilTest.java
@@ -25,9 +25,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
public class XMLUtilTest extends SilentTestCase {
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testGetTextContext_1() throws Exception {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
index 6da39125d2..d6e4541dc0 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQBytesMessage.java
@@ -58,14 +58,11 @@ import static org.apache.activemq.artemis.reader.BytesMessageUtil.bytesWriteUTF;
*/
public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessage {
- // Static -------------------------------------------------------
public static final byte TYPE = Message.BYTES_TYPE;
- // Attributes ----------------------------------------------------
private int bodyLength;
- // Constructor ---------------------------------------------------
/**
* This constructor is used to construct messages prior to sending
@@ -352,7 +349,6 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag
reset();
}
- // Public --------------------------------------------------------
@Override
public byte getType() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
index 61f5f3fbfb..f2e468f355 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnection.java
@@ -66,7 +66,7 @@ import org.apache.activemq.artemis.utils.collections.ConcurrentHashSet;
*/
public class ActiveMQConnection extends ActiveMQConnectionForContextImpl implements TopicConnection, QueueConnection {
- // Constants ------------------------------------------------------------------------------------
+
public static final int TYPE_GENERIC_CONNECTION = 0;
public static final int TYPE_QUEUE_CONNECTION = 1;
@@ -79,9 +79,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
public static final SimpleString CONNECTION_ID_PROPERTY_NAME = MessageUtil.CONNECTION_ID_PROPERTY_NAME;
- // Static ---------------------------------------------------------------------------------------
-
- // Attributes -----------------------------------------------------------------------------------
private final int connectionType;
@@ -137,7 +134,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
private final ConnectionFactoryOptions options;
- // Constructors ---------------------------------------------------------------------------------
public ActiveMQConnection(final ConnectionFactoryOptions options,
final String username,
@@ -502,8 +498,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
return null; // we offer RA
}
- // Public ---------------------------------------------------------------------------------------
-
/**
* Sets a FailureListener for the session which is notified if a failure occurs on the session.
*
@@ -563,12 +557,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
return initialSession;
}
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // In case the user forgets to close the connection manually
-
@Override
protected final void finalize() throws Throwable {
if (!closed) {
@@ -638,7 +626,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
return sessionFactory;
}
- // Private --------------------------------------------------------------------------------------
/**
* @param transacted
@@ -714,8 +701,6 @@ public class ActiveMQConnection extends ActiveMQConnectionForContextImpl impleme
}
- // Inner classes --------------------------------------------------------------------------------
-
private static class JMSFailureListener implements SessionFailureListener {
private final WeakReference connectionRef;
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
index c6d764581a..27bfa7d2e9 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionFactory.java
@@ -868,10 +868,6 @@ public class ActiveMQConnectionFactory extends JNDIStorable implements Connectio
return JMSFactoryType.CF.intValue();
}
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
protected synchronized ActiveMQConnection createConnectionInternal(final String username,
final String password,
final boolean isXA,
@@ -947,7 +943,6 @@ public class ActiveMQConnectionFactory extends JNDIStorable implements Connectio
"]";
}
- // Private --------------------------------------------------------------------------------------
private void checkWrite() {
if (readOnly) {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
index 4d69b711c9..43bcc83cf3 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQConnectionMetaData.java
@@ -49,17 +49,13 @@ public class ActiveMQConnectionMetaData implements ConnectionMetaData {
JMS_MINOR_VERSION = Integer.valueOf(versionProps.getProperty("activemq.version.implementation.minorVersion", "0"));
}
- // Constants -----------------------------------------------------
private static final String ACTIVEMQ = "ActiveMQ";
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
private final Version serverVersion;
- // Constructors --------------------------------------------------
+
/**
* Create a new ActiveMQConnectionMetaData object.
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
index 469db142dc..a1a04daf92 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQDestination.java
@@ -37,9 +37,7 @@ import org.apache.activemq.artemis.utils.DestinationUtil;
* ActiveMQ Artemis implementation of a JMS Destination.
*/
public class ActiveMQDestination extends JNDIStorable implements Destination, Serializable {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
private static final long serialVersionUID = 5027962425462382883L;
@@ -292,7 +290,6 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
return createTemporaryTopic(address, null);
}
- // Attributes ----------------------------------------------------
/**
* The core address
@@ -318,7 +315,7 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
private final transient ActiveMQSession session;
private transient boolean created;
- // Constructors --------------------------------------------------
+
protected ActiveMQDestination(final String address,
final TYPE type,
@@ -428,7 +425,6 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
return queue;
}
- // Public --------------------------------------------------------
public String getAddress() {
return simpleAddress != null ? simpleAddress.toString() : null;
@@ -512,14 +508,6 @@ public class ActiveMQDestination extends JNDIStorable implements Destination, Se
props.put("address", getAddress());
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
public enum TYPE {
QUEUE,
TOPIC,
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
index e0249bff79..f9559ec5a4 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMapMessage.java
@@ -37,19 +37,14 @@ import static org.apache.activemq.artemis.reader.MapMessageUtil.writeBodyMap;
* ActiveMQ Artemis implementation of a JMS MapMessage.
*/
public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
- // Constants -----------------------------------------------------
public static final byte TYPE = Message.MAP_TYPE;
- // Attributes ----------------------------------------------------
private final TypedProperties map = new TypedProperties();
private boolean invalid;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
/*
* This constructor is used to construct messages prior to sending
@@ -89,7 +84,6 @@ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
}
}
- // Public --------------------------------------------------------
@Override
public byte getType() {
@@ -335,11 +329,8 @@ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage {
readBodyMap(message.getBodyBuffer(), map);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
/**
* Check the name
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
index 7cc6c472d8..0991fbcda9 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessage.java
@@ -63,7 +63,6 @@ import static org.apache.activemq.artemis.jms.client.ActiveMQDestination.TOPIC_Q
*/
public class ActiveMQMessage implements javax.jms.Message {
- // Constants -----------------------------------------------------
public static final byte TYPE = org.apache.activemq.artemis.api.core.Message.DEFAULT_TYPE;
public static final SimpleString OLD_QUEUE_QUALIFIED_PREFIX = SimpleString.toSimpleString(ActiveMQDestination.QUEUE_QUALIFIED_PREFIX + PacketImpl.OLD_QUEUE_PREFIX);
@@ -110,7 +109,6 @@ public class ActiveMQMessage implements javax.jms.Message {
return jmsdata;
}
- // Static --------------------------------------------------------
private static final HashSet reservedIdentifiers = new HashSet<>();
@@ -172,7 +170,6 @@ public class ActiveMQMessage implements javax.jms.Message {
return msg;
}
- // Attributes ----------------------------------------------------
// The underlying message
protected ClientMessage message;
@@ -206,7 +203,6 @@ public class ActiveMQMessage implements javax.jms.Message {
private long jmsDeliveryTime;
- // Constructors --------------------------------------------------
/*
* Create a new message prior to sending
@@ -771,7 +767,6 @@ public class ActiveMQMessage implements javax.jms.Message {
return message.getBodySize() == 0;
}
- // Public --------------------------------------------------------
public void setIndividualAcknowledge() {
this.individualAck = true;
@@ -865,9 +860,7 @@ public class ActiveMQMessage implements javax.jms.Message {
return sb.toString();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
protected void checkWrite() throws JMSException {
if (readOnly) {
@@ -881,8 +874,6 @@ public class ActiveMQMessage implements javax.jms.Message {
}
}
- // Private ------------------------------------------------------------
-
private void checkStream() throws JMSException {
if (!(message.getType() == ActiveMQBytesMessage.TYPE || message.getType() == ActiveMQStreamMessage.TYPE)) {
throw ActiveMQJMSClientBundle.BUNDLE.onlyValidForByteOrStreamMessages();
@@ -948,5 +939,4 @@ public class ActiveMQMessage implements javax.jms.Message {
}
}
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
index 86c808c095..39b2da764f 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageConsumer.java
@@ -66,7 +66,7 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
private final SimpleString autoDeleteQueueName;
- // Constructors --------------------------------------------------
+
protected ActiveMQMessageConsumer(final ConnectionFactoryOptions options,
final ActiveMQConnection connection,
@@ -180,7 +180,6 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
return noLocal;
}
- // Public --------------------------------------------------------
@Override
public String toString() {
@@ -191,11 +190,8 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
return consumer.isClosed();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
private void checkClosed() throws JMSException {
if (consumer.isClosed() || session.getCoreSession().isClosed()) {
@@ -265,6 +261,4 @@ public final class ActiveMQMessageConsumer implements QueueReceiver, TopicSubscr
}
}
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
index 0c771320d7..cd6cbf42f7 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQMessageProducer.java
@@ -72,7 +72,6 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To
private long defaultDeliveryDelay = Message.DEFAULT_DELIVERY_DELAY;
private final ActiveMQDestination defaultDestination;
- // Constructors --------------------------------------------------
protected ActiveMQMessageProducer(final ActiveMQConnection connection,
final ClientProducer producer,
@@ -326,7 +325,6 @@ public class ActiveMQMessageProducer implements MessageProducer, QueueSender, To
return (Queue) getDestination();
}
- // Public --------------------------------------------------------
@Override
public String toString() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
index 173f29d457..267dc8ac4b 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQObjectMessage.java
@@ -38,20 +38,16 @@ import org.apache.activemq.artemis.utils.ObjectInputStreamWithClassLoader;
* Serialization is slooooow!
*/
public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMessage {
- // Constants -----------------------------------------------------
+
public static final byte TYPE = Message.OBJECT_TYPE;
- // Attributes ----------------------------------------------------
// keep a snapshot of the Serializable Object as a byte[] to provide Object isolation
private byte[] data;
private final ConnectionFactoryOptions options;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
protected ActiveMQObjectMessage(final ClientSession session, ConnectionFactoryOptions options) {
super(ActiveMQObjectMessage.TYPE, session);
@@ -77,7 +73,6 @@ public class ActiveMQObjectMessage extends ActiveMQMessage implements ObjectMess
this.options = options;
}
- // Public --------------------------------------------------------
@Override
public byte getType() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
index f1b69d7669..54c16635c4 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueue.java
@@ -27,14 +27,9 @@ import org.apache.activemq.artemis.api.core.SimpleString;
*/
public class ActiveMQQueue extends ActiveMQDestination implements Queue {
- // Constants -----------------------------------------------------
private static final long serialVersionUID = -1106092883162295462L;
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
public ActiveMQQueue() {
this((SimpleString) null);
}
@@ -68,7 +63,6 @@ public class ActiveMQQueue extends ActiveMQDestination implements Queue {
// Queue implementation ------------------------------------------
- // Public --------------------------------------------------------
@Override
public String getQueueName() {
@@ -100,11 +94,5 @@ public class ActiveMQQueue extends ActiveMQDestination implements Queue {
return super.getAddress().hashCode();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
index 810166ce8f..76e13065a7 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQQueueBrowser.java
@@ -34,11 +34,7 @@ import org.apache.activemq.artemis.utils.SelectorTranslator;
* ActiveMQ Artemis implementation of a JMS QueueBrowser.
*/
public final class ActiveMQQueueBrowser implements QueueBrowser {
- // Constants ------------------------------------------------------------------------------------
- // Static ---------------------------------------------------------------------------------------
-
- // Attributes -----------------------------------------------------------------------------------
private final ConnectionFactoryOptions options;
@@ -52,7 +48,7 @@ public final class ActiveMQQueueBrowser implements QueueBrowser {
private final boolean enable1xPrefixes;
- // Constructors ---------------------------------------------------------------------------------
+
protected ActiveMQQueueBrowser(final ConnectionFactoryOptions options,
final ActiveMQQueue queue,
@@ -105,21 +101,12 @@ public final class ActiveMQQueueBrowser implements QueueBrowser {
return queue;
}
- // Public ---------------------------------------------------------------------------------------
@Override
public String toString() {
return "ActiveMQQueueBrowser->" + consumer;
}
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
private final class BrowserEnumeration implements Enumeration {
ClientMessage current = null;
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
index 1b2d619462..e5e09a14ad 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQSession.java
@@ -120,7 +120,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
private final Map queueCache = new ConcurrentHashMap<>();
- // Constructors --------------------------------------------------
protected ActiveMQSession(final ConnectionFactoryOptions options,
final ActiveMQConnection connection,
@@ -1139,7 +1138,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
return (TopicSession) getSession();
}
- // Public --------------------------------------------------------
@Override
public String toString() {
@@ -1237,8 +1235,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
return enable1xPrefixes;
}
- // Package protected ---------------------------------------------
-
void deleteQueue(final SimpleString queueName) throws JMSException {
if (!session.isClosed()) {
try {
@@ -1253,8 +1249,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
return connection;
}
- // Protected -----------------------------------------------------
-
void checkClosed() throws JMSException {
if (session.isClosed()) {
@@ -1280,7 +1274,6 @@ public class ActiveMQSession implements QueueSession, TopicSession {
session.createQueue(queueConfiguration.setName(queueName).setAddress(destination.getAddress()).setAutoCreated(autoCreated).setDurable(durable));
}
- // Private -------------------------------------------------------
private ActiveMQQueue lookupQueue(final String queueName, boolean isTemporary) throws ActiveMQException {
@@ -1337,6 +1330,5 @@ public class ActiveMQSession implements QueueSession, TopicSession {
return topic;
}
}
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
index 6904df40f1..c0ab87e27c 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQStreamMessage.java
@@ -76,7 +76,6 @@ public class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMess
message = new ClientMessageImpl((byte) 0, false, 0, 0, (byte) 4, 1500, null);
}
- // Public --------------------------------------------------------
@Override
public byte getType() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
index b79c36adf8..f1cffea77d 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryQueue.java
@@ -24,19 +24,13 @@ import javax.jms.TemporaryQueue;
* This class can be instantiated directly.
*/
public class ActiveMQTemporaryQueue extends ActiveMQQueue implements TemporaryQueue {
- // Constants -----------------------------------------------------
+
private static final long serialVersionUID = -4624930377557954624L;
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
// TemporaryQueue implementation ------------------------------------------
- // Public --------------------------------------------------------
public ActiveMQTemporaryQueue() {
this(null, null);
}
@@ -74,11 +68,5 @@ public class ActiveMQTemporaryQueue extends ActiveMQQueue implements TemporaryQu
return super.getAddress().hashCode();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java
index 457663d1a7..f06f10f9b7 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTemporaryTopic.java
@@ -20,15 +20,10 @@ import javax.jms.TemporaryTopic;
public class ActiveMQTemporaryTopic extends ActiveMQTopic implements TemporaryTopic {
- // Constants -----------------------------------------------------
private static final long serialVersionUID = 845450764835635266L;
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public ActiveMQTemporaryTopic() {
this(null, null);
}
@@ -37,7 +32,6 @@ public class ActiveMQTemporaryTopic extends ActiveMQTopic implements TemporaryTo
super(address, true, session);
}
- // Public --------------------------------------------------------
@Override
public boolean equals(final Object o) {
@@ -59,12 +53,4 @@ public class ActiveMQTemporaryTopic extends ActiveMQTopic implements TemporaryTo
return super.getAddress().hashCode();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
index 1406b4c93b..ebb10ed078 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTextMessage.java
@@ -34,19 +34,14 @@ import static org.apache.activemq.artemis.reader.TextMessageUtil.writeBodyText;
* This class was ported from SpyTextMessage in JBossMQ.
*/
public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage {
- // Constants -----------------------------------------------------
public static final byte TYPE = Message.TEXT_TYPE;
- // Attributes ----------------------------------------------------
// We cache it locally - it's more performant to cache as a SimpleString, the AbstractChannelBuffer write
// methods are more efficient for a SimpleString
private SimpleString text;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public ActiveMQTextMessage(final ClientSession session) {
super(ActiveMQTextMessage.TYPE, session);
@@ -65,7 +60,6 @@ public class ActiveMQTextMessage extends ActiveMQMessage implements TextMessage
setText(foreign.getText());
}
- // Public --------------------------------------------------------
@Override
public byte getType() {
diff --git a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
index 0a2711c39e..ab5ca41764 100644
--- a/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
+++ b/artemis-jms-client/src/main/java/org/apache/activemq/artemis/jms/client/ActiveMQTopic.java
@@ -26,14 +26,10 @@ import org.apache.activemq.artemis.api.core.SimpleString;
* This class can be instantiated directly.
*/
public class ActiveMQTopic extends ActiveMQDestination implements Topic {
- // Constants -----------------------------------------------------
+
private static final long serialVersionUID = 7873614001276404156L;
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
public ActiveMQTopic() {
this((SimpleString) null);
}
@@ -71,7 +67,6 @@ public class ActiveMQTopic extends ActiveMQDestination implements Topic {
return getName();
}
- // Public --------------------------------------------------------
@Override
public String toString() {
@@ -98,11 +93,5 @@ public class ActiveMQTopic extends ActiveMQDestination implements Topic {
return super.getAddress().hashCode();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
index 33e079922b..8363c4276a 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeControlImpl.java
@@ -26,14 +26,12 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
private final JMSBridge bridge;
- // Constructors --------------------------------------------------
public JMSBridgeControlImpl(final JMSBridge bridge) throws Exception {
super(JMSBridgeControl.class);
this.bridge = bridge;
}
- // Public --------------------------------------------------------
@Override
public void pause() throws Exception {
@@ -207,18 +205,5 @@ public class JMSBridgeControlImpl extends StandardMBean implements JMSBridgeCont
bridge.setTargetUsername(name);
}
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
index 2da550b951..f9dc9f7630 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java
@@ -940,10 +940,6 @@ public final class JMSBridgeImpl implements JMSBridge {
this.tm = tm;
}
- // Public ---------------------------------------------------------------------------
-
- // Private -------------------------------------------------------------------
-
private synchronized void checkParams() {
checkNotNull(sourceCff, "sourceCff");
checkNotNull(targetCff, "targetCff");
@@ -1747,8 +1743,6 @@ public final class JMSBridgeImpl implements JMSBridge {
return service;
}
- // Inner classes ---------------------------------------------------------------
-
/**
* We use a Thread which polls the sourceDestination instead of a MessageListener
* to ensure that message delivery does not happen concurrently with
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java
index 53d0fb7ca2..9c2844827e 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedBindings.java
@@ -26,9 +26,6 @@ import org.apache.activemq.artemis.utils.DataConstants;
public class PersistedBindings implements EncodingSupport {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private long id;
@@ -38,9 +35,6 @@ public class PersistedBindings implements EncodingSupport {
private ArrayList bindings = new ArrayList<>();
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public PersistedBindings() {
}
@@ -55,7 +49,6 @@ public class PersistedBindings implements EncodingSupport {
this.name = name;
}
- // Public --------------------------------------------------------
@Override
public void decode(ActiveMQBuffer buffer) {
type = PersistedType.getType(buffer.readByte());
@@ -138,12 +131,4 @@ public class PersistedBindings implements EncodingSupport {
bindings.remove(address);
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java
index 3e7e100e1b..54d46017e3 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedConnectionFactory.java
@@ -23,9 +23,6 @@ import org.apache.activemq.artemis.jms.server.config.impl.ConnectionFactoryConfi
public class PersistedConnectionFactory implements EncodingSupport {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private long id;
@@ -43,11 +40,7 @@ public class PersistedConnectionFactory implements EncodingSupport {
this.config = config;
}
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
/**
* @return the id
@@ -87,12 +80,4 @@ public class PersistedConnectionFactory implements EncodingSupport {
return config.getEncodeSize();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
index 602f982e26..e898b8646e 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/config/PersistedDestination.java
@@ -24,9 +24,6 @@ import org.apache.activemq.artemis.utils.DataConstants;
public class PersistedDestination implements EncodingSupport {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private long id;
@@ -37,9 +34,6 @@ public class PersistedDestination implements EncodingSupport {
private String selector;
private boolean durable;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public PersistedDestination() {
}
@@ -57,15 +51,6 @@ public class PersistedDestination implements EncodingSupport {
this.selector = selector;
this.durable = durable;
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
public long getId() {
return id;
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
index bc288db496..7f49aaa730 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
@@ -46,7 +46,7 @@ import org.apache.activemq.artemis.utils.IDGenerator;
public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
- // Constants -----------------------------------------------------
+
public static final byte CF_RECORD = 1;
@@ -54,7 +54,6 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
public static final byte BINDING_RECORD = 3;
- // Attributes ----------------------------------------------------
private final IDGenerator idGenerator;
@@ -72,9 +71,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
private final Configuration config;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public JMSJournalStorageManagerImpl(ExecutorFactory ioExecutors,
final IDGenerator idGenerator,
final Configuration config,
@@ -101,7 +98,6 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
this.idGenerator = idGenerator;
}
- // Public --------------------------------------------------------
@Override
public List recoverConnectionFactories() {
List cfs = new ArrayList<>(mapFactories.values());
@@ -280,11 +276,8 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
private void checkAndCreateDir(final File dir, final boolean create) {
@@ -299,6 +292,5 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager {
}
}
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
index e082f9f885..e233fec440 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
@@ -37,9 +37,7 @@ import org.apache.activemq.artemis.utils.DataConstants;
* Every property on this class has to be also set through encoders through EncodingSupport implementation at this class.
*/
public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConfiguration {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private String name = null;
@@ -130,10 +128,6 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
private boolean useTopologyForLoadBalancing = ActiveMQClient.DEFAULT_USE_TOPOLOGY_FOR_LOADBALANCING;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
public ConnectionFactoryConfigurationImpl() {
}
@@ -955,14 +949,5 @@ public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConf
return useTopologyForLoadBalancing;
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java
index fbf77d4d82..c036bb50a7 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/JMSQueueConfigurationImpl.java
@@ -20,9 +20,6 @@ import org.apache.activemq.artemis.jms.server.config.JMSQueueConfiguration;
public class JMSQueueConfigurationImpl implements JMSQueueConfiguration {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private String name = null;
@@ -32,9 +29,6 @@ public class JMSQueueConfigurationImpl implements JMSQueueConfiguration {
private String[] bindings = null;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public JMSQueueConfigurationImpl() {
}
@@ -85,14 +79,5 @@ public class JMSQueueConfigurationImpl implements JMSQueueConfiguration {
return this;
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java
index 1617db2e10..6db682d3e3 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TopicConfigurationImpl.java
@@ -20,17 +20,10 @@ import org.apache.activemq.artemis.jms.server.config.TopicConfiguration;
public class TopicConfigurationImpl implements TopicConfiguration {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
private String name;
private String[] bindings;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public TopicConfigurationImpl() {
}
@@ -59,14 +52,5 @@ public class TopicConfigurationImpl implements TopicConfiguration {
return this;
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java
index 8fe0739c95..60e035467b 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/config/impl/TransportConfigurationEncodingSupport.java
@@ -111,22 +111,6 @@ public class TransportConfigurationEncodingSupport {
return size;
}
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
index 534b77d010..6284dec136 100644
--- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
+++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
@@ -1329,9 +1329,7 @@ public class JMSServerManagerImpl extends CleaningActivateCallback implements JM
return server.getActiveMQServerControl().listPreparedTransactionDetailsAsHTML((xid, tx, creation) -> new JMSTransactionDetail(xid, tx, creation));
}
- // Public --------------------------------------------------------
- // Private -------------------------------------------------------
private synchronized void checkInitialised() {
if (!active) {
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
index 160f92a684..7023cdf613 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/AbstractSequentialFile.java
@@ -80,7 +80,6 @@ public abstract class AbstractSequentialFile implements SequentialFile {
return new LocalBufferObserver();
}
- // Public --------------------------------------------------------
@Override
public final boolean exists() {
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
index dc87627332..026e2172db 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/io/aio/AIOSequentialFile.java
@@ -376,9 +376,6 @@ public class AIOSequentialFile extends AbstractSequentialFile {
return "AIOSequentialFile{" + getFileName() + ", opened=" + opened + ", pendingClose=" + pendingClose + ", pendingCallbacks=" + pendingCallbacks + '}';
}
- // Private methods
- // -----------------------------------------------------------------------------------------------------
-
private void checkOpened() {
if (aioFile == null || !opened) {
throw new NullPointerException("File not opened, file=null on fileName = " + getFileName());
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 bec7091817..6fc2616264 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
@@ -51,12 +51,12 @@ public final class TimedBuffer extends CriticalComponentImpl {
private static final double MAX_TIMEOUT_ERROR_FACTOR = 1.5;
- // Constants -----------------------------------------------------
+
// The number of tries on sleep before switching to spin
private static final int MAX_CHECKS_ON_SLEEP = 20;
- // Attributes ----------------------------------------------------
+
// If the TimedBuffer is idle - i.e. no records are being added, then it's pointless the timer flush thread
// in spinning and checking the time - and using up CPU in the process - this semaphore is used to
// prevent that
@@ -88,11 +88,7 @@ public final class TimedBuffer extends CriticalComponentImpl {
// no need to be volatile as every access is synchronized
private boolean spinning = false;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
public TimedBuffer(CriticalAnalyzer analyzer, final int size, final int timeout, final boolean logRates) {
super(analyzer, CRITICAL_PATHS);
@@ -348,14 +344,6 @@ public final class TimedBuffer extends CriticalComponentImpl {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
/**
* Sub classes (tests basically) can use this to override how the sleep is being done
*
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java
index c80768e57c..765b5e912a 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/AbstractJournalUpdateTask.java
@@ -38,9 +38,6 @@ import org.apache.activemq.artemis.utils.collections.ConcurrentLongHashSet;
*/
public abstract class AbstractJournalUpdateTask implements JournalReaderCallback {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
public static final String FILE_COMPACT_CONTROL = "journal-rename-control.ctr";
protected final JournalImpl journal;
@@ -63,9 +60,6 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
protected final List newDataFiles = new ArrayList<>();
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
protected AbstractJournalUpdateTask(final SequentialFileFactory fileFactory,
final JournalImpl journal,
@@ -80,7 +74,6 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
this.recordsSnapshot = recordsSnapshot;
}
- // Public --------------------------------------------------------
public static SequentialFile writeControlFile(final SequentialFileFactory fileFactory,
final List files,
@@ -254,9 +247,7 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
return recordsSnapshot.contains(id);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
/**
* @throws Exception
@@ -312,8 +303,6 @@ public abstract class AbstractJournalUpdateTask implements JournalReaderCallback
writeEncoder(record);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
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 c094a439eb..2d951c4a53 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
@@ -138,7 +138,6 @@ public class JournalFilesRepository {
this.maxAtticFiles = maxAtticFiles;
}
- // Public --------------------------------------------------------
public int getPoolSize() {
return poolSize;
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 6b482929ea..fccafc745d 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
@@ -202,7 +202,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
protected static final byte FILL_CHARACTER = (byte) 'J';
- // Attributes ----------------------------------------------------
+
private volatile boolean autoReclaim = true;
@@ -355,7 +355,7 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
public JournalFilesRepository getFilesRepository() {
return filesRepository;
}
- // Constructors --------------------------------------------------
+
public JournalImpl(final int fileSize,
final int minFiles,
@@ -3453,9 +3453,6 @@ public class JournalImpl extends JournalBase implements TestableJournal, Journal
}
}
- // Inner classes
- // ---------------------------------------------------------------------------
-
// Used on Load
private static final class TransactionHolder {
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java
index d34c030f98..26c0f4f12f 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SyncIOCompletion.java
@@ -23,24 +23,8 @@ import org.apache.activemq.artemis.core.journal.IOCompletion;
*/
public abstract class SyncIOCompletion implements IOCompletion {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
public abstract void waitCompletion() throws Exception;
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
index 2c6f083d78..a1681ced1f 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
@@ -27,7 +27,6 @@ public class ByteArrayEncoding implements EncodingSupport {
this.data = data;
}
- // Public --------------------------------------------------------
@Override
public void decode(final ActiveMQBuffer buffer) {
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java
index f327b6831f..dd9c42cc0b 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreTextMessageWrapper.java
@@ -43,15 +43,12 @@ public class CoreTextMessageWrapper extends CoreMessageWrapper {
public static final byte TYPE = Message.TEXT_TYPE;
- // Attributes ----------------------------------------------------
+
// We cache it locally - it's more performant to cache as a SimpleString, the AbstractChannelBuffer write
// methods are more efficient for a SimpleString
private SimpleString text;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
/*
* This constructor is used to construct messages prior to sending
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
index e0bfecd611..46e5eea216 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
@@ -71,9 +71,7 @@ public class StompProtocolManager extends AbstractProtocolManager incomingInterceptors;
private final List outgoingInterceptors;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
StompProtocolManager(final StompProtocolManagerFactory factory,
final ActiveMQServer server,
@@ -196,7 +194,6 @@ public class StompProtocolManager extends AbstractProtocolManager headers = new HashMap<>(frame.getHeadersMap());
@@ -153,16 +149,6 @@ public class StompUtils {
command.addHeader(name.toString(), message.getObjectProperty(name).toString());
}
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
index 8efe50e515..9a836b8e4a 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAService.java
@@ -26,23 +26,18 @@ import java.util.Set;
* https://jira.jboss.org/browse/HORNETQ-339
*/
public class ActiveMQRAService {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private final MBeanServer mBeanServer;
private final String resourceAdapterObjectName;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public ActiveMQRAService(final MBeanServer mBeanServer, final String resourceAdapterObjectName) {
this.mBeanServer = mBeanServer;
this.resourceAdapterObjectName = resourceAdapterObjectName;
}
- // Public --------------------------------------------------------
public void stop() {
try {
@@ -61,12 +56,4 @@ public class ActiveMQRAService {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
index 6aa7785f7c..4abd5a8068 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
@@ -93,7 +93,6 @@ import org.apache.activemq.artemis.utils.uri.BeanSupport;
import org.jboss.logging.Logger;
public class ConfigurationImpl implements Configuration, Serializable {
- // Constants ------------------------------------------------------------------------------
private static final Logger logger = Logger.getLogger(ConfigurationImpl.class);
@@ -107,8 +106,6 @@ public class ConfigurationImpl implements Configuration, Serializable {
private static final long serialVersionUID = 4077088945050267843L;
- // Attributes -----------------------------------------------------------------------------
-
private String name = "localhost";
private boolean persistenceEnabled = ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled();
@@ -375,8 +372,6 @@ public class ConfigurationImpl implements Configuration, Serializable {
*/
private File artemisInstance;
- // Public -------------------------------------------------------------------------
-
@Override
public String getJournalRetentionDirectory() {
return journalRetentionDirectory;
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 d2e1d75cab..1e92a83622 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
@@ -321,7 +321,6 @@ public final class FileConfigurationParser extends XMLConfigurationUtil {
private static final String ENABLE_INGRESS_TIMESTAMP = "enable-ingress-timestamp";
- // Attributes ----------------------------------------------------
private boolean validateAIO = false;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
index 2a8aa8c39b..2dc6e85b58 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/filter/impl/FilterImpl.java
@@ -54,13 +54,11 @@ import static org.apache.activemq.artemis.api.core.FilterConstants.NATIVE_MESSAG
*/
public class FilterImpl implements Filter {
- // Constants -----------------------------------------------------
private final SimpleString sfilterString;
private final BooleanExpression booleanExpression;
- // Static ---------------------------------------------------------
/**
* @return null if filterStr is null or an empty String and a valid filter else
@@ -92,8 +90,6 @@ public class FilterImpl implements Filter {
return new FilterImpl(filterStr, booleanExpression);
}
- // Constructors ---------------------------------------------------
-
private FilterImpl(final SimpleString str, final BooleanExpression expression) {
sfilterString = str;
this.booleanExpression = expression;
@@ -160,8 +156,6 @@ public class FilterImpl implements Filter {
return "FilterImpl [sfilterString=" + sfilterString + "]";
}
- // Private --------------------------------------------------------------------------
-
private static Object getHeaderFieldValue(final Message msg, final SimpleString fieldName) {
if (FilterConstants.ACTIVEMQ_USERID.equals(fieldName)) {
if (msg.getUserID() == null) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
index cfcf2c2e09..cb319a2cd3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AbstractControl.java
@@ -41,26 +41,17 @@ import org.apache.activemq.artemis.utils.UUIDGenerator;
public abstract class AbstractControl extends StandardMBean {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected final StorageManager storageManager;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public AbstractControl(final Class clazz, final StorageManager storageManager) throws NotCompliantMBeanException {
super(clazz);
this.storageManager = storageManager;
}
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
protected void clearIO() {
// the storage manager could be null on the backup on certain components
@@ -176,6 +167,6 @@ public abstract class AbstractControl extends StandardMBean {
}
}
}
- // Inner classes------------------------------------------------
+
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
index b319a1e778..dd1ebd5045 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AcceptorControlImpl.java
@@ -29,17 +29,11 @@ import org.apache.activemq.artemis.spi.core.remoting.Acceptor;
public class AcceptorControlImpl extends AbstractControl implements AcceptorControl {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private final Acceptor acceptor;
private final TransportConfiguration configuration;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public AcceptorControlImpl(final Acceptor acceptor,
final StorageManager storageManager,
@@ -158,14 +152,5 @@ public class AcceptorControlImpl extends AbstractControl implements AcceptorCont
return MBeanInfoHelper.getMBeanAttributesInfo(AcceptorControl.class);
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
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 af17daf5f3..dbc721675a 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
@@ -139,10 +139,9 @@ import org.apache.activemq.artemis.utils.collections.TypedProperties;
import org.jboss.logging.Logger;
public class ActiveMQServerControlImpl extends AbstractControl implements ActiveMQServerControl, NotificationEmitter, org.apache.activemq.artemis.core.server.management.NotificationListener {
- // Constants -----------------------------------------------------
+
private static final Logger logger = Logger.getLogger(ActiveMQServerControlImpl.class);
- // Attributes ----------------------------------------------------
private final PostOffice postOffice;
@@ -4137,11 +4136,8 @@ public class ActiveMQServerControlImpl extends AbstractControl implements Active
return new MBeanNotificationInfo[]{new MBeanNotificationInfo(names, this.getClass().getName(), "Notifications emitted by a Core Server")};
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
private synchronized void setMessageCounterEnabled(final boolean enable) {
if (isStarted()) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
index 6277db9113..b2f520979e 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/AddressControlImpl.java
@@ -57,9 +57,6 @@ import org.apache.activemq.artemis.utils.JsonLoader;
public class AddressControlImpl extends AbstractControl implements AddressControl {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private AddressInfo addressInfo;
@@ -73,9 +70,6 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
private final ManagementService managementService;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public AddressControlImpl(AddressInfo addressInfo,
final ActiveMQServer server,
@@ -93,7 +87,6 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
this.managementService = managementService;
}
- // Public --------------------------------------------------------
// AddressControlMBean implementation ----------------------------
@@ -593,7 +586,6 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
server.replay(startScanDate, endScanDate, this.getAddress(), target, filter);
}
- // Private -------------------------------------------------------
private long getMessageCount(final DurabilityType durability) {
List queues = getQueues(durability);
@@ -631,7 +623,6 @@ public class AddressControlImpl extends AbstractControl implements AddressContro
}
}
- // Inner classes -------------------------------------------------
private enum DurabilityType {
ALL, DURABLE, NON_DURABLE
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
index efcd5b0e9f..e393b35c82 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BaseBroadcastGroupControlImpl.java
@@ -28,19 +28,12 @@ import javax.management.MBeanOperationInfo;
public class BaseBroadcastGroupControlImpl extends AbstractControl implements BaseBroadcastGroupControl {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
private Class broadcastGroupControlClass;
private final BroadcastGroup broadcastGroup;
private final BroadcastGroupConfiguration configuration;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public BaseBroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
final StorageManager storageManager,
@@ -173,14 +166,5 @@ public class BaseBroadcastGroupControlImpl extends AbstractControl implements Ba
return broadcastGroup;
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
index c09d5d5d7a..2bace399f6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BridgeControlImpl.java
@@ -31,17 +31,11 @@ import org.apache.activemq.artemis.logs.AuditLogger;
public class BridgeControlImpl extends AbstractControl implements BridgeControl {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private final Bridge bridge;
private final BridgeConfiguration configuration;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public BridgeControlImpl(final Bridge bridge,
final StorageManager storageManager,
@@ -333,14 +327,5 @@ public class BridgeControlImpl extends AbstractControl implements BridgeControl
}
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
index bf50b84033..7d467377a5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/BroadcastGroupControlImpl.java
@@ -25,15 +25,10 @@ import org.apache.activemq.artemis.logs.AuditLogger;
public class BroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl implements BroadcastGroupControl {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private UDPBroadcastEndpointFactory endpointFactory;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public BroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
final StorageManager storageManager,
@@ -88,14 +83,5 @@ public class BroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl imp
// MessagingComponentControlMBean implementation -----------------
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
index ccdd64aed2..fbac15eec0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/ClusterConnectionControlImpl.java
@@ -32,17 +32,13 @@ import org.apache.activemq.artemis.logs.AuditLogger;
public class ClusterConnectionControlImpl extends AbstractControl implements ClusterConnectionControl {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private final ClusterConnection clusterConnection;
private final ClusterConnectionConfiguration configuration;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public ClusterConnectionControlImpl(final ClusterConnection clusterConnection,
final StorageManager storageManager,
@@ -325,14 +321,5 @@ public class ClusterConnectionControlImpl extends AbstractControl implements Clu
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
index 946b03c73e..f70075269f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/DivertControlImpl.java
@@ -34,17 +34,11 @@ import org.apache.activemq.artemis.logs.AuditLogger;
public class DivertControlImpl extends AbstractControl implements DivertControl {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private final Divert divert;
private final String internalNamingPrefix;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
// DivertControlMBean implementation ---------------------------
@@ -204,14 +198,5 @@ public class DivertControlImpl extends AbstractControl implements DivertControl
return MBeanInfoHelper.getMBeanAttributesInfo(DivertControl.class);
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
index 2f92c321b9..fae642efc2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsChannelBroadcastGroupControlImpl.java
@@ -25,16 +25,9 @@ import org.apache.activemq.artemis.logs.AuditLogger;
public class JGroupsChannelBroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl implements JGroupsChannelBroadcastGroupControl {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ChannelBroadcastEndpointFactory endpointFactory;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
public JGroupsChannelBroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
final StorageManager storageManager,
final BroadcastGroupConfiguration configuration,
@@ -53,14 +46,5 @@ public class JGroupsChannelBroadcastGroupControlImpl extends BaseBroadcastGroupC
return endpointFactory.getChannelName();
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
index 81112b52ef..e168fec0d7 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsFileBroadcastGroupControlImpl.java
@@ -30,15 +30,10 @@ import java.nio.file.Paths;
public class JGroupsFileBroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl implements JGroupsFileBroadcastGroupControl {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private JGroupsFileBroadcastEndpointFactory endpointFactory;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public JGroupsFileBroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
final StorageManager storageManager,
@@ -76,14 +71,5 @@ public class JGroupsFileBroadcastGroupControlImpl extends BaseBroadcastGroupCont
return endpointFactory.getFile();
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
index 7ef7047641..0c97fb42cb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/JGroupsPropertiesBroadcastGroupControlImpl.java
@@ -25,15 +25,9 @@ import org.apache.activemq.artemis.logs.AuditLogger;
public class JGroupsPropertiesBroadcastGroupControlImpl extends BaseBroadcastGroupControlImpl implements JGroupsPropertiesBroadcastGroupControl {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private JGroupsPropertiesBroadcastEndpointFactory endpointFactory;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public JGroupsPropertiesBroadcastGroupControlImpl(final BroadcastGroup broadcastGroup,
final StorageManager storageManager,
@@ -58,14 +52,5 @@ public class JGroupsPropertiesBroadcastGroupControlImpl extends BaseBroadcastGro
return endpointFactory.getProperties();
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
index 07fc9a83ab..900951e77b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/MBeanInfoHelper.java
@@ -29,15 +29,8 @@ import org.apache.activemq.artemis.api.core.management.Operation;
import org.apache.activemq.artemis.api.core.management.Parameter;
public class MBeanInfoHelper {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
public static MBeanOperationInfo[] getMBeanOperationsInfo(final Class mbeanInterface) {
List operations = new ArrayList<>();
@@ -81,11 +74,8 @@ public class MBeanInfoHelper {
return finalAttributes.toArray(new MBeanAttributeInfo[finalAttributes.size()]);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
private static boolean isGetterMethod(final Method method) {
if (!method.getName().equals("get") && method.getName().startsWith("get") &&
@@ -182,5 +172,4 @@ public class MBeanInfoHelper {
return paramsInfo;
}
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
index fbb4d78b3d..62008af104 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/QueueControlImpl.java
@@ -68,9 +68,6 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
public static final int FLUSH_LIMIT = 500;
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private final Queue queue;
@@ -84,7 +81,6 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
private MessageCounter counter;
- // Static --------------------------------------------------------
private static String toJSON(final Map[] messages) {
JsonArray array = toJSONMsgArray(messages);
@@ -111,8 +107,6 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
return arrayReturn.build().toString();
}
- // Constructors --------------------------------------------------
-
public QueueControlImpl(final Queue queue,
final String address,
final ActiveMQServer server,
@@ -128,7 +122,6 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
this.addressSettingsRepository = addressSettingsRepository;
}
- // Public --------------------------------------------------------
public void setMessageCounter(final MessageCounter counter) {
this.counter = counter;
@@ -1978,11 +1971,8 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
private void checkStarted() {
if (!server.getPostOffice().isStarted()) {
@@ -1990,5 +1980,4 @@ public class QueueControlImpl extends AbstractControl implements QueueControl {
}
}
- // Inner classes -------------------------------------------------
}
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 27545a639b..8e0b6f4b85 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
@@ -38,9 +38,7 @@ import static org.apache.activemq.artemis.api.core.JsonUtil.nullSafe;
* regular intervals - this means we are less intrusive on the queue
*/
public class MessageCounter {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
// destination related information
private final String destName;
@@ -75,9 +73,6 @@ public class MessageCounter {
private long lastMessagesAcked;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
/**
* Constructor
@@ -144,7 +139,6 @@ public class MessageCounter {
}
};
- // Public --------------------------------------------------------
/*
* This method is called periodically to update statistics from the queue
@@ -356,11 +350,8 @@ public class MessageCounter {
.toString();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
/**
* Update message counter history
@@ -432,7 +423,6 @@ public class MessageCounter {
}
}
- // Inner classes -------------------------------------------------
/**
* Internal day counter class for one day hour based counter history
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
index 8230e01d72..22103f5634 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/messagecounter/impl/MessageCounterHelper.java
@@ -27,11 +27,7 @@ import org.apache.activemq.artemis.core.messagecounter.MessageCounter;
import org.apache.activemq.artemis.core.messagecounter.MessageCounter.DayCounter;
public class MessageCounterHelper {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
public static String listMessageCounterHistory(final MessageCounter counter) throws Exception {
List history = counter.getHistory();
@@ -177,15 +173,6 @@ public class MessageCounterHelper {
}
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
index 8ae57447f9..6bbc466173 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/cursor/impl/PageCursorProviderImpl.java
@@ -56,11 +56,10 @@ import org.jboss.logging.Logger;
* However I want to keep this isolated as much as possible during development
*/
public class PageCursorProviderImpl implements PageCursorProvider {
- // Constants -----------------------------------------------------
+
private static final Logger logger = Logger.getLogger(PageCursorProviderImpl.class);
- // Attributes ----------------------------------------------------
/**
* As an optimization, avoid subsequent schedules as they are unnecessary
@@ -93,9 +92,7 @@ public class PageCursorProviderImpl implements PageCursorProvider {
//storageManager.beforePageRead will be attempted in a loop, printing at intervals a warn message
private static final long PAGE_READ_PERMISSION_TIMEOUT_NS = TimeUnit.SECONDS.toNanos(10);
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public PageCursorProviderImpl(final PagingStore pagingStore,
final StorageManager storageManager,
final ArtemisExecutor executor,
@@ -118,7 +115,6 @@ public class PageCursorProviderImpl implements PageCursorProvider {
this.inProgressReadPages = new LongObjectHashMap<>();
}
- // Public --------------------------------------------------------
@Override
public synchronized PageSubscription createSubscription(long cursorID, Filter filter, boolean persistent) {
@@ -702,6 +698,5 @@ public class PageCursorProviderImpl implements PageCursorProvider {
}
}
- // Inner classes -------------------------------------------------
}
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 5178096735..b99015d42e 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
@@ -290,7 +290,6 @@ public final class PageSubscriptionImpl implements PageSubscription {
this.counter = new PageSubscriptionCounterImpl(store, this, executor, persistent, cursorId);
}
- // Public --------------------------------------------------------
@Override
public PagingStore getPagingStore() {
@@ -1038,9 +1037,7 @@ public final class PageSubscriptionImpl implements PageSubscription {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
private boolean match(final Message message) {
if (filter == null) {
@@ -1050,7 +1047,6 @@ public final class PageSubscriptionImpl implements PageSubscription {
}
}
- // Private -------------------------------------------------------
// To be called only after the ACK has been processed and guaranteed to be on storage
// The only exception is on non storage events such as not matching messages
@@ -1151,7 +1147,6 @@ public final class PageSubscriptionImpl implements PageSubscription {
}
}
- // Inner classes -------------------------------------------------
/**
* This will hold information about the pending ACKs towards a page.
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
index 6667d05c16..c5e707b76f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/Page.java
@@ -43,7 +43,6 @@ import org.jboss.logging.Logger;
public final class Page implements Comparable {
- // Constants -----------------------------------------------------
private static final Logger logger = Logger.getLogger(Page.class);
public static final int SIZE_RECORD = DataConstants.SIZE_BYTE + DataConstants.SIZE_INT + DataConstants.SIZE_BYTE;
@@ -52,7 +51,6 @@ public final class Page implements Comparable {
private static final byte END_BYTE = (byte) '}';
- // Attributes ----------------------------------------------------
private final int pageId;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
index f833b5af9c..6c9b85cbcc 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageSyncTimer.java
@@ -32,9 +32,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQScheduledComponent;
*/
final class PageSyncTimer extends ActiveMQScheduledComponent {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private final PagingStore store;
@@ -53,9 +51,6 @@ final class PageSyncTimer extends ActiveMQScheduledComponent {
private final List syncOperations = new LinkedList<>();
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
PageSyncTimer(PagingStore store, ScheduledExecutorService scheduledExecutor, Executor executor, long timeSync) {
super(scheduledExecutor, executor, timeSync, TimeUnit.NANOSECONDS, true);
@@ -64,7 +59,6 @@ final class PageSyncTimer extends ActiveMQScheduledComponent {
this.timeSync = timeSync;
}
- // Public --------------------------------------------------------
synchronized void addSync(OperationContext ctx) {
ctx.pageSyncLineUp();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
index 4684b8bad4..13a9a307b3 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PageTransactionInfoImpl.java
@@ -38,9 +38,7 @@ import org.apache.activemq.artemis.utils.DataConstants;
import org.jboss.logging.Logger;
public final class PageTransactionInfoImpl implements PageTransactionInfo {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private static final Logger logger = Logger.getLogger(PageTransactionInfoImpl.class);
@@ -65,10 +63,6 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo {
private List lateDeliveries;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
public PageTransactionInfoImpl(final long transactionID) {
this();
this.transactionID = transactionID;
@@ -77,7 +71,6 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo {
public PageTransactionInfoImpl() {
}
- // Public --------------------------------------------------------
@Override
public long getRecordID() {
@@ -301,14 +294,6 @@ public final class PageTransactionInfoImpl implements PageTransactionInfo {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
/**
* a Message shouldn't be delivered until it's committed
* For that reason the page-reference will be written right away
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
index 3e10291bba..d8c90bcc0f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingManagerImpl.java
@@ -91,11 +91,7 @@ public final class PagingManagerImpl implements PagingManager {
private final SimpleString managementAddress;
- // Static
- // --------------------------------------------------------------------------------------------------------------------------
- // Constructors
- // --------------------------------------------------------------------------------------------------------------------
// for tests.. not part of the API
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
index 4d164a542f..7336ac0634 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryDatabase.java
@@ -52,13 +52,12 @@ import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
*/
public class PagingStoreFactoryDatabase implements PagingStoreFactory {
- // Constants -----------------------------------------------------
private static final String ADDRESS_FILE = "address.txt";
private static final String DIRECTORY_NAME = "directory.txt";
- // Attributes ----------------------------------------------------
+
protected final boolean syncNonTransactional;
@@ -140,7 +139,6 @@ public class PagingStoreFactoryDatabase implements PagingStoreFactory {
started = true;
}
}
- // Public --------------------------------------------------------
@Override
public synchronized void stop() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
index 0a1119ec4a..1e70fd2e6d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreFactoryNIO.java
@@ -54,11 +54,9 @@ import org.apache.activemq.artemis.utils.actors.ArtemisExecutor;
*/
public class PagingStoreFactoryNIO implements PagingStoreFactory {
- // Constants -----------------------------------------------------
public static final String ADDRESS_FILE = "address.txt";
- // Attributes ----------------------------------------------------
private final File directory;
@@ -134,7 +132,6 @@ public class PagingStoreFactoryNIO implements PagingStoreFactory {
this.readWholePage = readWholePage;
}
- // Public --------------------------------------------------------
@Override
public ScheduledExecutorService getScheduledExecutor() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
index bec3f54b1b..31330965df 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/paging/impl/PagingStoreImpl.java
@@ -1200,5 +1200,4 @@ public class PagingStoreImpl implements PagingStore {
}
}
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java
index d1c5591eee..6a5b87751b 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedAddressSetting.java
@@ -22,9 +22,7 @@ import org.apache.activemq.artemis.core.journal.EncodingSupport;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
public class PersistedAddressSetting implements EncodingSupport {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private long storeId;
@@ -32,9 +30,6 @@ public class PersistedAddressSetting implements EncodingSupport {
private AddressSettings setting;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public PersistedAddressSetting() {
super();
@@ -63,7 +58,6 @@ public class PersistedAddressSetting implements EncodingSupport {
this.setting = setting;
}
- // Public --------------------------------------------------------
public void setStoreId(long id) {
this.storeId = id;
@@ -107,12 +101,4 @@ public class PersistedAddressSetting implements EncodingSupport {
return addressMatch.sizeof() + setting.getEncodeSize();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
index f8eeb1f608..d17de9ec4f 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/config/PersistedSecuritySetting.java
@@ -25,9 +25,6 @@ import static org.apache.activemq.artemis.utils.DataConstants.SIZE_NULL;
public class PersistedSecuritySetting implements EncodingSupport {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private long storeId;
@@ -53,9 +50,6 @@ public class PersistedSecuritySetting implements EncodingSupport {
private SimpleString deleteAddressRoles;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public PersistedSecuritySetting() {
}
@@ -98,7 +92,6 @@ public class PersistedSecuritySetting implements EncodingSupport {
this.deleteAddressRoles = SimpleString.toSimpleString(deleteAddressRoles);
}
- // Public --------------------------------------------------------
public long getStoreId() {
return storeId;
@@ -359,12 +352,4 @@ public class PersistedSecuritySetting implements EncodingSupport {
"]";
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
index 314982ebfe..10c33996bd 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
@@ -1668,8 +1668,6 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
}
}
- // Public -----------------------------------------------------------------------------------
-
@Override
public Journal getMessageJournal() {
return messageJournal;
@@ -1680,8 +1678,6 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
return bindingsJournal;
}
- // Package protected ---------------------------------------------
-
protected void confirmLargeMessage(final LargeServerMessage largeServerMessage) {
synchronized (largeServerMessage) {
if (largeServerMessage.getPendingRecordID() >= 0) {
@@ -1905,8 +1901,6 @@ public abstract class AbstractJournalStorageManager extends CriticalComponentImp
}
}
- // Inner Classes
- // ----------------------------------------------------------------------------
private static final class DummyOperationContext implements OperationContext {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
index 694cb2a5cf..52c7bd2bf0 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BatchingIDGenerator.java
@@ -162,7 +162,6 @@ public final class BatchingIDGenerator implements IDGenerator {
return new IDCounterEncoding(id);
}
- // Inner classes -------------------------------------------------
protected static final class IDCounterEncoding implements EncodingSupport {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BufferSplitter.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BufferSplitter.java
index 4b6910166f..e8db7f1c18 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BufferSplitter.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/BufferSplitter.java
@@ -55,7 +55,6 @@ public class BufferSplitter {
this.length = length;
}
- // Public --------------------------------------------------------
@Override
public void decode(final ActiveMQBuffer buffer) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
index 6809808b5a..267e1efb61 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeServerMessageImpl.java
@@ -68,10 +68,8 @@ public final class LargeServerMessageImpl extends CoreMessage implements CoreLar
return lsm.toMessage();
}
- // Constants -----------------------------------------------------
private static final Logger logger = Logger.getLogger(LargeServerMessageImpl.class);
- // Attributes ----------------------------------------------------
private final StorageManager storageManager;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
index ba15fc7921..d1db38641d 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/postoffice/impl/PostOfficeImpl.java
@@ -1452,8 +1452,6 @@ public class PostOfficeImpl implements PostOffice, NotificationListener, Binding
return "PostOfficeImpl [server=" + server + "]";
}
- // Private -----------------------------------------------------------------
-
private void routeQueueInfo(final Message message, final Queue queue, final boolean applyFilters) throws Exception {
if (!applyFilters || queue.getFilter() == null || queue.getFilter().match(message)) {
RoutingContext context = new RoutingContextImpl(null);
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java
index af2d15b193..e23ea2e7eb 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/NodeAnnounceMessage.java
@@ -36,9 +36,7 @@ public class NodeAnnounceMessage extends PacketImpl {
private String scaleDownGroupName;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
public NodeAnnounceMessage(final long currentEventID,
final String nodeID,
@@ -72,7 +70,6 @@ public class NodeAnnounceMessage extends PacketImpl {
super(nodeAnnounceMessage_V2);
}
- // Public --------------------------------------------------------
public String getNodeID() {
return nodeID;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java
index 90e42630bb..c85cc84fd5 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddMessage.java
@@ -62,7 +62,6 @@ public final class ReplicationAddMessage extends PacketImpl {
this.encodingData = encodingData;
}
- // Public --------------------------------------------------------
@Override
public int expectedEncodeSize() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java
index 0ed85b682c..73a35d4db4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationAddTXMessage.java
@@ -66,7 +66,6 @@ public class ReplicationAddTXMessage extends PacketImpl {
this.persister = persister;
}
- // Public --------------------------------------------------------
@Override
public int expectedEncodeSize() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java
index df43c146cc..9097bf46b8 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPageWriteMessage.java
@@ -39,7 +39,6 @@ public class ReplicationPageWriteMessage extends PacketImpl implements MessagePa
this.pagedMessage = pagedMessage;
}
- // Public --------------------------------------------------------
@Override
public int expectedEncodeSize() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java
index cf993a3083..32e7980e4c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/protocol/core/impl/wireformat/ReplicationPrepareMessage.java
@@ -47,7 +47,6 @@ public final class ReplicationPrepareMessage extends PacketImpl {
this.encodingData = encodingData;
}
- // Public --------------------------------------------------------
@Override
public int expectedEncodeSize() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
index 22df7d0aff..9e19fc5e84 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/impl/netty/NettyAcceptor.java
@@ -890,8 +890,6 @@ public class NettyAcceptor extends AbstractAcceptor {
return String.join(",", protocolManagers.keySet());
}
- // Inner classes -----------------------------------------------------------------------------
-
private final class ActiveMQServerChannelHandler extends ActiveMQChannelHandler implements ConnectionCreator {
ActiveMQServerChannelHandler(final ChannelGroup group,
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
index a58c885807..98a9b389c2 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
@@ -80,13 +80,11 @@ import org.apache.activemq.artemis.utils.ReusableLatch;
import org.jboss.logging.Logger;
public class RemotingServiceImpl implements RemotingService, ServerConnectionLifeCycleListener {
- // Constants -----------------------------------------------------
private static final Logger logger = Logger.getLogger(RemotingServiceImpl.class);
private static final int ACCEPTOR_STOP_TIMEOUT = 3000;
- // Attributes ----------------------------------------------------
private volatile boolean started = false;
@@ -128,9 +126,6 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
private long connectionTtlCheckInterval;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public RemotingServiceImpl(final ClusterManager clusterManager,
final Configuration config,
@@ -675,7 +670,6 @@ public class RemotingServiceImpl implements RemotingService, ServerConnectionLif
return clusterConnection;
}
- // Inner classes -------------------------------------------------
private final class DelegatingBufferHandler implements BufferHandler {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
index 63a7bbd44a..d9ffe9930c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/replication/ReplicationEndpoint.java
@@ -142,7 +142,7 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
private final ArrayDeque pendingPackets;
- // Constructors --------------------------------------------------
+
public ReplicationEndpoint(final ActiveMQServerImpl server,
boolean wantedFailBack,
ReplicationEndpointEventListener eventListener) {
@@ -153,7 +153,6 @@ public final class ReplicationEndpoint implements ChannelHandler, ActiveMQCompon
this.supportResponseBatching = false;
}
- // Public --------------------------------------------------------
public synchronized void registerJournal(final byte id, final Journal journal) {
if (journals == null || id >= journals.length) {
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 7be1e17554..73006efdce 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
@@ -616,7 +616,6 @@ public final class ReplicationManager implements ActiveMQComponent {
ctx.replicationDone();
}
- // Inner classes -------------------------------------------------
private final class ReplicatedSessionFailureListener implements SessionFailureListener {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
index 4d2c4bc4d0..188692a373 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/security/impl/SecurityStoreImpl.java
@@ -74,7 +74,6 @@ public class SecurityStoreImpl implements SecurityStore, HierarchicalRepositoryC
private final NotificationService notificationService;
- // Constructors --------------------------------------------------
/**
* @param notificationService can be null
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
index 6c928d4f2f..a737086b19 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/BridgeImpl.java
@@ -77,11 +77,11 @@ import org.jboss.logging.Logger;
*/
public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowledgementHandler, ReadyListener, ClientProducerFlowCallback {
- // Constants -----------------------------------------------------
+
private static final Logger logger = Logger.getLogger(BridgeImpl.class);
- // Attributes ----------------------------------------------------
+
protected final ServerLocatorInternal serverLocator;
@@ -1124,7 +1124,6 @@ public class BridgeImpl implements Bridge, SessionFailureListener, SendAcknowled
}
- // Inner classes -------------------------------------------------
protected void scheduleRetryConnectFixedTimeout(final long milliseconds) {
try {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
index 8820885a79..64939ad514 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/cluster/impl/ClusterConnectionImpl.java
@@ -922,8 +922,6 @@ public final class ClusterConnectionImpl implements ClusterConnection, AfterConn
}
}
- // Inner classes -----------------------------------------------------------------------------------
-
private class MessageFlowRecordImpl implements MessageFlowRecord {
private BridgeImpl bridge;
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 89fcbeb855..9cfbd34b6b 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
@@ -2895,8 +2895,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
return sessions.get(sessionName);
}
- // PUBLIC -------
-
@Override
public String toString() {
if (identity != null) {
@@ -4154,9 +4152,6 @@ public class ActiveMQServerImpl implements ActiveMQServer {
}
}
- // Inner classes
- // --------------------------------------------------------------------------------
-
public final class DefaultCriticalErrorListener implements IOCriticalErrorListener {
private final AtomicBoolean failedAlready = new AtomicBoolean();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
index 4938a1b7f8..bf81e7465c 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/MessageReferenceImpl.java
@@ -82,13 +82,11 @@ public class MessageReferenceImpl extends LinkedListImpl.Node onDelivery;
- // Static --------------------------------------------------------
// This value has been computed by using https://github.com/openjdk/jol
// on HotSpot 64-bit VM COOPS, 8-byte alignment
private static final int memoryOffset = 72;
- // Constructors --------------------------------------------------
public MessageReferenceImpl() {
queue = null;
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 6eb4e3f1d5..90d43e509c 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
@@ -4124,9 +4124,6 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
.setAutoCreated(autoCreated);
}
- // Inner classes
- // --------------------------------------------------------------------------
-
protected static class ConsumerHolder implements PriorityAware {
ConsumerHolder(final T consumer) {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
index 8704a392d9..18b90fb868 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerConsumerImpl.java
@@ -75,13 +75,10 @@ import org.jboss.logging.Logger;
* Concrete implementation of a ClientConsumer.
*/
public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
- // Constants ------------------------------------------------------------------------------------
+
private static final Logger logger = Logger.getLogger(ServerConsumerImpl.class);
- // Static ---------------------------------------------------------------------------------------
-
- // Attributes -----------------------------------------------------------------------------------
private final long id;
@@ -163,7 +160,6 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
private boolean isClosed = false;
- // Constructors ---------------------------------------------------------------------------------
public ServerConsumerImpl(final long id,
final ServerSession session,
@@ -1136,7 +1132,6 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
return BigDecimal.valueOf((acks - messageConsumedSnapshot.getAndSet(acks)) / timeSlice).setScale(2, BigDecimal.ROUND_UP).floatValue();
}
- // Private --------------------------------------------------------------------------------------
@Override
public void promptDelivery() {
@@ -1203,9 +1198,6 @@ public class ServerConsumerImpl implements ServerConsumer, ReadyListener {
}
}
- // Inner classes
- // ------------------------------------------------------------------------
-
private final Runnable resumeLargeMessageRunnable = new Runnable() {
@Override
public void run() {
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java
index 84ce87492c..72ad1a1e93 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerInfo.java
@@ -37,7 +37,6 @@ public class ServerInfo {
this.pagingManager = pagingManager;
}
- // Public --------------------------------------------------------
public String dump() {
long maxMemory = Runtime.getRuntime().maxMemory();
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 9ac5129d86..e80f91cc60 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -108,13 +108,11 @@ import static org.apache.activemq.artemis.api.core.JsonUtil.nullSafe;
* Server side Session implementation
*/
public class ServerSessionImpl implements ServerSession, FailureListener {
- // Constants -----------------------------------------------------------------------------
+
private static final Logger logger = Logger.getLogger(ServerSessionImpl.class);
- // Static -------------------------------------------------------------------------------
- // Attributes ----------------------------------------------------------------------------
private boolean securityEnabled = true;
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
index 60c268cc24..ce474dd4d4 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/management/impl/ManagementServiceImpl.java
@@ -114,7 +114,6 @@ import org.apache.activemq.artemis.utils.collections.TypedProperties;
import org.jboss.logging.Logger;
public class ManagementServiceImpl implements ManagementService {
- // Constants -----------------------------------------------------
private static final Logger logger = Logger.getLogger(ManagementServiceImpl.class);
@@ -158,9 +157,6 @@ public class ManagementServiceImpl implements ManagementService {
private final ObjectNameBuilder objectNameBuilder;
- // Static --------------------------------------------------------
-
- // Constructor ----------------------------------------------------
public ManagementServiceImpl(final MBeanServer mbeanServer, final Configuration configuration) {
this.mbeanServer = mbeanServer;
@@ -175,7 +171,6 @@ public class ManagementServiceImpl implements ManagementService {
objectNameBuilder = ObjectNameBuilder.create(configuration.getJMXDomain(), configuration.getName(), configuration.isJMXUseBrokerName());
}
- // Public --------------------------------------------------------
// ManagementService implementation -------------------------
@@ -955,5 +950,4 @@ public class ManagementServiceImpl implements ManagementService {
return correlationId;
}
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java
index 4aff8e2f3e..54f23bc557 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/spi/core/security/ActiveMQSecurityManagerImpl.java
@@ -44,7 +44,7 @@ public class ActiveMQSecurityManagerImpl implements ActiveMQSecurityManager {
this.configuration = configuration;
}
- // Public ---------------------------------------------------------------------
+
@Override
public boolean validateUser(final String username, final String password) {
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java
index 1d575e479e..6166e07d31 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/ValidatorsTest.java
@@ -36,9 +36,7 @@ public class ValidatorsTest extends Assert {
}
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testGE_ZERO() throws Exception {
@@ -143,12 +141,4 @@ public class ValidatorsTest extends Assert {
ValidatorsTest.failure(Validators.MINUS_ONE_OR_POSITIVE_INT, Integer.MAX_VALUE + 1);
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
index 1eb749b009..6775230420 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/filter/impl/FilterTest.java
@@ -694,8 +694,6 @@ public class FilterTest extends SilentTestCase {
// parse.getNextToken();
// }
- // Private -----------------------------------------------------------------------------------
-
private void doPutStringProperty(final String key, final String value) {
message.putStringProperty(new SimpleString(key), new SimpleString(value));
}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
index 830d159bc2..02876f9b4f 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/persistence/impl/journal/OperationContextUnitTest.java
@@ -422,12 +422,4 @@ public class OperationContextUnitTest extends ActiveMQTestBase {
Assert.assertEquals(0, operations.get());
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java
index a2b3d44018..46d038729d 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/security/RoleTest.java
@@ -30,15 +30,8 @@ import static org.apache.activemq.artemis.core.security.CheckType.MANAGE;
import static org.apache.activemq.artemis.core.security.CheckType.SEND;
public class RoleTest extends Assert {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testWriteRole() throws Exception {
@@ -125,11 +118,5 @@ public class RoleTest extends Assert {
Assert.assertFalse(role.equals(null));
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java
index caa8bba664..8dd9818dc0 100644
--- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java
+++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/version/impl/VersionImplTest.java
@@ -25,15 +25,7 @@ import org.junit.Assert;
import org.junit.Test;
public class VersionImplTest extends Assert {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testVersionImpl() throws Exception {
@@ -81,11 +73,5 @@ public class VersionImplTest extends Assert {
Assert.assertTrue(version.equals(version2));
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
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 f9a43b3a2d..7887458789 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
@@ -2572,9 +2572,7 @@ public abstract class ActiveMQTestBase extends Assert {
return null;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
protected interface ActiveMQAction {
diff --git a/examples/features/standard/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java b/examples/features/standard/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
index 8e72f0f167..1753430fd6 100644
--- a/examples/features/standard/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
+++ b/examples/features/standard/queue-requestor/src/main/java/org/apache/activemq/artemis/jms/example/TextReverserService.java
@@ -34,21 +34,15 @@ import javax.jms.TextMessage;
*/
public class TextReverserService implements MessageListener {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private final Session session;
private final Connection connection;
- // Static --------------------------------------------------------
-
private static String reverse(final String text) {
return new StringBuffer(text).reverse().toString();
}
- // Constructors --------------------------------------------------
public TextReverserService(final ConnectionFactory cf, final Destination destination) throws JMSException {
// create a JMS connection
@@ -87,7 +81,6 @@ public class TextReverserService implements MessageListener {
}
}
- // Public --------------------------------------------------------
public void close() {
if (connection != null) {
@@ -100,12 +93,4 @@ public class TextReverserService implements MessageListener {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java b/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
index f9eea4c889..5321b883c2 100644
--- a/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
+++ b/examples/features/standard/xa-heuristic/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
@@ -34,7 +34,6 @@ public class DummyXid implements Xid {
private boolean hashCalculated;
- // Static --------------------------------------------------------
public static String toBase64String(final Xid xid) {
return Base64.encodeBytes(DummyXid.toByteArray(xid));
@@ -56,7 +55,7 @@ public class DummyXid implements Xid {
return hashBytes;
}
- // Constructors --------------------------------------------------
+
/**
* Standard constructor
@@ -99,7 +98,7 @@ public class DummyXid implements Xid {
return globalTransactionId;
}
- // Public -------------------------------------------------------------------------------
+----------
@Override
public int hashCode() {
@@ -153,7 +152,6 @@ public class DummyXid implements Xid {
stringRep(globalTransactionId);
}
- // Private -------------------------------------------------------------------------------
private String stringRep(final byte[] bytes) {
StringBuilder buff = new StringBuilder();
diff --git a/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java b/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
index a570770748..aa23863ea0 100644
--- a/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
+++ b/examples/features/standard/xa-receive/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
@@ -34,7 +34,7 @@ public class DummyXid implements Xid {
private boolean hashCalculated;
- // Static --------------------------------------------------------
+
public static String toBase64String(final Xid xid) {
return Base64.encodeBytes(DummyXid.toByteArray(xid));
@@ -56,7 +56,7 @@ public class DummyXid implements Xid {
return hashBytes;
}
- // Constructors --------------------------------------------------
+
/**
* Standard constructor
@@ -99,7 +99,7 @@ public class DummyXid implements Xid {
return globalTransactionId;
}
- // Public -------------------------------------------------------------------------------
+----------
@Override
public int hashCode() {
@@ -153,7 +153,6 @@ public class DummyXid implements Xid {
stringRep(globalTransactionId);
}
- // Private -------------------------------------------------------------------------------
private String stringRep(final byte[] bytes) {
StringBuilder buff = new StringBuilder();
diff --git a/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java b/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
index a570770748..7e35ce2fe9 100644
--- a/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
+++ b/examples/features/standard/xa-send/src/main/java/org/apache/activemq/artemis/jms/example/DummyXid.java
@@ -34,7 +34,6 @@ public class DummyXid implements Xid {
private boolean hashCalculated;
- // Static --------------------------------------------------------
public static String toBase64String(final Xid xid) {
return Base64.encodeBytes(DummyXid.toByteArray(xid));
@@ -56,8 +55,6 @@ public class DummyXid implements Xid {
return hashBytes;
}
- // Constructors --------------------------------------------------
-
/**
* Standard constructor
*
@@ -99,7 +96,7 @@ public class DummyXid implements Xid {
return globalTransactionId;
}
- // Public -------------------------------------------------------------------------------
+----------
@Override
public int hashCode() {
@@ -153,7 +150,6 @@ public class DummyXid implements Xid {
stringRep(globalTransactionId);
}
- // Private -------------------------------------------------------------------------------
private String stringRep(final byte[] bytes) {
StringBuilder buff = new StringBuilder();
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNameParser.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNameParser.java
index 0e7bc1a155..881497fe9f 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNameParser.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNameParser.java
@@ -27,11 +27,9 @@ import java.util.Properties;
* @author Ovidiu Feodorov
*/
public class InVMNameParser implements NameParser, Serializable {
- // Constants -----------------------------------------------------
private static final long serialVersionUID = 2925203703371001031L;
- // Static --------------------------------------------------------
static Properties syntax;
@@ -42,11 +40,7 @@ public class InVMNameParser implements NameParser, Serializable {
InVMNameParser.syntax.put("jndi.syntax.separator", "/");
}
- // Attributes ----------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
public static Properties getSyntax() {
return InVMNameParser.syntax;
@@ -57,12 +51,4 @@ public class InVMNameParser implements NameParser, Serializable {
return new CompoundName(name, InVMNameParser.syntax);
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNamingContext.java b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNamingContext.java
index e1c40b64d5..ac3fb33fa3 100644
--- a/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNamingContext.java
+++ b/tests/activemq5-unit-tests/src/main/java/org/apache/activemq/broker/artemiswrapper/InVMNamingContext.java
@@ -37,13 +37,10 @@ import java.util.List;
import java.util.Map;
public class InVMNamingContext implements Context, Serializable {
- // Constants -----------------------------------------------------
private static final long serialVersionUID = 385743957345L;
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
protected Map map;
@@ -51,7 +48,6 @@ public class InVMNamingContext implements Context, Serializable {
private String nameInNamespace = "";
- // Constructors --------------------------------------------------
public InVMNamingContext() {
map = Collections.synchronizedMap(new HashMap());
@@ -262,13 +258,9 @@ public class InVMNamingContext implements Context, Serializable {
return nameInNamespace;
}
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
private String trimSlashes(String s) {
int i = 0;
@@ -304,7 +296,6 @@ public class InVMNamingContext implements Context, Serializable {
c.map.put(name, obj);
}
- // Inner classes -------------------------------------------------
private class NamingEnumerationImpl implements NamingEnumeration {
diff --git a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/NetworkedSyncTest.java b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/NetworkedSyncTest.java
index c057083e34..129d5a850b 100644
--- a/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/NetworkedSyncTest.java
+++ b/tests/activemq5-unit-tests/src/test/java/org/apache/activemq/perf/NetworkedSyncTest.java
@@ -40,7 +40,6 @@ import org.springframework.core.io.ClassPathResource;
public class NetworkedSyncTest extends TestCase {
- // constants
public static final int MESSAGE_COUNT = 10000; //100000;
public final static String config = "org/apache/activemq/perf/networkSync.xml";
public final static String broker1URL = "tcp://localhost:61616";
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
index 9721f4566c..b9e4172b5c 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/BridgeTestBase.java
@@ -485,5 +485,4 @@ public abstract class BridgeTestBase extends ActiveMQTestBase {
return new TransactionManagerImple();
}
- // Inner classes -------------------------------------------------------------------
}
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
index e42a8d7841..6af04efe0e 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/bridge/JMSBridgeTest.java
@@ -1390,7 +1390,6 @@ public class JMSBridgeTest extends BridgeTestBase {
server0.stop();
}
- // Private -------------------------------------------------------------------------------
private void testStress(final QualityOfServiceMode qosMode,
final boolean persistent,
@@ -1998,8 +1997,6 @@ public class JMSBridgeTest extends BridgeTestBase {
}
- // Inner classes -------------------------------------------------------------------
-
private static class StressSender implements Runnable {
int numMessages;
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
index 1b2d9fd047..bfed8796c1 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/JMSXDeliveryCountTest.java
@@ -678,14 +678,7 @@ public class JMSXDeliveryCountTest extends JMSTestBase {
}
}
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
+
static class DummyXAResource implements XAResource {
DummyXAResource() {
diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
index a7e8cc6877..80183d533b 100644
--- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
+++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/jms/xa/XATest.java
@@ -47,11 +47,7 @@ import org.junit.Before;
import org.junit.Test;
public class XATest extends JMSTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected TransactionManager tm;
@@ -61,7 +57,6 @@ public class XATest extends JMSTestBase {
protected Queue queue1;
- // Constructors --------------------------------------------------
// TestCase overrides -------------------------------------------
@@ -114,7 +109,6 @@ public class XATest extends JMSTestBase {
}
- // Public --------------------------------------------------------
@Test
public void test2PCSendCommit1PCOptimization() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
index ed03adb2f0..1d2551dc12 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/SimpleNotificationService.java
@@ -25,15 +25,9 @@ import org.apache.activemq.artemis.core.server.management.NotificationService;
public class SimpleNotificationService implements NotificationService {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private final List listeners = new ArrayList<>();
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
// NotificationService implementation ----------------------------
@@ -58,15 +52,6 @@ public class SimpleNotificationService implements NotificationService {
}
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
public static class Listener implements NotificationListener {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
index 588ef11d80..69528b1179 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/String64KLimitTest.java
@@ -42,20 +42,14 @@ import org.junit.Test;
* http://jira.jboss.com/jira/browse/JBAS-2641
*/
public class String64KLimitTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
private ClientSession session;
private ServerLocator locator;
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
protected String genString(final int len) {
char[] chars = new char[len];
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
index 3977f974f2..88f3dfef3d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/BlockingSendTest.java
@@ -31,15 +31,7 @@ import org.junit.Test;
public class BlockingSendTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testSinglePersistentBlockingNonSync() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
index 45b95e8985..fe7ac3b793 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ConsumerCloseTest.java
@@ -53,11 +53,8 @@ public class ConsumerCloseTest extends ActiveMQTestBase {
private SimpleString address;
private ServerLocator locator;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testCanNotUseAClosedConsumer() throws Exception {
@@ -263,9 +260,7 @@ public class ConsumerCloseTest extends ActiveMQTestBase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
index cd69c367f6..f896336dfd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/CreateQueueIdempotentTest.java
@@ -98,14 +98,6 @@ public class CreateQueueIdempotentTest extends ActiveMQTestBase {
Assert.assertEquals(NUM_THREADS - 1, failedAttempts.intValue());
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
class QueueCreator extends Thread {
private String queueName = null;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
index 53384f5949..da738b82ec 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/DurableQueueTest.java
@@ -34,9 +34,6 @@ import org.junit.Test;
public class DurableQueueTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
@@ -46,11 +43,7 @@ public class DurableQueueTest extends ActiveMQTestBase {
private ServerLocator locator;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testConsumeFromDurableQueue() throws Exception {
@@ -148,9 +141,7 @@ public class DurableQueueTest extends ActiveMQTestBase {
session.deleteQueue(queue);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
index 2e40ab5615..3a31c597e2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpireTestOnRestartTest.java
@@ -134,12 +134,4 @@ public class ExpireTestOnRestartTest extends ActiveMQTestBase {
locator.close();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
index 3d0ac77206..c644281978 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ExpiryLargeMessageTest.java
@@ -48,7 +48,7 @@ import org.junit.Test;
*/
public class ExpiryLargeMessageTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
+
final SimpleString EXPIRY = new SimpleString("my-expiry");
final SimpleString DLQ = new SimpleString("my-DLQ");
@@ -60,13 +60,7 @@ public class ExpiryLargeMessageTest extends ActiveMQTestBase {
// it has to be an even number
final int numberOfMessages = 50;
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testExpiryMessagesThenDLQ() throws Exception {
@@ -463,12 +457,4 @@ public class ExpiryLargeMessageTest extends ActiveMQTestBase {
session.close();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
index c64a761130..2d1e22a49c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/HeuristicXATest.java
@@ -43,22 +43,14 @@ import org.junit.Test;
public class HeuristicXATest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
final SimpleString ADDRESS = new SimpleString("ADDRESS");
final String body = "this is the body";
- // Attributes ----------------------------------------------------
-
private MBeanServer mbeanServer;
private ServerLocator locator;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testInvalidCall() throws Exception {
@@ -409,9 +401,7 @@ public class HeuristicXATest extends ActiveMQTestBase {
session.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -421,8 +411,6 @@ public class HeuristicXATest extends ActiveMQTestBase {
locator = createInVMNonHALocator();
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
index b296e4022c..9ff2907233 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/IncompatibleVersionTest.java
@@ -56,20 +56,14 @@ public class IncompatibleVersionTest extends SpawnedTestBase {
private static final Logger log = Logger.getLogger(IncompatibleVersionTest.class);
private static final String WORD_START = "&*STARTED&*";
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
private CoreRemotingConnection connection;
private ServerLocator locator;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
index 3856681999..7384a17dcc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/InterruptedLargeMessageTest.java
@@ -73,7 +73,7 @@ import org.junit.Before;
import org.junit.Test;
public class InterruptedLargeMessageTest extends LargeMessageTestBase {
- // Constants -----------------------------------------------------
+
static final int RECEIVE_WAIT_TIME = 60000;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
index 129ef389ef..1685c9e157 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/JmsNettyNioStressTest.java
@@ -70,15 +70,7 @@ import org.junit.Test;
*/
public class JmsNettyNioStressTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
// Remove this method to re-enable those tests
@Test
@@ -291,12 +283,4 @@ public class JmsNettyNioStressTest extends ActiveMQTestBase {
server.stop();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
index e2eae05930..eaad11e29a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageCompressTest.java
@@ -54,7 +54,7 @@ import javax.management.openmbean.CompositeData;
*/
public class LargeMessageCompressTest extends LargeMessageTest {
- // Constructors --------------------------------------------------
+
public LargeMessageCompressTest(StoreConfiguration.StoreType storeType) {
super(storeType);
isCompressedTest = true;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
index b1b8bb09a0..55a62a5e34 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LargeMessageTest.java
@@ -2564,9 +2564,7 @@ public class LargeMessageTest extends LargeMessageTestBase {
session.commit();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -2795,8 +2793,6 @@ public class LargeMessageTest extends LargeMessageTestBase {
Wait.assertTrue(() -> ((UnixOperatingSystemMXBean)os).getOpenFileDescriptorCount() - fdBefore < 3);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
\ No newline at end of file
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
index 80aed4fa28..e70b1593e7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/LibaioDependencyCheckTest.java
@@ -28,15 +28,7 @@ import org.junit.Test;
*/
public class LibaioDependencyCheckTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testDependency() throws Exception {
@@ -45,12 +37,4 @@ public class LibaioDependencyCheckTest extends ActiveMQTestBase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
index 03d482c521..b5db065d7b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageConsumerRollbackTest.java
@@ -73,15 +73,7 @@ public class MessageConsumerRollbackTest extends ActiveMQTestBase {
session.close();
}
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testRollbackMultipleConsumers() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
index 8644088132..3919de2de0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageDurabilityTest.java
@@ -35,9 +35,6 @@ import org.junit.Test;
public class MessageDurabilityTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
@@ -47,11 +44,7 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
private ServerLocator locator;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testNonDurableMessageOnNonDurableQueue() throws Exception {
@@ -174,9 +167,7 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
});
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -190,7 +181,6 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
session = addClientSession(sf.createSession(false, true, true));
}
- // Private -------------------------------------------------------
private void restart() throws Exception {
session.close();
@@ -201,6 +191,5 @@ public class MessageDurabilityTest extends ActiveMQTestBase {
sf = createSessionFactory(locator);
session = sf.createSession(false, true, true);
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
index e15abffb8d..4e75fa3df9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageExpirationTest.java
@@ -279,9 +279,7 @@ public class MessageExpirationTest extends ActiveMQTestBase {
session.deleteQueue(expiryQueue);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
index 56ecd1c5fd..2884770023 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessagePriorityTest.java
@@ -36,11 +36,9 @@ import org.junit.Test;
public class MessagePriorityTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
private static final Logger log = Logger.getLogger(MessagePriorityTest.class);
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
@@ -49,11 +47,6 @@ public class MessagePriorityTest extends ActiveMQTestBase {
private ClientSessionFactory sf;
private ServerLocator locator;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testMessagePriority() throws Exception {
@@ -302,9 +295,7 @@ public class MessagePriorityTest extends ActiveMQTestBase {
session.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -318,7 +309,6 @@ public class MessagePriorityTest extends ActiveMQTestBase {
session = addClientSession(sf.createSession(false, true, true));
}
- // Private -------------------------------------------------------
private static void expectMessage(final byte expectedPriority,
final String expectedStringInBody,
@@ -329,6 +319,5 @@ public class MessagePriorityTest extends ActiveMQTestBase {
Assert.assertEquals(expectedStringInBody, m.getBodyBuffer().readString());
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
index 0ce4eda9d6..d585fe85ea 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MessageRateTest.java
@@ -37,19 +37,12 @@ import org.junit.Test;
public class MessageRateTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
private final SimpleString ADDRESS = new SimpleString("ADDRESS");
private ServerLocator locator;
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testProduceRate() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
index eb5b6d4aa5..3eb60b3fd1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MixRoutingTest.java
@@ -37,19 +37,14 @@ import org.junit.Assert;
import org.junit.Test;
public class MixRoutingTest extends SingleServerTestBase {
- // Constants -----------------------------------------------------
+
private static final Logger log = Logger.getLogger(MixRoutingTest.class);
private static final long CONNECTION_TTL = 2000;
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Override
protected ActiveMQServer createServer() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
index 3986f1c39d..dd6ca508e1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/MultipleThreadFilterOneTest.java
@@ -40,11 +40,6 @@ import org.junit.Test;
*/
public class MultipleThreadFilterOneTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
final String ADDRESS = "ADDRESS";
@@ -58,9 +53,8 @@ public class MultipleThreadFilterOneTest extends ActiveMQTestBase {
private boolean isNetty = false;
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
+
class SomeProducer extends Thread {
@@ -269,12 +263,4 @@ public class MultipleThreadFilterOneTest extends ActiveMQTestBase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
index 623f8a5298..60c1629afb 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NIOvsOIOTest.java
@@ -48,15 +48,7 @@ public class NIOvsOIOTest extends ActiveMQTestBase {
private static final Logger log = Logger.getLogger(NIOvsOIOTest.class);
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testNIOPerf() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
index 7ffa5eb596..dd0e076160 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/NettyConsumerWindowSizeTest.java
@@ -18,27 +18,12 @@ package org.apache.activemq.artemis.tests.integration.client;
public class NettyConsumerWindowSizeTest extends ConsumerWindowSizeTest {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
@Override
protected boolean isNetty() {
return true;
}
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
index 16dd1dfec2..879d13b754 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/OrderTest.java
@@ -60,11 +60,7 @@ public class OrderTest extends ActiveMQTestBase {
locator = createNettyNonHALocator();
}
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testSimpleStorage() throws Exception {
@@ -243,12 +239,4 @@ public class OrderTest extends ActiveMQTestBase {
session.close();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
index e6291bced8..4018c48ef6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/ProducerCloseTest.java
@@ -55,9 +55,7 @@ public class ProducerCloseTest extends ActiveMQTestBase {
});
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
index 84318671a9..f42eac6d65 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/RedeliveryConsumerTest.java
@@ -43,9 +43,6 @@ import org.junit.Test;
public class RedeliveryConsumerTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
ActiveMQServer server;
@@ -55,11 +52,7 @@ public class RedeliveryConsumerTest extends ActiveMQTestBase {
private ServerLocator locator;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testRedeliveryMessageStrict() throws Exception {
@@ -398,9 +391,7 @@ public class RedeliveryConsumerTest extends ActiveMQTestBase {
factory.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
/**
* @param persistDeliveryCountBeforeDelivery
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
index 9150e9519e..739f0ce759 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SelfExpandingBufferTest.java
@@ -120,9 +120,7 @@ public class SelfExpandingBufferTest extends ActiveMQTestBase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
protected void setUpService(final boolean netty, final boolean persistent) throws Exception {
service = createServer(persistent, createDefaultConfig(netty));
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
index bf939cc2e0..59434afab0 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/SessionCloseTest.java
@@ -40,19 +40,13 @@ import static org.apache.activemq.artemis.tests.util.RandomUtil.randomXid;
public class SessionCloseTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
private ClientSessionFactory sf;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testCanNotUseAClosedSession() throws Exception {
@@ -223,9 +217,7 @@ public class SessionCloseTest extends ActiveMQTestBase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -237,8 +229,6 @@ public class SessionCloseTest extends ActiveMQTestBase {
sf = createSessionFactory(locator);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
index 1d778a2a24..85dd151cbe 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/client/TemporaryQueueTest.java
@@ -604,7 +604,5 @@ public class TemporaryQueueTest extends SingleServerTestBase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
index 5aabb1e2be..5935922c8f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientCrashTest.java
@@ -55,7 +55,6 @@ public class ClientCrashTest extends ClientTestBase {
// using short values so this test can run fast
static final int CONNECTION_TTL = 1000;
- // Constants -----------------------------------------------------
public static final SimpleString QUEUE = new SimpleString("ClientCrashTestQueue");
public static final SimpleString QUEUE2 = new SimpleString("ClientCrashTestQueue2");
@@ -64,9 +63,6 @@ public class ClientCrashTest extends ClientTestBase {
public static final String MESSAGE_TEXT_FROM_CLIENT = "ClientCrashTest from client";
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ClientSessionFactory sf;
@@ -86,9 +82,7 @@ public class ClientCrashTest extends ClientTestBase {
}
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testCrashClient() throws Exception {
@@ -177,8 +171,6 @@ public class ClientCrashTest extends ClientTestBase {
session.close();
}
- // Package protected ---------------------------------------------
-
@Override
@Before
public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
index 5fc6f1a0ae..c0719bdbb1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java
@@ -37,26 +37,18 @@ import org.junit.Test;
* (local server, remote VM client).
*/
public class ClientExitTest extends ClientTestBase {
- // Constants ------------------------------------------------------------------------------------
+
private static final String MESSAGE_TEXT = RandomUtil.randomString();
private static final SimpleString QUEUE = new SimpleString("ClientExitTestQueue");
- // Static ---------------------------------------------------------------------------------------
-
private static final Logger log = Logger.getLogger(ClientExitTest.class);
- // Attributes -----------------------------------------------------------------------------------
-
private ClientSession session;
private ClientConsumer consumer;
- // Constructors ---------------------------------------------------------------------------------
-
- // Public ---------------------------------------------------------------------------------------
-
@Test
public void testGracefulClientExit() throws Exception {
// spawn a JVM that creates a JMS client, which sends a test message
@@ -91,8 +83,6 @@ public class ClientExitTest extends ClientTestBase {
// // assertActiveSession(0);
}
- // Package protected ----------------------------------------------------------------------------
-
@Override
@Before
public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
index 13cbc08181..dea7460dc5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient.java
@@ -36,9 +36,7 @@ public class CrashClient {
public static int OK = 9;
public static int NOT_OK = 1;
- // Constants ------------------------------------------------------------------------------------
- // Static ---------------------------------------------------------------------------------------
public static void main(final String[] args) throws Exception {
try {
@@ -63,21 +61,4 @@ public class CrashClient {
System.exit(NOT_OK);
}
}
-
- // Attributes -----------------------------------------------------------------------------------
-
- // Constructors ---------------------------------------------------------------------------------
-
- // Command implementation -----------------------------------------------------------------------
-
- // Public ---------------------------------------------------------------------------------------
-
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
index 14c2183660..838089d33c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/CrashClient2.java
@@ -34,9 +34,6 @@ public class CrashClient2 {
private static final Logger log = Logger.getLogger(CrashClient2.class);
public static final int OK = 9;
- // Constants ------------------------------------------------------------------------------------
-
- // Static ---------------------------------------------------------------------------------------
public static void main(final String[] args) throws Exception {
try {
@@ -76,20 +73,4 @@ public class CrashClient2 {
}
}
- // Attributes -----------------------------------------------------------------------------------
-
- // Constructors ---------------------------------------------------------------------------------
-
- // Command implementation -----------------------------------------------------------------------
-
- // Public ---------------------------------------------------------------------------------------
-
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
index d4d42caadc..e6c4088d64 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/GracefulClient.java
@@ -34,9 +34,6 @@ import org.jboss.logging.Logger;
public class GracefulClient {
private static final Logger log = Logger.getLogger(GracefulClient.class);
- // Constants ------------------------------------------------------------------------------------
-
- // Static ---------------------------------------------------------------------------------------
public static void main(final String[] args) throws Exception {
if (args.length != 2) {
@@ -70,20 +67,4 @@ public class GracefulClient {
}
}
- // Attributes -----------------------------------------------------------------------------------
-
- // Constructors ---------------------------------------------------------------------------------
-
- // Command implementation -----------------------------------------------------------------------
-
- // Public ---------------------------------------------------------------------------------------
-
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
index 3c380b9655..939d916099 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterTestBase.java
@@ -213,8 +213,6 @@ public abstract class ClusterTestBase extends ActiveMQTestBase {
}
- // Private -------------------------------------------------------------------------------------------------------
-
private static final int MAX_CONSUMERS = 100;
protected static class ConsumerHolder {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
index 4c691124ae..0fbe1ab479 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/SimpleSymmetricClusterTest.java
@@ -36,15 +36,8 @@ import org.junit.Test;
public class SimpleSymmetricClusterTest extends ClusterTestBase {
private static final Logger log = Logger.getLogger(SimpleSymmetricClusterTest.class);
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
public boolean isNetty() {
return false;
@@ -482,12 +475,4 @@ public class SimpleSymmetricClusterTest extends ClusterTestBase {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
index 2381e6dd07..3b77b2f1c9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/TwoWayTwoNodeClusterWithDiscoveryTest.java
@@ -20,23 +20,14 @@ import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancing
public class TwoWayTwoNodeClusterWithDiscoveryTest extends TwoWayTwoNodeClusterTest {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected static final String groupAddress = getUDPDiscoveryAddress();
protected static final int groupPort = getUDPDiscoveryPort();
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
@Override
protected void setupClusters() {
@@ -50,8 +41,6 @@ public class TwoWayTwoNodeClusterWithDiscoveryTest extends TwoWayTwoNodeClusterT
setupLiveServerWithDiscovery(1, groupAddress, groupPort, isFileStorage(), isNetty(), false);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
index 73b7bf6ea5..436f4ac2a5 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTest.java
@@ -2516,9 +2516,7 @@ public class FailoverTest extends FailoverTestBase {
Assert.assertNotNull(sf.getConnection());
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live) {
@@ -2575,6 +2573,5 @@ public class FailoverTest extends FailoverTestBase {
return session;
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
index c1b949250d..e7335aa548 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/FailoverTestBase.java
@@ -58,7 +58,6 @@ import org.junit.Assert;
import org.junit.Before;
public abstract class FailoverTestBase extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
protected static final SimpleString ADDRESS = new SimpleString("FailoverTestAddress");
@@ -71,7 +70,6 @@ public abstract class FailoverTestBase extends ActiveMQTestBase {
protected static final int PAGE_MAX = 2 * 1024;
protected static final int PAGE_SIZE = 1024;
- // Attributes ----------------------------------------------------
protected TestableServer liveServer;
@@ -362,9 +360,7 @@ public abstract class FailoverTestBase extends ActiveMQTestBase {
final ClientSession... sessions) throws Exception {
liveServer.crash(failover, waitFailure, sessions);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
public static final class LatchClusterTopologyListener implements ClusterTopologyListener {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
index 75570c220f..703f23295d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/MultipleServerFailoverTestBase.java
@@ -65,13 +65,12 @@ public abstract class MultipleServerFailoverTestBase extends ActiveMQTestBase {
return pluggableQuorumConfiguration;
}
- // Constants -----------------------------------------------------
+
// TODO: find a better solution for this
// this is necessary because the cluster connection is using "jms" as its match; see org.apache.activemq.artemis.tests.util.ActiveMQTestBase.basicClusterConnectionConfig()
protected static final SimpleString ADDRESS = new SimpleString("jms.FailoverTestAddress");
- // Attributes ----------------------------------------------------
protected List liveServers = new ArrayList<>();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
index f660c9f0c5..d145b89bdd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/failover/PagingFailoverTest.java
@@ -45,7 +45,7 @@ import org.junit.Test;
*
*/
public class PagingFailoverTest extends FailoverTestBase {
- // Constants -----------------------------------------------------
+
@Rule
public RetryRule retryRule = new RetryRule(2);
@@ -58,11 +58,6 @@ public class PagingFailoverTest extends FailoverTestBase {
private ClientSessionFactoryInternal sf;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Override
@Before
@@ -206,9 +201,7 @@ public class PagingFailoverTest extends FailoverTestBase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
protected TransportConfiguration getAcceptorTransportConfiguration(final boolean live) {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
index 9d249f4694..9dfddb2672 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
@@ -47,7 +47,6 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
private static final Logger log = Logger.getLogger(MultiThreadRandomReattachTestBase.class);
- // Constants -----------------------------------------------------
private static final int RECEIVE_TIMEOUT = 30000;
@@ -55,16 +54,11 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
private final int NUM_THREADS = getNumThreads();
- // Attributes ----------------------------------------------------
protected static final SimpleString ADDRESS = new SimpleString("FailoverTestAddress");
protected ActiveMQServer server;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testA() throws Exception {
@@ -219,9 +213,7 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
}, NUM_THREADS, false);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
protected abstract void start() throws Exception;
@@ -1109,7 +1101,6 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
return 10;
}
- // Private -------------------------------------------------------
private void runTestMultipleThreads(final RunnableT runnable,
final int numThreads,
@@ -1201,7 +1192,6 @@ public abstract class MultiThreadRandomReattachTestBase extends MultiThreadReatt
}
}
- // Inner classes -------------------------------------------------
private class MyHandler implements MessageHandler {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
index 2eb12f8ef4..4da1bd930e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/MultiThreadReattachSupportTestBase.java
@@ -159,7 +159,6 @@ public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBas
}
}
- // Private -------------------------------------------------------
private Failer startFailer(final long time, final ClientSession session, final boolean failOnCreateConnection) {
Failer failer = new Failer(session, failOnCreateConnection);
@@ -172,7 +171,6 @@ public abstract class MultiThreadReattachSupportTestBase extends ActiveMQTestBas
return failer;
}
- // Inner classes -------------------------------------------------
protected abstract class RunnableT extends Thread {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
index 931b959ac8..2b3af427ee 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/OrderReattachTest.java
@@ -41,18 +41,12 @@ import org.junit.Assert;
import org.junit.Test;
public class OrderReattachTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
final SimpleString ADDRESS = new SimpleString("address");
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testOrderOnSendInVM() throws Throwable {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
index 5194a97e07..66fb6604dd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/RandomReattachTest.java
@@ -57,11 +57,9 @@ public class RandomReattachTest extends ActiveMQTestBase {
private static final Logger log = Logger.getLogger(RandomReattachTest.class);
- // Constants -----------------------------------------------------
private static final int RECEIVE_TIMEOUT = 10000;
- // Attributes ----------------------------------------------------
private static final SimpleString ADDRESS = new SimpleString("FailoverTestAddress");
@@ -69,11 +67,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
private Timer timer;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testA() throws Exception {
@@ -226,9 +220,7 @@ public class RandomReattachTest extends ActiveMQTestBase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
protected void doTestA(final ClientSessionFactory sf) throws Exception {
long start = System.currentTimeMillis();
@@ -1242,7 +1234,6 @@ public class RandomReattachTest extends ActiveMQTestBase {
super.tearDown();
}
- // Private -------------------------------------------------------
private Failer startFailer(final long time, final ClientSession session) {
Failer failer = new Failer((ClientSessionInternal) session);
@@ -1265,7 +1256,6 @@ public class RandomReattachTest extends ActiveMQTestBase {
server = null;
}
- // Inner classes -------------------------------------------------
class Failer extends TimerTask {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
index b5a6236d62..37d4899821 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/reattach/ReattachTest.java
@@ -1018,9 +1018,7 @@ public class ReattachTest extends ActiveMQTestBase {
sf.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -1042,7 +1040,5 @@ public class ReattachTest extends ActiveMQTestBase {
super.tearDown();
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
index bb81924df6..0c1069f8c7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/FloodServerTest.java
@@ -38,7 +38,7 @@ import org.junit.Test;
* A FloodServerTest
*/
public class FloodServerTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
+
private static final Logger log = Logger.getLogger(FloodServerTest.class);
@@ -46,19 +46,11 @@ public class FloodServerTest extends ActiveMQTestBase {
private final String topicName = "my-topic";
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
// TestCase overrides -------------------------------------------
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -70,9 +62,7 @@ public class FloodServerTest extends ActiveMQTestBase {
server.start();
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
@Test
public void testFoo() {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
index 322d5f5465..b19d0a6773 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/ManualReconnectionToSingleServerTest.java
@@ -47,7 +47,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
public class ManualReconnectionToSingleServerTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
+
public static final String BROKER_URL = "tcp://localhost:61616?minLargeMessageSize=10000&HA=true&retryInterval=100&reconnectAttempts=20&producerWindowSize=10000";
@@ -121,9 +121,7 @@ public class ManualReconnectionToSingleServerTest extends ActiveMQTestBase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -147,9 +145,7 @@ public class ManualReconnectionToSingleServerTest extends ActiveMQTestBase {
allMessagesReceived = new CountDownLatch(1);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
protected void disconnect() {
instanceLog.debug("calling disconnect");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
index 9d34da8ad1..4390974030 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/CreateQueueTest.java
@@ -26,15 +26,8 @@ import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.junit.Test;
public class CreateQueueTest extends JMSTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testCreateQueueTempQueue() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
index 3bd36383ab..7a89c62b80 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ExpiryMessageTest.java
@@ -31,15 +31,8 @@ import org.apache.activemq.artemis.tests.util.JMSTestBase;
import org.junit.Test;
public class ExpiryMessageTest extends JMSTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Override
protected Configuration createDefaultConfig(boolean netty) throws Exception {
@@ -80,10 +73,6 @@ public class ExpiryMessageTest extends JMSTestBase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
index 86f13ed5b3..cf24290838 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/MessageTest.java
@@ -32,7 +32,7 @@ import org.junit.Assert;
import org.junit.Test;
public class MessageTest extends JMSTestBase {
- // Constants -----------------------------------------------------
+
private static final long TIMEOUT = 1000;
@@ -42,13 +42,7 @@ public class MessageTest extends JMSTestBase {
private static final String propName3 = "myprop3";
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
/**
* @see https://jira.jboss.org/jira/browse/HORNETQ-242
@@ -208,11 +202,8 @@ public class MessageTest extends JMSTestBase {
checkProperties(received);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
private void checkProperties(final Message message) throws Exception {
Assert.assertNull(message.getObjectProperty(MessageTest.propName1));
@@ -310,5 +301,4 @@ public class MessageTest extends JMSTestBase {
return received;
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
index d4aa5f63d1..60b69815e2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NewQueueRequestorTest.java
@@ -66,14 +66,6 @@ public class NewQueueRequestorTest extends JMSTestBase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
class TestMessageListener implements MessageListener {
private final QueueSession sess;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
index 437897ab11..6a01868938 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/NoLocalSubscriberTest.java
@@ -31,15 +31,7 @@ import org.apache.activemq.artemis.utils.RandomUtil;
import org.junit.Test;
public class NoLocalSubscriberTest extends JMSTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
/**
* Test that a message created from the same connection than a nolocal consumer
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
index e6b23dea43..608ac8ecab 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/PreACKJMSTest.java
@@ -34,17 +34,10 @@ import org.junit.Test;
public class PreACKJMSTest extends JMSTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private Queue queue;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testPreACKAuto() throws Exception {
@@ -137,9 +130,7 @@ public class PreACKJMSTest extends JMSTestBase {
assertNotNull("ConnectionFactory is on PreACK mode but it is transacted", msg2);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -161,8 +152,6 @@ public class PreACKJMSTest extends JMSTestBase {
jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", false, JMSFactoryType.CF, connectors, null, ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ActiveMQClient.DEFAULT_CONNECTION_TTL, callTimeout, ActiveMQClient.DEFAULT_CALL_FAILOVER_TIMEOUT, ActiveMQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ActiveMQClient.DEFAULT_COMPRESS_LARGE_MESSAGES, ActiveMQClient.DEFAULT_CONSUMER_WINDOW_SIZE, ActiveMQClient.DEFAULT_CONSUMER_MAX_RATE, ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, ActiveMQClient.DEFAULT_PRODUCER_WINDOW_SIZE, ActiveMQClient.DEFAULT_PRODUCER_MAX_RATE, ActiveMQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, ActiveMQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, ActiveMQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, ActiveMQClient.DEFAULT_AUTO_GROUP, true, ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, ActiveMQClient.DEFAULT_ACK_BATCH_SIZE, ActiveMQClient.DEFAULT_ACK_BATCH_SIZE, ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS, ActiveMQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, ActiveMQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, ActiveMQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, ActiveMQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, null, jndiBindings);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
index bbb81f8282..cbadb6ab09 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/ReSendMessageTest.java
@@ -44,17 +44,10 @@ import org.junit.Test;
*/
public class ReSendMessageTest extends JMSTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private Queue queue;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testResendWithLargeMessage() throws Exception {
@@ -223,9 +216,7 @@ public class ReSendMessageTest extends JMSTestBase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
protected void createCF(final List connectorConfigs,
final String... jndiBindings) throws Exception {
@@ -244,8 +235,6 @@ public class ReSendMessageTest extends JMSTestBase {
queue = createQueue("queue1");
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
index 852109704d..d511f1951e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
@@ -41,15 +41,8 @@ import org.junit.Test;
* A SessionClosedOnRemotingConnectionFailureTest
*/
public class SessionClosedOnRemotingConnectionFailureTest extends JMSTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testSessionClosedOnRemotingConnectionFailure() throws Exception {
@@ -112,11 +105,5 @@ public class SessionClosedOnRemotingConnectionFailureTest extends JMSTestBase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
index 9641641a8d..f1ad57fae2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/StoreConfigTest.java
@@ -316,12 +316,4 @@ public class StoreConfigTest extends JMSTestBase {
conn.close();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
index e8b92a162f..eeed30af0e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/client/TextMessageTest.java
@@ -34,17 +34,10 @@ import org.junit.Test;
public class TextMessageTest extends JMSTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private Queue queue;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testSendReceiveNullBody() throws Exception {
@@ -166,9 +159,7 @@ public class TextMessageTest extends JMSTestBase {
assertEquals(str, received4.getText());
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
index eccb1c8bd9..0f76c431c8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverListenerTest.java
@@ -64,9 +64,6 @@ import org.junit.Test;
*/
public class JMSFailoverListenerTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected Configuration backupConf;
@@ -86,11 +83,7 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
private TransportConfiguration backupAcceptortc;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testAutomaticFailover() throws Exception {
@@ -246,9 +239,7 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
connBackup.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -292,9 +283,7 @@ public class JMSFailoverListenerTest extends ActiveMQTestBase {
JMSUtil.waitForServer(backupServer);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
private static class MyFailoverListener implements FailoverEventListener {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
index 7a6ca6286d..472070dc36 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSFailoverTest.java
@@ -85,9 +85,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
private static final Logger log = Logger.getLogger(JMSFailoverTest.class);
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
protected InVMNamingContext ctx1 = new InVMNamingContext();
@@ -115,11 +113,6 @@ public class JMSFailoverTest extends ActiveMQTestBase {
private TransportConfiguration backupAcceptortc;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testCreateQueue() throws Exception {
@@ -512,9 +505,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
f.set(locator, value);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -569,9 +560,7 @@ public class JMSFailoverTest extends ActiveMQTestBase {
JMSUtil.waitForServer(backupServer);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
private static class MyExceptionListener implements ExceptionListener {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
index 2527201747..a294f83f7a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/JMSReconnectTest.java
@@ -285,9 +285,7 @@ public class JMSReconnectTest extends ActiveMQTestBase {
conn.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -298,9 +296,7 @@ public class JMSReconnectTest extends ActiveMQTestBase {
server.start();
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
private static class MyExceptionListener implements ExceptionListener {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
index fab80dad6f..943b1032fc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TemporaryQueueClusterTest.java
@@ -30,15 +30,7 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase {
public static final String QUEUE_NAME = "target";
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testClusteredQueue() throws Exception {
@@ -147,12 +139,4 @@ public class TemporaryQueueClusterTest extends JMSClusteredTestBase {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
index e9e72f9029..61ac2405d7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/cluster/TopicClusterTest.java
@@ -39,15 +39,8 @@ public class TopicClusterTest extends JMSClusteredTestBase {
// TODO: required to match cluster-connection
public static final String TOPIC = "jms.t1";
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testDeleteTopicAfterClusteredSend() throws Exception {
@@ -184,12 +177,4 @@ public class TopicClusterTest extends JMSClusteredTestBase {
assertTrue(checked);
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
index f73e934f73..f67737333b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactorySerializationTest.java
@@ -52,21 +52,15 @@ import org.junit.Before;
import org.junit.Test;
public class ConnectionFactorySerializationTest extends JMSTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected static ActiveMQConnectionFactory cf;
- // Constructors --------------------------------------------------
@Override
@Before
public void setUp() throws Exception {
super.setUp();
}
- // Public --------------------------------------------------------
@Test
public void testConnectionFactoryUDP() throws Exception {
@@ -322,9 +316,7 @@ public class ConnectionFactorySerializationTest extends JMSTestBase {
return cl.cast(o);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
protected static InetAddress getLocalHost() throws UnknownHostException {
InetAddress addr;
@@ -336,7 +328,5 @@ public class ConnectionFactorySerializationTest extends JMSTestBase {
return addr;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
index dc2828b786..d3ff863dff 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/connection/ConnectionFactoryWithJGroupsSerializationTest.java
@@ -83,7 +83,6 @@ public class ConnectionFactoryWithJGroupsSerializationTest extends JMSTestBase {
}
}
- // Public --------------------------------------------------------
//HORNETQ-1389
//Here we deploy two Connection Factories with JGroups discovery groups.
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
index ff166735d8..6e52b907fd 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/largemessage/JMSLargeMessageTest.java
@@ -38,17 +38,12 @@ import org.junit.Before;
import org.junit.Test;
public class JMSLargeMessageTest extends JMSTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
Queue queue1;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Override
protected boolean usePersistence() {
@@ -298,14 +293,6 @@ public class JMSLargeMessageTest extends JMSTestBase {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
class ThreadReader extends Thread {
CountDownLatch latch;
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
index 3d80e5aad6..3c9e658346 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/JMSServerDeployerTest.java
@@ -37,15 +37,10 @@ import org.junit.Before;
import org.junit.Test;
public class JMSServerDeployerTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
+
private static final Logger log = org.jboss.logging.Logger.getLogger(JMSServerDeployerTest.class);
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
private JMSServerManager jmsServer;
@@ -53,7 +48,6 @@ public class JMSServerDeployerTest extends ActiveMQTestBase {
private Configuration config;
- // Public --------------------------------------------------------
@Test
public void testDeployUnusualQueueNames() throws Exception {
@@ -107,9 +101,7 @@ public class JMSServerDeployerTest extends ActiveMQTestBase {
Assert.assertEquals(jmsTopicName, topic.getTopicName());
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -128,8 +120,6 @@ public class JMSServerDeployerTest extends ActiveMQTestBase {
jmsServer.start();
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
index 953d70b83f..7189b5b0bc 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/config/JMSServerConfigParserTest.java
@@ -27,15 +27,8 @@ import org.junit.Test;
public class JMSServerConfigParserTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testParsing() throws Exception {
@@ -61,12 +54,4 @@ public class JMSServerConfigParserTest extends ActiveMQTestBase {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
index 11dd26b57d..e7ef7d2562 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/jms/server/management/JMSUtil.java
@@ -57,11 +57,6 @@ import org.junit.Assert;
public class JMSUtil {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
public static Connection createConnection(final String connectorFactory) throws JMSException {
ActiveMQJMSConnectionFactory cf = (ActiveMQJMSConnectionFactory) ActiveMQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.CF, new TransportConfiguration(connectorFactory));
@@ -264,17 +259,7 @@ public class JMSUtil {
Assert.assertTrue(ok);
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
public static ActiveMQConnection createConnectionAndWaitForTopology(ActiveMQConnectionFactory factory,
int topologyMembers,
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
index d108958e23..669dcb2de6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOImportExportTest.java
@@ -33,15 +33,7 @@ public class NIOImportExportTest extends JournalImplTestBase {
return new NIOSequentialFileFactory(getTestDirfile(), true, 1);
}
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testExportImport() throws Exception {
@@ -184,12 +176,4 @@ public class NIOImportExportTest extends JournalImplTestBase {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
index 5e691b8dc5..4876ef9a4b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/ValidateTransactionHealthTest.java
@@ -127,8 +127,6 @@ public class ValidateTransactionHealthTest extends SpawnedTestBase {
}
- // Package protected ---------------------------------------------
-
private void internalTest(final String type,
final String journalDir,
final long numberOfRecords,
@@ -185,7 +183,6 @@ public class ValidateTransactionHealthTest extends SpawnedTestBase {
}
- // Inner classes -------------------------------------------------
static class Loader implements LoaderCallback {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
index e524221462..bd32dd420c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/LargeMessageTestBase.java
@@ -57,23 +57,15 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public abstract class LargeMessageTestBase extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
private static final Logger log = Logger.getLogger(LargeMessageTestBase.class);
protected final SimpleString ADDRESS = new SimpleString("SimpleAddress");
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
protected StoreConfiguration.StoreType storeType;
@@ -701,7 +693,5 @@ public abstract class LargeMessageTestBase extends ActiveMQTestBase {
}
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
index 18be7cd3a5..0c58db73e7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/largemessage/ServerLargeMessageTest.java
@@ -59,11 +59,6 @@ import org.junit.Test;
public class ServerLargeMessageTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
String originalPath;
@@ -88,9 +83,8 @@ public class ServerLargeMessageTest extends ActiveMQTestBase {
}
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
+
// The ClientConsumer should be able to also send ServerLargeMessages as that's done by the CoreBridge
@Test
@@ -375,13 +369,6 @@ public class ServerLargeMessageTest extends ActiveMQTestBase {
mockFile.close();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
private class MockSequentialFile extends AbstractSequentialFile {
private SequentialFile originalFile;
@@ -463,5 +450,4 @@ public class ServerLargeMessageTest extends ActiveMQTestBase {
return originalFile.cloneFile();
}
}
-
-}
+}
\ No newline at end of file
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
index 2a37038164..95af1df888 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlTest.java
@@ -38,11 +38,8 @@ import org.junit.Assert;
import org.junit.Test;
public class AcceptorControlTest extends ManagementTestBase {
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
public boolean usingCore() {
return false;
@@ -162,9 +159,7 @@ public class AcceptorControlTest extends ManagementTestBase {
return i;
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
protected AcceptorControl createManagementControl(final String name) throws Exception {
return ManagementControlHelper.createAcceptorControl(name, mbeanServer);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
index 3aa3dddf2f..e322839d3a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AcceptorControlUsingCoreTest.java
@@ -24,13 +24,6 @@ import org.junit.Test;
public class AcceptorControlUsingCoreTest extends AcceptorControlTest {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
// AcceptorControlTest overrides --------------------------------
@@ -83,7 +76,6 @@ public class AcceptorControlUsingCoreTest extends AcceptorControlTest {
};
}
- // Public --------------------------------------------------------
@Override
public boolean usingCore() {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
index 7c3fecce52..c4e3c269f6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlTest.java
@@ -114,9 +114,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
@Rule
public RetryRule retryRule = new RetryRule(0);
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected boolean legacyCreateQueue;
@@ -135,7 +132,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
this.legacyCreateQueue = legacyCreateQueue;
}
- // Static --------------------------------------------------------
private static boolean contains(final String name, final String[] strings) {
boolean found = false;
@@ -148,9 +144,7 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
return found;
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
public boolean usingCore() {
return false;
@@ -4313,12 +4307,10 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
}
}
- // Package protected ---------------------------------------------
interface ScaleDownHandler {
void scaleDown(ActiveMQServerControl control) throws Exception;
}
- // Protected -----------------------------------------------------
@Override
@Before
@@ -4350,7 +4342,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
return ManagementControlHelper.createActiveMQServerControl(mbeanServer);
}
- // Private -------------------------------------------------------
private String createJsonFilter(String fieldName, String operationName, String value) {
HashMap filterMap = new HashMap<>();
@@ -4395,7 +4386,6 @@ public class ActiveMQServerControlTest extends ManagementTestBase {
}
session.commit();
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
index 9c42638ec3..a1bd1fc7e9 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ActiveMQServerControlUsingCoreTest.java
@@ -28,19 +28,11 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTest {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public ActiveMQServerControlUsingCoreTest(boolean legacyCreateQueue) {
super(legacyCreateQueue);
}
- // Public --------------------------------------------------------
// ActiveMQServerControlTest overrides --------------------------
@@ -1666,12 +1658,4 @@ public class ActiveMQServerControlUsingCoreTest extends ActiveMQServerControlTes
public boolean usingCore() {
return true;
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
index 21dbb6a74e..4ed58be88b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlTest.java
@@ -693,9 +693,7 @@ public class AddressControlTest extends ManagementTestBase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -719,9 +717,7 @@ public class AddressControlTest extends ManagementTestBase {
return ManagementControlHelper.createAddressControl(address, mbeanServer);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
index 738b47dc80..e160dfe255 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/AddressControlUsingCoreTest.java
@@ -24,13 +24,6 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames;
public class AddressControlUsingCoreTest extends AddressControlTest {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
@Override
@@ -211,15 +204,12 @@ public class AddressControlUsingCoreTest extends AddressControlTest {
};
}
- // Public --------------------------------------------------------
@Override
public boolean usingCore() {
return true;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
index 7059a558c1..bacc2f5481 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/BridgeControlUsingCoreTest.java
@@ -41,9 +41,6 @@ import org.junit.Test;
public class BridgeControlUsingCoreTest extends ManagementTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server_0;
@@ -51,9 +48,6 @@ public class BridgeControlUsingCoreTest extends ManagementTestBase {
private ActiveMQServer server_1;
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testAttributes() throws Exception {
@@ -99,9 +93,7 @@ public class BridgeControlUsingCoreTest extends ManagementTestBase {
Assert.assertTrue((Boolean) proxy.retrieveAttributeValue("Started"));
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
index 4e9a872106..397da5d40a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControl2Test.java
@@ -44,9 +44,6 @@ import org.junit.Test;
public class ClusterConnectionControl2Test extends ManagementTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server0;
@@ -60,9 +57,8 @@ public class ClusterConnectionControl2Test extends ManagementTestBase {
private final String clusterName = "cluster";
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
+
@Test
public void testNodes() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
index 604b170f06..092bce2b83 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlTest.java
@@ -52,9 +52,6 @@ import org.junit.Test;
public class ClusterConnectionControlTest extends ManagementTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server_0;
@@ -66,9 +63,6 @@ public class ClusterConnectionControlTest extends ManagementTestBase {
private MBeanServer mbeanServer_1;
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testAttributes1() throws Exception {
@@ -184,9 +178,7 @@ public class ClusterConnectionControlTest extends ManagementTestBase {
return result;
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -233,8 +225,6 @@ public class ClusterConnectionControlTest extends ManagementTestBase {
return ManagementControlHelper.createClusterConnectionControl(name, mbeanServer);
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
index 0c76a6449c..44e2d7d642 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ClusterConnectionControlUsingCoreTest.java
@@ -23,14 +23,6 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames;
public class ClusterConnectionControlUsingCoreTest extends ClusterConnectionControlTest {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
// ClusterConnectionControlTest overrides --------------------------------
@Override
@@ -138,14 +130,5 @@ public class ClusterConnectionControlUsingCoreTest extends ClusterConnectionCont
};
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
index 3f4e8a18ae..6f1973cf44 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/CoreMessagingProxy.java
@@ -27,17 +27,11 @@ import org.apache.activemq.artemis.api.core.management.ManagementHelper;
public class CoreMessagingProxy {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private final String resourceName;
private final ServerLocator locator;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public CoreMessagingProxy(final ServerLocator locator, final String resourceName) throws Exception {
this.locator = locator;
@@ -45,11 +39,8 @@ public class CoreMessagingProxy {
this.resourceName = resourceName;
}
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
public Object retrieveAttributeValue(final String attributeName) {
return retrieveAttributeValue(attributeName, null);
@@ -96,7 +87,6 @@ public class CoreMessagingProxy {
}
}
- // Private -------------------------------------------------------
private ClientSession getSession(ClientSessionFactory sessionFactory) throws ActiveMQException {
ClientSession session = sessionFactory.createSession(false, true, true);
@@ -108,6 +98,5 @@ public class CoreMessagingProxy {
return new ClientRequestor(session, ActiveMQDefaultConfiguration.getDefaultManagementAddress());
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
index d1424cac83..57496ed3b2 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlTest.java
@@ -35,17 +35,12 @@ import org.junit.Test;
public class DivertControlTest extends ManagementTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
private DivertConfiguration divertConfig;
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testAttributes() throws Exception {
@@ -92,9 +87,7 @@ public class DivertControlTest extends ManagementTestBase {
Assert.assertTrue(divertControl.isRetroactiveResource());
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
index e7d286a114..5a69620490 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/DivertControlUsingCoreTest.java
@@ -23,13 +23,6 @@ import org.apache.activemq.artemis.api.core.management.ResourceNames;
public class DivertControlUsingCoreTest extends DivertControlTest {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
// DivertControlTest overrides --------------------------------
@@ -96,14 +89,5 @@ public class DivertControlUsingCoreTest extends DivertControlTest {
};
}
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
index 4c6b3516c7..905d579f77 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementControlHelper.java
@@ -38,11 +38,7 @@ import org.apache.activemq.artemis.api.core.RoutingType;
public class ManagementControlHelper {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
public static AcceptorControl createAcceptorControl(final String name,
final MBeanServer mbeanServer) throws Exception {
@@ -105,15 +101,7 @@ public class ManagementControlHelper {
return (BrokerBalancerControl) ManagementControlHelper.createProxy(ObjectNameBuilder.DEFAULT.getBrokerBalancerObjectName(name), BrokerBalancerControl.class, mbeanServer);
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
public static Object createProxy(final ObjectName objectName,
final Class mbeanInterface,
@@ -121,6 +109,5 @@ public class ManagementControlHelper {
return MBeanServerInvocationHandler.newProxyInstance(mbeanServer, objectName, mbeanInterface, false);
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
index 9aead03d4a..1ac3889827 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java
@@ -30,17 +30,9 @@ import org.junit.Test;
public class ManagementHelperTest extends Assert {
- // Constants -----------------------------------------------------
private static final Logger log = Logger.getLogger(ManagementHelperTest.class);
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testArrayOfStringParameter() throws Exception {
@@ -227,12 +219,4 @@ public class ManagementHelperTest extends Assert {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
index 3647db7302..d7640c9735 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java
@@ -199,11 +199,5 @@ public class ManagementServiceImplTest extends ActiveMQTestBase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
index 83aeeec1bd..5c6b0cf926 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementTestBase.java
@@ -34,13 +34,10 @@ import org.junit.Before;
public abstract class ManagementTestBase extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected MBeanServer mbeanServer;
- // Static --------------------------------------------------------
+
protected static void consumeMessages(final int expected,
final ClientSession session,
@@ -64,13 +61,10 @@ public abstract class ManagementTestBase extends ActiveMQTestBase {
}
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
+
@Override
@Before
@@ -149,8 +143,6 @@ public abstract class ManagementTestBase extends ActiveMQTestBase {
return control.getMessagesAdded();
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
index e151a1f8f1..e6e66cd57c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/NotificationTest.java
@@ -53,9 +53,6 @@ import static org.apache.activemq.artemis.api.core.management.CoreNotificationTy
public class NotificationTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
@@ -66,11 +63,8 @@ public class NotificationTest extends ActiveMQTestBase {
private SimpleString notifQueue;
private ServerLocator locator;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testBINDING_ADDED() throws Exception {
@@ -430,9 +424,7 @@ public class NotificationTest extends ActiveMQTestBase {
Assert.assertEquals(notifications[0].getTimestamp(), (long) notifications[0].getObjectProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP));
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -462,7 +454,6 @@ public class NotificationTest extends ActiveMQTestBase {
notifConsumer = session.createConsumer(notifQueue);
}
- // Private -------------------------------------------------------
private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException {
ClientMessage message = null;
@@ -495,6 +486,5 @@ public class NotificationTest extends ActiveMQTestBase {
return messages;
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
index 66dbcffe2f..4b2a58f8db 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java
@@ -3880,9 +3880,7 @@ public class QueueControlTest extends ManagementTestBase {
clientConsumer.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
index 71476f5943..2a517a8a35 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SSLSecurityNotificationTest.java
@@ -191,7 +191,6 @@ public class SSLSecurityNotificationTest extends ActiveMQTestBase {
notifConsumer = adminSession.createConsumer(notifQueue);
}
- // Private -------------------------------------------------------
private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException {
ClientMessage message = null;
@@ -218,6 +217,5 @@ public class SSLSecurityNotificationTest extends ActiveMQTestBase {
return messages;
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
index b9d7aa76de..499aa68a47 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementTestBase.java
@@ -31,21 +31,12 @@ import org.junit.Before;
public abstract class SecurityManagementTestBase extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
@Override
@Before
@@ -95,8 +86,6 @@ public abstract class SecurityManagementTestBase extends ActiveMQTestBase {
}
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
index bbe97ec1a5..83e748bf9f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
@@ -29,9 +29,7 @@ import org.junit.Test;
public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManagementTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private final String validAdminUser = "validAdminUser";
@@ -41,11 +39,8 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
private final String invalidAdminPassword = "invalidAdminPassword";
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
/**
* default CLUSTER_ADMIN_USER must work even when there are other
@@ -71,9 +66,7 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
doSendManagementMessage(null, null, false);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
protected ActiveMQServer setupAndStartActiveMQServer() throws Exception {
@@ -99,8 +92,6 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
return server;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
index d4b094dce2..171072a427 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
@@ -39,9 +39,7 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana
doSendManagementMessage(null, null, false);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
protected ActiveMQServer setupAndStartActiveMQServer() throws Exception {
@@ -52,8 +50,6 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana
return server;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
index ef8bb40f86..91c6f5b644 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
@@ -24,17 +24,10 @@ import org.junit.Test;
public class SecurityManagementWithModifiedConfigurationTest extends SecurityManagementTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private final String configuredClusterPassword = "this is not the default password";
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testSendManagementMessageWithModifiedClusterAdminUser() throws Exception {
@@ -56,9 +49,7 @@ public class SecurityManagementWithModifiedConfigurationTest extends SecurityMan
doSendManagementMessage(null, null, false);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
protected ActiveMQServer setupAndStartActiveMQServer() throws Exception {
@@ -69,8 +60,6 @@ public class SecurityManagementWithModifiedConfigurationTest extends SecurityMan
return server;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
index 0bed0fb1d8..1e9e55de62 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/SecurityNotificationTest.java
@@ -48,9 +48,6 @@ import static org.apache.activemq.artemis.api.core.management.CoreNotificationTy
public class SecurityNotificationTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
@@ -60,11 +57,7 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
private SimpleString notifQueue;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testSECURITY_AUTHENTICATION_VIOLATION() throws Exception {
@@ -173,9 +166,7 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
guestSession.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
@Override
@Before
@@ -210,7 +201,6 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
notifConsumer = adminSession.createConsumer(notifQueue);
}
- // Private -------------------------------------------------------
private static void flush(final ClientConsumer notifConsumer) throws ActiveMQException {
ClientMessage message = null;
@@ -237,6 +227,5 @@ public class SecurityNotificationTest extends ActiveMQTestBase {
return messages;
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
index a46b285cda..3dc6c10379 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingCounterTest.java
@@ -44,19 +44,13 @@ import org.junit.Test;
public class PagingCounterTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
private ServerLocator sl;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Before
public void checkLoggerStart() throws Exception {
@@ -357,6 +351,5 @@ public class PagingCounterTest extends ActiveMQTestBase {
return server;
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java
index 886a029c71..e59835608f 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingOrderTest.java
@@ -68,9 +68,6 @@ public class PagingOrderTest extends ActiveMQTestBase {
private static final int PAGE_SIZE = 10 * 1024;
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSyncTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSyncTest.java
index 8ea2757d72..243c376d1d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSyncTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSyncTest.java
@@ -46,9 +46,7 @@ public class PagingSyncTest extends ActiveMQTestBase {
private static final int PAGE_SIZE = 10 * 1024;
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
@@ -102,12 +100,4 @@ public class PagingSyncTest extends ActiveMQTestBase {
session.close();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
index 2fa004b113..475091576a 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteQueueRestartTest.java
@@ -34,17 +34,11 @@ import org.junit.Test;
public class DeleteQueueRestartTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
+
private static final String ADDRESS = "ADDRESS";
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testDeleteQueueAndRestart() throws Exception {
@@ -101,12 +95,4 @@ public class DeleteQueueRestartTest extends ActiveMQTestBase {
server.stop();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
index f5b5cd095a..2229949d6c 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java
@@ -34,9 +34,6 @@ import org.junit.Test;
public class ExportFormatTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
// Case the format was changed, and the change was agreed, use _testCreateFormat to recreate this field
String bindingsFile = "#File,JournalFileImpl: (activemq-bindings-1.bindings id = 1, recordID = 1)\n" +
@@ -142,12 +139,4 @@ public class ExportFormatTest extends ActiveMQTestBase {
session.commit();
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
index 790fc3b066..af6742b469 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/JMSDynamicConfigTest.java
@@ -32,15 +32,7 @@ public class JMSDynamicConfigTest extends JMSTestBase {
return true;
}
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testStart() throws Exception {
@@ -72,12 +64,4 @@ public class JMSDynamicConfigTest extends JMSTestBase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/QueueConfigRestartTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/QueueConfigRestartTest.java
index fd8d275eb2..31ca22e8d8 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/QueueConfigRestartTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/QueueConfigRestartTest.java
@@ -26,17 +26,10 @@ import org.junit.Test;
public class QueueConfigRestartTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
private static final String ADDRESS = "ADDRESS";
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
@@ -217,12 +210,4 @@ public class QueueConfigRestartTest extends ActiveMQTestBase {
QueueBinding queueBinding2 = (QueueBinding)server.getPostOffice().getBinding(queue);
Assert.assertFalse(queueBinding2.getQueue().isEnabled());
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
index 4238196cd2..5243f8474e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RestartSMTest.java
@@ -36,19 +36,14 @@ import org.junit.Test;
public class RestartSMTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
ExecutorService executor;
ExecutorFactory execFactory;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Override
@Before
@@ -100,12 +95,4 @@ public class RestartSMTest extends ActiveMQTestBase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
index 66263e2a3f..8e4a86a745 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/RolesConfigurationStorageTest.java
@@ -123,12 +123,4 @@ public class RolesConfigurationStorageTest extends StorageManagerTestBase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
index 7cb280c516..4c6b29cef4 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/TransportConfigurationEncodingSupportTest.java
@@ -34,15 +34,6 @@ import org.junit.Test;
public class TransportConfigurationEncodingSupportTest extends Assert {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testTransportConfiguration() throws Exception {
@@ -110,12 +101,4 @@ public class TransportConfigurationEncodingSupportTest extends Assert {
assertEquals(expected.getParams().get(key).toString(), actual.getParams().get(key).toString());
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
index c92f75808a..6f7ccec011 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ra/ActiveMQActivationTest.java
@@ -23,15 +23,7 @@ import org.junit.Test;
public class ActiveMQActivationTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testValidateJNDIParameters() throws Exception {
@@ -48,12 +40,4 @@ public class ActiveMQActivationTest extends ActiveMQTestBase {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
index ef232a6308..7bc9336024 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/DestroyConsumerTest.java
@@ -21,15 +21,7 @@ import org.junit.Test;
public class DestroyConsumerTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testFoo() {
@@ -68,12 +60,4 @@ public class DestroyConsumerTest extends ActiveMQTestBase {
//
// }
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
index 321c21844f..c8b2a4c3e6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NettyNetworkAddressTest.java
@@ -42,8 +42,6 @@ public class NettyNetworkAddressTest extends NetworkAddressTestBase {
return TransportConstants.LOCAL_PORT_PROP_NAME;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
index 93e93836b1..09b0f679a1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/NetworkAddressTestBase.java
@@ -40,11 +40,6 @@ import org.junit.Test;
public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
static {
try {
@@ -78,9 +73,7 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
return map;
}
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testConnectToServerWithSameHost() throws Exception {
@@ -221,9 +214,7 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
protected abstract String getAcceptorFactoryClassName();
@@ -233,8 +224,6 @@ public abstract class NetworkAddressTestBase extends ActiveMQTestBase {
protected abstract String getLocalPortProperty();
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
index 6affcf929b..8de5748462 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/PingTest.java
@@ -44,21 +44,15 @@ import org.junit.Before;
import org.junit.Test;
public class PingTest extends ActiveMQTestBase {
- // Constants -----------------------------------------------------
private static final Logger log = Logger.getLogger(PingTest.class);
private static final long CLIENT_FAILURE_CHECK_PERIOD = 500;
- // Attributes ----------------------------------------------------
private ActiveMQServer server;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
index 24501be54a..6dfcafe03e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/ReconnectTest.java
@@ -445,12 +445,4 @@ public class ReconnectTest extends ActiveMQTestBase {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
index bd48ac1be5..6b163f2ad7 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/remoting/SynchronousCloseTest.java
@@ -30,15 +30,9 @@ public class SynchronousCloseTest extends ActiveMQTestBase {
private ActiveMQServer server;
- // Static --------------------------------------------------------
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
@Override
@Before
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
index ce873c5d8c..2e0aecde59 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java
@@ -654,9 +654,7 @@ public final class ReplicationTest extends ActiveMQTestBase {
return paging;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
public static final class TestInterceptor implements Interceptor {
static AtomicBoolean value = new AtomicBoolean(true);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
index 51bad7e04b..fa24ccd67e 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/DelayedMessageTest.java
@@ -255,7 +255,6 @@ public class DelayedMessageTest extends ActiveMQTestBase {
}
- // Private -------------------------------------------------------
private ClientMessage createDurableMessage(final ClientSession session, final String body) {
ClientMessage message = session.createMessage(ActiveMQTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte) 1);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
index 697d2ce6b6..7ddfeabac6 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/MultipliedDelayedMessageTest.java
@@ -114,7 +114,6 @@ public class MultipliedDelayedMessageTest extends ActiveMQTestBase {
session.close();
}
- // Private -------------------------------------------------------
private ClientMessage createDurableMessage(final ClientSession session, final String body) {
ClientMessage message = session.createMessage(ActiveMQTextMessage.TYPE, true, 0, System.currentTimeMillis(), (byte) 1);
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
index 58160a1d0a..19296ec539 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/scheduling/ScheduledMessageTest.java
@@ -795,7 +795,6 @@ public class ScheduledMessageTest extends ActiveMQTestBase {
assertEquals(100, count.get());
}
- // Private -------------------------------------------------------
private void scheduledDelivery(final boolean tx) throws Exception {
ActiveMQTestBase.forceGC();
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
index 710bb16925..65ce1550c1 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java
@@ -941,8 +941,6 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase {
}
}
- // Package protected ---------------------------------------------
-
@Override
@Before
public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
index c21dc45292..f9c9eb715b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java
@@ -360,8 +360,6 @@ public class CoreClientOverTwoWaySSLTest extends ActiveMQTestBase {
}
}
- // Package protected ---------------------------------------------
-
@Override
@Before
public void setUp() throws Exception {
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
index 64d89ef52a..c6467fcd9d 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/util/JMSClusteredTestBase.java
@@ -63,19 +63,12 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
protected static final int MAX_HOPS = 1;
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
// TestCase overrides -------------------------------------------
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
/**
* @throws Exception
@@ -188,8 +181,6 @@ public class JMSClusteredTestBase extends ActiveMQTestBase {
return configuration;
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
index 972b4bce68..b931f6dec3 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AcknowledgementTest.java
@@ -908,14 +908,6 @@ public class AcknowledgementTest extends JMSTestCase {
ProxyAssertSupport.assertFalse(listener.failed);
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
private abstract class LatchListener implements MessageListener {
protected CountDownLatch latch = new CountDownLatch(1);
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
index a3285bc092..ec93a6d0a9 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMessageListenerTest.java
@@ -30,17 +30,10 @@ import org.junit.Test;
public class AutoAckMessageListenerTest extends JMSTestCase {
- // Constants -----------------------------------------------------
private static final JmsTestLogger log = JmsTestLogger.LOGGER;
- // Attributes ----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testAutoAckMsgListenerQueue() throws Exception {
@@ -81,14 +74,6 @@ public class AutoAckMessageListenerTest extends JMSTestCase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
private static class AutoAckMsgListener implements MessageListener {
private boolean passed;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
index e86fee920f..a4304868ce 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/CTSMiscellaneousTest.java
@@ -31,14 +31,9 @@ import org.junit.Test;
* Safeguards for previously detected TCK failures.
*/
public class CTSMiscellaneousTest extends JMSTest {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected static ActiveMQConnectionFactory cf;
- // Constructors --------------------------------------------------
@Override
@Before
public void setUp() throws Exception {
@@ -51,7 +46,6 @@ public class CTSMiscellaneousTest extends JMSTest {
}
- // Public --------------------------------------------------------
/* By default we send non persistent messages asynchronously for performance reasons
* when running with strictTCK we send them synchronously
@@ -92,11 +86,5 @@ public class CTSMiscellaneousTest extends JMSTest {
super.tearDown();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
index f2ac432545..9846da4785 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
@@ -35,17 +35,10 @@ import org.junit.Test;
* All tests related to closing a Connection.
*/
public class ConnectionClosedTest extends JMSTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
// TestCase overrides -------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testCloseOnce() throws Exception {
@@ -325,12 +318,4 @@ public class ConnectionClosedTest extends JMSTestCase {
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
index 8aac28066c..4bc33cb739 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
@@ -35,19 +35,12 @@ import org.junit.Test;
* which go to ConnectionClosedTest.
*/
public class ConnectionTest extends JMSTestCase {
- // Constants -----------------------------------------------------
private static final JmsTestLogger log = JmsTestLogger.LOGGER;
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
// TestCase overrides -------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testManyConnections() throws Exception {
@@ -293,14 +286,6 @@ public class ConnectionTest extends JMSTestCase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
static class MyExceptionListener implements ExceptionListener {
JMSException exceptionReceived;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
index 2505db593c..729f58d05a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConsumerClosedTest.java
@@ -25,19 +25,13 @@ import javax.naming.InitialContext;
import org.junit.Test;
public class ConsumerClosedTest extends JMSTestCase {
- // Constants -----------------------------------------------------
+
public static final int NUMBER_OF_MESSAGES = 10;
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
InitialContext ic;
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testMessagesSentDuringClose() throws Exception {
@@ -73,11 +67,5 @@ public class ConsumerClosedTest extends JMSTestCase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
index bb7ecfeb03..125e827912 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DurableSubscriptionTest.java
@@ -39,15 +39,8 @@ import org.junit.Test;
* MessageConsumerTest.
*/
public class DurableSubscriptionTest extends JMSTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testSimplestDurableSubscription() throws Exception {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
index 3fa5688c8a..c4dcbf968b 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
@@ -3702,13 +3702,7 @@ public class MessageConsumerTest extends JMSTestCase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
private class ConnectionCloseMessageListener implements MessageListener {
private Connection conn;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
index 0b6209c939..3ea0bc41a2 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
@@ -739,13 +739,7 @@ public class MessageProducerTest extends JMSTestCase {
assertNotNull(topicConsumer.receive(1000));
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
private static class CloseCompletionListener implements CompletionListener {
private MessageProducer p;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
index 2395f6f1ca..ef50413174 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageWithReadResolveTest.java
@@ -34,17 +34,9 @@ import org.junit.Test;
*/
public class MessageWithReadResolveTest extends JMSTestCase {
- // Constants -----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
// TestCase overrides -------------------------------------------
- // Public --------------------------------------------------------
@Test
public void testSendReceiveMessage() throws Exception {
@@ -80,11 +72,8 @@ public class MessageWithReadResolveTest extends JMSTestCase {
conn.close();
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
/* This class would trigger the exception when serialized with jboss serialization */
public static class TestMessage implements Serializable {
@@ -129,5 +118,4 @@ public class MessageWithReadResolveTest extends JMSTestCase {
}
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
index 9ee99b0def..ef8949e86f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
@@ -35,13 +35,6 @@ import org.junit.Test;
* Various use cases, added here while trying things or fixing forum issues.
*/
public class MiscellaneousTest extends JMSTestCase {
- // Constants -----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
@Override
@After
@@ -51,7 +44,6 @@ public class MiscellaneousTest extends JMSTestCase {
super.tearDown();
}
- // Public --------------------------------------------------------
@Test
public void testBrowser() throws Exception {
@@ -219,14 +211,6 @@ public class MiscellaneousTest extends JMSTestCase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
private class Result {
private boolean success;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
index ad0530fe3f..5bb407b84a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/NonDurableSubscriberTest.java
@@ -28,15 +28,8 @@ import org.junit.Test;
* Non-durable subscriber tests.
*/
public class NonDurableSubscriberTest extends JMSTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
/**
* Test introduced as a result of a TCK failure.
@@ -88,12 +81,4 @@ public class NonDurableSubscriberTest extends JMSTestCase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
index 1795193bf0..85ed184462 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ReferenceableTest.java
@@ -42,15 +42,8 @@ import org.junit.Test;
* All administered objects should be referenceable and serializable as per spec 4.2
*/
public class ReferenceableTest extends JMSTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@SuppressWarnings("cast")
@Test
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
index c2e700aa00..4c2e6f69bb 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
@@ -39,15 +39,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class SessionTest extends ActiveMQServerTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testCreateProducer() throws Exception {
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
index f43dd4eac5..5afe2127d4 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
@@ -31,15 +31,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class TemporaryDestinationTest extends JMSTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testTemp() throws Exception {
@@ -423,11 +416,5 @@ public class TemporaryDestinationTest extends JMSTestCase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
index c2bf023acc..7d16e63aea 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
@@ -32,15 +32,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class TopicTest extends JMSTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
/**
* The simplest possible topic test.
@@ -133,14 +126,6 @@ public class TopicTest extends JMSTestCase {
ProxyAssertSupport.assertFalse(l3.failed);
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
static class Wibble2 implements Serializable {
private static final long serialVersionUID = -5146179676719808756L;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
index c3f2945c7f..c63c939210 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
@@ -1055,11 +1055,5 @@ public class TransactedSessionTest extends JMSTestCase {
ProxyAssertSupport.assertEquals(NUM_MESSAGES * NUM_TX, count);
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
index 5d8ded1b0b..2452b268b6 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/BytesMessageTest.java
@@ -28,15 +28,8 @@ import org.junit.Before;
* A test that sends/receives bytes messages to the JMS provider and verifies their integrity.
*/
public class BytesMessageTest extends MessageTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Override
@Before
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
index 9f691acc07..9b86d56dd8 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSCorrelationIDHeaderTest.java
@@ -22,15 +22,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class JMSCorrelationIDHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testJMSDestination() throws Exception {
@@ -64,11 +57,8 @@ public class JMSCorrelationIDHeaderTest extends MessageHeaderTestBase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
private void assertByteArraysEqual(final byte[] bytes1, final byte[] bytes2) {
if (bytes1 == null || bytes2 == null) {
@@ -85,6 +75,5 @@ public class JMSCorrelationIDHeaderTest extends MessageHeaderTestBase {
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
index 1c066d7760..c4ef5a0310 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDeliveryModeHeaderTest.java
@@ -23,15 +23,7 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class JMSDeliveryModeHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testDefaultDeliveryMode() throws Exception {
@@ -60,12 +52,4 @@ public class JMSDeliveryModeHeaderTest extends MessageHeaderTestBase {
ProxyAssertSupport.assertEquals(DeliveryMode.PERSISTENT, queueConsumer.receive().getJMSDeliveryMode());
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
index cfc277ec3b..3ae2a41b50 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSDestinationHeaderTest.java
@@ -22,15 +22,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class JMSDestinationHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testJMSDestination() throws Exception {
@@ -39,11 +32,5 @@ public class JMSDestinationHeaderTest extends MessageHeaderTestBase {
ProxyAssertSupport.assertEquals(queue1, m.getJMSDestination());
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
index 428593a065..3ee903fbd6 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
@@ -29,11 +29,7 @@ import org.junit.Before;
import org.junit.Test;
public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
private volatile boolean testFailed;
@@ -41,9 +37,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
private volatile Message expectedMessage;
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
@Override
@Before
@@ -287,12 +281,4 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
checkEmpty(queue1);
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
index 82a8ae42a2..6f796b32ef 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSMessageIDHeaderTest.java
@@ -22,15 +22,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class JMSMessageIDHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testJMSMessageIDPrefix() throws Exception {
@@ -71,11 +64,5 @@ public class JMSMessageIDHeaderTest extends MessageHeaderTestBase {
}
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
index 5556cc5650..ab5bab28b0 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSReplyToHeaderTest.java
@@ -26,15 +26,8 @@ import org.junit.Test;
* A JMSReplyToHeaderTest
*/
public class JMSReplyToHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testJMSDestinationSimple() throws Exception {
@@ -57,12 +50,4 @@ public class JMSReplyToHeaderTest extends MessageHeaderTestBase {
ProxyAssertSupport.assertNull(m.getJMSReplyTo());
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
index 8b4cb266d4..e38ff7a132 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTimestampHeaderTest.java
@@ -22,15 +22,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class JMSTimestampHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testJMSTimestamp() throws Exception {
@@ -54,12 +47,4 @@ public class JMSTimestampHeaderTest extends MessageHeaderTestBase {
ProxyAssertSupport.assertEquals(0L, queueConsumer.receive().getJMSTimestamp());
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
index c68d43c52e..c3a29be163 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSTypeHeaderTest.java
@@ -22,15 +22,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class JMSTypeHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testJMSType() throws Exception {
@@ -49,12 +42,4 @@ public class JMSTypeHeaderTest extends MessageHeaderTestBase {
ProxyAssertSupport.assertEquals(null, queueConsumer.receive(1000).getJMSType());
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
index 0bf5503824..346b3736d3 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MapMessageTest.java
@@ -29,15 +29,7 @@ import org.junit.Test;
* A test that sends/receives map messages to the JMS provider and verifies their integrity.
*/
public class MapMessageTest extends MessageTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Override
@Before
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
index 143061e587..46ecf49c7f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
@@ -63,15 +63,8 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Test;
public class MessageHeaderTest extends MessageHeaderTestBase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Test
public void testClearMessage() throws Exception {
@@ -742,14 +735,6 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
MessageHeaderTestBase.ensureEquivalent(receivedMessage, (ActiveMQMessage) message);
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
private static class ForeignDestination implements Destination, Serializable {
private static final long serialVersionUID = 5545509674580823610L;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
index 0f6e77cd56..e101f43e2f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTestBase.java
@@ -44,9 +44,6 @@ import org.apache.activemq.artemis.jms.tests.util.ProxyAssertSupport;
import org.junit.Before;
public abstract class MessageHeaderTestBase extends ActiveMQServerTestCase {
- // Constants -----------------------------------------------------
-
- // Static --------------------------------------------------------
/**
* Loads the message header fields with significant values.
@@ -343,7 +340,6 @@ public abstract class MessageHeaderTestBase extends ActiveMQServerTestCase {
ProxyAssertSupport.assertEquals(m1.getText(), m2.getText());
}
- // Attributes ----------------------------------------------------
protected Connection producerConnection, consumerConnection;
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
index f2a8904371..41c0e87ff4 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessagePropertyConversionTest.java
@@ -39,7 +39,7 @@ import org.junit.Test;
* Testing of message property conversion. See {@link javax.jms.Message} for details
*/
public class MessagePropertyConversionTest extends ActiveMQServerTestCase {
- // Attributes ----------------------------------------------------
+
private Connection producerConnection, consumerConnection;
@@ -49,9 +49,8 @@ public class MessagePropertyConversionTest extends ActiveMQServerTestCase {
private MessageConsumer queueConsumer;
- // Constructors --------------------------------------------------
- // Public --------------------------------------------------------
+
@Override
@Before
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
index 66fb4150ff..0e177069ad 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
@@ -31,11 +31,7 @@ import org.junit.Before;
import org.junit.Test;
public abstract class MessageTestBase extends ActiveMQServerTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
protected Message message;
@@ -47,9 +43,6 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
protected MessageConsumer queueCons;
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
@Override
@Before
@@ -171,9 +164,7 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
protected void prepareMessage(final Message m) throws JMSException {
m.setBooleanProperty("booleanProperty", true);
@@ -213,7 +204,5 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
ProxyAssertSupport.assertEquals(mode, m.getJMSDeliveryMode());
}
- // Private -------------------------------------------------------
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
index 21eeeca899..f6dbc0d88a 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/ObjectMessageDeliveryTest.java
@@ -32,15 +32,8 @@ import org.junit.Test;
* ObjectMessageDeliveryTest
*/
public class ObjectMessageDeliveryTest extends ActiveMQServerTestCase {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
- // Attributes ----------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
static class TestObject implements Serializable {
@@ -118,12 +111,4 @@ public class ObjectMessageDeliveryTest extends ActiveMQServerTestCase {
}
}
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
index 9fc193feae..0787403a1c 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
@@ -30,9 +30,7 @@ import java.io.EOFException;
import java.io.IOException;
public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMessage {
- // Static -------------------------------------------------------
- // Attributes ----------------------------------------------------
protected byte[] internalArray;
@@ -46,7 +44,6 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
private transient DataInputStream m;
- // Constructor ---------------------------------------------------
public SimpleJMSBytesMessage() {
ostream = new ByteArrayOutputStream();
@@ -399,13 +396,9 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
return internalArray.length;
}
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
/**
* Check the message is readable
@@ -425,5 +418,4 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
}
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
index 722b1e01e9..225e6266db 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
@@ -26,17 +26,12 @@ import java.util.HashMap;
import java.util.Map;
public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
protected Map content;
protected boolean bodyReadOnly = false;
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
public SimpleJMSMapMessage() {
content = new HashMap<>();
@@ -438,11 +433,8 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
}
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
- // Private -------------------------------------------------------
/**
* Check the name
@@ -459,6 +451,5 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
}
}
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
index f9cc393cd4..03f0ac2711 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
@@ -32,7 +32,7 @@ public class SimpleJMSMessage implements Message {
private boolean ignoreSetDestination;
- // Constructors --------------------------------------------------
+
public SimpleJMSMessage() {
properties.put("JMSXDeliveryCount", Integer.valueOf(0));
@@ -365,13 +365,6 @@ public class SimpleJMSMessage implements Message {
throw new UnsupportedOperationException("JMS 2.0 / not implemented");
}
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
index 5b9bc3df5f..d3ade3060c 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
@@ -21,15 +21,10 @@ import javax.jms.ObjectMessage;
import java.io.Serializable;
public class SimpleJMSObjectMessage extends SimpleJMSMessage implements ObjectMessage {
- // Constants -----------------------------------------------------
- // Static --------------------------------------------------------
-
- // Attributes ----------------------------------------------------
private Serializable object;
- // Constructors --------------------------------------------------
// ObjectMessage implementation ----------------------------------
@@ -43,13 +38,6 @@ public class SimpleJMSObjectMessage extends SimpleJMSMessage implements ObjectMe
return object;
}
- // Public --------------------------------------------------------
- // Package protected ---------------------------------------------
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
}
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
index 6e9cff220b..4d18a22b48 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
@@ -26,9 +26,7 @@ import java.util.ArrayList;
import java.util.List;
public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMessage {
- // Constants -----------------------------------------------------
- // Attributes ----------------------------------------------------
protected List