[jboss-cvs] JBoss Messaging SVN: r4871 - in branches/Branch_JBMESSAGING-1314: src/main/org/jboss/messaging/core/paging/impl and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Aug 26 13:05:47 EDT 2008
Author: clebert.suconic at jboss.com
Date: 2008-08-26 13:05:47 -0400 (Tue, 26 Aug 2008)
New Revision: 4871
Added:
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java
Removed:
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessage.java
Modified:
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/Page.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/Pager.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/PagingStore.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java
branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java
branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageImplTestBase.java
branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreTestBase.java
Log:
Adding an interface for PageMessage
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/Page.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/Page.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/Page.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -23,7 +23,6 @@
package org.jboss.messaging.core.paging;
-import org.jboss.messaging.core.paging.impl.PageMessage;
/**
*
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/Pager.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/Pager.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/Pager.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -25,7 +25,6 @@
import java.util.Collection;
-import org.jboss.messaging.core.paging.impl.PageMessage;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.util.SimpleString;
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/PagingStore.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/PagingStore.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/PagingStore.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -23,7 +23,6 @@
package org.jboss.messaging.core.paging;
-import org.jboss.messaging.core.paging.impl.PageMessage;
import org.jboss.messaging.core.server.MessagingComponent;
import org.jboss.messaging.util.SimpleString;
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -23,7 +23,6 @@
package org.jboss.messaging.core.paging;
-import org.jboss.messaging.core.paging.impl.PageMessage;
/**
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageImpl.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -31,6 +31,7 @@
import org.jboss.messaging.core.journal.SequentialFile;
import org.jboss.messaging.core.journal.SequentialFileFactory;
import org.jboss.messaging.core.paging.Page;
+import org.jboss.messaging.core.paging.PageMessage;
import org.jboss.messaging.core.paging.PagingStoreFactory;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.util.VariableLatch;
Deleted: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessage.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessage.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessage.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-
-package org.jboss.messaging.core.paging.impl;
-
-import org.jboss.messaging.core.journal.EncodingSupport;
-import org.jboss.messaging.core.remoting.MessagingBuffer;
-import org.jboss.messaging.core.server.ServerMessage;
-import org.jboss.messaging.core.server.impl.ServerMessageImpl;
-
-/**
- *
- * This class is used to encapsulate ServerMessage and TransactionID on Paging
- *
- * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- *
- */
-public class PageMessage implements EncodingSupport
-{
-
- // Constants -----------------------------------------------------
-
- // Attributes ----------------------------------------------------
-
- // Static --------------------------------------------------------
-
- // Constructors --------------------------------------------------
-
- // Public --------------------------------------------------------
-
- private final ServerMessage message;
- private long transactionID;
-
- public PageMessage(ServerMessage message, long transactionID)
- {
- this.message = message;
- this.transactionID = transactionID;
- }
-
- public PageMessage(ServerMessage message)
- {
- this.message = message;
- }
-
- public PageMessage()
- {
- this(new ServerMessageImpl());
- }
-
- public ServerMessage getMessage()
- {
- return message;
- }
-
- public long getTransactionID()
- {
- return transactionID;
- }
-
-
- // EncodingSupport implementation --------------------------------
-
- public void decode(MessagingBuffer buffer)
- {
- transactionID = buffer.getLong();
- final long messageID = buffer.getLong();
- message.decode(buffer);
- message.setMessageID(messageID);
- }
-
- public void encode(MessagingBuffer buffer)
- {
- buffer.putLong(transactionID);
- buffer.putLong(message.getMessageID());
- message.encode(buffer);
- }
-
- public int getEncodeSize()
- {
-
- return 8 + 8 + message.getEncodeSize();
- }
-
- // Package protected ---------------------------------------------
-
- // Protected -----------------------------------------------------
-
- // Private -------------------------------------------------------
-
- // Inner classes -------------------------------------------------
-
-}
Copied: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java (from rev 4870, branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessage.java)
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java (rev 0)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PageMessageImpl.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+
+package org.jboss.messaging.core.paging.impl;
+
+import org.jboss.messaging.core.paging.PageMessage;
+import org.jboss.messaging.core.remoting.MessagingBuffer;
+import org.jboss.messaging.core.server.ServerMessage;
+import org.jboss.messaging.core.server.impl.ServerMessageImpl;
+
+/**
+ *
+ * This class is used to encapsulate ServerMessage and TransactionID on Paging
+ *
+ * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
+ *
+ */
+public class PageMessageImpl implements PageMessage
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ private final ServerMessage message;
+ private long transactionID;
+
+ public PageMessageImpl(ServerMessage message, long transactionID)
+ {
+ this.message = message;
+ this.transactionID = transactionID;
+ }
+
+ public PageMessageImpl(ServerMessage message)
+ {
+ this.message = message;
+ }
+
+ public PageMessageImpl()
+ {
+ this(new ServerMessageImpl());
+ }
+
+ public ServerMessage getMessage()
+ {
+ return message;
+ }
+
+ public long getTransactionID()
+ {
+ return transactionID;
+ }
+
+
+ // EncodingSupport implementation --------------------------------
+
+ public void decode(MessagingBuffer buffer)
+ {
+ transactionID = buffer.getLong();
+ final long messageID = buffer.getLong();
+ message.decode(buffer);
+ message.setMessageID(messageID);
+ }
+
+ public void encode(MessagingBuffer buffer)
+ {
+ buffer.putLong(transactionID);
+ buffer.putLong(message.getMessageID());
+ message.encode(buffer);
+ }
+
+ public int getEncodeSize()
+ {
+
+ return 8 + 8 + message.getEncodeSize();
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PagingManagerFactoryNIO.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -27,6 +27,7 @@
import org.jboss.messaging.core.journal.SequentialFileFactory;
import org.jboss.messaging.core.journal.impl.NIOSequentialFileFactory;
+import org.jboss.messaging.core.paging.PageMessage;
import org.jboss.messaging.core.paging.PagingStore;
import org.jboss.messaging.core.paging.PagingStoreFactory;
import org.jboss.messaging.util.SimpleString;
@@ -70,12 +71,12 @@
public PageMessage[] newArray(int size)
{
- return new PageMessage[size];
+ return new PageMessageImpl[size];
}
public PageMessage newElement()
{
- return new PageMessage();
+ return new PageMessageImpl();
}
// Package protected ---------------------------------------------
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/paging/impl/PagingStoreImpl.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -35,6 +35,7 @@
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.paging.LastPageRecord;
import org.jboss.messaging.core.paging.Page;
+import org.jboss.messaging.core.paging.PageMessage;
import org.jboss.messaging.core.paging.Pager;
import org.jboss.messaging.core.paging.PagingStoreFactory;
import org.jboss.messaging.util.SimpleString;
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/postoffice/PostOffice.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/postoffice/PostOffice.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/postoffice/PostOffice.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -28,7 +28,7 @@
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.paging.Pager;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.server.MessageReference;
import org.jboss.messaging.core.server.MessagingComponent;
import org.jboss.messaging.core.server.ServerMessage;
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/postoffice/impl/PostOfficeImpl.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -40,12 +40,13 @@
import org.jboss.messaging.core.filter.Filter;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.paging.LastPageRecord;
+import org.jboss.messaging.core.paging.PageMessage;
import org.jboss.messaging.core.paging.PageTransactionInfo;
import org.jboss.messaging.core.paging.Pager;
import org.jboss.messaging.core.paging.PagingManager;
import org.jboss.messaging.core.paging.PagingStore;
import org.jboss.messaging.core.paging.impl.LastPageRecordImpl;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.FlowController;
@@ -598,13 +599,13 @@
public boolean page(ServerMessage message, long transactionId)
throws Exception
{
- return pagingManager.getPageStore(message.getDestination()).page(new PageMessage(message, transactionId));
+ return pagingManager.getPageStore(message.getDestination()).page(new PageMessageImpl(message, transactionId));
}
public boolean page(ServerMessage message) throws Exception
{
- return pagingManager.getPageStore(message.getDestination()).page(new PageMessage(message));
+ return pagingManager.getPageStore(message.getDestination()).page(new PageMessageImpl(message));
}
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -35,7 +35,7 @@
import org.jboss.messaging.core.management.impl.MessagingServerManagementImpl;
import org.jboss.messaging.core.paging.PagingManager;
import org.jboss.messaging.core.paging.PagingStoreFactory;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.paging.impl.PagingManagerFactoryNIO;
import org.jboss.messaging.core.paging.impl.PagingManagerImpl;
import org.jboss.messaging.core.persistence.StorageManager;
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -40,7 +40,7 @@
import org.jboss.messaging.core.filter.impl.FilterImpl;
import org.jboss.messaging.core.logging.Logger;
import org.jboss.messaging.core.paging.Pager;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.persistence.StorageManager;
import org.jboss.messaging.core.postoffice.Binding;
import org.jboss.messaging.core.postoffice.FlowController;
Modified: branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/src/main/org/jboss/messaging/core/transaction/impl/TransactionImpl.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -43,7 +43,7 @@
import org.jboss.messaging.core.settings.HierarchicalRepository;
import org.jboss.messaging.core.settings.impl.QueueSettings;
import org.jboss.messaging.core.transaction.Transaction;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.paging.impl.PageTransactionInfoImpl;
import org.jboss.messaging.util.SimpleString;
Modified: branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -27,8 +27,9 @@
import java.nio.ByteBuffer;
import org.jboss.messaging.core.paging.Page;
+import org.jboss.messaging.core.paging.PageMessage;
import org.jboss.messaging.core.paging.PagingStore;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.paging.impl.PagingManagerFactoryNIO;
import org.jboss.messaging.core.paging.impl.PagingManagerImpl;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
@@ -68,11 +69,11 @@
ServerMessage msg = createMessage(1l, new SimpleString("simple-test"), createRandomBuffer(10));
- assertFalse(store.page(new PageMessage(msg)));
+ assertFalse(store.page(new PageMessageImpl(msg)));
store.startPaging();
- assertTrue(store.page(new PageMessage(msg)));
+ assertTrue(store.page(new PageMessageImpl(msg)));
Page page = store.depage();
@@ -90,7 +91,7 @@
assertNull(store.depage());
- assertFalse(store.page(new PageMessage(msg)));
+ assertFalse(store.page(new PageMessageImpl(msg)));
}
// Package protected ---------------------------------------------
Modified: branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageImplTestBase.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageImplTestBase.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PageImplTestBase.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -28,8 +28,9 @@
import org.jboss.messaging.core.journal.SequentialFile;
import org.jboss.messaging.core.journal.SequentialFileFactory;
+import org.jboss.messaging.core.paging.PageMessage;
import org.jboss.messaging.core.paging.impl.PageImpl;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
import org.jboss.messaging.core.server.ServerMessage;
import org.jboss.messaging.core.server.impl.ServerMessageImpl;
@@ -96,7 +97,7 @@
msg.setDestination(simpleDestination);
- impl.write(new PageMessage(msg));
+ impl.write(new PageMessageImpl(msg));
assertEquals(i + 1, impl.getNumberOfMessages());
}
Modified: branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreImplTest.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -29,8 +29,9 @@
import org.jboss.messaging.core.journal.SequentialFileFactory;
import org.jboss.messaging.core.paging.Page;
+import org.jboss.messaging.core.paging.PageMessage;
import org.jboss.messaging.core.paging.PagingStore;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.paging.impl.PagingStoreImpl;
import org.jboss.messaging.core.paging.impl.TestSupportPageStore;
import org.jboss.messaging.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
@@ -94,7 +95,7 @@
buffers.add(buffer);
SimpleString destination = new SimpleString("test");
- PageMessage msg = createMessage(1l, destination, buffer);
+ PageMessageImpl msg = createMessage(1l, destination, buffer);
assertTrue(storeImpl.isPaging());
@@ -135,7 +136,7 @@
buffers.add(buffer);
- PageMessage msg = createMessage(i+1l, destination, buffer);
+ PageMessageImpl msg = createMessage(i+1l, destination, buffer);
assertTrue(storeImpl.page(msg));
}
@@ -199,7 +200,7 @@
}
- PageMessage msg = createMessage(i+1l, destination, buffer);
+ PageMessageImpl msg = createMessage(i+1l, destination, buffer);
assertTrue(storeImpl.page(msg));
}
@@ -232,7 +233,7 @@
assertTrue(storeImpl.isPaging());
- PageMessage msg = createMessage(100, destination, buffers.get(0));
+ PageMessageImpl msg = createMessage(100, destination, buffers.get(0));
assertTrue(storeImpl.page(msg));
Modified: branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreTestBase.java
===================================================================
--- branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreTestBase.java 2008-08-26 09:15:34 UTC (rev 4870)
+++ branches/Branch_JBMESSAGING-1314/tests/src/org/jboss/messaging/tests/unit/core/paging/impl/PagingStoreTestBase.java 2008-08-26 17:05:47 UTC (rev 4871)
@@ -34,7 +34,8 @@
import org.jboss.messaging.core.journal.SequentialFile;
import org.jboss.messaging.core.journal.SequentialFileFactory;
import org.jboss.messaging.core.paging.Page;
-import org.jboss.messaging.core.paging.impl.PageMessage;
+import org.jboss.messaging.core.paging.PageMessage;
+import org.jboss.messaging.core.paging.impl.PageMessageImpl;
import org.jboss.messaging.core.paging.impl.PagingStoreImpl;
import org.jboss.messaging.core.paging.impl.TestSupportPageStore;
import org.jboss.messaging.core.remoting.impl.ByteBufferWrapper;
@@ -78,7 +79,7 @@
final CountDownLatch latchStart = new CountDownLatch(numberOfThreads);
- final ConcurrentHashMap<Long, PageMessage> buffers = new ConcurrentHashMap<Long, PageMessage>();
+ final ConcurrentHashMap<Long, PageMessageImpl> buffers = new ConcurrentHashMap<Long, PageMessageImpl>();
final ArrayList<Page> readPages = new ArrayList<Page>();
@@ -111,7 +112,7 @@
while (true)
{
long id = messageIdGenerator.incrementAndGet();
- PageMessage msg = createMessage(id, destination, createRandomBuffer(5));
+ PageMessageImpl msg = createMessage(id, destination, createRandomBuffer(5));
if (storeImpl.page(msg))
{
buffers.put(id, msg);
@@ -206,7 +207,7 @@
for (PageMessage msg : msgs)
{
- PageMessage msgWritten = buffers.remove(msg.getMessage().getMessageID());
+ PageMessageImpl msgWritten = buffers.remove(msg.getMessage().getMessageID());
buffers2.put(msg.getMessage().getMessageID(), msg);
assertNotNull(msgWritten);
assertEquals (msg.getMessage().getDestination(), msgWritten.getMessage().getDestination());
@@ -290,7 +291,7 @@
}
- protected PageMessage createMessage(long messageId, SimpleString destination, ByteBuffer buffer)
+ protected PageMessageImpl createMessage(long messageId, SimpleString destination, ByteBuffer buffer)
{
ServerMessage msg = new ServerMessageImpl((byte)1, true, 0,
System.currentTimeMillis(), (byte)0, new ByteBufferWrapper(buffer));
@@ -298,7 +299,7 @@
msg.setMessageID((long)messageId);
msg.setDestination(destination);
- return new PageMessage(msg);
+ return new PageMessageImpl(msg);
}
protected ByteBuffer createRandomBuffer(int size)
More information about the jboss-cvs-commits
mailing list