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:53 UTC
[12/12] qpid-broker-j git commit: NO-JIRA : Add missing @Overrides
NO-JIRA : Add missing @Overrides
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/ec1bd825
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ec1bd825
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ec1bd825
Branch: refs/heads/master
Commit: ec1bd825ae5b70e5b181c3fa9e5529ce5c011422
Parents: ae444b1
Author: rgodfrey <rg...@apache.org>
Authored: Tue Jul 18 12:02:11 2017 +0200
Committer: rgodfrey <rg...@apache.org>
Committed: Tue Jul 18 12:02:11 2017 +0200
----------------------------------------------------------------------
.../berkeleydb/AbstractBDBMessageStore.java | 3 +
.../qpid/server/store/berkeleydb/BDBBackup.java | 1 +
.../berkeleydb/BDBConfiguredObjectRecord.java | 3 +
.../store/berkeleydb/BDBSystemConfig.java | 4 ++
.../store/berkeleydb/CoalescingCommiter.java | 3 +
.../tuple/ConfiguredObjectBinding.java | 2 +
.../berkeleydb/tuple/HierarchyKeyBinding.java | 2 +
.../tuple/PreparedTransactionBinding.java | 5 ++
.../berkeleydb/tuple/StringMapBinding.java | 2 +
.../berkeleydb/tuple/UUIDTupleBinding.java | 2 +
.../berkeleydb/upgrade/UpgradeFrom4To5.java | 9 +++
.../berkeleydb/upgrade/UpgradeFrom5To6.java | 15 ++++
.../upgrade/UpgradeInteractionHandler.java | 1 +
.../berkeleydb/BDBHAVirtualHost.java | 2 +
.../virtualhost/berkeleydb/BDBVirtualHost.java | 3 +
.../berkeleydb/BDBHAVirtualHostNode.java | 7 ++
.../berkeleydb/BDBHAVirtualHostNodeImpl.java | 2 +
.../berkeleydb/BDBVirtualHostNode.java | 2 +
.../berkeleydb/BDBStoreUpgradeTestPreparer.java | 3 +
.../StandardEnvironmentFacadeFactoryTest.java | 1 +
.../StandardEnvironmentFacadeTest.java | 2 +
.../upgrade/MapJsonSerializerTest.java | 1 +
.../berkeleydb/replication/GroupCreator.java | 1 +
.../org/apache/qpid/server/QpidException.java | 1 +
.../server/consumer/AbstractConsumerTarget.java | 4 ++
.../qpid/server/exchange/AbstractExchange.java | 1 +
.../server/exchange/HeadersExchangeImpl.java | 1 +
.../exchange/topic/TopicMatcherDFAState.java | 2 +
.../qpid/server/exchange/topic/TopicWord.java | 1 +
.../server/filter/ArithmeticExpression.java | 11 +++
.../qpid/server/filter/BinaryExpression.java | 3 +
.../server/filter/ComparisonExpression.java | 16 +++++
.../qpid/server/filter/ConstantExpression.java | 5 ++
.../qpid/server/filter/FilterSupport.java | 1 +
.../apache/qpid/server/filter/Filterable.java | 2 +
.../filter/JMSMessagePropertyExpression.java | 14 ++++
.../qpid/server/filter/JMSSelectorFilter.java | 1 +
.../server/filter/JMSSelectorFilterFactory.java | 1 +
.../qpid/server/filter/LogicExpression.java | 6 ++
.../qpid/server/filter/UnaryExpression.java | 13 ++++
.../qpid/server/filter/selector/Token.java | 1 +
.../server/filter/selector/TokenMgrError.java | 1 +
.../server/logging/AbstractMessageLogger.java | 4 ++
.../qpid/server/logging/NullMessageLogger.java | 2 +
.../server/logging/SystemOutMessageLogger.java | 2 +
.../logging/messages/AccessControlMessages.java | 16 +++++
.../AuthenticationProviderMessages.java | 12 ++++
.../logging/messages/BindingMessages.java | 6 ++
.../server/logging/messages/BrokerMessages.java | 30 ++++++++
.../logging/messages/ChannelMessages.java | 28 ++++++++
.../logging/messages/ConfigStoreMessages.java | 10 +++
.../logging/messages/ConnectionMessages.java | 18 +++++
.../logging/messages/ExchangeMessages.java | 8 +++
.../messages/HighAvailabilityMessages.java | 28 ++++++++
.../logging/messages/KeyStoreMessages.java | 12 ++++
.../messages/ManagementConsoleMessages.java | 14 ++++
.../logging/messages/MessageStoreMessages.java | 16 +++++
.../server/logging/messages/PortMessages.java | 20 ++++++
.../server/logging/messages/QueueMessages.java | 12 ++++
.../logging/messages/SubscriptionMessages.java | 8 +++
.../messages/TransactionLogMessages.java | 16 +++++
.../logging/messages/TrustStoreMessages.java | 10 +++
.../logging/messages/VirtualHostMessages.java | 16 +++++
.../logging/subjects/AbstractLogSubject.java | 1 +
.../logging/subjects/ConnectionLogSubject.java | 1 +
.../message/AbstractServerMessageImpl.java | 5 ++
.../qpid/server/message/MessageDestination.java | 3 +-
.../qpid/server/message/MessageInstance.java | 8 +++
.../qpid/server/message/MessageReference.java | 1 +
.../qpid/server/message/RoutingResult.java | 2 +
.../qpid/server/message/ServerMessage.java | 3 +
.../server/model/AbstractConfiguredObject.java | 14 ++++
.../qpid/server/model/AbstractContainer.java | 2 +
.../qpid/server/model/AbstractSystemConfig.java | 5 ++
.../server/model/AbstractUnresolvedObject.java | 1 +
.../server/model/AccessControlProvider.java | 1 +
.../org/apache/qpid/server/model/Broker.java | 5 ++
.../apache/qpid/server/model/BrokerImpl.java | 12 ++++
.../apache/qpid/server/model/BrokerModel.java | 2 +
.../model/ConfiguredAutomatedAttribute.java | 6 ++
.../ConfiguredDerivedInjectedAttribute.java | 5 ++
.../model/ConfiguredDerivedMethodAttribute.java | 5 ++
.../qpid/server/model/ConfiguredObject.java | 2 +
.../ConfiguredObjectInjectedStatistic.java | 1 +
.../ConfiguredSettableInjectedAttribute.java | 12 ++++
.../server/model/DefaultVirtualHostAlias.java | 1 +
.../apache/qpid/server/model/HostNameAlias.java | 1 +
.../qpid/server/model/JsonSystemConfig.java | 1 +
.../qpid/server/model/JsonSystemConfigImpl.java | 2 +
.../qpid/server/model/MemorySystemConfig.java | 1 +
.../qpid/server/model/PatternMatchingAlias.java | 1 +
.../org/apache/qpid/server/model/Queue.java | 2 +
.../server/model/SystemAddressSpaceAlias.java | 1 +
.../apache/qpid/server/model/SystemConfig.java | 1 +
.../model/SystemConfigBootstrapModel.java | 2 +
.../model/VirtualHostAccessControlProvider.java | 1 +
.../adapter/FileBasedGroupProviderImpl.java | 1 +
.../qpid/server/protocol/ProtocolVersion.java | 4 ++
.../server/protocol/v0_8/AMQShortString.java | 3 +
.../qpid/server/protocol/v0_8/AMQType.java | 72 ++++++++++++++++++++
.../server/protocol/v0_8/AMQTypedValue.java | 15 ++++
.../qpid/server/protocol/v0_8/FieldTable.java | 3 +
.../apache/qpid/server/queue/AbstractQueue.java | 43 ++++++++++++
.../server/queue/AbstractQueueEntryList.java | 1 +
.../AssignedConsumerMessageGroupManager.java | 5 ++
.../queue/DefinedGroupMessageGroupManager.java | 5 ++
.../server/queue/MoveMessagesTransaction.java | 1 +
.../qpid/server/queue/NotificationCheck.java | 4 ++
.../server/queue/OrderedQueueEntryList.java | 9 +++
.../qpid/server/queue/PriorityQueueImpl.java | 1 +
.../qpid/server/queue/PriorityQueueList.java | 1 +
.../qpid/server/queue/QueueConsumerImpl.java | 15 ++++
.../qpid/server/queue/QueueEntryImpl.java | 27 ++++++++
.../server/queue/QueueEntryTransaction.java | 1 +
.../qpid/server/queue/SortedQueueEntry.java | 1 +
.../qpid/server/queue/SortedQueueEntryList.java | 11 +++
.../server/queue/StandardQueueEntryList.java | 1 +
.../qpid/server/security/FileKeyStore.java | 1 +
.../qpid/server/security/FileKeyStoreImpl.java | 2 +
.../qpid/server/security/FileTrustStore.java | 1 +
.../server/security/FileTrustStoreImpl.java | 3 +
.../ManagedPeerCertificateTrustStore.java | 1 +
.../qpid/server/security/NonJavaKeyStore.java | 1 +
.../server/security/NonJavaKeyStoreImpl.java | 1 +
.../qpid/server/security/NonJavaTrustStore.java | 1 +
.../access/AbstractAccessControlProvider.java | 2 +
.../server/security/auth/TaskPrincipal.java | 1 +
.../server/security/auth/UsernamePrincipal.java | 2 +
.../AbstractPasswordFilePrincipalDatabase.java | 8 +++
.../Base64MD5PasswordFilePrincipalDatabase.java | 4 ++
.../security/auth/database/HashedUser.java | 10 +++
.../PlainPasswordFilePrincipalDatabase.java | 3 +
.../security/auth/database/PlainUser.java | 10 +++
.../AbstractScramAuthenticationManager.java | 1 +
.../PrincipalDatabaseAuthenticationManager.java | 5 ++
.../sasl/crammd5/AbstractCramMd5Negotiator.java | 1 +
.../auth/sasl/scram/ScramNegotiator.java | 2 +
.../server/security/group/GroupPrincipal.java | 1 +
.../apache/qpid/server/session/AMQPSession.java | 3 +
.../server/session/AbstractAMQPSession.java | 4 ++
.../store/BrokerStoreUpgraderAndRecoverer.java | 1 +
.../qpid/server/store/MemoryMessageStore.java | 2 +
.../qpid/server/store/StoredMemoryMessage.java | 4 ++
.../server/streams/CompositeInputStream.java | 3 +-
.../qpid/server/transport/AMQPConnection.java | 1 +
.../transport/AbstractAMQPConnection.java | 3 +
.../transport/MultiVersionProtocolEngine.java | 4 ++
.../MultiVersionProtocolEngineFactory.java | 1 +
.../NonBlockingConnectionUndecidedDelegate.java | 1 +
.../security/ssl/QpidClientX509KeyManager.java | 10 ++-
.../server/txn/AsyncAutoCommitTransaction.java | 11 +++
.../qpid/server/txn/AutoCommitTransaction.java | 9 +++
.../qpid/server/txn/DistributedTransaction.java | 9 +++
.../org/apache/qpid/server/txn/DtxBranch.java | 1 +
.../qpid/server/txn/LocalTransaction.java | 9 +++
.../org/apache/qpid/server/util/Action.java | 1 +
.../apache/qpid/server/util/NameUUIDGen.java | 1 +
.../apache/qpid/server/util/RandomUUIDGen.java | 1 +
.../org/apache/qpid/server/util/Serial.java | 1 +
.../org/apache/qpid/server/util/Strings.java | 4 ++
.../server/virtualhost/AbstractVirtualHost.java | 25 +++++++
.../AsynchronousMessageStoreRecoverer.java | 2 +
.../server/virtualhost/HouseKeepingTask.java | 1 +
.../virtualhost/ProvidedStoreVirtualHost.java | 2 +
.../virtualhost/QueueManagingVirtualHost.java | 2 +
.../SynchronousMessageStoreRecoverer.java | 2 +
.../virtualhostalias/HostNameAliasImpl.java | 2 +
.../virtualhostnode/JsonVirtualHostNode.java | 2 +
.../apache/qpid/server/SystemLauncherTest.java | 1 +
.../store/ManagementModeStoreHandlerTest.java | 2 +
.../StoreConfigurationChangeListenerTest.java | 1 +
.../configuration/updater/TaskExecutorTest.java | 2 +
.../ConnectionVersionValidatorTest.java | 1 +
.../server/consumer/TestConsumerTarget.java | 10 +++
.../server/exchange/HeadersBindingTest.java | 15 ++++
.../server/exchange/HeadersExchangeTest.java | 1 +
.../server/logging/UnitTestMessageLogger.java | 2 +
.../logging/actors/AMQPConnectionActorTest.java | 3 +
.../logging/actors/BaseActorTestCase.java | 3 +
.../logging/actors/HttpManagementActorTest.java | 3 +
.../subjects/AbstractTestLogSubject.java | 2 +
.../logging/subjects/ChannelLogSubjectTest.java | 1 +
.../subjects/ConnectionLogSubjectTest.java | 1 +
.../server/model/adapter/PortFactoryTest.java | 1 +
.../model/testmodels/hierarchy/TestKitCar.java | 1 +
.../testmodels/hierarchy/TestStandardCar.java | 1 +
.../testmodels/singleton/TestSingletonImpl.java | 1 +
...edAccessControlContextThreadFactoryTest.java | 1 +
.../server/queue/AbstractQueueTestBase.java | 3 +
.../qpid/server/queue/LastValueQueueTest.java | 1 +
.../qpid/server/queue/MockMessageInstance.java | 13 ++++
.../server/queue/PriorityQueueListTest.java | 1 +
.../qpid/server/queue/PriorityQueueTest.java | 1 +
...cerFlowControlOverflowPolicyHandlerTest.java | 1 +
.../server/queue/QueueEntryImplTestBase.java | 1 +
.../queue/RingOverflowPolicyHandlerTest.java | 1 +
.../server/queue/SimpleQueueEntryImplTest.java | 4 ++
.../server/queue/SortedQueueEntryListTest.java | 4 ++
.../qpid/server/queue/SortedQueueEntryTest.java | 4 ++
.../qpid/server/queue/StandardQueueTest.java | 4 ++
.../qpid/server/security/FileKeyStoreTest.java | 1 +
.../server/security/FileTrustStoreTest.java | 1 +
.../auth/AuthenticatedPrincipalTest.java | 1 +
...e64MD5PasswordFilePrincipalDatabaseTest.java | 4 ++
.../PlainPasswordFilePrincipalDatabaseTest.java | 3 +
.../AnonymousAuthenticationManagerTest.java | 1 +
.../SimpleAuthenticationManagerTest.java | 1 +
...pleLDAPAuthenticationManagerFactoryTest.java | 1 +
.../store/MessageStoreQuotaEventsTestBase.java | 3 +
.../qpid/server/store/MessageStoreTestCase.java | 1 +
.../store/TestMessageMetaDataFactory.java | 1 +
.../org/apache/qpid/server/txn/MockAction.java | 2 +
.../qpid/server/txn/MockStoreTransaction.java | 7 ++
.../server/util/ByteBufferInputStreamTest.java | 1 +
.../security/access/config/LegacyOperation.java | 1 +
.../security/access/config/ObjectType.java | 1 +
.../access/config/RuleBasedAccessControl.java | 2 +
.../server/security/access/config/RuleSet.java | 1 +
.../access/firewall/HostnameFirewallRule.java | 1 +
...actCommonRuleBasedAccessControlProvider.java | 1 +
.../AbstractLegacyAccessControlProvider.java | 1 +
.../AclFileAccessControlProviderImpl.java | 1 +
.../config/RuleBasedAccessControlTest.java | 1 +
.../AclFileAccessControlProviderImplTest.java | 1 +
.../protocol/v0_10/ConsumerTarget_0_10.java | 12 ++++
.../protocol/v0_10/CreditCreditManager.java | 5 ++
...ExplicitAcceptDispositionChangeListener.java | 4 ++
...ImplicitAcceptDispositionChangeListener.java | 4 ++
.../v0_10/MessageAcceptCompletionListener.java | 1 +
.../protocol/v0_10/MessageMetaData_0_10.java | 5 ++
.../protocol/v0_10/MessageTransferHeader.java | 14 ++++
.../protocol/v0_10/MessageTransferMessage.java | 4 ++
.../v0_10/ProtocolEngineCreator_0_10.java | 3 +
.../server/protocol/v0_10/SenderException.java | 1 +
.../server/protocol/v0_10/ServerDecoder.java | 34 ++++++---
.../protocol/v0_10/ServerDisassembler.java | 7 ++
.../server/protocol/v0_10/ServerEncoder.java | 36 ++++++++--
.../qpid/server/protocol/v0_10/ServerFrame.java | 1 +
.../protocol/v0_10/ServerInputHandler.java | 1 +
.../server/protocol/v0_10/ServerSession.java | 2 +
.../protocol/v0_10/ServerSessionDelegate.java | 6 ++
.../server/protocol/v0_10/Session_0_10.java | 1 +
.../protocol/v0_10/WindowCreditManager.java | 5 ++
.../v0_10/transport/AbstractDecoder.java | 19 ++++++
.../v0_10/transport/AbstractEncoder.java | 19 ++++++
.../protocol/v0_10/transport/Acquired.java | 6 ++
.../protocol/v0_10/transport/BBDecoder.java | 43 ++++++++----
.../protocol/v0_10/transport/BBEncoder.java | 36 ++++++++--
.../server/protocol/v0_10/transport/Binary.java | 3 +
.../v0_10/transport/ConnectionClose.java | 10 +++
.../v0_10/transport/ConnectionCloseOk.java | 10 +++
.../v0_10/transport/ConnectionHeartbeat.java | 10 +++
.../v0_10/transport/ConnectionOpen.java | 10 +++
.../v0_10/transport/ConnectionOpenOk.java | 10 +++
.../v0_10/transport/ConnectionRedirect.java | 10 +++
.../v0_10/transport/ConnectionSecure.java | 10 +++
.../v0_10/transport/ConnectionSecureOk.java | 10 +++
.../v0_10/transport/ConnectionStart.java | 10 +++
.../v0_10/transport/ConnectionStartOk.java | 10 +++
.../v0_10/transport/ConnectionTune.java | 10 +++
.../v0_10/transport/ConnectionTuneOk.java | 10 +++
.../v0_10/transport/DeliveryProperties.java | 7 ++
.../protocol/v0_10/transport/DtxCommit.java | 10 +++
.../server/protocol/v0_10/transport/DtxEnd.java | 10 +++
.../protocol/v0_10/transport/DtxForget.java | 10 +++
.../protocol/v0_10/transport/DtxGetTimeout.java | 10 +++
.../protocol/v0_10/transport/DtxPrepare.java | 10 +++
.../protocol/v0_10/transport/DtxRecover.java | 10 +++
.../protocol/v0_10/transport/DtxRollback.java | 10 +++
.../protocol/v0_10/transport/DtxSelect.java | 10 +++
.../protocol/v0_10/transport/DtxSetTimeout.java | 10 +++
.../protocol/v0_10/transport/DtxStart.java | 10 +++
.../protocol/v0_10/transport/ExchangeBind.java | 10 +++
.../protocol/v0_10/transport/ExchangeBound.java | 10 +++
.../v0_10/transport/ExchangeBoundResult.java | 6 ++
.../v0_10/transport/ExchangeDeclare.java | 10 +++
.../v0_10/transport/ExchangeDelete.java | 10 +++
.../protocol/v0_10/transport/ExchangeQuery.java | 10 +++
.../v0_10/transport/ExchangeQueryResult.java | 6 ++
.../v0_10/transport/ExchangeUnbind.java | 10 +++
.../v0_10/transport/ExecutionException.java | 10 +++
.../v0_10/transport/ExecutionResult.java | 10 +++
.../protocol/v0_10/transport/ExecutionSync.java | 10 +++
.../v0_10/transport/FragmentProperties.java | 6 ++
.../server/protocol/v0_10/transport/Frame.java | 2 +
.../v0_10/transport/GetTimeoutResult.java | 6 ++
.../server/protocol/v0_10/transport/Header.java | 1 +
.../protocol/v0_10/transport/MessageAccept.java | 10 +++
.../v0_10/transport/MessageAcquire.java | 10 +++
.../protocol/v0_10/transport/MessageCancel.java | 10 +++
.../protocol/v0_10/transport/MessageFlow.java | 10 +++
.../protocol/v0_10/transport/MessageFlush.java | 10 +++
.../v0_10/transport/MessageProperties.java | 6 ++
.../protocol/v0_10/transport/MessageReject.java | 10 +++
.../v0_10/transport/MessageRelease.java | 10 +++
.../protocol/v0_10/transport/MessageResume.java | 10 +++
.../v0_10/transport/MessageResumeResult.java | 6 ++
.../v0_10/transport/MessageSetFlowMode.java | 10 +++
.../protocol/v0_10/transport/MessageStop.java | 10 +++
.../v0_10/transport/MessageSubscribe.java | 10 +++
.../v0_10/transport/MessageTransfer.java | 12 ++++
.../server/protocol/v0_10/transport/Method.java | 5 ++
.../protocol/v0_10/transport/ProtocolError.java | 7 ++
.../v0_10/transport/ProtocolHeader.java | 7 ++
.../protocol/v0_10/transport/QueueDeclare.java | 10 +++
.../protocol/v0_10/transport/QueueDelete.java | 10 +++
.../protocol/v0_10/transport/QueuePurge.java | 10 +++
.../protocol/v0_10/transport/QueueQuery.java | 10 +++
.../v0_10/transport/QueueQueryResult.java | 6 ++
.../server/protocol/v0_10/transport/Range.java | 33 +++++++++
.../protocol/v0_10/transport/RangeSet.java | 1 +
.../protocol/v0_10/transport/RangeSetImpl.java | 13 ++++
.../protocol/v0_10/transport/RecoverResult.java | 6 ++
.../protocol/v0_10/transport/ReplyTo.java | 8 +++
.../protocol/v0_10/transport/SessionAttach.java | 10 +++
.../v0_10/transport/SessionAttached.java | 10 +++
.../v0_10/transport/SessionCommandFragment.java | 6 ++
.../v0_10/transport/SessionCommandPoint.java | 10 +++
.../v0_10/transport/SessionCompleted.java | 10 +++
.../v0_10/transport/SessionConfirmed.java | 10 +++
.../protocol/v0_10/transport/SessionDetach.java | 10 +++
.../v0_10/transport/SessionDetached.java | 10 +++
.../v0_10/transport/SessionExpected.java | 10 +++
.../protocol/v0_10/transport/SessionFlush.java | 10 +++
.../protocol/v0_10/transport/SessionGap.java | 10 +++
.../protocol/v0_10/transport/SessionHeader.java | 6 ++
.../v0_10/transport/SessionKnownCompleted.java | 10 +++
.../v0_10/transport/SessionRequestTimeout.java | 10 +++
.../v0_10/transport/SessionTimeout.java | 10 +++
.../server/protocol/v0_10/transport/Struct.java | 3 +
.../protocol/v0_10/transport/TxCommit.java | 10 +++
.../protocol/v0_10/transport/TxRollback.java | 10 +++
.../protocol/v0_10/transport/TxSelect.java | 10 +++
.../protocol/v0_10/transport/XaResult.java | 6 ++
.../server/protocol/v0_10/transport/Xid.java | 6 ++
.../v0_10/ServerSessionDelegateTest.java | 1 +
.../protocol/v0_10/WindowCreditManagerTest.java | 1 +
.../qpid/server/protocol/v0_8/AMQChannel.java | 3 +
.../qpid/server/protocol/v0_8/AMQMessage.java | 4 ++
.../protocol/v0_8/ConsumerTarget_0_8.java | 8 +++
.../v0_8/InfiniteCreditCreditManager.java | 3 +
.../v0_8/MessageConverter_Internal_to_v0_8.java | 1 +
.../server/protocol/v0_8/MessageMetaData.java | 20 ++++++
.../protocol/v0_8/Pre0_10CreditManager.java | 3 +
.../v0_8/ProtocolEngineCreator_0_8.java | 3 +
.../v0_8/ProtocolEngineCreator_0_9.java | 3 +
.../v0_8/ProtocolEngineCreator_0_9_1.java | 3 +
.../v0_8/ProtocolOutputConverterImpl.java | 14 ++++
.../server/protocol/v0_8/ServerDecoder.java | 1 +
.../protocol/v0_8/transport/AMQFrame.java | 2 +
.../protocol/v0_8/transport/AMQMethodBody.java | 2 +
.../v0_8/transport/AMQMethodBodyImpl.java | 4 ++
.../protocol/v0_8/transport/AMQMethodEvent.java | 1 +
.../v0_8/transport/AccessRequestBody.java | 6 ++
.../v0_8/transport/AccessRequestOkBody.java | 6 ++
.../protocol/v0_8/transport/BasicAckBody.java | 6 ++
.../v0_8/transport/BasicCancelBody.java | 6 ++
.../v0_8/transport/BasicCancelOkBody.java | 6 ++
.../v0_8/transport/BasicConsumeBody.java | 6 ++
.../v0_8/transport/BasicConsumeOkBody.java | 6 ++
.../v0_8/transport/BasicDeliverBody.java | 6 ++
.../protocol/v0_8/transport/BasicGetBody.java | 6 ++
.../v0_8/transport/BasicGetEmptyBody.java | 6 ++
.../protocol/v0_8/transport/BasicGetOkBody.java | 6 ++
.../protocol/v0_8/transport/BasicNackBody.java | 6 ++
.../v0_8/transport/BasicPublishBody.java | 6 ++
.../protocol/v0_8/transport/BasicQosBody.java | 6 ++
.../protocol/v0_8/transport/BasicQosOkBody.java | 6 ++
.../v0_8/transport/BasicRecoverBody.java | 6 ++
.../v0_8/transport/BasicRecoverSyncBody.java | 6 ++
.../v0_8/transport/BasicRecoverSyncOkBody.java | 6 ++
.../v0_8/transport/BasicRejectBody.java | 6 ++
.../v0_8/transport/BasicReturnBody.java | 6 ++
.../v0_8/transport/ChannelAlertBody.java | 6 ++
.../v0_8/transport/ChannelCloseBody.java | 6 ++
.../v0_8/transport/ChannelCloseOkBody.java | 6 ++
.../v0_8/transport/ChannelFlowBody.java | 6 ++
.../v0_8/transport/ChannelFlowOkBody.java | 6 ++
.../v0_8/transport/ChannelOpenBody.java | 6 ++
.../v0_8/transport/ChannelOpenOkBody.java | 6 ++
.../v0_8/transport/CompositeAMQDataBlock.java | 2 +
.../v0_8/transport/ConfirmSelectBody.java | 6 ++
.../v0_8/transport/ConfirmSelectOkBody.java | 6 ++
.../v0_8/transport/ConnectionCloseBody.java | 6 ++
.../v0_8/transport/ConnectionCloseOkBody.java | 6 ++
.../v0_8/transport/ConnectionOpenBody.java | 6 ++
.../v0_8/transport/ConnectionOpenOkBody.java | 6 ++
.../v0_8/transport/ConnectionRedirectBody.java | 6 ++
.../v0_8/transport/ConnectionSecureBody.java | 6 ++
.../v0_8/transport/ConnectionSecureOkBody.java | 6 ++
.../v0_8/transport/ConnectionStartBody.java | 6 ++
.../v0_8/transport/ConnectionStartOkBody.java | 6 ++
.../v0_8/transport/ConnectionTuneBody.java | 6 ++
.../v0_8/transport/ConnectionTuneOkBody.java | 6 ++
.../protocol/v0_8/transport/ContentBody.java | 3 +
.../v0_8/transport/ContentHeaderBody.java | 3 +
.../v0_8/transport/ExchangeBoundBody.java | 6 ++
.../v0_8/transport/ExchangeBoundOkBody.java | 6 ++
.../v0_8/transport/ExchangeDeclareBody.java | 6 ++
.../v0_8/transport/ExchangeDeclareOkBody.java | 6 ++
.../v0_8/transport/ExchangeDeleteBody.java | 6 ++
.../v0_8/transport/ExchangeDeleteOkBody.java | 6 ++
.../protocol/v0_8/transport/HeartbeatBody.java | 3 +
.../v0_8/transport/ProtocolInitiation.java | 2 +
.../protocol/v0_8/transport/QueueBindBody.java | 6 ++
.../v0_8/transport/QueueBindOkBody.java | 6 ++
.../v0_8/transport/QueueDeclareBody.java | 6 ++
.../v0_8/transport/QueueDeclareOkBody.java | 6 ++
.../v0_8/transport/QueueDeleteBody.java | 6 ++
.../v0_8/transport/QueueDeleteOkBody.java | 6 ++
.../protocol/v0_8/transport/QueuePurgeBody.java | 6 ++
.../v0_8/transport/QueuePurgeOkBody.java | 6 ++
.../v0_8/transport/QueueUnbindBody.java | 6 ++
.../v0_8/transport/QueueUnbindOkBody.java | 6 ++
.../transport/ServerChannelMethodProcessor.java | 1 +
.../protocol/v0_8/transport/TxCommitBody.java | 6 ++
.../protocol/v0_8/transport/TxCommitOkBody.java | 6 ++
.../protocol/v0_8/transport/TxRollbackBody.java | 6 ++
.../v0_8/transport/TxRollbackOkBody.java | 6 ++
.../protocol/v0_8/transport/TxSelectBody.java | 6 ++
.../protocol/v0_8/transport/TxSelectOkBody.java | 6 ++
.../org/apache/qpid/server/url/BindingURL.java | 1 +
.../qpid/server/url/URLSyntaxException.java | 1 +
.../server/protocol/v0_8/AMQDecoderTest.java | 1 +
.../protocol/v0_8/ReferenceCountingTest.java | 1 +
.../BasicContentHeaderPropertiesTest.java | 1 +
.../transport/MessagePublishInfoImplTest.java | 1 +
.../v1_0/AbstractReceivingLinkEndpoint.java | 1 +
.../protocol/v1_0/ConsumerTarget_1_0.java | 7 ++
.../protocol/v1_0/ExchangeDestination.java | 3 +
.../v1_0/MessageConverter_Internal_to_v1_0.java | 2 +
.../protocol/v1_0/MessageMetaData_1_0.java | 19 ++++++
.../qpid/server/protocol/v1_0/Message_1_0.java | 3 +
.../protocol/v1_0/NodeReceivingDestination.java | 3 +
.../v1_0/ProtocolEngineCreator_1_0_0.java | 3 +
.../v1_0/ProtocolEngineCreator_1_0_0_SASL.java | 3 +
.../server/protocol/v1_0/QueueDestination.java | 5 ++
.../protocol/v1_0/SendingLinkEndpoint.java | 4 ++
.../server/protocol/v1_0/SequenceNumber.java | 1 +
.../v1_0/StandardReceivingLinkEndpoint.java | 2 +
.../v1_0/codec/ArrayTypeConstructor.java | 1 +
.../protocol/v1_0/codec/BinaryString.java | 2 +
.../v1_0/codec/CompoundTypeConstructor.java | 8 +++
.../codec/DefaultDescribedTypeConstructor.java | 1 +
.../protocol/v1_0/codec/ValueHandler.java | 1 +
.../protocol/v1_0/framing/FrameHandler.java | 2 +
.../v1_0/messaging/SectionEncoderImpl.java | 1 +
.../qpid/server/protocol/v1_0/type/Binary.java | 3 +
.../qpid/server/protocol/v1_0/type/Symbol.java | 4 ++
.../server/protocol/v1_0/type/UnsignedByte.java | 1 +
.../protocol/v1_0/type/UnsignedInteger.java | 1 +
.../server/protocol/v1_0/type/UnsignedLong.java | 1 +
.../protocol/v1_0/type/UnsignedShort.java | 2 +
.../type/codec/AMQPDescribedTypeRegistry.java | 4 ++
.../v1_0/type/messaging/AmqpSequence.java | 1 +
.../type/messaging/ApplicationProperties.java | 1 +
.../protocol/v1_0/type/messaging/Data.java | 1 +
.../v1_0/type/messaging/StdDistMode.java | 2 +
.../v1_0/type/messaging/TerminusDurability.java | 2 +
.../type/messaging/TerminusExpiryPolicy.java | 2 +
.../messaging/codec/AcceptedConstructor.java | 1 +
.../codec/AmqpSequenceConstructor.java | 1 +
.../messaging/codec/AmqpValueConstructor.java | 1 +
.../codec/ApplicationPropertiesConstructor.java | 1 +
.../type/messaging/codec/DataConstructor.java | 1 +
.../codec/DeleteOnCloseConstructor.java | 1 +
.../codec/DeleteOnNoLinksConstructor.java | 1 +
.../DeleteOnNoLinksOrMessagesConstructor.java | 1 +
.../codec/DeleteOnNoMessagesConstructor.java | 1 +
.../codec/DeliveryAnnotationsConstructor.java | 1 +
.../codec/ExactSubjectFilterConstructor.java | 1 +
.../type/messaging/codec/FooterConstructor.java | 1 +
.../type/messaging/codec/HeaderConstructor.java | 1 +
.../codec/JMSSelectorFilterConstructor.java | 1 +
.../codec/MatchingSubjectFilterConstructor.java | 1 +
.../codec/MessageAnnotationsConstructor.java | 1 +
.../messaging/codec/ModifiedConstructor.java | 1 +
.../codec/NoLocalFilterConstructor.java | 1 +
.../messaging/codec/PropertiesConstructor.java | 1 +
.../messaging/codec/ReceivedConstructor.java | 1 +
.../messaging/codec/RejectedConstructor.java | 1 +
.../messaging/codec/ReleasedConstructor.java | 1 +
.../type/messaging/codec/SourceConstructor.java | 1 +
.../type/messaging/codec/TargetConstructor.java | 1 +
.../v1_0/type/security/SaslChallenge.java | 1 +
.../protocol/v1_0/type/security/SaslCode.java | 2 +
.../protocol/v1_0/type/security/SaslInit.java | 1 +
.../v1_0/type/security/SaslMechanisms.java | 1 +
.../v1_0/type/security/SaslOutcome.java | 1 +
.../v1_0/type/security/SaslResponse.java | 1 +
.../codec/SaslChallengeConstructor.java | 1 +
.../security/codec/SaslInitConstructor.java | 1 +
.../codec/SaslMechanismsConstructor.java | 1 +
.../security/codec/SaslOutcomeConstructor.java | 1 +
.../security/codec/SaslResponseConstructor.java | 1 +
.../type/transaction/TransactionErrors.java | 2 +
.../v1_0/type/transaction/TxnCapabilities.java | 2 +
.../v1_0/type/transaction/TxnCapability.java | 2 +
.../codec/CoordinatorConstructor.java | 1 +
.../transaction/codec/DeclareConstructor.java | 1 +
.../transaction/codec/DeclaredConstructor.java | 1 +
.../transaction/codec/DischargeConstructor.java | 1 +
.../codec/TransactionalStateConstructor.java | 1 +
.../protocol/v1_0/type/transport/Attach.java | 1 +
.../protocol/v1_0/type/transport/Begin.java | 1 +
.../protocol/v1_0/type/transport/Close.java | 2 +
.../v1_0/type/transport/ConnectionError.java | 2 +
.../protocol/v1_0/type/transport/Detach.java | 2 +
.../v1_0/type/transport/Disposition.java | 1 +
.../protocol/v1_0/type/transport/End.java | 2 +
.../protocol/v1_0/type/transport/Flow.java | 1 +
.../protocol/v1_0/type/transport/LinkError.java | 2 +
.../v1_0/type/transport/ReceiverSettleMode.java | 2 +
.../protocol/v1_0/type/transport/Role.java | 2 +
.../v1_0/type/transport/SenderSettleMode.java | 2 +
.../v1_0/type/transport/SessionError.java | 2 +
.../protocol/v1_0/type/transport/Transfer.java | 1 +
.../type/transport/codec/AttachConstructor.java | 1 +
.../type/transport/codec/BeginConstructor.java | 1 +
.../type/transport/codec/CloseConstructor.java | 1 +
.../type/transport/codec/DetachConstructor.java | 1 +
.../transport/codec/DispositionConstructor.java | 1 +
.../type/transport/codec/EndConstructor.java | 1 +
.../type/transport/codec/ErrorConstructor.java | 2 +
.../type/transport/codec/FlowConstructor.java | 1 +
.../type/transport/codec/OpenConstructor.java | 1 +
.../transport/codec/TransferConstructor.java | 1 +
.../MessageConverter_1_0_to_v0_10.java | 1 +
.../v0_8_v1_0/MessageConverter_0_8_to_1_0.java | 1 +
.../v0_8_v1_0/MessageConverter_1_0_to_v0_8.java | 1 +
.../server/store/derby/DerbySystemConfig.java | 4 ++
.../virtualhost/derby/DerbyVirtualHost.java | 3 +
.../derby/DerbyVirtualHostNode.java | 2 +
.../derby/DerbyVirtualHostNodeTest.java | 1 +
.../bonecp/BoneCPConnectionProviderFactory.java | 1 +
.../store/jdbc/AbstractJDBCMessageStore.java | 2 +
.../jdbc/GenericAbstractJDBCMessageStore.java | 1 +
.../store/jdbc/GenericJDBCMessageStore.java | 1 +
.../jdbc/JDBCConnectionProviderFactory.java | 1 +
.../server/store/jdbc/JDBCSystemConfig.java | 6 ++
.../virtualhost/jdbc/JDBCVirtualHost.java | 5 ++
.../jdbc/JDBCVirtualHostNode.java | 6 ++
...kerUserOrConnectionLogInclusionRuleImpl.java | 1 +
.../logback/LoggerNameAndLevelFilter.java | 1 +
.../PredicateAndLoggerNameAndLevelFilter.java | 1 +
.../logging/logback/RecordEventAppender.java | 2 +
.../logback/RollingPolicyDecoratorTest.java | 2 +
.../logging/logback/RolloverWatcherTest.java | 1 +
.../VirtualHostLogEventExcludingFilterTest.java | 1 +
.../management/plugin/servlet/FileServlet.java | 1 +
.../management/plugin/servlet/query/Token.java | 1 +
.../plugin/servlet/query/TokenMgrError.java | 1 +
.../plugin/servlet/rest/BrokerQueryServlet.java | 4 ++
.../servlet/rest/VirtualHostQueryServlet.java | 3 +
.../main/java/org/apache/qpid/server/Main.java | 1 +
.../java/org/apache/qpid/test/utils/Piper.java | 1 +
.../test/utils/QpidJmsClient0xProvider.java | 1 +
.../client/AMQQueueDeferredOrderingTest.java | 3 +
.../qpid/client/AsynchMessageListenerTest.java | 1 +
.../client/failover/FailoverBehaviourTest.java | 1 +
.../message/AMQPEncodedMapMessageTest.java | 2 +
.../client/prefetch/PrefetchBehaviourTest.java | 2 +
.../qpid/client/session/ExchangeDeleteTest.java | 1 +
.../qpid/client/session/QueueDeclareTest.java | 1 +
.../qpid/client/session/QueueDeleteTest.java | 1 +
.../server/SupportedProtocolVersionsTest.java | 1 +
.../ReturnUnroutableMandatoryMessageTest.java | 1 +
.../server/failover/FailoverMethodTest.java | 1 +
.../logging/AccessControlLoggingTest.java | 1 +
.../server/logging/DurableQueueLoggingTest.java | 1 +
.../logging/TransientQueueLoggingTest.java | 1 +
.../qpid/server/queue/ConsumerPriorityTest.java | 1 +
.../queue/DeepQueueConsumeWithSelector.java | 1 +
.../qpid/server/queue/DefaultFiltersTest.java | 1 +
.../server/queue/MessageGroupQueueTest.java | 1 +
.../MultipleTransactedBatchProducerTest.java | 3 +
.../queue/NodeAutoCreationPolicyTest.java | 2 +
.../qpid/server/queue/PriorityQueueTest.java | 2 +
.../server/queue/ProducerFlowControlTest.java | 1 +
.../apache/qpid/server/queue/QueueBindTest.java | 1 +
.../qpid/server/queue/SortedQueueTest.java | 3 +
.../security/acl/AbstractACLTestCase.java | 6 ++
.../qpid/systest/rest/ConnectionRestTest.java | 1 +
.../apache/qpid/systest/rest/QueueRestTest.java | 1 +
.../org/apache/qpid/test/client/DupsOkTest.java | 1 +
.../test/client/QueueBrowserClientAckTest.java | 1 +
.../test/client/QueueBrowserDupsOkTest.java | 1 +
.../qpid/test/client/QueueBrowserNoAckTest.java | 1 +
.../test/client/QueueBrowserPreAckTest.java | 1 +
.../test/client/QueueBrowserTransactedTest.java | 1 +
.../qpid/test/client/RollbackOrderTest.java | 1 +
.../test/client/message/JMSDestinationTest.java | 1 +
.../test/client/message/ObjectMessageTest.java | 2 +
.../qpid/test/client/message/SelectorTest.java | 2 +
.../test/unit/ack/AcknowledgeOnMessageTest.java | 1 +
.../apache/qpid/test/unit/ack/RecoverTest.java | 2 +
.../qpid/test/unit/basic/BytesMessageTest.java | 3 +
.../test/unit/basic/FieldTableMessageTest.java | 3 +
.../qpid/test/unit/basic/MapMessageTest.java | 1 +
.../test/unit/basic/MultipleConnectionTest.java | 2 +
.../qpid/test/unit/basic/ObjectMessageTest.java | 4 ++
.../qpid/test/unit/basic/PropertyValueTest.java | 3 +
.../qpid/test/unit/basic/SessionStartTest.java | 1 +
.../qpid/test/unit/basic/TextMessageTest.java | 3 +
.../test/unit/client/MaxDeliveryCountTest.java | 1 +
.../CloseWithBlockingReceiveTest.java | 1 +
.../client/connection/ConnectionStartTest.java | 1 +
.../connection/ExceptionListenerTest.java | 4 ++
.../unit/client/message/ObjectMessageTest.java | 6 ++
.../unit/close/TopicPublisherCloseTest.java | 2 +
.../test/unit/message/StreamMessageTest.java | 1 +
.../unit/transacted/CommitRollbackTest.java | 1 +
.../unit/transacted/TransactionTimeoutTest.java | 1 +
.../qpid/transport/ProtocolNegotiationTest.java | 1 +
.../org/apache/qpid/util/LogMonitorTest.java | 1 +
.../java/org/apache/qpid/testkit/Client.java | 1 +
.../java/org/apache/qpid/testkit/Receiver.java | 1 +
.../org/apache/qpid/testkit/TestLauncher.java | 8 ++-
.../qpid/tools/MemoryConsumptionTestClient.java | 1 +
.../qpid/tools/MercuryConsumerController.java | 4 +-
.../qpid/tools/MercuryProducerController.java | 5 +-
.../qpid/tools/MercuryTestController.java | 2 +
.../java/org/apache/qpid/tools/QpidBench.java | 10 +++
.../java/org/apache/qpid/tools/QpidReceive.java | 3 +-
.../org/apache/qpid/tools/StressTestClient.java | 1 +
.../qpid/tools/report/MercuryReporter.java | 14 +++-
.../apache/qpid/tools/report/Statistics.java | 6 +-
627 files changed, 2971 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
index e6262a6..f84b02c 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
@@ -143,6 +143,7 @@ public abstract class AbstractBDBMessageStore implements MessageStore
return message;
}
+ @Override
public long getNextMessageId()
{
long newMessageId;
@@ -1498,11 +1499,13 @@ public abstract class AbstractBDBMessageStore implements MessageStore
_messageNumber = messageNumber;
}
+ @Override
public long getMessageNumber()
{
return _messageNumber;
}
+ @Override
public UUID getQueueId()
{
return _queueId;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
index 53f74aa..cd67da9 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackup.java
@@ -239,6 +239,7 @@ public class BDBBackup
// List all .jdb files in the directory.
fileSet = fromDirFile.listFiles(new FilenameFilter()
{
+ @Override
public boolean accept(File dir, String name)
{
return name.endsWith(LOG_FILE_SUFFIX);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java
index 6db6217..3a6a9f0 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBConfiguredObjectRecord.java
@@ -41,16 +41,19 @@ public class BDBConfiguredObjectRecord implements ConfiguredObjectRecord
_attributes = Collections.unmodifiableMap(attributes);
}
+ @Override
public UUID getId()
{
return _id;
}
+ @Override
public String getType()
{
return _type;
}
+ @Override
public Map<String, Object> getAttributes()
{
return _attributes;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfig.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfig.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfig.java
index c98f2c9..94df210 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfig.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBSystemConfig.java
@@ -30,15 +30,19 @@ import org.apache.qpid.server.store.preferences.PreferenceStoreProvider;
public interface BDBSystemConfig<X extends BDBSystemConfig<X>> extends SystemConfig<X>, FileBasedSettings,
SizeMonitoringSettings, PreferenceStoreProvider
{
+ @Override
@ManagedAttribute(defaultValue = "${qpid.work_dir}${file.separator}config")
String getStorePath();
+ @Override
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreUnderfullSize();
+ @Override
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreOverfullSize();
+ @Override
@ManagedAttribute( description = "Configuration for the preference store, e.g. type, path, etc.",
defaultValue = "{\"type\": \"Provided\"}")
PreferenceStoreAttributes getPreferenceStoreAttributes();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
index 56bedd5..3dceae4 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/CoalescingCommiter.java
@@ -103,11 +103,13 @@ public class CoalescingCommiter implements Committer
_future = future;
}
+ @Override
public void complete()
{
_future.set(_value);
}
+ @Override
public void abort(RuntimeException databaseException)
{
_future.setException(databaseException);
@@ -155,6 +157,7 @@ public class CoalescingCommiter implements Committer
}
}
+ @Override
public void run()
{
while (!_stopped.get())
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
index ac3bb12..37ddfbf 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/ConfiguredObjectBinding.java
@@ -51,6 +51,7 @@ public class ConfiguredObjectBinding extends TupleBinding<ConfiguredObjectRecord
_uuid = uuid;
}
+ @Override
public BDBConfiguredObjectRecord entryToObject(TupleInput tupleInput)
{
String type = tupleInput.readString();
@@ -70,6 +71,7 @@ public class ConfiguredObjectBinding extends TupleBinding<ConfiguredObjectRecord
}
+ @Override
public void objectToEntry(ConfiguredObjectRecord object, TupleOutput tupleOutput)
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/HierarchyKeyBinding.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/HierarchyKeyBinding.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/HierarchyKeyBinding.java
index bd9747c..7135734 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/HierarchyKeyBinding.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/HierarchyKeyBinding.java
@@ -40,6 +40,7 @@ public class HierarchyKeyBinding extends TupleBinding<HierarchyKey>
/** private constructor forces getInstance instead */
private HierarchyKeyBinding() { }
+ @Override
public HierarchyKey entryToObject(TupleInput tupleInput)
{
UUID childId = new UUID(tupleInput.readLong(), tupleInput.readLong());
@@ -48,6 +49,7 @@ public class HierarchyKeyBinding extends TupleBinding<HierarchyKey>
return new HierarchyKey(childId, parentType);
}
+ @Override
public void objectToEntry(HierarchyKey hk, TupleOutput tupleOutput)
{
UUID uuid = hk.getChildId();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
index 23e302a..707d17f 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/PreparedTransactionBinding.java
@@ -132,26 +132,31 @@ public class PreparedTransactionBinding
_queueId = queueId;
}
+ @Override
public TransactionLogResource getResource()
{
return this;
}
+ @Override
public EnqueueableMessage getMessage()
{
return this;
}
+ @Override
public long getMessageNumber()
{
return _messageNumber;
}
+ @Override
public boolean isPersistent()
{
return true;
}
+ @Override
public StoredMessage<?> getStoredMessage()
{
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java
index 15f3195..fffdb0d 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/StringMapBinding.java
@@ -31,6 +31,7 @@ public class StringMapBinding extends TupleBinding<Map<String,String>>
{
private static final StringMapBinding INSTANCE = new StringMapBinding();
+ @Override
public Map<String, String> entryToObject(final TupleInput tupleInput)
{
int entries = tupleInput.readInt();
@@ -42,6 +43,7 @@ public class StringMapBinding extends TupleBinding<Map<String,String>>
return map;
}
+ @Override
public void objectToEntry(final Map<String, String> stringStringMap, final TupleOutput tupleOutput)
{
tupleOutput.writeInt(stringStringMap.size());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java
index f8657cd..9575a93 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/tuple/UUIDTupleBinding.java
@@ -30,11 +30,13 @@ public class UUIDTupleBinding extends TupleBinding<UUID>
{
private static final UUIDTupleBinding INSTANCE = new UUIDTupleBinding();
+ @Override
public UUID entryToObject(final TupleInput tupleInput)
{
return new UUID(tupleInput.readLong(), tupleInput.readLong());
}
+ @Override
public void objectToEntry(final UUID uuid, final TupleOutput tupleOutput)
{
tupleOutput.writeLong(uuid.getMostSignificantBits());
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
index f41ca1d..b3e376f 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom4To5.java
@@ -74,6 +74,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
private static final Logger _logger = LoggerFactory.getLogger(UpgradeFrom4To5.class);
+ @Override
public void performUpgrade(final Environment environment, final UpgradeInteractionHandler handler, ConfiguredObject<?> parent)
{
Transaction transaction = null;
@@ -719,6 +720,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
static final class MessageContentKeyBinding extends TupleBinding<MessageContentKey>
{
+ @Override
public MessageContentKey entryToObject(TupleInput tupleInput)
{
long messageId = tupleInput.readLong();
@@ -726,6 +728,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
return new MessageContentKey(messageId, chunk);
}
+ @Override
public void objectToEntry(MessageContentKey object, TupleOutput tupleOutput)
{
final MessageContentKey mk = object;
@@ -737,6 +740,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
static final class ContentBinding extends TupleBinding<ByteBuffer>
{
+ @Override
public ByteBuffer entryToObject(TupleInput tupleInput)
{
final int size = tupleInput.readInt();
@@ -745,6 +749,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
return ByteBuffer.wrap(underlying);
}
+ @Override
public void objectToEntry(ByteBuffer src, TupleOutput tupleOutput)
{
src = src.slice();
@@ -782,6 +787,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
static final class QueueEntryKeyBinding extends TupleBinding<QueueEntryKey>
{
+ @Override
public QueueEntryKey entryToObject(TupleInput tupleInput)
{
AMQShortString queueName = AMQShortStringEncoding.readShortString(tupleInput);
@@ -789,6 +795,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
return new QueueEntryKey(queueName, messageId);
}
+ @Override
public void objectToEntry(QueueEntryKey mk, TupleOutput tupleOutput)
{
AMQShortStringEncoding.writeShortString(mk.getQueueName(), tupleOutput);
@@ -836,6 +843,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
static final class BindingTuple extends TupleBinding<BindingRecord>
{
+ @Override
public BindingRecord entryToObject(TupleInput tupleInput)
{
AMQShortString exchangeName = AMQShortStringEncoding.readShortString(tupleInput);
@@ -847,6 +855,7 @@ public class UpgradeFrom4To5 extends AbstractStoreUpgrade
return new BindingRecord(exchangeName, queueName, routingKey, arguments);
}
+ @Override
public void objectToEntry(BindingRecord binding, TupleOutput tupleOutput)
{
AMQShortStringEncoding.writeShortString(binding.getExchangeName(), tupleOutput);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
index 19560e0..ffdcd09 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
@@ -120,6 +120,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
* Queue, Exchange, Bindings entries are stored now as configurable objects
* in "CONFIGURED_OBJECTS" table.
*/
+ @Override
public void performUpgrade(final Environment environment, final UpgradeInteractionHandler handler, ConfiguredObject<?> parent)
{
reportStarting(environment, 5);
@@ -782,6 +783,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
static class UpgradeQueueBinding extends TupleBinding<OldQueueRecord>
{
+ @Override
public OldQueueRecord entryToObject(TupleInput tupleInput)
{
AMQShortString name = AMQShortStringEncoding.readShortString(tupleInput);
@@ -791,6 +793,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
return new OldQueueRecord(name, owner, exclusive, arguments);
}
+ @Override
public void objectToEntry(OldQueueRecord queue, TupleOutput tupleOutput)
{
AMQShortStringEncoding.writeShortString(queue.getNameShortString(), tupleOutput);
@@ -802,11 +805,13 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
static class UpgradeUUIDBinding extends TupleBinding<UUID>
{
+ @Override
public UUID entryToObject(final TupleInput tupleInput)
{
return new UUID(tupleInput.readLong(), tupleInput.readLong());
}
+ @Override
public void objectToEntry(final UUID uuid, final TupleOutput tupleOutput)
{
tupleOutput.writeLong(uuid.getMostSignificantBits());
@@ -817,6 +822,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
static class ConfiguredObjectBinding extends TupleBinding<UpgradeConfiguredObjectRecord>
{
+ @Override
public UpgradeConfiguredObjectRecord entryToObject(TupleInput tupleInput)
{
String type = tupleInput.readString();
@@ -825,6 +831,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
return configuredObject;
}
+ @Override
public void objectToEntry(UpgradeConfiguredObjectRecord object, TupleOutput tupleOutput)
{
tupleOutput.writeString(object.getType());
@@ -866,6 +873,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
static class ExchangeBinding extends TupleBinding<ExchangeRecord>
{
+ @Override
public ExchangeRecord entryToObject(TupleInput tupleInput)
{
AMQShortString name = AMQShortStringEncoding.readShortString(tupleInput);
@@ -876,6 +884,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
return new ExchangeRecord(name, typeName, autoDelete);
}
+ @Override
public void objectToEntry(ExchangeRecord exchange, TupleOutput tupleOutput)
{
AMQShortStringEncoding.writeShortString(exchange.getNameShortString(), tupleOutput);
@@ -926,6 +935,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
static class QueueBindingBinding extends TupleBinding<BindingRecord>
{
+ @Override
public BindingRecord entryToObject(TupleInput tupleInput)
{
AMQShortString exchangeName = AMQShortStringEncoding.readShortString(tupleInput);
@@ -937,6 +947,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
return new BindingRecord(exchangeName, queueName, routingKey, arguments);
}
+ @Override
public void objectToEntry(BindingRecord binding, TupleOutput tupleOutput)
{
AMQShortStringEncoding.writeShortString(binding.getExchangeName(), tupleOutput);
@@ -972,6 +983,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
static class OldQueueEntryBinding extends TupleBinding<OldQueueEntryKey>
{
+ @Override
public OldQueueEntryKey entryToObject(TupleInput tupleInput)
{
AMQShortString queueName = AMQShortStringEncoding.readShortString(tupleInput);
@@ -980,6 +992,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
return new OldQueueEntryKey(queueName, messageId);
}
+ @Override
public void objectToEntry(OldQueueEntryKey mk, TupleOutput tupleOutput)
{
AMQShortStringEncoding.writeShortString(mk.getQueueName(), tupleOutput);
@@ -1012,6 +1025,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
static class NewQueueEntryBinding extends TupleBinding<NewQueueEntryKey>
{
+ @Override
public NewQueueEntryKey entryToObject(TupleInput tupleInput)
{
UUID queueId = new UUID(tupleInput.readLong(), tupleInput.readLong());
@@ -1020,6 +1034,7 @@ public class UpgradeFrom5To6 extends AbstractStoreUpgrade
return new NewQueueEntryKey(queueId, messageId);
}
+ @Override
public void objectToEntry(NewQueueEntryKey mk, TupleOutput tupleOutput)
{
UUID uuid = mk.getQueueId();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java
index 0cedbd1..c3f3ebe 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeInteractionHandler.java
@@ -27,6 +27,7 @@ public interface UpgradeInteractionHandler
public static final UpgradeInteractionHandler DEFAULT_HANDLER = new UpgradeInteractionHandler()
{
+ @Override
public UpgradeInteractionResponse requireResponse(final String question,
final UpgradeInteractionResponse defaultResponse,
final UpgradeInteractionResponse... possibleResponses)
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
index 7ad276b..c6541e5 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBHAVirtualHost.java
@@ -49,9 +49,11 @@ public interface BDBHAVirtualHost<X extends BDBHAVirtualHost<X>>
@DerivedAttribute
String getDurability();
+ @Override
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreUnderfullSize();
+ @Override
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreOverfullSize();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
index 8153a38..9b44503 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhost/berkeleydb/BDBVirtualHost.java
@@ -42,12 +42,15 @@ public interface BDBVirtualHost<X extends BDBVirtualHost<X>> extends QueueManagi
@ManagedContextDefault(name= QPID_BROKER_BDB_TOTAL_CACHE_SIZE)
long DEFAULT_JE_CACHE_SIZE = Math.max(BDB_MIN_CACHE_SIZE, Runtime.getRuntime().maxMemory()/20l);
+ @Override
@ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}messages")
String getStorePath();
+ @Override
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreUnderfullSize();
+ @Override
@ManagedAttribute(mandatory = true, defaultValue = "0")
Long getStoreOverfullSize();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java
index 61f7cc5..fe2fe3b 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNode.java
@@ -44,21 +44,27 @@ public interface BDBHAVirtualHostNode<X extends BDBHAVirtualHostNode<X>> extends
public static final String HELPER_NODE_NAME = "helperNodeName";
public static final String PERMITTED_NODES = "permittedNodes";
+ @Override
@ManagedAttribute(mandatory=true)
String getGroupName();
+ @Override
@ManagedAttribute(mandatory=true)
String getAddress();
+ @Override
@ManagedAttribute(mandatory=true)
String getHelperAddress();
+ @Override
@ManagedAttribute(defaultValue = "false")
boolean isDesignatedPrimary();
+ @Override
@ManagedAttribute(defaultValue = "1")
int getPriority();
+ @Override
@ManagedAttribute(defaultValue = "0")
int getQuorumOverride();
@@ -71,6 +77,7 @@ public interface BDBHAVirtualHostNode<X extends BDBHAVirtualHostNode<X>> extends
@DerivedAttribute
Long getJoinTime();
+ @Override
@ManagedAttribute(persist = false)
String getHelperNodeName();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
index 126e105..04fde04 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
@@ -376,6 +376,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
return Futures.immediateFuture(null);
}
+ @Override
@StateTransition( currentState = { State.UNINITIALIZED, State.ACTIVE, State.ERRORED }, desiredState = State.STOPPED )
protected ListenableFuture<Void> doStop()
{
@@ -433,6 +434,7 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode<BDBHAVirtu
}
}
+ @Override
@StateTransition( currentState = { State.ACTIVE, State.STOPPED, State.ERRORED}, desiredState = State.DELETED )
protected ListenableFuture<Void> doDelete()
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
index 77aedad..a38628d 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBVirtualHostNode.java
@@ -32,9 +32,11 @@ public interface BDBVirtualHostNode<X extends BDBVirtualHostNode<X>>
{
String STORE_PATH = "storePath";
+ @Override
@ManagedAttribute(mandatory = true, defaultValue = "${qpid.work_dir}${file.separator}${this:name}${file.separator}config")
String getStorePath();
+ @Override
@ManagedAttribute( description = "Configuration for the preference store, e.g. type, path, etc.",
defaultValue = "{\"type\": \"Provided\"}")
PreferenceStoreAttributes getPreferenceStoreAttributes();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
index b01171d..a537f66 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
@@ -131,6 +131,7 @@ public class BDBStoreUpgradeTestPreparer
connection.start();
connection.setExceptionListener(new ExceptionListener()
{
+ @Override
public void onException(JMSException e)
{
_logger.error("Error setting exception listener for connection", e);
@@ -252,6 +253,7 @@ public class BDBStoreUpgradeTestPreparer
connection.start();
connection.setExceptionListener(new ExceptionListener()
{
+ @Override
public void onException(JMSException e)
{
_logger.error("Error setting exception listener for connection", e);
@@ -297,6 +299,7 @@ public class BDBStoreUpgradeTestPreparer
connection.start();
connection.setExceptionListener(new ExceptionListener()
{
+ @Override
public void onException(JMSException e)
{
_logger.error("Error setting exception listener for connection", e);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
index 261117f..b59088b 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeFactoryTest.java
@@ -52,6 +52,7 @@ public class StandardEnvironmentFacadeFactoryTest extends QpidTestCase
// make mock object implementing FileBasedSettings
_parent = mock(ConfiguredObject.class, withSettings().extraInterfaces(FileBasedSettings.class).defaultAnswer(new Answer()
{
+ @Override
public Object answer(InvocationOnMock invocation)
{
if (invocation.getMethod().getName().equals("getStorePath"))
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
index 0bba4bd..82fa59e 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/StandardEnvironmentFacadeTest.java
@@ -41,12 +41,14 @@ public class StandardEnvironmentFacadeTest extends QpidTestCase
protected File _storePath;
protected EnvironmentFacade _environmentFacade;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
_storePath = new File(TMP_FOLDER + File.separator + "bdb" + File.separator + getTestName());
}
+ @Override
protected void tearDown() throws Exception
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
index 11934b1..2b3582a 100644
--- a/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
+++ b/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/MapJsonSerializerTest.java
@@ -29,6 +29,7 @@ public class MapJsonSerializerTest extends QpidTestCase
{
private MapJsonSerializer _serializer;
+ @Override
protected void setUp() throws Exception
{
super.setUp();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
----------------------------------------------------------------------
diff --git a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
index a0f39f2..fb2d030 100644
--- a/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
+++ b/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
@@ -194,6 +194,7 @@ public class GroupCreator
{
Future<Object> future = executor.submit(new Callable<Object>()
{
+ @Override
public Object call()
{
try
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/QpidException.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/QpidException.java b/broker-core/src/main/java/org/apache/qpid/server/QpidException.java
index d473580..cd43929 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/QpidException.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/QpidException.java
@@ -70,6 +70,7 @@ public class QpidException extends Exception
return newAMQE;
}
+ @Override
public QpidException clone()
{
return null;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java b/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
index 377d24b..09768b3 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/consumer/AbstractConsumerTarget.java
@@ -86,6 +86,7 @@ public abstract class AbstractConsumerTarget<T extends AbstractConsumerTarget<T>
}
}
+ @Override
public boolean isMultiQueue()
{
return _isMultiQueue;
@@ -125,6 +126,7 @@ public abstract class AbstractConsumerTarget<T extends AbstractConsumerTarget<T>
}
}
+ @Override
public final boolean isNotifyWorkDesired()
{
return _notifyWorkDesired;
@@ -195,6 +197,7 @@ public abstract class AbstractConsumerTarget<T extends AbstractConsumerTarget<T>
return !isNotifyWorkDesired();
}
+ @Override
public final State getState()
{
return _state.get();
@@ -263,6 +266,7 @@ public abstract class AbstractConsumerTarget<T extends AbstractConsumerTarget<T>
}
+ @Override
final public boolean close()
{
if (_state.compareAndSet(State.OPEN, State.CLOSED))
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
index aed59d4..8aefd5a 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
@@ -270,6 +270,7 @@ public abstract class AbstractExchange<T extends AbstractExchange<T>>
_deleteTaskList.clear();
}
+ @Override
public boolean isAutoDelete()
{
return getLifetimePolicy() != LifetimePolicy.PERMANENT;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
index 24be373..6ebd1b9 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeImpl.java
@@ -154,6 +154,7 @@ public class HeadersExchangeImpl extends AbstractExchange<HeadersExchangeImpl> i
}
+ @Override
protected void onUnbind(final BindingIdentifier binding)
{
assert binding != null;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
index e526a07..7513e8f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicMatcherDFAState.java
@@ -248,6 +248,7 @@ public class TopicMatcherDFAState
}
+ @Override
public String toString()
{
StringBuilder transitions = new StringBuilder();
@@ -272,6 +273,7 @@ public class TopicMatcherDFAState
SortedSet<TopicMatcherDFAState> reachableStates =
new TreeSet<TopicMatcherDFAState>(new Comparator<TopicMatcherDFAState>()
{
+ @Override
public int compare(final TopicMatcherDFAState o1, final TopicMatcherDFAState o2)
{
return o1.getId() - o2.getId();
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java b/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
index c905299..c155c98 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/exchange/topic/TopicWord.java
@@ -32,6 +32,7 @@ public final class TopicWord
_word = s;
}
+ @Override
public String toString()
{
return _word;
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java b/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
index 69f3596..1b5988f 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/ArithmeticExpression.java
@@ -39,6 +39,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
{
return new ArithmeticExpression<E>(left, right)
{
+ @Override
protected Object evaluate(Object lvalue, Object rvalue)
{
if (lvalue instanceof String)
@@ -56,6 +57,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
throw new SelectorParsingException("Cannot call plus operation on: " + lvalue + " and: " + rvalue);
}
+ @Override
public String getExpressionSymbol()
{
return "+";
@@ -67,6 +69,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
{
return new ArithmeticExpression<E>(left, right)
{
+ @Override
protected Object evaluate(Object lvalue, Object rvalue)
{
if (lvalue instanceof Number)
@@ -77,6 +80,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
throw new SelectorParsingException("Cannot call minus operation on: " + lvalue + " and: " + rvalue);
}
+ @Override
public String getExpressionSymbol()
{
return "-";
@@ -89,6 +93,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
return new ArithmeticExpression<E>(left, right)
{
+ @Override
protected Object evaluate(Object lvalue, Object rvalue)
{
if (lvalue instanceof Number)
@@ -99,6 +104,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
throw new SelectorParsingException("Cannot call multiply operation on: " + lvalue + " and: " + rvalue);
}
+ @Override
public String getExpressionSymbol()
{
return "*";
@@ -111,6 +117,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
return new ArithmeticExpression<E>(left, right)
{
+ @Override
protected Object evaluate(Object lvalue, Object rvalue)
{
if (lvalue instanceof Number)
@@ -121,6 +128,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
throw new SelectorParsingException("Cannot call divide operation on: " + lvalue + " and: " + rvalue);
}
+ @Override
public String getExpressionSymbol()
{
return "/";
@@ -133,6 +141,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
return new ArithmeticExpression<E>(left, right)
{
+ @Override
protected Object evaluate(Object lvalue, Object rvalue)
{
if (lvalue instanceof Number)
@@ -143,6 +152,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
throw new SelectorParsingException("Cannot call mod operation on: " + lvalue + " and: " + rvalue);
}
+ @Override
public String getExpressionSymbol()
{
return "%";
@@ -241,6 +251,7 @@ public abstract class ArithmeticExpression<T> extends BinaryExpression<T>
}
}
+ @Override
public Object evaluate(T message)
{
Object lvalue = getLeft().evaluate(message);
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java b/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
index d8dc85f..f21f062 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/BinaryExpression.java
@@ -47,6 +47,7 @@ public abstract class BinaryExpression<T> implements Expression<T>
/**
* @see java.lang.Object#toString()
*/
+ @Override
public String toString()
{
return "(" + left.toString() + " " + getExpressionSymbol() + " " + right.toString() + ")";
@@ -57,6 +58,7 @@ public abstract class BinaryExpression<T> implements Expression<T>
*
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode()
{
return toString().hashCode();
@@ -67,6 +69,7 @@ public abstract class BinaryExpression<T> implements Expression<T>
*
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object o)
{
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec1bd825/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
----------------------------------------------------------------------
diff --git a/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java b/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
index 5037bbe..b64fa0c 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/filter/ComparisonExpression.java
@@ -123,6 +123,7 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
/**
* org.apache.activemq.filter.UnaryExpression#getExpressionSymbol()
*/
+ @Override
public String getExpressionSymbol()
{
return "LIKE";
@@ -131,6 +132,7 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
/**
* org.apache.activemq.filter.Expression#evaluate(MessageEvaluationContext)
*/
+ @Override
public Object evaluate(E message)
{
@@ -150,6 +152,7 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
return likePattern.matcher((String) rv).matches() ? Boolean.TRUE : Boolean.FALSE;
}
+ @Override
public boolean matches(E message)
{
Object object = evaluate(message);
@@ -240,11 +243,13 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
return new ComparisonExpression<E>(left, right)
{
+ @Override
protected boolean asBoolean(int answer)
{
return answer > 0;
}
+ @Override
public String getExpressionSymbol()
{
return ">";
@@ -259,11 +264,13 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
return new ComparisonExpression<E>(left, right)
{
+ @Override
protected boolean asBoolean(int answer)
{
return answer >= 0;
}
+ @Override
public String getExpressionSymbol()
{
return ">=";
@@ -279,11 +286,13 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
return new ComparisonExpression<E>(left, right)
{
+ @Override
protected boolean asBoolean(int answer)
{
return answer < 0;
}
+ @Override
public String getExpressionSymbol()
{
return "<";
@@ -300,11 +309,13 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
return new ComparisonExpression<E>(left, right)
{
+ @Override
protected boolean asBoolean(int answer)
{
return answer <= 0;
}
+ @Override
public String getExpressionSymbol()
{
return "<=";
@@ -371,6 +382,7 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
super(left, right);
}
+ @Override
public Object evaluate(T message)
{
Comparable lv = (Comparable) getLeft().evaluate(message);
@@ -562,6 +574,7 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
protected abstract boolean asBoolean(int answer);
+ @Override
public boolean matches(T message)
{
Object object = evaluate(message);
@@ -576,6 +589,7 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
super(left, right);
}
+ @Override
public Object evaluate(E message)
{
Object lv = getLeft().evaluate(message);
@@ -600,11 +614,13 @@ public abstract class ComparisonExpression<T> extends BinaryExpression<T> implem
return Boolean.FALSE;
}
+ @Override
protected boolean asBoolean(int answer)
{
return answer == 0;
}
+ @Override
public String getExpressionSymbol()
{
return "=";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org