From ed4fa3390ff8e4d7ff19cd3a2b88f1fb95b05d98 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 4 Mar 2015 21:44:43 +0100 Subject: [PATCH] Add XMPPConnection.sendStanza(Stanza) and deprecate sendPacket(). --- documentation/gettingstarted.md | 2 +- .../smack/bosh/XMPPBOSHConnection.java | 4 +- .../java/org/jivesoftware/smack/IQTest.java | 4 +- .../org/jivesoftware/smack/MessageTest.java | 44 +++++++++---------- .../jivesoftware/smack/PacketReaderTest.java | 18 ++++---- .../org/jivesoftware/smack/PresenceTest.java | 18 ++++---- .../smack/AbstractXMPPConnection.java | 22 ++++++---- .../smack/SynchronizationPoint.java | 2 +- .../jivesoftware/smack/XMPPConnection.java | 10 +++++ .../jivesoftware/smack/DummyConnection.java | 10 ++--- .../smack/ThreadedDummyConnection.java | 6 +-- .../smackx/debugger/EnhancedDebugger.java | 2 +- .../jivesoftware/smackx/CompressionTest.java | 2 +- .../org/jivesoftware/smackx/FormTest.java | 2 +- .../smackx/GroupChatInvitationTest.java | 2 +- .../smackx/LastActivityManagerTest.java | 4 +- .../smackx/OfflineMessageManagerTest.java | 8 ++-- .../org/jivesoftware/smackx/VersionTest.java | 2 +- .../bytestreams/ibb/InBandBytestreamTest.java | 2 +- .../socks5/Socks5ByteStreamTest.java | 2 +- .../address/MultipleRecipientManager.java | 12 ++--- .../ibb/InBandBytestreamManager.java | 6 +-- .../ibb/InBandBytestreamRequest.java | 2 +- .../ibb/InBandBytestreamSession.java | 10 ++--- .../socks5/Socks5BytestreamManager.java | 2 +- .../socks5/Socks5BytestreamRequest.java | 4 +- .../smackx/caps/EntityCapsManager.java | 2 +- .../filetransfer/FileTransferManager.java | 2 +- .../filetransfer/FileTransferNegotiator.java | 4 +- .../smackx/filetransfer/StreamNegotiator.java | 2 +- .../smackx/muc/MultiUserChat.java | 12 ++--- .../smackx/muc/MultiUserChatManager.java | 2 +- .../muc/packet/GroupChatInvitation.java | 2 +- .../jivesoftware/smackx/pep/PEPManager.java | 2 +- .../jivesoftware/smackx/pubsub/LeafNode.java | 4 +- .../receipts/DeliveryReceiptManager.java | 4 +- .../bytestreams/ibb/CloseListenerTest.java | 2 +- .../bytestreams/ibb/DataListenerTest.java | 2 +- .../ibb/InBandBytestreamRequestTest.java | 4 +- .../ibb/InitiationListenerTest.java | 6 +-- .../socks5/InitiationListenerTest.java | 4 +- .../jivesoftware/util/ConnectionUtils.java | 4 +- .../java/org/jivesoftware/util/Protocol.java | 2 +- .../jivesoftware/smack/chat/ChatManager.java | 2 +- .../org/jivesoftware/smack/roster/Roster.java | 6 +-- .../smackx/jingle/JingleManagerTest.java | 2 +- .../smackx/jingle/JingleMediaTest.java | 2 +- .../jingle/provider/JingleProviderTest.java | 2 +- .../smackx/jingleold/JingleSession.java | 26 +++++------ .../jingleold/nat/TransportCandidate.java | 2 +- .../smackx/workgroup/agent/AgentRoster.java | 4 +- .../smackx/workgroup/agent/AgentSession.java | 8 ++-- .../smackx/workgroup/agent/Offer.java | 4 +- .../workgroup/agent/OfferConfirmation.java | 2 +- .../smackx/xevent/MessageEventManager.java | 8 ++-- .../smackx/xroster/RosterExchangeManager.java | 6 +-- .../smack/tcp/XMPPTCPConnection.java | 10 ++--- .../smack/tcp/PacketWriterTest.java | 4 +- 58 files changed, 183 insertions(+), 167 deletions(-) diff --git a/documentation/gettingstarted.md b/documentation/gettingstarted.md index d9ad4d84b..5913cc2f1 100644 --- a/documentation/gettingstarted.md +++ b/documentation/gettingstarted.md @@ -98,7 +98,7 @@ your presence to let people know you're unavailable and "out fishing": Presence presence = new Presence(Presence.Type.unavailable); presence.setStatus("Gone fishing"); // Send the packet (assume we have an XMPPConnection instance called "con"). -con.sendPacket(presence); +con.sendStanza(presence); ``` Smack provides two ways to read incoming packets: `PacketListener`, and diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java index 2022c938e..ded19e207 100644 --- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java +++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java @@ -255,7 +255,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection { } @Override - protected void sendPacketInternal(Stanza packet) throws NotConnectedException { + protected void sendStanzaInternal(Stanza packet) throws NotConnectedException { sendElement(packet); } @@ -267,7 +267,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection { } } catch (BOSHException e) { - LOGGER.log(Level.SEVERE, "BOSHException in sendPacketInternal", e); + LOGGER.log(Level.SEVERE, "BOSHException in sendStanzaInternal", e); } } diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java index 49184a875..29ae721c3 100644 --- a/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java +++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/IQTest.java @@ -54,7 +54,7 @@ public class IQTest extends SmackTestCase { new StanzaTypeFilter(IQ.class)); PacketCollector collector = getConnection(0).createPacketCollector(filter); // Send the iq packet with an invalid namespace - getConnection(0).sendPacket(iq); + getConnection(0).sendStanza(iq); IQ result = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout()); // Stop queuing results @@ -85,7 +85,7 @@ public class IQTest extends SmackTestCase { PacketCollector collector = getConnection(0).createPacketCollector( new PacketIDFilter(versionRequest.getStanzaId())); - getConnection(0).sendPacket(versionRequest); + getConnection(0).sendStanza(versionRequest); // Wait up to 5 seconds for a result. IQ result = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout()); diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java index c9e77e17b..278e45198 100644 --- a/smack-core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java +++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/MessageTest.java @@ -42,11 +42,11 @@ public class MessageTest extends SmackTestCase { * message? */ public void testDirectPresence() { - getConnection(1).sendPacket(new Presence(Presence.Type.available)); + getConnection(1).sendStanza(new Presence(Presence.Type.available)); Presence presence = new Presence(Presence.Type.available); presence.setTo(getBareJID(1)); - getConnection(0).sendPacket(presence); + getConnection(0).sendStanza(presence); PacketCollector collector = getConnection(0) .createPacketCollector(new MessageTypeFilter(Message.Type.chat)); @@ -67,10 +67,10 @@ public class MessageTest extends SmackTestCase { * the client becomes available again the offline messages are received. */ public void testOfflineMessage() { - getConnection(0).sendPacket(new Presence(Presence.Type.available)); - getConnection(1).sendPacket(new Presence(Presence.Type.available)); + getConnection(0).sendStanza(new Presence(Presence.Type.available)); + getConnection(1).sendStanza(new Presence(Presence.Type.available)); // Make user2 unavailable - getConnection(1).sendPacket(new Presence(Presence.Type.unavailable)); + getConnection(1).sendStanza(new Presence(Presence.Type.unavailable)); try { Thread.sleep(500); @@ -86,7 +86,7 @@ public class MessageTest extends SmackTestCase { // User2 becomes available again - getConnection(1).sendPacket(new Presence(Presence.Type.available)); + getConnection(1).sendStanza(new Presence(Presence.Type.available)); // Check that offline messages are retrieved by user2 which is now available Message message = (Message) collector.nextResult(2500); @@ -112,7 +112,7 @@ public class MessageTest extends SmackTestCase { */ /*public void testOfflineMessageInvalidXML() { // Make user2 unavailable - getConnection(1).sendPacket(new Presence(Presence.Type.unavailable)); + getConnection(1).sendStanza(new Presence(Presence.Type.unavailable)); try { Thread.sleep(500); @@ -128,7 +128,7 @@ public class MessageTest extends SmackTestCase { // User2 becomes available again - getConnection(1).sendPacket(new Presence(Presence.Type.available)); + getConnection(1).sendStanza(new Presence(Presence.Type.available)); // Check that offline messages are retrieved by user2 which is now available Message message = (Message) collector.nextResult(2500); @@ -150,8 +150,8 @@ public class MessageTest extends SmackTestCase { * connections are not being closed. */ public void testHugeMessage() { - getConnection(0).sendPacket(new Presence(Presence.Type.available)); - getConnection(1).sendPacket(new Presence(Presence.Type.available)); + getConnection(0).sendStanza(new Presence(Presence.Type.available)); + getConnection(1).sendStanza(new Presence(Presence.Type.available)); // User2 becomes available again PacketCollector collector = getConnection(1).createPacketCollector( new MessageTypeFilter(Message.Type.chat)); @@ -165,7 +165,7 @@ public class MessageTest extends SmackTestCase { msg.setBody(sb.toString()); // Send the first message - getConnection(0).sendPacket(msg); + getConnection(0).sendStanza(msg); // Check that the connection that sent the message is still connected assertTrue("XMPPConnection was closed", getConnection(0).isConnected()); // Check that the message was received @@ -173,7 +173,7 @@ public class MessageTest extends SmackTestCase { assertNotNull("No Message was received", rcv); // Send the second message - getConnection(0).sendPacket(msg); + getConnection(0).sendStanza(msg); // Check that the connection that sent the message is still connected assertTrue("XMPPConnection was closed", getConnection(0).isConnected()); // Check that the second message was received @@ -200,11 +200,11 @@ public class MessageTest extends SmackTestCase { // Set this connection as highest priority Presence presence = new Presence(Presence.Type.available); presence.setPriority(10); - conn3.sendPacket(presence); + conn3.sendStanza(presence); // Set this connection as highest priority presence = new Presence(Presence.Type.available); presence.setPriority(5); - getConnection(0).sendPacket(presence); + getConnection(0).sendStanza(presence); // Let the server process the change in presences Thread.sleep(200); @@ -249,11 +249,11 @@ public class MessageTest extends SmackTestCase { // Set this connection as highest priority Presence presence = new Presence(Presence.Type.available); presence.setMode(Presence.Mode.away); - conn3.sendPacket(presence); + conn3.sendStanza(presence); // Set this connection as highest priority presence = new Presence(Presence.Type.available); presence.setMode(Presence.Mode.available); - getConnection(0).sendPacket(presence); + getConnection(0).sendStanza(presence); // Let the server process the change in presences Thread.sleep(200); @@ -299,12 +299,12 @@ public class MessageTest extends SmackTestCase { Presence presence = new Presence(Presence.Type.available); presence.setMode(Presence.Mode.available); presence.setPriority(10); - conn3.sendPacket(presence); + conn3.sendStanza(presence); // Set this connection as highest priority presence = new Presence(Presence.Type.available); presence.setMode(Presence.Mode.available); presence.setPriority(10); - getConnection(0).sendPacket(presence); + getConnection(0).sendStanza(presence); connectionConfiguration = new ConnectionConfiguration(getHost(), getPort(), getServiceName()); @@ -314,7 +314,7 @@ public class MessageTest extends SmackTestCase { presence = new Presence(Presence.Type.available); presence.setMode(Presence.Mode.available); presence.setPriority(4); - getConnection(0).sendPacket(presence); + getConnection(0).sendStanza(presence); // Let the server process the change in presences @@ -326,7 +326,7 @@ public class MessageTest extends SmackTestCase { PacketCollector coll4 = conn4.createPacketCollector(new MessageTypeFilter(Message.Type.chat)); // Send a message from this resource to indicate most recent activity - conn3.sendPacket(new Message("admin@" + getServiceName())); + conn3.sendStanza(new Message("admin@" + getServiceName())); // User1 sends a message to the bare JID of User0 Chat chat = getConnection(1).getChatManager().createChat(getBareJID(0), null); @@ -362,7 +362,7 @@ public class MessageTest extends SmackTestCase { Presence presence = new Presence(Presence.Type.available); presence.setMode(Presence.Mode.available); presence.setPriority(-1); - getConnection(0).sendPacket(presence); + getConnection(0).sendStanza(presence); // Let the server process the change in presences Thread.sleep(200); @@ -383,7 +383,7 @@ public class MessageTest extends SmackTestCase { presence = new Presence(Presence.Type.available); presence.setMode(Presence.Mode.available); presence.setPriority(1); - getConnection(0).sendPacket(presence); + getConnection(0).sendStanza(presence); // Let the server process the change in presences Thread.sleep(200); diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java index aa5d345eb..7c24ea877 100644 --- a/smack-core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java +++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/PacketReaderTest.java @@ -84,7 +84,7 @@ public class PacketReaderTest extends SmackTestCase { // Send the IQ and wait for the answer PacketCollector collector = getConnection(0).createPacketCollector( new PacketIDFilter(iqPacket.getStanzaId())); - getConnection(0).sendPacket(iqPacket); + getConnection(0).sendStanza(iqPacket); IQ response = (IQ) collector.nextResult(SmackConfiguration.getPacketReplyTimeout()); if (response == null) { fail("No response from the other user."); @@ -114,7 +114,7 @@ public class PacketReaderTest extends SmackTestCase { Message msg = new Message(getConnection(0).getUser(), Message.Type.normal); - getConnection(1).sendPacket(msg); + getConnection(1).sendStanza(msg); // Remove the listener getConnection(0).removeAsyncPacketListener(listener); @@ -141,7 +141,7 @@ public class PacketReaderTest extends SmackTestCase { Message message = new Message(packet.getFrom()); message.setFrom(getFullJID(1)); message.setBody("HELLO"); - getConnection(1).sendPacket(message); + getConnection(1).sendStanza(message); } }, new StanzaTypeFilter(Message.class)); @@ -149,7 +149,7 @@ public class PacketReaderTest extends SmackTestCase { PacketCollector collector = getConnection(0).createPacketCollector( new FromMatchesFilter(getFullJID(1))); // User0 sends the regular message to user1 - getConnection(0).sendPacket(packet); + getConnection(0).sendStanza(packet); // Check that user0 got a reply from user1 assertNotNull("No message was received", collector.nextResult(1000)); @@ -159,7 +159,7 @@ public class PacketReaderTest extends SmackTestCase { packet.setTo(getFullJID(1)); packet.setBody("aloha"); packet.setError(new XMPPError(XMPPError.Condition.feature_not_implemented, null)); - getConnection(0).sendPacket(packet); + getConnection(0).sendStanza(packet); // Check that user0 got a reply from user1 assertNotNull("No message was received", collector.nextResult(1000)); } @@ -213,8 +213,8 @@ public class PacketReaderTest extends SmackTestCase { for (int i = 0; i < 5; i++) { - getConnection(1).sendPacket(msg0); - getConnection(0).sendPacket(msg1); + getConnection(1).sendStanza(msg0); + getConnection(0).sendStanza(msg1); } try { @@ -236,8 +236,8 @@ public class PacketReaderTest extends SmackTestCase { } for (int i = 0; i < 10; i++) { - getConnection(0).sendPacket(msg1); - getConnection(1).sendPacket(msg0); + getConnection(0).sendStanza(msg1); + getConnection(1).sendStanza(msg0); } try { diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java index 9537b087e..f7c2a6792 100644 --- a/smack-core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java +++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/PresenceTest.java @@ -46,9 +46,9 @@ public class PresenceTest extends SmackTestCase { conn.connect(); conn.login(getUsername(1), getUsername(1), "OtherPlace"); // Change the presence priorities of User_1 - getConnection(1).sendPacket(new Presence(Presence.Type.available, null, 1, + getConnection(1).sendStanza(new Presence(Presence.Type.available, null, 1, Presence.Mode.available)); - conn.sendPacket(new Presence(Presence.Type.available, null, 2, + conn.sendStanza(new Presence(Presence.Type.available, null, 2, Presence.Mode.available)); Thread.sleep(150); // Create the chats between the participants @@ -64,9 +64,9 @@ public class PresenceTest extends SmackTestCase { chat1.nextMessage(1000));*/ // Invert the presence priorities of User_1 - getConnection(1).sendPacket(new Presence(Presence.Type.available, null, 2, + getConnection(1).sendStanza(new Presence(Presence.Type.available, null, 2, Presence.Mode.available)); - conn.sendPacket(new Presence(Presence.Type.available, null, 1, + conn.sendStanza(new Presence(Presence.Type.available, null, 1, Presence.Mode.available)); Thread.sleep(150); @@ -86,14 +86,14 @@ public class PresenceTest extends SmackTestCase { /*assertNotNull("Resource with highest priority didn't receive the message", chat1.nextMessage(2000));*/ - getConnection(1).sendPacket(new Presence(Presence.Type.available, null, 2, + getConnection(1).sendStanza(new Presence(Presence.Type.available, null, 2, Presence.Mode.available)); // User_1 will log in again using another resource conn = createConnection(); conn.connect(); conn.login(getUsername(1), getPassword(1), "OtherPlace"); - conn.sendPacket(new Presence(Presence.Type.available, null, 1, + conn.sendStanza(new Presence(Presence.Type.available, null, 1, Presence.Mode.available)); chat2 = conn.getChatManager().createChat(getBareJID(0), chat0.getThreadID(), null); @@ -106,9 +106,9 @@ public class PresenceTest extends SmackTestCase { chat2.nextMessage(1000));*/ // Invert the presence priorities of User_1 - getConnection(1).sendPacket(new Presence(Presence.Type.available, null, 1, + getConnection(1).sendStanza(new Presence(Presence.Type.available, null, 1, Presence.Mode.available)); - conn.sendPacket(new Presence(Presence.Type.available, null, 2, + conn.sendStanza(new Presence(Presence.Type.available, null, 2, Presence.Mode.available)); Thread.sleep(150); @@ -139,7 +139,7 @@ public class PresenceTest extends SmackTestCase { */ public void testNotAvailablePresence() throws XMPPException { // Change the presence to unavailable of User_1 - getConnection(1).sendPacket(new Presence(Presence.Type.unavailable)); + getConnection(1).sendStanza(new Presence(Presence.Type.unavailable)); // User_1 will log in again using another resource (that is going to be available) XMPPTCPConnection conn = createConnection(); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java index bf47eaf0d..79eef043c 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java @@ -325,7 +325,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { @Override public abstract boolean isSecureConnection(); - protected abstract void sendPacketInternal(Stanza packet) throws NotConnectedException; + protected abstract void sendStanzaInternal(Stanza packet) throws NotConnectedException; @Override public abstract void send(PlainStreamElement element) throws NotConnectedException; @@ -538,7 +538,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { // eventually load the roster. And we should load the roster before we // send the initial presence. if (config.isSendPresence() && !resumed) { - sendPacket(new Presence(Presence.Type.available)); + sendStanza(new Presence(Presence.Type.available)); } } @@ -596,8 +596,14 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } } + @Deprecated @Override public void sendPacket(Stanza packet) throws NotConnectedException { + sendStanza(packet); + } + + @Override + public void sendStanza(Stanza packet) throws NotConnectedException { Objects.requireNonNull(packet, "Packet must not be null"); throwNotConnectedExceptionIfAppropriate(); @@ -615,7 +621,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { // Invoke interceptors for the new packet that is about to be sent. Interceptors may modify // the content of the packet. firePacketInterceptors(packet); - sendPacketInternal(packet); + sendStanzaInternal(packet); } /** @@ -656,7 +662,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { * @throws NotConnectedException */ public synchronized void disconnect(Presence unavailablePresence) throws NotConnectedException { - sendPacket(unavailablePresence); + sendStanza(unavailablePresence); shutdown(); callConnectionClosedListener(); } @@ -694,7 +700,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { PacketCollector packetCollector = createPacketCollector(packetFilter); try { // Now we can send the packet as the collector has been created - sendPacket(packet); + sendStanza(packet); } catch (NotConnectedException | RuntimeException e) { packetCollector.cancel(); @@ -1023,7 +1029,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { ErrorIQ errorIQ = IQ.createErrorResponse(iq, new XMPPError( XMPPError.Condition.feature_not_implemented)); try { - sendPacket(errorIQ); + sendStanza(errorIQ); } catch (NotConnectedException e) { LOGGER.log(Level.WARNING, "NotConnectedException while sending error IQ to unkown IQ request", e); @@ -1052,7 +1058,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { return; } try { - sendPacket(response); + sendStanza(response); } catch (NotConnectedException e) { LOGGER.log(Level.WARNING, "NotConnectedException while sending response to IQ request", e); @@ -1433,7 +1439,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } }, timeout, TimeUnit.MILLISECONDS); addAsyncStanzaListener(packetListener, replyFilter); - sendPacket(stanza); + sendStanza(stanza); } @Override diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java b/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java index 4cd2070e1..9a4614b59 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SynchronizationPoint.java @@ -62,7 +62,7 @@ public class SynchronizationPoint { try { if (request != null) { if (request instanceof Stanza) { - connection.sendPacket((Stanza) request); + connection.sendStanza((Stanza) request); } else if (request instanceof PlainStreamElement){ connection.send((PlainStreamElement) request); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java index b6c091dc3..3b7079f04 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java @@ -158,9 +158,19 @@ public interface XMPPConnection { * * @param packet the packet to send. * @throws NotConnectedException + * @deprecated use {@link #sendStanza(Stanza)} instead. */ + @Deprecated public void sendPacket(Stanza packet) throws NotConnectedException; + /** + * Sends the specified stanza to the server. + * + * @param stanza the stanza to send. + * @throws NotConnectedException if the connection is not connected. + */ + public void sendStanza(Stanza stanza) throws NotConnectedException; + /** * Send a PlainStreamElement. *

diff --git a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java index 0b0db518b..dde1da0cc 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java @@ -33,7 +33,7 @@ import org.jivesoftware.smack.packet.TopLevelStreamElement; * unit tests. * * Instances store any packets that are delivered to be send using the - * {@link #sendPacket(Stanza)} method in a blocking queue. The content of this queue + * {@link #sendStanza(Stanza)} method in a blocking queue. The content of this queue * can be inspected using {@link #getSentPacket()}. Typically these queues are * used to retrieve a message that was generated by the client. * @@ -132,7 +132,7 @@ public class DummyConnection extends AbstractXMPPConnection { } @Override - protected void sendPacketInternal(Stanza packet) { + protected void sendStanzaInternal(Stanza packet) { if (SmackConfiguration.DEBUG) { System.out.println("[SEND]: " + packet.toXML()); } @@ -140,7 +140,7 @@ public class DummyConnection extends AbstractXMPPConnection { } /** - * Returns the number of packets that's sent through {@link #sendPacket(Stanza)} and + * Returns the number of packets that's sent through {@link #sendStanza(Stanza)} and * that has not been returned by {@link #getSentPacket()}. * * @return the number of packets which are in the queue. @@ -150,7 +150,7 @@ public class DummyConnection extends AbstractXMPPConnection { } /** - * Returns the first packet that's sent through {@link #sendPacket(Stanza)} + * Returns the first packet that's sent through {@link #sendStanza(Stanza)} * and that has not been returned by earlier calls to this method. * * @return a sent packet. @@ -160,7 +160,7 @@ public class DummyConnection extends AbstractXMPPConnection { } /** - * Returns the first packet that's sent through {@link #sendPacket(Stanza)} + * Returns the first packet that's sent through {@link #sendStanza(Stanza)} * and that has not been returned by earlier calls to this method. This * method will block for up to the specified number of seconds if no packets * have been sent yet. diff --git a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java index 5644c66cf..e5cec42d0 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/ThreadedDummyConnection.java @@ -38,8 +38,8 @@ public class ThreadedDummyConnection extends DummyConnection { private volatile boolean timeout = false; @Override - public void sendPacket(Stanza packet) throws NotConnectedException { - super.sendPacket(packet); + public void sendStanza(Stanza packet) throws NotConnectedException { + super.sendStanza(packet); if (packet instanceof IQ && !timeout) { timeout = false; @@ -62,7 +62,7 @@ public class ThreadedDummyConnection extends DummyConnection { } /** - * Calling this method will cause the next sendPacket call with an IQ packet to timeout. + * Calling this method will cause the next sendStanza call with an IQ packet to timeout. * This is accomplished by simply stopping the auto creating of the reply packet * or processing one that was entered via {@link #processPacket(Stanza)}. */ diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java index 389092ebf..edd2fda17 100644 --- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java +++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java @@ -578,7 +578,7 @@ public class EnhancedDebugger implements SmackDebugger { if (!"".equals(adhocMessages.getText())) { AdHocPacket packetToSend = new AdHocPacket(adhocMessages.getText()); try { - connection.sendPacket(packetToSend); + connection.sendStanza(packetToSend); } catch (NotConnectedException e1) { e1.printStackTrace(); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java index e58a2a810..c7d045bcd 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/CompressionTest.java @@ -61,7 +61,7 @@ public class CompressionTest extends SmackTestCase { // Create a packet collector to listen for a response. PacketCollector collector = connection.createPacketCollector(new PacketIDFilter(version.getStanzaId())); - connection.sendPacket(version); + connection.sendStanza(version); // Wait up to 5 seconds for a result. IQ result = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout()); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/FormTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/FormTest.java index 5ffc06fa9..9a42dc272 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/FormTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/FormTest.java @@ -123,7 +123,7 @@ public class FormTest extends SmackTestCase { // Add the completed form to the message msg2.addExtension(completedForm.getDataFormToSend()); // Send the message with the completed form - getConnection(1).sendPacket(msg2); + getConnection(1).sendStanza(msg2); // Get the message with the completed form Message msg3 = (Message) collector.nextResult(2000); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/GroupChatInvitationTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/GroupChatInvitationTest.java index 89f48278c..6b80247ec 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/GroupChatInvitationTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/GroupChatInvitationTest.java @@ -46,7 +46,7 @@ public class GroupChatInvitationTest extends SmackTestCase { Message message = new Message(getBareJID(1)); message.setBody("Group chat invitation!"); message.addExtension(invitation); - getConnection(0).sendPacket(message); + getConnection(0).sendStanza(message); Thread.sleep(250); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/LastActivityManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/LastActivityManagerTest.java index 274165651..cfb28e128 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/LastActivityManagerTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/LastActivityManagerTest.java @@ -35,7 +35,7 @@ public class LastActivityManagerTest extends SmackTestCase { // Send a message as the last activity action from connection 1 to // connection 0 - conn1.sendPacket(new Message(getBareJID(0))); + conn1.sendStanza(new Message(getBareJID(0))); // Wait 1 seconds to have some idle time try { @@ -70,7 +70,7 @@ public class LastActivityManagerTest extends SmackTestCase { // Send a message as the last activity action from connection 2 to // connection 0 - conn2.sendPacket(new Message(getBareJID(0))); + conn2.sendStanza(new Message(getBareJID(0))); // Wait 1 seconds to have some idle time try { diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java index 04a01e3c1..e99b65cac 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/OfflineMessageManagerTest.java @@ -55,7 +55,7 @@ public class OfflineMessageManagerTest extends SmackTestCase { */ public void testReadAndDelete() { // Make user2 unavailable - getConnection(1).sendPacket(new Presence(Presence.Type.unavailable)); + getConnection(1).sendStanza(new Presence(Presence.Type.unavailable)); try { Thread.sleep(500); @@ -100,7 +100,7 @@ public class OfflineMessageManagerTest extends SmackTestCase { // User2 becomes available again PacketCollector collector = getConnection(1).createPacketCollector( new MessageTypeFilter(Message.Type.chat)); - getConnection(1).sendPacket(new Presence(Presence.Type.available)); + getConnection(1).sendStanza(new Presence(Presence.Type.available)); // Check that no offline messages was sent to the user Message message = (Message) collector.nextResult(2500); @@ -124,7 +124,7 @@ public class OfflineMessageManagerTest extends SmackTestCase { */ public void testFetchAndPurge() { // Make user2 unavailable - getConnection(1).sendPacket(new Presence(Presence.Type.unavailable)); + getConnection(1).sendStanza(new Presence(Presence.Type.unavailable)); try { Thread.sleep(500); @@ -158,7 +158,7 @@ public class OfflineMessageManagerTest extends SmackTestCase { // User2 becomes available again PacketCollector collector = getConnection(1).createPacketCollector( new MessageTypeFilter(Message.Type.chat)); - getConnection(1).sendPacket(new Presence(Presence.Type.available)); + getConnection(1).sendStanza(new Presence(Presence.Type.available)); // Check that no offline messages was sent to the user Message message = (Message) collector.nextResult(2500); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/VersionTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/VersionTest.java index b608179bf..d093a678b 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/VersionTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/VersionTest.java @@ -47,7 +47,7 @@ public class VersionTest extends SmackTestCase { // Create a packet collector to listen for a response. PacketCollector collector = getConnection(0).createPacketCollector(new PacketIDFilter(version.getStanzaId())); - getConnection(0).sendPacket(version); + getConnection(0).sendStanza(version); // Wait up to 5 seconds for a result. IQ result = (IQ)collector.nextResult(5000); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java index 264c0515d..b54867d91 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamTest.java @@ -63,7 +63,7 @@ public class InBandBytestreamTest extends SmackTestCase { PacketCollector collector = initiatorConnection.createPacketCollector(new PacketIDFilter( open.getStanzaId())); - initiatorConnection.sendPacket(open); + initiatorConnection.sendStanza(open); Packet result = collector.nextResult(); assertNotNull(result.getError()); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java index 3e862df7c..fbbed78fa 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ByteStreamTest.java @@ -84,7 +84,7 @@ public class Socks5ByteStreamTest extends SmackTestCase { PacketCollector collector = initiatorConnection.createPacketCollector(new PacketIDFilter( bytestreamInitiation.getStanzaId())); - initiatorConnection.sendPacket(bytestreamInitiation); + initiatorConnection.sendStanza(bytestreamInitiation); Packet result = collector.nextResult(); assertNotNull(result.getError()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java index 944ed181a..bc5822b66 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java @@ -102,7 +102,7 @@ public class MultipleRecipientManager { && StringUtils.isNullOrEmpty(replyTo) && StringUtils.isNullOrEmpty(replyRoom)) { String toJid = to.iterator().next(); packet.setTo(toJid); - connection.sendPacket(packet); + connection.sendStanza(packet); return; } String serviceAddress = getMultipleRecipienServiceAddress(connection); @@ -155,7 +155,7 @@ public class MultipleRecipientManager { if (replyAddress != null && replyAddress.getJid() != null) { // Send reply to the reply_to address reply.setTo(replyAddress.getJid()); - connection.sendPacket(reply); + connection.sendStanza(reply); } else { // Send reply to multiple recipients @@ -203,19 +203,19 @@ public class MultipleRecipientManager { if (to != null) { for (String jid : to) { packet.setTo(jid); - connection.sendPacket(new PacketCopy(packet.toXML())); + connection.sendStanza(new PacketCopy(packet.toXML())); } } if (cc != null) { for (String jid : cc) { packet.setTo(jid); - connection.sendPacket(new PacketCopy(packet.toXML())); + connection.sendStanza(new PacketCopy(packet.toXML())); } } if (bcc != null) { for (String jid : bcc) { packet.setTo(jid); - connection.sendPacket(new PacketCopy(packet.toXML())); + connection.sendStanza(new PacketCopy(packet.toXML())); } } } @@ -258,7 +258,7 @@ public class MultipleRecipientManager { // Add extension to packet packet.addExtension(multipleAddresses); // Send the packet - connection.sendPacket(packet); + connection.sendStanza(packet); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java index bac9992de..ccc3a5f1d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamManager.java @@ -442,7 +442,7 @@ public class InBandBytestreamManager implements BytestreamManager { protected void replyRejectPacket(IQ request) throws NotConnectedException { XMPPError xmppError = new XMPPError(XMPPError.Condition.not_acceptable); IQ error = IQ.createErrorResponse(request, xmppError); - this.connection.sendPacket(error); + this.connection.sendStanza(error); } /** @@ -455,7 +455,7 @@ public class InBandBytestreamManager implements BytestreamManager { protected void replyResourceConstraintPacket(IQ request) throws NotConnectedException { XMPPError xmppError = new XMPPError(XMPPError.Condition.resource_constraint); IQ error = IQ.createErrorResponse(request, xmppError); - this.connection.sendPacket(error); + this.connection.sendStanza(error); } /** @@ -468,7 +468,7 @@ public class InBandBytestreamManager implements BytestreamManager { protected void replyItemNotFoundPacket(IQ request) throws NotConnectedException { XMPPError xmppError = new XMPPError(XMPPError.Condition.item_not_found); IQ error = IQ.createErrorResponse(request, xmppError); - this.connection.sendPacket(error); + this.connection.sendStanza(error); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java index 1e9483e53..53462128c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequest.java @@ -79,7 +79,7 @@ public class InBandBytestreamRequest implements BytestreamRequest { // acknowledge request IQ resultIQ = IQ.createResultIQ(this.byteStreamRequest); - connection.sendPacket(resultIQ); + connection.sendStanza(resultIQ); return ibbSession; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java index a82526ebd..1f197fa4c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSession.java @@ -173,7 +173,7 @@ public class InBandBytestreamSession implements BytestreamSession { // acknowledge close request IQ confirmClose = IQ.createResultIQ(closeRequest); - this.connection.sendPacket(confirmClose); + this.connection.sendStanza(confirmClose); } @@ -457,7 +457,7 @@ public class InBandBytestreamSession implements BytestreamSession { if (data.getSeq() <= this.lastSequence) { IQ unexpectedRequest = IQ.createErrorResponse((IQ) packet, new XMPPError( XMPPError.Condition.unexpected_request)); - connection.sendPacket(unexpectedRequest); + connection.sendStanza(unexpectedRequest); return; } @@ -467,7 +467,7 @@ public class InBandBytestreamSession implements BytestreamSession { // data is invalid; respond with bad-request error IQ badRequest = IQ.createErrorResponse((IQ) packet, new XMPPError( XMPPError.Condition.bad_request)); - connection.sendPacket(badRequest); + connection.sendStanza(badRequest); return; } @@ -476,7 +476,7 @@ public class InBandBytestreamSession implements BytestreamSession { // confirm IQ IQ confirmData = IQ.createResultIQ((IQ) packet); - connection.sendPacket(confirmData); + connection.sendStanza(confirmData); // set last seen sequence this.lastSequence = data.getSeq(); @@ -808,7 +808,7 @@ public class InBandBytestreamSession implements BytestreamSession { Message message = new Message(remoteJID); message.addExtension(data); - connection.sendPacket(message); + connection.sendStanza(message); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java index eac999397..149a3fc12 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamManager.java @@ -704,7 +704,7 @@ public final class Socks5BytestreamManager implements BytestreamManager { protected void replyRejectPacket(IQ packet) throws NotConnectedException { XMPPError xmppError = new XMPPError(XMPPError.Condition.not_acceptable); IQ errorIQ = IQ.createErrorResponse(packet, xmppError); - this.connection.sendPacket(errorIQ); + this.connection.sendStanza(errorIQ); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java index 28fb19c8b..c2d751cbb 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5BytestreamRequest.java @@ -257,7 +257,7 @@ public class Socks5BytestreamRequest implements BytestreamRequest { // send used-host confirmation Bytestream response = createUsedHostResponse(selectedHost); - this.manager.getConnection().sendPacket(response); + this.manager.getConnection().sendStanza(response); return new Socks5BytestreamSession(socket, selectedHost.getJID().equals( this.bytestreamRequest.getFrom())); @@ -282,7 +282,7 @@ public class Socks5BytestreamRequest implements BytestreamRequest { String errorMessage = "Could not establish socket with any provided host"; XMPPError error = XMPPError.from(XMPPError.Condition.item_not_found, errorMessage); IQ errorIQ = IQ.createErrorResponse(this.bytestreamRequest, error); - this.manager.getConnection().sendPacket(errorIQ); + this.manager.getConnection().sendStanza(errorIQ); throw new XMPPErrorException(errorMessage, error); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java index dcad233c4..75ffbf6f4 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java @@ -505,7 +505,7 @@ public class EntityCapsManager extends Manager { if (connection != null && connection.isAuthenticated() && presenceSend) { Presence presence = new Presence(Presence.Type.available); try { - connection.sendPacket(presence); + connection.sendStanza(presence); } catch (NotConnectedException e) { LOGGER.log(Level.WARNING, "Could could not update presence with caps info", e); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java index 47d80dc5a..45df2da7a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferManager.java @@ -173,6 +173,6 @@ public class FileTransferManager extends Manager { // Socks5BytestreamManager.replyRejectPacket(IQ). IQ rejection = IQ.createErrorResponse(initiation, new XMPPError( XMPPError.Condition.forbidden)); - connection().sendPacket(rejection); + connection().sendStanza(rejection); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java index 04dd26485..1be561969 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiator.java @@ -192,7 +192,7 @@ public class FileTransferNegotiator extends Manager { String errorMessage = "No stream methods contained in stanza."; XMPPError error = XMPPError.from(XMPPError.Condition.bad_request, errorMessage); IQ iqPacket = IQ.createErrorResponse(si, error); - connection().sendPacket(iqPacket); + connection().sendStanza(iqPacket); throw new FileTransferException.NoStreamMethodsOfferedException(); } @@ -203,7 +203,7 @@ public class FileTransferNegotiator extends Manager { } catch (NoAcceptableTransferMechanisms e) { IQ iqPacket = IQ.createErrorResponse(si, XMPPError.from(XMPPError.Condition.bad_request, "No acceptable transfer mechanism")); - connection().sendPacket(iqPacket); + connection().sendStanza(iqPacket); throw e; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java index 5b42ca15a..57b07e515 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/filetransfer/StreamNegotiator.java @@ -98,7 +98,7 @@ public abstract class StreamNegotiator { streamMethodInitiation = initationSetEvents.performActionAndWaitForEvent(eventKey, connection.getPacketReplyTimeout(), new Callback() { @Override public void action() throws NotConnectedException { - connection.sendPacket(response); + connection.sendStanza(response); } }); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java index b85bc6d68..b3b48c0ad 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChat.java @@ -518,7 +518,7 @@ public class MultiUserChat { // field is in the form "roomName@service/nickname" Presence leavePresence = new Presence(Presence.Type.unavailable); leavePresence.setTo(room + "/" + nickname); - connection.sendPacket(leavePresence); + connection.sendStanza(leavePresence); // Reset occupant information. occupantsMap.clear(); nickname = null; @@ -689,7 +689,7 @@ public class MultiUserChat { // Add the MUCUser packet that includes the invitation to the message message.addExtension(mucUser); - connection.sendPacket(message); + connection.sendStanza(message); } /** @@ -892,7 +892,7 @@ public class MultiUserChat { joinPresence.setTo(room + "/" + nickname); // Send join packet. - connection.sendPacket(joinPresence); + connection.sendStanza(joinPresence); } /** @@ -939,7 +939,7 @@ public class MultiUserChat { form.addField(requestVoiceField); Message message = new Message(room); message.addExtension(form); - connection.sendPacket(message); + connection.sendStanza(message); } /** @@ -1575,7 +1575,7 @@ public class MultiUserChat { public void sendMessage(String text) throws XMPPException, NotConnectedException { Message message = createMessage(); message.setBody(text); - connection.sendPacket(message); + connection.sendStanza(message); } /** @@ -1612,7 +1612,7 @@ public class MultiUserChat { public void sendMessage(Message message) throws XMPPException, NotConnectedException { message.setTo(room); message.setType(Message.Type.groupchat); - connection.sendPacket(message); + connection.sendStanza(message); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java index 0be189da4..e6512f7b0 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java @@ -284,7 +284,7 @@ public class MultiUserChatManager extends Manager { // Add the MUCUser packet that includes the rejection message.addExtension(mucUser); - connection().sendPacket(message); + connection().sendStanza(message); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java index 59d0e7ba6..cfd14f3b3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java @@ -36,7 +36,7 @@ import org.xmlpull.v1.XmlPullParserException; * Message message = new Message("user@chat.example.com"); * message.setBody("Join me for a group chat!"); * message.addExtension(new GroupChatInvitation("room@chat.example.com");); - * con.sendPacket(message); + * con.sendStanza(message); * * * To listen for group chat invitations, use a StanzaExtensionFilter for the diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java index 0d0e7035b..544764cc7 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pep/PEPManager.java @@ -115,7 +115,7 @@ public class PEPManager { //pubSub.setFrom(connection.getUser()); // Send the message that contains the roster - connection.sendPacket(pubSub); + connection.sendStanza(pubSub); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java index cf3b98ff5..c89dae1df 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/LeafNode.java @@ -211,7 +211,7 @@ public class LeafNode extends Node { PubSub packet = createPubsubPacket(Type.set, new NodeExtension(PubSubElementType.PUBLISH, getId())); - con.sendPacket(packet); + con.sendStanza(packet); } /** @@ -256,7 +256,7 @@ public class LeafNode extends Node { PubSub packet = createPubsubPacket(Type.set, new PublishItem(getId(), items)); - con.sendPacket(packet); + con.sendStanza(packet); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java index 3e0531ffc..909941a35 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/receipts/DeliveryReceiptManager.java @@ -56,7 +56,7 @@ import org.jivesoftware.smackx.disco.ServiceDiscoveryManager; * }); * Message message = … * DeliveryReceiptRequest.addTo(message); - * connection.sendPacket(message); + * connection.sendStanza(message); * * * DeliveryReceiptManager can be configured to automatically add delivery receipt requests to every @@ -158,7 +158,7 @@ public class DeliveryReceiptManager extends Manager { final Message messageWithReceiptRequest = (Message) packet; Message ack = receiptMessageFor(messageWithReceiptRequest); - connection.sendPacket(ack); + connection.sendStanza(ack); } }, MESSAGES_WITH_DEVLIERY_RECEIPT_REQUEST); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java index 0430124bf..3f3fb1847 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/CloseListenerTest.java @@ -68,7 +68,7 @@ public class CloseListenerTest { // capture reply to the In-Band Bytestream close request ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct error packet assertEquals(initiatorJID, argument.getValue().getTo()); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java index 93d8e5209..43382d73c 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/DataListenerTest.java @@ -70,7 +70,7 @@ public class DataListenerTest { // capture reply to the In-Band Bytestream close request ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct error packet assertEquals(initiatorJID, argument.getValue().getTo()); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java index 057549a2c..cbf7bb39f 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamRequestTest.java @@ -78,7 +78,7 @@ public class InBandBytestreamRequestTest { // capture reply to the In-Band Bytestream open request ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct error packet assertEquals(initiatorJID, argument.getValue().getTo()); @@ -103,7 +103,7 @@ public class InBandBytestreamRequestTest { // capture reply to the In-Band Bytestream open request ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct acknowledgment packet assertEquals(initiatorJID, argument.getValue().getTo()); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java index 5f57d089b..e1c7bea4a 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InitiationListenerTest.java @@ -86,7 +86,7 @@ public class InitiationListenerTest { // capture reply to the In-Band Bytestream open request ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct error packet assertEquals(initiatorJID, argument.getValue().getTo()); @@ -114,7 +114,7 @@ public class InitiationListenerTest { // capture reply to the In-Band Bytestream open request ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct error packet assertEquals(initiatorJID, argument.getValue().getTo()); @@ -204,7 +204,7 @@ public class InitiationListenerTest { // capture reply to the In-Band Bytestream open request ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct error packet assertEquals(initiatorJID, argument.getValue().getTo()); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java index 9475fe287..de0cc4ae2 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/socks5/InitiationListenerTest.java @@ -93,7 +93,7 @@ public class InitiationListenerTest { // capture reply to the SOCKS5 Bytestream initiation ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct error packet assertEquals(initiatorJID, argument.getValue().getTo()); @@ -183,7 +183,7 @@ public class InitiationListenerTest { // capture reply to the SOCKS5 Bytestream initiation ArgumentCaptor argument = ArgumentCaptor.forClass(IQ.class); - verify(connection).sendPacket(argument.capture()); + verify(connection).sendStanza(argument.capture()); // assert that reply is the correct error packet assertEquals(initiatorJID, argument.getValue().getTo()); diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java index edd85e959..9dd870445 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java +++ b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java @@ -53,7 +53,7 @@ public class ConnectionUtils { * 

      * 
      *   PacketCollector collector = connection.createPacketCollector(new PacketFilter());
-     *   connection.sendPacket(packet);
+     *   connection.sendStanza(packet);
      *   Packet reply = collector.nextResult();
      * 
      *
@@ -95,7 +95,7 @@ public class ConnectionUtils { return null; } }; - doAnswer(addIncoming).when(connection).sendPacket(isA(Stanza.class)); + doAnswer(addIncoming).when(connection).sendStanza(isA(Stanza.class)); // mock receive methods Answer answer = new Answer() { diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java index 75acff249..c96fd215e 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java +++ b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java @@ -52,7 +52,7 @@ import org.jivesoftware.smack.packet.Stanza; * public void methodToTest() { * Packet packet = new Packet(); // create an XMPP packet * PacketCollector collector = connection.createPacketCollector(new StanzaIdFilter()); - * connection.sendPacket(packet); + * connection.sendStanza(packet); * Packet reply = collector.nextResult(); * } * diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java index b34fafa64..102b73276 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java @@ -362,7 +362,7 @@ public class ChatManager extends Manager{ if (message.getFrom() == null) { message.setFrom(connection().getUser()); } - connection().sendPacket(message); + connection().sendStanza(message); } PacketCollector createPacketCollector(Chat chat) { diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java index 6de3f540f..496fcae4e 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/Roster.java @@ -483,7 +483,7 @@ public class Roster extends Manager { // Create a presence subscription packet and send. Presence presencePacket = new Presence(Presence.Type.subscribe); presencePacket.setTo(user); - connection.sendPacket(presencePacket); + connection.sendStanza(presencePacket); } /** @@ -1242,7 +1242,7 @@ public class Roster extends Manager { } if (response != null) { response.setTo(presence.getFrom()); - connection.sendPacket(response); + connection.sendStanza(response); } break; case unsubscribe: @@ -1252,7 +1252,7 @@ public class Roster extends Manager { // has unsubscribed to our presence. response = new Presence(Presence.Type.unsubscribed); response.setTo(presence.getFrom()); - connection.sendPacket(response); + connection.sendStanza(response); } // Otherwise, in manual mode so ignore. break; diff --git a/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java index c2632b833..bf795a2d5 100644 --- a/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java +++ b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleManagerTest.java @@ -175,7 +175,7 @@ public class JingleManagerTest extends SmackTestCase { iqSent.setType(IQ.Type.set); System.out.println("Sending packet and waiting... "); - getConnection(1).sendPacket(iqSent); + getConnection(1).sendStanza(iqSent); try { Thread.sleep(10000); } catch (InterruptedException e) { diff --git a/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java index 4b12a785b..147fda5fb 100644 --- a/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java +++ b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/JingleMediaTest.java @@ -368,7 +368,7 @@ public class JingleMediaTest extends SmackTestCase { Thread.sleep(20000); //js0.sendFormattedError(JingleError.UNSUPPORTED_TRANSPORTS); - js0.sendPacket(js0.createJingleError(null, JingleError.UNSUPPORTED_TRANSPORTS)); + js0.sendStanza(js0.createJingleError(null, JingleError.UNSUPPORTED_TRANSPORTS)); Thread.sleep(20000); diff --git a/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java index bfc187e18..72cef16c7 100644 --- a/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java +++ b/smack-jingle-old/src/integration-test/java/org/jivesoftware/smackx/jingle/provider/JingleProviderTest.java @@ -75,7 +75,7 @@ public class JingleProviderTest extends SmackTestCase { System.out.println("Testing if a Jingle IQ can be sent and received..."); // Send the iq packet with an invalid namespace - getConnection(0).sendPacket(iqSent); + getConnection(0).sendStanza(iqSent); // Receive the packet IQ iqReceived = (IQ)collector.nextResult(SmackConfiguration.getPacketReplyTimeout()); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java index 51a330bbd..5b1893b12 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java @@ -325,12 +325,12 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList // // If the response is anything other than a RESULT then send it now. // if ((response != null) && (!response.getType().equals(IQ.Type.result))) { - // getConnection().sendPacket(response); + // getConnection().sendStanza(response); // } // Loop through all of the responses and send them. for (IQ response : responses) { - sendPacket(response); + sendStanza(response); } } @@ -397,7 +397,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList // Send section // ---------------------------------------------------------------------------------------------------------- - public void sendPacket(IQ iq) throws NotConnectedException { + public void sendStanza(IQ iq) throws NotConnectedException { if (iq instanceof Jingle) { @@ -405,7 +405,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList } else { - getConnection().sendPacket(iq); + getConnection().sendStanza(iq); } } @@ -467,7 +467,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList // The the packet. if ((getConnection() != null) && (getConnection().isConnected())) - getConnection().sendPacket(jout); + getConnection().sendStanza(jout); } return jout; } @@ -483,7 +483,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList // updatePacketListener(); // // // Send the actual packet. - // sendPacket(inJingle); + // sendStanza(inJingle); // // // Change to the PENDING state. // setSessionState(JingleSessionStateEnum.PENDING); @@ -507,7 +507,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList IQ ack = IQ.createResultIQ(iq); // No! Don't send it. Let it flow to the normal way IQ results get processed and sent. - // getConnection().sendPacket(ack); + // getConnection().sendStanza(ack); result = ack; } } @@ -518,7 +518,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList * Send a content info message. */ // public synchronized void sendContentInfo(ContentInfo ci) { - // sendPacket(new Jingle(new JingleContentInfo(ci))); + // sendStanza(new Jingle(new JingleContentInfo(ci))); // } /* * (non-Javadoc) @@ -806,7 +806,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList } // Send the "accept" and wait for the ACK addExpectedId(jout.getStanzaId()); - sendPacket(jout); + sendStanza(jout); //triggerSessionEstablished(); @@ -838,7 +838,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList } // Send the "accept" and wait for the ACK addExpectedId(jout.getStanzaId()); - sendPacket(jout); + sendStanza(jout); } } } @@ -974,7 +974,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList LOGGER.fine("Terminate " + reason); Jingle jout = new Jingle(JingleActionEnum.SESSION_TERMINATE); jout.setType(IQ.Type.set); - sendPacket(jout); + sendStanza(jout); triggerSessionClosed(reason); } @@ -1035,7 +1035,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList // errorPacket.addExtension(jingleError); // NO! Let the normal state machinery do all of the sending. - // getConnection().sendPacket(perror); + // getConnection().sendStanza(perror); LOGGER.severe("Error sent: " + errorPacket.toXML()); } return errorPacket; @@ -1094,7 +1094,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList // Save the session-initiate packet ID, so that we can respond to it. sessionInitPacketID = jingle.getStanzaId(); - sendPacket(jingle); + sendStanza(jingle); // Now setup to track the media negotiators, so that we know when (if) to send a session-accept. setupListeners(); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java index 43244ac7e..e451702b4 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/TransportCandidate.java @@ -613,7 +613,7 @@ public abstract class TransportCandidate { String id = null; byte[] send = null; byte[] receive = null; - DatagramPacket sendPacket = null; + DatagramPacket sendStanza = null; List listeners = new ArrayList(); List resultListeners = new ArrayList(); boolean enabled = true; diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java index 3b04023c0..f04510b4e 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java @@ -82,7 +82,7 @@ public class AgentRoster { // Send request for roster. AgentStatusRequest request = new AgentStatusRequest(); request.setTo(workgroupJID); - connection.sendPacket(request); + connection.sendStanza(request); } /** @@ -94,7 +94,7 @@ public class AgentRoster { public void reload() throws NotConnectedException { AgentStatusRequest request = new AgentStatusRequest(); request.setTo(workgroupJID); - connection.sendPacket(request); + connection.sendStanza(request); } /** diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java index baf424c32..0492740ce 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java @@ -318,7 +318,7 @@ public class AgentSession { presence.setTo(workgroupJID); presence.addExtension(new DefaultExtensionElement(AgentStatus.ELEMENT_NAME, AgentStatus.NAMESPACE)); - connection.sendPacket(presence); + connection.sendStanza(presence); } } @@ -465,7 +465,7 @@ public class AgentSession { DepartQueuePacket departPacket = new DepartQueuePacket(this.workgroupJID); // PENDING - this.connection.sendPacket(departPacket); + this.connection.sendStanza(departPacket); } /** @@ -693,7 +693,7 @@ public class AgentSession { if (packet instanceof OfferRequestProvider.OfferRequestPacket) { // Acknowledge the IQ set. IQ reply = IQ.createResultIQ((IQ) packet); - connection.sendPacket(reply); + connection.sendStanza(reply); fireOfferRequestEvent((OfferRequestProvider.OfferRequestPacket)packet); } @@ -782,7 +782,7 @@ public class AgentSession { else if (packet instanceof OfferRevokeProvider.OfferRevokePacket) { // Acknowledge the IQ set. IQ reply = IQ.createResultIQ((OfferRevokeProvider.OfferRevokePacket) packet); - connection.sendPacket(reply); + connection.sendStanza(reply); fireOfferRevokeEvent((OfferRevokeProvider.OfferRevokePacket)packet); } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java index 374de974e..3092324d5 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Offer.java @@ -84,7 +84,7 @@ public class Offer { */ public void accept() throws NotConnectedException { Stanza acceptPacket = new AcceptPacket(this.session.getWorkgroupJID()); - connection.sendPacket(acceptPacket); + connection.sendStanza(acceptPacket); // TODO: listen for a reply. accepted = true; } @@ -95,7 +95,7 @@ public class Offer { */ public void reject() throws NotConnectedException { RejectPacket rejectPacket = new RejectPacket(this.session.getWorkgroupJID()); - connection.sendPacket(rejectPacket); + connection.sendStanza(rejectPacket); // TODO: listen for a reply. rejected = true; } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java index 7cb0d7198..4f65ec6fc 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java @@ -55,7 +55,7 @@ public class OfferConfirmation extends SimpleIQ { public void notifyService(XMPPConnection con, String workgroup, String createdRoomName) throws NotConnectedException { NotifyServicePacket packet = new NotifyServicePacket(workgroup, createdRoomName); - con.sendPacket(packet); + con.sendStanza(packet); } public static class Provider extends IQProvider { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java index dbfda2b5b..3b525534e 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java @@ -218,7 +218,7 @@ public class MessageEventManager extends Manager { messageEvent.setStanzaId(packetID); msg.addExtension(messageEvent); // Send the packet - connection().sendPacket(msg); + connection().sendStanza(msg); } /** @@ -237,7 +237,7 @@ public class MessageEventManager extends Manager { messageEvent.setStanzaId(packetID); msg.addExtension(messageEvent); // Send the packet - connection().sendPacket(msg); + connection().sendStanza(msg); } /** @@ -256,7 +256,7 @@ public class MessageEventManager extends Manager { messageEvent.setStanzaId(packetID); msg.addExtension(messageEvent); // Send the packet - connection().sendPacket(msg); + connection().sendStanza(msg); } /** @@ -275,6 +275,6 @@ public class MessageEventManager extends Manager { messageEvent.setStanzaId(packetID); msg.addExtension(messageEvent); // Send the packet - connection().sendPacket(msg); + connection().sendStanza(msg); } } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java index a8988238e..547c3f3fd 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java @@ -125,7 +125,7 @@ public class RosterExchangeManager { XMPPConnection connection = weakRefConnection.get(); // Send the message that contains the roster - connection.sendPacket(msg); + connection.sendStanza(msg); } /** @@ -145,7 +145,7 @@ public class RosterExchangeManager { XMPPConnection connection = weakRefConnection.get(); // Send the message that contains the roster - connection.sendPacket(msg); + connection.sendStanza(msg); } /** @@ -168,7 +168,7 @@ public class RosterExchangeManager { XMPPConnection connection = weakRefConnection.get(); // Send the message that contains the roster - connection.sendPacket(msg); + connection.sendStanza(msg); } /** diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java index fac6ecdc6..b95b16132 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java @@ -421,7 +421,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { } // (Re-)send the stanzas *after* we tried to enable SM for (Stanza stanza : previouslyUnackedStanzas) { - sendPacketInternal(stanza); + sendStanzaInternal(stanza); } afterSuccessfulLogin(false); @@ -508,7 +508,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { setWasAuthenticated(); // If we are able to resume the stream, then don't set // connected/authenticated/usingTLS to false since we like behave like we are still - // connected (e.g. sendPacket should not throw a NotConnectedException). + // connected (e.g. sendStanza should not throw a NotConnectedException). if (isSmResumptionPossible() && instant) { disconnectedButResumeable = true; } else { @@ -536,7 +536,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { } @Override - protected void sendPacketInternal(Stanza packet) throws NotConnectedException { + protected void sendStanzaInternal(Stanza packet) throws NotConnectedException { packetWriter.sendStreamElement(packet); if (isSmEnabled()) { for (StanzaFilter requestAckPredicate : requestAckPredicates) { @@ -1342,8 +1342,8 @@ public class XMPPTCPConnection extends AbstractXMPPConnection { unacknowledgedStanzas = new ArrayBlockingQueue<>(QUEUE_SIZE); } // Check if the stream element should be put to the unacknowledgedStanza - // queue. Note that we can not do the put() in sendPacketInternal() and the - // packet order is not stable at this point (sendPacketInternal() can be + // queue. Note that we can not do the put() in sendStanzaInternal() and the + // packet order is not stable at this point (sendStanzaInternal() can be // called concurrently). if (unacknowledgedStanzas != null && packet != null) { // If the unacknowledgedStanza queue is nearly full, request an new ack diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java index 338c713e2..5b501b634 100644 --- a/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java +++ b/smack-tcp/src/test/java/org/jivesoftware/smack/tcp/PacketWriterTest.java @@ -35,7 +35,7 @@ public class PacketWriterTest { /** * Make sure that packet writer does block once the queue reaches * {@link PacketWriter#QUEUE_SIZE} and that - * {@link PacketWriter#sendPacket(org.jivesoftware.smack.tcp.packet.Packet)} does unblock after the + * {@link PacketWriter#sendStanza(org.jivesoftware.smack.tcp.packet.Packet)} does unblock after the * interrupt. * * @throws InterruptedException @@ -84,7 +84,7 @@ public class PacketWriterTest { // will block before we call shutdown. Otherwise we may get false positives (which is still // better then false negatives). barrier.await(); - // Not really cool, but may increases the chances for 't' to block in sendPacket. + // Not really cool, but may increases the chances for 't' to block in sendStanza. Thread.sleep(250); // Set to true for testing purposes, so that shutdown() won't wait packet writer