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/06/22 18:32:14 UTC
[2/7] qpid-jms git commit: QPIDJMS-75: update handling to remove need
for 'isComplete', rename post-matcher action to 'onCompletion'
QPIDJMS-75: update handling to remove need for 'isComplete', rename post-matcher action to 'onCompletion'
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/b1ed3972
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/b1ed3972
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/b1ed3972
Branch: refs/heads/master
Commit: b1ed3972ed1e8ff9a66e15715b47f1c1ac22a1e2
Parents: 5694dae
Author: Robert Gemmell <ro...@apache.org>
Authored: Mon Jun 22 15:01:03 2015 +0100
Committer: Robert Gemmell <ro...@apache.org>
Committed: Mon Jun 22 17:27:54 2015 +0100
----------------------------------------------------------------------
...ractFrameFieldAndPayloadMatchingHandler.java | 45 +++++++-------------
.../FrameWithPayloadMatchingHandler.java | 4 +-
.../apache/qpid/jms/test/testpeer/Handler.java | 6 +--
.../jms/test/testpeer/HeaderHandlerImpl.java | 26 ++++-------
.../qpid/jms/test/testpeer/TestAmqpPeer.java | 40 ++++++++---------
.../test/testpeer/matchers/AttachMatcher.java | 4 +-
.../test/testpeer/matchers/BeginMatcher.java | 4 +-
.../test/testpeer/matchers/CloseMatcher.java | 4 +-
.../test/testpeer/matchers/DetachMatcher.java | 4 +-
.../testpeer/matchers/DispositionMatcher.java | 4 +-
.../jms/test/testpeer/matchers/EndMatcher.java | 4 +-
.../jms/test/testpeer/matchers/FlowMatcher.java | 4 +-
.../jms/test/testpeer/matchers/OpenMatcher.java | 4 +-
.../testpeer/matchers/SaslChallengeMatcher.java | 4 +-
.../test/testpeer/matchers/SaslInitMatcher.java | 4 +-
.../matchers/SaslMechanismsMatcher.java | 4 +-
.../testpeer/matchers/SaslOutcomeMatcher.java | 4 +-
.../testpeer/matchers/SaslResponseMatcher.java | 4 +-
.../test/testpeer/matchers/TransferMatcher.java | 4 +-
.../testpeer/matchers/generate-matchers.xsl | 4 +-
20 files changed, 75 insertions(+), 106 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
index e3aeeb1..2b512ed 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/AbstractFrameFieldAndPayloadMatchingHandler.java
@@ -39,19 +39,18 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
private int _expectedChannel;
private int _actualChannel;
- private AmqpPeerRunnable _onSuccessAction;
- private volatile boolean _isComplete;
+ private AmqpPeerRunnable _onCompletion;
protected AbstractFrameFieldAndPayloadMatchingHandler(FrameType frameType,
int channel,
UnsignedLong numericDescriptor,
Symbol symbolicDescriptor,
- AmqpPeerRunnable onSuccessAction)
+ AmqpPeerRunnable onCompletion)
{
super(numericDescriptor, symbolicDescriptor);
_frameType = frameType;
_expectedChannel = channel;
- _onSuccessAction = onSuccessAction;
+ _onCompletion = onCompletion;
}
protected abstract void verifyPayload(Binary payload) throws AssertionError;
@@ -87,8 +86,14 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
peer.assertionFailed(ae);
}
- //TODO: rename 'completed'
- succeeded();
+ if(_onCompletion != null)
+ {
+ _onCompletion.run();
+ }
+ else
+ {
+ LOGGER.debug("No onCompletion action, doing nothing.");
+ }
}
else
{
@@ -106,28 +111,14 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
return _expectedChannel == ANY_CHANNEL ? "<any>" : String.valueOf(_expectedChannel);
}
- private void succeeded()
+ public AmqpPeerRunnable getOnCompletionAction()
{
- if(_onSuccessAction != null)
- {
- _onSuccessAction.run();
- }
- else
- {
- LOGGER.debug("No onSuccess action, doing nothing.");
- }
-
- _isComplete = true;
- }
-
- public AmqpPeerRunnable getOnSuccessAction()
- {
- return _onSuccessAction;
+ return _onCompletion;
}
- public AbstractFrameFieldAndPayloadMatchingHandler onSuccess(AmqpPeerRunnable onSuccessAction)
+ public AbstractFrameFieldAndPayloadMatchingHandler onCompletion(AmqpPeerRunnable onSuccessAction)
{
- _onSuccessAction = onSuccessAction;
+ _onCompletion = onSuccessAction;
return this;
}
@@ -143,12 +134,6 @@ public abstract class AbstractFrameFieldAndPayloadMatchingHandler extends Abstra
}
@Override
- public boolean isComplete()
- {
- return _isComplete;
- }
-
- @Override
public String toString()
{
return "AbstractFrameFieldAndPayloadMatchingHandler [_symbolicDescriptor=" + getSymbolicDescriptor()
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
index 0369aec..3279ab6 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/FrameWithPayloadMatchingHandler.java
@@ -34,9 +34,9 @@ public class FrameWithPayloadMatchingHandler extends AbstractFrameFieldAndPayloa
int channel,
UnsignedLong numericDescriptor,
Symbol symbolicDescriptor,
- AmqpPeerRunnable onSuccess)
+ AmqpPeerRunnable onCompletion)
{
- super(frameType, channel, numericDescriptor, symbolicDescriptor, onSuccess);
+ super(frameType, channel, numericDescriptor, symbolicDescriptor, onCompletion);
}
public void setPayloadMatcher(Matcher<Binary> payloadMatcher)
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java
index fb7e815..9523102 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/Handler.java
@@ -24,9 +24,7 @@ package org.apache.qpid.jms.test.testpeer;
*/
interface Handler
{
- boolean isComplete();
+ AmqpPeerRunnable getOnCompletionAction();
- AmqpPeerRunnable getOnSuccessAction();
-
- Handler onSuccess(AmqpPeerRunnable onSuccessAction);
+ Handler onCompletion(AmqpPeerRunnable onCompletion);
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
index 86661c7..f981b34 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/HeaderHandlerImpl.java
@@ -31,25 +31,18 @@ class HeaderHandlerImpl implements HeaderHandler
private final byte[] _expectedHeader;
private final byte[] _response;
- private AmqpPeerRunnable _onSuccess;
- private boolean _isComplete;
+ private AmqpPeerRunnable _onCompletion;
HeaderHandlerImpl(byte[] expectedHeader, byte[] response)
{
this(expectedHeader, response, null);
}
- public HeaderHandlerImpl(byte[] header, byte[] response, AmqpPeerRunnable onSuccess)
+ public HeaderHandlerImpl(byte[] header, byte[] response, AmqpPeerRunnable onCompletion)
{
_expectedHeader = header;
_response = response;
- _onSuccess = onSuccess;
- }
-
- @Override
- public boolean isComplete()
- {
- return _isComplete;
+ _onCompletion = onCompletion;
}
@Override
@@ -59,11 +52,10 @@ class HeaderHandlerImpl implements HeaderHandler
assertThat("Header should match", header, equalTo(_expectedHeader));
peer.sendHeader(_response);
- if(_onSuccess !=null)
+ if(_onCompletion != null)
{
- _onSuccess.run();
+ _onCompletion.run();
}
- _isComplete = true;
}
@Override
@@ -73,15 +65,15 @@ class HeaderHandlerImpl implements HeaderHandler
}
@Override
- public AmqpPeerRunnable getOnSuccessAction()
+ public AmqpPeerRunnable getOnCompletionAction()
{
- return _onSuccess;
+ return _onCompletion;
}
@Override
- public Handler onSuccess(AmqpPeerRunnable onSuccessAction)
+ public Handler onCompletion(AmqpPeerRunnable onCompletion)
{
- _onSuccess = onSuccessAction;
+ _onCompletion = onCompletion;
return this;
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
index b274880..a587851 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/TestAmqpPeer.java
@@ -225,10 +225,7 @@ public class TestAmqpPeer implements AutoCloseable
if(handler instanceof HeaderHandler)
{
((HeaderHandler)handler).header(header,this);
- if(handler.isComplete())
- {
- removeFirstHandler();
- }
+ removeFirstHandler();
}
else
{
@@ -242,10 +239,7 @@ public class TestAmqpPeer implements AutoCloseable
if(handler instanceof FrameHandler)
{
((FrameHandler)handler).frame(type, channel, describedType, payload, this);
- if(handler.isComplete())
- {
- removeFirstHandler();
- }
+ removeFirstHandler();
}
else
{
@@ -394,7 +388,7 @@ public class TestAmqpPeer implements AutoCloseable
SaslInitMatcher saslInitMatcher = new SaslInitMatcher()
.withMechanism(equalTo(mechanism))
.withInitialResponse(initialResponseMatcher)
- .onSuccess(new AmqpPeerRunnable()
+ .onCompletion(new AmqpPeerRunnable()
{
@Override
public void run()
@@ -433,7 +427,7 @@ public class TestAmqpPeer implements AutoCloseable
OpenMatcher openMatcher = new OpenMatcher()
.withContainerId(notNullValue(String.class))
- .onSuccess(new FrameSender(
+ .onCompletion(new FrameSender(
this, FrameType.AMQP, 0,
open,
null));
@@ -516,7 +510,7 @@ public class TestAmqpPeer implements AutoCloseable
saslMechanismsFrame, null)));
SaslInitMatcher saslInitMatcher = new SaslInitMatcher().withMechanism(equalTo(clientSelectedMech));
- saslInitMatcher.onSuccess(new AmqpPeerRunnable()
+ saslInitMatcher.onCompletion(new AmqpPeerRunnable()
{
@Override
public void run()
@@ -545,7 +539,7 @@ public class TestAmqpPeer implements AutoCloseable
OpenMatcher openMatcher = new OpenMatcher()
.withContainerId(notNullValue(String.class))
- .onSuccess(new FrameSender(
+ .onCompletion(new FrameSender(
this, FrameType.AMQP, 0,
openFrame,
null));
@@ -587,7 +581,7 @@ public class TestAmqpPeer implements AutoCloseable
{
CloseMatcher closeMatcher = new CloseMatcher().withError(errorMatcher);
if(sendReply) {
- closeMatcher.onSuccess(new FrameSender(this, FrameType.AMQP, 0,
+ closeMatcher.onCompletion(new FrameSender(this, FrameType.AMQP, 0,
new CloseFrame(),
null));
}
@@ -625,7 +619,7 @@ public class TestAmqpPeer implements AutoCloseable
_lastInitiatedChannel = actualChannel;
}
});
- beginMatcher.onSuccess(beginResponseSender);
+ beginMatcher.onCompletion(beginResponseSender);
addHandler(beginMatcher);
@@ -657,7 +651,7 @@ public class TestAmqpPeer implements AutoCloseable
frameSender.setChannel(endMatcher.getActualChannel());
}
});
- endMatcher.onSuccess(frameSender);
+ endMatcher.onCompletion(frameSender);
}
addHandler(endMatcher);
@@ -789,7 +783,7 @@ public class TestAmqpPeer implements AutoCloseable
composite.add(detachResonseSender);
}
- attachMatcher.onSuccess(composite);
+ attachMatcher.onCompletion(composite);
addHandler(attachMatcher);
}
@@ -903,7 +897,7 @@ public class TestAmqpPeer implements AutoCloseable
composite.add(flowFrameSender);
}
- attachMatcher.onSuccess(composite);
+ attachMatcher.onCompletion(composite);
addHandler(attachMatcher);
}
@@ -996,7 +990,7 @@ public class TestAmqpPeer implements AutoCloseable
composite.add(detachResonseSender);
}
- attachMatcher.onSuccess(composite);
+ attachMatcher.onCompletion(composite);
addHandler(attachMatcher);
}
@@ -1052,7 +1046,7 @@ public class TestAmqpPeer implements AutoCloseable
}
});
- detachMatcher.onSuccess(detachResponseSender);
+ detachMatcher.onCompletion(detachResponseSender);
}
addHandler(detachMatcher);
@@ -1203,7 +1197,7 @@ public class TestAmqpPeer implements AutoCloseable
}
if(addComposite) {
- flowMatcher.onSuccess(composite);
+ flowMatcher.onCompletion(composite);
}
addHandler(flowMatcher);
@@ -1298,7 +1292,7 @@ public class TestAmqpPeer implements AutoCloseable
dispositionResponse.setFirst(transferMatcher.getReceivedDeliveryId());
}
});
- transferMatcher.onSuccess(dispositionFrameSender);
+ transferMatcher.onCompletion(dispositionFrameSender);
addHandler(transferMatcher);
}
@@ -1483,11 +1477,11 @@ public class TestAmqpPeer implements AutoCloseable
private CompositeAmqpPeerRunnable insertCompsiteActionForLastHandler() {
CompositeAmqpPeerRunnable comp = new CompositeAmqpPeerRunnable();
Handler h = getLastHandler();
- AmqpPeerRunnable orig = h.getOnSuccessAction();
+ AmqpPeerRunnable orig = h.getOnCompletionAction();
if (orig != null) {
comp.add(orig);
}
- h.onSuccess(comp);
+ h.onCompletion(comp);
return comp;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
index a974902..e4695a8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/AttachMatcher.java
@@ -61,9 +61,9 @@ public class AttachMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public AttachMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public AttachMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
index af20399..fffbbb8 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/BeginMatcher.java
@@ -55,9 +55,9 @@ public class BeginMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public BeginMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public BeginMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
index 55c7830..d162ba1 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/CloseMatcher.java
@@ -48,9 +48,9 @@ public class CloseMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public CloseMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public CloseMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
index 7ccb7be..4d49d57 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DetachMatcher.java
@@ -50,9 +50,9 @@ public class DetachMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public DetachMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public DetachMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
index 9163d0a..d18ea96 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/DispositionMatcher.java
@@ -53,9 +53,9 @@ public class DispositionMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public DispositionMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public DispositionMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
index 939f211..34cb6d7 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/EndMatcher.java
@@ -48,9 +48,9 @@ public class EndMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public EndMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public EndMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
index fd4dbda..145d447 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/FlowMatcher.java
@@ -58,9 +58,9 @@ public class FlowMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public FlowMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public FlowMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
index 67ea017..4d1693d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/OpenMatcher.java
@@ -57,9 +57,9 @@ public class OpenMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public OpenMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public OpenMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
index ad18e3d..ae5280d 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslChallengeMatcher.java
@@ -48,9 +48,9 @@ public class SaslChallengeMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslChallengeMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslChallengeMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
index 322efd2..373d579 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslInitMatcher.java
@@ -50,9 +50,9 @@ public class SaslInitMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslInitMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslInitMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
index 7eec5c1..7dbaabd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslMechanismsMatcher.java
@@ -48,9 +48,9 @@ public class SaslMechanismsMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslMechanismsMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslMechanismsMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
index 7f3919c..da4280c 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslOutcomeMatcher.java
@@ -49,9 +49,9 @@ public class SaslOutcomeMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslOutcomeMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslOutcomeMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
index 00ec547..050a9e5 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/SaslResponseMatcher.java
@@ -48,9 +48,9 @@ public class SaslResponseMatcher extends FrameWithNoPayloadMatchingHandler
}
@Override
- public SaslResponseMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public SaslResponseMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
index 642b5fe..9fb02bd 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/TransferMatcher.java
@@ -58,9 +58,9 @@ public class TransferMatcher extends FrameWithPayloadMatchingHandler
}
@Override
- public TransferMatcher onSuccess(AmqpPeerRunnable onSuccessAction)
+ public TransferMatcher onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/b1ed3972/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
index 13a2d9d..18a1b97 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/test/testpeer/matchers/generate-matchers.xsl
@@ -97,9 +97,9 @@ public class <xsl:value-of select="$classname"/> extends <xsl:value-of select="$
}
@Override
- public <xsl:value-of select="$classname"/> onSuccess(AmqpPeerRunnable onSuccessAction)
+ public <xsl:value-of select="$classname"/> onCompletion(AmqpPeerRunnable onCompletion)
{
- super.onSuccess(onSuccessAction);
+ super.onCompletion(onCompletion);
return this;
}
<xsl:for-each select="descendant::node()[name()='field']">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org