From 3f20e0d19ae802a5864d59a12630e87705388c66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 Jan 2016 13:12:48 +0200 Subject: [PATCH 1/3] Remove redundant type parameters --- .../apache/activemq/artemis/utils/uri/URISupport.java | 6 +++--- .../jms/management/impl/JMSQueueControlImpl.java | 2 +- .../management/impl/openmbean/JMSOpenTypeSupport.java | 8 ++++---- .../artemis/core/journal/PreparedTransactionInfo.java | 4 ++-- .../management/impl/openmbean/OpenTypeSupport.java | 8 ++++---- .../impl/journal/AbstractJournalStorageManager.java | 10 +++++----- .../journal/TXLargeMessageConfirmationOperation.java | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java index 4b21b6c45c..7cbfeaa0a7 100644 --- a/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java +++ b/artemis-commons/src/main/java/org/apache/activemq/artemis/utils/uri/URISupport.java @@ -121,7 +121,7 @@ public class URISupport { public static Map parseQuery(String uri) throws URISyntaxException { try { uri = uri.substring(uri.lastIndexOf("?") + 1); // get only the relevant part of the query - Map rc = new HashMap(); + Map rc = new HashMap<>(); if (uri != null && !uri.isEmpty()) { parseParameters(rc, uri.split("&")); parseParameters(rc, uri.split(";")); @@ -164,7 +164,7 @@ public class URISupport { } else { CompositeData data = URISupport.parseComposite(uri); - Map parameters = new HashMap(); + Map parameters = new HashMap<>(); parameters.putAll(data.getParameters()); if (parameters.isEmpty()) { parameters = emptyMap(); @@ -402,7 +402,7 @@ public class URISupport { * @return an array containing each inner URI from the composite one. */ private static String[] splitComponents(String str) { - List l = new ArrayList(); + List l = new ArrayList<>(); int last = 0; int depth = 0; diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java index adbe4887ab..d6ca969564 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/JMSQueueControlImpl.java @@ -304,7 +304,7 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro @Override public String sendTextMessageWithProperties(String properties) throws Exception { String[] kvs = properties.split(","); - Map props = new HashMap(); + Map props = new HashMap<>(); for (String kv : kvs) { String[] it = kv.split("="); if (it.length == 2) { diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java index 14d8c841b8..5c1e556834 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java @@ -52,9 +52,9 @@ public final class JMSOpenTypeSupport { public abstract static class AbstractOpenTypeFactory implements OpenTypeFactory { private CompositeType compositeType; - private final List itemNamesList = new ArrayList(); - private final List itemDescriptionsList = new ArrayList(); - private final List itemTypesList = new ArrayList(); + private final List itemNamesList = new ArrayList<>(); + private final List itemDescriptionsList = new ArrayList<>(); + private final List itemTypesList = new ArrayList<>(); public CompositeType getCompositeType() throws OpenDataException { if (compositeType == null) { @@ -87,7 +87,7 @@ public final class JMSOpenTypeSupport { } public Map getFields(CompositeDataSupport data) throws OpenDataException { - Map rc = new HashMap(); + Map rc = new HashMap<>(); return rc; } } diff --git a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/PreparedTransactionInfo.java b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/PreparedTransactionInfo.java index afad7d703a..78617a67ce 100644 --- a/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/PreparedTransactionInfo.java +++ b/artemis-journal/src/main/java/org/apache/activemq/artemis/core/journal/PreparedTransactionInfo.java @@ -25,9 +25,9 @@ public class PreparedTransactionInfo { private final byte[] extraData; - private final List records = new ArrayList(); + private final List records = new ArrayList<>(); - private final List recordsToDelete = new ArrayList(); + private final List recordsToDelete = new ArrayList<>(); public PreparedTransactionInfo(final long id, final byte[] extraData) { this.id = id; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java index 50d9c999ac..1f3a109ff0 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/management/impl/openmbean/OpenTypeSupport.java @@ -52,9 +52,9 @@ public final class OpenTypeSupport { static class MessageOpenTypeFactory { private CompositeType compositeType; - private final List itemNamesList = new ArrayList(); - private final List itemDescriptionsList = new ArrayList(); - private final List itemTypesList = new ArrayList(); + private final List itemNamesList = new ArrayList<>(); + private final List itemDescriptionsList = new ArrayList<>(); + private final List itemTypesList = new ArrayList<>(); protected TabularType stringPropertyTabularType; protected TabularType booleanPropertyTabularType; @@ -239,7 +239,7 @@ public final class OpenTypeSupport { } protected CompositeDataSupport createTabularRowValue(TabularType type, String key, Object value) throws OpenDataException { - Map fields = new HashMap(); + Map fields = new HashMap<>(); fields.put("key", key); fields.put("value", value); return new CompositeDataSupport(type.getRowType(), fields); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java index be457c4d5c..b5569bdc9e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java @@ -1310,9 +1310,9 @@ public abstract class AbstractJournalStorageManager implements StorageManager { public JournalLoadInformation loadBindingJournal(final List queueBindingInfos, final List groupingInfos) throws Exception { - List records = new ArrayList(); + List records = new ArrayList<>(); - List preparedTransactions = new ArrayList(); + List preparedTransactions = new ArrayList<>(); JournalLoadInformation bindingsInfo = bindingsJournal.load(records, preparedTransactions, null); @@ -1521,9 +1521,9 @@ public abstract class AbstractJournalStorageManager implements StorageManager { Transaction tx = new TransactionImpl(preparedTransaction.getId(), xid, this); - List referencesToAck = new ArrayList(); + List referencesToAck = new ArrayList<>(); - Map messages = new HashMap(); + Map messages = new HashMap<>(); // Use same method as load message journal to prune out acks, so they don't get added. // Then have reacknowledge(tx) methods on queue, which needs to add the page size @@ -1677,7 +1677,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { switch (b) { case ADD_LARGE_MESSAGE_PENDING: { long messageID = buff.readLong(); - if (!pendingLargeMessages.remove(new Pair(recordDeleted.id, messageID))) { + if (!pendingLargeMessages.remove(new Pair<>(recordDeleted.id, messageID))) { ActiveMQServerLogger.LOGGER.largeMessageNotFound(recordDeleted.id); } installLargeMessageConfirmationOnTX(tx, recordDeleted.id); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/TXLargeMessageConfirmationOperation.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/TXLargeMessageConfirmationOperation.java index 361477a92c..bac83e673b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/TXLargeMessageConfirmationOperation.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/TXLargeMessageConfirmationOperation.java @@ -26,7 +26,7 @@ import org.apache.activemq.artemis.core.transaction.TransactionOperationAbstract public final class TXLargeMessageConfirmationOperation extends TransactionOperationAbstract { private AbstractJournalStorageManager journalStorageManager; - public List confirmedMessages = new LinkedList(); + public List confirmedMessages = new LinkedList<>(); public TXLargeMessageConfirmationOperation(AbstractJournalStorageManager journalStorageManager) { this.journalStorageManager = journalStorageManager; From 13cb6ddfd16c06b10ac09e39bf0a2725aea85de4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 Jan 2016 13:14:33 +0200 Subject: [PATCH 2/3] Add missing @Override annotations --- .../impl/openmbean/JMSOpenTypeSupport.java | 2 + .../core/config/impl/ConfigurationImpl.java | 3 + .../AbstractJournalStorageManager.java | 77 +++++++++++++++++++ .../impl/journal/DummyOperationContext.java | 10 +++ .../LargeMessageTXFailureCallback.java | 1 + .../codec/CursorAckRecordEncoding.java | 3 + .../codec/DeliveryCountUpdateEncoding.java | 3 + .../journal/codec/DuplicateIDEncoding.java | 3 + .../impl/journal/codec/GroupingEncoding.java | 6 ++ .../codec/HeuristicCompletionEncoding.java | 3 + .../journal/codec/LargeMessageEncoding.java | 3 + .../journal/codec/PageCountPendingImpl.java | 3 + .../journal/codec/PageCountRecordInc.java | 3 + .../journal/codec/PageUpdateTXEncoding.java | 1 + .../codec/PendingLargeMessageEncoding.java | 3 + .../codec/PersistentQueueBindingEncoding.java | 10 +++ .../impl/journal/codec/QueueEncoding.java | 3 + .../impl/journal/codec/XidEncoding.java | 3 + .../impl/LegacyLDAPSecuritySettingPlugin.java | 1 + .../tests/util/ThreadLeakCheckRule.java | 2 + 20 files changed, 143 insertions(+) diff --git a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java index 5c1e556834..513d1f2ff3 100644 --- a/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java +++ b/artemis-jms-server/src/main/java/org/apache/activemq/artemis/jms/management/impl/openmbean/JMSOpenTypeSupport.java @@ -56,6 +56,7 @@ public final class JMSOpenTypeSupport { private final List itemDescriptionsList = new ArrayList<>(); private final List itemTypesList = new ArrayList<>(); + @Override public CompositeType getCompositeType() throws OpenDataException { if (compositeType == null) { init(); @@ -86,6 +87,7 @@ public final class JMSOpenTypeSupport { return getTypeName(); } + @Override public Map getFields(CompositeDataSupport data) throws OpenDataException { Map rc = new HashMap<>(); return rc; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java index a90374ecaa..ca1127d52b 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java @@ -495,6 +495,7 @@ public class ConfigurationImpl implements Configuration, Serializable { return this; } + @Override public ClusterConnectionConfiguration addClusterConfiguration(String name, String uri) throws Exception { ClusterConnectionConfiguration newConfig = new ClusterConnectionConfiguration(new URI(uri)).setName(name); clusterConfigurations.add(newConfig); @@ -1289,10 +1290,12 @@ public class ConfigurationImpl implements Configuration, Serializable { return this; } + @Override public TransportConfiguration[] getTransportConfigurations(String... connectorNames) { return getTransportConfigurations(Arrays.asList(connectorNames)); } + @Override public TransportConfiguration[] getTransportConfigurations(final List connectorNames) { TransportConfiguration[] tcConfigs = (TransportConfiguration[]) Array.newInstance(TransportConfiguration.class, connectorNames.size()); int count = 0; diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java index b5569bdc9e..4471ff306e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/AbstractJournalStorageManager.java @@ -263,10 +263,12 @@ public abstract class AbstractJournalStorageManager implements StorageManager { return getContext().waitCompletion(timeout); } + @Override public OperationContext getContext() { return OperationContextImpl.getContext(executorFactory); } + @Override public void setContext(final OperationContext context) { OperationContextImpl.setContext(context); } @@ -275,22 +277,27 @@ public abstract class AbstractJournalStorageManager implements StorageManager { return singleThreadExecutor; } + @Override public OperationContext newSingleThreadContext() { return newContext(singleThreadExecutor); } + @Override public OperationContext newContext(final Executor executor1) { return new OperationContextImpl(executor1); } + @Override public void afterCompleteOperations(final IOCallback run) { getContext().executeOnCompletion(run); } + @Override public long generateID() { return idGenerator.generateID(); } + @Override public long getCurrentID() { return idGenerator.getCurrentID(); } @@ -298,6 +305,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { // Non transactional operations + @Override public void confirmPendingLargeMessageTX(final Transaction tx, long messageID, long recordID) throws Exception { readLock(); 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 */ + @Override public void confirmPendingLargeMessage(long recordID) throws Exception { readLock(); try { @@ -322,6 +331,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void storeMessage(final ServerMessage message) throws Exception { if (message.getMessageID() <= 0) { // 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 { readLock(); try { @@ -365,6 +376,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { storageManagerLock.readLock().unlock(); } + @Override public void storeAcknowledge(final long queueID, final long messageID) throws Exception { readLock(); try { @@ -375,6 +387,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void storeCursorAcknowledge(long queueID, PagePosition position) throws Exception { readLock(); try { @@ -387,6 +400,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deleteMessage(final long messageID) throws Exception { readLock(); try { @@ -401,6 +415,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void updateScheduledDeliveryTime(final MessageReference ref) throws Exception { ScheduledDeliveryEncoding encoding = new ScheduledDeliveryEncoding(ref.getScheduledDeliveryTime(), ref.getQueue().getID()); 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 { readLock(); try { @@ -424,6 +440,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deleteDuplicateID(final long recordID) throws Exception { readLock(); try { @@ -436,6 +453,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { // Transactional operations + @Override public void storeMessageTransactional(final long txID, final ServerMessage message) throws Exception { if (message.getMessageID() <= 0) { 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 { readLock(); try { @@ -467,6 +486,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void updatePageTransaction(final long txID, final PageTransactionInfo pageTransaction, 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 { readLock(); 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 { readLock(); try { @@ -499,6 +521,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void storeAcknowledgeTransactional(final long txID, final long queueID, 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 { readLock(); try { @@ -523,16 +547,19 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void storePageCompleteTransactional(long txID, long queueID, PagePosition position) throws Exception { long recordID = idGenerator.generateID(); position.setRecordID(recordID); messageJournal.appendAddRecordTransactional(txID, recordID, JournalRecordIds.PAGE_CURSOR_COMPLETE, new CursorAckRecordEncoding(queueID, position)); } + @Override public void deletePageComplete(long ackID) throws Exception { messageJournal.appendDeleteRecord(ackID, false); } + @Override public void deleteCursorAcknowledgeTransactional(long txID, long ackID) throws Exception { readLock(); try { @@ -543,10 +570,12 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deleteCursorAcknowledge(long ackID) throws Exception { messageJournal.appendDeleteRecord(ackID, false); } + @Override public long storeHeuristicCompletion(final Xid xid, final boolean isCommit) throws Exception { readLock(); try { @@ -560,6 +589,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deleteHeuristicCompletion(final long id) throws Exception { readLock(); try { @@ -571,6 +601,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deletePageTransactional(final long recordID) throws Exception { readLock(); try { @@ -581,6 +612,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void updateScheduledDeliveryTimeTransactional(final long txID, final MessageReference ref) throws Exception { ScheduledDeliveryEncoding encoding = new ScheduledDeliveryEncoding(ref.getScheduledDeliveryTime(), ref.getQueue().getID()); readLock(); @@ -593,6 +625,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void prepare(final long txID, final Xid xid) throws Exception { readLock(); try { @@ -603,19 +636,23 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void commit(final long txID) throws Exception { commit(txID, true); } + @Override public void commitBindings(final long txID) throws Exception { bindingsJournal.appendCommitRecord(txID, true); } + @Override public void rollbackBindings(final long txID) throws Exception { // no need to sync, it's going away anyways bindingsJournal.appendRollbackRecord(txID, false); } + @Override public void commit(final long txID, final boolean lineUpContext) throws Exception { readLock(); try { @@ -636,6 +673,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void rollback(final long txID) throws Exception { readLock(); try { @@ -646,6 +684,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void storeDuplicateIDTransactional(final long txID, final SimpleString address, final byte[] duplID, @@ -661,6 +700,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void updateDuplicateIDTransactional(final long txID, final SimpleString address, 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 { readLock(); try { @@ -688,6 +729,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { // Other operations + @Override public void updateDeliveryCount(final MessageReference ref) throws Exception { // no need to store if it's the same value // 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 { deleteAddressSetting(addressSetting.getAddressMatch()); readLock(); @@ -721,14 +764,17 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public List recoverAddressSettings() throws Exception { return new ArrayList<>(mapPersistedAddressSettings.values()); } + @Override public List recoverPersistedRoles() throws Exception { return new ArrayList<>(mapPersistedRoles.values()); } + @Override public void storeSecurityRoles(PersistedRoles persistedRoles) throws Exception { deleteSecurityRoles(persistedRoles.getAddressMatch()); @@ -766,6 +812,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deleteAddressSetting(SimpleString addressMatch) throws Exception { PersistedAddressSetting oldSetting = mapPersistedAddressSettings.remove(addressMatch); if (oldSetting != null) { @@ -779,6 +826,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deleteSecurityRoles(SimpleString addressMatch) throws Exception { PersistedRoles oldRoles = mapPersistedRoles.remove(addressMatch); if (oldRoles != null) { @@ -1174,6 +1222,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } // grouping handler operations + @Override public void addGrouping(final GroupBinding groupBinding) throws Exception { GroupingEncoding groupingEncoding = new GroupingEncoding(groupBinding.getId(), groupBinding.getGroupId(), groupBinding.getClusterName()); readLock(); @@ -1185,6 +1234,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deleteGrouping(long tx, final GroupBinding groupBinding) throws Exception { readLock(); try { @@ -1197,6 +1247,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { // BindingsImpl operations + @Override public void addQueueBinding(final long tx, final Binding binding) throws Exception { 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 { readLock(); try { @@ -1225,6 +1277,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public long storePageCounterInc(long txID, long queueID, int value) throws Exception { readLock(); try { @@ -1237,6 +1290,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public long storePageCounterInc(long queueID, int value) throws Exception { readLock(); try { @@ -1278,6 +1332,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deleteIncrementRecord(long txID, long recordID) throws Exception { readLock(); try { @@ -1288,6 +1343,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deletePageCounter(long txID, long recordID) throws Exception { readLock(); try { @@ -1298,6 +1354,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void deletePendingPageCounter(long txID, long recordID) throws Exception { readLock(); try { @@ -1308,6 +1365,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public JournalLoadInformation loadBindingJournal(final List queueBindingInfos, final List groupingInfos) throws Exception { List records = new ArrayList<>(); @@ -1354,6 +1412,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { return bindingsInfo; } + @Override public void lineUpContext() { readLock(); try { @@ -1369,6 +1428,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { protected abstract void beforeStart() throws Exception; + @Override public synchronized void start() throws Exception { if (started) { return; @@ -1390,6 +1450,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { started = true; } + @Override public void stop() throws Exception { stop(false); } @@ -1407,6 +1468,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { */ protected abstract void performCachedLargeMessageDeletes(); + @Override public synchronized void stop(boolean ioCriticalError) throws Exception { if (!started) { return; @@ -1444,6 +1506,7 @@ public abstract class AbstractJournalStorageManager implements StorageManager { protected abstract void beforeStop() throws Exception; + @Override public synchronized boolean isStarted() { return started; } @@ -1465,12 +1528,14 @@ public abstract class AbstractJournalStorageManager implements StorageManager { } } + @Override public void beforePageRead() throws Exception { if (pageMaxConcurrentIO != null) { pageMaxConcurrentIO.acquire(); } } + @Override public void afterPageRead() throws Exception { if (pageMaxConcurrentIO != null) { pageMaxConcurrentIO.release(); @@ -1479,10 +1544,12 @@ public abstract class AbstractJournalStorageManager implements StorageManager { // Public ----------------------------------------------------------------------------------- + @Override public Journal getMessageJournal() { return messageJournal; } + @Override public Journal getBindingsJournal() { return bindingsJournal; } @@ -1714,37 +1781,47 @@ public abstract class AbstractJournalStorageManager implements StorageManager { return DummyOperationContext.instance; } + @Override public void executeOnCompletion(final IOCallback runnable) { // There are no executeOnCompletion calls while using the DummyOperationContext // However we keep the code here for correctness runnable.done(); } + @Override public void replicationDone() { } + @Override public void replicationLineUp() { } + @Override public void storeLineUp() { } + @Override public void done() { } + @Override public void onError(final int errorCode, final String errorMessage) { } + @Override public void waitCompletion() { } + @Override public boolean waitCompletion(final long timeout) { return true; } + @Override public void pageSyncLineUp() { } + @Override public void pageSyncDone() { } } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DummyOperationContext.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DummyOperationContext.java index 194d2b1d25..1ae7524347 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DummyOperationContext.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DummyOperationContext.java @@ -27,37 +27,47 @@ final class DummyOperationContext implements OperationContext { return DummyOperationContext.instance; } + @Override public void executeOnCompletion(final IOCallback runnable) { // There are no executeOnCompletion calls while using the DummyOperationContext // However we keep the code here for correctness runnable.done(); } + @Override public void replicationDone() { } + @Override public void replicationLineUp() { } + @Override public void storeLineUp() { } + @Override public void done() { } + @Override public void onError(final int errorCode, final String errorMessage) { } + @Override public void waitCompletion() { } + @Override public boolean waitCompletion(final long timeout) { return true; } + @Override public void pageSyncLineUp() { } + @Override public void pageSyncDone() { } } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeMessageTXFailureCallback.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeMessageTXFailureCallback.java index c2133d9389..045be4674f 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeMessageTXFailureCallback.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/LargeMessageTXFailureCallback.java @@ -41,6 +41,7 @@ public class LargeMessageTXFailureCallback implements TransactionFailureCallback this.messages = messages; } + @Override public void failedTransaction(final long transactionID, final List records, final List recordsToDelete) { diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/CursorAckRecordEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/CursorAckRecordEncoding.java index 4e1fada359..db6291669e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/CursorAckRecordEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/CursorAckRecordEncoding.java @@ -42,16 +42,19 @@ public class CursorAckRecordEncoding implements EncodingSupport { public PagePosition position; + @Override public int getEncodeSize() { return DataConstants.SIZE_LONG + DataConstants.SIZE_LONG + DataConstants.SIZE_INT; } + @Override public void encode(ActiveMQBuffer buffer) { buffer.writeLong(queueID); buffer.writeLong(position.getPageNr()); buffer.writeInt(position.getMessageNr()); } + @Override public void decode(ActiveMQBuffer buffer) { queueID = buffer.readLong(); long pageNR = buffer.readLong(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DeliveryCountUpdateEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DeliveryCountUpdateEncoding.java index 5c4541d173..5025c77ec9 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DeliveryCountUpdateEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DeliveryCountUpdateEncoding.java @@ -35,16 +35,19 @@ public class DeliveryCountUpdateEncoding implements EncodingSupport { this.count = count; } + @Override public void decode(final ActiveMQBuffer buffer) { queueID = buffer.readLong(); count = buffer.readInt(); } + @Override public void encode(final ActiveMQBuffer buffer) { buffer.writeLong(queueID); buffer.writeInt(count); } + @Override public int getEncodeSize() { return 8 + 4; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DuplicateIDEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DuplicateIDEncoding.java index 49d8dc88e0..fccc2e2c41 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DuplicateIDEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/DuplicateIDEncoding.java @@ -40,6 +40,7 @@ public class DuplicateIDEncoding implements EncodingSupport { public DuplicateIDEncoding() { } + @Override public void decode(final ActiveMQBuffer buffer) { address = buffer.readSimpleString(); @@ -50,6 +51,7 @@ public class DuplicateIDEncoding implements EncodingSupport { buffer.readBytes(duplID); } + @Override public void encode(final ActiveMQBuffer buffer) { buffer.writeSimpleString(address); @@ -58,6 +60,7 @@ public class DuplicateIDEncoding implements EncodingSupport { buffer.writeBytes(duplID); } + @Override public int getEncodeSize() { return SimpleString.sizeofString(address) + DataConstants.SIZE_INT + duplID.length; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/GroupingEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/GroupingEncoding.java index 8db60373f2..aec0a36101 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/GroupingEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/GroupingEncoding.java @@ -38,20 +38,24 @@ public class GroupingEncoding implements EncodingSupport, GroupingInfo { public GroupingEncoding() { } + @Override public int getEncodeSize() { return SimpleString.sizeofString(groupId) + SimpleString.sizeofString(clusterName); } + @Override public void encode(final ActiveMQBuffer buffer) { buffer.writeSimpleString(groupId); buffer.writeSimpleString(clusterName); } + @Override public void decode(final ActiveMQBuffer buffer) { groupId = buffer.readSimpleString(); clusterName = buffer.readSimpleString(); } + @Override public long getId() { return id; } @@ -60,10 +64,12 @@ public class GroupingEncoding implements EncodingSupport, GroupingInfo { this.id = id; } + @Override public SimpleString getGroupId() { return groupId; } + @Override public SimpleString getClusterName() { return clusterName; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/HeuristicCompletionEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/HeuristicCompletionEncoding.java index 4ef9c85937..20d371123a 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/HeuristicCompletionEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/HeuristicCompletionEncoding.java @@ -42,16 +42,19 @@ public class HeuristicCompletionEncoding implements EncodingSupport { public HeuristicCompletionEncoding() { } + @Override public void decode(final ActiveMQBuffer buffer) { xid = XidCodecSupport.decodeXid(buffer); isCommit = buffer.readBoolean(); } + @Override public void encode(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); buffer.writeBoolean(isCommit); } + @Override public int getEncodeSize() { return XidCodecSupport.getXidEncodeLength(xid) + DataConstants.SIZE_BOOLEAN; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/LargeMessageEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/LargeMessageEncoding.java index 0e32895558..cdb57028d2 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/LargeMessageEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/LargeMessageEncoding.java @@ -31,6 +31,7 @@ public class LargeMessageEncoding implements EncodingSupport { /* (non-Javadoc) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) */ + @Override public void decode(final ActiveMQBuffer buffer) { message.decodeHeadersAndProperties(buffer); } @@ -38,6 +39,7 @@ public class LargeMessageEncoding implements EncodingSupport { /* (non-Javadoc) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) */ + @Override public void encode(final ActiveMQBuffer buffer) { message.encode(buffer); } @@ -45,6 +47,7 @@ public class LargeMessageEncoding implements EncodingSupport { /* (non-Javadoc) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize() */ + @Override public int getEncodeSize() { return message.getEncodeSize(); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountPendingImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountPendingImpl.java index 98371e7050..56e8c872d3 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountPendingImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountPendingImpl.java @@ -47,14 +47,17 @@ public class PageCountPendingImpl implements EncodingSupport, PageCountPending { this.id = id; } + @Override public long getID() { return id; } + @Override public long getQueueID() { return queueID; } + @Override public long getPageID() { return pageID; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountRecordInc.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountRecordInc.java index 6e0f71752b..e427d68d87 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountRecordInc.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageCountRecordInc.java @@ -47,15 +47,18 @@ public class PageCountRecordInc implements EncodingSupport { return value; } + @Override public int getEncodeSize() { return DataConstants.SIZE_LONG + DataConstants.SIZE_INT; } + @Override public void encode(ActiveMQBuffer buffer) { buffer.writeLong(queueID); buffer.writeInt(value); } + @Override public void decode(ActiveMQBuffer buffer) { queueID = buffer.readLong(); value = buffer.readInt(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageUpdateTXEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageUpdateTXEncoding.java index feae37b953..6db8270f30 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageUpdateTXEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PageUpdateTXEncoding.java @@ -42,6 +42,7 @@ public class PageUpdateTXEncoding implements EncodingSupport { this.recods = records; } + @Override public void decode(ActiveMQBuffer buffer) { this.pageTX = buffer.readLong(); this.recods = buffer.readInt(); diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PendingLargeMessageEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PendingLargeMessageEncoding.java index 34fd9a4964..b3be308656 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PendingLargeMessageEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PendingLargeMessageEncoding.java @@ -34,6 +34,7 @@ public class PendingLargeMessageEncoding implements EncodingSupport { /* (non-Javadoc) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#decode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) */ + @Override public void decode(final ActiveMQBuffer buffer) { largeMessageID = buffer.readLong(); } @@ -41,6 +42,7 @@ public class PendingLargeMessageEncoding implements EncodingSupport { /* (non-Javadoc) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#encode(org.apache.activemq.artemis.spi.core.remoting.ActiveMQBuffer) */ + @Override public void encode(final ActiveMQBuffer buffer) { buffer.writeLong(largeMessageID); } @@ -48,6 +50,7 @@ public class PendingLargeMessageEncoding implements EncodingSupport { /* (non-Javadoc) * @see org.apache.activemq.artemis.core.journal.EncodingSupport#getEncodeSize() */ + @Override public int getEncodeSize() { return DataConstants.SIZE_LONG; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java index bfbc7fd05f..4efe2926ee 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/PersistentQueueBindingEncoding.java @@ -67,6 +67,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin this.autoCreated = autoCreated; } + @Override public long getId() { return id; } @@ -75,30 +76,37 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin this.id = id; } + @Override public SimpleString getAddress() { return address; } + @Override public void replaceQueueName(SimpleString newName) { this.name = newName; } + @Override public SimpleString getFilterString() { return filterString; } + @Override public SimpleString getQueueName() { return name; } + @Override public SimpleString getUser() { return user; } + @Override public boolean isAutoCreated() { return autoCreated; } + @Override public void decode(final ActiveMQBuffer buffer) { name = buffer.readSimpleString(); address = buffer.readSimpleString(); @@ -120,6 +128,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin autoCreated = buffer.readBoolean(); } + @Override public void encode(final ActiveMQBuffer buffer) { buffer.writeSimpleString(name); buffer.writeSimpleString(address); @@ -128,6 +137,7 @@ public class PersistentQueueBindingEncoding implements EncodingSupport, QueueBin buffer.writeBoolean(autoCreated); } + @Override public int getEncodeSize() { return SimpleString.sizeofString(name) + SimpleString.sizeofString(address) + SimpleString.sizeofNullableString(filterString) + DataConstants.SIZE_BOOLEAN + diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/QueueEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/QueueEncoding.java index 4b0dfb65f7..1e05195a21 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/QueueEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/QueueEncoding.java @@ -32,14 +32,17 @@ public class QueueEncoding implements EncodingSupport { super(); } + @Override public void decode(final ActiveMQBuffer buffer) { queueID = buffer.readLong(); } + @Override public void encode(final ActiveMQBuffer buffer) { buffer.writeLong(queueID); } + @Override public int getEncodeSize() { return 8; } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/XidEncoding.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/XidEncoding.java index 5969ca2a97..cf10cb65de 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/XidEncoding.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/codec/XidEncoding.java @@ -38,14 +38,17 @@ public class XidEncoding implements EncodingSupport { xid = XidCodecSupport.decodeXid(ActiveMQBuffers.wrappedBuffer(data)); } + @Override public void decode(final ActiveMQBuffer buffer) { throw new IllegalStateException("Non Supported Operation"); } + @Override public void encode(final ActiveMQBuffer buffer) { XidCodecSupport.encodeXid(xid, buffer); } + @Override public int getEncodeSize() { return XidCodecSupport.getXidEncodeLength(xid); } diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java index 936ae9adb6..6adb2ab5cf 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/LegacyLDAPSecuritySettingPlugin.java @@ -384,6 +384,7 @@ public class LegacyLDAPSecuritySettingPlugin implements SecuritySettingPlugin { } } + @Override public SecuritySettingPlugin stop() { try { eventContext.close(); diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ThreadLeakCheckRule.java b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ThreadLeakCheckRule.java index 8ee46c3e9b..b87f5a71b5 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ThreadLeakCheckRule.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/tests/util/ThreadLeakCheckRule.java @@ -40,6 +40,7 @@ public class ThreadLeakCheckRule extends ExternalResource { * * @throws if setup fails (which will disable {@code after} */ + @Override protected void before() throws Throwable { // do nothing @@ -50,6 +51,7 @@ public class ThreadLeakCheckRule extends ExternalResource { /** * Override to tear down your specific external resource. */ + @Override protected void after() { try { if (enabled) { From 4e5b5b393af6edf0b6a0baa96f6757af39f49c38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 24 Jan 2016 13:14:54 +0200 Subject: [PATCH 3/3] Access static methods and fields directly --- .../core/persistence/impl/journal/DescribeJournal.java | 8 ++++---- .../tests/integration/management/QueueControlTest.java | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java index f3ecd76223..741053f01e 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/persistence/impl/journal/DescribeJournal.java @@ -564,7 +564,7 @@ public final class DescribeJournal { } case QUEUE_BINDING_RECORD: - return JournalStorageManager.newBindingEncoding(id, buffer); + return AbstractJournalStorageManager.newBindingEncoding(id, buffer); case ID_COUNTER_RECORD: EncodingSupport idReturn = new IDCounterEncoding(); @@ -573,13 +573,13 @@ public final class DescribeJournal { return idReturn; case JournalRecordIds.GROUP_RECORD: - return JournalStorageManager.newGroupEncoding(id, buffer); + return AbstractJournalStorageManager.newGroupEncoding(id, buffer); case ADDRESS_SETTING_RECORD: - return JournalStorageManager.newAddressEncoding(id, buffer); + return AbstractJournalStorageManager.newAddressEncoding(id, buffer); case SECURITY_RECORD: - return JournalStorageManager.newSecurityRecord(id, buffer); + return AbstractJournalStorageManager.newSecurityRecord(id, buffer); default: return null; diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java index 12c63ddfe1..e66e70d718 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/QueueControlTest.java @@ -41,7 +41,6 @@ import org.apache.activemq.artemis.api.core.management.MessageCounterInfo; import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.api.core.management.QueueControl; import org.apache.activemq.artemis.core.config.Configuration; -import org.apache.activemq.artemis.core.message.impl.MessageImpl; import org.apache.activemq.artemis.core.messagecounter.impl.MessageCounterManagerImpl; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; @@ -2030,7 +2029,7 @@ public class QueueControlTest extends ManagementTestBase { QueueControl queueControl = createManagementControl(address, queue); - queueControl.sendMessage(new HashMap(), MessageImpl.TEXT_TYPE, Base64.encodeBytes("theBody".getBytes()), "myID", true, "myUser", "myPassword"); + queueControl.sendMessage(new HashMap(), Message.TEXT_TYPE, Base64.encodeBytes("theBody".getBytes()), "myID", true, "myUser", "myPassword"); Assert.assertEquals(1, getMessageCount(queueControl)); @@ -2055,7 +2054,7 @@ public class QueueControlTest extends ManagementTestBase { QueueControl queueControl = createManagementControl(address, queue); - queueControl.sendMessage(new HashMap(), MessageImpl.TEXT_TYPE, null, "myID", true, "myUser", "myPassword"); + queueControl.sendMessage(new HashMap(), Message.TEXT_TYPE, null, "myID", true, "myUser", "myPassword"); Assert.assertEquals(1, getMessageCount(queueControl));