From aff6a647273f5949f1aa11f80097c98b1a1fd09a Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Thu, 7 Jul 2011 15:10:56 +0000 Subject: NO-JIRA: remove interface method @overrides git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1143868 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/connection/ConnectionRegistry.java | 1 - .../java/org/apache/qpid/server/queue/QueueEntryImpl.java | 2 -- .../org/apache/qpid/server/transport/ServerConnection.java | 2 -- .../java/org/apache/qpid/server/transport/ServerSession.java | 1 - .../qpid/server/exchange/AbstractHeadersExchangeTestBase.java | 2 -- .../java/org/apache/qpid/server/queue/MockQueueEntry.java | 2 -- .../java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java | 3 --- .../manager/PrincipalDatabaseAuthenticationManagerTest.java | 9 --------- .../security/auth/rmi/RMIPasswordAuthenticatorTest.java | 5 ----- .../qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java | 2 -- .../qpid/server/security/auth/sasl/UsernamePrincipalTest.java | 2 -- .../src/test/java/org/apache/qpid/server/txn/MockAction.java | 2 -- .../java/org/apache/qpid/server/txn/MockServerMessage.java | 11 ----------- .../java/org/apache/qpid/server/txn/MockStoreTransaction.java | 11 +---------- 14 files changed, 1 insertion(+), 54 deletions(-) diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java index c06305ee4e..3786c2020c 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java @@ -73,7 +73,6 @@ public class ConnectionRegistry implements IConnectionRegistry, Closeable _registry.remove(connnection); } - @Override public List getConnections() { return new ArrayList(_registry); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java index bc452d2d72..e951b3dfd4 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java @@ -547,13 +547,11 @@ public class QueueEntryImpl implements QueueEntry return _queueEntryList; } - @Override public boolean isDequeued() { return _state == DEQUEUED_STATE; } - @Override public boolean isDispensed() { return _state.isDispensed(); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java index 54cd709af3..2113494cc5 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java @@ -249,7 +249,6 @@ public class ServerConnection extends Connection implements AMQConnectionModel, return _actor; } - @Override public void close(AMQConstant cause, String message) throws AMQException { ConnectionCloseCode replyCode = ConnectionCloseCode.NORMAL; @@ -264,7 +263,6 @@ public class ServerConnection extends Connection implements AMQConnectionModel, close(replyCode, message); } - @Override public List getSessionModels() { List sessions = new ArrayList(); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java index 60c94b43c0..5c6206c53c 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java @@ -663,7 +663,6 @@ public class ServerSession extends Session implements PrincipalHolder, SessionCo } } - @Override public String toLogString() { return "[" + diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java index ae58a52046..44da761353 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java @@ -483,13 +483,11 @@ public class AbstractHeadersExchangeTestBase extends InternalBrokerBaseCase return 0; //To change body of implemented methods use File | Settings | File Templates. } - @Override public boolean isDequeued() { return false; } - @Override public boolean isDispensed() { return false; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java index 0ba8eb4792..a3f8f4c0d3 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java @@ -231,13 +231,11 @@ public class MockQueueEntry implements QueueEntry _message = msg; } - @Override public boolean isDequeued() { return false; } - @Override public boolean isDispensed() { return false; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java index 4c21f38363..0e136c523f 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java @@ -795,14 +795,11 @@ public class SimpleAMQQueueTest extends InternalBrokerBaseCase // get messages on the queue with filter accepting all available messages List entries = _queue.getMessagesOnTheQueue(new QueueEntryFilter() { - - @Override public boolean accept(QueueEntry entry) { return true; } - @Override public boolean filterComplete() { return false; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java index 5a9026cb64..ade27ed62b 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManagerTest.java @@ -184,14 +184,11 @@ public class PrincipalDatabaseAuthenticationManagerTest extends InternalBrokerBa { return new SaslServer() { - - @Override public String getMechanismName() { return null; } - @Override public byte[] evaluateResponse(byte[] response) throws SaslException { if (throwSaslException) @@ -201,37 +198,31 @@ public class PrincipalDatabaseAuthenticationManagerTest extends InternalBrokerBa return null; } - @Override public boolean isComplete() { return complete; } - @Override public String getAuthorizationID() { return complete ? "guest" : null; } - @Override public byte[] unwrap(byte[] incoming, int offset, int len) throws SaslException { return null; } - @Override public byte[] wrap(byte[] outgoing, int offset, int len) throws SaslException { return null; } - @Override public Object getNegotiatedProperty(String propName) { return null; } - @Override public void dispose() throws SaslException { } diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java index eb713e3712..0403796a46 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/rmi/RMIPasswordAuthenticatorTest.java @@ -210,31 +210,26 @@ public class RMIPasswordAuthenticatorTest extends TestCase { return new AuthenticationManager() { - @Override public void close() { throw new UnsupportedOperationException(); } - @Override public String getMechanisms() { throw new UnsupportedOperationException(); } - @Override public SaslServer createSaslServer(String mechanism, String localFQDN) throws SaslException { throw new UnsupportedOperationException(); } - @Override public AuthenticationResult authenticate(SaslServer server, byte[] response) { throw new UnsupportedOperationException(); } - @Override public AuthenticationResult authenticate(String username, String password) { if (exception != null) { diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java index 8b3f9c0622..86e4e23750 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/CRAMMD5HexServerTest.java @@ -197,8 +197,6 @@ public class CRAMMD5HexServerTest extends TestCase { return new Principal() { - - @Override public String getName() { return name; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipalTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipalTest.java index 8bff22115e..541f14d923 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipalTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/sasl/UsernamePrincipalTest.java @@ -75,8 +75,6 @@ public class UsernamePrincipalTest extends TestCase final UsernamePrincipal expected = new UsernamePrincipal("name"); final Principal other = new Principal() { - - @Override public String getName() { return "otherprincipal"; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java index 975e3e91b9..15c135ea2c 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockAction.java @@ -32,13 +32,11 @@ class MockAction implements Action private boolean _rollbackFired = false; private boolean _postCommitFired = false; - @Override public void postCommit() { _postCommitFired = true; } - @Override public void onRollback() { _rollbackFired = true; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java index 64c62fd029..422105e410 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockServerMessage.java @@ -46,67 +46,56 @@ class MockServerMessage implements ServerMessage this.persistent = persistent; } - @Override public boolean isPersistent() { return persistent; } - @Override public MessageReference newReference() { throw new NotImplementedException(); } - @Override public boolean isImmediate() { throw new NotImplementedException(); } - @Override public long getSize() { throw new NotImplementedException(); } - @Override public SessionConfig getSessionConfig() { throw new NotImplementedException(); } - @Override public String getRoutingKey() { throw new NotImplementedException(); } - @Override public AMQMessageHeader getMessageHeader() { throw new NotImplementedException(); } - @Override public long getExpiration() { throw new NotImplementedException(); } - @Override public int getContent(ByteBuffer buf, int offset) { throw new NotImplementedException(); } - @Override public long getArrivalTime() { throw new NotImplementedException(); } - @Override public Long getMessageNumber() { return 0L; diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java index 5700bba9f8..ff372532ac 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/MockStoreTransaction.java @@ -61,7 +61,6 @@ class MockStoreTransaction implements Transaction return _state; } - @Override public void enqueueMessage(TransactionLogResource queue, Long messageId) throws AMQStoreException { if (_throwExceptionOnQueueOp) @@ -83,8 +82,6 @@ class MockStoreTransaction implements Transaction return _numberOfEnqueuedMessages; } - - @Override public void dequeueMessage(TransactionLogResource queue, Long messageId) throws AMQStoreException { if (_throwExceptionOnQueueOp) @@ -95,19 +92,16 @@ class MockStoreTransaction implements Transaction _numberOfDequeuedMessages++; } - @Override public void commitTran() throws AMQStoreException { _state = TransactionState.COMMITTED; } - @Override public StoreFuture commitTranAsync() throws AMQStoreException { throw new NotImplementedException(); } - @Override public void abortTran() throws AMQStoreException { _state = TransactionState.ABORTED; @@ -117,14 +111,11 @@ class MockStoreTransaction implements Transaction { return new TransactionLog() { - - @Override public void configureTransactionLog(String name, TransactionLogRecoveryHandler recoveryHandler, Configuration storeConfiguration, LogSubject logSubject) throws Exception { } - - @Override + public Transaction newTransaction() { storeTransaction.setState(TransactionState.STARTED); -- cgit v1.2.1