You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2009/11/24 08:51:07 UTC
svn commit: r883618 [2/3] - in /mina/sandbox/vysper/trunk:
nbxml/src/main/java/org/apache/vysper/xmpp/xmlfragment/
nbxml/src/test/java/org/apache/vysper/xmpp/xmlfragment/
server/core/src/main/java/org/apache/vysper/xmpp/authorization/
server/core/src/m...
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailUpdateOutHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailUpdateOutHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailUpdateOutHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceAvailUpdateOutHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -38,7 +38,7 @@
StanzaReceiverRelay receiverRelay = (StanzaReceiverRelay) sessionContext.getServerRuntimeContext().getStanzaRelay();
// at first, initial presence
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), null, null, null, null, null).getFinalStanza());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), null, null, null, null, null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertTrue(0 < receiverRelay.getCountDelivered());
resetRecordedStanzas(); // purge recorded
@@ -47,7 +47,7 @@
// send update now
final String showValue = "chatty";
- XMPPCoreStanza updatePresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), null, null, null, showValue, null).getFinalStanza());
+ XMPPCoreStanza updatePresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), null, null, null, showValue, null).build());
handler.executeCore(updatePresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
// check resource state
assertEquals(ResourceState.AVAILABLE, getResourceState());
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubRequestOutHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubRequestOutHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubRequestOutHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/im/handler/PresenceSubRequestOutHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -44,7 +44,7 @@
// now entity 'unrelated' approves the subscription
- XMPPCoreStanza requestApproval = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(unrelatedUser.getEntityFQ(), initiatingUser.getEntity(), null, PresenceStanzaType.SUBSCRIBED, null, null).getFinalStanza());
+ XMPPCoreStanza requestApproval = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(unrelatedUser.getEntityFQ(), initiatingUser.getEntity(), null, PresenceStanzaType.SUBSCRIBED, null, null).build());
handler.executeCore(requestApproval, sessionContext.getServerRuntimeContext(), false, sessionContext);
// 3 roster pushes but...
@@ -62,7 +62,7 @@
setResourceState(initiatingUser.getBoundResourceId(), ResourceState.AVAILABLE_INTERESTED);
// SUBSCRIBE FROM
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), unrelatedUser.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).getFinalStanza());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), unrelatedUser.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
@@ -104,7 +104,7 @@
setResourceState(initiatingUser.getBoundResourceId(), ResourceState.AVAILABLE_INTERESTED);
// SUBSCRIBE FROM
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_FROM.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).getFinalStanza());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_FROM.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
@@ -136,7 +136,7 @@
setResourceState(initiatingUser.getBoundResourceId(), ResourceState.AVAILABLE_INTERESTED);
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_TO.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).getFinalStanza());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_TO.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
@@ -148,7 +148,7 @@
setResourceState(initiatingUser.getBoundResourceId(), ResourceState.AVAILABLE_INTERESTED);
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_BOTH.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).getFinalStanza());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(initiatingUser.getEntityFQ(), subscribed_BOTH.getEntity(), null, PresenceStanzaType.SUBSCRIBE, null, null).build());
handler.executeCore(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AbortHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -68,13 +68,13 @@
executeAbortAuthorization_3Times();
StanzaBuilder stanzaBuilder = createAbort();
- Stanza abortPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza abortPlainStanza = stanzaBuilder.build();
stanzaBuilder = new StanzaBuilder("auth");
stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
stanzaBuilder.addAttribute("mechanism", "PLAIN");
stanzaBuilder.addText(new String(Base64.encodeBase64("dummy\0user007\0pass007".getBytes())));
- Stanza authPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza authPlainStanza = stanzaBuilder.build();
// correct credential no longer work - no retries left
AuthHandler authHandler = new AuthHandler();
@@ -107,7 +107,7 @@
private Stanza executeAbort() throws AuthorizationFailedException {
StanzaBuilder stanzaBuilder = createAbort();
- Stanza abortStanza = stanzaBuilder.getFinalStanza();
+ Stanza abortStanza = stanzaBuilder.build();
AbortHandler abortHandler = new AbortHandler();
ResponseStanzaContainer responseContainer = abortHandler.execute(abortStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerPlainMechanismTestCase.java Tue Nov 24 07:51:04 2009
@@ -68,7 +68,7 @@
public void testAuthPlainNoInitialResponse() throws AuthorizationFailedException {
StanzaBuilder stanzaBuilder = createAuthPlain();
- Stanza authPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
@@ -80,7 +80,7 @@
public void testAuthPlainEmptyInitialResponse() throws AuthorizationFailedException {
StanzaBuilder stanzaBuilder = createAuthPlain();
stanzaBuilder.addText("=");
- Stanza authPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
@@ -93,7 +93,7 @@
StanzaBuilder stanzaBuilder = createAuthPlain();
stanzaBuilder.addText(new String(Base64.encodeBase64("dummy\0user007\0pass007".getBytes())));
- Stanza authPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza authPlainStanza = stanzaBuilder.build();
assertEquals(3, AuthorizationRetriesCounter.getFromSession(sessionContext).getTriesLeft());
@@ -112,7 +112,7 @@
StanzaBuilder stanzaBuilder = createAuthPlain();
stanzaBuilder.addText(new String(Base64.encodeBase64("dummy\0user007\0pass007".getBytes())));
- Stanza authPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza authPlainStanza = stanzaBuilder.build();
// correct credential no longer work - no retries left
AuthHandler authHandler = new AuthHandler();
@@ -146,7 +146,7 @@
StanzaBuilder stanzaBuilder = createAuthPlain();
stanzaBuilder.addText(new String(Base64.encodeBase64("dummy\0user008\0pass007".getBytes())));
- Stanza authPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
ResponseStanzaContainer responseContainer = authHandler.execute(authPlainStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/sasl/handler/AuthHandlerUnavailableMechanismTestCase.java Tue Nov 24 07:51:04 2009
@@ -58,7 +58,7 @@
StanzaBuilder stanzaBuilder = new StanzaBuilder("auth");
stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
stanzaBuilder.addAttribute("mechanism", "plain"); // 'PLAIN' would be correct
- Stanza authPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
try {
@@ -74,7 +74,7 @@
StanzaBuilder stanzaBuilder = new StanzaBuilder("auth");
stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_SASL);
stanzaBuilder.addAttribute("mechanism", "EXTERNAL");
- Stanza authPlainStanza = stanzaBuilder.getFinalStanza();
+ Stanza authPlainStanza = stanzaBuilder.build();
AuthHandler authHandler = new AuthHandler();
try {
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/core/starttls/handler/StartTLSHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -46,7 +46,7 @@
public void testAppropriateSessionState() {
StanzaBuilder stanzaBuilder = new StanzaBuilder("starttls");
stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
- Stanza starttlsStanza = stanzaBuilder.getFinalStanza();
+ Stanza starttlsStanza = stanzaBuilder.build();
TestSessionContext sessionContext = this.sessionContext;
sessionContext.setServerToServer();
@@ -83,11 +83,11 @@
StanzaBuilder stanzaBuilder = new StanzaBuilder("starttls");
stanzaBuilder.addNamespaceAttribute(NamespaceURIs.HTTP_ETHERX_JABBER_ORG_STREAMS);
- Stanza wrongNSStanza = stanzaBuilder.getFinalStanza();
+ Stanza wrongNSStanza = stanzaBuilder.build();
stanzaBuilder = new StanzaBuilder("starttls");
stanzaBuilder.addNamespaceAttribute(NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_TLS);
- Stanza correctNSStanza = stanzaBuilder.getFinalStanza();
+ Stanza correctNSStanza = stanzaBuilder.build();
TestSessionContext sessionContext = this.sessionContext;
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0199_xmppping/XmppPingIQHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -51,7 +51,7 @@
StanzaBuilder stanzaBuilder = StanzaBuilder.createIQStanza(boundClient, server, IQStanzaType.GET, IQ_ID);
stanzaBuilder.startInnerElement("ping", NamespaceURIs.URN_XMPP_PING).endInnerElement();
- Stanza requestStanza = stanzaBuilder.getFinalStanza();
+ Stanza requestStanza = stanzaBuilder.build();
ResponseStanzaContainer resp = handler.execute(requestStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, null);
// we should always get a response
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/roster/handler/RosterIQHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -42,7 +42,7 @@
StanzaBuilder stanzaBuilder = createRosterGet();
assertEquals(ResourceState.CONNECTED, getResourceState());
- handler.execute(stanzaBuilder.getFinalStanza(), sessionContext.getServerRuntimeContext(), true, sessionContext, null);
+ handler.execute(stanzaBuilder.build(), sessionContext.getServerRuntimeContext(), true, sessionContext, null);
assertEquals(ResourceState.CONNECTED_INTERESTED, getResourceState());
// C: <iq from='juliet@example.com/balcony'
@@ -60,7 +60,7 @@
// mock intial presence resource state change
sessionContext.getServerRuntimeContext().getResourceRegistry().setResourceState(boundResourceId, ResourceState.AVAILABLE);
- handler.execute(stanzaBuilder.getFinalStanza(), sessionContext.getServerRuntimeContext(), true, sessionContext, null);
+ handler.execute(stanzaBuilder.build(), sessionContext.getServerRuntimeContext(), true, sessionContext, null);
assertEquals(ResourceState.AVAILABLE_INTERESTED, getResourceState());
}
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/modules/servicediscovery/handler/ExtendedDiscoInfoTestCase.java Tue Nov 24 07:51:04 2009
@@ -77,7 +77,7 @@
StanzaBuilder request = StanzaBuilder.createIQStanza(EntityImpl.parse("user@vysper.org"), EntityImpl.parse("info@vysper.org"), IQStanzaType.GET, "1");
- IQStanza finalStanza = (IQStanza)XMPPCoreStanza.getWrapper(request.getFinalStanza());
+ IQStanza finalStanza = (IQStanza)XMPPCoreStanza.getWrapper(request.build());
Stanza resultStanza = infoIQHandler.handleGet(finalStanza, runtimeContext, new TestSessionContext(runtimeContext, new SessionStateHolder()));
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/AbstractProtocolStateTestCase.java Tue Nov 24 07:51:04 2009
@@ -61,7 +61,7 @@
Stanza stanza;
Stanza recordedResponse;
XMLElementVerifier responseVerifier;
- stanza = new ServerResponses().getStreamOpener(true, testFrom, xmlLang, XMPPVersion.VERSION_1_0, null).getFinalStanza();
+ stanza = new ServerResponses().getStreamOpener(true, testFrom, xmlLang, XMPPVersion.VERSION_1_0, null).build();
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
recordedResponse = sessionContext.getNextRecordedResponse();
@@ -83,7 +83,7 @@
stanzaBuilder.addAttribute("id", "1");
stanzaBuilder.addAttribute("type", "get");
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
Stanza response = sessionContext.getNextRecordedResponse();
XMLElementVerifier responseVerifier = response.getVerifier();
@@ -101,7 +101,7 @@
stanzaBuilder.addAttribute("id", "1");
stanzaBuilder.addAttribute("type", "get");
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
Stanza response = sessionContext.getNextRecordedResponse();
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolInitiatedTestCase.java Tue Nov 24 07:51:04 2009
@@ -80,7 +80,7 @@
Stanza stanza = new ServerResponses().getStreamOpener(true,
testFrom,
sessionContext.getXMLLang(),
- XMPPVersion.VERSION_1_0, null).getFinalStanza();
+ XMPPVersion.VERSION_1_0, null).build();
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
}
@@ -154,7 +154,7 @@
}
protected Stanza getVersionResponse(XMPPVersion versionSent) {
- Stanza stanza = new ServerResponses().getStreamOpener(true, testFrom, null, versionSent, null).getFinalStanza();
+ Stanza stanza = new ServerResponses().getStreamOpener(true, testFrom, null, versionSent, null).build();
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
return sessionContext.getNextRecordedResponse();
@@ -166,7 +166,7 @@
.addNamespaceAttribute(NamespaceURIs.JABBER_CLIENT)
.addAttribute(NamespaceURIs.XML, "lang", "en_UK")
.addAttribute("version", XMPPVersion.VERSION_1_0.toString());
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
Stanza response = sessionContext.getNextRecordedResponse();
XMLElementVerifier responseVerifier = response.getVerifier();
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerAquireTestCase.java Tue Nov 24 07:51:04 2009
@@ -57,7 +57,7 @@
Stanza stanza = protocolWorker.aquireStanza(sessionContext, streamParser);
assertNotNull(stanza);
- Stanza expectedStanza = new StanzaBuilder("ProtocolHandlerTestStanzaHandler", "testNSURI").getFinalStanza();
+ Stanza expectedStanza = new StanzaBuilder("ProtocolHandlerTestStanzaHandler", "testNSURI").addNamespaceAttribute("testNSURI").build();
assertEquals("stanza full match", expectedStanza, stanza);
}
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerProcessTestCase.java Tue Nov 24 07:51:04 2009
@@ -64,7 +64,7 @@
sessionContext.setSessionState(SessionState.AUTHENTICATED);
- Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").getFinalStanza();
+ Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
@@ -80,7 +80,7 @@
CallTestStanzaHandler stanzaHandler = new CallTestStanzaHandler("ProtocolWorkerProcessTestCase");
namespaceHandlerDictionary.register(stanzaHandler);
- Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").getFinalStanza();
+ Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
@@ -96,8 +96,8 @@
CallTestStanzaHandlerResponse stanzaHandler = new CallTestStanzaHandlerResponse("ProtocolWorkerProcessTestCase");
namespaceHandlerDictionary.register(stanzaHandler);
- Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").getFinalStanza();
- Stanza responseStanza = new StanzaBuilder("response").getFinalStanza();
+ Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
+ Stanza responseStanza = new StanzaBuilder("response").build();
stanzaHandler.setResponseStanza(responseStanza);
@@ -121,7 +121,7 @@
namespaceHandlerDictionary.register(stanzaHandler);
stanzaHandler.setProtocolException(new ProtocolException("forced error"));
- Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").getFinalStanza();
+ Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
@@ -137,7 +137,7 @@
CallTestStanzaHandler stanzaHandler = new CallTestStanzaHandler("ProtocolWorkerProcessTestCase");
namespaceHandlerDictionary.register(stanzaHandler);
- Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").getFinalStanza();
+ Stanza stanza = new StanzaBuilder("ProtocolWorkerProcessTestCase", "testNSURI").build();
protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanza, sessionStateHolder);
@@ -171,7 +171,7 @@
stanzaBuilder.addAttribute("from", new EntityImpl("ernest", server.getDomain(), null).getFullQualifiedName());
stanzaBuilder.startInnerElement("query").addNamespaceAttribute("jabber:iq:roster").endInnerElement();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
try {
stanzaHandler.assertHandlerCalled();
@@ -199,7 +199,7 @@
stanzaBuilder.addAttribute("from", new EntityImpl("charlotte", server.getDomain(), onlyBoundResource).getFullQualifiedName());
stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
stanzaHandler.assertHandlerCalled();
}
@@ -222,7 +222,7 @@
stanzaBuilder.addAttribute("from", new EntityImpl("charlotte", server.getDomain(), arbitraryUnboundResource).getFullQualifiedName());
stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
try {
stanzaHandler.assertHandlerCalled();
@@ -254,7 +254,7 @@
stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), null).getFullQualifiedName());
stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
Stanza recordedResponse = sessionContext.getNextRecordedResponse();
assertUnknownSenderError(recordedResponse); // not allowed, bare id without resource and two resources bound
sessionContext.reset();
@@ -267,7 +267,7 @@
stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), null).getFullQualifiedName());
stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
stanzaHandler.assertHandlerCalled();
sessionContext.reset();
@@ -275,7 +275,7 @@
stanzaBuilder = StanzaBuilder.createIQStanza(null, null, IQStanzaType.GET, "test");
stanzaBuilder.addAttribute("from", new EntityImpl("lea", server.getDomain(), secondBoundResource).getFullQualifiedName());
stanzaBuilder.startInnerElement("query").addNamespaceAttribute("testNSURI").endInnerElement();
- protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.getFinalStanza(), sessionStateHolder);
+ protocolWorker.processStanza(sessionContext.getServerRuntimeContext(), sessionContext, stanzaBuilder.build(), sessionStateHolder);
recordedResponse = sessionContext.getNextRecordedResponse();
assertUnknownSenderError(recordedResponse);
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/ProtocolWorkerStateAwarenessTestCase.java Tue Nov 24 07:51:04 2009
@@ -58,7 +58,7 @@
StanzaBuilder stanzaBuilder = new StanzaBuilder("iq", NamespaceURIs.JABBER_CLIENT);
stanzaBuilder.addAttribute("id", "1");
stanzaBuilder.addAttribute("type", "get");
- Stanza stanza = stanzaBuilder.getFinalStanza();
+ Stanza stanza = stanzaBuilder.build();
assertNotAuthorized(stanza);
}
@@ -67,7 +67,7 @@
StanzaBuilder stanzaBuilder = new StanzaBuilder("presence", NamespaceURIs.JABBER_CLIENT);
// TODO? add more presence specifics
- Stanza stanza = stanzaBuilder.getFinalStanza();
+ Stanza stanza = stanzaBuilder.build();
assertNotAuthorized(stanza);
}
@@ -76,7 +76,7 @@
StanzaBuilder stanzaBuilder = new StanzaBuilder("message", NamespaceURIs.JABBER_CLIENT);
// TODO? add more message specifics
- Stanza stanza = stanzaBuilder.getFinalStanza();
+ Stanza stanza = stanzaBuilder.build();
assertNotAuthorized(stanza);
}
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/protocol/StanzaHandlerLookupTestCase.java Tue Nov 24 07:51:04 2009
@@ -78,7 +78,7 @@
StanzaHandlerLookup stanzaHandlerLookup = initStanzaHandlerLookup();
stanzaHandlerLookup.addDictionary(new BaseStreamStanzaDictionary());
- Stanza stanza = new StanzaBuilder("iq", NamespaceURIs.JABBER_CLIENT).getFinalStanza();
+ Stanza stanza = new StanzaBuilder("iq", NamespaceURIs.JABBER_CLIENT).build();
StanzaHandler handler = stanzaHandlerLookup.getHandler(stanza);
assertNotNull("handler found", handler);
@@ -94,7 +94,7 @@
StanzaHandlerLookup stanzaHandlerLookup = initStanzaHandlerLookup();
stanzaHandlerLookup.addDictionary(new BaseStreamStanzaDictionary());
- Stanza stanza = new StanzaBuilder("iq", NamespaceURIs.JABBER_SERVER).getFinalStanza();
+ Stanza stanza = new StanzaBuilder("iq", NamespaceURIs.JABBER_SERVER).build();
StanzaHandler handler = stanzaHandlerLookup.getHandler(stanza);
assertNotNull("handler found", handler);
@@ -106,7 +106,7 @@
StanzaHandlerLookup stanzaHandlerLookup = initStanzaHandlerLookup();
stanzaHandlerLookup.addDictionary(new BaseStreamStanzaDictionary());
- Stanza stanza = new StanzaBuilder("iq", "arbitraryNamespace").getFinalStanza();
+ Stanza stanza = new StanzaBuilder("iq", "arbitraryNamespace").build();
StanzaHandler handler = stanzaHandlerLookup.getHandler(stanza);
assertTrue("iq handler with arbitrary namespace not found", handler instanceof IQHandler);
@@ -116,7 +116,7 @@
StanzaHandlerLookup stanzaHandlerLookup = initStanzaHandlerLookup();
stanzaHandlerLookup.addDictionary(new BaseStreamStanzaDictionary());
- Stanza stanza = new StanzaBuilder("presence", NamespaceURIs.JABBER_CLIENT).getFinalStanza();
+ Stanza stanza = new StanzaBuilder("presence", NamespaceURIs.JABBER_CLIENT).build();
StanzaHandler handler = stanzaHandlerLookup.getHandler(stanza);
assertNotNull("handler found", handler);
@@ -127,7 +127,7 @@
StanzaHandlerLookup stanzaHandlerLookup = initStanzaHandlerLookup();
stanzaHandlerLookup.addDictionary(new BaseStreamStanzaDictionary());
- Stanza stanza = new StanzaBuilder("message", NamespaceURIs.JABBER_CLIENT).getFinalStanza();
+ Stanza stanza = new StanzaBuilder("message", NamespaceURIs.JABBER_CLIENT).build();
StanzaHandler handler = stanzaHandlerLookup.getHandler(stanza);
assertNotNull("handler found", handler);
@@ -168,7 +168,7 @@
stanzaBuilder.addAttribute("to", to);
}
stanzaBuilder.startInnerElement(name, namespaceURI).endInnerElement();
- Stanza stanza = stanzaBuilder.getFinalStanza();
+ Stanza stanza = stanzaBuilder.build();
return stanza;
}
}
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/server/response/ServerErrorResponsesTestCase.java Tue Nov 24 07:51:04 2009
@@ -48,7 +48,7 @@
builder.startInnerElement("ping", NamespaceURIs.URN_XMPP_PING);
builder.endInnerElement();
- Stanza request = builder.getFinalStanza();
+ Stanza request = builder.build();
IQStanza requestIq = new IQStanza(request);
ServerErrorResponses serverErrorResponses = ServerErrorResponses.getInstance();
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/stanza/StanzaBuilderTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/stanza/StanzaBuilderTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/stanza/StanzaBuilderTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/stanza/StanzaBuilderTestCase.java Tue Nov 24 07:51:04 2009
@@ -33,7 +33,7 @@
builder.startInnerElement("foo", "urn:bar");
builder.endInnerElement();
- Stanza stanza = builder.getFinalStanza();
+ Stanza stanza = builder.build();
XMLElement innerElm = stanza.getFirstInnerElement();
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanzaTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanzaTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanzaTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/stanza/XMPPCoreStanzaTestCase.java Tue Nov 24 07:51:04 2009
@@ -30,7 +30,7 @@
StanzaBuilder responseBuilder = new StanzaBuilder("iq", NamespaceURIs.JABBER_SERVER);
responseBuilder.addAttribute("id", "xzy");
responseBuilder.addAttribute("type", IQStanzaType.RESULT.value());
- Stanza stanza = responseBuilder.getFinalStanza();
+ Stanza stanza = responseBuilder.build();
// do not invoke some other getVerifier()s until getCoreVerifier()
XMPPCoreStanza coreStanza = new IQStanza(stanza);
assertNotNull(coreStanza.getCoreVerifier());
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/state/presence/EhCachePresenceCacheImplTest.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/state/presence/EhCachePresenceCacheImplTest.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/state/presence/EhCachePresenceCacheImplTest.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/state/presence/EhCachePresenceCacheImplTest.java Tue Nov 24 07:51:04 2009
@@ -116,7 +116,7 @@
*/
protected PresenceStanza getPresenceStanza(TestUser user) {
XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(user.getEntityFQ(),
- null, null, null, null, null).getFinalStanza());
+ null, null, null, null, null).build());
return (PresenceStanza)initialPresence;
}
Modified: mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/state/presence/LatestPresenceCacheTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/state/presence/LatestPresenceCacheTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/state/presence/LatestPresenceCacheTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/core/src/test/java/org/apache/vysper/xmpp/state/presence/LatestPresenceCacheTestCase.java Tue Nov 24 07:51:04 2009
@@ -76,7 +76,7 @@
}
public XMPPCoreStanza sendInitialPresence(SessionStateHolder sessionStateHolder, TestUser user) {
- XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(user.getEntityFQ(), null, null, null, null, null).getFinalStanza());
+ XMPPCoreStanza initialPresence = XMPPCoreStanza.getWrapper(StanzaBuilder.createPresenceStanza(user.getEntityFQ(), null, null, null, null, null).build());
handler.execute(initialPresence, sessionContext.getServerRuntimeContext(), true, sessionContext, sessionStateHolder);
return initialPresence;
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/MUCModule.java Tue Nov 24 07:51:04 2009
@@ -216,7 +216,7 @@
}
try {
- serverRuntimeContext.getStanzaRelay().relay(receiver, builder.getFinalStanza(), new IgnoreFailureStrategy());
+ serverRuntimeContext.getStanzaRelay().relay(receiver, builder.build(), new IgnoreFailureStrategy());
} catch (DeliveryException e) {
// ignore
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCHandlerHelper.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCHandlerHelper.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCHandlerHelper.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCHandlerHelper.java Tue Nov 24 07:51:04 2009
@@ -86,7 +86,7 @@
builder.startInnerElement(errorName, NamespaceURIs.URN_IETF_PARAMS_XML_NS_XMPP_STANZAS).endInnerElement();
builder.endInnerElement();
- return builder.getFinalStanza();
+ return builder.build();
}
public static Stanza createInviteMessageStanza(Stanza original, String password) throws EntityFormatException {
@@ -124,7 +124,7 @@
X newX = new X(NamespaceURIs.XEP0045_MUC_USER, inner);
builder.addPreparedElement(newX);
- return builder.getFinalStanza();
+ return builder.build();
}
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandler.java Tue Nov 24 07:51:04 2009
@@ -131,7 +131,7 @@
replaceAttributes.add(new Attribute("to", occupent.getJid().getFullQualifiedName()));
relayStanza(occupent.getJid(),
- StanzaBuilder.createClone(stanza, true, replaceAttributes).getFinalStanza(),
+ StanzaBuilder.createClone(stanza, true, replaceAttributes).build(),
serverRuntimeContext);
}
@@ -170,7 +170,7 @@
replaceAttributes.add(new Attribute("to", receivingOccupant.getJid().getFullQualifiedName()));
relayStanza(receivingOccupant.getJid(),
- StanzaBuilder.createClone(stanza, true, replaceAttributes).getFinalStanza(),
+ StanzaBuilder.createClone(stanza, true, replaceAttributes).build(),
serverRuntimeContext);
} else {
// TODO correct error?
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandler.java Tue Nov 24 07:51:04 2009
@@ -276,7 +276,7 @@
logger.debug("Room presence from {} sent to {}", newOccupant, roomAndOccupantNick);
- relayStanza(newOccupant.getJid(), builder.getFinalStanza(), serverRuntimeContext);
+ relayStanza(newOccupant.getJid(), builder.build(), serverRuntimeContext);
}
private void sendNewOccupantPresenceToExisting(Occupant newOccupant, Occupant existingOccupant, Room room, ServerRuntimeContext serverRuntimeContext) {
@@ -305,7 +305,7 @@
builder.addPreparedElement(new X(NamespaceURIs.XEP0045_MUC_USER, inner));
logger.debug("Room presence from {} sent to {}", roomAndNewUserNick, existingOccupant);
- relayStanza(existingOccupant.getJid(), builder.getFinalStanza(), serverRuntimeContext);
+ relayStanza(existingOccupant.getJid(), builder.build(), serverRuntimeContext);
}
private void sendChangeNickUnavailable(Occupant changer, String oldNick, Occupant receiver, Room room, ServerRuntimeContext serverRuntimeContext) {
@@ -327,7 +327,7 @@
builder.addPreparedElement(new X(NamespaceURIs.XEP0045_MUC_USER, inner));
logger.debug("Room presence from {} sent to {}", roomAndOldNick, receiver);
- relayStanza(receiver.getJid(), builder.getFinalStanza(), serverRuntimeContext);
+ relayStanza(receiver.getJid(), builder.build(), serverRuntimeContext);
}
@@ -346,7 +346,7 @@
builder.addPreparedElement(new X(NamespaceURIs.XEP0045_MUC_USER, new Item(changer, includeJid, true)));
logger.debug("Room presence from {} sent to {}", roomAndNick, receiver);
- relayStanza(receiver.getJid(), builder.getFinalStanza(), serverRuntimeContext);
+ relayStanza(receiver.getJid(), builder.build(), serverRuntimeContext);
}
@@ -370,7 +370,7 @@
}
builder.addPreparedElement(new X(NamespaceURIs.XEP0045_MUC_USER, inner));
- relayStanza(receiver.getJid(), builder.getFinalStanza(), serverRuntimeContext);
+ relayStanza(receiver.getJid(), builder.build(), serverRuntimeContext);
}
@@ -400,7 +400,7 @@
}
builder.addPreparedElement(new X(NamespaceURIs.XEP0045_MUC_USER, inner));
- relayStanza(existingOccupant.getJid(), builder.getFinalStanza(), serverRuntimeContext);
+ relayStanza(existingOccupant.getJid(), builder.build(), serverRuntimeContext);
}
protected void relayStanzas(Entity receiver, List<Stanza> stanzas, ServerRuntimeContext serverRuntimeContext) {
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessage.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessage.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessage.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessage.java Tue Nov 24 07:51:04 2009
@@ -77,7 +77,7 @@
Delay delay = new Delay(delayFrom, timestamp);
builder.addPreparedElement(delay);
- return builder.getFinalStanza();
+ return builder.build();
}
public boolean hasSubject() {
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractDiscoTestCase.java Tue Nov 24 07:51:04 2009
@@ -83,7 +83,7 @@
StanzaBuilder request = buildRequest();
- ResponseStanzaContainer resultStanzaContainer = infoIQHandler.execute(request.getFinalStanza(), serverRuntimeContext, false, new TestSessionContext(serverRuntimeContext, new SessionStateHolder()), null);
+ ResponseStanzaContainer resultStanzaContainer = infoIQHandler.execute(request.build(), serverRuntimeContext, false, new TestSessionContext(serverRuntimeContext, new SessionStateHolder()), null);
Stanza resultStanza = resultStanzaContainer.getResponseStanza();
assertEquals("Disco request must not return error", "result", resultStanza.getAttributeValue("type"));
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/AbstractMUCOccupantDiscoTestCase.java Tue Nov 24 07:51:04 2009
@@ -54,7 +54,7 @@
request.startInnerElement("query", getNamespace()).endInnerElement();
// send message to room
- sendDisco(request.getFinalStanza());
+ sendDisco(request.build());
assertNull(occupant1Queue.getNext());
Stanza stanza = occupant2Queue.getNext();
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/AbstractMUCMessageHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -42,7 +42,7 @@
stanzaBuilder.addPreparedElement(x);
}
- Stanza messageStanza = stanzaBuilder.getFinalStanza();
+ Stanza messageStanza = stanzaBuilder.build();
ResponseStanzaContainer container = handler.execute(messageStanza,
sessionContext.getServerRuntimeContext(), true, sessionContext,
null);
@@ -68,7 +68,7 @@
Stanza errorStanza = sendMessage(OCCUPANT1_JID, ROOM1_JID,
GROUPCHAT, body);
- XMLElement expectedBody = new XMLElementBuilder("body").addText(body).getFinalElement();
+ XMLElement expectedBody = new XMLElementBuilder("body").addText(body).build();
assertMessageErrorStanza(errorStanza, ROOM1_JID, OCCUPANT1_JID, "modify",
expectedErrorName,expectedBody);
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCMessageHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -85,7 +85,7 @@
// send message to occupant 1 with type groupchat
Stanza errorStanza = sendMessage(OCCUPANT1_JID, new EntityImpl(ROOM1_JID, "Nick 2"), MessageStanzaType.GROUPCHAT, BODY);
- XMLElement expectedBody = new XMLElementBuilder("body").addText(BODY).getFinalElement();
+ XMLElement expectedBody = new XMLElementBuilder("body").addText(BODY).build();
assertMessageErrorStanza(errorStanza, ROOM1_JID, OCCUPANT1_JID, "modify",
"bad-request", expectedBody);
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerChangeNickTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerChangeNickTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerChangeNickTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerChangeNickTestCase.java Tue Nov 24 07:51:04 2009
@@ -29,7 +29,7 @@
stanzaBuilder.startInnerElement("x", NamespaceURIs.XEP0045_MUC);
stanzaBuilder.endInnerElement();
- Stanza presenceStanza = stanzaBuilder.getFinalStanza();
+ Stanza presenceStanza = stanzaBuilder.build();
ResponseStanzaContainer container = handler.execute(presenceStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, null);
if(container != null) {
return container.getResponseStanza();
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerChangeStatusTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerChangeStatusTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerChangeStatusTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerChangeStatusTestCase.java Tue Nov 24 07:51:04 2009
@@ -25,7 +25,7 @@
private Stanza changeStatus(Entity occupantJid, Entity roomWithNickJid, String show, String status) throws ProtocolException {
StanzaBuilder stanzaBuilder = StanzaBuilder.createPresenceStanza(occupantJid, roomWithNickJid, null, null, show, status);
- Stanza presenceStanza = stanzaBuilder.getFinalStanza();
+ Stanza presenceStanza = stanzaBuilder.build();
ResponseStanzaContainer container = handler.execute(presenceStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, null);
if(container != null) {
return container.getResponseStanza();
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerEnterRoomTestCase.java Tue Nov 24 07:51:04 2009
@@ -56,7 +56,7 @@
}
stanzaBuilder.addPreparedElement(new X(xInnerElms));
}
- Stanza presenceStanza = stanzaBuilder.getFinalStanza();
+ Stanza presenceStanza = stanzaBuilder.build();
ResponseStanzaContainer container = handler.execute(presenceStanza, userSessionContext.getServerRuntimeContext(), true, userSessionContext, null);
if(container != null) {
return container.getResponseStanza();
@@ -187,7 +187,7 @@
private void assertPresenceErrorStanza(Stanza response, Entity from, Entity to,
String type, String errorName) {
- XMLElement xElement = new XMLElementBuilder("x", NamespaceURIs.XEP0045_MUC).getFinalElement();
+ XMLElement xElement = new XMLElementBuilder("x", NamespaceURIs.XEP0045_MUC).build();
assertErrorStanza(response, "presence", from, to, type, errorName, xElement);
}
@@ -242,11 +242,11 @@
public void testDiscussionHistory() throws Exception {
// add some messages
Room room = conference.findOrCreateRoom(ROOM1_JID, "Room 1");
- room.getHistory().append(StanzaBuilder.createMessageStanza(OCCUPANT2_JID, ROOM1_JID, MessageStanzaType.GROUPCHAT, null, "Body").getFinalStanza(),
+ room.getHistory().append(StanzaBuilder.createMessageStanza(OCCUPANT2_JID, ROOM1_JID, MessageStanzaType.GROUPCHAT, null, "Body").build(),
new Occupant(OCCUPANT2_JID, "nick2", Affiliation.None, Role.Participant));
- room.getHistory().append(StanzaBuilder.createMessageStanza(OCCUPANT2_JID, ROOM1_JID, MessageStanzaType.GROUPCHAT, null, "Body2").getFinalStanza(),
+ room.getHistory().append(StanzaBuilder.createMessageStanza(OCCUPANT2_JID, ROOM1_JID, MessageStanzaType.GROUPCHAT, null, "Body2").build(),
new Occupant(OCCUPANT2_JID, "nick2", Affiliation.None, Role.Participant));
- room.getHistory().append(StanzaBuilder.createMessageStanza(OCCUPANT2_JID, ROOM1_JID, MessageStanzaType.GROUPCHAT, null, "Body3").getFinalStanza(),
+ room.getHistory().append(StanzaBuilder.createMessageStanza(OCCUPANT2_JID, ROOM1_JID, MessageStanzaType.GROUPCHAT, null, "Body3").build(),
new Occupant(OCCUPANT2_JID, "nick2", Affiliation.None, Role.Participant));
// now, let user 1 enter room
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerExitRoomTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerExitRoomTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerExitRoomTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerExitRoomTestCase.java Tue Nov 24 07:51:04 2009
@@ -27,7 +27,7 @@
private Stanza exitRoom(Entity occupantJid, Entity roomJid, String status) throws ProtocolException {
StanzaBuilder stanzaBuilder = StanzaBuilder.createPresenceStanza(occupantJid, roomJid, null, PresenceStanzaType.UNAVAILABLE, null, status);
- Stanza presenceStanza = stanzaBuilder.getFinalStanza();
+ Stanza presenceStanza = stanzaBuilder.build();
ResponseStanzaContainer container = handler.execute(presenceStanza, sessionContext.getServerRuntimeContext(), true, sessionContext, null);
if(container != null) {
return container.getResponseStanza();
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCPresenceHandlerVerifyTestCase.java Tue Nov 24 07:51:04 2009
@@ -28,7 +28,7 @@
builder.startInnerElement("x", NamespaceURIs.XEP0045_MUC);
builder.endInnerElement();
- assertFalse(presenceHandler.verify(builder.getFinalStanza()));
+ assertFalse(presenceHandler.verify(builder.build()));
}
@@ -37,7 +37,7 @@
builder.startInnerElement("x", NamespaceURIs.XEP0045_MUC);
builder.endInnerElement();
- assertTrue(presenceHandler.verify(builder.getFinalStanza()));
+ assertTrue(presenceHandler.verify(builder.build()));
}
public void testVerifyWithNonMUCNamespace() {
@@ -45,14 +45,14 @@
builder.startInnerElement("x", "foo");
builder.endInnerElement();
- assertFalse(presenceHandler.verify(builder.getFinalStanza()));
+ assertFalse(presenceHandler.verify(builder.build()));
}
public void testVerifyWithoutMUCNamespace() {
StanzaBuilder builder = StanzaBuilder.createPresenceStanza(FROM, TO, null, null, null, null);
- assertTrue(presenceHandler.verify(builder.getFinalStanza()));
+ assertTrue(presenceHandler.verify(builder.build()));
}
@@ -60,6 +60,6 @@
StanzaBuilder builder = StanzaBuilder.createPresenceStanza(FROM, TO, null, null, null, null);
builder.startInnerElement("foo").endInnerElement();
- assertTrue(presenceHandler.verify(builder.getFinalStanza()));
+ assertTrue(presenceHandler.verify(builder.build()));
}
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/handler/MUCSubjectMessageHandlerTestCase.java Tue Nov 24 07:51:04 2009
@@ -58,7 +58,7 @@
Stanza error = sendMessage(OCCUPANT1_JID, ROOM2_JID, GROUPCHAT, null, null, SUBJECT);
assertMessageErrorStanza(error, ROOM2_JID, OCCUPANT1_JID, "auth", "forbidden",
- new XMLElementBuilder("subject").addText(SUBJECT).getFinalElement());
+ new XMLElementBuilder("subject").addText(SUBJECT).build());
assertNull(occupant1Queue.getNext());
assertNull(occupant2Queue.getNext());
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionHistoryTestCase.java Tue Nov 24 07:51:04 2009
@@ -67,14 +67,14 @@
int maxStanzas = DiscussionHistory.DEFAULT_HISTORY_SIZE + 1;
for(int i = 0; i<maxStanzas; i++) {
history.append(
- StanzaBuilder.createMessageStanza(FROM, ROOM_JID, MessageStanzaType.GROUPCHAT, null, BODY + i).getFinalStanza(),
+ StanzaBuilder.createMessageStanza(FROM, ROOM_JID, MessageStanzaType.GROUPCHAT, null, BODY + i).build(),
FROM_OCCUPANT, createTimestamp(maxStanzas - i));
}
// add a subject message
history.append(
StanzaBuilder.createMessageStanza(FROM, ROOM_JID, MessageStanzaType.GROUPCHAT, null, null).
- startInnerElement("subject").addText(SUBJECT).endInnerElement().getFinalStanza(),
+ startInnerElement("subject").addText(SUBJECT).endInnerElement().build(),
FROM_OCCUPANT);
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/model/DiscussionMessageTestCase.java Tue Nov 24 07:51:04 2009
@@ -55,7 +55,7 @@
StanzaBuilder builder = StanzaBuilder.createMessageStanza(FROM, ROOM_JID, null, null);
builder.startInnerElement("subject").addText(SUBJECT).endInnerElement();
- DiscussionMessage item = new DiscussionMessage(builder.getFinalStanza(), FROM_OCCUPANT, TIMESTAMP);
+ DiscussionMessage item = new DiscussionMessage(builder.build(), FROM_OCCUPANT, TIMESTAMP);
assertEquals(NICK, item.getNick());
assertEquals(TIMESTAMP, item.getTimestamp());
assertFalse(item.hasBody());
@@ -66,7 +66,7 @@
public void testBodyMessage() {
StanzaBuilder builder = StanzaBuilder.createMessageStanza(FROM, ROOM_JID, null, BODY);
- DiscussionMessage item = new DiscussionMessage(builder.getFinalStanza(), FROM_OCCUPANT, TIMESTAMP);
+ DiscussionMessage item = new DiscussionMessage(builder.build(), FROM_OCCUPANT, TIMESTAMP);
assertEquals(NICK, item.getNick());
assertEquals(TIMESTAMP, item.getTimestamp());
assertTrue(item.hasBody());
@@ -75,7 +75,7 @@
public void testCreateStanza() throws Exception {
StanzaBuilder builder = StanzaBuilder.createMessageStanza(FROM, ROOM_JID, MessageStanzaType.GROUPCHAT, null, BODY);
- Stanza inStanza = builder.getFinalStanza();
+ Stanza inStanza = builder.build();
DiscussionMessage item = new DiscussionMessage(inStanza, FROM_OCCUPANT, TIMESTAMP);
Entity to = TestUtil.parseUnchecked("user2@vysper.org/res");
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0045-muc/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0045_muc/stanzas/XTestCase.java Tue Nov 24 07:51:04 2009
@@ -40,7 +40,7 @@
builder.startInnerElement("password").addText("secret").endInnerElement();
builder.endInnerElement();
- X x = X.fromStanza(builder.getFinalStanza());
+ X x = X.fromStanza(builder.build());
assertNotNull(x);
assertEquals("secret", x.getPasswordValue());
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/SubscriberPayloadNotificationVisitor.java Tue Nov 24 07:51:04 2009
@@ -100,7 +100,7 @@
stanzaBuilder.addPreparedElement(item);
stanzaBuilder.endInnerElement(); // items
stanzaBuilder.endInnerElement(); // event
- return stanzaBuilder.getFinalStanza();
+ return stanzaBuilder.build();
}
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubCreateNodeHandler.java Tue Nov 24 07:51:04 2009
@@ -91,6 +91,6 @@
LeafNode node = new LeafNode(serviceConfiguration, nodeName, sender);
root.add(node);
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubPublishHandler.java Tue Nov 24 07:51:04 2009
@@ -117,7 +117,7 @@
StanzaBuilder itemBuilder = new StanzaBuilder("item");
itemBuilder.addAttribute("id", strID);
itemBuilder.addPreparedElement(item.getFirstInnerElement());
- item = itemBuilder.getFinalStanza();
+ item = itemBuilder.build();
}
StanzaRelay relay = serverRuntimeContext.getStanzaRelay();
@@ -126,7 +126,7 @@
buildSuccessStanza(sb, nodeName, strID);
sb.endInnerElement(); // pubsub
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
/**
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveAffiliationsHandler.java Tue Nov 24 07:51:04 2009
@@ -85,7 +85,7 @@
buildSuccessStanza(sb, subscriptions);
sb.endInnerElement(); // pubsub
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
/**
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubRetrieveSubscriptionsHandler.java Tue Nov 24 07:51:04 2009
@@ -88,7 +88,7 @@
buildSuccessStanza(sb, nodeName, subscriptions);
sb.endInnerElement(); // pubsub
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
/**
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubSubscribeHandler.java Tue Nov 24 07:51:04 2009
@@ -125,7 +125,7 @@
buildSuccessStanza(sb, nodeName, strSubJID, id);
sb.endInnerElement(); // pubsub
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
/**
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/PubSubUnsubscribeHandler.java Tue Nov 24 07:51:04 2009
@@ -134,7 +134,7 @@
}
sb.endInnerElement(); // pubsub
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerDeleteNodeHandler.java Tue Nov 24 07:51:04 2009
@@ -96,7 +96,7 @@
sendDeleteNotifications(serverRuntimeContext, sender, nodeName, node);
root.deleteNode(nodeName);
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
/**
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/main/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/handler/owner/PubSubOwnerManageAffiliationsHandler.java Tue Nov 24 07:51:04 2009
@@ -107,7 +107,7 @@
buildSuccessStanza(sb, node, affiliations);
sb.endInnerElement();
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
/**
@@ -170,7 +170,7 @@
}
sb.endInnerElement();
- return new IQStanza(sb.getFinalStanza());
+ return new IQStanza(sb.build());
}
/**
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoInfoTestCase.java Tue Nov 24 07:51:04 2009
@@ -166,7 +166,7 @@
stanzaBuilder.startInnerElement("query");
stanzaBuilder.addNamespaceAttribute(getNamespace());
- return stanzaBuilder.getFinalStanza();
+ return stanzaBuilder.build();
}
@Override
@@ -178,7 +178,7 @@
stanzaBuilder.endInnerElement();
- return stanzaBuilder.getFinalStanza();
+ return stanzaBuilder.build();
}
}
}
Modified: mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java
URL: http://svn.apache.org/viewvc/mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java?rev=883618&r1=883617&r2=883618&view=diff
==============================================================================
--- mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java (original)
+++ mina/sandbox/vysper/trunk/server/extensions/xep0060-pubsub/src/test/java/org/apache/vysper/xmpp/modules/extension/xep0060_pubsub/disco/PubSubDiscoItemsTestCase.java Tue Nov 24 07:51:04 2009
@@ -206,7 +206,7 @@
stanzaBuilder.endInnerElement();
- return stanzaBuilder.getFinalStanza();
+ return stanzaBuilder.build();
}
@Override
@@ -218,7 +218,7 @@
stanzaBuilder.endInnerElement();
- return stanzaBuilder.getFinalStanza();
+ return stanzaBuilder.build();
}
}
}