activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [03/42] activemq-artemis git commit: Add missing @Override annotations
Date Mon, 07 Dec 2015 18:39:15 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMesageListenerTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMesageListenerTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMesageListenerTest.java
index 1a2c309..858b529 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMesageListenerTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/AutoAckMesageListenerTest.java
@@ -110,6 +110,7 @@ public class AutoAckMesageListenerTest extends JMSTestCase {
       }
 
       // will receive two messages
+      @Override
       public void onMessage(Message message) {
          try {
             if (message.getBooleanProperty("last") == false) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
index 85ec7fd..009519b 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/BrowserTest.java
@@ -64,6 +64,7 @@ public class BrowserTest extends JMSTestCase {
 
          try {
             ps.createBrowser(new Queue() {
+               @Override
                public String getQueueName() throws JMSException {
                   return "NoSuchQueue";
                }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionClosedTest.java
----------------------------------------------------------------------
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 48117d1..d47896e 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
@@ -136,6 +136,7 @@ public class ConnectionClosedTest extends JMSTestCase {
 
          public String failed;
 
+         @Override
          public void run() {
             try {
                long start = System.currentTimeMillis();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
index b656f93..8e29dfd 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionFactoryTest.java
@@ -207,6 +207,7 @@ public class ConnectionFactoryTest extends JMSTestCase {
 
             int processed;
 
+            @Override
             public void onMessage(final Message msg) {
                processed++;
 
@@ -224,6 +225,7 @@ public class ConnectionFactoryTest extends JMSTestCase {
 
             int processed;
 
+            @Override
             public void onMessage(final Message msg) {
                processed++;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/ConnectionTest.java
----------------------------------------------------------------------
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 7fee727..7faaa0c 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
@@ -297,6 +297,7 @@ public class ConnectionTest extends JMSTestCase {
 
       JMSException exceptionReceived;
 
+      @Override
       public void onException(final JMSException exception) {
          exceptionReceived = exception;
          ConnectionTest.log.trace("Received exception");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DeliveryOrderTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DeliveryOrderTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DeliveryOrderTest.java
index 794d472..8cf5719 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DeliveryOrderTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/DeliveryOrderTest.java
@@ -96,6 +96,7 @@ public class DeliveryOrderTest extends JMSTestCase {
          this.sess = sess;
       }
 
+      @Override
       public void onMessage(final Message msg) {
          // preserve the first error
          if (failed) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
index 5df5887..63e87b9 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/JMSTest.java
@@ -248,6 +248,7 @@ public class JMSTest extends JMSTestCase {
       final CountDownLatch latch = new CountDownLatch(1);
 
       new Thread(new Runnable() {
+         @Override
          public void run() {
             try {
                // sleep a little bit to ensure that
@@ -297,6 +298,7 @@ public class JMSTest extends JMSTestCase {
       final CountDownLatch latch = new CountDownLatch(1);
 
       cons.setMessageListener(new MessageListener() {
+         @Override
          public void onMessage(final Message m) {
             message.set(m);
             latch.countDown();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageConsumerTest.java
----------------------------------------------------------------------
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 288014f..45e0f3c 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
@@ -121,6 +121,7 @@ public class MessageConsumerTest extends JMSTestCase {
 
             int count;
 
+            @Override
             public synchronized void onMessage(final Message m) {
                try {
                   prod.send(m);
@@ -484,6 +485,7 @@ public class MessageConsumerTest extends JMSTestCase {
 
          try {
             ps.createConsumer(new Topic() {
+               @Override
                public String getTopicName() throws JMSException {
                   return "NoSuchTopic";
                }
@@ -512,6 +514,7 @@ public class MessageConsumerTest extends JMSTestCase {
 
          try {
             ps.createConsumer(new Queue() {
+               @Override
                public String getQueueName() throws JMSException {
                   return "NoSuchQueue";
                }
@@ -1332,6 +1335,7 @@ public class MessageConsumerTest extends JMSTestCase {
 
             boolean failed;
 
+            @Override
             public void run() {
                try {
                   for (int i = 0; i < NUM_MESSAGES; i++) {
@@ -1626,6 +1630,7 @@ public class MessageConsumerTest extends JMSTestCase {
 
          final Message m = producerSession.createMessage();
          new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   // this is needed to make sure the main thread has enough time to block
@@ -1673,6 +1678,7 @@ public class MessageConsumerTest extends JMSTestCase {
 
          final Message m1 = producerSession.createMessage();
          new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   // this is needed to make sure the main thread has enough time to block
@@ -1721,6 +1727,7 @@ public class MessageConsumerTest extends JMSTestCase {
 
          final Message m1 = producerSession.createMessage();
          new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   // this is needed to make sure the main thread has enough time to block
@@ -1819,6 +1826,7 @@ public class MessageConsumerTest extends JMSTestCase {
          consumerConnection.start();
 
          new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   for (int i = 0; i < count; i++) {
@@ -1876,6 +1884,7 @@ public class MessageConsumerTest extends JMSTestCase {
          consumerConnection.start();
 
          new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   // this is needed to make sure the main thread has enough time to block
@@ -1923,6 +1932,7 @@ public class MessageConsumerTest extends JMSTestCase {
          consumerConnection.start();
          final CountDownLatch latch = new CountDownLatch(1);
          Thread closerThread = new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   // this is needed to make sure the main thread has enough time to block
@@ -2310,6 +2320,7 @@ public class MessageConsumerTest extends JMSTestCase {
 
          consumerConnection.start();
          Thread worker1 = new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   topicConsumer.receive(3000);
@@ -2350,6 +2361,7 @@ public class MessageConsumerTest extends JMSTestCase {
       final AtomicInteger messagesReceived = new AtomicInteger(0);
 
       MessageListener myListener = new MessageListener() {
+         @Override
          public void onMessage(final Message message) {
             messagesReceived.incrementAndGet();
             try {
@@ -2449,6 +2461,7 @@ public class MessageConsumerTest extends JMSTestCase {
          MessageConsumer queueConsumer = consumerSession.createConsumer(queue1);
 
          MessageListener myListener = new MessageListener() {
+            @Override
             public void onMessage(final Message message) {
                try {
                   Thread.sleep(1);
@@ -2640,6 +2653,7 @@ public class MessageConsumerTest extends JMSTestCase {
                this.consumer = consumer;
             }
 
+            @Override
             public void run() {
                try {
                   m = consumer.receive(1500);
@@ -3894,6 +3908,7 @@ public class MessageConsumerTest extends JMSTestCase {
          this.sess = sess;
       }
 
+      @Override
       public void onMessage(final Message m) {
          TextMessage tm = (TextMessage) m;
          count++;
@@ -3990,6 +4005,7 @@ public class MessageConsumerTest extends JMSTestCase {
          ActiveMQTestBase.waitForLatch(latch);
       }
 
+      @Override
       public void onMessage(final Message m) {
          try {
             TextMessage tm = (TextMessage) m;
@@ -4069,6 +4085,7 @@ public class MessageConsumerTest extends JMSTestCase {
          ActiveMQTestBase.waitForLatch(latch);
       }
 
+      @Override
       public void onMessage(final Message m) {
          messages.add(m);
          log.trace("Added message " + m + " to my list");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MessageProducerTest.java
----------------------------------------------------------------------
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 7fa72b3..cb7e493 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
@@ -174,6 +174,7 @@ public class MessageProducerTest extends JMSTestCase {
          this.m = m;
       }
 
+      @Override
       public synchronized void run() {
          try {
             prod.send(m);
@@ -257,6 +258,7 @@ public class MessageProducerTest extends JMSTestCase {
          final MessageProducer anonProducer = ps.createProducer(null);
 
          new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   anonProducer.send(ActiveMQServerTestCase.topic2, m1);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/MiscellaneousTest.java
----------------------------------------------------------------------
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 a30b7c9..4febb3d 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
@@ -114,6 +114,7 @@ public class MiscellaneousTest extends JMSTestCase {
       Session s = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
       final MessageConsumer cons = s.createConsumer(queue1);
       cons.setMessageListener(new MessageListener() {
+         @Override
          public void onMessage(final Message m) {
             // close the connection on the same thread that processed the message
             try {
@@ -167,6 +168,7 @@ public class MiscellaneousTest extends JMSTestCase {
       Session s = conn.createSession(true, Session.SESSION_TRANSACTED);
       final MessageConsumer cons = s.createConsumer(queue1);
       cons.setMessageListener(new MessageListener() {
+         @Override
          public void onMessage(final Message m) {
             // close the connection on the same thread that processed the message
             try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/SessionTest.java
----------------------------------------------------------------------
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 887fdec..e6a8909 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
@@ -238,6 +238,7 @@ public class SessionTest extends ActiveMQServerTestCase {
             this.consumer = consumer;
          }
 
+         @Override
          public void run() {
             try {
                m = consumer.receive(3000);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TemporaryDestinationTest.java
----------------------------------------------------------------------
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 9357b1c..c75bfc9 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
@@ -300,6 +300,7 @@ public class TemporaryDestinationTest extends JMSTestCase {
          final Message m = producerSession.createTextMessage(messageText);
 
          Thread t = new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   // this is needed to make sure the main thread has enough time to block

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TopicTest.java
----------------------------------------------------------------------
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 9d616f8..bbeb176 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
@@ -160,6 +160,7 @@ public class TopicTest extends JMSTestCase {
          this.num = num;
       }
 
+      @Override
       public synchronized void onMessage(final Message m) {
          ObjectMessage om = (ObjectMessage) m;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/TransactedSessionTest.java
----------------------------------------------------------------------
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 b7422dc..b814d6e 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
@@ -702,6 +702,7 @@ public class TransactedSessionTest extends JMSTestCase {
          this.conn = conn;
       }
 
+      @Override
       public void onMessage(Message message) {
          if (!started) {
             startLatch.countDown();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/JMSExpirationHeaderTest.java
----------------------------------------------------------------------
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 303513c..0babc3c 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
@@ -115,6 +115,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
       // start the receiver thread
       final CountDownLatch latch = new CountDownLatch(1);
       Thread receiverThread = new Thread(new Runnable() {
+         @Override
          public void run() {
             try {
                expectedMessage = queueConsumer.receive(100);
@@ -141,6 +142,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
 
       // start the receiver thread
       Thread receiverThread = new Thread(new Runnable() {
+         @Override
          public void run() {
             try {
                long t1 = System.currentTimeMillis();
@@ -161,6 +163,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
 
       // start the sender thread
       Thread senderThread = new Thread(new Runnable() {
+         @Override
          public void run() {
             try {
                // wait for 3 secs
@@ -231,6 +234,7 @@ public class JMSExpirationHeaderTest extends MessageHeaderTestBase {
       final CountDownLatch latch = new CountDownLatch(1);
       // blocking read for a while to make sure I don't get anything, not even a null
       Thread receiverThread = new Thread(new Runnable() {
+         @Override
          public void run() {
             try {
                log.trace("Attempting to receive");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageHeaderTest.java
----------------------------------------------------------------------
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 f672de6..7394a93 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
@@ -815,17 +815,20 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
 
    class FakeSession implements ClientSession {
 
+      @Override
       public ClientConsumer createConsumer(final SimpleString queueName,
                                            final boolean browseOnly) throws ActiveMQException {
          // TODO Auto-generated method stub
          return null;
       }
 
+      @Override
       public ClientConsumer createConsumer(final String queueName, final boolean browseOnly) throws ActiveMQException {
          // TODO Auto-generated method stub
          return null;
       }
 
+      @Override
       public void createQueue(final String address, final String queueName) throws ActiveMQException {
          // TODO Auto-generated method stub
 
@@ -837,12 +840,14 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
          this.message = message;
       }
 
+      @Override
       public void createQueue(final SimpleString address,
                               final SimpleString queueName,
                               final SimpleString filterString,
                               final boolean durable) throws ActiveMQException {
       }
 
+      @Override
       public void createQueue(final SimpleString address,
                               final SimpleString queueName,
                               final boolean durable) throws ActiveMQException {
@@ -861,6 +866,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
                                     boolean durable) throws ActiveMQException {
       }
 
+      @Override
       public void createQueue(final String address,
                               final String queueName,
                               final boolean durable) throws ActiveMQException {
@@ -878,50 +884,61 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
                               final boolean temporary) throws ActiveMQException {
       }
 
+      @Override
       public void createQueue(final String address,
                               final String queueName,
                               final String filterString,
                               final boolean durable) throws ActiveMQException {
       }
 
+      @Override
       public void createTemporaryQueue(final SimpleString address,
                                        final SimpleString queueName) throws ActiveMQException {
       }
 
+      @Override
       public void createTemporaryQueue(final String address, final String queueName) throws ActiveMQException {
       }
 
+      @Override
       public void createTemporaryQueue(final SimpleString address,
                                        final SimpleString queueName,
                                        final SimpleString filter) throws ActiveMQException {
       }
 
+      @Override
       public void createTemporaryQueue(final String address,
                                        final String queueName,
                                        final String filter) throws ActiveMQException {
       }
 
+      @Override
       public void deleteQueue(final SimpleString queueName) throws ActiveMQException {
       }
 
+      @Override
       public void deleteQueue(final String queueName) throws ActiveMQException {
       }
 
+      @Override
       public ClientConsumer createConsumer(final SimpleString queueName) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public ClientConsumer createConsumer(final SimpleString queueName,
                                            final SimpleString filterString) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public ClientConsumer createConsumer(final SimpleString queueName,
                                            final SimpleString filterString,
                                            final boolean browseOnly) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public ClientConsumer createConsumer(final SimpleString queueName,
                                            final SimpleString filterString,
                                            final int windowSize,
@@ -930,20 +947,24 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
          return null;
       }
 
+      @Override
       public ClientConsumer createConsumer(final String queueName) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public ClientConsumer createConsumer(final String queueName, final String filterString) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public ClientConsumer createConsumer(final String queueName,
                                            final String filterString,
                                            final boolean browseOnly) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public ClientConsumer createConsumer(final String queueName,
                                            final String filterString,
                                            final int windowSize,
@@ -1005,14 +1026,17 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
          return null;
       }
 
+      @Override
       public ClientProducer createProducer() throws ActiveMQException {
          return null;
       }
 
+      @Override
       public ClientProducer createProducer(final SimpleString address) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public ClientProducer createProducer(final SimpleString address, final int rate) throws ActiveMQException {
          return null;
       }
@@ -1024,6 +1048,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
          return null;
       }
 
+      @Override
       public ClientProducer createProducer(final String address) throws ActiveMQException {
          return null;
       }
@@ -1039,55 +1064,69 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
          return null;
       }
 
+      @Override
       public QueueQuery queueQuery(final SimpleString queueName) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public AddressQuery addressQuery(final SimpleString address) throws ActiveMQException {
          return null;
       }
 
+      @Override
       public XAResource getXAResource() {
          return null;
       }
 
+      @Override
       public void commit() throws ActiveMQException {
       }
 
+      @Override
       public boolean isRollbackOnly() {
 
          return false;
       }
 
+      @Override
       public void rollback() throws ActiveMQException {
       }
 
+      @Override
       public void rollback(final boolean considerLastMessageAsDelivered) throws ActiveMQException {
       }
 
+      @Override
       public void close() throws ActiveMQException {
       }
 
+      @Override
       public boolean isClosed() {
          return false;
       }
 
+      @Override
       public boolean isAutoCommitSends() {
          return false;
       }
 
+      @Override
       public boolean isAutoCommitAcks() {
          return false;
       }
 
+      @Override
       public boolean isBlockOnAcknowledge() {
          return false;
       }
 
+      @Override
       public boolean isXA() {
          return false;
       }
 
+      @Override
       public ClientMessage createMessage(final byte type,
                                          final boolean durable,
                                          final long expiration,
@@ -1096,24 +1135,29 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
          return message;
       }
 
+      @Override
       public ClientMessage createMessage(final byte type, final boolean durable) {
          return message;
       }
 
+      @Override
       public ClientMessage createMessage(final boolean durable) {
          return message;
       }
 
+      @Override
       public FakeSession start() throws ActiveMQException {
          return this;
       }
 
+      @Override
       public void stop() throws ActiveMQException {
       }
 
       public void addFailureListener(final FailureListener listener) {
       }
 
+      @Override
       public void addFailoverListener(FailoverEventListener listener) {
       }
 
@@ -1121,50 +1165,63 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
          return false;
       }
 
+      @Override
       public boolean removeFailoverListener(FailoverEventListener listener) {
          return false;
       }
 
+      @Override
       public int getVersion() {
          return 0;
       }
 
+      @Override
       public FakeSession setSendAcknowledgementHandler(final SendAcknowledgementHandler handler) {
          return this;
       }
 
+      @Override
       public void commit(final Xid xid, final boolean b) throws XAException {
       }
 
+      @Override
       public void end(final Xid xid, final int i) throws XAException {
       }
 
+      @Override
       public void forget(final Xid xid) throws XAException {
       }
 
+      @Override
       public int getTransactionTimeout() throws XAException {
          return 0;
       }
 
+      @Override
       public boolean isSameRM(final XAResource xaResource) throws XAException {
          return false;
       }
 
+      @Override
       public int prepare(final Xid xid) throws XAException {
          return 0;
       }
 
+      @Override
       public Xid[] recover(final int i) throws XAException {
          return new Xid[0];
       }
 
+      @Override
       public void rollback(final Xid xid) throws XAException {
       }
 
+      @Override
       public boolean setTransactionTimeout(final int i) throws XAException {
          return false;
       }
 
+      @Override
       public void start(final Xid xid, final int i) throws XAException {
       }
 
@@ -1184,11 +1241,13 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
          return null;
       }
 
+      @Override
       public void addFailureListener(final SessionFailureListener listener) {
          // TODO Auto-generated method stub
 
       }
 
+      @Override
       public boolean removeFailureListener(final SessionFailureListener listener) {
          // TODO Auto-generated method stub
          return false;
@@ -1197,6 +1256,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
       /* (non-Javadoc)
        * @see ClientSession#createQueue(org.apache.activemq.artemis.utils.SimpleString, org.apache.activemq.artemis.utils.SimpleString)
        */
+      @Override
       public void createQueue(SimpleString address, SimpleString queueName) throws ActiveMQException {
          // TODO Auto-generated method stub
 
@@ -1213,6 +1273,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
       /* (non-Javadoc)
        * @see ClientSession#addMetaData(java.lang.String, java.lang.String)
        */
+      @Override
       public void addMetaData(String key, String data) throws ActiveMQException {
          // TODO Auto-generated method stub
 
@@ -1221,6 +1282,7 @@ public class MessageHeaderTest extends MessageHeaderTestBase {
       /* (non-Javadoc)
        * @see ClientSession#addUniqueMetaData(java.lang.String, java.lang.String)
        */
+      @Override
       public void addUniqueMetaData(String key, String data) throws ActiveMQException {
          // TODO Auto-generated method stub
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/MessageTestBase.java
----------------------------------------------------------------------
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 0cd9031..40e92fd 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
@@ -65,6 +65,7 @@ public abstract class MessageTestBase extends ActiveMQServerTestCase {
       conn.start();
    }
 
+   @Override
    @After
    public void tearDown() throws Exception {
       if (conn != null)

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSBytesMessage.java
----------------------------------------------------------------------
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 232b11f..8e8c6e4 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
@@ -56,6 +56,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
 
    // BytesMessage implementation -----------------------------------
 
+   @Override
    public boolean readBoolean() throws JMSException {
       checkRead();
       try {
@@ -69,6 +70,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public byte readByte() throws JMSException {
       checkRead();
       try {
@@ -82,6 +84,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public int readUnsignedByte() throws JMSException {
       checkRead();
       try {
@@ -95,6 +98,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public short readShort() throws JMSException {
       checkRead();
       try {
@@ -108,6 +112,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public int readUnsignedShort() throws JMSException {
       checkRead();
       try {
@@ -121,6 +126,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public char readChar() throws JMSException {
       checkRead();
       try {
@@ -134,6 +140,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public int readInt() throws JMSException {
       checkRead();
       try {
@@ -147,6 +154,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public long readLong() throws JMSException {
       checkRead();
       try {
@@ -160,6 +168,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public float readFloat() throws JMSException {
       checkRead();
       try {
@@ -173,6 +182,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public double readDouble() throws JMSException {
       checkRead();
       try {
@@ -186,6 +196,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public String readUTF() throws JMSException {
       checkRead();
       try {
@@ -199,6 +210,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public int readBytes(final byte[] value) throws JMSException {
       checkRead();
       try {
@@ -209,6 +221,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public int readBytes(final byte[] value, final int length) throws JMSException {
       checkRead();
       try {
@@ -219,6 +232,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeBoolean(final boolean value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -231,6 +245,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeByte(final byte value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -243,6 +258,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeShort(final short value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -255,6 +271,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeChar(final char value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -267,6 +284,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeInt(final int value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -279,6 +297,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeLong(final long value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -291,6 +310,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeFloat(final float value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -303,6 +323,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeDouble(final double value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -315,6 +336,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeUTF(final String value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -327,6 +349,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeBytes(final byte[] value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -339,6 +362,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeBytes(final byte[] value, final int offset, final int length) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -351,6 +375,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void writeObject(final Object value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("the message body is read-only");
@@ -396,6 +421,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
 
    }
 
+   @Override
    public void reset() throws JMSException {
       try {
          if (bodyWriteOnly) {
@@ -414,6 +440,7 @@ public class SimpleJMSBytesMessage extends SimpleJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public long getBodyLength() throws JMSException {
       checkRead();
       return internalArray.length;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMapMessage.java
----------------------------------------------------------------------
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 6ae217b..f216420 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
@@ -45,6 +45,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    // MapMessage implementation -------------------------------------
 
+   @Override
    public void setBoolean(final String name, final boolean value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -55,6 +56,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setByte(final String name, final byte value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -65,6 +67,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setShort(final String name, final short value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -75,6 +78,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setChar(final String name, final char value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -85,6 +89,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setInt(final String name, final int value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -95,6 +100,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setLong(final String name, final long value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -105,6 +111,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setFloat(final String name, final float value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -115,6 +122,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setDouble(final String name, final double value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -125,6 +133,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setString(final String name, final String value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -135,6 +144,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setBytes(final String name, final byte[] value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -145,6 +155,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setBytes(final String name, final byte[] value, final int offset, final int length) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -163,6 +174,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public void setObject(final String name, final Object value) throws JMSException {
       checkName(name);
       if (bodyReadOnly) {
@@ -205,6 +217,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
 
    }
 
+   @Override
    public boolean getBoolean(final String name) throws JMSException {
       Object value;
 
@@ -225,6 +238,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public byte getByte(final String name) throws JMSException {
       Object value;
 
@@ -245,6 +259,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public short getShort(final String name) throws JMSException {
       Object value;
 
@@ -268,6 +283,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public char getChar(final String name) throws JMSException {
       Object value;
 
@@ -285,6 +301,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public int getInt(final String name) throws JMSException {
       Object value;
 
@@ -311,6 +328,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public long getLong(final String name) throws JMSException {
       Object value;
 
@@ -340,6 +358,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public float getFloat(final String name) throws JMSException {
       Object value;
 
@@ -360,6 +379,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public double getDouble(final String name) throws JMSException {
       Object value;
 
@@ -383,6 +403,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public String getString(final String name) throws JMSException {
       Object value;
 
@@ -424,6 +445,7 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public byte[] getBytes(final String name) throws JMSException {
       Object value;
 
@@ -440,18 +462,21 @@ public class SimpleJMSMapMessage extends SimpleJMSMessage implements MapMessage
       }
    }
 
+   @Override
    public Object getObject(final String name) throws JMSException {
 
       return content.get(name);
 
    }
 
+   @Override
    public Enumeration getMapNames() throws JMSException {
 
       return Collections.enumeration(new HashMap(content).keySet());
 
    }
 
+   @Override
    public boolean itemExists(final String name) throws JMSException {
 
       return content.containsKey(name);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSMessage.java
----------------------------------------------------------------------
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 afdcd63..3f49a5b 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
@@ -52,20 +52,24 @@ public class SimpleJMSMessage implements Message {
 
    private String messageID;
 
+   @Override
    public String getJMSMessageID() throws JMSException {
       return messageID;
    }
 
+   @Override
    public void setJMSMessageID(final String id) throws JMSException {
       messageID = id;
    }
 
    private long timestamp;
 
+   @Override
    public long getJMSTimestamp() throws JMSException {
       return timestamp;
    }
 
+   @Override
    public void setJMSTimestamp(final long timestamp) throws JMSException {
       this.timestamp = timestamp;
    }
@@ -80,6 +84,7 @@ public class SimpleJMSMessage implements Message {
 
    private boolean isCorrelationIDBytes;
 
+   @Override
    public byte[] getJMSCorrelationIDAsBytes() throws JMSException {
       if (!isCorrelationIDBytes) {
          throw new JMSException("CorrelationID is a String for this message");
@@ -87,6 +92,7 @@ public class SimpleJMSMessage implements Message {
       return correlationIDBytes;
    }
 
+   @Override
    public void setJMSCorrelationIDAsBytes(final byte[] correlationID) throws JMSException {
       if (correlationID == null || correlationID.length == 0) {
          throw new JMSException("Please specify a non-zero length byte[]");
@@ -95,11 +101,13 @@ public class SimpleJMSMessage implements Message {
       isCorrelationIDBytes = true;
    }
 
+   @Override
    public void setJMSCorrelationID(final String correlationID) throws JMSException {
       correlationIDString = correlationID;
       isCorrelationIDBytes = false;
    }
 
+   @Override
    public String getJMSCorrelationID() throws JMSException {
 
       return correlationIDString;
@@ -107,20 +115,24 @@ public class SimpleJMSMessage implements Message {
 
    private Destination replyTo;
 
+   @Override
    public Destination getJMSReplyTo() throws JMSException {
       return replyTo;
    }
 
+   @Override
    public void setJMSReplyTo(final Destination replyTo) throws JMSException {
       this.replyTo = replyTo;
    }
 
    private Destination destination;
 
+   @Override
    public Destination getJMSDestination() throws JMSException {
       return destination;
    }
 
+   @Override
    public void setJMSDestination(final Destination destination) throws JMSException {
       if (!ignoreSetDestination) {
          this.destination = destination;
@@ -129,64 +141,77 @@ public class SimpleJMSMessage implements Message {
 
    private int deliveryMode = DeliveryMode.PERSISTENT;
 
+   @Override
    public int getJMSDeliveryMode() throws JMSException {
       return deliveryMode;
    }
 
+   @Override
    public void setJMSDeliveryMode(final int deliveryMode) throws JMSException {
       this.deliveryMode = deliveryMode;
    }
 
    private boolean redelivered;
 
+   @Override
    public boolean getJMSRedelivered() throws JMSException {
       return redelivered;
    }
 
+   @Override
    public void setJMSRedelivered(final boolean redelivered) throws JMSException {
       this.redelivered = redelivered;
    }
 
    private String type;
 
+   @Override
    public String getJMSType() throws JMSException {
       return type;
    }
 
+   @Override
    public void setJMSType(final String type) throws JMSException {
       this.type = type;
    }
 
    private long expiration;
 
+   @Override
    public long getJMSExpiration() throws JMSException {
       return expiration;
    }
 
+   @Override
    public void setJMSExpiration(final long expiration) throws JMSException {
       this.expiration = expiration;
    }
 
    private int priority;
 
+   @Override
    public int getJMSPriority() throws JMSException {
       return priority;
    }
 
+   @Override
    public void setJMSPriority(final int priority) throws JMSException {
       this.priority = priority;
    }
 
    private final Map<String, Object> properties = new HashMap<String, Object>();
 
+   @Override
    public void clearProperties() throws JMSException {
       properties.clear();
    }
 
+   @Override
    public boolean propertyExists(final String name) throws JMSException {
       return properties.containsKey(name);
    }
 
+   @Override
    public boolean getBooleanProperty(final String name) throws JMSException {
       Object prop = properties.get(name);
       if (!(prop instanceof Boolean)) {
@@ -195,6 +220,7 @@ public class SimpleJMSMessage implements Message {
       return ((Boolean) properties.get(name)).booleanValue();
    }
 
+   @Override
    public byte getByteProperty(final String name) throws JMSException {
       Object prop = properties.get(name);
       if (!(prop instanceof Byte)) {
@@ -203,6 +229,7 @@ public class SimpleJMSMessage implements Message {
       return ((Byte) properties.get(name)).byteValue();
    }
 
+   @Override
    public short getShortProperty(final String name) throws JMSException {
       Object prop = properties.get(name);
       if (!(prop instanceof Short)) {
@@ -211,6 +238,7 @@ public class SimpleJMSMessage implements Message {
       return ((Short) properties.get(name)).shortValue();
    }
 
+   @Override
    public int getIntProperty(final String name) throws JMSException {
       Object prop = properties.get(name);
       if (!(prop instanceof Integer)) {
@@ -219,6 +247,7 @@ public class SimpleJMSMessage implements Message {
       return ((Integer) properties.get(name)).intValue();
    }
 
+   @Override
    public long getLongProperty(final String name) throws JMSException {
       Object prop = properties.get(name);
       if (!(prop instanceof Long)) {
@@ -227,6 +256,7 @@ public class SimpleJMSMessage implements Message {
       return ((Long) properties.get(name)).longValue();
    }
 
+   @Override
    public float getFloatProperty(final String name) throws JMSException {
       Object prop = properties.get(name);
       if (!(prop instanceof Float)) {
@@ -235,6 +265,7 @@ public class SimpleJMSMessage implements Message {
       return ((Float) properties.get(name)).floatValue();
    }
 
+   @Override
    public double getDoubleProperty(final String name) throws JMSException {
       Object prop = properties.get(name);
       if (!(prop instanceof Double)) {
@@ -243,6 +274,7 @@ public class SimpleJMSMessage implements Message {
       return ((Double) properties.get(name)).doubleValue();
    }
 
+   @Override
    public String getStringProperty(final String name) throws JMSException {
       Object prop = properties.get(name);
       if (!(prop instanceof String)) {
@@ -251,53 +283,66 @@ public class SimpleJMSMessage implements Message {
       return (String) properties.get(name);
    }
 
+   @Override
    public Object getObjectProperty(final String name) throws JMSException {
       return properties.get(name);
    }
 
+   @Override
    public Enumeration getPropertyNames() throws JMSException {
       return Collections.enumeration(properties.keySet());
    }
 
+   @Override
    public void setBooleanProperty(final String name, final boolean value) throws JMSException {
       properties.put(name, new Boolean(value));
    }
 
+   @Override
    public void setByteProperty(final String name, final byte value) throws JMSException {
       properties.put(name, new Byte(value));
    }
 
+   @Override
    public void setShortProperty(final String name, final short value) throws JMSException {
       properties.put(name, new Short(value));
    }
 
+   @Override
    public void setIntProperty(final String name, final int value) throws JMSException {
       properties.put(name, new Integer(value));
    }
 
+   @Override
    public void setLongProperty(final String name, final long value) throws JMSException {
       properties.put(name, new Long(value));
    }
 
+   @Override
    public void setFloatProperty(final String name, final float value) throws JMSException {
       properties.put(name, new Float(value));
    }
 
+   @Override
    public void setDoubleProperty(final String name, final double value) throws JMSException {
       properties.put(name, new Double(value));
    }
 
+   @Override
    public void setStringProperty(final String name, final String value) throws JMSException {
       properties.put(name, value);
    }
 
+   @Override
    public void setObjectProperty(final String name, final Object value) throws JMSException {
       properties.put(name, value);
    }
 
+   @Override
    public void acknowledge() throws JMSException {
    }
 
+   @Override
    public void clearBody() throws JMSException {
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSObjectMessage.java
----------------------------------------------------------------------
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 32987d9..fcce6c2 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
@@ -34,10 +34,12 @@ public class SimpleJMSObjectMessage extends SimpleJMSMessage implements ObjectMe
 
    // ObjectMessage implementation ----------------------------------
 
+   @Override
    public void setObject(final Serializable object) throws JMSException {
       this.object = object;
    }
 
+   @Override
    public Serializable getObject() throws JMSException {
       return object;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSStreamMessage.java
----------------------------------------------------------------------
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 23a4e8d..ca63cef 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
@@ -58,6 +58,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
 
    // StreamMessage implementation ----------------------------------
 
+   @Override
    public boolean readBoolean() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -89,6 +90,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
 
    }
 
+   @Override
    public byte readByte() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -118,6 +120,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public short readShort() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -151,6 +154,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public char readChar() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -175,6 +179,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public int readInt() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -212,6 +217,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public long readLong() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -253,6 +259,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public float readFloat() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -282,6 +289,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public double readDouble() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -315,6 +323,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public String readString() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -372,6 +381,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public int readBytes(final byte[] value) throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -423,6 +433,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public Object readObject() throws JMSException {
       if (bodyWriteOnly) {
          throw new MessageNotReadableException("The message body is writeonly");
@@ -439,6 +450,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public void writeBoolean(final boolean value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -446,6 +458,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(new Boolean(value));
    }
 
+   @Override
    public void writeByte(final byte value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -453,6 +466,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(new Byte(value));
    }
 
+   @Override
    public void writeShort(final short value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -460,6 +474,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(new Short(value));
    }
 
+   @Override
    public void writeChar(final char value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -467,6 +482,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(new Character(value));
    }
 
+   @Override
    public void writeInt(final int value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -474,6 +490,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(new Integer(value));
    }
 
+   @Override
    public void writeLong(final long value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -481,6 +498,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(new Long(value));
    }
 
+   @Override
    public void writeFloat(final float value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -488,6 +506,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(new Float(value));
    }
 
+   @Override
    public void writeDouble(final double value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -495,6 +514,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(new Double(value));
    }
 
+   @Override
    public void writeString(final String value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -507,6 +527,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public void writeBytes(final byte[] value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -514,6 +535,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(value.clone());
    }
 
+   @Override
    public void writeBytes(final byte[] value, final int offset, final int length) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -530,6 +552,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       content.add(temp);
    }
 
+   @Override
    public void writeObject(final Object value) throws JMSException {
       if (!bodyWriteOnly) {
          throw new MessageNotWriteableException("The message body is readonly");
@@ -572,6 +595,7 @@ public class SimpleJMSStreamMessage extends SimpleJMSMessage implements StreamMe
       }
    }
 
+   @Override
    public void reset() throws JMSException {
       bodyWriteOnly = false;
       position = 0;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
index 2e839df..8860b71 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/message/SimpleJMSTextMessage.java
@@ -40,10 +40,12 @@ public class SimpleJMSTextMessage extends SimpleJMSMessage implements TextMessag
 
    // TextMessage implementation ------------------------------------
 
+   @Override
    public void setText(final String text) throws JMSException {
       this.text = text;
    }
 
+   @Override
    public String getText() throws JMSException {
       return text;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
index 0db8a3b..baf8df8 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/selector/SelectorTest.java
@@ -536,6 +536,7 @@ public class SelectorTest extends ActiveMQServerTestCase {
          final CountDownLatch latch2 = new CountDownLatch(1);
 
          new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   while (true) {
@@ -556,6 +557,7 @@ public class SelectorTest extends ActiveMQServerTestCase {
          }, "consumer thread 1").start();
 
          new Thread(new Runnable() {
+            @Override
             public void run() {
                try {
                   while (true) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
index 0dfd49e..269246b 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMContext.java
@@ -68,10 +68,12 @@ public class InVMContext implements Context, Serializable {
 
    // Context implementation ----------------------------------------
 
+   @Override
    public Object lookup(final Name name) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public Object lookup(String name) throws NamingException {
       name = trimSlashes(name);
       int i = name.indexOf("/");
@@ -96,26 +98,32 @@ public class InVMContext implements Context, Serializable {
       }
    }
 
+   @Override
    public void bind(final Name name, final Object obj) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public void bind(final String name, final Object obj) throws NamingException {
       internalBind(name, obj, false);
    }
 
+   @Override
    public void rebind(final Name name, final Object obj) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public void rebind(final String name, final Object obj) throws NamingException {
       internalBind(name, obj, true);
    }
 
+   @Override
    public void unbind(final Name name) throws NamingException {
       unbind(name.toString());
    }
 
+   @Override
    public void unbind(String name) throws NamingException {
       name = trimSlashes(name);
       int i = name.indexOf("/");
@@ -133,26 +141,32 @@ public class InVMContext implements Context, Serializable {
       }
    }
 
+   @Override
    public void rename(final Name oldName, final Name newName) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public void rename(final String oldName, final String newName) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public NamingEnumeration list(final Name name) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public NamingEnumeration list(final String name) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public NamingEnumeration listBindings(final Name name) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public NamingEnumeration<Binding> listBindings(String contextName) throws NamingException {
       contextName = trimSlashes(contextName);
       if (!"".equals(contextName) && !".".equals(contextName)) {
@@ -172,18 +186,22 @@ public class InVMContext implements Context, Serializable {
       return new NamingEnumerationImpl(l.iterator());
    }
 
+   @Override
    public void destroySubcontext(final Name name) throws NamingException {
       destroySubcontext(name.toString());
    }
 
+   @Override
    public void destroySubcontext(final String name) throws NamingException {
       map.remove(trimSlashes(name));
    }
 
+   @Override
    public Context createSubcontext(final Name name) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public Context createSubcontext(String name) throws NamingException {
       name = trimSlashes(name);
       if (map.get(name) != null) {
@@ -194,47 +212,58 @@ public class InVMContext implements Context, Serializable {
       return c;
    }
 
+   @Override
    public Object lookupLink(final Name name) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public Object lookupLink(final String name) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public NameParser getNameParser(final Name name) throws NamingException {
       return getNameParser(name.toString());
    }
 
+   @Override
    public NameParser getNameParser(final String name) throws NamingException {
       return parser;
    }
 
+   @Override
    public Name composeName(final Name name, final Name prefix) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public String composeName(final String name, final String prefix) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public Object addToEnvironment(final String propName, final Object propVal) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public Object removeFromEnvironment(final String propName) throws NamingException {
       throw new UnsupportedOperationException();
    }
 
+   @Override
    public Hashtable<String, String> getEnvironment() throws NamingException {
       Hashtable<String, String> env = new Hashtable<String, String>();
       env.put("java.naming.factory.initial", InVMInitialContextFactory.class.getCanonicalName());
       return env;
    }
 
+   @Override
    public void close() throws NamingException {
    }
 
+   @Override
    public String getNameInNamespace() throws NamingException {
       return nameInNamespace;
    }
@@ -292,22 +321,27 @@ public class InVMContext implements Context, Serializable {
          iterator = bindingIterator;
       }
 
+      @Override
       public void close() throws NamingException {
          throw new UnsupportedOperationException();
       }
 
+      @Override
       public boolean hasMore() throws NamingException {
          return iterator.hasNext();
       }
 
+      @Override
       public Binding next() throws NamingException {
          return iterator.next();
       }
 
+      @Override
       public boolean hasMoreElements() {
          return iterator.hasNext();
       }
 
+      @Override
       public Binding nextElement() {
          return iterator.next();
       }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
index e323f46..ce8c2cf 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactory.java
@@ -58,6 +58,7 @@ public class InVMInitialContextFactory implements InitialContextFactory {
 
    // Public --------------------------------------------------------
 
+   @Override
    public Context getInitialContext(final Hashtable environment) throws NamingException {
       // try first in the environment passed as argument ...
       String s = (String) environment.get(Constants.SERVER_INDEX_PROPERTY_NAME);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
index b61639a..66eba9f 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMInitialContextFactoryBuilder.java
@@ -40,6 +40,7 @@ public class InVMInitialContextFactoryBuilder implements InitialContextFactoryBu
 
    // InitialContextFactoryBuilder implementation --------------------------------------------------
 
+   @Override
    public InitialContextFactory createInitialContextFactory(final Hashtable environment) throws NamingException {
 
       InitialContextFactory icf = null;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
index 2fe13bf..fa006b3 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/InVMNameParser.java
@@ -50,6 +50,7 @@ public class InVMNameParser implements NameParser, Serializable {
       return InVMNameParser.syntax;
    }
 
+   @Override
    public Name parse(final String name) throws NamingException {
       return new CompoundName(name, InVMNameParser.syntax);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
----------------------------------------------------------------------
diff --git a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
index 165b332..e4b615d 100644
--- a/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
+++ b/tests/jms-tests/src/test/java/org/apache/activemq/artemis/jms/tests/tools/container/LocalTestServer.java
@@ -81,10 +81,12 @@ public class LocalTestServer implements Server, Runnable {
 
    // Server implementation ------------------------------------------------------------------------
 
+   @Override
    public int getServerID() {
       return serverIndex;
    }
 
+   @Override
    public synchronized void start(final HashMap<String, Object> configuration,
                                   final boolean clearJournal) throws Exception {
       if (isStarted()) {
@@ -133,6 +135,7 @@ public class LocalTestServer implements Server, Runnable {
       return directory.delete();
    }
 
+   @Override
    public synchronized boolean stop() throws Exception {
       jmsServerManager.stop();
       started = false;
@@ -141,25 +144,30 @@ public class LocalTestServer implements Server, Runnable {
       return true;
    }
 
+   @Override
    public void ping() throws Exception {
       if (!isStarted()) {
          throw new RuntimeException("ok");
       }
    }
 
+   @Override
    public synchronized void kill() throws Exception {
       stop();
    }
 
+   @Override
    public synchronized boolean isStarted() throws Exception {
       return started;
    }
 
+   @Override
    public synchronized void startServerPeer() throws Exception {
       System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, "" + getServerID());
       getActiveMQServer().start();
    }
 
+   @Override
    public synchronized void stopServerPeer() throws Exception {
       System.setProperty(Constants.SERVER_INDEX_PROPERTY_NAME, "" + getServerID());
       getActiveMQServer().stop();
@@ -179,48 +187,58 @@ public class LocalTestServer implements Server, Runnable {
    /**
     * Only for in-VM use!
     */
+   @Override
    public ActiveMQServer getServerPeer() {
       return getActiveMQServer();
    }
 
+   @Override
    public void destroyQueue(final String name, final String jndiName) throws Exception {
       getJMSServerManager().destroyQueue(name);
    }
 
+   @Override
    public void destroyTopic(final String name, final String jndiName) throws Exception {
       getJMSServerManager().destroyTopic(name);
    }
 
+   @Override
    public void createQueue(final String name, final String jndiName) throws Exception {
       getJMSServerManager().createQueue(true, name, null, true, "/queue/" + (jndiName != null ? jndiName : name));
    }
 
+   @Override
    public void createTopic(final String name, final String jndiName) throws Exception {
       getJMSServerManager().createTopic(true, name, "/topic/" + (jndiName != null ? jndiName : name));
    }
 
+   @Override
    public void deployConnectionFactory(final String clientId,
                                        final String objectName,
                                        final String... jndiBindings) throws Exception {
       deployConnectionFactory(clientId, JMSFactoryType.CF, objectName, -1, -1, -1, -1, false, false, -1, false, jndiBindings);
    }
 
+   @Override
    public void deployConnectionFactory(final String objectName,
                                        final int consumerWindowSize,
                                        final String... jndiBindings) throws Exception {
       deployConnectionFactory(null, JMSFactoryType.CF, objectName, consumerWindowSize, -1, -1, -1, false, false, -1, false, jndiBindings);
    }
 
+   @Override
    public void deployConnectionFactory(final String objectName, final String... jndiBindings) throws Exception {
       deployConnectionFactory(null, JMSFactoryType.CF, objectName, -1, -1, -1, -1, false, false, -1, false, jndiBindings);
    }
 
+   @Override
    public void deployConnectionFactory(final String objectName,
                                        JMSFactoryType type,
                                        final String... jndiBindings) throws Exception {
       deployConnectionFactory(null, type, objectName, -1, -1, -1, -1, false, false, -1, false, jndiBindings);
    }
 
+   @Override
    public void deployConnectionFactory(final String objectName,
                                        final int prefetchSize,
                                        final int defaultTempQueueFullSize,
@@ -230,6 +248,7 @@ public class LocalTestServer implements Server, Runnable {
       this.deployConnectionFactory(null, JMSFactoryType.CF, objectName, prefetchSize, defaultTempQueueFullSize, defaultTempQueuePageSize, defaultTempQueueDownCacheSize, false, false, -1, false, jndiBindings);
    }
 
+   @Override
    public void deployConnectionFactory(final String objectName,
                                        final boolean supportsFailover,
                                        final boolean supportsLoadBalancing,
@@ -237,6 +256,7 @@ public class LocalTestServer implements Server, Runnable {
       this.deployConnectionFactory(null, JMSFactoryType.CF, objectName, -1, -1, -1, -1, supportsFailover, supportsLoadBalancing, -1, false, jndiBindings);
    }
 
+   @Override
    public void deployConnectionFactory(final String clientId,
                                        final JMSFactoryType type,
                                        final String objectName,
@@ -258,10 +278,12 @@ public class LocalTestServer implements Server, Runnable {
       getJMSServerManager().createConnectionFactory(objectName, false, type, connectors, clientId, ActiveMQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, ActiveMQClient.DEFAULT_CONNECTION_TTL, ActiveMQClient.DEFAULT_CALL_TIMEOUT, ActiveMQClient.DEFAULT_CALL_FAILOVER_TIMEOUT, ActiveMQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, ActiveMQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, ActiveMQClient.DEFAULT_COMPRESS_LARGE_MESSAGES, prefetchSize, ActiveMQClient.DEFAULT_CONSUMER_MAX_RATE, ActiveMQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, ActiveMQClient.DEFAULT_PRODUCER_WINDOW_SIZE, ActiveMQClient.DEFAULT_PRODUCER_MAX_RATE, blockOnAcknowledge, true, true, ActiveMQClient.DEFAULT_AUTO_GROUP, ActiveMQClient.DEFAULT_PRE_ACKNOWLEDGE, ActiveMQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, ActiveMQClient.DEFAULT_ACK_BATCH_SIZE, dupsOkBatchSize, ActiveMQClient.DEFAULT_USE_GLOBAL_POOLS, ActiveMQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, ActiveMQClient.DEFAULT_THREAD_POOL_MAX_SIZE, ActiveMQClient
 .DEFAULT_RETRY_INTERVAL, ActiveMQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, ActiveMQClient.DEFAULT_MAX_RETRY_INTERVAL, ActiveMQClient.DEFAULT_RECONNECT_ATTEMPTS, ActiveMQClient.DEFAULT_FAILOVER_ON_INITIAL_CONNECTION, null, jndiBindings);
    }
 
+   @Override
    public void undeployConnectionFactory(final String objectName) throws Exception {
       getJMSServerManager().destroyConnectionFactory(objectName);
    }
 
+   @Override
    public void configureSecurityForDestination(final String destName,
                                                final boolean isQueue,
                                                final Set<Role> roles) throws Exception {
@@ -282,14 +304,17 @@ public class LocalTestServer implements Server, Runnable {
 
    // Private --------------------------------------------------------------------------------------
 
+   @Override
    public ActiveMQServer getActiveMQServer() {
       return jmsServerManager.getActiveMQServer();
    }
 
+   @Override
    public JMSServerManager getJMSServerManager() {
       return jmsServerManager;
    }
 
+   @Override
    public InitialContext getInitialContext() throws Exception {
       Properties props = new Properties();
       props.setProperty("java.naming.factory.initial", "org.apache.activemq.artemis.jms.tests.tools.container.InVMInitialContextFactory");
@@ -297,6 +322,7 @@ public class LocalTestServer implements Server, Runnable {
       return new InitialContext(props);
    }
 
+   @Override
    public void run() {
       //  bootstrap.run();
 
@@ -315,6 +341,7 @@ public class LocalTestServer implements Server, Runnable {
       }
    }
 
+   @Override
    public void removeAllMessages(final String destination, final boolean isQueue) throws Exception {
       if (isQueue) {
          JMSQueueControl queue = (JMSQueueControl) getActiveMQServer().getManagementService().getResource(ResourceNames.JMS_QUEUE + destination);
@@ -326,6 +353,7 @@ public class LocalTestServer implements Server, Runnable {
       }
    }
 
+   @Override
    public List<String> listAllSubscribersForTopic(final String s) throws Exception {
       ObjectName objectName = ObjectNameBuilder.DEFAULT.getJMSTopicObjectName(s);
       TopicControl topic = MBeanServerInvocationHandler.newProxyInstance(ManagementFactory.getPlatformMBeanServer(), objectName, TopicControl.class, false);
@@ -338,10 +366,12 @@ public class LocalTestServer implements Server, Runnable {
       return subs;
    }
 
+   @Override
    public Set<Role> getSecurityConfig() throws Exception {
       return getActiveMQServer().getSecurityRepository().getMatch("*");
    }
 
+   @Override
    public void setSecurityConfig(final Set<Role> defConfig) throws Exception {
       getActiveMQServer().getSecurityRepository().removeMatch("#");
       getActiveMQServer().getSecurityRepository().addMatch("#", defConfig);


Mime
View raw message