Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D4242200C4B for ; Mon, 6 Mar 2017 04:58:23 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D2B45160B7D; Mon, 6 Mar 2017 03:58:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B4D76160B89 for ; Mon, 6 Mar 2017 04:58:20 +0100 (CET) Received: (qmail 97912 invoked by uid 500); 6 Mar 2017 03:58:19 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 97267 invoked by uid 99); 6 Mar 2017 03:58:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Mar 2017 03:58:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 35556E02B4; Mon, 6 Mar 2017 03:58:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Mon, 06 Mar 2017 03:58:25 -0000 Message-Id: <9c3a00bee03b4be68fa49bb1d3162e80@git.apache.org> In-Reply-To: <3e13b8336dbc43ab82a722bc97ceec94@git.apache.org> References: <3e13b8336dbc43ab82a722bc97ceec94@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [07/21] activemq-artemis git commit: ARTEMIS-1009 Pure Message Encoding. archived-at: Mon, 06 Mar 2017 03:58:24 -0000 http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java index 70c5b22..23fa0a6 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/clientcrash/ClientExitTest.java @@ -16,9 +16,9 @@ */ package org.apache.activemq.artemis.tests.integration.clientcrash; -import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ClientConsumer; +import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; import org.apache.activemq.artemis.api.core.client.ServerLocator; @@ -63,7 +63,7 @@ public class ClientExitTest extends ClientTestBase { // read the message from the queue - Message message = consumer.receive(15000); + ClientMessage message = consumer.receive(15000); assertNotNull(message); assertEquals(ClientExitTest.MESSAGE_TEXT, message.getBodyBuffer().readString()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java index 87f9255..b0f03d4 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/BridgeTest.java @@ -38,6 +38,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQBuffer; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.Interceptor; import org.apache.activemq.artemis.api.core.Message; + import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; @@ -68,7 +69,6 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.MessageReference; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.api.core.RoutingType; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.core.server.cluster.Bridge; import org.apache.activemq.artemis.core.server.cluster.Transformer; import org.apache.activemq.artemis.core.server.cluster.impl.BridgeImpl; @@ -1885,12 +1885,8 @@ public class BridgeTest extends ActiveMQTestBase { final String BRIDGE = "myBridge"; ServiceRegistryImpl serviceRegistry = new ServiceRegistryImpl(); - Transformer transformer = new Transformer() { - @Override - public ServerMessage transform(ServerMessage message) { - return null; - } - }; + Transformer transformer = (Message encode) -> null; + serviceRegistry.addBridgeTransformer(BRIDGE, transformer); Configuration config = createDefaultInVMConfig().addConnectorConfiguration("in-vm", new TransportConfiguration(INVM_CONNECTOR_FACTORY)); ActiveMQServer server = addServer(new ActiveMQServerImpl(config, null, null, null, serviceRegistry)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java index d9a817e..e462240 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/bridge/SimpleTransformer.java @@ -17,14 +17,16 @@ package org.apache.activemq.artemis.tests.integration.cluster.bridge; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ICoreMessage; +import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.core.server.cluster.Transformer; public class SimpleTransformer implements Transformer { @Override - public ServerMessage transform(final ServerMessage message) { + public Message transform(final Message messageParameter) { + ICoreMessage message = messageParameter.toCore(); SimpleString oldProp = (SimpleString) message.getObjectProperty(new SimpleString("wibble")); if (!oldProp.equals(new SimpleString("bing"))) { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java index 26bcb43..8766057 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/ClusterHeadersRemovedTest.java @@ -16,12 +16,13 @@ */ package org.apache.activemq.artemis.tests.integration.cluster.distribution; +import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.client.ClientSessionFactory; -import org.apache.activemq.artemis.core.message.impl.MessageImpl; + import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType; import org.junit.Before; import org.junit.Test; @@ -83,7 +84,7 @@ public class ClusterHeadersRemovedTest extends ClusterTestBase { assertNotNull(message); - assertFalse(message.containsProperty(MessageImpl.HDR_ROUTE_TO_IDS)); + assertFalse(message.containsProperty(Message.HDR_ROUTE_TO_IDS)); } } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java index de5fe33..0b0fa00 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/cluster/distribution/MessageRedistributionTest.java @@ -28,7 +28,7 @@ import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.client.ClientProducer; import org.apache.activemq.artemis.api.core.client.ClientSession; -import org.apache.activemq.artemis.core.message.impl.MessageImpl; + import org.apache.activemq.artemis.core.server.Bindable; import org.apache.activemq.artemis.core.server.cluster.impl.MessageLoadBalancingType; import org.apache.activemq.artemis.core.server.cluster.impl.Redistributor; @@ -474,7 +474,7 @@ public class MessageRedistributionTest extends ClusterTestBase { bb.putLong(i); - msg.putBytesProperty(MessageImpl.HDR_BRIDGE_DUPLICATE_ID, bytes); + msg.putBytesProperty(Message.HDR_BRIDGE_DUPLICATE_ID, bytes); prod0.send(msg); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java index 510fa68..69a360e 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/divert/DivertTest.java @@ -20,6 +20,7 @@ import java.util.Collection; import java.util.concurrent.TimeUnit; import org.apache.activemq.artemis.api.core.Message; + import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; @@ -35,7 +36,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.Divert; import org.apache.activemq.artemis.api.core.RoutingType; -import org.apache.activemq.artemis.core.server.ServerMessage; + import org.apache.activemq.artemis.core.server.cluster.Transformer; import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; import org.apache.activemq.artemis.core.server.impl.ServiceRegistryImpl; @@ -1301,7 +1302,7 @@ public class DivertTest extends ActiveMQTestBase { ServiceRegistryImpl serviceRegistry = new ServiceRegistryImpl(); Transformer transformer = new Transformer() { @Override - public ServerMessage transform(ServerMessage message) { + public Message transform(Message message) { return null; } }; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java index 43a4ad9..eff1615 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/interceptors/InterceptorTest.java @@ -50,7 +50,7 @@ import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionRec import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.api.core.RoutingType; -import org.apache.activemq.artemis.core.server.ServerMessage; + import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; import org.apache.activemq.artemis.spi.core.security.ActiveMQJAASSecurityManager; @@ -88,7 +88,7 @@ public class InterceptorTest extends ActiveMQTestBase { if (packet.getType() == PacketImpl.SESS_SEND) { SessionSendMessage p = (SessionSendMessage) packet; - ServerMessage sm = (ServerMessage) p.getMessage(); + Message sm = p.getMessage(); sm.putStringProperty(InterceptorTest.key, "orange"); } @@ -165,7 +165,7 @@ public class InterceptorTest extends ActiveMQTestBase { if (packet.getType() == PacketImpl.SESS_RECEIVE_MSG) { SessionReceiveMessage p = (SessionReceiveMessage) packet; - ServerMessage sm = (ServerMessage) p.getMessage(); + Message sm = p.getMessage(); sm.putStringProperty(InterceptorTest.key, "orange"); } @@ -319,7 +319,7 @@ public class InterceptorTest extends ActiveMQTestBase { if (packet.getType() == PacketImpl.SESS_SEND) { SessionSendMessage p = (SessionSendMessage) packet; - ServerMessage sm = (ServerMessage) p.getMessage(); + Message sm = p.getMessage(); sm.putIntProperty(key, num); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/MessageJournalTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/MessageJournalTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/MessageJournalTest.java new file mode 100644 index 0000000..85ed04f --- /dev/null +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/MessageJournalTest.java @@ -0,0 +1,130 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.activemq.artemis.tests.integration.journal; + +import java.util.LinkedList; +import java.util.List; + +import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; +import org.apache.activemq.artemis.core.journal.RecordInfo; +import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; +import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; +import org.apache.activemq.artemis.core.protocol.core.impl.CoreProtocolManagerFactory; +import org.apache.activemq.artemis.core.server.ActiveMQServer; +import org.apache.activemq.artemis.protocol.amqp.broker.AMQPMessage; +import org.apache.activemq.artemis.protocol.amqp.broker.ProtonProtocolManagerFactory; +import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; +import org.apache.qpid.proton.message.Message; +import org.junit.Assert; +import org.junit.Test; + +public class MessageJournalTest extends ActiveMQTestBase { + + @Test + public void testStoreCore() throws Throwable { + ActiveMQServer server = createServer(true); + + server.start(); + + CoreMessage message = new CoreMessage().initBuffer(10 * 1024).setDurable(true); + + message.setMessageID(333); + + CoreProtocolManagerFactory factory = (CoreProtocolManagerFactory) server.getRemotingService().getProtocolFactoryMap().get("CORE"); + + Assert.assertNotNull(factory); + + message.getBodyBuffer().writeByte((byte)'Z'); + + server.getStorageManager().storeMessage(message); + + server.getStorageManager().stop(); + + JournalStorageManager journalStorageManager = (JournalStorageManager) server.getStorageManager(); + + List committedRecords = new LinkedList<>(); + + List preparedTransactions = new LinkedList<>(); + + TransactionFailureCallback transactionFailure = new TransactionFailureCallback() { + @Override + public void failedTransaction(long transactionID, List records, List recordsToDelete) { + + } + }; + + try { + journalStorageManager.getMessageJournal().start(); + + journalStorageManager.getMessageJournal().load(committedRecords, preparedTransactions, transactionFailure); + + Assert.assertEquals(1, committedRecords.size()); + } finally { + journalStorageManager.getMessageJournal().stop(); + } + + } + + + @Test + public void testStoreAMQP() throws Throwable { + ActiveMQServer server = createServer(true); + + server.start(); + + ProtonProtocolManagerFactory factory = (ProtonProtocolManagerFactory) server.getRemotingService().getProtocolFactoryMap().get("AMQP"); + + Message protonJMessage = Message.Factory.create(); + + AMQPMessage message = new AMQPMessage(protonJMessage); + + message.setMessageID(333); + + Assert.assertNotNull(factory); + + server.getStorageManager().storeMessage(message); + + server.getStorageManager().stop(); + + JournalStorageManager journalStorageManager = (JournalStorageManager) server.getStorageManager(); + + List committedRecords = new LinkedList<>(); + + List preparedTransactions = new LinkedList<>(); + + TransactionFailureCallback transactionFailure = new TransactionFailureCallback() { + @Override + public void failedTransaction(long transactionID, List records, List recordsToDelete) { + + } + }; + + try { + journalStorageManager.getMessageJournal().start(); + + journalStorageManager.getMessageJournal().load(committedRecords, preparedTransactions, transactionFailure); + + Assert.assertEquals(1, committedRecords.size()); + } finally { + journalStorageManager.getMessageJournal().stop(); + } + + } + +} http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java index 38cc126..a0f23d0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/journal/NIOJournalCompactTest.java @@ -43,9 +43,9 @@ import org.apache.activemq.artemis.core.journal.impl.JournalCompactor; import org.apache.activemq.artemis.core.journal.impl.JournalFile; import org.apache.activemq.artemis.core.journal.impl.JournalFileImpl; import org.apache.activemq.artemis.core.journal.impl.JournalImpl; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.tests.unit.core.journal.impl.JournalImplTestBase; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.SimpleEncoding; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; @@ -1656,13 +1656,13 @@ public class NIOJournalCompactTest extends JournalImplTestBase { long id = seqGenerator.incrementAndGet(); values[i] = id; - ServerMessageImpl message = new ServerMessageImpl(id, 100); + CoreMessage message = new CoreMessage(id, 100); message.getBodyBuffer().writeBytes(new byte[1024]); storage.storeMessageTransactional(tx, message); } - ServerMessageImpl message = new ServerMessageImpl(seqGenerator.incrementAndGet(), 100); + CoreMessage message = new CoreMessage(seqGenerator.incrementAndGet(), 100); survivingMsgs.add(message.getMessageID()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java index 02a412c..04d7afa 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/karaf/ArtemisFeatureTest.java @@ -42,6 +42,7 @@ import org.apache.karaf.shell.api.console.SessionFactory; import org.apache.log4j.Logger; import org.apache.qpid.jms.JmsConnectionFactory; import org.junit.Assert; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.ops4j.pax.exam.Configuration; @@ -71,6 +72,7 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; * Useful docs about this test: https://ops4j1.jira.com/wiki/display/paxexam/FAQ */ @RunWith(PaxExam.class) +@Ignore // need to fix OSGI with Netty public class ArtemisFeatureTest extends Assert { private static Logger LOG = Logger.getLogger(ArtemisFeatureTest.class.getName()); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java index 0719b38..3151408 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementHelperTest.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.client.ClientMessage; import org.apache.activemq.artemis.api.core.management.ManagementHelper; import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; @@ -48,7 +48,7 @@ public class ManagementHelperTest extends Assert { String operationName = RandomUtil.randomString(); String param = RandomUtil.randomString(); String[] params = new String[]{RandomUtil.randomString(), RandomUtil.randomString(), RandomUtil.randomString()}; - Message msg = new ClientMessageImpl((byte) 0, false, 0, 0, (byte) 4, 1000); + ClientMessage msg = new ClientMessageImpl((byte) 0, false, 0, 0, (byte) 4, 1000); ManagementHelper.putOperationInvocation(msg, resource, operationName, param, params); Object[] parameters = ManagementHelper.retrieveOperationParameters(msg); @@ -135,7 +135,7 @@ public class ManagementHelperTest extends Assert { Object[] params = new Object[]{i, s, d, b, l, map, strArray, maps}; - Message msg = new ClientMessageImpl((byte) 0, false, 0, 0, (byte) 4, 1000); + ClientMessageImpl msg = new ClientMessageImpl((byte) 0, false, 0, 0, (byte) 4, 1000); ManagementHelper.putOperationInvocation(msg, resource, operationName, params); Object[] parameters = ManagementHelper.retrieveOperationParameters(msg); @@ -201,7 +201,7 @@ public class ManagementHelperTest extends Assert { Object[] params = new Object[]{"hello", map}; - Message msg = new ClientMessageImpl((byte) 0, false, 0, 0, (byte) 4, 1000); + ClientMessageImpl msg = new ClientMessageImpl((byte) 0, false, 0, 0, (byte) 4, 1000); ManagementHelper.putOperationInvocation(msg, resource, operationName, params); Object[] parameters = ManagementHelper.retrieveOperationParameters(msg); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java index 1afc732..151341f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/management/ManagementServiceImplTest.java @@ -16,19 +16,20 @@ */ package org.apache.activemq.artemis.tests.integration.management; +import org.apache.activemq.artemis.api.core.ICoreMessage; +import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.management.AddressControl; import org.apache.activemq.artemis.api.core.management.ManagementHelper; import org.apache.activemq.artemis.api.core.management.QueueControl; import org.apache.activemq.artemis.api.core.management.ResourceNames; import org.apache.activemq.artemis.core.config.Configuration; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.ActiveMQServers; import org.apache.activemq.artemis.core.server.Queue; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.core.server.impl.AddressInfo; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.core.server.management.impl.ManagementServiceImpl; import org.apache.activemq.artemis.tests.integration.server.FakeStorageManager; import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue; @@ -50,10 +51,10 @@ public class ManagementServiceImplTest extends ActiveMQTestBase { server.start(); // invoke attribute and operation on the server - ServerMessage message = new ServerMessageImpl(1, 100); + CoreMessage message = new CoreMessage(1, 100); ManagementHelper.putOperationInvocation(message, ResourceNames.BROKER, "createQueue", queue, address); - ServerMessage reply = server.getManagementService().handleMessage(message); + Message reply = server.getManagementService().handleMessage(message); Assert.assertTrue(ManagementHelper.hasOperationSucceeded(reply)); } @@ -66,10 +67,10 @@ public class ManagementServiceImplTest extends ActiveMQTestBase { server.start(); // invoke attribute and operation on the server - ServerMessage message = new ServerMessageImpl(1, 100); + CoreMessage message = new CoreMessage(1, 100); ManagementHelper.putOperationInvocation(message, ResourceNames.BROKER, "thereIsNoSuchOperation"); - ServerMessage reply = server.getManagementService().handleMessage(message); + ICoreMessage reply = server.getManagementService().handleMessage(message); Assert.assertFalse(ManagementHelper.hasOperationSucceeded(reply)); Assert.assertNotNull(ManagementHelper.getResult(reply)); @@ -83,10 +84,10 @@ public class ManagementServiceImplTest extends ActiveMQTestBase { server.start(); // invoke attribute and operation on the server - ServerMessage message = new ServerMessageImpl(1, 100); + ICoreMessage message = new CoreMessage(1, 100); ManagementHelper.putOperationInvocation(message, "Resouce.Does.Not.Exist", "toString"); - ServerMessage reply = server.getManagementService().handleMessage(message); + ICoreMessage reply = server.getManagementService().handleMessage(message); Assert.assertFalse(ManagementHelper.hasOperationSucceeded(reply)); Assert.assertNotNull(ManagementHelper.getResult(reply)); @@ -100,11 +101,11 @@ public class ManagementServiceImplTest extends ActiveMQTestBase { server.start(); // invoke attribute and operation on the server - ServerMessage message = new ServerMessageImpl(1, 100); + ICoreMessage message = new CoreMessage(1, 100); ManagementHelper.putAttribute(message, ResourceNames.BROKER, "started"); - ServerMessage reply = server.getManagementService().handleMessage(message); + ICoreMessage reply = server.getManagementService().handleMessage(message); Assert.assertTrue(ManagementHelper.hasOperationSucceeded(reply)); Assert.assertTrue((Boolean) ManagementHelper.getResult(reply)); @@ -118,11 +119,11 @@ public class ManagementServiceImplTest extends ActiveMQTestBase { server.start(); // invoke attribute and operation on the server - ServerMessage message = new ServerMessageImpl(1, 100); + ICoreMessage message = new CoreMessage(1, 100); ManagementHelper.putAttribute(message, ResourceNames.BROKER, "attribute.Does.Not.Exist"); - ServerMessage reply = server.getManagementService().handleMessage(message); + ICoreMessage reply = server.getManagementService().handleMessage(message); Assert.assertFalse(ManagementHelper.hasOperationSucceeded(reply)); Assert.assertNotNull(ManagementHelper.getResult(reply)); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java index 1f0d7e0..3675416 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingSendTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.api.core.ActiveMQException; -import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; @@ -289,7 +288,7 @@ public class PagingSendTest extends ActiveMQTestBase { List messageIds = new ArrayList<>(); ClientProducer producer = session.createProducer(queueAddr); for (int i = 0; i < batchSize; i++) { - Message message = session.createMessage(true); + ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeBytes(new byte[1024]); String id = UUID.randomUUID().toString(); message.putStringProperty("id", id); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java index 1714947..48127d2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/paging/PagingTest.java @@ -42,6 +42,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQExceptionType; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ClientConsumer; import org.apache.activemq.artemis.api.core.client.ClientMessage; @@ -75,7 +76,6 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContex import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.core.server.Queue; -import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; import org.apache.activemq.artemis.core.server.impl.AddressInfo; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; @@ -5536,7 +5536,7 @@ public class PagingTest extends ActiveMQTestBase { for (int i = 0; i < 100; i++) { Message msg = session.createMessage(true); - msg.getBodyBuffer().writeBytes(new byte[1024]); + msg.toCore().getBodyBuffer().writeBytes(new byte[1024]); prod.send(msg); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java index 90f7c5f..615a924 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/DeleteMessagesOnStartupTest.java @@ -21,17 +21,17 @@ import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.config.StoreConfiguration; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; import org.apache.activemq.artemis.core.persistence.AddressBindingInfo; import org.apache.activemq.artemis.core.persistence.GroupingInfo; import org.apache.activemq.artemis.core.persistence.QueueBindingInfo; import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; import org.apache.activemq.artemis.core.server.Queue; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.core.server.impl.PostOfficeJournalLoader; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.tests.unit.core.postoffice.impl.FakeQueue; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakePostOffice; import org.junit.Assert; @@ -40,8 +40,6 @@ import org.junit.runners.Parameterized; public class DeleteMessagesOnStartupTest extends StorageManagerTestBase { - volatile boolean deleteMessages = false; - ArrayList deletedMessage = new ArrayList<>(); public DeleteMessagesOnStartupTest(StoreConfiguration.StoreType storeType) { @@ -63,12 +61,12 @@ public class DeleteMessagesOnStartupTest extends StorageManagerTestBase { HashMap queues = new HashMap<>(); queues.put(100L, theQueue); - ServerMessage msg = new ServerMessageImpl(1, 100); + Message msg = new CoreMessage(1, 100); journal.storeMessage(msg); for (int i = 2; i < 100; i++) { - journal.storeMessage(new ServerMessageImpl(i, 100)); + journal.storeMessage(new CoreMessage(i, 100)); } journal.storeReference(100, 1, true); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java index 8833b92..16cedd2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/persistence/ExportFormatTest.java @@ -47,27 +47,27 @@ public class ExportFormatTest extends ActiveMQTestBase { // Case the format was changed, and the change was agreed, use _testCreateFormat to recreate this field String journalFile = "#File,JournalFileImpl: (activemq-data-1.amq id = 1, recordID = 1)\n" + - "operation@AddRecordTX,txID@0,id@5,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAABQEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZufQEAQAAAAEAAAAGawBlAHkABgAAAAA=\n" + - "operation@UpdateTX,txID@0,id@5,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + - "operation@AddRecordTX,txID@0,id@6,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAABgEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZufcEAQAAAAEAAAAGawBlAHkABgAAAAE=\n" + - "operation@UpdateTX,txID@0,id@6,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + - "operation@AddRecordTX,txID@0,id@7,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAABwEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZufcEAQAAAAEAAAAGawBlAHkABgAAAAI=\n" + + "operation@AddRecordTX,txID@0,id@7,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAAHAQAAAARBADEAAAAAPQAAAA0AAAAAAAAABwEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WFoEAQAAAAEAAAAGawBlAHkABgAAAAA=\n" + "operation@UpdateTX,txID@0,id@7,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + - "operation@AddRecordTX,txID@0,id@8,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAACAEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZufgEAQAAAAEAAAAGawBlAHkABgAAAAM=\n" + + "operation@AddRecordTX,txID@0,id@8,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAAIAQAAAARBADEAAAAAPQAAAA0AAAAAAAAACAEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WF4EAQAAAAEAAAAGawBlAHkABgAAAAE=\n" + "operation@UpdateTX,txID@0,id@8,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + - "operation@AddRecordTX,txID@0,id@9,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAACQEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZufgEAQAAAAEAAAAGawBlAHkABgAAAAQ=\n" + + "operation@AddRecordTX,txID@0,id@9,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAAJAQAAAARBADEAAAAAPQAAAA0AAAAAAAAACQEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WF4EAQAAAAEAAAAGawBlAHkABgAAAAI=\n" + "operation@UpdateTX,txID@0,id@9,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + + "operation@AddRecordTX,txID@0,id@10,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAAKAQAAAARBADEAAAAAPQAAAA0AAAAAAAAACgEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WF8EAQAAAAEAAAAGawBlAHkABgAAAAM=\n" + + "operation@UpdateTX,txID@0,id@10,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + + "operation@AddRecordTX,txID@0,id@11,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAALAQAAAARBADEAAAAAPQAAAA0AAAAAAAAACwEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WF8EAQAAAAEAAAAGawBlAHkABgAAAAQ=\n" + + "operation@UpdateTX,txID@0,id@11,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + "operation@Commit,txID@0,numberOfRecords@10\n" + - "operation@AddRecord,id@13,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAADQEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZuhQEAQAAAAEAAAAGawBlAHkABgAAAAU=\n" + - "operation@Update,id@13,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + - "operation@AddRecord,id@14,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAADgEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZuhcEAQAAAAEAAAAGawBlAHkABgAAAAY=\n" + - "operation@Update,id@14,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + - "operation@AddRecord,id@15,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAADwEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZuhsEAQAAAAEAAAAGawBlAHkABgAAAAc=\n" + + "operation@AddRecord,id@15,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAAPAQAAAARBADEAAAAAPQAAAA0AAAAAAAAADwEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WLAEAQAAAAEAAAAGawBlAHkABgAAAAU=\n" + "operation@Update,id@15,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + - "operation@AddRecord,id@16,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAAEAEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2Zuh4EAQAAAAEAAAAGawBlAHkABgAAAAg=\n" + + "operation@AddRecord,id@16,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAAQAQAAAARBADEAAAAAPQAAAA0AAAAAAAAAEAEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WLIEAQAAAAEAAAAGawBlAHkABgAAAAY=\n" + "operation@Update,id@16,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + - "operation@AddRecord,id@17,userRecordType@31,length@65,isUpdate@false,compactCount@0,data@AAAAEQAAAE4AAAAAAAAAEQEAAAAEQQAxAAAA_wAAAAAAAAAAAAABTh2ZuiIEAQAAAAEAAAAGawBlAHkABgAAAAk=\n" + + "operation@AddRecord,id@17,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAARAQAAAARBADEAAAAAPQAAAA0AAAAAAAAAEQEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WLgEAQAAAAEAAAAGawBlAHkABgAAAAc=\n" + "operation@Update,id@17,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + + "operation@AddRecord,id@18,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAASAQAAAARBADEAAAAAPQAAAA0AAAAAAAAAEgEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WLwEAQAAAAEAAAAGawBlAHkABgAAAAg=\n" + + "operation@Update,id@18,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + + "operation@AddRecord,id@19,userRecordType@45,length@83,isUpdate@false,compactCount@0,data@AQAAAAAAAAATAQAAAARBADEAAAAAPQAAAA0AAAAAAAAAEwEAAAAEQQAxAAAAAQAAAAAAAAAAAAABWpf6WL4EAQAAAAEAAAAGawBlAHkABgAAAAk=\n" + + "operation@Update,id@19,userRecordType@32,length@8,isUpdate@true,compactCount@0,data@AAAAAAAAAAM=\n" + "#File,JournalFileImpl: (activemq-data-2.amq id = 2, recordID = 2)"; @Test http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java index 1ae9527..ab32517 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/replication/ReplicationTest.java @@ -58,6 +58,7 @@ import org.apache.activemq.artemis.core.journal.PreparedTransactionInfo; import org.apache.activemq.artemis.core.journal.RecordInfo; import org.apache.activemq.artemis.core.journal.TransactionFailureCallback; import org.apache.activemq.artemis.core.journal.impl.JournalFile; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; import org.apache.activemq.artemis.core.paging.PagedMessage; import org.apache.activemq.artemis.core.paging.PagingManager; import org.apache.activemq.artemis.core.paging.PagingStore; @@ -65,6 +66,7 @@ import org.apache.activemq.artemis.core.paging.impl.PagedMessageImpl; import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl; import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO; import org.apache.activemq.artemis.core.persistence.OperationContext; +import org.apache.activemq.artemis.core.persistence.Persister; import org.apache.activemq.artemis.core.persistence.StorageManager; import org.apache.activemq.artemis.core.persistence.impl.journal.JournalStorageManager; import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContextImpl; @@ -74,10 +76,8 @@ import org.apache.activemq.artemis.core.replication.ReplicatedJournal; import org.apache.activemq.artemis.core.replication.ReplicationManager; import org.apache.activemq.artemis.core.server.ActiveMQComponent; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.core.server.cluster.ClusterController; import org.apache.activemq.artemis.core.server.impl.ActiveMQServerImpl; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.core.settings.HierarchicalRepository; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.spi.core.protocol.RemotingConnection; @@ -228,7 +228,7 @@ public final class ReplicationTest extends ActiveMQTestBase { Assert.assertTrue("Expecting no active tokens:" + manager.getActiveTokens(), manager.getActiveTokens().isEmpty()); - ServerMessage msg = new ServerMessageImpl(1, 1024); + CoreMessage msg = new CoreMessage().initBuffer(1024).setMessageID(1); SimpleString dummy = new SimpleString("dummy"); msg.setAddress(dummy); @@ -259,12 +259,12 @@ public final class ReplicationTest extends ActiveMQTestBase { blockOnReplication(storage, manager); - ServerMessageImpl serverMsg = new ServerMessageImpl(); + CoreMessage serverMsg = new CoreMessage(); serverMsg.setMessageID(500); serverMsg.setAddress(new SimpleString("tttt")); ActiveMQBuffer buffer = ActiveMQBuffers.dynamicBuffer(100); - serverMsg.encodeHeadersAndProperties(buffer); + serverMsg.encodeHeadersAndProperties(buffer.byteBuf()); manager.largeMessageBegin(500); @@ -619,6 +619,62 @@ public final class ReplicationTest extends ActiveMQTestBase { static final class FakeJournal implements Journal { @Override + public void appendAddRecord(long id, + byte recordType, + Persister persister, + Object record, + boolean sync) throws Exception { + + } + + @Override + public void appendAddRecord(long id, + byte recordType, + Persister persister, + Object record, + boolean sync, + IOCompletion completionCallback) throws Exception { + + } + + @Override + public void appendUpdateRecord(long id, + byte recordType, + Persister persister, + Object record, + boolean sync) throws Exception { + + } + + @Override + public void appendUpdateRecord(long id, + byte recordType, + Persister persister, + Object record, + boolean sync, + IOCompletion callback) throws Exception { + + } + + @Override + public void appendAddRecordTransactional(long txID, + long id, + byte recordType, + Persister persister, + Object record) throws Exception { + + } + + @Override + public void appendUpdateRecordTransactional(long txID, + long id, + byte recordType, + Persister persister, + Object record) throws Exception { + + } + + @Override public void appendAddRecord(final long id, final byte recordType, final byte[] record, @@ -756,11 +812,6 @@ public final class ReplicationTest extends ActiveMQTestBase { } @Override - public void perfBlast(final int pages) { - - } - - @Override public boolean isStarted() { return false; http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FakeStorageManager.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FakeStorageManager.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FakeStorageManager.java index c3670c5..67cfe18 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FakeStorageManager.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/FakeStorageManager.java @@ -19,8 +19,8 @@ package org.apache.activemq.artemis.tests.integration.server; import java.util.ArrayList; import java.util.List; +import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager; -import org.apache.activemq.artemis.core.server.ServerMessage; public class FakeStorageManager extends NullStorageManager { @@ -29,12 +29,12 @@ public class FakeStorageManager extends NullStorageManager { List ackIds = new ArrayList<>(); @Override - public void storeMessage(final ServerMessage message) throws Exception { + public void storeMessage(final Message message) throws Exception { messageIds.add(message.getMessageID()); } @Override - public void storeMessageTransactional(final long txID, final ServerMessage message) throws Exception { + public void storeMessageTransactional(final long txID, final Message message) throws Exception { messageIds.add(message.getMessageID()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java index cba3008..ec49ece 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/ScaleDownTest.java @@ -425,7 +425,7 @@ public class ScaleDownTest extends ClusterTestBase { while (!servers[0].getPagingManager().getPageStore(new SimpleString(addressName)).isPaging()) { for (int i = 0; i < CHUNK_SIZE; i++) { - Message message = session.createMessage(true); + ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeBytes(new byte[1024]); producer.send(message); messageCount++; @@ -463,7 +463,7 @@ public class ScaleDownTest extends ClusterTestBase { while (!servers[0].getPagingManager().getPageStore(new SimpleString(addressName)).isPaging()) { for (int i = 0; i < CHUNK_SIZE; i++) { - Message message = session.createMessage(true); + ClientMessage message = session.createMessage(true); message.getBodyBuffer().writeBytes(new byte[1024]); message.putIntProperty("order", i); producer.send(message); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java index 89f7a60..141a6b8 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverOneWaySSLTest.java @@ -27,6 +27,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQConnectionTimedOutException; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; @@ -41,7 +42,6 @@ import org.apache.activemq.artemis.core.remoting.impl.netty.NettyAcceptor; import org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants; import org.apache.activemq.artemis.core.remoting.impl.ssl.SSLSupport; import org.apache.activemq.artemis.core.server.ActiveMQServer; -import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.tests.integration.IntegrationTestLogger; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; @@ -127,7 +127,7 @@ public class CoreClientOverOneWaySSLTest extends ActiveMQTestBase { ClientConsumer consumer = addClientConsumer(session.createConsumer(CoreClientOverOneWaySSLTest.QUEUE)); session.start(); - Message m = consumer.receive(1000); + ClientMessage m = consumer.receive(1000); Assert.assertNotNull(m); Assert.assertEquals(text, m.getBodyBuffer().readString()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java index 772e44d..11b3b0b 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/ssl/CoreClientOverTwoWaySSLTest.java @@ -26,7 +26,6 @@ import io.netty.handler.ssl.SslHandler; import org.apache.activemq.artemis.api.core.ActiveMQException; import org.apache.activemq.artemis.api.core.ActiveMQNotConnectedException; import org.apache.activemq.artemis.api.core.Interceptor; -import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.TransportConfiguration; import org.apache.activemq.artemis.api.core.client.ActiveMQClient; @@ -151,7 +150,7 @@ public class CoreClientOverTwoWaySSLTest extends ActiveMQTestBase { ClientConsumer consumer = session.createConsumer(CoreClientOverTwoWaySSLTest.QUEUE); session.start(); - Message m = consumer.receive(1000); + ClientMessage m = consumer.receive(1000); Assert.assertNotNull(m); Assert.assertEquals(text, m.getBodyBuffer().readString()); } @@ -189,7 +188,7 @@ public class CoreClientOverTwoWaySSLTest extends ActiveMQTestBase { ClientConsumer consumer = session.createConsumer(CoreClientOverTwoWaySSLTest.QUEUE); session.start(); - Message m = consumer.receive(1000); + ClientMessage m = consumer.receive(1000); Assert.assertNotNull(m); Assert.assertEquals(text, m.getBodyBuffer().readString()); } http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java ---------------------------------------------------------------------- diff --git a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java index 0ee92e9..da9e8cd 100644 --- a/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java +++ b/tests/performance-tests/src/test/java/org/apache/activemq/artemis/tests/performance/storage/PersistMultiThreadTest.java @@ -26,7 +26,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration; +import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; import org.apache.activemq.artemis.core.paging.PagingManager; import org.apache.activemq.artemis.core.paging.PagingStore; import org.apache.activemq.artemis.core.paging.cursor.PageCursorProvider; @@ -37,8 +39,6 @@ import org.apache.activemq.artemis.core.replication.ReplicationManager; import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.JournalType; import org.apache.activemq.artemis.core.server.RouteContextList; -import org.apache.activemq.artemis.core.server.ServerMessage; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.core.transaction.Transaction; @@ -188,8 +188,8 @@ public class PersistMultiThreadTest extends ActiveMQTestBase { } private void storeMessage(long txID, long id) throws Exception { - ServerMessage message = new ServerMessageImpl(id, 10 * 1024); - message.setPagingStore(fakePagingStore); + Message message = new CoreMessage(id, 10 * 1024); + message.setContext(fakePagingStore); message.getBodyBuffer().writeBytes(new byte[104]); message.putStringProperty("hello", "" + id); @@ -248,6 +248,26 @@ public class PersistMultiThreadTest extends ActiveMQTestBase { class FakePagingStore implements PagingStore { @Override + public void durableDown(Message message, int durableCount) { + + } + + @Override + public void durableUp(Message message, int durableCount) { + + } + + @Override + public void nonDurableUp(Message message, int nonDurableCoun) { + + } + + @Override + public void nonDurableDown(Message message, int nonDurableCoun) { + + } + + @Override public SimpleString getAddress() { return null; } @@ -328,7 +348,7 @@ public class PersistMultiThreadTest extends ActiveMQTestBase { } @Override - public boolean page(ServerMessage message, + public boolean page(Message message, Transaction tx, RouteContextList listCtx, ReentrantReadWriteLock.ReadLock readLock) throws Exception { http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java index d902d3c..61c8d30 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/artemis/tests/stress/paging/PageCursorStressTest.java @@ -25,9 +25,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.Message; +import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.config.Configuration; import org.apache.activemq.artemis.core.filter.Filter; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; import org.apache.activemq.artemis.core.paging.cursor.PageCache; import org.apache.activemq.artemis.core.paging.cursor.PageCursorProvider; import org.apache.activemq.artemis.core.paging.cursor.PageSubscription; @@ -39,10 +42,7 @@ import org.apache.activemq.artemis.core.persistence.impl.journal.OperationContex import org.apache.activemq.artemis.core.server.ActiveMQServer; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.RoutingContext; -import org.apache.activemq.artemis.api.core.RoutingType; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.core.server.impl.RoutingContextImpl; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; import org.apache.activemq.artemis.core.transaction.Transaction; import org.apache.activemq.artemis.core.transaction.impl.TransactionImpl; @@ -147,7 +147,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { PageSubscription cursorEven = createNonPersistentCursor(new Filter() { @Override - public boolean match(ServerMessage message) { + public boolean match(Message message) { Boolean property = message.getBooleanProperty("even"); if (property == null) { return false; @@ -166,7 +166,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { PageSubscription cursorOdd = createNonPersistentCursor(new Filter() { @Override - public boolean match(ServerMessage message) { + public boolean match(Message message) { Boolean property = message.getBooleanProperty("even"); if (property == null) { return false; @@ -382,7 +382,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); - ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); + Message msg = new CoreMessage(i, buffer.writerIndex()); msg.putIntProperty("key", i); msg.getBodyBuffer().writeBytes(buffer, 0, buffer.writerIndex()); @@ -415,7 +415,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); - ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); + Message msg = new CoreMessage(i, buffer.writerIndex()); msg.putIntProperty("key", i); msg.getBodyBuffer().writeBytes(buffer, 0, buffer.writerIndex()); @@ -445,7 +445,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); - ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); + Message msg = new CoreMessage(i, buffer.writerIndex()); msg.putIntProperty("key", i + 1); msg.getBodyBuffer().writeBytes(buffer, 0, buffer.writerIndex()); @@ -530,7 +530,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { //System.out.println("Sending " + count); ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, count); - ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); + Message msg = new CoreMessage(i, buffer.writerIndex()); msg.putIntProperty("key", count++); msg.getBodyBuffer().writeBytes(buffer, 0, buffer.writerIndex()); @@ -666,7 +666,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { } - private int tstProperty(ServerMessage msg) { + private int tstProperty(Message msg) { return msg.getIntProperty("key").intValue(); } @@ -747,7 +747,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { System.out.println("Paged " + i); ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); - ServerMessage msg = new ServerMessageImpl(i, buffer.writerIndex()); + Message msg = new CoreMessage(i, buffer.writerIndex()); msg.putIntProperty("key", i); // to be used on tests that are validating filters msg.putBooleanProperty("even", i % 2 == 0); @@ -850,7 +850,7 @@ public class PageCursorStressTest extends ActiveMQTestBase { for (int i = start; i < start + NUM_MESSAGES; i++) { ActiveMQBuffer buffer = RandomUtil.randomBuffer(messageSize, i + 1L); - ServerMessage msg = new ServerMessageImpl(storage.generateID(), buffer.writerIndex()); + Message msg = new CoreMessage(storage.generateID(), buffer.writerIndex()); msg.getBodyBuffer().writeBytes(buffer, 0, buffer.writerIndex()); msg.putIntProperty("key", i); pageStore.page(msg, ctx.getTransaction(), ctx.getContextListing(ADDRESS), lock); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java ---------------------------------------------------------------------- diff --git a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java index 34ce7ac..6d73cfd 100644 --- a/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java +++ b/tests/timing-tests/src/test/java/org/apache/activemq/artemis/tests/timing/core/server/impl/QueueConcurrentTest.java @@ -19,12 +19,12 @@ package org.apache.activemq.artemis.tests.timing.core.server.impl; import java.util.ArrayList; import java.util.List; +import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.server.HandleStatus; import org.apache.activemq.artemis.core.server.MessageReference; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.QueueConfig; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.core.server.impl.QueueImpl; import org.apache.activemq.artemis.tests.unit.UnitTestLogger; import org.apache.activemq.artemis.tests.unit.core.server.impl.fakes.FakeConsumer; @@ -138,9 +138,9 @@ public class QueueConcurrentTest extends ActiveMQTestBase { long start = System.currentTimeMillis(); while (System.currentTimeMillis() - start < testTime) { - ServerMessage message = generateMessage(i); + Message message = generateMessage(i); - MessageReference ref = message.createReference(queue); + MessageReference ref = MessageReference.Factory.createReference(message, queue); queue.addTail(ref, false); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/unit-tests/pom.xml ---------------------------------------------------------------------- diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml index 32ca63b..803bf39 100644 --- a/tests/unit-tests/pom.xml +++ b/tests/unit-tests/pom.xml @@ -54,6 +54,12 @@ org.apache.activemq + artemis-amqp-protocol + ${project.version} + test + + + org.apache.activemq artemis-jms-server ${project.version} http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java index d1536d4..39507aa 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/journal/impl/JournalImplTestUnit.java @@ -2426,7 +2426,7 @@ public abstract class JournalImplTestUnit extends JournalImplTestBase { } @Test - public void testTransactionChangesNotVisibleOutsideTX() throws Exception { + public void testTransactionChangesNotVisibleOutsideTXtestTransactionChangesNotVisibleOutsideTX() throws Exception { setup(10, 10 * 1024, true); createJournal(); startJournal(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java index 252b0eb..e88097a 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/message/impl/MessageImplTest.java @@ -21,11 +21,12 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ICoreMessage; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.client.impl.ClientMessageImpl; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; import org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionSendMessage; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.apache.activemq.artemis.utils.RandomUtil; import org.junit.Assert; @@ -46,9 +47,9 @@ public class MessageImplTest extends ActiveMQTestBase { final long expiration = RandomUtil.randomLong(); final long timestamp = RandomUtil.randomLong(); final byte priority = RandomUtil.randomByte(); - Message message1 = new ClientMessageImpl(type, durable, expiration, timestamp, priority, 100); + ICoreMessage message1 = new ClientMessageImpl(type, durable, expiration, timestamp, priority, 100); - Message message = message1; + ICoreMessage message = message1; Assert.assertEquals(type, message.getType()); Assert.assertEquals(durable, message.isDurable()); @@ -63,7 +64,7 @@ public class MessageImplTest extends ActiveMQTestBase { final byte priority2 = RandomUtil.randomByte(); message.setAddress(destination); - Assert.assertEquals(destination, message.getAddress()); + Assert.assertEquals(destination, message.getAddressSimpleString()); message.setDurable(durable2); Assert.assertEquals(durable2, message.isDurable()); @@ -232,10 +233,9 @@ public class MessageImplTest extends ActiveMQTestBase { private void internalMessageCopy() throws Exception { final long RUNS = 2; - final ServerMessageImpl msg = new ServerMessageImpl(123, 18); + final CoreMessage msg = new CoreMessage(123, 18); msg.setMessageID(RandomUtil.randomLong()); - msg.encodeMessageIDToBuffer(); msg.setAddress(new SimpleString("Batatantkashf aksjfh aksfjh askfdjh askjfh ")); final AtomicInteger errors = new AtomicInteger(0); @@ -257,7 +257,7 @@ public class MessageImplTest extends ActiveMQTestBase { for (int i = 0; i < RUNS; i++) { try { - ServerMessageImpl newMsg = (ServerMessageImpl) msg.copy(); + Message newMsg = msg.copy(); } catch (Throwable e) { e.printStackTrace(); errors.incrementAndGet(); http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java index d6e0f72..847e8b7 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PageTest.java @@ -17,23 +17,26 @@ package org.apache.activemq.artemis.tests.unit.core.paging.impl; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.List; -import org.apache.activemq.artemis.api.core.ActiveMQBuffer; +import org.apache.activemq.artemis.api.core.ICoreMessage; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.core.io.SequentialFile; import org.apache.activemq.artemis.core.io.SequentialFileFactory; import org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; +import org.apache.activemq.artemis.core.message.impl.CoreMessagePersister; import org.apache.activemq.artemis.core.paging.PagedMessage; import org.apache.activemq.artemis.core.paging.impl.Page; import org.apache.activemq.artemis.core.paging.impl.PagedMessageImpl; import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager; -import org.apache.activemq.artemis.core.server.ServerMessage; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; +import org.apache.activemq.artemis.core.protocol.core.impl.CoreProtocolManagerFactory; +import org.apache.activemq.artemis.protocol.amqp.broker.AMQPMessagePersister; +import org.apache.activemq.artemis.spi.core.protocol.MessagePersister; import org.apache.activemq.artemis.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory; import org.apache.activemq.artemis.tests.util.ActiveMQTestBase; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; public class PageTest extends ActiveMQTestBase { @@ -47,6 +50,12 @@ public class PageTest extends ActiveMQTestBase { // Public -------------------------------------------------------- + @Before + public void registerProtocols() { + MessagePersister.registerPersister(CoreProtocolManagerFactory.ID, CoreMessagePersister.getInstance()); + MessagePersister.registerPersister((byte)2, AMQPMessagePersister.getInstance()); + } + @Test public void testPageWithNIO() throws Exception { recreateDirectory(getTestDir()); @@ -64,6 +73,11 @@ public class PageTest extends ActiveMQTestBase { testAdd(new FakeSequentialFileFactory(1, false), 10); } + @Test + public void testAddCore() throws Exception { + testAdd(new NIOSequentialFileFactory(getTestDirfile(), 1), 1); + } + /** * Validate if everything we add is recovered */ @@ -89,7 +103,7 @@ public class PageTest extends ActiveMQTestBase { SimpleString simpleDestination = new SimpleString("Test"); - ArrayList buffers = addPageElements(simpleDestination, impl, numberOfElements); + addPageElements(simpleDestination, impl, numberOfElements); impl.sync(); impl.close(); @@ -105,9 +119,7 @@ public class PageTest extends ActiveMQTestBase { Assert.assertEquals(numberOfElements, impl.getNumberOfMessages()); for (int i = 0; i < msgs.size(); i++) { - Assert.assertEquals(simpleDestination, msgs.get(i).getMessage().getAddress()); - - ActiveMQTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i).getMessage().getBodyBuffer().toByteBuffer().array()); + Assert.assertEquals(simpleDestination, msgs.get(i).getMessage().getAddressSimpleString()); } impl.delete(null); @@ -130,7 +142,7 @@ public class PageTest extends ActiveMQTestBase { SimpleString simpleDestination = new SimpleString("Test"); - ArrayList buffers = addPageElements(simpleDestination, impl, numberOfElements); + addPageElements(simpleDestination, impl, numberOfElements); impl.sync(); @@ -170,9 +182,7 @@ public class PageTest extends ActiveMQTestBase { Assert.assertEquals(numberOfElements, impl.getNumberOfMessages()); for (int i = 0; i < msgs.size(); i++) { - Assert.assertEquals(simpleDestination, msgs.get(i).getMessage().getAddress()); - - ActiveMQTestBase.assertEqualsByteArrays(buffers.get(i).toByteBuffer().array(), msgs.get(i).getMessage().getBodyBuffer().toByteBuffer().array()); + Assert.assertEquals(simpleDestination, msgs.get(i).getMessage().getAddressSimpleString()); } impl.delete(null); @@ -190,29 +200,25 @@ public class PageTest extends ActiveMQTestBase { * @return * @throws Exception */ - protected ArrayList addPageElements(final SimpleString simpleDestination, + protected void addPageElements(final SimpleString simpleDestination, final Page page, final int numberOfElements) throws Exception { - ArrayList buffers = new ArrayList<>(); int initialNumberOfMessages = page.getNumberOfMessages(); for (int i = 0; i < numberOfElements; i++) { - ServerMessage msg = new ServerMessageImpl(i, 100); + ICoreMessage msg = new CoreMessage().initBuffer(100); for (int j = 0; j < 10; j++) { msg.getBodyBuffer().writeByte((byte) 'b'); } - buffers.add(msg.getBodyBuffer()); - msg.setAddress(simpleDestination); page.write(new PagedMessageImpl(msg, new long[0])); Assert.assertEquals(initialNumberOfMessages + i + 1, page.getNumberOfMessages()); } - return buffers; } // Package protected --------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/669e7cf2/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java index 10b9a06..60f7a15 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/artemis/tests/unit/core/paging/impl/PagingManagerImplTest.java @@ -22,7 +22,9 @@ import java.util.List; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock.ReadLock; +import org.apache.activemq.artemis.api.core.ICoreMessage; import org.apache.activemq.artemis.api.core.SimpleString; +import org.apache.activemq.artemis.core.message.impl.CoreMessage; import org.apache.activemq.artemis.core.paging.PagedMessage; import org.apache.activemq.artemis.core.paging.PagingStore; import org.apache.activemq.artemis.core.paging.impl.Page; @@ -30,9 +32,7 @@ import org.apache.activemq.artemis.core.paging.impl.PagingManagerImpl; import org.apache.activemq.artemis.core.paging.impl.PagingStoreFactoryNIO; import org.apache.activemq.artemis.core.persistence.StorageManager; import org.apache.activemq.artemis.core.persistence.impl.nullpm.NullStorageManager; -import org.apache.activemq.artemis.core.server.ServerMessage; import org.apache.activemq.artemis.core.server.impl.RoutingContextImpl; -import org.apache.activemq.artemis.core.server.impl.ServerMessageImpl; import org.apache.activemq.artemis.core.settings.HierarchicalRepository; import org.apache.activemq.artemis.core.settings.impl.AddressFullMessagePolicy; import org.apache.activemq.artemis.core.settings.impl.AddressSettings; @@ -63,7 +63,7 @@ public class PagingManagerImplTest extends ActiveMQTestBase { PagingStore store = managerImpl.getPageStore(new SimpleString("simple-test")); - ServerMessage msg = createMessage(1L, new SimpleString("simple-test"), createRandomBuffer(10)); + ICoreMessage msg = createMessage(1L, new SimpleString("simple-test"), createRandomBuffer(10)); final RoutingContextImpl ctx = new RoutingContextImpl(null); Assert.assertFalse(store.page(msg, ctx.getTransaction(), ctx.getContextListing(store.getStoreName()), lock)); @@ -82,7 +82,7 @@ public class PagingManagerImplTest extends ActiveMQTestBase { Assert.assertEquals(1, msgs.size()); - ActiveMQTestBase.assertEqualsByteArrays(msg.getBodyBuffer().writerIndex(), msg.getBodyBuffer().toByteBuffer().array(), msgs.get(0).getMessage().getBodyBuffer().toByteBuffer().array()); + ActiveMQTestBase.assertEqualsByteArrays(msg.getBodyBuffer().writerIndex(), msg.getBodyBuffer().toByteBuffer().array(), (msgs.get(0).getMessage()).toCore().getBodyBuffer().toByteBuffer().array()); Assert.assertTrue(store.isPaging()); @@ -104,10 +104,10 @@ public class PagingManagerImplTest extends ActiveMQTestBase { pageDirDir.mkdirs(); } - protected ServerMessage createMessage(final long messageId, - final SimpleString destination, - final ByteBuffer buffer) { - ServerMessage msg = new ServerMessageImpl(messageId, 200); + protected ICoreMessage createMessage(final long messageId, + final SimpleString destination, + final ByteBuffer buffer) { + ICoreMessage msg = new CoreMessage(messageId, 200); msg.setAddress(destination);