activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [33/42] activemq-artemis git commit: Add missing @Override annotations
Date Mon, 07 Dec 2015 18:39:45 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
index 6dcd351..7d069c2 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManager.java
@@ -130,6 +130,7 @@ class StompProtocolManager implements ProtocolManager<StompFrameInterceptor>, No
 
    // ProtocolManager implementation --------------------------------
 
+   @Override
    public ConnectionEntry createConnectionEntry(final Acceptor acceptorUsed, final Connection connection) {
       StompConnection conn = new StompConnection(acceptorUsed, connection, this);
 
@@ -157,9 +158,11 @@ class StompProtocolManager implements ProtocolManager<StompFrameInterceptor>, No
       }
    }
 
+   @Override
    public void removeHandler(String name) {
    }
 
+   @Override
    public void handleBuffer(final RemotingConnection connection, final ActiveMQBuffer buffer) {
       StompConnection conn = (StompConnection) connection;
 
@@ -267,6 +270,7 @@ class StompProtocolManager implements ProtocolManager<StompFrameInterceptor>, No
 
       // Close the session outside of the lock on the StompConnection, otherwise it could dead lock
       this.executor.execute(new Runnable() {
+         @Override
          public void run() {
             StompSession session = sessions.remove(connection.getID());
             if (session != null) {
@@ -302,6 +306,7 @@ class StompProtocolManager implements ProtocolManager<StompFrameInterceptor>, No
 
    public void sendReply(final StompConnection connection, final StompFrame frame) {
       server.getStorageManager().afterCompleteOperations(new IOCallback() {
+         @Override
          public void onError(final int errorCode, final String errorMessage) {
             ActiveMQServerLogger.LOGGER.errorProcessingIOCallback(errorCode, errorMessage);
 
@@ -311,6 +316,7 @@ class StompProtocolManager implements ProtocolManager<StompFrameInterceptor>, No
             send(connection, error);
          }
 
+         @Override
          public void done() {
             send(connection, frame);
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManagerFactory.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManagerFactory.java
index 328a74e..2d41e03 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManagerFactory.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompProtocolManagerFactory.java
@@ -34,6 +34,7 @@ public class StompProtocolManagerFactory extends AbstractProtocolManagerFactory<
 
    private static final String[] SUPPORTED_PROTOCOLS = {STOMP_PROTOCOL_NAME};
 
+   @Override
    public ProtocolManager createProtocolManager(final ActiveMQServer server,
                                                 final List<StompFrameInterceptor> incomingInterceptors,
                                                 List<StompFrameInterceptor> outgoingInterceptors) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
index 227b233..2b1eaa6 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompSession.java
@@ -86,12 +86,15 @@ public class StompSession implements SessionCallback {
       return true;
    }
 
+   @Override
    public void sendProducerCreditsMessage(int credits, SimpleString address) {
    }
 
+   @Override
    public void sendProducerCreditsFailMessage(int credits, SimpleString address) {
    }
 
+   @Override
    public int sendMessage(ServerMessage serverMessage, ServerConsumer consumer, int deliveryCount) {
       LargeServerMessageImpl largeMessage = null;
       ServerMessage newServerMessage = serverMessage;
@@ -161,6 +164,7 @@ public class StompSession implements SessionCallback {
 
    }
 
+   @Override
    public int sendLargeMessageContinuation(ServerConsumer consumer,
                                            byte[] body,
                                            boolean continues,
@@ -168,17 +172,21 @@ public class StompSession implements SessionCallback {
       return 0;
    }
 
+   @Override
    public int sendLargeMessage(ServerMessage msg, ServerConsumer consumer, long bodySize, int deliveryCount) {
       return 0;
    }
 
+   @Override
    public void closed() {
    }
 
+   @Override
    public void addReadyListener(final ReadyListener listener) {
       connection.getTransportConnection().addReadyListener(listener);
    }
 
+   @Override
    public void removeReadyListener(final ReadyListener listener) {
       connection.getTransportConnection().removeReadyListener(listener);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompVersions.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompVersions.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompVersions.java
index a2e340d..adf360c 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompVersions.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompVersions.java
@@ -30,6 +30,7 @@ public enum StompVersions {
       this.version = ver;
    }
 
+   @Override
    public String toString() {
       return this.version;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
index f606481..6874173 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v11/StompFrameHandlerV11.java
@@ -695,6 +695,7 @@ public class StompFrameHandlerV11 extends VersionedStompFrameHandler implements
          return true;
       }
 
+      @Override
       protected StompFrame parseBody() throws ActiveMQStompException {
          byte[] content = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java
index 0aeafe4..c774d11 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/v12/StompFrameHandlerV12.java
@@ -244,6 +244,7 @@ public class StompFrameHandlerV12 extends StompFrameHandlerV11 implements FrameE
          return true;
       }
 
+      @Override
       protected StompFrame parseBody() throws ActiveMQStompException {
          byte[] content = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java
index 26ce7fb..667d4a5 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRABytesMessage.java
@@ -51,6 +51,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public long getBodyLength() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getBodyLength()");
@@ -65,6 +66,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public boolean readBoolean() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readBoolean()");
@@ -79,6 +81,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public byte readByte() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readByte()");
@@ -95,6 +98,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The result
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int readBytes(final byte[] value, final int length) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readBytes(" + Arrays.toString(value) + ", " + length + ")");
@@ -110,6 +114,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The result
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int readBytes(final byte[] value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readBytes(" + Arrays.toString(value) + ")");
@@ -124,6 +129,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public char readChar() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readChar()");
@@ -138,6 +144,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public double readDouble() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readDouble()");
@@ -152,6 +159,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public float readFloat() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readFloat()");
@@ -166,6 +174,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int readInt() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readInt()");
@@ -180,6 +189,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public long readLong() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readLong()");
@@ -194,6 +204,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public short readShort() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readShort()");
@@ -208,6 +219,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int readUnsignedByte() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readUnsignedByte()");
@@ -222,6 +234,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int readUnsignedShort() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readUnsignedShort()");
@@ -236,6 +249,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public String readUTF() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("readUTF()");
@@ -249,6 +263,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     *
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void reset() throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("reset()");
@@ -263,6 +278,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeBoolean(final boolean value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeBoolean(" + value + ")");
@@ -277,6 +293,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeByte(final byte value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeByte(" + value + ")");
@@ -293,6 +310,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param length The length
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeBytes(final byte[] value, final int offset, final int length) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeBytes(" + Arrays.toString(value) + ", " + offset + ", " + length + ")");
@@ -307,6 +325,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeBytes(final byte[] value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeBytes(" + Arrays.toString(value) + ")");
@@ -321,6 +340,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeChar(final char value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeChar(" + value + ")");
@@ -335,6 +355,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeDouble(final double value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeDouble(" + value + ")");
@@ -349,6 +370,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeFloat(final float value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeFloat(" + value + ")");
@@ -363,6 +385,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeInt(final int value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeInt(" + value + ")");
@@ -377,6 +400,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeLong(final long value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeLong(" + value + ")");
@@ -391,6 +415,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeObject(final Object value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeObject(" + value + ")");
@@ -405,6 +430,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeShort(final short value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeShort(" + value + ")");
@@ -419,6 +445,7 @@ public class ActiveMQRABytesMessage extends ActiveMQRAMessage implements BytesMe
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void writeUTF(final String value) throws JMSException {
       if (ActiveMQRABytesMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("writeUTF(" + value + ")");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java
index 65078c3..2a1b706 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionFactoryImpl.java
@@ -98,6 +98,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     *
     * @param reference The reference
     */
+   @Override
    public void setReference(final Reference reference) {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("setReference(" + reference + ")");
@@ -111,6 +112,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     *
     * @return The reference
     */
+   @Override
    public Reference getReference() {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("getReference()");
@@ -134,6 +136,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public QueueConnection createQueueConnection() throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createQueueConnection()");
@@ -156,6 +159,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public QueueConnection createQueueConnection(final String userName, final String password) throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createQueueConnection(" + userName + ", ****)");
@@ -180,6 +184,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public TopicConnection createTopicConnection() throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createTopicConnection()");
@@ -202,6 +207,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public TopicConnection createTopicConnection(final String userName, final String password) throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createTopicConnection(" + userName + ", ****)");
@@ -225,6 +231,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public Connection createConnection() throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createConnection()");
@@ -247,6 +254,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public Connection createConnection(final String userName, final String password) throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createConnection(" + userName + ", ****)");
@@ -271,6 +279,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public XAQueueConnection createXAQueueConnection() throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createXAQueueConnection()");
@@ -293,6 +302,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public XAQueueConnection createXAQueueConnection(final String userName, final String password) throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createXAQueueConnection(" + userName + ", ****)");
@@ -316,6 +326,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public XATopicConnection createXATopicConnection() throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createXATopicConnection()");
@@ -338,6 +349,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public XATopicConnection createXATopicConnection(final String userName, final String password) throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createXATopicConnection(" + userName + ", ****)");
@@ -361,6 +373,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public XAConnection createXAConnection() throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createXAConnection()");
@@ -383,6 +396,7 @@ public class ActiveMQRAConnectionFactoryImpl implements ActiveMQRAConnectionFact
     * @return The connection
     * @throws JMSException Thrown if the operation fails
     */
+   @Override
    public XAConnection createXAConnection(final String userName, final String password) throws JMSException {
       if (ActiveMQRAConnectionFactoryImpl.trace) {
          ActiveMQRALogger.LOGGER.trace("createXAConnection(" + userName + ", ****)");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java
index e9784aa..bb0d0f3 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionManager.java
@@ -57,6 +57,7 @@ public class ActiveMQRAConnectionManager implements ConnectionManager {
     * @return The connection
     * @throws ResourceException Thrown if there is a problem obtaining the connection
     */
+   @Override
    public Object allocateConnection(final ManagedConnectionFactory mcf,
                                     final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
       if (ActiveMQRAConnectionManager.trace) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java
index 0b9251a..9a22289 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAConnectionMetaData.java
@@ -45,6 +45,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
     *
     * @return The version
     */
+   @Override
    public String getJMSVersion() {
       if (ActiveMQRAConnectionMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSVersion()");
@@ -58,6 +59,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
     *
     * @return The major version
     */
+   @Override
    public int getJMSMajorVersion() {
       if (ActiveMQRAConnectionMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSMajorVersion()");
@@ -71,6 +73,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
     *
     * @return The minor version
     */
+   @Override
    public int getJMSMinorVersion() {
       if (ActiveMQRAConnectionMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSMinorVersion()");
@@ -84,6 +87,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
     *
     * @return The name
     */
+   @Override
    public String getJMSProviderName() {
       if (ActiveMQRAConnectionMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSProviderName()");
@@ -97,6 +101,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
     *
     * @return The version
     */
+   @Override
    public String getProviderVersion() {
       if (ActiveMQRAConnectionMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSProviderName()");
@@ -110,6 +115,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
     *
     * @return The version
     */
+   @Override
    public int getProviderMajorVersion() {
       if (ActiveMQRAConnectionMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getProviderMajorVersion()");
@@ -123,6 +129,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
     *
     * @return The version
     */
+   @Override
    public int getProviderMinorVersion() {
       if (ActiveMQRAConnectionMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getProviderMinorVersion()");
@@ -136,6 +143,7 @@ public class ActiveMQRAConnectionMetaData implements ConnectionMetaData {
     *
     * @return The names
     */
+   @Override
    public Enumeration<Object> getJMSXPropertyNames() {
       Vector<Object> v = new Vector<Object>();
       v.add("JMSXGroupID");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java
index d6eccc7..8a38e45 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRACredential.java
@@ -197,6 +197,7 @@ public class ActiveMQRACredential implements Serializable {
        *
        * @return The credential
        */
+      @Override
       public PasswordCredential run() {
          if (ActiveMQRACredential.trace) {
             ActiveMQRALogger.LOGGER.trace("run()");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java
index c24cdea..7857255 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRALocalTransaction.java
@@ -53,6 +53,7 @@ public class ActiveMQRALocalTransaction implements LocalTransaction {
     *
     * @throws ResourceException Thrown if the operation fails
     */
+   @Override
    public void begin() throws ResourceException {
       if (ActiveMQRALocalTransaction.trace) {
          ActiveMQRALogger.LOGGER.trace("begin()");
@@ -66,6 +67,7 @@ public class ActiveMQRALocalTransaction implements LocalTransaction {
     *
     * @throws ResourceException Thrown if the operation fails
     */
+   @Override
    public void commit() throws ResourceException {
       if (ActiveMQRALocalTransaction.trace) {
          ActiveMQRALogger.LOGGER.trace("commit()");
@@ -91,6 +93,7 @@ public class ActiveMQRALocalTransaction implements LocalTransaction {
     *
     * @throws ResourceException Thrown if the operation fails
     */
+   @Override
    public void rollback() throws ResourceException {
       if (ActiveMQRALocalTransaction.trace) {
          ActiveMQRALogger.LOGGER.trace("rollback()");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
index 9f628ed..800972c 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnection.java
@@ -189,6 +189,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     * @return The connection
     * @throws ResourceException Thrown if an error occurs
     */
+   @Override
    public synchronized Object getConnection(final Subject subject,
                                             final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
@@ -248,6 +249,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     *
     * @throws ResourceException Could not property close the session and connection.
     */
+   @Override
    public void destroy() throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("destroy()");
@@ -314,6 +316,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     *
     * @throws ResourceException Thrown if an error occurs
     */
+   @Override
    public void cleanup() throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("cleanup()");
@@ -343,6 +346,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     * @throws ResourceException     Failed to associate connection.
     * @throws IllegalStateException ManagedConnection in an illegal state.
     */
+   @Override
    public void associateConnection(final Object obj) throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("associateConnection(" + obj + ")");
@@ -433,6 +437,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     *
     * @param l The connection event listener to be added.
     */
+   @Override
    public void addConnectionEventListener(final ConnectionEventListener l) {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("addConnectionEventListener(" + l + ")");
@@ -446,6 +451,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     *
     * @param l The connection event listener to be removed.
     */
+   @Override
    public void removeConnectionEventListener(final ConnectionEventListener l) {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("removeConnectionEventListener(" + l + ")");
@@ -460,6 +466,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     * @return The XAResource for the connection.
     * @throws ResourceException XA transaction not supported
     */
+   @Override
    public XAResource getXAResource() throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("getXAResource()");
@@ -493,6 +500,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     * @return The local transaction for the connection.
     * @throws ResourceException Thrown if operation fails.
     */
+   @Override
    public LocalTransaction getLocalTransaction() throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("getLocalTransaction()");
@@ -514,6 +522,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     * @throws ResourceException     Thrown if the operation fails.
     * @throws IllegalStateException Thrown if the managed connection already is destroyed.
     */
+   @Override
    public ManagedConnectionMetaData getMetaData() throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("getMetaData()");
@@ -532,6 +541,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     * @param out The log writer
     * @throws ResourceException If operation fails
     */
+   @Override
    public void setLogWriter(final PrintWriter out) throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("setLogWriter(" + out + ")");
@@ -544,6 +554,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     * @return Always null
     * @throws ResourceException If operation fails
     */
+   @Override
    public PrintWriter getLogWriter() throws ResourceException {
       if (ActiveMQRAManagedConnection.trace) {
          ActiveMQRALogger.LOGGER.trace("getLogWriter()");
@@ -557,6 +568,7 @@ public final class ActiveMQRAManagedConnection implements ManagedConnection, Exc
     *
     * @param exception The JMS exception
     */
+   @Override
    public void onException(final JMSException exception) {
       if (ActiveMQConnection.EXCEPTION_FAILOVER.equals(exception.getErrorCode())) {
          return;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
index 6f4fdac..e2e7fc0 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAManagedConnectionFactory.java
@@ -92,6 +92,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     * @return javax.resource.cci.ConnectionFactory instance
     * @throws ResourceException Thrown if a connection factory can't be created
     */
+   @Override
    public Object createConnectionFactory() throws ResourceException {
       if (ActiveMQRAManagedConnectionFactory.trace) {
          ActiveMQRALogger.LOGGER.debug("createConnectionFactory()");
@@ -107,6 +108,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     * @return javax.resource.cci.ConnectionFactory instance
     * @throws ResourceException Thrown if a connection factory can't be created
     */
+   @Override
    public Object createConnectionFactory(final ConnectionManager cxManager) throws ResourceException {
       if (ActiveMQRAManagedConnectionFactory.trace) {
          ActiveMQRALogger.LOGGER.trace("createConnectionFactory(" + cxManager + ")");
@@ -132,6 +134,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     * @return The managed connection
     * @throws ResourceException Thrown if a managed connection can't be created
     */
+   @Override
    public ManagedConnection createManagedConnection(final Subject subject,
                                                     final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
       if (ActiveMQRAManagedConnectionFactory.trace) {
@@ -180,6 +183,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     * @return The managed connection
     * @throws ResourceException Thrown if the managed connection can not be found
     */
+   @Override
    public ManagedConnection matchManagedConnections(@SuppressWarnings("rawtypes") final Set connectionSet,
                                                     final Subject subject,
                                                     final ConnectionRequestInfo cxRequestInfo) throws ResourceException {
@@ -233,6 +237,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     * @param out The writer
     * @throws ResourceException Thrown if the writer can't be set
     */
+   @Override
    public void setLogWriter(final PrintWriter out) throws ResourceException {
       if (ActiveMQRAManagedConnectionFactory.trace) {
          ActiveMQRALogger.LOGGER.trace("setLogWriter(" + out + ")");
@@ -245,6 +250,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     * @return The writer
     * @throws ResourceException Thrown if the writer can't be retrieved
     */
+   @Override
    public PrintWriter getLogWriter() throws ResourceException {
       if (ActiveMQRAManagedConnectionFactory.trace) {
          ActiveMQRALogger.LOGGER.trace("getLogWriter()");
@@ -258,6 +264,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     *
     * @return The resource adapter
     */
+   @Override
    public ResourceAdapter getResourceAdapter() {
       if (ActiveMQRAManagedConnectionFactory.trace) {
          ActiveMQRALogger.LOGGER.trace("getResourceAdapter()");
@@ -274,6 +281,7 @@ public final class ActiveMQRAManagedConnectionFactory implements ManagedConnecti
     * @param ra The resource adapter
     * @throws ResourceException Thrown if incorrect resource adapter
     */
+   @Override
    public void setResourceAdapter(final ResourceAdapter ra) throws ResourceException {
       if (ActiveMQRAManagedConnectionFactory.trace) {
          ActiveMQRALogger.LOGGER.trace("setResourceAdapter(" + ra + ")");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
index a507a63..c22cc8d 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMapMessage.java
@@ -53,6 +53,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public boolean getBoolean(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getBoolean(" + name + ")");
@@ -68,6 +69,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public byte getByte(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getByte(" + name + ")");
@@ -83,6 +85,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public byte[] getBytes(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getBytes(" + name + ")");
@@ -98,6 +101,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public char getChar(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getChar(" + name + ")");
@@ -113,6 +117,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public double getDouble(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getDouble(" + name + ")");
@@ -128,6 +133,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public float getFloat(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getFloat(" + name + ")");
@@ -143,6 +149,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int getInt(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getInt(" + name + ")");
@@ -158,6 +165,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public long getLong(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getLong(" + name + ")");
@@ -172,6 +180,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The values
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    @SuppressWarnings("rawtypes")
    public Enumeration getMapNames() throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
@@ -188,6 +197,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Object getObject(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getObject(" + name + ")");
@@ -203,6 +213,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public short getShort(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getShort(" + name + ")");
@@ -218,6 +229,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public String getString(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getString(" + name + ")");
@@ -233,6 +245,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @return True / false
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public boolean itemExists(final String name) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("itemExists(" + name + ")");
@@ -248,6 +261,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setBoolean(final String name, final boolean value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setBoolean(" + name + ", " + value + ")");
@@ -263,6 +277,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setByte(final String name, final byte value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setByte(" + name + ", " + value + ")");
@@ -280,6 +295,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param length The length
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setBytes(final String name, final byte[] value, final int offset, final int length) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setBytes(" + name + ", " + Arrays.toString(value) + ", " + offset + ", " +
@@ -296,6 +312,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setBytes(final String name, final byte[] value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setBytes(" + name + ", " + Arrays.toString(value) + ")");
@@ -311,6 +328,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setChar(final String name, final char value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setChar(" + name + ", " + value + ")");
@@ -326,6 +344,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setDouble(final String name, final double value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setDouble(" + name + ", " + value + ")");
@@ -341,6 +360,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setFloat(final String name, final float value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setFloat(" + name + ", " + value + ")");
@@ -356,6 +376,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setInt(final String name, final int value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setInt(" + name + ", " + value + ")");
@@ -371,6 +392,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setLong(final String name, final long value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setLong(" + name + ", " + value + ")");
@@ -386,6 +408,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setObject(final String name, final Object value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setObject(" + name + ", " + value + ")");
@@ -401,6 +424,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setShort(final String name, final short value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setShort(" + name + ", " + value + ")");
@@ -416,6 +440,7 @@ public class ActiveMQRAMapMessage extends ActiveMQRAMessage implements MapMessag
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setString(final String name, final String value) throws JMSException {
       if (ActiveMQRAMapMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setString(" + name + ", " + value + ")");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
index e9f25ff..7872459 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessage.java
@@ -62,6 +62,7 @@ public class ActiveMQRAMessage implements Message {
     *
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void acknowledge() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("acknowledge()");
@@ -76,6 +77,7 @@ public class ActiveMQRAMessage implements Message {
     *
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void clearBody() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("clearBody()");
@@ -89,6 +91,7 @@ public class ActiveMQRAMessage implements Message {
     *
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void clearProperties() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("clearProperties()");
@@ -104,6 +107,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public boolean getBooleanProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getBooleanProperty(" + name + ")");
@@ -119,6 +123,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public byte getByteProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getByteProperty(" + name + ")");
@@ -134,6 +139,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public double getDoubleProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getDoubleProperty(" + name + ")");
@@ -149,6 +155,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public float getFloatProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getFloatProperty(" + name + ")");
@@ -164,6 +171,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int getIntProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getIntProperty(" + name + ")");
@@ -178,6 +186,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public String getJMSCorrelationID() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSCorrelationID()");
@@ -192,6 +201,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public byte[] getJMSCorrelationIDAsBytes() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSCorrelationIDAsBytes()");
@@ -206,6 +216,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int getJMSDeliveryMode() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSDeliveryMode()");
@@ -220,6 +231,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Destination getJMSDestination() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSDestination()");
@@ -234,6 +246,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public long getJMSExpiration() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSExpiration()");
@@ -248,6 +261,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public String getJMSMessageID() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSMessageID()");
@@ -262,6 +276,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int getJMSPriority() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSPriority()");
@@ -276,6 +291,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public boolean getJMSRedelivered() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSRedelivered()");
@@ -290,6 +306,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Destination getJMSReplyTo() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSReplyTo()");
@@ -304,6 +321,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public long getJMSTimestamp() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSTimestamp()");
@@ -318,6 +336,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public String getJMSType() throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getJMSType()");
@@ -333,6 +352,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public long getLongProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getLongProperty(" + name + ")");
@@ -348,6 +368,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Object getObjectProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getObjectProperty(" + name + ")");
@@ -362,6 +383,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The values
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    @SuppressWarnings("rawtypes")
    public Enumeration getPropertyNames() throws JMSException {
       if (ActiveMQRAMessage.trace) {
@@ -378,6 +400,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public short getShortProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getShortProperty(" + name + ")");
@@ -393,6 +416,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public String getStringProperty(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getStringProperty(" + name + ")");
@@ -408,6 +432,7 @@ public class ActiveMQRAMessage implements Message {
     * @return The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public boolean propertyExists(final String name) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("propertyExists(" + name + ")");
@@ -423,6 +448,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setBooleanProperty(final String name, final boolean value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setBooleanProperty(" + name + ", " + value + ")");
@@ -438,6 +464,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setByteProperty(final String name, final byte value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setByteProperty(" + name + ", " + value + ")");
@@ -453,6 +480,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setDoubleProperty(final String name, final double value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setDoubleProperty(" + name + ", " + value + ")");
@@ -468,6 +496,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setFloatProperty(final String name, final float value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setFloatProperty(" + name + ", " + value + ")");
@@ -483,6 +512,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setIntProperty(final String name, final int value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setIntProperty(" + name + ", " + value + ")");
@@ -497,6 +527,7 @@ public class ActiveMQRAMessage implements Message {
     * @param correlationID The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSCorrelationID(final String correlationID) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSCorrelationID(" + correlationID + ")");
@@ -511,6 +542,7 @@ public class ActiveMQRAMessage implements Message {
     * @param correlationID The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSCorrelationIDAsBytes(final byte[] correlationID) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSCorrelationIDAsBytes(" + Arrays.toString(correlationID) + ")");
@@ -525,6 +557,7 @@ public class ActiveMQRAMessage implements Message {
     * @param deliveryMode The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSDeliveryMode(final int deliveryMode) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSDeliveryMode(" + deliveryMode + ")");
@@ -539,6 +572,7 @@ public class ActiveMQRAMessage implements Message {
     * @param destination The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSDestination(final Destination destination) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSDestination(" + destination + ")");
@@ -553,6 +587,7 @@ public class ActiveMQRAMessage implements Message {
     * @param expiration The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSExpiration(final long expiration) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSExpiration(" + expiration + ")");
@@ -567,6 +602,7 @@ public class ActiveMQRAMessage implements Message {
     * @param id The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSMessageID(final String id) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSMessageID(" + id + ")");
@@ -581,6 +617,7 @@ public class ActiveMQRAMessage implements Message {
     * @param priority The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSPriority(final int priority) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSPriority(" + priority + ")");
@@ -595,6 +632,7 @@ public class ActiveMQRAMessage implements Message {
     * @param redelivered The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSRedelivered(final boolean redelivered) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSRedelivered(" + redelivered + ")");
@@ -609,6 +647,7 @@ public class ActiveMQRAMessage implements Message {
     * @param replyTo The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSReplyTo(final Destination replyTo) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSReplyTo(" + replyTo + ")");
@@ -623,6 +662,7 @@ public class ActiveMQRAMessage implements Message {
     * @param timestamp The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSTimestamp(final long timestamp) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSTimestamp(" + timestamp + ")");
@@ -637,6 +677,7 @@ public class ActiveMQRAMessage implements Message {
     * @param type The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setJMSType(final String type) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setJMSType(" + type + ")");
@@ -652,6 +693,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setLongProperty(final String name, final long value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setLongProperty(" + name + ", " + value + ")");
@@ -667,6 +709,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setObjectProperty(final String name, final Object value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setObjectProperty(" + name + ", " + value + ")");
@@ -682,6 +725,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setShortProperty(final String name, final short value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setShortProperty(" + name + ", " + value + ")");
@@ -697,6 +741,7 @@ public class ActiveMQRAMessage implements Message {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setStringProperty(final String name, final String value) throws JMSException {
       if (ActiveMQRAMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setStringProperty(" + name + ", " + value + ")");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java
index 957cbdc..73ec6c2 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageConsumer.java
@@ -70,6 +70,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
     *
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void close() throws JMSException {
       if (ActiveMQRAMessageConsumer.trace) {
          ActiveMQRALogger.LOGGER.trace("close " + this);
@@ -100,6 +101,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
     * @return The listener
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public MessageListener getMessageListener() throws JMSException {
       if (ActiveMQRAMessageConsumer.trace) {
          ActiveMQRALogger.LOGGER.trace("getMessageListener()");
@@ -116,6 +118,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
     * @param listener The listener
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setMessageListener(final MessageListener listener) throws JMSException {
       session.lock();
       try {
@@ -139,6 +142,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
     * @return The selector
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public String getMessageSelector() throws JMSException {
       if (ActiveMQRAMessageConsumer.trace) {
          ActiveMQRALogger.LOGGER.trace("getMessageSelector()");
@@ -154,6 +158,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
     * @return The message
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Message receive() throws JMSException {
       session.lock();
       try {
@@ -187,6 +192,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
     * @return The message
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Message receive(final long timeout) throws JMSException {
       session.lock();
       try {
@@ -219,6 +225,7 @@ public class ActiveMQRAMessageConsumer implements MessageConsumer {
     * @return The message
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Message receiveNoWait() throws JMSException {
       session.lock();
       try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java
index d6110d5..8ad0736 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageListener.java
@@ -59,6 +59,7 @@ public class ActiveMQRAMessageListener implements MessageListener {
     *
     * @param message The message
     */
+   @Override
    public void onMessage(Message message) {
       if (ActiveMQRAMessageListener.trace) {
          ActiveMQRALogger.LOGGER.trace("onMessage(" + message + ")");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java
index 561245f..41337f6 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMessageProducer.java
@@ -66,6 +66,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     *
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void close() throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("close " + this);
@@ -88,6 +89,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param timeToLive   The time to live
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void send(final Destination destination,
                     final Message message,
                     final int deliveryMode,
@@ -129,6 +131,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param message     The message
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void send(final Destination destination, final Message message) throws JMSException {
       session.lock();
       try {
@@ -158,6 +161,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param timeToLive   The time to live
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void send(final Message message,
                     final int deliveryMode,
                     final int priority,
@@ -195,6 +199,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param message The message
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void send(final Message message) throws JMSException {
       session.lock();
       try {
@@ -221,6 +226,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @return The mode
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int getDeliveryMode() throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("getDeliveryMode()");
@@ -235,6 +241,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @return The destination
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Destination getDestination() throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("getDestination()");
@@ -249,6 +256,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @return True if disable
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public boolean getDisableMessageID() throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("getDisableMessageID()");
@@ -263,6 +271,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @return True if disable
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public boolean getDisableMessageTimestamp() throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("getDisableMessageTimestamp()");
@@ -277,6 +286,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @return The priority
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public int getPriority() throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("getPriority()");
@@ -291,6 +301,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @return The ttl
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public long getTimeToLive() throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("getTimeToLive()");
@@ -305,6 +316,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param deliveryMode The mode
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setDeliveryMode(final int deliveryMode) throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("setDeliveryMode(" + deliveryMode + ")");
@@ -319,6 +331,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setDisableMessageID(final boolean value) throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("setDisableMessageID(" + value + ")");
@@ -333,6 +346,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param value The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setDisableMessageTimestamp(final boolean value) throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("setDisableMessageTimestamp(" + value + ")");
@@ -347,6 +361,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param defaultPriority The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setPriority(final int defaultPriority) throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("setPriority(" + defaultPriority + ")");
@@ -361,6 +376,7 @@ public class ActiveMQRAMessageProducer implements MessageProducer {
     * @param timeToLive The value
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setTimeToLive(final long timeToLive) throws JMSException {
       if (ActiveMQRAMessageProducer.trace) {
          ActiveMQRALogger.LOGGER.trace("setTimeToLive(" + timeToLive + ")");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java
index da33ca9..387b886 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAMetaData.java
@@ -53,6 +53,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
     * @return The name
     * @throws ResourceException Thrown if operation fails
     */
+   @Override
    public String getEISProductName() throws ResourceException {
       if (ActiveMQRAMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getEISProductName()");
@@ -67,6 +68,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
     * @return The version
     * @throws ResourceException Thrown if operation fails
     */
+   @Override
    public String getEISProductVersion() throws ResourceException {
       if (ActiveMQRAMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getEISProductVersion()");
@@ -81,6 +83,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
     * @return The user name
     * @throws ResourceException Thrown if operation fails
     */
+   @Override
    public String getUserName() throws ResourceException {
       if (ActiveMQRAMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getUserName()");
@@ -95,6 +98,7 @@ public class ActiveMQRAMetaData implements ManagedConnectionMetaData {
     * @return The number
     * @throws ResourceException Thrown if operation fails
     */
+   @Override
    public int getMaxConnections() throws ResourceException {
       if (ActiveMQRAMetaData.trace) {
          ActiveMQRALogger.LOGGER.trace("getMaxConnections()");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java
index 340450d..c343917 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAObjectMessage.java
@@ -51,6 +51,7 @@ public class ActiveMQRAObjectMessage extends ActiveMQRAMessage implements Object
     * @return The object
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Serializable getObject() throws JMSException {
       if (ActiveMQRAObjectMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("getObject()");
@@ -65,6 +66,7 @@ public class ActiveMQRAObjectMessage extends ActiveMQRAMessage implements Object
     * @param object The object
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void setObject(final Serializable object) throws JMSException {
       if (ActiveMQRAObjectMessage.trace) {
          ActiveMQRALogger.LOGGER.trace("setObject(" + object + ")");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java
index 8bcf6ec..bfd8227 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueReceiver.java
@@ -50,6 +50,7 @@ public class ActiveMQRAQueueReceiver extends ActiveMQRAMessageConsumer implement
     * @return The queue
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Queue getQueue() throws JMSException {
       if (ActiveMQRAQueueReceiver.trace) {
          ActiveMQRALogger.LOGGER.trace("getQueue()");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java
----------------------------------------------------------------------
diff --git a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java
index 66128ee..90fb8ea 100644
--- a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java
+++ b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/ActiveMQRAQueueSender.java
@@ -51,6 +51,7 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements
     * @return The queue
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public Queue getQueue() throws JMSException {
       if (ActiveMQRAQueueSender.trace) {
          ActiveMQRALogger.LOGGER.trace("getQueue()");
@@ -69,6 +70,7 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements
     * @param timeToLive   The time to live
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void send(final Queue destination,
                     final Message message,
                     final int deliveryMode,
@@ -109,6 +111,7 @@ public class ActiveMQRAQueueSender extends ActiveMQRAMessageProducer implements
     * @param message     The message
     * @throws JMSException Thrown if an error occurs
     */
+   @Override
    public void send(final Queue destination, final Message message) throws JMSException {
       session.lock();
       try {


Mime
View raw message