activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [34/42] activemq-artemis git commit: Add missing @Override annotations
Date Mon, 07 Dec 2015 18:39:46 GMT
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallbackAbstract.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallbackAbstract.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallbackAbstract.java
index 7bf9d0f..de4ed05 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallbackAbstract.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/JournalReaderCallbackAbstract.java
@@ -20,35 +20,45 @@ import org.apache.activemq.artemis.core.journal.RecordInfo;
 
 public class JournalReaderCallbackAbstract implements JournalReaderCallback {
 
+   @Override
    public void markAsDataFile(final JournalFile file) {
    }
 
+   @Override
    public void onReadAddRecord(final RecordInfo info) throws Exception {
    }
 
+   @Override
    public void onReadAddRecordTX(final long transactionID, final RecordInfo recordInfo) throws Exception {
    }
 
+   @Override
    public void onReadCommitRecord(final long transactionID, final int numberOfRecords) throws Exception {
    }
 
+   @Override
    public void onReadDeleteRecord(final long recordID) throws Exception {
    }
 
+   @Override
    public void onReadDeleteRecordTX(final long transactionID, final RecordInfo recordInfo) throws Exception {
    }
 
+   @Override
    public void onReadPrepareRecord(final long transactionID,
                                    final byte[] extraData,
                                    final int numberOfRecords) throws Exception {
    }
 
+   @Override
    public void onReadRollbackRecord(final long transactionID) throws Exception {
    }
 
+   @Override
    public void onReadUpdateRecord(final RecordInfo recordInfo) throws Exception {
    }
 
+   @Override
    public void onReadUpdateRecordTX(final long transactionID, final RecordInfo recordInfo) throws Exception {
    }
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java
index 0efdf8a..7f98ec5 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/SimpleWaitIOCallback.java
@@ -36,10 +36,12 @@ public final class SimpleWaitIOCallback extends SyncIOCompletion {
       return SimpleWaitIOCallback.class.getName();
    }
 
+   @Override
    public void done() {
       latch.countDown();
    }
 
+   @Override
    public void onError(final int errorCode1, final String errorMessage1) {
       this.errorCode = errorCode1;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TransactionCallback.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TransactionCallback.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TransactionCallback.java
index 3084dd5..faef4e8 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TransactionCallback.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/TransactionCallback.java
@@ -40,6 +40,7 @@ public class TransactionCallback implements IOCallback {
       countLatch.countUp();
    }
 
+   @Override
    public void done() {
       countLatch.countDown();
       if (++done == up.get() && delegateCompletion != null) {
@@ -59,6 +60,7 @@ public class TransactionCallback implements IOCallback {
       }
    }
 
+   @Override
    public void onError(final int errorCode, final String errorMessage) {
       this.errorMessage = errorMessage;
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
index be04bc8..2c6f083 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/ByteArrayEncoding.java
@@ -29,14 +29,17 @@ public class ByteArrayEncoding implements EncodingSupport {
 
    // Public --------------------------------------------------------
 
+   @Override
    public void decode(final ActiveMQBuffer buffer) {
       throw new IllegalStateException("operation not supported");
    }
 
+   @Override
    public void encode(final ActiveMQBuffer buffer) {
       buffer.writeBytes(data);
    }
 
+   @Override
    public int getEncodeSize() {
       return data.length;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecord.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecord.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecord.java
index 06444eb..779eb78 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecord.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalDeleteRecord.java
@@ -30,6 +30,7 @@ public class JournalDeleteRecord extends JournalInternalRecord {
       this.id = id;
    }
 
+   @Override
    public void encode(final ActiveMQBuffer buffer) {
       buffer.writeByte(JournalImpl.DELETE_RECORD);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalInternalRecord.java
----------------------------------------------------------------------
diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalInternalRecord.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalInternalRecord.java
index b05f161..0087816 100644
--- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalInternalRecord.java
+++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/impl/dataformat/JournalInternalRecord.java
@@ -33,6 +33,7 @@ public abstract class JournalInternalRecord implements EncodingSupport {
       this.fileID = fileID;
    }
 
+   @Override
    public void decode(final ActiveMQBuffer buffer) {
    }
 
@@ -56,5 +57,6 @@ public abstract class JournalInternalRecord implements EncodingSupport {
       }
    }
 
+   @Override
    public abstract int getEncodeSize();
 }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java
----------------------------------------------------------------------
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java
index e1ec2c6..0747ea8 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisAbstractPlugin.java
@@ -64,6 +64,7 @@ public abstract class ArtemisAbstractPlugin extends AbstractMojo {
 
 
 
+   @Override
    public void execute() throws MojoExecutionException, MojoFailureException {
       if (isIgnore()) {
          getLog().debug("******************************************************************************************************");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java
----------------------------------------------------------------------
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java
index d0ee8fc..44104ba 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisCLIPlugin.java
@@ -94,6 +94,7 @@ public class ArtemisCLIPlugin extends ArtemisAbstractPlugin {
 
    }
 
+   @Override
    protected boolean isIgnore() {
       return ignore;
    }
@@ -124,6 +125,7 @@ public class ArtemisCLIPlugin extends ArtemisAbstractPlugin {
          if (spawn) {
             final Process process = org.apache.activemq.artemis.cli.process.ProcessBuilder.build(name, location, true, args);
             Runtime.getRuntime().addShutdownHook(new Thread() {
+               @Override
                public void run() {
                   process.destroy();
                }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java
----------------------------------------------------------------------
diff --git a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java
index 4ead900..3b00c99 100644
--- a/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java
+++ b/artemis-maven-plugin/src/main/java/org/apache/activemq/artemis/maven/ArtemisDependencyScanPlugin.java
@@ -57,6 +57,7 @@ public class ArtemisDependencyScanPlugin extends ArtemisAbstractPlugin {
    @Parameter
    private File targetFolder;
 
+   @Override
    protected boolean isIgnore() {
       return false;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioContext.java
----------------------------------------------------------------------
diff --git a/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioContext.java b/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioContext.java
index 47e829c..9eb675d 100644
--- a/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioContext.java
+++ b/artemis-native/src/main/java/org/apache/activemq/artemis/jlibaio/LibaioContext.java
@@ -86,6 +86,7 @@ public class LibaioContext<Callback extends SubmitInfo> implements Closeable {
          if (loadLibrary(library)) {
             loaded = true;
             Runtime.getRuntime().addShutdownHook(new Thread() {
+               @Override
                public void run() {
                   shuttingDown.set(true);
                   checkShutdown();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/LibaioTest.java
----------------------------------------------------------------------
diff --git a/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/LibaioTest.java b/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/LibaioTest.java
index f9a1aee..af25dee 100644
--- a/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/LibaioTest.java
+++ b/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/LibaioTest.java
@@ -608,6 +608,7 @@ public class LibaioTest {
    public void testBlockedCallback() throws Exception {
       final LibaioContext blockedContext = new LibaioContext(500, true);
       Thread t = new Thread() {
+         @Override
          public void run() {
             blockedContext.poll();
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/OpenCloseContextTest.java
----------------------------------------------------------------------
diff --git a/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/OpenCloseContextTest.java b/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/OpenCloseContextTest.java
index 432c05f..6c7d69b 100644
--- a/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/OpenCloseContextTest.java
+++ b/artemis-native/src/test/java/org/apache/activemq/artemis/jlibaio/test/OpenCloseContextTest.java
@@ -54,6 +54,7 @@ public class OpenCloseContextTest {
          System.out.println("#test " + i);
          final LibaioContext control = new LibaioContext<>(5, true);
          Thread t = new Thread() {
+            @Override
             public void run() {
                control.poll();
             }
@@ -113,6 +114,7 @@ public class OpenCloseContextTest {
          System.out.println("#test " + i);
          final LibaioContext control = new LibaioContext<>(5, true);
          Thread t = new Thread() {
+            @Override
             public void run() {
                control.poll();
             }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
index ea8582a..0edd6b9 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/ActiveMQProtonRemotingConnection.java
@@ -56,6 +56,7 @@ public class ActiveMQProtonRemotingConnection extends AbstractRemotingConnection
    /*
     * This can be called concurrently by more than one thread so needs to be locked
     */
+   @Override
    public void fail(final ActiveMQException me, String scaleDownTargetNodeID) {
       if (destroyed) {
          return;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java
index cc436f4..990c7d7 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSBytesMessage.java
@@ -186,12 +186,14 @@ public class ServerJMSBytesMessage extends ServerJMSMessage implements BytesMess
       }
    }
 
+   @Override
    public void encode() throws Exception {
       super.encode();
       // this is to make sure we encode the body-length before it's persisted
       getBodyLength();
    }
 
+   @Override
    public void decode() throws Exception {
       super.decode();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
index e41a1a3..52f4f6a 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMapMessage.java
@@ -59,46 +59,57 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
 
    // MapMessage implementation -------------------------------------
 
+   @Override
    public void setBoolean(final String name, final boolean value) throws JMSException {
       map.putBooleanProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setByte(final String name, final byte value) throws JMSException {
       map.putByteProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setShort(final String name, final short value) throws JMSException {
       map.putShortProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setChar(final String name, final char value) throws JMSException {
       map.putCharProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setInt(final String name, final int value) throws JMSException {
       map.putIntProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setLong(final String name, final long value) throws JMSException {
       map.putLongProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setFloat(final String name, final float value) throws JMSException {
       map.putFloatProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setDouble(final String name, final double value) throws JMSException {
       map.putDoubleProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setString(final String name, final String value) throws JMSException {
       map.putSimpleStringProperty(new SimpleString(name), value == null ? null : new SimpleString(value));
    }
 
+   @Override
    public void setBytes(final String name, final byte[] value) throws JMSException {
       map.putBytesProperty(new SimpleString(name), value);
    }
 
+   @Override
    public void setBytes(final String name, final byte[] value, final int offset, final int length) throws JMSException {
       if (offset + length > value.length) {
          throw new JMSException("Invalid offset/length");
@@ -108,6 +119,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       map.putBytesProperty(new SimpleString(name), newBytes);
    }
 
+   @Override
    public void setObject(final String name, final Object value) throws JMSException {
       try {
          TypedProperties.setObjectProperty(new SimpleString(name), value, map);
@@ -117,6 +129,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public boolean getBoolean(final String name) throws JMSException {
       try {
          return map.getBooleanProperty(new SimpleString(name));
@@ -126,6 +139,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public byte getByte(final String name) throws JMSException {
       try {
          return map.getByteProperty(new SimpleString(name));
@@ -135,6 +149,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public short getShort(final String name) throws JMSException {
       try {
          return map.getShortProperty(new SimpleString(name));
@@ -144,6 +159,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public char getChar(final String name) throws JMSException {
       try {
          return map.getCharProperty(new SimpleString(name));
@@ -153,6 +169,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public int getInt(final String name) throws JMSException {
       try {
          return map.getIntProperty(new SimpleString(name));
@@ -162,6 +179,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public long getLong(final String name) throws JMSException {
       try {
          return map.getLongProperty(new SimpleString(name));
@@ -171,6 +189,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public float getFloat(final String name) throws JMSException {
       try {
          return map.getFloatProperty(new SimpleString(name));
@@ -180,6 +199,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public double getDouble(final String name) throws JMSException {
       try {
          return map.getDoubleProperty(new SimpleString(name));
@@ -189,6 +209,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public String getString(final String name) throws JMSException {
       try {
          SimpleString str = map.getSimpleStringProperty(new SimpleString(name));
@@ -204,6 +225,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public byte[] getBytes(final String name) throws JMSException {
       try {
          return map.getBytesProperty(new SimpleString(name));
@@ -213,6 +235,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       }
    }
 
+   @Override
    public Object getObject(final String name) throws JMSException {
       Object val = map.getProperty(new SimpleString(name));
 
@@ -223,6 +246,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       return val;
    }
 
+   @Override
    public Enumeration getMapNames() throws JMSException {
       Set<SimpleString> simplePropNames = map.getPropertyNames();
       Set<String> propNames = new HashSet<String>(simplePropNames.size());
@@ -234,6 +258,7 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       return Collections.enumeration(propNames);
    }
 
+   @Override
    public boolean itemExists(final String name) throws JMSException {
       return map.containsProperty(new SimpleString(name));
    }
@@ -245,11 +270,13 @@ public final class ServerJMSMapMessage extends ServerJMSMessage implements MapMe
       map.clear();
    }
 
+   @Override
    public void encode() throws Exception {
       super.encode();
       writeBodyMap(getWriteBodyBuffer(), map);
    }
 
+   @Override
    public void decode() throws Exception {
       super.decode();
       readBodyMap(getReadBodyBuffer(), map);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java
index afacd21..1686ea7 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSMessage.java
@@ -125,6 +125,7 @@ public class ServerJMSMessage implements Message {
 
    }
 
+   @Override
    public final Destination getJMSDestination() throws JMSException {
       SimpleString sdest = message.getAddress();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java
index 9b70f57..492ae0a 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSStreamMessage.java
@@ -50,6 +50,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
 
    // StreamMessage implementation ----------------------------------
 
+   @Override
    public boolean readBoolean() throws JMSException {
 
       try {
@@ -63,6 +64,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public byte readByte() throws JMSException {
       try {
          return streamReadByte(getReadBodyBuffer());
@@ -75,6 +77,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public short readShort() throws JMSException {
 
       try {
@@ -88,6 +91,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public char readChar() throws JMSException {
 
       try {
@@ -101,6 +105,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public int readInt() throws JMSException {
 
       try {
@@ -114,6 +119,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public long readLong() throws JMSException {
 
       try {
@@ -127,6 +133,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public float readFloat() throws JMSException {
 
       try {
@@ -140,6 +147,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public double readDouble() throws JMSException {
 
       try {
@@ -153,6 +161,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public String readString() throws JMSException {
 
       try {
@@ -171,6 +180,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
     */
    private int len = 0;
 
+   @Override
    public int readBytes(final byte[] value) throws JMSException {
 
       try {
@@ -187,6 +197,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public Object readObject() throws JMSException {
 
       if (getReadBodyBuffer().readerIndex() >= message.getEndOfBodyPosition()) {
@@ -203,60 +214,70 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public void writeBoolean(final boolean value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.BOOLEAN);
       getWriteBodyBuffer().writeBoolean(value);
    }
 
+   @Override
    public void writeByte(final byte value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.BYTE);
       getWriteBodyBuffer().writeByte(value);
    }
 
+   @Override
    public void writeShort(final short value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.SHORT);
       getWriteBodyBuffer().writeShort(value);
    }
 
+   @Override
    public void writeChar(final char value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.CHAR);
       getWriteBodyBuffer().writeShort((short) value);
    }
 
+   @Override
    public void writeInt(final int value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.INT);
       getWriteBodyBuffer().writeInt(value);
    }
 
+   @Override
    public void writeLong(final long value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.LONG);
       getWriteBodyBuffer().writeLong(value);
    }
 
+   @Override
    public void writeFloat(final float value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.FLOAT);
       getWriteBodyBuffer().writeInt(Float.floatToIntBits(value));
    }
 
+   @Override
    public void writeDouble(final double value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.DOUBLE);
       getWriteBodyBuffer().writeLong(Double.doubleToLongBits(value));
    }
 
+   @Override
    public void writeString(final String value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.STRING);
       getWriteBodyBuffer().writeNullableString(value);
    }
 
+   @Override
    public void writeBytes(final byte[] value) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.BYTES);
@@ -264,6 +285,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       getWriteBodyBuffer().writeBytes(value);
    }
 
+   @Override
    public void writeBytes(final byte[] value, final int offset, final int length) throws JMSException {
 
       getWriteBodyBuffer().writeByte(DataConstants.BYTES);
@@ -271,6 +293,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       getWriteBodyBuffer().writeBytes(value, offset, length);
    }
 
+   @Override
    public void writeObject(final Object value) throws JMSException {
       if (value instanceof String) {
          writeString((String) value);
@@ -310,6 +333,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       }
    }
 
+   @Override
    public void reset() throws JMSException {
       getWriteBodyBuffer().resetReaderIndex();
    }
@@ -323,6 +347,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
       getWriteBodyBuffer().clear();
    }
 
+   @Override
    public void decode() throws Exception {
       super.decode();
    }
@@ -330,6 +355,7 @@ public final class ServerJMSStreamMessage extends ServerJMSMessage implements St
    /**
     * Encode the body into the internal message
     */
+   @Override
    public void encode() throws Exception {
       super.encode();
       bodyLength = message.getEndOfBodyPosition();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
index 3191067..a055c8e 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/converter/jms/ServerJMSTextMessage.java
@@ -55,6 +55,7 @@ public class ServerJMSTextMessage extends ServerJMSMessage implements TextMessag
    }
    // TextMessage implementation ------------------------------------
 
+   @Override
    public void setText(final String text) throws JMSException {
       if (text != null) {
          this.text = new SimpleString(text);
@@ -66,6 +67,7 @@ public class ServerJMSTextMessage extends ServerJMSMessage implements TextMessag
       writeBodyText(getWriteBodyBuffer(), this.text);
    }
 
+   @Override
    public String getText() {
       if (text != null) {
          return text.toString();
@@ -82,11 +84,13 @@ public class ServerJMSTextMessage extends ServerJMSMessage implements TextMessag
       text = null;
    }
 
+   @Override
    public void encode() throws Exception {
       super.encode();
       writeBodyText(getWriteBodyBuffer(), text);
    }
 
+   @Override
    public void decode() throws Exception {
       super.decode();
       text = readBodyText(getReadBodyBuffer());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
index 03c6474..64a6232 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/proton/plug/ActiveMQProtonConnectionCallback.java
@@ -88,6 +88,7 @@ public class ActiveMQProtonConnectionCallback implements AMQPConnectionCallback
       this.protonConnectionDelegate = protonConnectionDelegate;
    }
 
+   @Override
    public void onTransport(ByteBuf byteBuf, AMQPConnectionContext amqpConnection) {
       final int size = byteBuf.writerIndex();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManager.java b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManager.java
index a1d9a60..c6fec87 100644
--- a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManager.java
+++ b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientProtocolManager.java
@@ -30,10 +30,12 @@ import org.apache.activemq.artemis.spi.core.remoting.SessionContext;
 public class HornetQClientProtocolManager extends ActiveMQClientProtocolManager {
 
    private static final int VERSION_PLAYED = 123;
+   @Override
    protected void sendHandshake(Connection transportConnection) {
    }
 
 
+   @Override
    protected SessionContext newSessionContext(String name,
                                               int confirmationWindowSize,
                                               Channel sessionChannel,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
index 169a82a..15d3ba1 100644
--- a/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
+++ b/artemis-protocols/artemis-hqclient-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/hornetq/client/HornetQClientSessionContext.java
@@ -49,6 +49,7 @@ public class HornetQClientSessionContext extends ActiveMQSessionContext {
    }
 
 
+   @Override
    public ClientSession.QueueQuery queueQuery(final SimpleString queueName) throws ActiveMQException {
       SessionQueueQueryMessage request = new SessionQueueQueryMessage(queueName);
       SessionQueueQueryResponseMessage response = (SessionQueueQueryResponseMessage) getSessionChannel().sendBlocking(request, PacketImpl.SESS_QUEUEQUERY_RESP);
@@ -56,6 +57,7 @@ public class HornetQClientSessionContext extends ActiveMQSessionContext {
       return response.toQueueQuery();
    }
 
+   @Override
    protected CreateSessionMessage newCreateSession(String username,
                                                    String password,
                                                    int minLargeMessageSize,
@@ -68,12 +70,14 @@ public class HornetQClientSessionContext extends ActiveMQSessionContext {
    }
 
 
+   @Override
    public ClientSession.AddressQuery addressQuery(final SimpleString address) throws ActiveMQException {
       SessionBindingQueryResponseMessage response = (SessionBindingQueryResponseMessage) getSessionChannel().sendBlocking(new SessionBindingQueryMessage(address), PacketImpl.SESS_BINDINGQUERY_RESP);
 
       return new AddressQueryImpl(response.isExists(), response.getQueueNames(), false);
    }
 
+   @Override
    public ClientConsumerInternal createConsumer(SimpleString queueName,
                                                 SimpleString filterString,
                                                 int windowSize,

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
index 7bb12c6..c11bd86 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTConnection.java
@@ -52,6 +52,7 @@ public class MQTTConnection implements RemotingConnection {
       this.destroyed = false;
    }
 
+   @Override
    public Object getID() {
       return transportConnection.getID();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTMessageInfo.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTMessageInfo.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTMessageInfo.java
index ca7110f..ffa6202 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTMessageInfo.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTMessageInfo.java
@@ -46,6 +46,7 @@ class MQTTMessageInfo {
       return address;
    }
 
+   @Override
    public String toString() {
       return ("ServerMessageId: " + serverMessageId + " ConsumerId: " + consumerId + " addr: " + address);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
index 6db86df..c38593c 100644
--- a/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
+++ b/artemis-protocols/artemis-mqtt-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/mqtt/MQTTProtocolHandler.java
@@ -75,6 +75,7 @@ public class MQTTProtocolHandler extends ChannelInboundHandlerAdapter {
       stopped = true;
    }
 
+   @Override
    public void channelRead(ChannelHandlerContext ctx, Object msg) {
       try {
          if (stopped) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
index bda4c22..6d3ff13 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireMessageConverter.java
@@ -102,6 +102,7 @@ public class OpenWireMessageConverter implements MessageConverter {
       return null;
    }
 
+   @Override
    public Object outbound(ServerMessage message, int deliveryCount) {
       // TODO: implement this
       return null;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
index 9b35b90..0ef7669 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManager.java
@@ -155,6 +155,7 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>, No
       return false;
    }
 
+   @Override
    public ProtocolManagerFactory<Interceptor> getFactory() {
       return factory;
    }
@@ -252,10 +253,12 @@ public class OpenWireProtocolManager implements ProtocolManager<Interceptor>, No
 
    public void sendReply(final OpenWireConnection connection, final Command command) {
       server.getStorageManager().afterCompleteOperations(new IOCallback() {
+         @Override
          public void onError(final int errorCode, final String errorMessage) {
             ActiveMQServerLogger.LOGGER.errorProcessingIOCallback(errorCode, errorMessage);
          }
 
+         @Override
          public void done() {
             send(connection, command);
          }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java
index f506f1a..6b3076d 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireProtocolManagerFactory.java
@@ -36,6 +36,7 @@ public class OpenWireProtocolManagerFactory extends AbstractProtocolManagerFacto
 
    private static String[] SUPPORTED_PROTOCOLS = {OPENWIRE_PROTOCOL_NAME};
 
+   @Override
    public ProtocolManager createProtocolManager(final ActiveMQServer server,
                                                 final List<Interceptor> incomingInterceptors,
                                                 List<Interceptor> outgoingInterceptors) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQCompositeConsumerBrokerExchange.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQCompositeConsumerBrokerExchange.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQCompositeConsumerBrokerExchange.java
index e1f1db2..7e83767 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQCompositeConsumerBrokerExchange.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQCompositeConsumerBrokerExchange.java
@@ -31,6 +31,7 @@ public class AMQCompositeConsumerBrokerExchange extends AMQConsumerBrokerExchang
       this.consumerMap = consumerMap;
    }
 
+   @Override
    public void processMessagePull(MessagePull messagePull) throws Exception {
       AMQConsumer amqConsumer = consumerMap.get(messagePull.getDestination());
       if (amqConsumer != null) {
@@ -38,6 +39,7 @@ public class AMQCompositeConsumerBrokerExchange extends AMQConsumerBrokerExchang
       }
    }
 
+   @Override
    public void acknowledge(MessageAck ack) throws Exception {
       AMQConsumer amqConsumer = consumerMap.get(ack.getDestination());
       if (amqConsumer != null) {
@@ -45,6 +47,7 @@ public class AMQCompositeConsumerBrokerExchange extends AMQConsumerBrokerExchang
       }
    }
 
+   @Override
    public void removeConsumer() throws Exception {
       for (AMQConsumer amqConsumer : consumerMap.values()) {
          amqConsumer.removeConsumer();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSession.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSession.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSession.java
index 642eda9..2a39e03 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSession.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQServerSession.java
@@ -88,6 +88,7 @@ public class AMQServerSession extends ServerSessionImpl {
       super(name, username, password, minLargeMessageSize, autoCommitSends, autoCommitAcks, preAcknowledge, persistDeliveryCountBeforeDelivery, xa, connection, storageManager, postOffice, resourceManager, securityStore, managementService, activeMQServerImpl, managementAddress, simpleString, callback, context, new AMQTransactionFactory(), queueCreator);
    }
 
+   @Override
    protected void doClose(final boolean failed) throws Exception {
       synchronized (this) {
          if (tx != null && tx.getXid() == null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSingleConsumerBrokerExchange.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSingleConsumerBrokerExchange.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSingleConsumerBrokerExchange.java
index 7d3b2d1..b29c448 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSingleConsumerBrokerExchange.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSingleConsumerBrokerExchange.java
@@ -28,14 +28,17 @@ public class AMQSingleConsumerBrokerExchange extends AMQConsumerBrokerExchange {
       this.consumer = consumer;
    }
 
+   @Override
    public void processMessagePull(MessagePull messagePull) throws Exception {
       consumer.processMessagePull(messagePull);
    }
 
+   @Override
    public void removeConsumer() throws Exception {
       consumer.removeConsumer();
    }
 
+   @Override
    public void acknowledge(MessageAck ack) throws Exception {
       amqSession.acknowledge(ack, consumer);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java
index 23447a7..023ee4f 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractConnectionContext.java
@@ -68,6 +68,7 @@ public abstract class AbstractConnectionContext extends ProtonInitializable impl
       handler.addEventHandler(listener);
    }
 
+   @Override
    public SASLResult getSASLResult() {
       return handler.getSASLResult();
    }
@@ -88,10 +89,12 @@ public abstract class AbstractConnectionContext extends ProtonInitializable impl
    /**
     * See comment at {@link org.proton.plug.AMQPConnectionContext#isSyncOnFlush()}
     */
+   @Override
    public boolean isSyncOnFlush() {
       return false;
    }
 
+   @Override
    public Object getLock() {
       return handler.getLock();
    }
@@ -106,10 +109,12 @@ public abstract class AbstractConnectionContext extends ProtonInitializable impl
       handler.outputDone(bytes);
    }
 
+   @Override
    public void flush() {
       handler.flush();
    }
 
+   @Override
    public void close() {
       handler.close();
    }
@@ -233,10 +238,12 @@ public abstract class AbstractConnectionContext extends ProtonInitializable impl
          }
       }
 
+      @Override
       public void onRemoteDetach(Link link) throws Exception {
          link.detach();
       }
 
+      @Override
       public void onDelivery(Delivery delivery) throws Exception {
          ProtonDeliveryHandler handler = (ProtonDeliveryHandler) delivery.getLink().getContext();
          if (handler != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
index 64fd49e..baf0710 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonContextSender.java
@@ -49,6 +49,7 @@ public abstract class AbstractProtonContextSender extends ProtonInitializable im
       this.sessionSPI = server;
    }
 
+   @Override
    public void onFlow(int credits) {
       this.creditsSemaphore.setCredits(credits);
    }
@@ -64,6 +65,7 @@ public abstract class AbstractProtonContextSender extends ProtonInitializable im
    /*
    * close the session
    * */
+   @Override
    public void close() throws ActiveMQAMQPException {
       closed = true;
       protonSession.removeSender(sender);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java
index 348f01e..00d1c67 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/AbstractProtonSessionContext.java
@@ -59,6 +59,7 @@ public abstract class AbstractProtonSessionContext extends ProtonInitializable i
       this.session = session;
    }
 
+   @Override
    public void initialise() throws Exception {
       if (!isInitialized()) {
          super.initialise();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java
index b8d9ee1..5e5115f 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/ProtonTransactionHandler.java
@@ -110,6 +110,7 @@ public class ProtonTransactionHandler implements ProtonDeliveryHandler {
       }
    }
 
+   @Override
    public void onFlow(int credits) {
 
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java
index a35ebab..63e9250 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContext.java
@@ -43,6 +43,7 @@ public class ProtonClientConnectionContext extends AbstractConnectionContext imp
    }
 
    // Maybe a client interface?
+   @Override
    public void clientOpen(ClientSASL sasl) throws Exception {
       FutureRunnable future = new FutureRunnable(1);
       synchronized (handler.getLock()) {
@@ -58,6 +59,7 @@ public class ProtonClientConnectionContext extends AbstractConnectionContext imp
       waitWithTimeout(future);
    }
 
+   @Override
    public AMQPClientSessionContext createClientSession() throws ActiveMQAMQPException {
 
       FutureRunnable futureRunnable = new FutureRunnable(1);

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java
index 2f12043..8bc54c5 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientConnectionContextFactory.java
@@ -28,6 +28,7 @@ public class ProtonClientConnectionContextFactory extends AMQPConnectionContextF
       return theInstance;
    }
 
+   @Override
    public AMQPConnectionContext createConnection(AMQPConnectionCallback connectionCallback) {
       return new ProtonClientConnectionContext(connectionCallback);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java
index 924ca3f..e03c99d 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientContext.java
@@ -51,6 +51,7 @@ public class ProtonClientContext extends AbstractProtonContextSender implements
       }
    }
 
+   @Override
    public void send(ProtonJMessage message) {
       if (sender.getSenderSettleMode() != SenderSettleMode.SETTLED) {
          catchUpRunnable.countUp();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java
index fca6d8e..ca8dc98 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientReceiverContext.java
@@ -45,6 +45,7 @@ public class ProtonClientReceiverContext extends AbstractProtonReceiverContext i
       super(sessionSPI, connection, protonSession, receiver);
    }
 
+   @Override
    public void onFlow(int credits) {
    }
 
@@ -56,6 +57,7 @@ public class ProtonClientReceiverContext extends AbstractProtonReceiverContext i
    * This may be called more than once per deliver so we have to cache the buffer until we have received it all.
    *
    * */
+   @Override
    public void onMessage(Delivery delivery) throws ActiveMQAMQPException {
       ByteBuf buffer = PooledByteBufAllocator.DEFAULT.heapBuffer(1024);
       try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java
index 04febda..3b07a40 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/client/ProtonClientSessionContext.java
@@ -39,6 +39,7 @@ public class ProtonClientSessionContext extends AbstractProtonSessionContext imp
       super(sessionSPI, connection, session);
    }
 
+   @Override
    public AMQPClientSenderContext createSender(String address, boolean preSettled) throws ActiveMQAMQPException {
       FutureRunnable futureRunnable = new FutureRunnable(1);
 
@@ -61,6 +62,7 @@ public class ProtonClientSessionContext extends AbstractProtonSessionContext imp
       return amqpSender;
    }
 
+   @Override
    public AMQPClientReceiverContext createReceiver(String address) throws ActiveMQAMQPException {
       FutureRunnable futureRunnable = new FutureRunnable(1);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
index 2dae0e6..e4e554d 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContext.java
@@ -41,6 +41,7 @@ public class ProtonServerConnectionContext extends AbstractConnectionContext imp
       super(connectionSP, idleTimeout, maxFrameSize, channelMax);
    }
 
+   @Override
    protected AbstractProtonSessionContext newSessionExtension(Session realSession) throws ActiveMQAMQPException {
       AMQPSessionCallback sessionSPI = connectionCallback.createSessionCallback(this);
       AbstractProtonSessionContext protonSession = new ProtonServerSessionContext(sessionSPI, this, realSession);
@@ -48,6 +49,7 @@ public class ProtonServerConnectionContext extends AbstractConnectionContext imp
       return protonSession;
    }
 
+   @Override
    protected void remoteLinkOpened(Link link) throws Exception {
 
       ProtonServerSessionContext protonSession = (ProtonServerSessionContext) getSessionExtension(link.getSession());

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java
index 8724233..0c5c95f 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerConnectionContextFactory.java
@@ -32,6 +32,7 @@ public class ProtonServerConnectionContextFactory extends AMQPConnectionContextF
       return theInstance;
    }
 
+   @Override
    public AMQPServerConnectionContext createConnection(AMQPConnectionCallback connectionCallback) {
       return createConnection(connectionCallback, DEFAULT_IDLE_TIMEOUT, DEFAULT_MAX_FRAME_SIZE, DEFAULT_CHANNEL_MAX);
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java
index bbbfd75..c0c1ea3 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerReceiverContext.java
@@ -45,6 +45,7 @@ public class ProtonServerReceiverContext extends AbstractProtonReceiverContext {
       super(sessionSPI, connection, protonSession, receiver);
    }
 
+   @Override
    public void onFlow(int credits) {
    }
 
@@ -94,6 +95,7 @@ public class ProtonServerReceiverContext extends AbstractProtonReceiverContext {
    * This may be called more than once per deliver so we have to cache the buffer until we have received it all.
    *
    * */
+   @Override
    public void onMessage(Delivery delivery) throws ActiveMQAMQPException {
       Receiver receiver;
       try {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
index 71efa3c..db8b409 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSenderContext.java
@@ -57,6 +57,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
       return brokerConsumer;
    }
 
+   @Override
    public void onFlow(int currentCredits) {
       super.onFlow(currentCredits);
       sessionSPI.onFlowConsumer(brokerConsumer, currentCredits);
@@ -65,6 +66,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
    /*
 * start the session
 * */
+   @Override
    public void start() throws ActiveMQAMQPException {
       super.start();
       // protonSession.getServerSession().start();
@@ -145,6 +147,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
    /*
    * close the session
    * */
+   @Override
    public void close() throws ActiveMQAMQPException {
       super.close();
       try {
@@ -156,6 +159,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
       }
    }
 
+   @Override
    public void onMessage(Delivery delivery) throws ActiveMQAMQPException {
       Object message = delivery.getContext();
 
@@ -215,6 +219,7 @@ public class ProtonServerSenderContext extends AbstractProtonContextSender imple
    /**
     * handle an out going message from ActiveMQ Artemis, send via the Proton Sender
     */
+   @Override
    public int deliverMessage(Object message, int deliveryCount) throws Exception {
       if (closed) {
          System.err.println("Message can't be delivered as it's closed");

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java
index bbeeebd..adfacae 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/context/server/ProtonServerSessionContext.java
@@ -84,6 +84,7 @@ public class ProtonServerSessionContext extends AbstractProtonSessionContext {
       }
    }
 
+   @Override
    public void removeSender(Sender sender) throws ActiveMQAMQPException {
       ProtonServerSenderContext senderRemoved = (ProtonServerSenderContext) senders.remove(sender);
       if (senderRemoved != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java
index f7f8f92..1fac0dd 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/handler/impl/ProtonHandlerImpl.java
@@ -89,6 +89,7 @@ public class ProtonHandlerImpl extends ProtonInitializable implements ProtonHand
       }
    }
 
+   @Override
    public Object getLock() {
       return lock;
    }
@@ -229,6 +230,7 @@ public class ProtonHandlerImpl extends ProtonInitializable implements ProtonHand
       }
    }
 
+   @Override
    public void createClientSasl(ClientSASL clientSASL) {
       if (clientSASL != null) {
          clientSasl = transport.sasl();

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java
index 341e7d8..59685ad 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/sasl/ClientSASLPlain.java
@@ -32,10 +32,12 @@ public class ClientSASLPlain implements ClientSASL {
       this.password = password;
    }
 
+   @Override
    public String getName() {
       return "PLAIN";
    }
 
+   @Override
    public byte[] getBytes() {
 
       if (username == null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java
index d878262..20095ff 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/FutureRunnable.java
@@ -30,6 +30,7 @@ public class FutureRunnable implements Runnable {
       this(0);
    }
 
+   @Override
    public void run() {
       latch.countDown();
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java
index 9c69147..ff9ccca 100644
--- a/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java
+++ b/artemis-protocols/artemis-proton-plug/src/main/java/org/proton/plug/util/ProtonServerMessage.java
@@ -122,6 +122,7 @@ public class ProtonServerMessage implements ProtonJMessage {
       encode(writableBuffer);
    }
 
+   @Override
    public int encode(WritableBuffer writableBuffer) {
       final int firstPosition = writableBuffer.position();
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
index e8be646..317f3ad 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/ProtonTest.java
@@ -77,6 +77,7 @@ public class ProtonTest extends AbstractJMSTest {
       connection = createConnection();
    }
 
+   @Override
    @After
    public void tearDown() throws Exception {
       if (connection != null) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java
index 27271e4..aff0fa1 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/invm/ProtonINVMSPI.java
@@ -43,11 +43,13 @@ public class ProtonINVMSPI implements AMQPConnectionCallback {
 
    public ProtonINVMSPI() {
       mainExecutor.execute(new Runnable() {
+         @Override
          public void run() {
             Thread.currentThread().setName("MainExecutor-INVM");
          }
       });
       returningExecutor.execute(new Runnable() {
+         @Override
          public void run() {
             Thread.currentThread().setName("ReturningExecutor-INVM");
          }
@@ -73,6 +75,7 @@ public class ProtonINVMSPI implements AMQPConnectionCallback {
 
       bytes.retain();
       mainExecutor.execute(new Runnable() {
+         @Override
          public void run() {
             try {
                if (DebugInfo.debug) {
@@ -130,6 +133,7 @@ public class ProtonINVMSPI implements AMQPConnectionCallback {
 
          bytes.retain();
          returningExecutor.execute(new Runnable() {
+            @Override
             public void run() {
                try {
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java
index 8ef45eb..80ab8a8 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/AMQPClientSPI.java
@@ -41,10 +41,12 @@ public class AMQPClientSPI implements AMQPConnectionCallback {
       this.channel = channel;
    }
 
+   @Override
    public void setConnection(AMQPConnectionContext connection) {
       this.connection = connection;
    }
 
+   @Override
    public AMQPConnectionContext getConnection() {
       return connection;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java
index 088e7a1..bb7d0d4 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalclient/SimpleAMQPConnector.java
@@ -35,6 +35,7 @@ public class SimpleAMQPConnector implements Connector {
 
    private Bootstrap bootstrap;
 
+   @Override
    public void start() {
 
       bootstrap = new Bootstrap();
@@ -42,11 +43,13 @@ public class SimpleAMQPConnector implements Connector {
       bootstrap.group(new NioEventLoopGroup(10));
 
       bootstrap.handler(new ChannelInitializer<Channel>() {
+            @Override
             public void initChannel(Channel channel) throws Exception {
             }
          });
    }
 
+   @Override
    public AMQPClientConnectionContext connect(String host, int port) throws Exception {
       SocketAddress remoteDestination = new InetSocketAddress(host, port);
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java
index 2dd6bef..412114f 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalConnectionSPI.java
@@ -51,10 +51,12 @@ public class MinimalConnectionSPI implements AMQPConnectionCallback {
       executorService.shutdown();
    }
 
+   @Override
    public void setConnection(AMQPConnectionContext connection) {
       this.connection = connection;
    }
 
+   @Override
    public AMQPConnectionContext getConnection() {
       return connection;
    }

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java
index c4b939c..c6d8a0d 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/MinimalSessionSPI.java
@@ -49,6 +49,7 @@ public class MinimalSessionSPI implements AMQPSessionCallback {
 
    static AtomicInteger tempQueueGenerator = new AtomicInteger(0);
 
+   @Override
    public String tempQueueName() {
       return "TempQueueName" + tempQueueGenerator.incrementAndGet();
    }
@@ -162,6 +163,7 @@ public class MinimalSessionSPI implements AMQPSessionCallback {
          if (thread == null) {
             System.out.println("Start!!!");
             thread = new Thread() {
+               @Override
                public void run() {
                   try {
                      while (running) {

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java
index 23da426..ac1d28f 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/minimalserver/SimpleServerThreadFactory.java
@@ -43,6 +43,7 @@ public final class SimpleServerThreadFactory implements ThreadFactory {
       this.daemon = daemon;
    }
 
+   @Override
    public Thread newThread(final Runnable command) {
       final Thread t;
       // attach the thread to a group only if there is no security manager:
@@ -55,6 +56,7 @@ public final class SimpleServerThreadFactory implements ThreadFactory {
       }
 
       AccessController.doPrivileged(new PrivilegedAction<Object>() {
+         @Override
          public Object run() {
             t.setDaemon(daemon);
             t.setPriority(threadPriority);
@@ -64,6 +66,7 @@ public final class SimpleServerThreadFactory implements ThreadFactory {
 
       try {
          AccessController.doPrivileged(new PrivilegedAction<Object>() {
+            @Override
             public Object run() {
                t.setContextClassLoader(tccl);
                return null;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/25ae4724/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java
index 58e6774..b7ae38b 100644
--- a/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java
+++ b/artemis-protocols/artemis-proton-plug/src/test/java/org/proton/plug/test/util/CreditsSemaphoreTest.java
@@ -35,6 +35,7 @@ public class CreditsSemaphoreTest {
    final CountDownLatch waiting = new CountDownLatch(1);
 
    Thread thread = new Thread() {
+      @Override
       public void run() {
          try {
             for (int i = 0; i < 12; i++) {

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/StompConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
index 61d565a..08bc2e9 100644
--- a/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
+++ b/artemis-protocols/artemis-stomp-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/stomp/StompConnection.java
@@ -211,6 +211,7 @@ public final class StompConnection implements RemotingConnection {
       dataReceived = true;
    }
 
+   @Override
    public synchronized boolean checkDataReceived() {
       boolean res = dataReceived;
 
@@ -251,6 +252,7 @@ public final class StompConnection implements RemotingConnection {
       return ActiveMQBuffers.dynamicBuffer(size);
    }
 
+   @Override
    public void destroy() {
       synchronized (failLock) {
          if (destroyed) {
@@ -277,6 +279,7 @@ public final class StompConnection implements RemotingConnection {
       manager.cleanup(this);
    }
 
+   @Override
    public void fail(final ActiveMQException me) {
       synchronized (failLock) {
          if (destroyed) {
@@ -295,43 +298,53 @@ public final class StompConnection implements RemotingConnection {
       internalClose();
    }
 
+   @Override
    public void fail(final ActiveMQException me, String scaleDownTargetNodeID) {
       fail(me);
    }
 
+   @Override
    public void flush() {
    }
 
+   @Override
    public List<FailureListener> getFailureListeners() {
       // we do not return the listeners otherwise the remoting service
       // would NOT destroy the connection.
       return Collections.emptyList();
    }
 
+   @Override
    public Object getID() {
       return transportConnection.getID();
    }
 
+   @Override
    public String getRemoteAddress() {
       return transportConnection.getRemoteAddress();
    }
 
+   @Override
    public long getCreationTime() {
       return creationTime;
    }
 
+   @Override
    public Connection getTransportConnection() {
       return transportConnection;
    }
 
+   @Override
    public boolean isClient() {
       return false;
    }
 
+   @Override
    public boolean isDestroyed() {
       return destroyed;
    }
 
+   @Override
    public void bufferReceived(Object connectionID, ActiveMQBuffer buffer) {
       manager.handleBuffer(this, buffer);
    }


Mime
View raw message