Access static methods and fields directly

This commit is contained in:
Ville Skyttä 2016-01-24 13:14:54 +02:00 committed by Clebert Suconic
parent 13cb6ddfd1
commit 4e5b5b393a
2 changed files with 6 additions and 7 deletions

View File

@ -564,7 +564,7 @@ public final class DescribeJournal {
} }
case QUEUE_BINDING_RECORD: case QUEUE_BINDING_RECORD:
return JournalStorageManager.newBindingEncoding(id, buffer); return AbstractJournalStorageManager.newBindingEncoding(id, buffer);
case ID_COUNTER_RECORD: case ID_COUNTER_RECORD:
EncodingSupport idReturn = new IDCounterEncoding(); EncodingSupport idReturn = new IDCounterEncoding();
@ -573,13 +573,13 @@ public final class DescribeJournal {
return idReturn; return idReturn;
case JournalRecordIds.GROUP_RECORD: case JournalRecordIds.GROUP_RECORD:
return JournalStorageManager.newGroupEncoding(id, buffer); return AbstractJournalStorageManager.newGroupEncoding(id, buffer);
case ADDRESS_SETTING_RECORD: case ADDRESS_SETTING_RECORD:
return JournalStorageManager.newAddressEncoding(id, buffer); return AbstractJournalStorageManager.newAddressEncoding(id, buffer);
case SECURITY_RECORD: case SECURITY_RECORD:
return JournalStorageManager.newSecurityRecord(id, buffer); return AbstractJournalStorageManager.newSecurityRecord(id, buffer);
default: default:
return null; return null;

View File

@ -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.ObjectNameBuilder;
import org.apache.activemq.artemis.api.core.management.QueueControl; import org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.core.config.Configuration; 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.messagecounter.impl.MessageCounterManagerImpl;
import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.ActiveMQServers;
@ -2030,7 +2029,7 @@ public class QueueControlTest extends ManagementTestBase {
QueueControl queueControl = createManagementControl(address, queue); QueueControl queueControl = createManagementControl(address, queue);
queueControl.sendMessage(new HashMap<String, String>(), MessageImpl.TEXT_TYPE, Base64.encodeBytes("theBody".getBytes()), "myID", true, "myUser", "myPassword"); queueControl.sendMessage(new HashMap<String, String>(), Message.TEXT_TYPE, Base64.encodeBytes("theBody".getBytes()), "myID", true, "myUser", "myPassword");
Assert.assertEquals(1, getMessageCount(queueControl)); Assert.assertEquals(1, getMessageCount(queueControl));
@ -2055,7 +2054,7 @@ public class QueueControlTest extends ManagementTestBase {
QueueControl queueControl = createManagementControl(address, queue); QueueControl queueControl = createManagementControl(address, queue);
queueControl.sendMessage(new HashMap<String, String>(), MessageImpl.TEXT_TYPE, null, "myID", true, "myUser", "myPassword"); queueControl.sendMessage(new HashMap<String, String>(), Message.TEXT_TYPE, null, "myID", true, "myUser", "myPassword");
Assert.assertEquals(1, getMessageCount(queueControl)); Assert.assertEquals(1, getMessageCount(queueControl));