You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2015/01/15 17:35:33 UTC
[4/5] qpid-jms git commit: rename various implementation methods so
as to distinguish them from the JMS MessageListener for clarity
rename various implementation methods so as to distinguish them from the JMS MessageListener for clarity
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/1c080fb6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/1c080fb6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/1c080fb6
Branch: refs/heads/master
Commit: 1c080fb643be28171ac45371bc6a3d4abd3344f2
Parents: b7d7434
Author: Robert Gemmell <ro...@apache.org>
Authored: Thu Jan 15 12:36:15 2015 +0000
Committer: Robert Gemmell <ro...@apache.org>
Committed: Thu Jan 15 16:35:08 2015 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/qpid/jms/JmsConnection.java | 6 +++---
.../main/java/org/apache/qpid/jms/JmsConnectionListener.java | 2 +-
.../src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java | 2 +-
.../main/java/org/apache/qpid/jms/JmsMessageDispatcher.java | 2 +-
.../src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java | 4 ++--
.../src/main/java/org/apache/qpid/jms/JmsSession.java | 4 ++--
.../org/apache/qpid/jms/provider/DefaultProviderListener.java | 2 +-
.../java/org/apache/qpid/jms/provider/ProviderListener.java | 2 +-
.../java/org/apache/qpid/jms/provider/ProviderWrapper.java | 4 ++--
.../java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java | 2 +-
.../apache/qpid/jms/provider/failover/FailoverProvider.java | 4 ++--
.../src/test/java/org/apache/qpid/jms/JmsConnectionTest.java | 2 +-
.../org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java | 2 +-
13 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
index 39ece2f..14ef911 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnection.java
@@ -988,7 +988,7 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
}
@Override
- public void onMessage(JmsInboundMessageDispatch envelope) {
+ public void onInboundMessage(JmsInboundMessageDispatch envelope) {
JmsMessage incoming = envelope.getMessage();
// Ensure incoming Messages are in readonly mode.
@@ -999,10 +999,10 @@ public class JmsConnection implements Connection, TopicConnection, QueueConnecti
JmsMessageDispatcher dispatcher = dispatchers.get(envelope.getConsumerId());
if (dispatcher != null) {
- dispatcher.onMessage(envelope);
+ dispatcher.onInboundMessage(envelope);
}
for (JmsConnectionListener listener : connectionListeners) {
- listener.onMessage(envelope);
+ listener.onInboundMessage(envelope);
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java
index d1a2663..f1e3da9 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsConnectionListener.java
@@ -68,6 +68,6 @@ public interface JmsConnectionListener {
* @param envelope
* The envelope that contains the incoming message and it's delivery information.
*/
- void onMessage(JmsInboundMessageDispatch envelope);
+ void onInboundMessage(JmsInboundMessageDispatch envelope);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
index b92b6c0..9a0bc32 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageConsumer.java
@@ -304,7 +304,7 @@ public class JmsMessageConsumer implements MessageConsumer, JmsMessageAvailableC
* the newly arrived message.
*/
@Override
- public void onMessage(final JmsInboundMessageDispatch envelope) {
+ public void onInboundMessage(final JmsInboundMessageDispatch envelope) {
lock.lock();
try {
if (acknowledgementMode == Session.CLIENT_ACKNOWLEDGE) {
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageDispatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageDispatcher.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageDispatcher.java
index 602e8b0..3340a77 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageDispatcher.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsMessageDispatcher.java
@@ -26,6 +26,6 @@ public interface JmsMessageDispatcher {
* @param envelope
* the incoming message dispatch information.
*/
- void onMessage(JmsInboundMessageDispatch envelope);
+ void onInboundMessage(JmsInboundMessageDispatch envelope);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java
index ce20d42..4460ff4 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsQueueBrowser.java
@@ -249,11 +249,11 @@ public class JmsQueueBrowser implements QueueBrowser, Enumeration<Message> {
}
@Override
- public void onMessage(JmsInboundMessageDispatch envelope) {
+ public void onInboundMessage(JmsInboundMessageDispatch envelope) {
if (envelope.getMessage() == null) {
browseDone.set(true);
} else {
- super.onMessage(envelope);
+ super.onInboundMessage(envelope);
}
notifyMessageAvailable();
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
index f724f06..4efd45d 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/JmsSession.java
@@ -918,7 +918,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
}
@Override
- public void onMessage(JmsInboundMessageDispatch envelope) {
+ public void onInboundMessage(JmsInboundMessageDispatch envelope) {
if (started.get()) {
deliver(envelope);
} else {
@@ -988,7 +988,7 @@ public class JmsSession implements Session, QueueSession, TopicSession, JmsMessa
} else {
JmsMessageConsumer consumer = this.consumers.get(id);
if (consumer != null) {
- consumer.onMessage(envelope);
+ consumer.onInboundMessage(envelope);
}
}
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/DefaultProviderListener.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/DefaultProviderListener.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/DefaultProviderListener.java
index 4477121..19b0c9f 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/DefaultProviderListener.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/DefaultProviderListener.java
@@ -27,7 +27,7 @@ import org.apache.qpid.jms.message.JmsInboundMessageDispatch;
public class DefaultProviderListener implements ProviderListener {
@Override
- public void onMessage(JmsInboundMessageDispatch envelope) {
+ public void onInboundMessage(JmsInboundMessageDispatch envelope) {
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderListener.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderListener.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderListener.java
index bcab614..0928a89 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderListener.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderListener.java
@@ -32,7 +32,7 @@ public interface ProviderListener {
* @param envelope
* The dispatch object containing the message and delivery information.
*/
- void onMessage(JmsInboundMessageDispatch envelope);
+ void onInboundMessage(JmsInboundMessageDispatch envelope);
/**
* Called from a fault tolerant Provider instance to signal that the underlying
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java
index daffabe..00cfeb3 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/ProviderWrapper.java
@@ -146,8 +146,8 @@ public class ProviderWrapper<E extends Provider> implements Provider, ProviderLi
}
@Override
- public void onMessage(JmsInboundMessageDispatch envelope) {
- this.listener.onMessage(envelope);
+ public void onInboundMessage(JmsInboundMessageDispatch envelope) {
+ this.listener.onInboundMessage(envelope);
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
index 816f959..8d153c6 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/amqp/AmqpConsumer.java
@@ -486,7 +486,7 @@ public class AmqpConsumer extends AmqpAbstractResource<JmsConsumerInfo, Receiver
} else {
LOG.debug("Dispatching end of browse to: {}", envelope.getConsumerId());
}
- listener.onMessage(envelope);
+ listener.onInboundMessage(envelope);
} else {
LOG.error("Provider listener is not set, message will be dropped: {}", envelope);
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
index 9d2a199..ad7929d 100644
--- a/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
+++ b/qpid-jms-client/src/main/java/org/apache/qpid/jms/provider/failover/FailoverProvider.java
@@ -610,7 +610,7 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
//--------------- DefaultProviderListener overrides ----------------------//
@Override
- public void onMessage(final JmsInboundMessageDispatch envelope) {
+ public void onInboundMessage(final JmsInboundMessageDispatch envelope) {
if (closed.get() || failed.get()) {
return;
}
@@ -618,7 +618,7 @@ public class FailoverProvider extends DefaultProviderListener implements Provide
@Override
public void run() {
if (!closed.get()) {
- listener.onMessage(envelope);
+ listener.onInboundMessage(envelope);
}
}
});
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
index f3d8a57..174b27b 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/JmsConnectionTest.java
@@ -89,7 +89,7 @@ public class JmsConnectionTest {
JmsConnectionListener listener = new JmsConnectionListener() {
@Override
- public void onMessage(JmsInboundMessageDispatch envelope) {
+ public void onInboundMessage(JmsInboundMessageDispatch envelope) {
}
@Override
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/1c080fb6/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java
index 4945a92..f3a76cb 100644
--- a/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java
+++ b/qpid-jms-interop-tests/qpid-jms-activemq-tests/src/test/java/org/apache/qpid/jms/discovery/JmsAmqpDiscoveryTest.java
@@ -168,6 +168,6 @@ public class JmsAmqpDiscoveryTest extends AmqpTestSupport implements JmsConnecti
}
@Override
- public void onMessage(JmsInboundMessageDispatch envelope) {
+ public void onInboundMessage(JmsInboundMessageDispatch envelope) {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org