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] 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));