You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2017/07/18 10:03:49 UTC
[08/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java b/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
index 285072b..3acd6b5 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/UnitTestMessageLogger.java
@@ -38,11 +38,13 @@ public class UnitTestMessageLogger extends AbstractMessageLogger
super(statusUpdatesEnabled);
}
+ @Override
public void rawMessage(String message, String logHierarchy)
{
_log.add(message);
}
+ @Override
public void rawMessage(String message, Throwable throwable, String logHierarchy)
{
_log.add(message);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
index 801ecfa..e6b65c6 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/AMQPConnectionActorTest.java
@@ -109,6 +109,7 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
{
getEventLogger().message(new LogSubject()
{
+ @Override
public String toLogString()
{
return "[AMQPActorTest]";
@@ -116,11 +117,13 @@ public class AMQPConnectionActorTest extends BaseConnectionActorTestCase
}, new LogMessage()
{
+ @Override
public String toString()
{
return message;
}
+ @Override
public String getLogHierarchy()
{
return "test.hierarchy";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
index 896127c..b817953 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/BaseActorTestCase.java
@@ -62,6 +62,7 @@ public abstract class BaseActorTestCase extends QpidTestCase
{
getEventLogger().message(new LogSubject()
{
+ @Override
public String toLogString()
{
return message;
@@ -69,11 +70,13 @@ public abstract class BaseActorTestCase extends QpidTestCase
}, new LogMessage()
{
+ @Override
public String toString()
{
return message;
}
+ @Override
public String getLogHierarchy()
{
return "test.hierarchy";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
index c06cc39..63af555 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/actors/HttpManagementActorTest.java
@@ -43,6 +43,7 @@ public class HttpManagementActorTest extends BaseActorTestCase
return "";
}
+ @Override
public String toString()
{
return "";
@@ -104,6 +105,7 @@ public class HttpManagementActorTest extends BaseActorTestCase
final String message = Subject.doAs(subject, new PrivilegedAction<String>()
{
+ @Override
public String run()
{
return sendTestLogMessage();
@@ -165,6 +167,7 @@ public class HttpManagementActorTest extends BaseActorTestCase
subject.getPrincipals().add(_connectionPrincipal);
final String message = Subject.doAs(subject, new PrivilegedAction<String>()
{
+ @Override
public String run()
{
getEventLogger().message(EMPTY_MESSAGE);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
index aeea26c..26d67ac 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/AbstractTestLogSubject.java
@@ -75,11 +75,13 @@ public abstract class AbstractTestLogSubject extends QpidTestCase
eventLogger.message(_subject, new LogMessage()
{
+ @Override
public String toString()
{
return "<Log Message>";
}
+ @Override
public String getLogHierarchy()
{
return "test.hierarchy";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
index 25cbb74..d88b2e9 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ChannelLogSubjectTest.java
@@ -48,6 +48,7 @@ public class ChannelLogSubjectTest extends ConnectionLogSubjectTest
*
* @param message the message whose format needs validation
*/
+ @Override
protected void validateLogStatement(String message)
{
// Use the ConnectionLogSubjectTest to validate that the connection
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
index 6663269..f46d67f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/logging/subjects/ConnectionLogSubjectTest.java
@@ -61,6 +61,7 @@ public class ConnectionLogSubjectTest extends AbstractTestLogSubject
*
* @param message the message whose format needs validation
*/
+ @Override
protected void validateLogStatement(String message)
{
verifyConnection(CONNECTION_ID, USER, IP_STRING, VHOST, message);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
index 972bdc4..e3ee8e2 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
@@ -120,6 +120,7 @@ public class PortFactoryTest extends QpidTestCase
_attributes.put(Port.BINDING_ADDRESS, "127.0.0.1");
}
+ @Override
public void tearDown() throws Exception
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCar.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCar.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCar.java
index 9a7ca65..cfda41f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCar.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestKitCar.java
@@ -28,6 +28,7 @@ import org.apache.qpid.server.model.Param;
@ManagedObject(category = false)
public interface TestKitCar<X extends TestKitCar<X>> extends TestCar<X>
{
+ @Override
@ManagedOperation(changesConfiguredObjectState = false)
Door openDoor(@Param(name = "door", defaultValue = "PASSENGER") Door door);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCar.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCar.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCar.java
index e3eb835..ba92b2a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCar.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestStandardCar.java
@@ -28,6 +28,7 @@ import org.apache.qpid.server.store.preferences.UserPreferencesCreator;
public interface TestStandardCar<X extends TestStandardCar<X>> extends TestCar<X>, UserPreferencesCreator
{
+ @Override
@ManagedOperation(changesConfiguredObjectState = false)
Door openDoor(@Param(name = "door", defaultValue = "DRIVER") Door door);
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java
index 1c459ac..d9f444b 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/TestSingletonImpl.java
@@ -256,6 +256,7 @@ public class TestSingletonImpl extends AbstractConfiguredObject<TestSingletonImp
}
+ @Override
public <T> T doAsSystem(PrivilegedAction<T> action)
{
return Subject.doAs(SYSTEM_SUBJECT, action);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
index 6484ca6..cc4d2e9 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/pool/SuppressingInheritedAccessControlContextThreadFactoryTest.java
@@ -72,6 +72,7 @@ public class SuppressingInheritedAccessControlContextThreadFactoryTest extends Q
factory.newThread(new Runnable()
{
+ @Override
public void run()
{
threadAccessControlContextCapturer.set(AccessController.getContext());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
index 163d54a..c268e87 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/AbstractQueueTestBase.java
@@ -676,11 +676,13 @@ abstract class AbstractQueueTestBase extends QpidTestCase
// get messages on the queue with filter accepting all available messages
List<? extends QueueEntry> entries = ((AbstractQueue)_queue).getMessagesOnTheQueue(new QueueEntryFilter()
{
+ @Override
public boolean accept(QueueEntry entry)
{
return true;
}
+ @Override
public boolean filterComplete()
{
return false;
@@ -1325,6 +1327,7 @@ abstract class AbstractQueueTestBase extends QpidTestCase
_queueEntries = queueEntries;
}
+ @Override
public void performAction(MessageInstance entry)
{
_queueEntries.add((QueueEntry) entry);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
index 610901b..6701c0f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/LastValueQueueTest.java
@@ -40,6 +40,7 @@ public class LastValueQueueTest extends AbstractQueueTestBase
}
+ @Override
public void testOldestMessage()
{
Queue<?> queue = getQueue();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java b/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
index f376712..58d37fa 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/MockMessageInstance.java
@@ -37,6 +37,7 @@ public class MockMessageInstance implements MessageInstance
private ServerMessage _message;
+ @Override
public boolean acquire()
{
return false;
@@ -55,6 +56,7 @@ public class MockMessageInstance implements MessageInstance
return 0;
}
+ @Override
public boolean acquiredByConsumer()
{
return false;
@@ -84,11 +86,13 @@ public class MockMessageInstance implements MessageInstance
return false;
}
+ @Override
public void delete()
{
}
+ @Override
public boolean expired()
{
return false;
@@ -112,16 +116,19 @@ public class MockMessageInstance implements MessageInstance
return false;
}
+ @Override
public boolean isAvailable()
{
return false;
}
+ @Override
public boolean getDeliveredToConsumer()
{
return false;
}
+ @Override
public ServerMessage getMessage()
{
return _message;
@@ -132,11 +139,13 @@ public class MockMessageInstance implements MessageInstance
return 0;
}
+ @Override
public boolean isAcquired()
{
return false;
}
+ @Override
public void reject()
{
}
@@ -148,6 +157,7 @@ public class MockMessageInstance implements MessageInstance
}
+ @Override
public void release()
{
}
@@ -158,6 +168,7 @@ public class MockMessageInstance implements MessageInstance
}
+ @Override
public void setRedelivered()
{
}
@@ -173,6 +184,7 @@ public class MockMessageInstance implements MessageInstance
return false;
}
+ @Override
public boolean isRedelivered()
{
return false;
@@ -183,6 +195,7 @@ public class MockMessageInstance implements MessageInstance
_message = msg;
}
+ @Override
public boolean isDeleted()
{
return false;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
index cbf24c2..648fc8f 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueListTest.java
@@ -57,6 +57,7 @@ public class PriorityQueueListTest extends QpidTestCase
private QueueEntry _priority5message1;
private QueueEntry _priority5message2;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
index 3d6feee..c5d5a9a 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/PriorityQueueTest.java
@@ -106,6 +106,7 @@ public class PriorityQueueTest extends AbstractQueueTestBase
return msg;
}
+ @Override
protected ServerMessage createMessage(Long id)
{
return createMessage(id, (byte) 0);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
index 0f76d51..381d303 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlOverflowPolicyHandlerTest.java
@@ -52,6 +52,7 @@ public class ProducerFlowControlOverflowPolicyHandlerTest extends QpidTestCase
private EventLogger _eventLogger;
private LogSubject _subject;
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
index 10428f2..a2580db 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
@@ -70,6 +70,7 @@ public abstract class QueueEntryImplTestBase extends QpidTestCase
public abstract void testTraverseWithDeletedEntries();
+ @Override
public void setUp() throws Exception
{
_queueEntry = getQueueEntryImpl(1);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
index 4d471b9..ca14820 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/RingOverflowPolicyHandlerTest.java
@@ -46,6 +46,7 @@ public class RingOverflowPolicyHandlerTest extends QpidTestCase
private EventLogger _eventLogger;
private LogSubject _subject;
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
index e2568f3..d2daddb 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
@@ -62,6 +62,7 @@ public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
}
+ @Override
public QueueEntryImpl getQueueEntryImpl(int msgId)
{
ServerMessage message = mock(ServerMessage.class);
@@ -73,6 +74,7 @@ public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
return (QueueEntryImpl) queueEntryList.add(message, null);
}
+ @Override
public void testCompareTo()
{
assertTrue(_queueEntry.compareTo(_queueEntry2) < 0);
@@ -88,6 +90,7 @@ public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
assertTrue(_queueEntry3.compareTo(_queueEntry3) == 0);
}
+ @Override
public void testTraverseWithNoDeletedEntries()
{
QueueEntry current = _queueEntry;
@@ -103,6 +106,7 @@ public class SimpleQueueEntryImplTest extends QueueEntryImplTestBase
}
+ @Override
public void testTraverseWithDeletedEntries()
{
// Delete 2nd queue entry
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
index f753b03..f0c2226 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
@@ -146,16 +146,19 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
}
}
+ @Override
public int getExpectedListLength()
{
return keys.length;
}
+ @Override
public long getExpectedFirstMsgId()
{
return 67L;
}
+ @Override
public ServerMessage getTestMessageToAdd()
{
return generateTestMessage(1, "test value");
@@ -184,6 +187,7 @@ public class SortedQueueEntryListTest extends QueueEntryListTestBase
return message;
}
+ @Override
public void testIterator() throws Exception
{
super.testIterator();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
index afdc6cb..2dbcec2 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryTest.java
@@ -84,6 +84,7 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
super.setUp();
}
+ @Override
public QueueEntryImpl getQueueEntryImpl(int msgId)
{
final ServerMessage message = mock(ServerMessage.class);
@@ -100,6 +101,7 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
return _queueEntryList.add(message, null);
}
+ @Override
public void testCompareTo()
{
assertTrue(_queueEntry.compareTo(_queueEntry2) > 0);
@@ -116,6 +118,7 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
assertTrue(_queueEntry3.compareTo(_queueEntry3) == 0);
}
+ @Override
public void testTraverseWithNoDeletedEntries()
{
QueueEntry current = _queueEntry2;
@@ -131,6 +134,7 @@ public class SortedQueueEntryTest extends QueueEntryImplTestBase
}
+ @Override
public void testTraverseWithDeletedEntries()
{
// Delete 2nd queue entry
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
index 495685e..3e850ac 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/queue/StandardQueueTest.java
@@ -139,6 +139,7 @@ public class StandardQueueTest extends AbstractQueueTestBase
* @param entry
* @param batch
*/
+ @Override
public void send(final MessageInstanceConsumer consumer, MessageInstance entry, boolean batch)
{
super.send(consumer, entry, batch);
@@ -233,6 +234,7 @@ public class StandardQueueTest extends AbstractQueueTestBase
* Entries with even message id are considered
* dequeued!
*/
+ @Override
protected DequeuedQueueEntry createQueueEntry(final ServerMessage message,
final MessageEnqueueRecord enqueueRecord)
{
@@ -264,11 +266,13 @@ public class StandardQueueTest extends AbstractQueueTestBase
_message = message;
}
+ @Override
public boolean isDeleted()
{
return (_message.getMessageNumber() % 2 == 0);
}
+ @Override
public boolean isAvailable()
{
return !(_message.getMessageNumber() % 2 == 0);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
index 2426dc6..e950ef4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/FileKeyStoreTest.java
@@ -53,6 +53,7 @@ public class FileKeyStoreTest extends QpidTestCase
private final ConfiguredObjectFactory _factory = _model.getObjectFactory();
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
index e235b33..ce570fc 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/FileTrustStoreTest.java
@@ -56,6 +56,7 @@ public class FileTrustStoreTest extends QpidTestCase
private final Model _model = BrokerModel.getInstance();
private final ConfiguredObjectFactory _factory = _model.getObjectFactory();
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
index e12b559..a0731f0 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/AuthenticatedPrincipalTest.java
@@ -89,6 +89,7 @@ public class AuthenticatedPrincipalTest extends QpidTestCase
{
final Principal other = new Principal()
{
+ @Override
public String getName()
{
return "otherprincipal";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
index e25f041..8c93162 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/Base64MD5PasswordFilePrincipalDatabaseTest.java
@@ -59,6 +59,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
}
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -68,6 +69,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
_database.open(_pwdFile);
}
+ @Override
public void tearDown() throws Exception
{
try
@@ -104,6 +106,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
Principal principal = new Principal()
{
+ @Override
public String getName()
{
return TEST_USERNAME;
@@ -154,6 +157,7 @@ public class Base64MD5PasswordFilePrincipalDatabaseTest extends AbstractPassword
Principal principal = new Principal()
{
+ @Override
public String getName()
{
return CREATED_USERNAME;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
index 80955f1..4bef243 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabaseTest.java
@@ -50,6 +50,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
private PlainPasswordFilePrincipalDatabase _database;
private List<File> _testPwdFiles = new ArrayList<File>();
+ @Override
public void setUp() throws Exception
{
super.setUp();
@@ -79,6 +80,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
Principal principal = new Principal()
{
+ @Override
public String getName()
{
return CREATED_USERNAME;
@@ -105,6 +107,7 @@ public class PlainPasswordFilePrincipalDatabaseTest extends AbstractPasswordFile
Principal principal = new Principal()
{
+ @Override
public String getName()
{
return TEST_USERNAME;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
index f480394..660ff5d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/AnonymousAuthenticationManagerTest.java
@@ -49,6 +49,7 @@ public class AnonymousAuthenticationManagerTest extends QpidTestCase
}
+ @Override
public void tearDown() throws Exception
{
if(_manager != null)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
index 867dd85..7b024ab 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleAuthenticationManagerTest.java
@@ -45,6 +45,7 @@ public class SimpleAuthenticationManagerTest extends QpidTestCase
private static final String TEST_PASSWORD = "testPassword";
private SimpleAuthenticationManager _authenticationManager;
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
index f0dc892..a3cf2e0 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManagerFactoryTest.java
@@ -45,6 +45,7 @@ public class SimpleLDAPAuthenticationManagerFactoryTest extends QpidTestCase
private TrustStore _trustStore = mock(TrustStore.class);
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
index e2f29ab..11bdef1 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreQuotaEventsTestBase.java
@@ -159,16 +159,19 @@ public abstract class MessageStoreQuotaEventsTestBase extends QpidTestCase imple
_handle = handle;
}
+ @Override
public long getMessageNumber()
{
return _messageId;
}
+ @Override
public boolean isPersistent()
{
return true;
}
+ @Override
public StoredMessage<?> getStoredMessage()
{
return _handle;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
index e70e9ff..f2750f4 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/MessageStoreTestCase.java
@@ -481,6 +481,7 @@ public abstract class MessageStoreTestCase extends QpidTestCase
_messageNumber = messageNumber;
}
+ @Override
public boolean matches(Object obj)
{
return obj instanceof StoredMessage && ((StoredMessage<?>)obj).getMessageNumber() == _messageNumber;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java b/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java
index 381718d..ee67dd2 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/store/TestMessageMetaDataFactory.java
@@ -28,6 +28,7 @@ import org.apache.qpid.server.plugin.MessageMetaDataType;
public class TestMessageMetaDataFactory implements MessageMetaDataType.Factory<TestMessageMetaData>
{
+ @Override
public TestMessageMetaData createMetaData(List<QpidByteBuffer> bufs)
{
long id = QpidByteBufferUtils.getLong(bufs);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java b/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
index 9be896f..c79bb4d 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/txn/MockAction.java
@@ -32,6 +32,7 @@ class MockAction implements ServerTransaction.EnqueueAction, ServerTransaction.A
private boolean _rollbackFired = false;
private boolean _postCommitFired = false;
+ @Override
public void postCommit(MessageEnqueueRecord... records)
{
_postCommitFired = true;
@@ -43,6 +44,7 @@ class MockAction implements ServerTransaction.EnqueueAction, ServerTransaction.A
_postCommitFired = true;
}
+ @Override
public void onRollback()
{
_rollbackFired = true;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java b/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
index f666fda..0b82318 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java
@@ -65,6 +65,7 @@ class MockStoreTransaction implements Transaction
return _state;
}
+ @Override
public MessageEnqueueRecord enqueueMessage(TransactionLogResource queue, EnqueueableMessage message)
{
if (_throwExceptionOnQueueOp)
@@ -98,16 +99,19 @@ class MockStoreTransaction implements Transaction
_numberOfDequeuedMessages++;
}
+ @Override
public void commitTran()
{
_state = TransactionState.COMMITTED;
}
+ @Override
public <X> ListenableFuture<X> commitTranAsync(final X val)
{
return Futures.immediateFuture(val);
}
+ @Override
public void abortTran()
{
_state = TransactionState.ABORTED;
@@ -123,6 +127,7 @@ class MockStoreTransaction implements Transaction
}
+ @Override
public StoredXidRecord recordXid(long format,
byte[] globalId,
byte[] branchId,
@@ -157,11 +162,13 @@ class MockStoreTransaction implements Transaction
_messageNumber = messageNumber;
}
+ @Override
public UUID getQueueId()
{
return _queueId;
}
+ @Override
public long getMessageNumber()
{
return _messageNumber;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java b/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java
index b0fae31..93c964c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/util/ByteBufferInputStreamTest.java
@@ -31,6 +31,7 @@ public class ByteBufferInputStreamTest extends QpidTestCase
private byte[] _data = {2, 1, 5, 3, 4};
private ByteBufferInputStream _inputStream;
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyOperation.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyOperation.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyOperation.java
index 5f128d4..eae967f 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyOperation.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/LegacyOperation.java
@@ -37,6 +37,7 @@ public enum LegacyOperation
ACCESS_LOGS,
SHUTDOWN;
+ @Override
public String toString()
{
String name = name();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectType.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectType.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectType.java
index 907e62c..be49e03 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectType.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/ObjectType.java
@@ -76,6 +76,7 @@ public enum ObjectType
return _operations.contains(operation);
}
+ @Override
public String toString()
{
String name = name();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
index b8ef2e0..1b7fa5e 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControl.java
@@ -52,6 +52,7 @@ public class RuleBasedAccessControl implements AccessControl<CachingSecurityToke
_adapter = new LegacyAccessControlAdapter(this, model);
}
+ @Override
public Result getDefault()
{
return _ruleSet.getDefault();
@@ -74,6 +75,7 @@ public class RuleBasedAccessControl implements AccessControl<CachingSecurityToke
* control rules granted to the current thread's {@link Subject}. If there is no current
* user the plugin will abstain.
*/
+ @Override
public Result authorise(LegacyOperation operation, ObjectType objectType, ObjectProperties properties)
{
InetAddress addressOfClient = null;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
index 2f0088a..0c58524 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
@@ -268,6 +268,7 @@ public class RuleSet implements EventLoggerProvider
return objects;
}
+ @Override
public EventLogger getEventLogger()
{
return _eventLogger.getEventLogger();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
index 9d91304..a771aec 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/firewall/HostnameFirewallRule.java
@@ -93,6 +93,7 @@ public class HostnameFirewallRule implements FirewallRule
{
FutureTask<String> lookup = new FutureTask<String>(new Callable<String>()
{
+ @Override
public String call()
{
return remote.getCanonicalHostName();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java
index 57f483c..43379ae 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractCommonRuleBasedAccessControlProvider.java
@@ -75,6 +75,7 @@ abstract class AbstractCommonRuleBasedAccessControlProvider<X extends AbstractCo
}
}
+ @Override
protected RuleBasedAccessControl createRuleBasedAccessController()
{
List<Rule> rules = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
index 76a4fec..596bac2 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AbstractLegacyAccessControlProvider.java
@@ -118,6 +118,7 @@ abstract class AbstractLegacyAccessControlProvider<X extends AbstractLegacyAcces
+ @Override
public final AccessControl getAccessControl()
{
return _accessControl;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java
index d56a157..c8a90d7 100644
--- a/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java
+++ b/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImpl.java
@@ -126,6 +126,7 @@ public class AclFileAccessControlProviderImpl
return _path;
}
+ @Override
public int compareTo(final AccessControlProvider<?> o)
{
return ACCESS_CONTROL_PROVIDER_COMPARATOR.compare(this, o);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControlTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControlTest.java b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControlTest.java
index 5860d9e..8b8f4d5c 100644
--- a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControlTest.java
+++ b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/config/RuleBasedAccessControlTest.java
@@ -56,6 +56,7 @@ public class RuleBasedAccessControlTest extends QpidTestCase
private UnitTestMessageLogger _messageLogger;
private EventLogger _eventLogger;
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java
----------------------------------------------------------------------
diff --git a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java
index 712d940..22d6773 100644
--- a/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java
+++ b/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/AclFileAccessControlProviderImplTest.java
@@ -45,6 +45,7 @@ public class AclFileAccessControlProviderImplTest extends QpidTestCase
private Model _model;
private Broker _broker;
+ @Override
public void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
index 0d8210b..ebdd4cc 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ConsumerTarget_0_10.java
@@ -176,6 +176,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
_action = action;
}
+ @Override
public void run()
{
if(_action != null)
@@ -187,6 +188,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
private final AddMessageDispositionListenerAction _postIdSettingAction;
+ @Override
public void doSend(final MessageInstanceConsumer consumer, final MessageInstance entry, boolean batch)
{
ServerMessage serverMsg = entry.getMessage();
@@ -309,6 +311,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
final long messageSize = entry.getMessage().getSize();
xfr.setCompletionListener(new Method.CompletionListener()
{
+ @Override
public void onComplete(Method method)
{
deferredAddCredit(1, messageSize);
@@ -396,6 +399,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
dequeueTxn.dequeue(entry.getEnqueueRecord(),
new ServerTransaction.Action()
{
+ @Override
public void postCommit()
{
if (restoreCredit)
@@ -405,6 +409,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
entry.delete();
}
+ @Override
public void onRollback()
{
@@ -502,6 +507,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
return (maxDeliveryLimit > 0 && entry.getDeliveryCount() >= maxDeliveryLimit);
}
+ @Override
public boolean allocateCredit(ServerMessage message)
{
boolean creditAllocated = _creditManager.useCreditForMessage(message.getSize());
@@ -509,6 +515,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
return creditAllocated;
}
+ @Override
public void restoreCredit(ServerMessage message)
{
restoreCredit(1, message.getSize());
@@ -579,6 +586,7 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
stop();
}
+ @Override
public Session_0_10 getSession()
{
return _session.getModelObject();
@@ -589,10 +597,12 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
return false;
}
+ @Override
public void queueEmpty()
{
}
+ @Override
public void flushBatched()
{
}
@@ -603,11 +613,13 @@ public class ConsumerTarget_0_10 extends AbstractConsumerTarget<ConsumerTarget_0
return _targetAddress;
}
+ @Override
public long getUnacknowledgedBytes()
{
return _unacknowledgedBytes.longValue();
}
+ @Override
public long getUnacknowledgedMessages()
{
return _unacknowledgedCount.longValue();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
index 9088812..698351c 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/CreditCreditManager.java
@@ -32,11 +32,13 @@ public class CreditCreditManager implements FlowCreditManager_0_10
_messageCredit = messageCredit;
}
+ @Override
public synchronized void restoreCredit(final long messageCredit, final long bytesCredit)
{
}
+ @Override
public synchronized void addCredit(final long messageCredit, final long bytesCredit)
{
if(_messageCredit >= 0L && messageCredit > 0L)
@@ -50,6 +52,7 @@ public class CreditCreditManager implements FlowCreditManager_0_10
}
}
+ @Override
public synchronized void clearCredit()
{
_bytesCredit = 0l;
@@ -57,12 +60,14 @@ public class CreditCreditManager implements FlowCreditManager_0_10
}
+ @Override
public synchronized boolean hasCredit()
{
// Note !=, if credit is < 0 that indicates infinite credit
return (_bytesCredit != 0L && _messageCredit != 0L);
}
+ @Override
public synchronized boolean useCreditForMessage(long msgSize)
{
if(_messageCredit >= 0L)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
index 5617833..23747c7 100755
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ExplicitAcceptDispositionChangeListener.java
@@ -45,21 +45,25 @@ class ExplicitAcceptDispositionChangeListener implements ServerSession.MessageDi
_consumer = consumer;
}
+ @Override
public void onAccept()
{
_target.acknowledge(_consumer, _entry);
}
+ @Override
public void onRelease(boolean setRedelivered)
{
_target.release(_consumer, _entry, setRedelivered);
}
+ @Override
public void onReject()
{
_target.reject(_consumer, _entry);
}
+ @Override
public boolean acquire()
{
return _entry.acquire(_consumer);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
index 8adf027..53ea265 100755
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ImplicitAcceptDispositionChangeListener.java
@@ -44,22 +44,26 @@ class ImplicitAcceptDispositionChangeListener implements ServerSession.MessageDi
_consumer = consumer;
}
+ @Override
public void onAccept()
{
_logger.warn("MessageAccept received for message which is using NONE as the accept mode (likely client error)");
}
+ @Override
public void onRelease(boolean setRedelivered)
{
_target.release(_consumer, _entry, setRedelivered);
}
+ @Override
public void onReject()
{
_target.reject(_consumer, _entry);
}
+ @Override
public boolean acquire()
{
boolean acquired = _entry.acquire(_consumer);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
index 565d4db..667cd18 100755
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageAcceptCompletionListener.java
@@ -52,6 +52,7 @@ public class MessageAcceptCompletionListener implements Method.CompletionListene
}
}
+ @Override
public void onComplete(Method method)
{
if(_restoreCredit)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
index 70bcdeb..e1d790b 100755
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageMetaData_0_10.java
@@ -78,6 +78,7 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData
+ @Override
public MessageMetaDataType getType()
{
return TYPE;
@@ -163,6 +164,7 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData
return buf;
}
+ @Override
public synchronized void writeToBuffer(QpidByteBuffer dest)
{
if (_encoded == null)
@@ -175,11 +177,13 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData
clearEncodedForm();
}
+ @Override
public int getContentSize()
{
return _bodySize;
}
+ @Override
public boolean isPersistent()
{
return _deliveryProps != null && _deliveryProps.getDeliveryMode() == MessageDeliveryMode.PERSISTENT;
@@ -245,6 +249,7 @@ public class MessageMetaData_0_10 implements StorableMessageMetaData
private static class MetaDataFactory implements MessageMetaDataType.Factory<MessageMetaData_0_10>
{
+ @Override
public MessageMetaData_0_10 createMetaData(List<QpidByteBuffer> buf)
{
ServerDecoder decoder = new ServerDecoder(buf);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
index fed4cbe..303950c 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferHeader.java
@@ -42,6 +42,7 @@ class MessageTransferHeader implements AMQMessageHeader
_messageProps = messageProps;
}
+ @Override
public String getCorrelationId()
{
if (_messageProps != null && _messageProps.getCorrelationId() != null)
@@ -54,23 +55,27 @@ class MessageTransferHeader implements AMQMessageHeader
}
}
+ @Override
public long getExpiration()
{
return _deliveryProps == null ? 0L : _deliveryProps.getExpiration();
}
+ @Override
public String getUserId()
{
byte[] userIdBytes = _messageProps == null ? null : _messageProps.getUserId();
return userIdBytes == null ? null : new String(userIdBytes);
}
+ @Override
public String getAppId()
{
byte[] appIdBytes = _messageProps == null ? null : _messageProps.getAppId();
return appIdBytes == null ? null : new String(appIdBytes);
}
+ @Override
public String getMessageId()
{
UUID id = _messageProps == null ? null : _messageProps.getMessageId();
@@ -78,16 +83,19 @@ class MessageTransferHeader implements AMQMessageHeader
return id == null ? null : "ID:"+String.valueOf(id);
}
+ @Override
public String getMimeType()
{
return _messageProps == null ? null : _messageProps.getContentType();
}
+ @Override
public String getEncoding()
{
return _messageProps == null ? null : _messageProps.getContentEncoding();
}
+ @Override
public byte getPriority()
{
MessageDeliveryPriority priority = _deliveryProps == null || !_deliveryProps.hasPriority()
@@ -96,6 +104,7 @@ class MessageTransferHeader implements AMQMessageHeader
return (byte) priority.getValue();
}
+ @Override
public long getTimestamp()
{
return _deliveryProps == null ? 0L : _deliveryProps.getTimestamp();
@@ -109,12 +118,14 @@ class MessageTransferHeader implements AMQMessageHeader
return header instanceof Number ? ((Number)header).longValue() : 0L;
}
+ @Override
public String getType()
{
Object type = getHeader(JMS_TYPE);
return type instanceof String ? (String) type : null;
}
+ @Override
public String getReplyTo()
{
if (_messageProps != null && _messageProps.getReplyTo() != null)
@@ -151,12 +162,14 @@ class MessageTransferHeader implements AMQMessageHeader
}
}
+ @Override
public Object getHeader(String name)
{
Map<String, Object> appHeaders = _messageProps == null ? null : _messageProps.getApplicationHeaders();
return appHeaders == null ? null : appHeaders.get(name);
}
+ @Override
public boolean containsHeaders(Set<String> names)
{
Map<String, Object> appHeaders = _messageProps == null ? null : _messageProps.getApplicationHeaders();
@@ -172,6 +185,7 @@ class MessageTransferHeader implements AMQMessageHeader
}
+ @Override
public boolean containsHeader(String name)
{
Map<String, Object> appHeaders = _messageProps == null ? null : _messageProps.getApplicationHeaders();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
index 07860f5..1afa7ac 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/MessageTransferMessage.java
@@ -48,12 +48,14 @@ public class MessageTransferMessage extends AbstractServerMessageImpl<MessageTra
return metaData == null ? DELETED_MESSAGE_METADATA : metaData;
}
+ @Override
public String getInitialRoutingAddress()
{
final String routingKey = getMetaData().getRoutingKey();
return routingKey == null ? "" : routingKey;
}
+ @Override
public AMQMessageHeader getMessageHeader()
{
return getMetaData().getMessageHeader();
@@ -65,6 +67,7 @@ public class MessageTransferMessage extends AbstractServerMessageImpl<MessageTra
return getMetaData().isImmediate();
}
+ @Override
public long getExpiration()
{
return getMetaData().getExpiration();
@@ -76,6 +79,7 @@ public class MessageTransferMessage extends AbstractServerMessageImpl<MessageTra
return AMQP_0_10;
}
+ @Override
public long getArrivalTime()
{
return getMetaData().getArrivalTime();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java
index 9818e48..6542ce1 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngineCreator_0_10.java
@@ -50,17 +50,20 @@ public class ProtocolEngineCreator_0_10 implements ProtocolEngineCreator
{
}
+ @Override
public Protocol getVersion()
{
return Protocol.AMQP_0_10;
}
+ @Override
public byte[] getHeaderIdentifier()
{
return AMQP_0_10_HEADER;
}
+ @Override
public ProtocolEngine newProtocolEngine(Broker<?> broker,
ServerNetworkConnection network,
AmqpPort<?> port,
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SenderException.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SenderException.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SenderException.java
index 93bfe74..1dcf3cf 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SenderException.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/SenderException.java
@@ -45,6 +45,7 @@ public class SenderException extends TransportException
super(cause);
}
+ @Override
public void rethrow()
{
throw new SenderException(getMessage(), this);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java
index 4a195c8..04819f0 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDecoder.java
@@ -111,88 +111,104 @@ final class ServerDecoder extends AbstractDecoder
return _underlying.get(_bufferIndex);
}
+ @Override
protected byte doGet()
{
return getBuffer(1).get();
}
+ @Override
protected void doGet(byte[] bytes)
{
getBuffer(bytes.length).get(bytes);
}
+ @Override
public boolean hasRemaining()
{
return available() != 0;
}
+ @Override
public short readUint8()
{
return (short) (0xFF & getBuffer(1).get());
}
+ @Override
public int readUint16()
{
return 0xFFFF & getBuffer(2).getShort();
}
+ @Override
public long readUint32()
{
return 0xFFFFFFFFL & getBuffer(4).getInt();
}
+ @Override
public long readUint64()
{
return getBuffer(8).getLong();
}
- public byte[] readBin128()
+ @Override
+ public byte[] readBin128()
{
byte[] result = new byte[16];
get(result);
return result;
}
- public byte[] readBytes(int howManyBytes)
+ @Override
+ public byte[] readBytes(int howManyBytes)
{
byte[] result = new byte[howManyBytes];
get(result);
return result;
}
- public double readDouble()
+ @Override
+ public double readDouble()
{
return getBuffer(8).getDouble();
}
- public float readFloat()
+ @Override
+ public float readFloat()
{
return getBuffer(4).getFloat();
}
- public short readInt16()
+ @Override
+ public short readInt16()
{
return getBuffer(2).getShort();
}
- public int readInt32()
+ @Override
+ public int readInt32()
{
return getBuffer(4).getInt();
}
- public byte readInt8()
+ @Override
+ public byte readInt8()
{
return getBuffer(1).get();
}
- public byte[] readRemainingBytes()
+ @Override
+ public byte[] readRemainingBytes()
{
byte[] result = new byte[available()];
get(result);
return result;
}
- public long readInt64()
+ @Override
+ public long readInt64()
{
return getBuffer(8).getLong();
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java
index 0892c39..25eb871 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerDisassembler.java
@@ -67,6 +67,7 @@ public final class ServerDisassembler implements ProtocolEventSender, ProtocolDe
_maxPayload = maxFrame - HEADER_SIZE;
}
+ @Override
public void send(ProtocolEvent event)
{
synchronized (_sendLock)
@@ -75,6 +76,7 @@ public final class ServerDisassembler implements ProtocolEventSender, ProtocolDe
}
}
+ @Override
public void flush()
{
synchronized (_sendLock)
@@ -83,6 +85,7 @@ public final class ServerDisassembler implements ProtocolEventSender, ProtocolDe
}
}
+ @Override
public void close()
{
synchronized (_sendLock)
@@ -169,17 +172,20 @@ public final class ServerDisassembler implements ProtocolEventSender, ProtocolDe
}
}
+ @Override
public void init(Void v, ProtocolHeader header)
{
_sender.send(header.toByteBuffer());
_sender.flush();
}
+ @Override
public void control(Void v, Method method)
{
method(method, SegmentType.CONTROL);
}
+ @Override
public void command(Void v, Method method)
{
method(method, SegmentType.COMMAND);
@@ -278,6 +284,7 @@ public final class ServerDisassembler implements ProtocolEventSender, ProtocolDe
}
}
+ @Override
public void error(Void v, ProtocolError error)
{
throw new IllegalArgumentException(String.valueOf(error));
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java
index 39f1ca5..cce45f7 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerEncoder.java
@@ -49,6 +49,7 @@ public final class ServerEncoder extends AbstractEncoder
_out = QpidByteBuffer.allocate(useDirectMemory, _initialCapacity);
}
+ @Override
public void init()
{
if(_out.capacity() < _threshold)
@@ -74,6 +75,7 @@ public final class ServerEncoder extends AbstractEncoder
return slice;
}
+ @Override
public int position()
{
return _out.position();
@@ -89,6 +91,7 @@ public final class ServerEncoder extends AbstractEncoder
old.dispose();
}
+ @Override
protected void doPut(byte b)
{
try
@@ -102,6 +105,7 @@ public final class ServerEncoder extends AbstractEncoder
}
}
+ @Override
protected void doPut(ByteBuffer src)
{
try
@@ -115,6 +119,7 @@ public final class ServerEncoder extends AbstractEncoder
}
}
+ @Override
protected void put(byte[] bytes)
{
try
@@ -128,6 +133,7 @@ public final class ServerEncoder extends AbstractEncoder
}
}
+ @Override
public void writeUint8(short b)
{
assert b < 0x100;
@@ -143,6 +149,7 @@ public final class ServerEncoder extends AbstractEncoder
}
}
+ @Override
public void writeUint16(int s)
{
assert s < 0x10000;
@@ -158,6 +165,7 @@ public final class ServerEncoder extends AbstractEncoder
}
}
+ @Override
public void writeUint32(long i)
{
assert i < 0x100000000L;
@@ -173,6 +181,7 @@ public final class ServerEncoder extends AbstractEncoder
}
}
+ @Override
public void writeUint64(long l)
{
try
@@ -186,6 +195,7 @@ public final class ServerEncoder extends AbstractEncoder
}
}
+ @Override
public int beginSize8()
{
int pos = _out.position();
@@ -201,12 +211,14 @@ public final class ServerEncoder extends AbstractEncoder
return pos;
}
+ @Override
public void endSize8(int pos)
{
int cur = _out.position();
_out.put(pos, (byte) (cur - pos - 1));
}
+ @Override
public int beginSize16()
{
int pos = _out.position();
@@ -222,12 +234,14 @@ public final class ServerEncoder extends AbstractEncoder
return pos;
}
+ @Override
public void endSize16(int pos)
{
int cur = _out.position();
_out.putShort(pos, (short) (cur - pos - 2));
}
+ @Override
public int beginSize32()
{
int pos = _out.position();
@@ -244,6 +258,7 @@ public final class ServerEncoder extends AbstractEncoder
}
+ @Override
public void endSize32(int pos)
{
int cur = _out.position();
@@ -251,7 +266,8 @@ public final class ServerEncoder extends AbstractEncoder
}
- public void writeDouble(double aDouble)
+ @Override
+ public void writeDouble(double aDouble)
{
try
{
@@ -264,7 +280,8 @@ public final class ServerEncoder extends AbstractEncoder
}
}
- public void writeInt16(short aShort)
+ @Override
+ public void writeInt16(short aShort)
{
try
{
@@ -277,7 +294,8 @@ public final class ServerEncoder extends AbstractEncoder
}
}
- public void writeInt32(int anInt)
+ @Override
+ public void writeInt32(int anInt)
{
try
{
@@ -290,7 +308,8 @@ public final class ServerEncoder extends AbstractEncoder
}
}
- public void writeInt64(long aLong)
+ @Override
+ public void writeInt64(long aLong)
{
try
{
@@ -303,7 +322,8 @@ public final class ServerEncoder extends AbstractEncoder
}
}
- public void writeInt8(byte aByte)
+ @Override
+ public void writeInt8(byte aByte)
{
try
{
@@ -316,7 +336,8 @@ public final class ServerEncoder extends AbstractEncoder
}
}
- public void writeBin128(byte[] byteArray)
+ @Override
+ public void writeBin128(byte[] byteArray)
{
byteArray = (byteArray != null) ? byteArray : new byte [16];
@@ -355,7 +376,8 @@ public final class ServerEncoder extends AbstractEncoder
writeBin128(data);
}
- public void writeFloat(float aFloat)
+ @Override
+ public void writeFloat(float aFloat)
{
try
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java
index 39cf986..be5e62b 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerFrame.java
@@ -117,6 +117,7 @@ public final class ServerFrame
return flag(LAST_FRAME);
}
+ @Override
public String toString()
{
StringBuilder str = new StringBuilder();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java
index 89a1f20..fe2d7af 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerInputHandler.java
@@ -65,6 +65,7 @@ public class ServerInputHandler implements FrameSizeObserver
_state = PROTO_HDR;
}
+ @Override
public void setMaxFrameSize(final int maxFrameSize)
{
_maxFrameSize = maxFrameSize;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
index 989ff4e..40ab9d5 100644
--- a/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
+++ b/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerSession.java
@@ -1786,6 +1786,7 @@ public class ServerSession extends SessionInvoker
}
}
+ @Override
public T get(long timeout)
{
synchronized (this)
@@ -1819,6 +1820,7 @@ public class ServerSession extends SessionInvoker
}
}
+ @Override
public boolean isDone()
{
return result != null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org