This is an automated email from the ASF dual-hosted git repository. clebertsuconic pushed a commit to branch 2.19.x in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 914c96f5818de98579e93979d758a1ef2f412226 Author: Clebert Suconic <[email protected]> AuthorDate: Thu Nov 4 08:43:14 2021 -0400 ARTEMIS-3538 Removing some extra // ---- (cherry picked from commit 657e4bf8428c4ff6095d8083384ca30222bd2eb9) --- .../apache/activemq/artemis/utils/ConcurrentHashSetTest.java | 2 -- .../activemq/artemis/jms/client/ActiveMQBytesMessage.java | 2 -- .../apache/activemq/artemis/jms/client/ActiveMQMapMessage.java | 2 -- .../activemq/artemis/jms/client/ActiveMQStreamMessage.java | 2 -- .../apache/activemq/artemis/jms/bridge/impl/JMSBridgeImpl.java | 2 -- .../amqp/converter/coreWrapper/CoreStreamMessageWrapper.java | 2 -- .../transport/amqp/client/AmqpTransactionCoordinator.java | 2 -- .../apache/activemq/artemis/tests/extras/jms/xa/XATest.java | 2 -- .../artemis/tests/integration/jms/FloodServerTest.java | 5 ----- .../activemq/artemis/tests/util/JMSClusteredTestBase.java | 10 ---------- .../activemq/artemis/jms/tests/ConnectionClosedTest.java | 3 --- .../org/apache/activemq/artemis/jms/tests/ConnectionTest.java | 3 --- .../activemq/artemis/jms/tests/MessageWithReadResolveTest.java | 3 --- .../activemq/artemis/tests/unit/util/VersionLoaderTest.java | 5 ----- 14 files changed, 45 deletions(-) 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 7dbc96c..b2bdc60 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 @@ -105,8 +105,6 @@ public class ConcurrentHashSetTest extends Assert { } } - // TestCase overrides -------------------------------------------- - @Before public void setUp() throws Exception { set = new ConcurrentHashSet<>(); 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 d6e4541..348ec07 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 @@ -322,8 +322,6 @@ public class ActiveMQBytesMessage extends ActiveMQMessage implements BytesMessag bodyLength = message.getBodySize(); } - // ActiveMQRAMessage overrides ---------------------------------------- - @Override public void clearBody() throws JMSException { super.clearBody(); 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 f9559ec..bf1e059 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 @@ -301,8 +301,6 @@ public class ActiveMQMapMessage extends ActiveMQMessage implements MapMessage { return map.containsProperty(new SimpleString(name)); } - // ActiveMQRAMessage overrides ---------------------------------------- - @Override public void clearBody() throws JMSException { super.clearBody(); 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 c0ab87e..2b0b2de 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 @@ -341,8 +341,6 @@ public class ActiveMQStreamMessage extends ActiveMQMessage implements StreamMess getBuffer().resetReaderIndex(); } - // ActiveMQRAMessage overrides ---------------------------------------- - @Override public void clearBody() throws JMSException { super.clearBody(); 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 f9dc9f7..f35d41f 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 @@ -327,8 +327,6 @@ public final class JMSBridgeImpl implements JMSBridge { } } - // ActiveMQComponent overrides -------------------------------------------------- - @Override public JMSBridgeImpl setBridgeName(String name) { this.bridgeName = name; diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreStreamMessageWrapper.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreStreamMessageWrapper.java index ec28c0f..f55c705 100644 --- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreStreamMessageWrapper.java +++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/converter/coreWrapper/CoreStreamMessageWrapper.java @@ -305,8 +305,6 @@ public final class CoreStreamMessageWrapper extends CoreMessageWrapper { getWriteBodyBuffer().resetReaderIndex(); } - // ActiveMQRAMessage overrides ---------------------------------------- - @Override public void clearBody() { super.clearBody(); diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java index bc1030e..ebc964d 100644 --- a/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java +++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/transport/amqp/client/AmqpTransactionCoordinator.java @@ -177,8 +177,6 @@ public class AmqpTransactionCoordinator extends AmqpAbstractResource<Sender> { sendTxCommand(message); } - //----- Base class overrides ---------------------------------------------// - @Override public void remotelyClosed(AmqpConnection connection) { 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 80183d5..f3f4b2d 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 @@ -58,8 +58,6 @@ public class XATest extends JMSTestBase { protected Queue queue1; - // TestCase overrides ------------------------------------------- - @Override @Before public void setUp() throws Exception { 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 0c1069f..56e5d2c 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 @@ -47,11 +47,6 @@ public class FloodServerTest extends ActiveMQTestBase { private final String topicName = "my-topic"; - // TestCase overrides ------------------------------------------- - - - - @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 c6467fc..dd29b42 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,13 +63,6 @@ public class JMSClusteredTestBase extends ActiveMQTestBase { protected static final int MAX_HOPS = 1; - - - // TestCase overrides ------------------------------------------- - - - - /** * @throws Exception */ @@ -180,7 +173,4 @@ public class JMSClusteredTestBase extends ActiveMQTestBase { return configuration; } - - - } 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 9846da4..79c0703 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 @@ -37,9 +37,6 @@ import org.junit.Test; public class ConnectionClosedTest extends JMSTestCase { - // TestCase overrides ------------------------------------------- - - @Test public void testCloseOnce() throws Exception { Connection conn = createConnection(); 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 4bc33cb..e04d3f8 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 @@ -39,9 +39,6 @@ public class ConnectionTest extends JMSTestCase { private static final JmsTestLogger log = JmsTestLogger.LOGGER; - // TestCase overrides ------------------------------------------- - - @Test public void testManyConnections() throws Exception { for (int i = 0; i < 100; i++) { 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 ef50413..89e9ddf 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 @@ -35,9 +35,6 @@ import org.junit.Test; public class MessageWithReadResolveTest extends JMSTestCase { - // TestCase overrides ------------------------------------------- - - @Test public void testSendReceiveMessage() throws Exception { Connection conn = createConnection(); diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java index 4fba4ef..758d505 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/util/VersionLoaderTest.java @@ -43,9 +43,4 @@ public class VersionLoaderTest extends ActiveMQTestBase { Assert.assertEquals(Integer.parseInt(new StringTokenizer(props.getProperty("activemq.version.incrementingVersion"), ",").nextToken()), version.getIncrementingVersion()); } - // Z implementation ---------------------------------------------- - - // Y overrides --------------------------------------------------- - - }
