Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add missing @Override annotations

This commit is contained in:
Ville Skyttä 2016-01-24 13:14:33 +02:00 committed by Clebert Suconic
parent 3f20e0d19a
commit 13cb6ddfd1
20 changed files with 143 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java
View File

@ -56,6 +56,7 @@ public final class JMSOpenTypeSupport {
private final List<String> itemDescriptionsList = new ArrayList<>(); private final List<String> itemDescriptionsList = new ArrayList<>();
private final List<OpenType> itemTypesList = new ArrayList<>(); private final List<OpenType> itemTypesList = new ArrayList<>();
@Override
public CompositeType getCompositeType() throws OpenDataException { public CompositeType getCompositeType() throws OpenDataException {
if (compositeType == null) { if (compositeType == null) {
init(); init();
@ -86,6 +87,7 @@ public final class JMSOpenTypeSupport {
return getTypeName(); return getTypeName();
} }
@Override
public Map<String, Object> getFields(CompositeDataSupport data) throws OpenDataException { public Map<String, Object> getFields(CompositeDataSupport data) throws OpenDataException {
Map<String, Object> rc = new HashMap<>(); Map<String, Object> rc = new HashMap<>();
return rc; return rc;

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
View File

@ -495,6 +495,7 @@ public class ConfigurationImpl implements Configuration, Serializable {
return this; return this;
} }
@Override
public ClusterConnectionConfiguration addClusterConfiguration(String name, String uri) throws Exception { public ClusterConnectionConfiguration addClusterConfiguration(String name, String uri) throws Exception {
ClusterConnectionConfiguration newConfig = new ClusterConnectionConfiguration(new URI(uri)).setName(name); ClusterConnectionConfiguration newConfig = new ClusterConnectionConfiguration(new URI(uri)).setName(name);
clusterConfigurations.add(newConfig); clusterConfigurations.add(newConfig);
@ -1289,10 +1290,12 @@ public class ConfigurationImpl implements Configuration, Serializable {
return this; return this;
} }
@Override
public TransportConfiguration[] getTransportConfigurations(String... connectorNames) { public TransportConfiguration[] getTransportConfigurations(String... connectorNames) {
return getTransportConfigurations(Arrays.asList(connectorNames)); return getTransportConfigurations(Arrays.asList(connectorNames));
} }
@Override
public TransportConfiguration[] getTransportConfigurations(final List<String> connectorNames) { public TransportConfiguration[] getTransportConfigurations(final List<String> connectorNames) {
TransportConfiguration[] tcConfigs = (TransportConfiguration[]) Array.newInstance(TransportConfiguration.class, connectorNames.size()); TransportConfiguration[] tcConfigs = (TransportConfiguration[]) Array.newInstance(TransportConfiguration.class, connectorNames.size());
int count = 0; int count = 0;

77
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java
View File

@ -263,10 +263,12 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
return getContext().waitCompletion(timeout); return getContext().waitCompletion(timeout);
} }
@Override
public OperationContext getContext() { public OperationContext getContext() {
return OperationContextImpl.getContext(executorFactory); return OperationContextImpl.getContext(executorFactory);
} }
@Override
public void setContext(final OperationContext context) { public void setContext(final OperationContext context) {
OperationContextImpl.setContext(context); OperationContextImpl.setContext(context);
} }
@ -275,22 +277,27 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
return singleThreadExecutor; return singleThreadExecutor;
} }
@Override
public OperationContext newSingleThreadContext() { public OperationContext newSingleThreadContext() {
return newContext(singleThreadExecutor); return newContext(singleThreadExecutor);
} }
@Override
public OperationContext newContext(final Executor executor1) { public OperationContext newContext(final Executor executor1) {
return new OperationContextImpl(executor1); return new OperationContextImpl(executor1);
} }
@Override
public void afterCompleteOperations(final IOCallback run) { public void afterCompleteOperations(final IOCallback run) {
getContext().executeOnCompletion(run); getContext().executeOnCompletion(run);
} }
@Override
public long generateID() { public long generateID() {
return idGenerator.generateID(); return idGenerator.generateID();
} }
@Override
public long getCurrentID() { public long getCurrentID() {
return idGenerator.getCurrentID(); return idGenerator.getCurrentID();
} }
@ -298,6 +305,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
// Non transactional operations // Non transactional operations
@Override
public void confirmPendingLargeMessageTX(final Transaction tx, long messageID, long recordID) throws Exception { public void confirmPendingLargeMessageTX(final Transaction tx, long messageID, long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -312,6 +320,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
/** /**
* We don't need messageID now but we are likely to need it we ever decide to support a database * We don't need messageID now but we are likely to need it we ever decide to support a database
*/ */
@Override
public void confirmPendingLargeMessage(long recordID) throws Exception { public void confirmPendingLargeMessage(long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -322,6 +331,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeMessage(final ServerMessage message) throws Exception { public void storeMessage(final ServerMessage message) throws Exception {
if (message.getMessageID() <= 0) { if (message.getMessageID() <= 0) {
// Sanity check only... this shouldn't happen unless there is a bug // Sanity check only... this shouldn't happen unless there is a bug
@ -345,6 +355,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeReference(final long queueID, final long messageID, final boolean last) throws Exception { public void storeReference(final long queueID, final long messageID, final boolean last) throws Exception {
readLock(); readLock();
try { try {
@ -365,6 +376,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
storageManagerLock.readLock().unlock(); storageManagerLock.readLock().unlock();
} }
@Override
public void storeAcknowledge(final long queueID, final long messageID) throws Exception { public void storeAcknowledge(final long queueID, final long messageID) throws Exception {
readLock(); readLock();
try { try {
@ -375,6 +387,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeCursorAcknowledge(long queueID, PagePosition position) throws Exception { public void storeCursorAcknowledge(long queueID, PagePosition position) throws Exception {
readLock(); readLock();
try { try {
@ -387,6 +400,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteMessage(final long messageID) throws Exception { public void deleteMessage(final long messageID) throws Exception {
readLock(); readLock();
try { try {
@ -401,6 +415,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void updateScheduledDeliveryTime(final MessageReference ref) throws Exception { public void updateScheduledDeliveryTime(final MessageReference ref) throws Exception {
ScheduledDeliveryEncoding encoding = new ScheduledDeliveryEncoding(ref.getScheduledDeliveryTime(), ref.getQueue().getID()); ScheduledDeliveryEncoding encoding = new ScheduledDeliveryEncoding(ref.getScheduledDeliveryTime(), ref.getQueue().getID());
readLock(); readLock();
@ -412,6 +427,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeDuplicateID(final SimpleString address, final byte[] duplID, final long recordID) throws Exception { public void storeDuplicateID(final SimpleString address, final byte[] duplID, final long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -424,6 +440,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteDuplicateID(final long recordID) throws Exception { public void deleteDuplicateID(final long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -436,6 +453,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
// Transactional operations // Transactional operations
@Override
public void storeMessageTransactional(final long txID, final ServerMessage message) throws Exception { public void storeMessageTransactional(final long txID, final ServerMessage message) throws Exception {
if (message.getMessageID() <= 0) { if (message.getMessageID() <= 0) {
throw ActiveMQMessageBundle.BUNDLE.messageIdNotAssigned(); throw ActiveMQMessageBundle.BUNDLE.messageIdNotAssigned();
@ -456,6 +474,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storePageTransaction(final long txID, final PageTransactionInfo pageTransaction) throws Exception { public void storePageTransaction(final long txID, final PageTransactionInfo pageTransaction) throws Exception {
readLock(); readLock();
try { try {
@ -467,6 +486,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void updatePageTransaction(final long txID, public void updatePageTransaction(final long txID,
final PageTransactionInfo pageTransaction, final PageTransactionInfo pageTransaction,
final int depages) throws Exception { final int depages) throws Exception {
@ -479,6 +499,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void updatePageTransaction(final PageTransactionInfo pageTransaction, final int depages) throws Exception { public void updatePageTransaction(final PageTransactionInfo pageTransaction, final int depages) throws Exception {
readLock(); readLock();
try { try {
@ -489,6 +510,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeReferenceTransactional(final long txID, final long queueID, final long messageID) throws Exception { public void storeReferenceTransactional(final long txID, final long queueID, final long messageID) throws Exception {
readLock(); readLock();
try { try {
@ -499,6 +521,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeAcknowledgeTransactional(final long txID, public void storeAcknowledgeTransactional(final long txID,
final long queueID, final long queueID,
final long messageID) throws Exception { final long messageID) throws Exception {
@ -511,6 +534,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeCursorAcknowledgeTransactional(long txID, long queueID, PagePosition position) throws Exception { public void storeCursorAcknowledgeTransactional(long txID, long queueID, PagePosition position) throws Exception {
readLock(); readLock();
try { try {
@ -523,16 +547,19 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storePageCompleteTransactional(long txID, long queueID, PagePosition position) throws Exception { public void storePageCompleteTransactional(long txID, long queueID, PagePosition position) throws Exception {
long recordID = idGenerator.generateID(); long recordID = idGenerator.generateID();
position.setRecordID(recordID); position.setRecordID(recordID);
messageJournal.appendAddRecordTransactional(txID, recordID, JournalRecordIds.PAGE_CURSOR_COMPLETE, new CursorAckRecordEncoding(queueID, position)); messageJournal.appendAddRecordTransactional(txID, recordID, JournalRecordIds.PAGE_CURSOR_COMPLETE, new CursorAckRecordEncoding(queueID, position));
} }
@Override
public void deletePageComplete(long ackID) throws Exception { public void deletePageComplete(long ackID) throws Exception {
messageJournal.appendDeleteRecord(ackID, false); messageJournal.appendDeleteRecord(ackID, false);
} }
@Override
public void deleteCursorAcknowledgeTransactional(long txID, long ackID) throws Exception { public void deleteCursorAcknowledgeTransactional(long txID, long ackID) throws Exception {
readLock(); readLock();
try { try {
@ -543,10 +570,12 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteCursorAcknowledge(long ackID) throws Exception { public void deleteCursorAcknowledge(long ackID) throws Exception {
messageJournal.appendDeleteRecord(ackID, false); messageJournal.appendDeleteRecord(ackID, false);
} }
@Override
public long storeHeuristicCompletion(final Xid xid, final boolean isCommit) throws Exception { public long storeHeuristicCompletion(final Xid xid, final boolean isCommit) throws Exception {
readLock(); readLock();
try { try {
@ -560,6 +589,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteHeuristicCompletion(final long id) throws Exception { public void deleteHeuristicCompletion(final long id) throws Exception {
readLock(); readLock();
try { try {
@ -571,6 +601,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deletePageTransactional(final long recordID) throws Exception { public void deletePageTransactional(final long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -581,6 +612,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void updateScheduledDeliveryTimeTransactional(final long txID, final MessageReference ref) throws Exception { public void updateScheduledDeliveryTimeTransactional(final long txID, final MessageReference ref) throws Exception {
ScheduledDeliveryEncoding encoding = new ScheduledDeliveryEncoding(ref.getScheduledDeliveryTime(), ref.getQueue().getID()); ScheduledDeliveryEncoding encoding = new ScheduledDeliveryEncoding(ref.getScheduledDeliveryTime(), ref.getQueue().getID());
readLock(); readLock();
@ -593,6 +625,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void prepare(final long txID, final Xid xid) throws Exception { public void prepare(final long txID, final Xid xid) throws Exception {
readLock(); readLock();
try { try {
@ -603,19 +636,23 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void commit(final long txID) throws Exception { public void commit(final long txID) throws Exception {
commit(txID, true); commit(txID, true);
} }
@Override
public void commitBindings(final long txID) throws Exception { public void commitBindings(final long txID) throws Exception {
bindingsJournal.appendCommitRecord(txID, true); bindingsJournal.appendCommitRecord(txID, true);
} }
@Override
public void rollbackBindings(final long txID) throws Exception { public void rollbackBindings(final long txID) throws Exception {
// no need to sync, it's going away anyways // no need to sync, it's going away anyways
bindingsJournal.appendRollbackRecord(txID, false); bindingsJournal.appendRollbackRecord(txID, false);
} }
@Override
public void commit(final long txID, final boolean lineUpContext) throws Exception { public void commit(final long txID, final boolean lineUpContext) throws Exception {
readLock(); readLock();
try { try {
@ -636,6 +673,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void rollback(final long txID) throws Exception { public void rollback(final long txID) throws Exception {
readLock(); readLock();
try { try {
@ -646,6 +684,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeDuplicateIDTransactional(final long txID, public void storeDuplicateIDTransactional(final long txID,
final SimpleString address, final SimpleString address,
final byte[] duplID, final byte[] duplID,
@ -661,6 +700,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void updateDuplicateIDTransactional(final long txID, public void updateDuplicateIDTransactional(final long txID,
final SimpleString address, final SimpleString address,
final byte[] duplID, final byte[] duplID,
@ -676,6 +716,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteDuplicateIDTransactional(final long txID, final long recordID) throws Exception { public void deleteDuplicateIDTransactional(final long txID, final long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -688,6 +729,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
// Other operations // Other operations
@Override
public void updateDeliveryCount(final MessageReference ref) throws Exception { public void updateDeliveryCount(final MessageReference ref) throws Exception {
// no need to store if it's the same value // no need to store if it's the same value
// otherwise the journal will get OME in case of lots of redeliveries // otherwise the journal will get OME in case of lots of redeliveries
@ -707,6 +749,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void storeAddressSetting(PersistedAddressSetting addressSetting) throws Exception { public void storeAddressSetting(PersistedAddressSetting addressSetting) throws Exception {
deleteAddressSetting(addressSetting.getAddressMatch()); deleteAddressSetting(addressSetting.getAddressMatch());
readLock(); readLock();
@ -721,14 +764,17 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public List<PersistedAddressSetting> recoverAddressSettings() throws Exception { public List<PersistedAddressSetting> recoverAddressSettings() throws Exception {
return new ArrayList<>(mapPersistedAddressSettings.values()); return new ArrayList<>(mapPersistedAddressSettings.values());
} }
@Override
public List<PersistedRoles> recoverPersistedRoles() throws Exception { public List<PersistedRoles> recoverPersistedRoles() throws Exception {
return new ArrayList<>(mapPersistedRoles.values()); return new ArrayList<>(mapPersistedRoles.values());
} }
@Override
public void storeSecurityRoles(PersistedRoles persistedRoles) throws Exception { public void storeSecurityRoles(PersistedRoles persistedRoles) throws Exception {
deleteSecurityRoles(persistedRoles.getAddressMatch()); deleteSecurityRoles(persistedRoles.getAddressMatch());
@ -766,6 +812,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteAddressSetting(SimpleString addressMatch) throws Exception { public void deleteAddressSetting(SimpleString addressMatch) throws Exception {
PersistedAddressSetting oldSetting = mapPersistedAddressSettings.remove(addressMatch); PersistedAddressSetting oldSetting = mapPersistedAddressSettings.remove(addressMatch);
if (oldSetting != null) { if (oldSetting != null) {
@ -779,6 +826,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteSecurityRoles(SimpleString addressMatch) throws Exception { public void deleteSecurityRoles(SimpleString addressMatch) throws Exception {
PersistedRoles oldRoles = mapPersistedRoles.remove(addressMatch); PersistedRoles oldRoles = mapPersistedRoles.remove(addressMatch);
if (oldRoles != null) { if (oldRoles != null) {
@ -1174,6 +1222,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
// grouping handler operations // grouping handler operations
@Override
public void addGrouping(final GroupBinding groupBinding) throws Exception { public void addGrouping(final GroupBinding groupBinding) throws Exception {
GroupingEncoding groupingEncoding = new GroupingEncoding(groupBinding.getId(), groupBinding.getGroupId(), groupBinding.getClusterName()); GroupingEncoding groupingEncoding = new GroupingEncoding(groupBinding.getId(), groupBinding.getGroupId(), groupBinding.getClusterName());
readLock(); readLock();
@ -1185,6 +1234,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteGrouping(long tx, final GroupBinding groupBinding) throws Exception { public void deleteGrouping(long tx, final GroupBinding groupBinding) throws Exception {
readLock(); readLock();
try { try {
@ -1197,6 +1247,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
// BindingsImpl operations // BindingsImpl operations
@Override
public void addQueueBinding(final long tx, final Binding binding) throws Exception { public void addQueueBinding(final long tx, final Binding binding) throws Exception {
Queue queue = (Queue) binding.getBindable(); Queue queue = (Queue) binding.getBindable();
@ -1215,6 +1266,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteQueueBinding(long tx, final long queueBindingID) throws Exception { public void deleteQueueBinding(long tx, final long queueBindingID) throws Exception {
readLock(); readLock();
try { try {
@ -1225,6 +1277,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public long storePageCounterInc(long txID, long queueID, int value) throws Exception { public long storePageCounterInc(long txID, long queueID, int value) throws Exception {
readLock(); readLock();
try { try {
@ -1237,6 +1290,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public long storePageCounterInc(long queueID, int value) throws Exception { public long storePageCounterInc(long queueID, int value) throws Exception {
readLock(); readLock();
try { try {
@ -1278,6 +1332,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deleteIncrementRecord(long txID, long recordID) throws Exception { public void deleteIncrementRecord(long txID, long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -1288,6 +1343,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deletePageCounter(long txID, long recordID) throws Exception { public void deletePageCounter(long txID, long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -1298,6 +1354,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void deletePendingPageCounter(long txID, long recordID) throws Exception { public void deletePendingPageCounter(long txID, long recordID) throws Exception {
readLock(); readLock();
try { try {
@ -1308,6 +1365,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public JournalLoadInformation loadBindingJournal(final List<QueueBindingInfo> queueBindingInfos, public JournalLoadInformation loadBindingJournal(final List<QueueBindingInfo> queueBindingInfos,
final List<GroupingInfo> groupingInfos) throws Exception { final List<GroupingInfo> groupingInfos) throws Exception {
List<RecordInfo> records = new ArrayList<>(); List<RecordInfo> records = new ArrayList<>();
@ -1354,6 +1412,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
return bindingsInfo; return bindingsInfo;
} }
@Override
public void lineUpContext() { public void lineUpContext() {
readLock(); readLock();
try { try {
@ -1369,6 +1428,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
protected abstract void beforeStart() throws Exception; protected abstract void beforeStart() throws Exception;
@Override
public synchronized void start() throws Exception { public synchronized void start() throws Exception {
if (started) { if (started) {
return; return;
@ -1390,6 +1450,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
started = true; started = true;
} }
@Override
public void stop() throws Exception { public void stop() throws Exception {
stop(false); stop(false);
} }
@ -1407,6 +1468,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
*/ */
protected abstract void performCachedLargeMessageDeletes(); protected abstract void performCachedLargeMessageDeletes();
@Override
public synchronized void stop(boolean ioCriticalError) throws Exception { public synchronized void stop(boolean ioCriticalError) throws Exception {
if (!started) { if (!started) {
return; return;
@ -1444,6 +1506,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
protected abstract void beforeStop() throws Exception; protected abstract void beforeStop() throws Exception;
@Override
public synchronized boolean isStarted() { public synchronized boolean isStarted() {
return started; return started;
} }
@ -1465,12 +1528,14 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
} }
} }
@Override
public void beforePageRead() throws Exception { public void beforePageRead() throws Exception {
if (pageMaxConcurrentIO != null) { if (pageMaxConcurrentIO != null) {
pageMaxConcurrentIO.acquire(); pageMaxConcurrentIO.acquire();
} }
} }
@Override
public void afterPageRead() throws Exception { public void afterPageRead() throws Exception {
if (pageMaxConcurrentIO != null) { if (pageMaxConcurrentIO != null) {
pageMaxConcurrentIO.release(); pageMaxConcurrentIO.release();
@ -1479,10 +1544,12 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
// Public ----------------------------------------------------------------------------------- // Public -----------------------------------------------------------------------------------
@Override
public Journal getMessageJournal() { public Journal getMessageJournal() {
return messageJournal; return messageJournal;
} }
@Override
public Journal getBindingsJournal() { public Journal getBindingsJournal() {
return bindingsJournal; return bindingsJournal;
} }
@ -1714,37 +1781,47 @@ public abstract class AbstractJournalStorageManager implements StorageManager {
return DummyOperationContext.instance; return DummyOperationContext.instance;
} }
@Override
public void executeOnCompletion(final IOCallback runnable) { public void executeOnCompletion(final IOCallback runnable) {
// There are no executeOnCompletion calls while using the DummyOperationContext // There are no executeOnCompletion calls while using the DummyOperationContext
// However we keep the code here for correctness // However we keep the code here for correctness
runnable.done(); runnable.done();
} }
@Override
public void replicationDone() { public void replicationDone() {
} }
@Override
public void replicationLineUp() { public void replicationLineUp() {
} }
@Override
public void storeLineUp() { public void storeLineUp() {
} }
@Override
public void done() { public void done() {
} }
@Override
public void onError(final int errorCode, final String errorMessage) { public void onError(final int errorCode, final String errorMessage) {
} }
@Override
public void waitCompletion() { public void waitCompletion() {
} }
@Override
public boolean waitCompletion(final long timeout) { public boolean waitCompletion(final long timeout) {
return true; return true;
} }
@Override
public void pageSyncLineUp() { public void pageSyncLineUp() {
} }
@Override
public void pageSyncDone() { public void pageSyncDone() {
} }
} }

10
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DummyOperationContext.java
View File

@ -27,37 +27,47 @@ final class DummyOperationContext implements OperationContext {
return DummyOperationContext.instance; return DummyOperationContext.instance;
} }
@Override
public void executeOnCompletion(final IOCallback runnable) { public void executeOnCompletion(final IOCallback runnable) {
// There are no executeOnCompletion calls while using the DummyOperationContext // There are no executeOnCompletion calls while using the DummyOperationContext
// However we keep the code here for correctness // However we keep the code here for correctness
runnable.done(); runnable.done();
} }
@Override
public void replicationDone() { public void replicationDone() {
} }
@Override
public void replicationLineUp() { public void replicationLineUp() {
} }
@Override
public void storeLineUp() { public void storeLineUp() {
} }
@Override
public void done() { public void done() {
} }
@Override
public void onError(final int errorCode, final String errorMessage) { public void onError(final int errorCode, final String errorMessage) {
} }
@Override
public void waitCompletion() { public void waitCompletion() {
} }
@Override
public boolean waitCompletion(final long timeout) { public boolean waitCompletion(final long timeout) {
return true; return true;
} }
@Override
public void pageSyncLineUp() { public void pageSyncLineUp() {
} }
@Override
public void pageSyncDone() { public void pageSyncDone() {
} }
} }

1
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeMessageTXFailureCallback.java
View File

@ -41,6 +41,7 @@ public class LargeMessageTXFailureCallback implements TransactionFailureCallback
this.messages = messages; this.messages = messages;
} }
@Override
public void failedTransaction(final long transactionID, public void failedTransaction(final long transactionID,
final List<RecordInfo> records, final List<RecordInfo> records,
final List<RecordInfo> recordsToDelete) { final List<RecordInfo> recordsToDelete) {

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/CursorAckRecordEncoding.java
View File

@ -42,16 +42,19 @@ public class CursorAckRecordEncoding implements EncodingSupport {
public PagePosition position; public PagePosition position;
@Override
public int getEncodeSize() { public int getEncodeSize() {
return DataConstants.SIZE_LONG + DataConstants.SIZE_LONG + DataConstants.SIZE_INT; return DataConstants.SIZE_LONG + DataConstants.SIZE_LONG + DataConstants.SIZE_INT;
} }
@Override
public void encode(ActiveMQBuffer buffer) { public void encode(ActiveMQBuffer buffer) {
buffer.writeLong(queueID); buffer.writeLong(queueID);
buffer.writeLong(position.getPageNr()); buffer.writeLong(position.getPageNr());
buffer.writeInt(position.getMessageNr()); buffer.writeInt(position.getMessageNr());
} }
@Override
public void decode(ActiveMQBuffer buffer) { public void decode(ActiveMQBuffer buffer) {
queueID = buffer.readLong(); queueID = buffer.readLong();
long pageNR = buffer.readLong(); long pageNR = buffer.readLong();

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DeliveryCountUpdateEncoding.java
View File

@ -35,16 +35,19 @@ public class DeliveryCountUpdateEncoding implements EncodingSupport {
this.count = count; this.count = count;
} }
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
queueID = buffer.readLong(); queueID = buffer.readLong();
count = buffer.readInt(); count = buffer.readInt();
} }
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
buffer.writeLong(queueID); buffer.writeLong(queueID);
buffer.writeInt(count); buffer.writeInt(count);
} }
@Override
public int getEncodeSize() { public int getEncodeSize() {
return 8 + 4; return 8 + 4;
} }

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DuplicateIDEncoding.java
View File

@ -40,6 +40,7 @@ public class DuplicateIDEncoding implements EncodingSupport {
public DuplicateIDEncoding() { public DuplicateIDEncoding() {
} }
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
address = buffer.readSimpleString(); address = buffer.readSimpleString();
@ -50,6 +51,7 @@ public class DuplicateIDEncoding implements EncodingSupport {
buffer.readBytes(duplID); buffer.readBytes(duplID);
} }
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
buffer.writeSimpleString(address); buffer.writeSimpleString(address);
@ -58,6 +60,7 @@ public class DuplicateIDEncoding implements EncodingSupport {
buffer.writeBytes(duplID); buffer.writeBytes(duplID);
} }
@Override
public int getEncodeSize() { public int getEncodeSize() {
return SimpleString.sizeofString(address) + DataConstants.SIZE_INT + duplID.length; return SimpleString.sizeofString(address) + DataConstants.SIZE_INT + duplID.length;
} }

6
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/GroupingEncoding.java
View File

@ -38,20 +38,24 @@ public class GroupingEncoding implements EncodingSupport, GroupingInfo {
public GroupingEncoding() { public GroupingEncoding() {
} }
@Override
public int getEncodeSize() { public int getEncodeSize() {
return SimpleString.sizeofString(groupId) + SimpleString.sizeofString(clusterName); return SimpleString.sizeofString(groupId) + SimpleString.sizeofString(clusterName);
} }
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
buffer.writeSimpleString(groupId); buffer.writeSimpleString(groupId);
buffer.writeSimpleString(clusterName); buffer.writeSimpleString(clusterName);
} }
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
groupId = buffer.readSimpleString(); groupId = buffer.readSimpleString();
clusterName = buffer.readSimpleString(); clusterName = buffer.readSimpleString();
} }
@Override
public long getId() { public long getId() {
return id; return id;
} }
@ -60,10 +64,12 @@ public class GroupingEncoding implements EncodingSupport, GroupingInfo {
this.id = id; this.id = id;
} }
@Override
public SimpleString getGroupId() { public SimpleString getGroupId() {
return groupId; return groupId;
} }
@Override
public SimpleString getClusterName() { public SimpleString getClusterName() {
return clusterName; return clusterName;
} }

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/HeuristicCompletionEncoding.java
View File

@ -42,16 +42,19 @@ public class HeuristicCompletionEncoding implements EncodingSupport {
public HeuristicCompletionEncoding() { public HeuristicCompletionEncoding() {
} }
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
xid = XidCodecSupport.decodeXid(buffer); xid = XidCodecSupport.decodeXid(buffer);
isCommit = buffer.readBoolean(); isCommit = buffer.readBoolean();
} }
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
XidCodecSupport.encodeXid(xid, buffer); XidCodecSupport.encodeXid(xid, buffer);
buffer.writeBoolean(isCommit); buffer.writeBoolean(isCommit);
} }
@Override
public int getEncodeSize() { public int getEncodeSize() {
return XidCodecSupport.getXidEncodeLength(xid) + DataConstants.SIZE_BOOLEAN; return XidCodecSupport.getXidEncodeLength(xid) + DataConstants.SIZE_BOOLEAN;
} }

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/LargeMessageEncoding.java
View File

@ -31,6 +31,7 @@ public class LargeMessageEncoding implements EncodingSupport {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer)
*/ */
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
message.decodeHeadersAndProperties(buffer); message.decodeHeadersAndProperties(buffer);
} }
@ -38,6 +39,7 @@ public class LargeMessageEncoding implements EncodingSupport {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer)
*/ */
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
message.encode(buffer); message.encode(buffer);
} }
@ -45,6 +47,7 @@ public class LargeMessageEncoding implements EncodingSupport {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize() * @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize()
*/ */
@Override
public int getEncodeSize() { public int getEncodeSize() {
return message.getEncodeSize(); return message.getEncodeSize();
} }

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountPendingImpl.java
View File

@ -47,14 +47,17 @@ public class PageCountPendingImpl implements EncodingSupport, PageCountPending {
this.id = id; this.id = id;
} }
@Override
public long getID() { public long getID() {
return id; return id;
} }
@Override
public long getQueueID() { public long getQueueID() {
return queueID; return queueID;
} }
@Override
public long getPageID() { public long getPageID() {
return pageID; return pageID;
} }

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountRecordInc.java
View File

@ -47,15 +47,18 @@ public class PageCountRecordInc implements EncodingSupport {
return value; return value;
} }
@Override
public int getEncodeSize() { public int getEncodeSize() {
return DataConstants.SIZE_LONG + DataConstants.SIZE_INT; return DataConstants.SIZE_LONG + DataConstants.SIZE_INT;
} }
@Override
public void encode(ActiveMQBuffer buffer) { public void encode(ActiveMQBuffer buffer) {
buffer.writeLong(queueID); buffer.writeLong(queueID);
buffer.writeInt(value); buffer.writeInt(value);
} }
@Override
public void decode(ActiveMQBuffer buffer) { public void decode(ActiveMQBuffer buffer) {
queueID = buffer.readLong(); queueID = buffer.readLong();
value = buffer.readInt(); value = buffer.readInt();

1
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageUpdateTXEncoding.java
View File

@ -42,6 +42,7 @@ public class PageUpdateTXEncoding implements EncodingSupport {
this.recods = records; this.recods = records;
} }
@Override
public void decode(ActiveMQBuffer buffer) { public void decode(ActiveMQBuffer buffer) {
this.pageTX = buffer.readLong(); this.pageTX = buffer.readLong();
this.recods = buffer.readInt(); this.recods = buffer.readInt();

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PendingLargeMessageEncoding.java
View File

@ -34,6 +34,7 @@ public class PendingLargeMessageEncoding implements EncodingSupport {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer)
*/ */
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
largeMessageID = buffer.readLong(); largeMessageID = buffer.readLong();
} }
@ -41,6 +42,7 @@ public class PendingLargeMessageEncoding implements EncodingSupport {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer)
*/ */
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
buffer.writeLong(largeMessageID); buffer.writeLong(largeMessageID);
} }
@ -48,6 +50,7 @@ public class PendingLargeMessageEncoding implements EncodingSupport {
/* (non-Javadoc) /* (non-Javadoc)
* @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize() * @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize()
*/ */
@Override
public int getEncodeSize() { public int getEncodeSize() {
return DataConstants.SIZE_LONG; return DataConstants.SIZE_LONG;
} }

10
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java
View File

@ -67,6 +67,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
this.autoCreated = autoCreated; this.autoCreated = autoCreated;
} }
@Override
public long getId() { public long getId() {
return id; return id;
} }
@ -75,30 +76,37 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
this.id = id; this.id = id;
} }
@Override
public SimpleString getAddress() { public SimpleString getAddress() {
return address; return address;
} }
@Override
public void replaceQueueName(SimpleString newName) { public void replaceQueueName(SimpleString newName) {
this.name = newName; this.name = newName;
} }
@Override
public SimpleString getFilterString() { public SimpleString getFilterString() {
return filterString; return filterString;
} }
@Override
public SimpleString getQueueName() { public SimpleString getQueueName() {
return name; return name;
} }
@Override
public SimpleString getUser() { public SimpleString getUser() {
return user; return user;
} }
@Override
public boolean isAutoCreated() { public boolean isAutoCreated() {
return autoCreated; return autoCreated;
} }
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
name = buffer.readSimpleString(); name = buffer.readSimpleString();
address = buffer.readSimpleString(); address = buffer.readSimpleString();
@ -120,6 +128,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
autoCreated = buffer.readBoolean(); autoCreated = buffer.readBoolean();
} }
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
buffer.writeSimpleString(name); buffer.writeSimpleString(name);
buffer.writeSimpleString(address); buffer.writeSimpleString(address);
@ -128,6 +137,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin
buffer.writeBoolean(autoCreated); buffer.writeBoolean(autoCreated);
} }
@Override
public int getEncodeSize() { public int getEncodeSize() {
return SimpleString.sizeofString(name) + SimpleString.sizeofString(address) + return SimpleString.sizeofString(name) + SimpleString.sizeofString(address) +
SimpleString.sizeofNullableString(filterString) + DataConstants.SIZE_BOOLEAN + SimpleString.sizeofNullableString(filterString) + DataConstants.SIZE_BOOLEAN +

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/QueueEncoding.java
View File

@ -32,14 +32,17 @@ public class QueueEncoding implements EncodingSupport {
super(); super();
} }
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
queueID = buffer.readLong(); queueID = buffer.readLong();
} }
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
buffer.writeLong(queueID); buffer.writeLong(queueID);
} }
@Override
public int getEncodeSize() { public int getEncodeSize() {
return 8; return 8;
} }

3
artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/XidEncoding.java
View File

@ -38,14 +38,17 @@ public class XidEncoding implements EncodingSupport {
xid = XidCodecSupport.decodeXid(ActiveMQBuffers.wrappedBuffer(data)); xid = XidCodecSupport.decodeXid(ActiveMQBuffers.wrappedBuffer(data));
} }
@Override
public void decode(final ActiveMQBuffer buffer) { public void decode(final ActiveMQBuffer buffer) {
throw new IllegalStateException("Non Supported Operation"); throw new IllegalStateException("Non Supported Operation");
} }
@Override
public void encode(final ActiveMQBuffer buffer) { public void encode(final ActiveMQBuffer buffer) {
XidCodecSupport.encodeXid(xid, buffer); XidCodecSupport.encodeXid(xid, buffer);
} }
@Override
public int getEncodeSize() { public int getEncodeSize() {
return XidCodecSupport.getXidEncodeLength(xid); return XidCodecSupport.getXidEncodeLength(xid);
} }

1
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java
View File

@ -384,6 +384,7 @@ public class LegacyLDAPSecuritySettingPlugin implements SecuritySettingPlugin {
} }
} }
@Override
public SecuritySettingPlugin stop() { public SecuritySettingPlugin stop() {
try { try {
eventContext.close(); eventContext.close();

2
artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ThreadLeakCheckRule.java
View File

@ -40,6 +40,7 @@ public class ThreadLeakCheckRule extends ExternalResource {
* *
* @throws if setup fails (which will disable {@code after} * @throws if setup fails (which will disable {@code after}
*/ */
@Override
protected void before() throws Throwable { protected void before() throws Throwable {
// do nothing // do nothing
@ -50,6 +51,7 @@ public class ThreadLeakCheckRule extends ExternalResource {
/** /**
* Override to tear down your specific external resource. * Override to tear down your specific external resource.
*/ */
@Override
protected void after() { protected void after() {
try { try {
if (enabled) { if (enabled) {