[jboss-cvs] JBoss Messaging SVN: r3603 - in trunk: src/main/org/jboss/jms/client/delegate and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 21 13:49:20 EST 2008
Author: timfox
Date: 2008-01-21 13:49:20 -0500 (Mon, 21 Jan 2008)
New Revision: 3603
Removed:
trunk/src/main/org/jboss/jms/delegate/DeliveryRecovery.java
Modified:
trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java
trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/CodecAssert.java
Log:
Client side cleanup part II
Modified: trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java 2008-01-21 17:48:32 UTC (rev 3602)
+++ trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java 2008-01-21 18:49:20 UTC (rev 3603)
@@ -121,7 +121,6 @@
public static void callOnMessage(ClientSession sess,
MessageListener listener,
String consumerID,
- String queueName,
boolean isConnectionConsumer,
JBossMessage m,
int ackMode,
@@ -137,7 +136,7 @@
}
DeliveryInfo deliveryInfo =
- new DeliveryInfo(m, consumerID, queueName, connectionConsumerSession, shouldAck);
+ new DeliveryInfo(m, consumerID, connectionConsumerSession, shouldAck);
m.incDeliveryCount();
@@ -205,7 +204,6 @@
private QueuedExecutor sessionExecutor;
private boolean listenerRunning;
private int maxDeliveries;
- private String queueName;
private long lastDeliveryId = -1;
private boolean waitingForLastDelivery;
private boolean shouldAck;
@@ -235,7 +233,6 @@
this.sessionDelegate = sess;
this.consumerDelegate = cons;
this.consumerID = consumerID;
- this.queueName = queueName;
mainLock = new Object();
this.sessionExecutor = sessionExecutor;
this.maxDeliveries = maxDeliveries;
@@ -467,7 +464,7 @@
if (!isConnectionConsumer && !ignore)
{
- DeliveryInfo info = new DeliveryInfo(m, consumerID, queueName, null, shouldAck);
+ DeliveryInfo info = new DeliveryInfo(m, consumerID, null, shouldAck);
sessionDelegate.preDeliver(info);
@@ -899,7 +896,7 @@
{
try
{
- callOnMessage(sessionDelegate, theListener, consumerID, queueName,
+ callOnMessage(sessionDelegate, theListener, consumerID,
false, msg, ackMode, maxDeliveries, null, shouldAck);
if (trace) { log.trace("Called callonMessage"); }
Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2008-01-21 17:48:32 UTC (rev 3602)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java 2008-01-21 18:49:20 UTC (rev 3603)
@@ -337,9 +337,7 @@
return !(destination.getType() == DestinationType.TOPIC && subscriptionName == null);
}
-
-
-
+
// Protected ------------------------------------------------------------------------------------
// Package Private ------------------------------------------------------------------------------
Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java 2008-01-21 17:48:32 UTC (rev 3602)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java 2008-01-21 18:49:20 UTC (rev 3603)
@@ -931,9 +931,9 @@
if (trace) { log.trace("sending " + holder.msg + " to the message listener" ); }
ClientConsumer.callOnMessage(this, getDistinguishedListener(), holder.consumerID,
- holder.queueName, false,
- holder.msg, ackMode, holder.maxDeliveries,
- holder.connectionConsumerDelegate, holder.shouldAck);
+ false,
+ holder.msg, ackMode, holder.maxDeliveries,
+ holder.connectionConsumerDelegate, holder.shouldAck);
}
}
Modified: trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java 2008-01-21 17:48:32 UTC (rev 3602)
+++ trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java 2008-01-21 18:49:20 UTC (rev 3603)
@@ -39,8 +39,6 @@
// Attributes ----------------------------------------------------
- private String queueName;
-
//This is needed when doing local redelivery of messages, since we need to know which
//consumer gets the message
private String consumerId;
@@ -63,15 +61,13 @@
// Constructors --------------------------------------------------
- public DeliveryInfo(JBossMessage msg, String consumerId, String queueName,
+ public DeliveryInfo(JBossMessage msg, String consumerId,
ClientSession connectionConsumerSession, boolean shouldAck)
{
this.msg = msg;
this.consumerId = consumerId;
- this.queueName = queueName;
-
this.connectionConsumerSession = connectionConsumerSession;
this.shouldAck = shouldAck;
@@ -79,11 +75,6 @@
// Public --------------------------------------------------------
- public String getQueueName()
- {
- return queueName;
- }
-
public String getConsumerId()
{
return consumerId;
Deleted: trunk/src/main/org/jboss/jms/delegate/DeliveryRecovery.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/DeliveryRecovery.java 2008-01-21 17:48:32 UTC (rev 3602)
+++ trunk/src/main/org/jboss/jms/delegate/DeliveryRecovery.java 2008-01-21 18:49:20 UTC (rev 3603)
@@ -1,112 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * 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.jms.delegate;
-
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-
-import org.jboss.messaging.util.Streamable;
-
-/**
- * A DeliveryRecovery
- *
- * Used for sending information about to recover a delivery to the server
- * on failover
- *
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision$</tt>
- *
- * $Id$
- *
- */
-public class DeliveryRecovery implements Streamable
-{
- // Constants ------------------------------------------------------------------------------------
-
- // Static ---------------------------------------------------------------------------------------
-
- // Attributes -----------------------------------------------------------------------------------
-
- private long deliveryID;
- private long messageID;
- private String queueName;
-
- // Constructors ---------------------------------------------------------------------------------
-
- public DeliveryRecovery()
- {
- }
-
- public DeliveryRecovery(long deliveryID, long messageID, String queueName)
- {
- this.deliveryID = deliveryID;
- this.messageID = messageID;
- this.queueName = queueName;
- }
-
- // Streamable implementation --------------------------------------------------------------------
-
- public void read(DataInputStream in) throws Exception
- {
- deliveryID = in.readLong();
- messageID = in.readLong();
- queueName = in.readUTF();
- }
-
- public void write(DataOutputStream out) throws Exception
- {
- out.writeLong(deliveryID);
- out.writeLong(messageID);
- out.writeUTF(queueName);
- }
-
- // Public ---------------------------------------------------------------------------------------
-
- public long getDeliveryID()
- {
- return deliveryID;
- }
-
- public long getMessageID()
- {
- return messageID;
- }
-
- public String getQueueName()
- {
- return queueName;
- }
-
- public String toString()
- {
- return "DeliveryRecovery[ID=" + deliveryID + ", MID=" + messageID + ", Queue name=" + queueName + "]";
- }
-
- // Package protected ----------------------------------------------------------------------------
-
- // Protected ------------------------------------------------------------------------------------
-
- // Private --------------------------------------------------------------------------------------
-
- // Inner classes --------------------------------------------------------------------------------
-
-}
Modified: trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/CodecAssert.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/CodecAssert.java 2008-01-21 17:48:32 UTC (rev 3602)
+++ trunk/tests/src/org/jboss/messaging/core/remoting/wireformat/test/unit/CodecAssert.java 2008-01-21 18:49:20 UTC (rev 3603)
@@ -10,10 +10,8 @@
import junit.framework.Assert;
-import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate;
import org.jboss.jms.delegate.Ack;
import org.jboss.jms.delegate.Cancel;
-import org.jboss.jms.delegate.DeliveryRecovery;
import org.jboss.messaging.core.tx.MessagingXid;
/**
@@ -40,23 +38,6 @@
}
}
- static void assertEqualsDeliveries(List<DeliveryRecovery> expected,
- List<DeliveryRecovery> actual)
- {
- assertEquals(expected.size(), actual.size());
- for (int i = 0; i < expected.size(); i++)
- {
- DeliveryRecovery expectedDelivery = expected.get(i);
- DeliveryRecovery actualDelivery = actual.get(i);
- assertEquals(expectedDelivery.getDeliveryID(), actualDelivery
- .getDeliveryID());
- assertEquals(expectedDelivery.getMessageID(), actualDelivery
- .getMessageID());
- assertEquals(expectedDelivery.getQueueName(), actualDelivery
- .getQueueName());
- }
- }
-
static void assertEqualsCancels(List<Cancel> expected, List<Cancel> actual)
{
assertEquals(expected.size(), actual.size());
More information about the jboss-cvs-commits
mailing list