You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2012/04/05 13:25:17 UTC
svn commit: r1309768 - in
/qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms:
QpidDestination.java QpidQueue.java QpidTemporaryQueue.java
QpidTemporaryTopic.java QpidTopic.java TemporaryDestinationProvider.java
Author: rajith
Date: Thu Apr 5 11:25:16 2012
New Revision: 1309768
URL: http://svn.apache.org/viewvc?rev=1309768&view=rev
Log:
QPID-3401 Added equals, toString() implementations to Topic and Queue.
Modified:
qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidDestination.java
qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidQueue.java
qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryQueue.java
qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryTopic.java
qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTopic.java
qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/TemporaryDestinationProvider.java
Modified: qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidDestination.java
URL: http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidDestination.java?rev=1309768&r1=1309767&r2=1309768&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidDestination.java (original)
+++ qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidDestination.java Thu Apr 5 11:25:16 2012
@@ -170,4 +170,10 @@ public abstract class QpidDestination im
return str;
}
}
+
+ @Override
+ public String toString()
+ {
+ return address == null ? "" : address.toString();
+ }
}
Modified: qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidQueue.java?rev=1309768&r1=1309767&r2=1309768&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidQueue.java (original)
+++ qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidQueue.java Thu Apr 5 11:25:16 2012
@@ -41,4 +41,28 @@ public class QpidQueue extends QpidDesti
{
return address.getName();
}
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+
+ if (!(obj instanceof QpidQueue))
+ {
+ return false;
+ }
+
+ QpidQueue queue = (QpidQueue)obj;
+ try
+ {
+ return getQueueName().equals(queue.getQueueName());
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
}
Modified: qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryQueue.java
URL: http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryQueue.java?rev=1309768&r1=1309767&r2=1309768&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryQueue.java (original)
+++ qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryQueue.java Thu Apr 5 11:25:16 2012
@@ -36,7 +36,7 @@ public class QpidTemporaryQueue extends
@Override
public void delete() throws JMSException
{
- provider.delete();
+ provider.delete(getQueueName());
}
}
Modified: qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryTopic.java
URL: http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryTopic.java?rev=1309768&r1=1309767&r2=1309768&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryTopic.java (original)
+++ qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTemporaryTopic.java Thu Apr 5 11:25:16 2012
@@ -36,7 +36,7 @@ public class QpidTemporaryTopic extends
@Override
public void delete() throws JMSException
{
- provider.delete();
+ //provider.delete();
}
}
Modified: qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTopic.java
URL: http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTopic.java?rev=1309768&r1=1309767&r2=1309768&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTopic.java (original)
+++ qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/QpidTopic.java Thu Apr 5 11:25:16 2012
@@ -44,4 +44,39 @@ public class QpidTopic extends QpidDesti
return address.getSubject() == null ? "" : address.getSubject();
}
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ {
+ return true;
+ }
+
+ if (!(obj instanceof QpidTopic))
+ {
+ return false;
+ }
+
+ QpidTopic topic = (QpidTopic)obj;
+
+ try
+ {
+ if (!address.getName().equals(topic.getAddress().getName()))
+ {
+ return false;
+ }
+
+ // The subject being the topic name
+ if (!address.getSubject().equals(topic.getAddress().getSubject()))
+ {
+ return false;
+ }
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+
+ return true;
+ }
}
Modified: qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/TemporaryDestinationProvider.java
URL: http://svn.apache.org/viewvc/qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/TemporaryDestinationProvider.java?rev=1309768&r1=1309767&r2=1309768&view=diff
==============================================================================
--- qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/TemporaryDestinationProvider.java (original)
+++ qpid/branches/address-refactor2/qpid/java/client/src/main/java/org/apache/qpid/jms/TemporaryDestinationProvider.java Thu Apr 5 11:25:16 2012
@@ -28,5 +28,5 @@ public interface TemporaryDestinationPro
public String generateTempTopicAddress();
- public void delete() throws JMSException;
+ public void delete(String queueName) throws JMSException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org