From 90a5e289f83d9b075910091a913804e8071340d7 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Tue, 3 Jan 2017 11:12:34 +0100 Subject: [PATCH] s/processPacket/processStanza/ s/PacketCollector/StanzaCollector/ --- documentation/extensions/hoxt.md | 2 +- documentation/extensions/xhtml.md | 4 +- documentation/processing.md | 8 +-- .../org/jivesoftware/smack/FloodTest.java | 6 +- .../java/org/jivesoftware/smack/IQTest.java | 4 +- .../org/jivesoftware/smack/MessageTest.java | 26 ++++---- .../jivesoftware/smack/PacketReaderTest.java | 12 ++-- .../smack/AbstractXMPPConnection.java | 62 +++++++++---------- .../smack/SmackConfiguration.java | 4 +- .../jivesoftware/smack/SmackException.java | 2 +- ...ketCollector.java => StanzaCollector.java} | 28 ++++----- .../jivesoftware/smack/StanzaListener.java | 6 +- .../jivesoftware/smack/XMPPConnection.java | 24 +++---- .../smack/debugger/AbstractDebugger.java | 2 +- .../smack/filter/PacketFilter.java | 4 +- .../smack/filter/StanzaFilter.java | 4 +- .../smack/filter/package-info.java | 2 +- .../jivesoftware/smack/DummyConnection.java | 2 +- ...ctorTest.java => StanzaCollectorTest.java} | 18 +++--- .../test/util/WaitForPacketListener.java | 2 +- .../slf4j/SLF4JLoggingPacketListener.java | 2 +- .../smackx/debugger/EnhancedDebugger.java | 4 +- .../smackx/debugger/LiteDebugger.java | 2 +- .../smackx/carbons/CarbonManager.java | 4 +- .../smackx/iot/control/IoTControlManager.java | 2 +- .../smackx/iot/data/IoTDataManager.java | 10 +-- .../iot/discovery/IoTDiscoveryManager.java | 10 +-- .../provisioning/IoTProvisioningManager.java | 6 +- .../jivesoftware/smackx/mam/MamManager.java | 12 ++-- .../smackx/muclight/MultiUserChatLight.java | 28 ++++----- .../muclight/MultiUserChatLightManager.java | 10 +-- .../PushNotificationsManager.java | 2 +- .../jivesoftware/smackx/CompressionTest.java | 2 +- .../org/jivesoftware/smackx/FormTest.java | 6 +- .../smackx/GroupChatInvitationTest.java | 4 +- .../smackx/MultipleRecipientManagerTest.java | 42 ++++++------- .../smackx/OfflineMessageManagerTest.java | 6 +- .../jivesoftware/smackx/XHTMLManagerTest.java | 4 +- .../bytestreams/ibb/InBandBytestreamTest.java | 4 +- .../socks5/Socks5ByteStreamTest.java | 4 +- .../smackx/muc/MultiUserChatTest.java | 4 +- .../smackx/packet/MessageEventTest.java | 2 +- .../smackx/packet/RosterExchangeTest.java | 4 +- .../smackx/packet/XHTMLExtensionTest.java | 8 +-- .../blocking/BlockingCommandManager.java | 8 +-- .../jivesoftware/smackx/bob/BoBManager.java | 2 +- .../ibb/InBandBytestreamManager.java | 2 +- .../ibb/InBandBytestreamSession.java | 10 +-- .../socks5/Socks5BytestreamManager.java | 4 +- .../socks5/Socks5ClientForInitiator.java | 2 +- .../smackx/caps/EntityCapsManager.java | 6 +- .../smackx/commands/RemoteCommand.java | 2 +- .../smackx/disco/ServiceDiscoveryManager.java | 6 +- .../filetransfer/FileTransferNegotiator.java | 2 +- .../smackx/iqlast/LastActivityManager.java | 6 +- .../smackx/iqprivate/PrivateDataManager.java | 4 +- .../smackx/iqregister/AccountManager.java | 14 ++--- .../smackx/iqversion/VersionManager.java | 2 +- .../smackx/muc/MultiUserChat.java | 46 +++++++------- .../smackx/muc/MultiUserChatManager.java | 2 +- .../smackx/offline/OfflineMessageManager.java | 16 ++--- .../jivesoftware/smackx/pep/PEPManager.java | 2 +- .../jivesoftware/smackx/ping/PingManager.java | 2 +- .../smackx/privacy/PrivacyListManager.java | 14 ++--- .../jivesoftware/smackx/pubsub/LeafNode.java | 12 ++-- .../org/jivesoftware/smackx/pubsub/Node.java | 10 +-- .../smackx/pubsub/PubSubManager.java | 6 +- .../receipts/DeliveryReceiptManager.java | 6 +- .../smackx/search/UserSearch.java | 6 +- .../sharedgroups/SharedGroupManager.java | 2 +- .../smackx/time/EntityTimeManager.java | 2 +- .../smackx/vcardtemp/VCardManager.java | 4 +- .../InBandBytestreamSessionMessageTest.java | 6 +- .../ibb/InBandBytestreamSessionTest.java | 20 +++--- .../jivesoftware/util/ConnectionUtils.java | 16 ++--- .../java/org/jivesoftware/util/Protocol.java | 2 +- .../org/jivesoftware/smack/chat/Chat.java | 12 ++-- .../jivesoftware/smack/chat/ChatManager.java | 8 +-- .../org/jivesoftware/smack/roster/Roster.java | 16 ++--- .../smack/roster/RosterEntry.java | 2 +- .../smack/roster/RosterGroup.java | 6 +- .../smack/inttest/AbstractSmackIntTest.java | 6 +- .../java/org/jivesoftware/smack/ChatTest.java | 2 +- .../smack/StreamManagementTest.java | 4 +- .../smackx/caps/EntityCapsTest.java | 2 +- .../smackx/jingle/JingleManagerTest.java | 2 +- .../jingle/provider/JingleProviderTest.java | 4 +- .../smackx/jingleold/JingleManager.java | 2 +- .../smackx/jingleold/JingleSession.java | 2 +- .../smackx/jingleold/nat/RTPBridge.java | 8 +-- .../smackx/jingleold/nat/STUN.java | 4 +- .../smackx/workgroup/agent/Agent.java | 6 +- .../smackx/workgroup/agent/AgentRoster.java | 4 +- .../smackx/workgroup/agent/AgentSession.java | 36 +++++------ .../workgroup/agent/TranscriptManager.java | 4 +- .../agent/TranscriptSearchManager.java | 4 +- .../smackx/workgroup/user/Workgroup.java | 22 +++---- .../smackx/xevent/MessageEventManager.java | 2 +- .../smackx/xroster/RosterExchangeManager.java | 2 +- .../smack/tcp/XMPPTCPConnection.java | 4 +- 100 files changed, 406 insertions(+), 406 deletions(-) rename smack-core/src/main/java/org/jivesoftware/smack/{PacketCollector.java => StanzaCollector.java} (93%) rename smack-core/src/test/java/org/jivesoftware/smack/{PacketCollectorTest.java => StanzaCollectorTest.java} (91%) diff --git a/documentation/extensions/hoxt.md b/documentation/extensions/hoxt.md index a1d79066a..d8f39c1f6 100644 --- a/documentation/extensions/hoxt.md +++ b/documentation/extensions/hoxt.md @@ -89,7 +89,7 @@ req.setTo("juliet@capulet.com/balcony"); // send it connection.sendIqWithResponseCallback(req, new PacketListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza iq) { HttpOverXmppResp resp = (HttpOverXmppResp) iq; // check HTTP response code if (resp.getStatusCode() == 200) { diff --git a/documentation/extensions/xhtml.md b/documentation/extensions/xhtml.md index d98fd5063..62580bd97 100644 --- a/documentation/extensions/xhtml.md +++ b/documentation/extensions/xhtml.md @@ -143,8 +143,8 @@ XHTML bodies of any received message. ``` // Create a listener for the chat and display any XHTML content PacketListener packetListener = new PacketListener() { -public void processPacket(Stanza packet) { - Message message = (Message) packet; +public void processStanza(Stanza stanza) { + Message message = (Message) stanza; // Obtain the XHTML bodies of the message List bodies = XHTMLManager.getBodies(message); if (bodies != null) { diff --git a/documentation/processing.md b/documentation/processing.md index 868b88d4c..5688590e1 100644 --- a/documentation/processing.md +++ b/documentation/processing.md @@ -29,13 +29,13 @@ PacketCollector myCollector = connection.createPacketCollector(filter); // Normally, you'd do something with the collector, like wait for new packets. // Next, create a packet listener. We use an anonymous inner class for brevity. -PacketListener myListener = new PacketListener() { - **public** **void** processPacket(Packet packet) { - // Do something with the incoming packet here._ +StanzaListener myListener = new StanzaListener() { + **public** **void** processStanza(Stanza stanza) { + // Do something with the incoming stanza here._ } }; // Register the listener._ -connection.addPacketListener(myListener, filter); +connection.addStanzaListener(myListener, filter); ``` Standard Stanza Filters diff --git a/smack-core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java b/smack-core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java index 1740e6d8b..d6234b53d 100644 --- a/smack-core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java +++ b/smack-core/src/integration-test/java/org/jivesoftware/smack/FloodTest.java @@ -34,15 +34,15 @@ public class FloodTest extends SmackTestCase { public void testMessageFlood() { try { Chat chat11 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - PacketCollector chat12 = getConnection(1).createPacketCollector( + StanzaCollector chat12 = getConnection(1).createStanzaCollector( new ThreadFilter(chat11.getThreadID())); Chat chat21 = getConnection(0).getChatManager().createChat(getBareJID(2), null); - PacketCollector chat22 = getConnection(2).createPacketCollector( + StanzaCollector chat22 = getConnection(2).createStanzaCollector( new ThreadFilter(chat21.getThreadID())); Chat chat31 = getConnection(0).getChatManager().createChat(getBareJID(3), null); - PacketCollector chat32 = getConnection(3).createPacketCollector( + StanzaCollector chat32 = getConnection(3).createStanzaCollector( new ThreadFilter(chat31.getThreadID())); for (int i=0; i<500; i++) { 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 e626dc04d..6b9ca12f6 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 @@ -52,7 +52,7 @@ public class IQTest extends SmackTestCase { PacketFilter filter = new AndFilter(new PacketIDFilter(iq.getStanzaId()), new StanzaTypeFilter(IQ.class)); - PacketCollector collector = getConnection(0).createPacketCollector(filter); + StanzaCollector collector = getConnection(0).createStanzaCollector(filter); // Send the iq packet with an invalid namespace getConnection(0).sendStanza(iq); @@ -82,7 +82,7 @@ public class IQTest extends SmackTestCase { versionRequest.setTo(getBareJID(0) + "/Something"); // Create a packet collector to listen for a response. - PacketCollector collector = getConnection(0).createPacketCollector( + StanzaCollector collector = getConnection(0).createStanzaCollector( new PacketIDFilter(versionRequest.getStanzaId())); getConnection(0).sendStanza(versionRequest); 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 bb03e58d4..39406c92d 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 @@ -48,8 +48,8 @@ public class MessageTest extends SmackTestCase { presence.setTo(getBareJID(1)); getConnection(0).sendStanza(presence); - PacketCollector collector = getConnection(0) - .createPacketCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector collector = getConnection(0) + .createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); try { getConnection(1).getChatManager().createChat(getBareJID(0), null).sendMessage("Test 1"); } @@ -77,7 +77,7 @@ public class MessageTest extends SmackTestCase { // User1 sends some messages to User2 which is not available at the moment Chat chat = getConnection(0).getChatManager().createChat(getBareJID(1), null); - PacketCollector collector = getConnection(1).createPacketCollector( + StanzaCollector collector = getConnection(1).createStanzaCollector( new MessageTypeFilter(Message.Type.chat)); chat.sendMessage("Test 1"); chat.sendMessage("Test 2"); @@ -119,7 +119,7 @@ public class MessageTest extends SmackTestCase { // User1 sends some messages to User2 which is not available at the moment Chat chat = getConnection(0).getChatManager().createChat(getBareJID(1), null); - PacketCollector collector = getConnection(1).createPacketCollector( + StanzaCollector collector = getConnection(1).createStanzaCollector( new MessageTypeFilter(Message.Type.chat)); chat.sendMessage("Test \f 1"); chat.sendMessage("Test \r 1"); @@ -153,7 +153,7 @@ public class MessageTest extends SmackTestCase { 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( + StanzaCollector collector = getConnection(1).createStanzaCollector( new MessageTypeFilter(Message.Type.chat)); // Create message with a body of 4K characters @@ -210,8 +210,8 @@ public class MessageTest extends SmackTestCase { Thread.sleep(200); // User0 listen in both connected clients - PacketCollector collector = getConnection(0).createPacketCollector(new MessageTypeFilter(Message.Type.chat)); - PacketCollector coll3 = conn3.createPacketCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector collector = getConnection(0).createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector coll3 = conn3.createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); // User1 sends a message to the bare JID of User0 Chat chat = getConnection(1).getChatManager().createChat(getBareJID(0), null); @@ -259,8 +259,8 @@ public class MessageTest extends SmackTestCase { Thread.sleep(200); // User0 listen in both connected clients - PacketCollector collector = getConnection(0).createPacketCollector(new MessageTypeFilter(Message.Type.chat)); - PacketCollector coll3 = conn3.createPacketCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector collector = getConnection(0).createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector coll3 = conn3.createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); // User1 sends a message to the bare JID of User0 Chat chat = getConnection(1).getChatManager().createChat(getBareJID(0), null); @@ -321,9 +321,9 @@ public class MessageTest extends SmackTestCase { Thread.sleep(200); // User0 listen in both connected clients - PacketCollector collector = getConnection(0).createPacketCollector(new MessageTypeFilter(Message.Type.chat)); - PacketCollector coll3 = conn3.createPacketCollector(new MessageTypeFilter(Message.Type.chat)); - PacketCollector coll4 = conn4.createPacketCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector collector = getConnection(0).createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector coll3 = conn3.createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector coll4 = conn4.createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); // Send a message from this resource to indicate most recent activity conn3.sendStanza(new Message("admin@" + getXMPPServiceDomain())); @@ -368,7 +368,7 @@ public class MessageTest extends SmackTestCase { Thread.sleep(200); // User0 listen for incoming traffic - PacketCollector collector = getConnection(0).createPacketCollector(new MessageTypeFilter(Message.Type.chat)); + StanzaCollector collector = getConnection(0).createStanzaCollector(new MessageTypeFilter(Message.Type.chat)); // User1 sends a message to the bare JID of User0 Chat chat = getConnection(1).getChatManager().createChat(getBareJID(0), null); 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 7c24ea877..8e98c0bc3 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 @@ -82,7 +82,7 @@ public class PacketReaderTest extends SmackTestCase { iqPacket.setType(IQ.Type.get); // Send the IQ and wait for the answer - PacketCollector collector = getConnection(0).createPacketCollector( + StanzaCollector collector = getConnection(0).createStanzaCollector( new PacketIDFilter(iqPacket.getStanzaId())); getConnection(0).sendStanza(iqPacket); IQ response = (IQ) collector.nextResult(SmackConfiguration.getPacketReplyTimeout()); @@ -100,7 +100,7 @@ public class PacketReaderTest extends SmackTestCase { public void testRemoveListener() { PacketListener listener = new PacketListener() { - public void processPacket(Packet packet) { + public void processStanza(Packet packet) { // Do nothing } }; @@ -135,7 +135,7 @@ public class PacketReaderTest extends SmackTestCase { // User1 will always reply to user0 when a message is received getConnection(1).addAsyncPacketListener(new PacketListener() { - public void processPacket(Packet packet) { + public void processStanza(Packet packet) { System.out.println(new Date() + " " + packet); Message message = new Message(packet.getFrom()); @@ -146,7 +146,7 @@ public class PacketReaderTest extends SmackTestCase { }, new StanzaTypeFilter(Message.class)); // User0 listen for replies from user1 - PacketCollector collector = getConnection(0).createPacketCollector( + StanzaCollector collector = getConnection(0).createStanzaCollector( new FromMatchesFilter(getFullJID(1))); // User0 sends the regular message to user1 getConnection(0).sendStanza(packet); @@ -176,7 +176,7 @@ public class PacketReaderTest extends SmackTestCase { for (int j = 0; j < repeat; j++) { PacketListener listener0 = new PacketListener() { - public void processPacket(Packet packet) { + public void processStanza(Packet packet) { System.out.println("Packet Captured"); incCounter(); } @@ -190,7 +190,7 @@ public class PacketReaderTest extends SmackTestCase { }; PacketListener listener1 = new PacketListener() { - public void processPacket(Packet packet) { + public void processStanza(Packet packet) { System.out.println("Packet Captured"); incCounter(); } 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 c934037b4..18bf784bf 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/AbstractXMPPConnection.java @@ -111,17 +111,17 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { new CopyOnWriteArraySet(); /** - * A collection of PacketCollectors which collects packets for a specified filter + * A collection of StanzaCollectors which collects packets for a specified filter * and perform blocking and polling operations on the result queue. *

* We use a ConcurrentLinkedQueue here, because its Iterator is weakly - * consistent and we want {@link #invokePacketCollectors(Stanza)} for-each - * loop to be lock free. As drawback, removing a PacketCollector is O(n). + * consistent and we want {@link #invokeStanzaCollectorsAndNotifyRecvListeners(Stanza)} for-each + * loop to be lock free. As drawback, removing a StanzaCollector is O(n). * The alternative would be a synchronized HashSet, but this would mean a * synchronized block around every usage of collectors. *

*/ - private final Collection collectors = new ConcurrentLinkedQueue(); + private final Collection collectors = new ConcurrentLinkedQueue<>(); /** * List of PacketListeners that will be notified synchronously when a new stanza(/packet) was received. @@ -531,7 +531,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { // Note that we can not use IQReplyFilter here, since the users full JID is not yet // available. It will become available right after the resource has been successfully bound. Bind bindResource = Bind.newSet(resource); - PacketCollector packetCollector = createPacketCollectorAndSend(new StanzaIdFilter(bindResource), bindResource); + StanzaCollector packetCollector = createStanzaCollectorAndSend(new StanzaIdFilter(bindResource), bindResource); Bind response = packetCollector.nextResultOrThrow(); // Set the connections user to the result of resource binding. It is important that we don't infer the user // from the login() arguments and the configurations service name, as, for example, when SASL External is used, @@ -547,7 +547,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { boolean legacySessionDisabled = getConfiguration().isLegacySessionDisabled(); if (sessionFeature != null && !sessionFeature.isOptional() && !legacySessionDisabled) { Session session = new Session(); - packetCollector = createPacketCollectorAndSend(new StanzaIdFilter(session), session); + packetCollector = createStanzaCollectorAndSend(new StanzaIdFilter(session), session); packetCollector.nextResultOrThrow(); } } @@ -743,18 +743,18 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } @Override - public PacketCollector createPacketCollectorAndSend(IQ packet) throws NotConnectedException, InterruptedException { + public StanzaCollector createStanzaCollectorAndSend(IQ packet) throws NotConnectedException, InterruptedException { StanzaFilter packetFilter = new IQReplyFilter(packet, this); // Create the packet collector before sending the packet - PacketCollector packetCollector = createPacketCollectorAndSend(packetFilter, packet); + StanzaCollector packetCollector = createStanzaCollectorAndSend(packetFilter, packet); return packetCollector; } @Override - public PacketCollector createPacketCollectorAndSend(StanzaFilter packetFilter, Stanza packet) + public StanzaCollector createStanzaCollectorAndSend(StanzaFilter packetFilter, Stanza packet) throws NotConnectedException, InterruptedException { // Create the packet collector before sending the packet - PacketCollector packetCollector = createPacketCollector(packetFilter); + StanzaCollector packetCollector = createStanzaCollector(packetFilter); try { // Now we can send the packet as the collector has been created sendStanza(packet); @@ -767,21 +767,21 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } @Override - public PacketCollector createPacketCollector(StanzaFilter packetFilter) { - PacketCollector.Configuration configuration = PacketCollector.newConfiguration().setStanzaFilter(packetFilter); - return createPacketCollector(configuration); + public StanzaCollector createStanzaCollector(StanzaFilter packetFilter) { + StanzaCollector.Configuration configuration = StanzaCollector.newConfiguration().setStanzaFilter(packetFilter); + return createStanzaCollector(configuration); } @Override - public PacketCollector createPacketCollector(PacketCollector.Configuration configuration) { - PacketCollector collector = new PacketCollector(this, configuration); + public StanzaCollector createStanzaCollector(StanzaCollector.Configuration configuration) { + StanzaCollector collector = new StanzaCollector(this, configuration); // Add the collector to the list of active collectors. collectors.add(collector); return collector; } @Override - public void removePacketCollector(PacketCollector collector) { + public void removeStanzaCollector(StanzaCollector collector) { collectors.remove(collector); } @@ -878,7 +878,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { public void run() { for (StanzaListener listener : listenersToNotify) { try { - listener.processPacket(packet); + listener.processStanza(packet); } catch (Exception e) { LOGGER.log(Level.WARNING, "Sending listener threw exception", e); @@ -926,7 +926,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } for (StanzaListener interceptor : interceptorsToInvoke) { try { - interceptor.processPacket(packet); + interceptor.processStanza(packet); } catch (Exception e) { LOGGER.log(Level.SEVERE, "Packet interceptor threw exception", e); } @@ -1033,18 +1033,18 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { executorService.executeBlocking(new Runnable() { @Override public void run() { - invokePacketCollectorsAndNotifyRecvListeners(stanza); + invokeStanzaCollectorsAndNotifyRecvListeners(stanza); } }); } /** - * Invoke {@link PacketCollector#processPacket(Stanza)} for every - * PacketCollector with the given packet. Also notify the receive listeners with a matching stanza(/packet) filter about the packet. + * Invoke {@link StanzaCollector#processStanza(Stanza)} for every + * StanzaCollector with the given packet. Also notify the receive listeners with a matching stanza(/packet) filter about the packet. * - * @param packet the stanza(/packet) to notify the PacketCollectors and receive listeners about. + * @param packet the stanza(/packet) to notify the StanzaCollectors and receive listeners about. */ - protected void invokePacketCollectorsAndNotifyRecvListeners(final Stanza packet) { + protected void invokeStanzaCollectorsAndNotifyRecvListeners(final Stanza packet) { if (packet instanceof IQ) { final IQ iq = (IQ) packet; final IQ.Type type = iq.getType(); @@ -1140,7 +1140,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { @Override public void run() { try { - listener.processPacket(packet); + listener.processStanza(packet); } catch (Exception e) { LOGGER.log(Level.SEVERE, "Exception in async packet listener", e); } @@ -1149,8 +1149,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { } // Loop through all collectors and notify the appropriate ones. - for (PacketCollector collector: collectors) { - collector.processPacket(packet); + for (StanzaCollector collector: collectors) { + collector.processStanza(packet); } // Notify the receive listeners interested in the packet @@ -1170,7 +1170,7 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { public void run() { for (StanzaListener listener : listenersToNotify) { try { - listener.processPacket(packet); + listener.processStanza(packet); } catch(NotConnectedException e) { LOGGER.log(Level.WARNING, "Got not connected exception, aborting", e); break; @@ -1471,10 +1471,10 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { final StanzaListener packetListener = new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException, InterruptedException { + public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException { try { XMPPErrorException.ifHasErrorThenThrow(packet); - callback.processPacket(packet); + callback.processStanza(packet); } catch (XMPPErrorException e) { if (exceptionCallback != null) { @@ -1532,9 +1532,9 @@ public abstract class AbstractXMPPConnection implements XMPPConnection { public void addOneTimeSyncCallback(final StanzaListener callback, final StanzaFilter packetFilter) { final StanzaListener packetListener = new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException, InterruptedException { + public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException { try { - callback.processPacket(packet); + callback.processStanza(packet); } finally { removeSyncStanzaListener(this); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java index a217604ba..f68ff03ef 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java @@ -129,7 +129,7 @@ public final class SmackConfiguration { * * @return The number of packets to queue before deleting older packets. */ - public static int getPacketCollectorSize() { + public static int getStanzaCollectorSize() { return packetCollectorSize; } @@ -139,7 +139,7 @@ public final class SmackConfiguration { * * @param collectorSize the number of packets to queue before deleting older packets. */ - public static void setPacketCollectorSize(int collectorSize) { + public static void setStanzaCollectorSize(int collectorSize) { packetCollectorSize = collectorSize; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java index c24d48013..23e76d96e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java @@ -93,7 +93,7 @@ public class SmackException extends Exception { } public static NoResponseException newWith(XMPPConnection connection, - PacketCollector collector) { + StanzaCollector collector) { return newWith(connection, collector.getStanzaFilter()); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java similarity index 93% rename from smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java rename to smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java index cc8548bcb..7b47bc947 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/PacketCollector.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java @@ -1,6 +1,6 @@ /** * - * Copyright 2003-2007 Jive Software. + * Copyright 2003-2007 Jive Software, 2016-2017 Florian Schmaus. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,20 +27,20 @@ import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.Stanza; /** - * Provides a mechanism to collect packets into a result queue that pass a - * specified filter. The collector lets you perform blocking and polling - * operations on the result queue. So, a PacketCollector is more suitable to + * Provides a mechanism to collect Stanzas into a result queue that pass a + * specified filter/matcher. The collector lets you perform blocking and polling + * operations on the result queue. So, a StanzaCollector is more suitable to * use than a {@link StanzaListener} when you need to wait for a specific * result.

* * Each stanza(/packet) collector will queue up a configured number of packets for processing before * older packets are automatically dropped. The default number is retrieved by - * {@link SmackConfiguration#getPacketCollectorSize()}. + * {@link SmackConfiguration#getStanzaCollectorSize()}. * - * @see XMPPConnection#createPacketCollector(StanzaFilter) + * @see XMPPConnection#createStanzaCollector(StanzaFilter) * @author Matt Tucker */ -public class PacketCollector { +public class StanzaCollector { private final StanzaFilter packetFilter; @@ -49,7 +49,7 @@ public class PacketCollector { /** * The stanza(/packet) collector which timeout for the next result will get reset once this collector collects a stanza. */ - private final PacketCollector collectorToReset; + private final StanzaCollector collectorToReset; private final XMPPConnection connection; @@ -62,7 +62,7 @@ public class PacketCollector { * @param connection the connection the collector is tied to. * @param configuration the configuration used to construct this collector */ - protected PacketCollector(XMPPConnection connection, Configuration configuration) { + protected StanzaCollector(XMPPConnection connection, Configuration configuration) { this.connection = connection; this.packetFilter = configuration.packetFilter; this.resultQueue = new ArrayBlockingQueue<>(configuration.size); @@ -78,7 +78,7 @@ public class PacketCollector { // If the packet collector has already been cancelled, do nothing. if (!cancelled) { cancelled = true; - connection.removePacketCollector(this); + connection.removeStanzaCollector(this); } } @@ -274,7 +274,7 @@ public class PacketCollector { * * @param packet the stanza(/packet) to process. */ - protected void processPacket(Stanza packet) { + protected void processStanza(Stanza packet) { if (packetFilter == null || packetFilter.accept(packet)) { // CHECKSTYLE:OFF while (!resultQueue.offer(packet)) { @@ -305,8 +305,8 @@ public class PacketCollector { public static final class Configuration { private StanzaFilter packetFilter; - private int size = SmackConfiguration.getPacketCollectorSize(); - private PacketCollector collectorToReset; + private int size = SmackConfiguration.getStanzaCollectorSize(); + private StanzaCollector collectorToReset; private Configuration() { } @@ -355,7 +355,7 @@ public class PacketCollector { * @param collector * @return a reference to this configuration. */ - public Configuration setCollectorToReset(PacketCollector collector) { + public Configuration setCollectorToReset(StanzaCollector collector) { this.collectorToReset = collector; return this; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java b/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java index 4143fed28..992639a95 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/StanzaListener.java @@ -23,8 +23,8 @@ import org.jivesoftware.smack.packet.Stanza; /** * Provides a mechanism to listen for packets that pass a specified filter. * This allows event-style programming -- every time a new stanza(/packet) is found, - * the {@link #processPacket(Stanza)} method will be called. This is the - * opposite approach to the functionality provided by a {@link PacketCollector} + * the {@link #processStanza(Stanza)} method will be called. This is the + * opposite approach to the functionality provided by a {@link StanzaCollector} * which lets you block while waiting for results. *

* Additionally you are able to intercept Packets that are going to be send and @@ -50,6 +50,6 @@ public interface StanzaListener { * @throws NotConnectedException * @throws InterruptedException */ - public void processPacket(Stanza packet) throws NotConnectedException, InterruptedException; + public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException; } 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 6acc76240..c7d64752f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java @@ -225,11 +225,11 @@ public interface XMPPConnection { * @throws NotConnectedException * @throws InterruptedException */ - public PacketCollector createPacketCollectorAndSend(IQ packet) throws NotConnectedException, InterruptedException; + public StanzaCollector createStanzaCollectorAndSend(IQ packet) throws NotConnectedException, InterruptedException; /** * Creates a new stanza(/packet) collector for this connection. A stanza(/packet) filter determines - * which packets will be accumulated by the collector. A PacketCollector is + * which packets will be accumulated by the collector. A StanzaCollector is * more suitable to use than a {@link StanzaListener} when you need to wait for * a specific result. * @@ -239,46 +239,46 @@ public interface XMPPConnection { * @throws InterruptedException * @throws NotConnectedException */ - public PacketCollector createPacketCollectorAndSend(StanzaFilter packetFilter, Stanza packet) + public StanzaCollector createStanzaCollectorAndSend(StanzaFilter packetFilter, Stanza packet) throws NotConnectedException, InterruptedException; /** * Creates a new stanza(/packet) collector for this connection. A stanza(/packet) filter * determines which packets will be accumulated by the collector. A - * PacketCollector is more suitable to use than a {@link StanzaListener} + * StanzaCollector is more suitable to use than a {@link StanzaListener} * when you need to wait for a specific result. *

* Note: If you send a Stanza(/Packet) right after using this method, then * consider using - * {@link #createPacketCollectorAndSend(StanzaFilter, Stanza)} instead. - * Otherwise make sure cancel the PacketCollector in every case, e.g. even - * if an exception is thrown, or otherwise you may leak the PacketCollector. + * {@link #createStanzaCollectorAndSend(StanzaFilter, Stanza)} instead. + * Otherwise make sure cancel the StanzaCollector in every case, e.g. even + * if an exception is thrown, or otherwise you may leak the StanzaCollector. *

* * @param packetFilter the stanza(/packet) filter to use. * @return a new stanza(/packet) collector. */ - public PacketCollector createPacketCollector(StanzaFilter packetFilter); + public StanzaCollector createStanzaCollector(StanzaFilter packetFilter); /** * Create a new stanza(/packet) collector with the given stanza(/packet) collector configuration. *

* Please make sure to cancel the collector when it is no longer required. See also - * {@link #createPacketCollector(StanzaFilter)}. + * {@link #createStanzaCollector(StanzaFilter)}. *

* * @param configuration the stanza(/packet) collector configuration. * @return a new stanza(/packet) collector. * @since 4.1 */ - public PacketCollector createPacketCollector(PacketCollector.Configuration configuration); + public StanzaCollector createStanzaCollector(StanzaCollector.Configuration configuration); /** * Remove a stanza(/packet) collector of this connection. * * @param collector a stanza(/packet) collectors which was created for this connection. */ - public void removePacketCollector(PacketCollector collector); + public void removeStanzaCollector(StanzaCollector collector); /** * Registers a stanza(/packet) listener with this connection. @@ -316,7 +316,7 @@ public interface XMPPConnection { * incoming stanzas. Only use this kind of stanza(/packet) filter if it does not perform any XMPP activity that waits for a * response. Consider using {@link #addAsyncStanzaListener(StanzaListener, StanzaFilter)} when possible, i.e. when * the invocation order doesn't have to be the same as the order of the arriving packets. If the order of the - * arriving packets, consider using a {@link PacketCollector} when possible. + * arriving packets, consider using a {@link StanzaCollector} when possible. *

* * @param packetListener the stanza(/packet) listener to notify of new received packets. diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java index 29c6bafe2..a7940fe08 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java @@ -68,7 +68,7 @@ public abstract class AbstractDebugger implements SmackDebugger { // the GUI. This is what we call "interpreted" packet data, since it's the packet // data as Smack sees it and not as it's coming in as raw XML. listener = new StanzaListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { if (printInterpreted) { log("RCV PKT (" + connection.getConnectionCounter() + "): " + packet.toXML()); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java index d7f53ad2f..6452626e8 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/PacketFilter.java @@ -37,10 +37,10 @@ package org.jivesoftware.smack.filter; * } * }; * // Create a new stanza(/packet) collector using the filter we created. - * PacketCollector myCollector = packetReader.createPacketCollector(myFilter); + * StanzaCollector myCollector = packetReader.createStanzaCollector(myFilter); * * - * @see org.jivesoftware.smack.PacketCollector + * @see org.jivesoftware.smack.StanzaCollector * @see org.jivesoftware.smack.StanzaListener * @author Matt Tucker * @deprecated use {@link StanzaFilter} diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java index 87d4a2d61..83a3b127a 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/StanzaFilter.java @@ -39,10 +39,10 @@ import org.jivesoftware.smack.packet.Stanza; * } * }; * // Create a new stanza collector using the filter we created. - * PacketCollector myCollector = connection.createPacketCollector(myFilter); + * StanzaCollector myCollector = connection.createStanzaCollector(myFilter); * * - * @see org.jivesoftware.smack.PacketCollector + * @see org.jivesoftware.smack.StanzaCollector * @see org.jivesoftware.smack.StanzaListener * @author Matt Tucker */ diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/package-info.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/package-info.java index b2693b731..073b59ad6 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/package-info.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/package-info.java @@ -16,6 +16,6 @@ */ /** - * Allows {@link org.jivesoftware.smack.PacketCollector} and {@link org.jivesoftware.smack.StanzaListener} instances to filter for stanzas with particular attributes. + * Allows {@link org.jivesoftware.smack.StanzaCollector} and {@link org.jivesoftware.smack.StanzaListener} instances to filter for stanzas with particular attributes. */ package org.jivesoftware.smack.filter; 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 662461224..851311b3a 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/DummyConnection.java @@ -180,7 +180,7 @@ public class DummyConnection extends AbstractXMPPConnection { * @param packet the stanza(/packet) to process. */ public void processStanza(Stanza packet) { - invokePacketCollectorsAndNotifyRecvListeners(packet); + invokeStanzaCollectorsAndNotifyRecvListeners(packet); } /** diff --git a/smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java similarity index 91% rename from smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java rename to smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java index b21303a81..be4f771f0 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/PacketCollectorTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java @@ -23,18 +23,18 @@ import org.jivesoftware.smack.filter.StanzaFilter; import org.jivesoftware.smack.packet.Stanza; import org.junit.Test; -public class PacketCollectorTest +public class StanzaCollectorTest { @Test public void verifyRollover() throws InterruptedException { - TestPacketCollector collector = new TestPacketCollector(null, new OKEverything(), 5); + TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), 5); for (int i=0; i<6; i++) { Stanza testPacket = new TestPacket(i); - collector.processPacket(testPacket); + collector.processStanza(testPacket); } // Assert that '0' has rolled off @@ -48,7 +48,7 @@ public class PacketCollectorTest for (int i=10; i<15; i++) { Stanza testPacket = new TestPacket(i); - collector.processPacket(testPacket); + collector.processStanza(testPacket); } assertEquals("10", collector.nextResultBlockForever().getStanzaId()); @@ -69,7 +69,7 @@ public class PacketCollectorTest public void verifyThreadSafety() { int insertCount = 500; - final TestPacketCollector collector = new TestPacketCollector(null, new OKEverything(), insertCount); + final TestStanzaCollector collector = new TestStanzaCollector(null, new OKEverything(), insertCount); Thread consumer1 = new Thread(new Runnable() { @@ -158,7 +158,7 @@ public class PacketCollectorTest for(int i=0; i data) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { IoTSetRequest request = new IoTSetRequest(data); request.setTo(jid); - IoTSetResponse response = connection().createPacketCollectorAndSend(request).nextResultOrThrow(); + IoTSetResponse response = connection().createStanzaCollectorAndSend(request).nextResultOrThrow(); return response; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java index 1c1d77caf..6e4b6f63d 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java @@ -26,7 +26,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.ConnectionCreationListener; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; @@ -177,14 +177,14 @@ public final class IoTDataManager extends IoTManager { StanzaFilter dataFilter = new IoTFieldsExtensionFilter(seqNr, false); // Setup the IoTFieldsExtension message collectors before sending the IQ to avoid a data race. - PacketCollector doneCollector = connection.createPacketCollector(doneFilter); + StanzaCollector doneCollector = connection.createStanzaCollector(doneFilter); - PacketCollector.Configuration dataCollectorConfiguration = PacketCollector.newConfiguration().setStanzaFilter( + StanzaCollector.Configuration dataCollectorConfiguration = StanzaCollector.newConfiguration().setStanzaFilter( dataFilter).setCollectorToReset(doneCollector); - PacketCollector dataCollector = connection.createPacketCollector(dataCollectorConfiguration); + StanzaCollector dataCollector = connection.createStanzaCollector(dataCollectorConfiguration); try { - connection.createPacketCollectorAndSend(iotDataRequest).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(iotDataRequest).nextResultOrThrow(); // Wait until a message with an IoTFieldsExtension and the done flag comes in. doneCollector.nextResult(); } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java index 678ab5bcd..2fa512911 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/IoTDiscoveryManager.java @@ -241,7 +241,7 @@ public final class IoTDiscoveryManager extends Manager { final XMPPConnection connection = connection(); IoTRegister iotRegister = new IoTRegister(thing.getMetaTags(), thing.getNodeInfo(), thing.isSelfOwened()); iotRegister.setTo(registry); - IQ result = connection.createPacketCollectorAndSend(iotRegister).nextResultOrThrow(); + IQ result = connection.createStanzaCollectorAndSend(iotRegister).nextResultOrThrow(); if (result instanceof IoTClaimed) { IoTClaimed iotClaimedResult = (IoTClaimed) result; throw new IoTClaimedException(iotClaimedResult); @@ -288,7 +288,7 @@ public final class IoTDiscoveryManager extends Manager { IoTMine iotMine = new IoTMine(metaTags, publicThing); iotMine.setTo(registry); - IoTClaimed iotClaimed = connection().createPacketCollectorAndSend(iotMine).nextResultOrThrow(); + IoTClaimed iotClaimed = connection().createStanzaCollectorAndSend(iotMine).nextResultOrThrow(); // The 'jid' attribute of the response now represents the XMPP address of the thing we just successfully claimed. Jid thing = iotClaimed.getJid(); @@ -317,7 +317,7 @@ public final class IoTDiscoveryManager extends Manager { IoTRemove iotRemove = new IoTRemove(thing, nodeInfo); iotRemove.setTo(registry); - connection().createPacketCollectorAndSend(iotRemove).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(iotRemove).nextResultOrThrow(); // We no not update the ThingState here, as this is done in the IQ handler above.; } @@ -341,7 +341,7 @@ public final class IoTDiscoveryManager extends Manager { IoTUnregister iotUnregister = new IoTUnregister(nodeInfo); iotUnregister.setTo(registry); - connection().createPacketCollectorAndSend(iotUnregister).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(iotUnregister).nextResultOrThrow(); ThingState state = getStateFor(nodeInfo); state.setUnregistered(); @@ -370,7 +370,7 @@ public final class IoTDiscoveryManager extends Manager { IoTDisown iotDisown = new IoTDisown(thing, nodeInfo); iotDisown.setTo(registry); - connection().createPacketCollectorAndSend(iotDisown).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(iotDisown).nextResultOrThrow(); } // Registry utility methods diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java index a1b39e77f..3fc6c6741 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/IoTProvisioningManager.java @@ -122,7 +122,7 @@ public final class IoTProvisioningManager extends Manager { // Stanza listener for XEP-0324 § 3.2.3. connection.addAsyncStanzaListener(new StanzaListener() { @Override - public void processPacket(Stanza stanza) throws NotConnectedException, InterruptedException { + public void processStanza(Stanza stanza) throws NotConnectedException, InterruptedException { if (!isFromProvisioningService(stanza, true)) { return; } @@ -148,7 +148,7 @@ public final class IoTProvisioningManager extends Manager { // (yet) part of the XEP. connection.addAsyncStanzaListener(new StanzaListener() { @Override - public void processPacket(final Stanza stanza) throws NotConnectedException, InterruptedException { + public void processStanza(final Stanza stanza) throws NotConnectedException, InterruptedException { final Message friendMessage = (Message) stanza; final Friend friend = Friend.from(friendMessage); final BareJid friendJid = friend.getFriend(); @@ -337,7 +337,7 @@ public final class IoTProvisioningManager extends Manager { IoTIsFriend iotIsFriend = new IoTIsFriend(friendInQuestion); iotIsFriend.setTo(provisioningServer); - IoTIsFriendResponse response = connection().createPacketCollectorAndSend(iotIsFriend).nextResultOrThrow(); + IoTIsFriendResponse response = connection().createStanzaCollectorAndSend(iotIsFriend).nextResultOrThrow(); assert (response.getJid().equals(friendInQuestion)); boolean isFriend = response.getIsFriendResult(); if (!isFriend) { diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java index ea7539e57..18cc9ac9e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java @@ -25,7 +25,7 @@ import java.util.WeakHashMap; import org.jivesoftware.smack.ConnectionCreationListener; import org.jivesoftware.smack.Manager; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.SmackException.NotLoggedInException; @@ -413,7 +413,7 @@ public final class MamManager extends Manager { String queryId = UUID.randomUUID().toString(); MamQueryIQ mamQueryIq = new MamQueryIQ(queryId); - MamQueryIQ mamResponseQueryIq = connection().createPacketCollectorAndSend(mamQueryIq).nextResultOrThrow(); + MamQueryIQ mamResponseQueryIq = connection().createStanzaCollectorAndSend(mamQueryIq).nextResultOrThrow(); return mamResponseQueryIq.getDataForm().getFields(); } @@ -423,11 +423,11 @@ public final class MamManager extends Manager { final XMPPConnection connection = getAuthenticatedConnectionOrThrow(); MamFinIQ mamFinIQ = null; - PacketCollector mamFinIQCollector = connection.createPacketCollector(new IQReplyFilter(mamQueryIq, connection)); + StanzaCollector mamFinIQCollector = connection.createStanzaCollector(new IQReplyFilter(mamQueryIq, connection)); - PacketCollector.Configuration resultCollectorConfiguration = PacketCollector.newConfiguration() + StanzaCollector.Configuration resultCollectorConfiguration = StanzaCollector.newConfiguration() .setStanzaFilter(new MamResultFilter(mamQueryIq)).setCollectorToReset(mamFinIQCollector); - PacketCollector resultCollector = connection.createPacketCollector(resultCollectorConfiguration); + StanzaCollector resultCollector = connection.createStanzaCollector(resultCollectorConfiguration); try { connection.sendStanza(mamQueryIq); @@ -547,7 +547,7 @@ public final class MamManager extends Manager { NotConnectedException, InterruptedException, NotLoggedInException { final XMPPConnection connection = getAuthenticatedConnectionOrThrow(); - MamPrefsIQ mamPrefsResultIQ = connection.createPacketCollectorAndSend(mamPrefsIQ).nextResultOrThrow(); + MamPrefsIQ mamPrefsResultIQ = connection.createStanzaCollectorAndSend(mamPrefsIQ).nextResultOrThrow(); return new MamPrefsResult(mamPrefsResultIQ, DataForm.from(mamPrefsIQ)); } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java index f62afbcd7..a2ee01441 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLight.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArraySet; import org.jivesoftware.smack.MessageListener; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.StanzaListener; @@ -86,7 +86,7 @@ public class MultiUserChatLight { private final StanzaListener messageListener; - private PacketCollector messageCollector; + private StanzaCollector messageCollector; MultiUserChatLight(XMPPConnection connection, EntityJid room) { this.connection = connection; @@ -97,7 +97,7 @@ public class MultiUserChatLight { messageListener = new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { Message message = (Message) packet; for (MessageListener listener : messageListeners) { listener.processMessage(message); @@ -263,10 +263,10 @@ public class MultiUserChatLight { throws Exception { MUCLightCreateIQ createMUCLightIQ = new MUCLightCreateIQ(room, roomName, occupants); - messageCollector = connection.createPacketCollector(fromRoomGroupchatFilter); + messageCollector = connection.createStanzaCollector(fromRoomGroupchatFilter); try { - connection.createPacketCollectorAndSend(createMUCLightIQ).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(createMUCLightIQ).nextResultOrThrow(); } catch (InterruptedException | NoResponseException | XMPPErrorException e) { removeConnectionCallbacks(); throw e; @@ -297,7 +297,7 @@ public class MultiUserChatLight { affiliations.put(connection.getUser(), MUCLightAffiliation.none); MUCLightChangeAffiliationsIQ changeAffiliationsIQ = new MUCLightChangeAffiliationsIQ(room, affiliations); - IQ responseIq = connection.createPacketCollectorAndSend(changeAffiliationsIQ).nextResultOrThrow(); + IQ responseIq = connection.createStanzaCollectorAndSend(changeAffiliationsIQ).nextResultOrThrow(); boolean roomLeft = responseIq.getType().equals(IQ.Type.result); if (roomLeft) { @@ -319,7 +319,7 @@ public class MultiUserChatLight { throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { MUCLightGetInfoIQ mucLightGetInfoIQ = new MUCLightGetInfoIQ(room, version); - IQ responseIq = connection.createPacketCollectorAndSend(mucLightGetInfoIQ).nextResultOrThrow(); + IQ responseIq = connection.createStanzaCollectorAndSend(mucLightGetInfoIQ).nextResultOrThrow(); MUCLightInfoIQ mucLightInfoResponseIQ = (MUCLightInfoIQ) responseIq; return new MUCLightRoomInfo(mucLightInfoResponseIQ.getVersion(), room, @@ -353,7 +353,7 @@ public class MultiUserChatLight { public MUCLightRoomConfiguration getConfiguration(String version) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { MUCLightGetConfigsIQ mucLightGetConfigsIQ = new MUCLightGetConfigsIQ(room, version); - IQ responseIq = connection.createPacketCollectorAndSend(mucLightGetConfigsIQ).nextResultOrThrow(); + IQ responseIq = connection.createStanzaCollectorAndSend(mucLightGetConfigsIQ).nextResultOrThrow(); MUCLightConfigurationIQ mucLightConfigurationIQ = (MUCLightConfigurationIQ) responseIq; return mucLightConfigurationIQ.getConfiguration(); } @@ -386,7 +386,7 @@ public class MultiUserChatLight { throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { MUCLightGetAffiliationsIQ mucLightGetAffiliationsIQ = new MUCLightGetAffiliationsIQ(room, version); - IQ responseIq = connection.createPacketCollectorAndSend(mucLightGetAffiliationsIQ).nextResultOrThrow(); + IQ responseIq = connection.createStanzaCollectorAndSend(mucLightGetAffiliationsIQ).nextResultOrThrow(); MUCLightAffiliationsIQ mucLightAffiliationsIQ = (MUCLightAffiliationsIQ) responseIq; return mucLightAffiliationsIQ.getAffiliations(); @@ -418,7 +418,7 @@ public class MultiUserChatLight { public void changeAffiliations(HashMap affiliations) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { MUCLightChangeAffiliationsIQ changeAffiliationsIQ = new MUCLightChangeAffiliationsIQ(room, affiliations); - connection.createPacketCollectorAndSend(changeAffiliationsIQ).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(changeAffiliationsIQ).nextResultOrThrow(); } /** @@ -431,7 +431,7 @@ public class MultiUserChatLight { */ public void destroy() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { MUCLightDestroyIQ mucLightDestroyIQ = new MUCLightDestroyIQ(room); - IQ responseIq = connection.createPacketCollectorAndSend(mucLightDestroyIQ).nextResultOrThrow(); + IQ responseIq = connection.createStanzaCollectorAndSend(mucLightDestroyIQ).nextResultOrThrow(); boolean roomDestroyed = responseIq.getType().equals(IQ.Type.result); if (roomDestroyed) { @@ -451,7 +451,7 @@ public class MultiUserChatLight { public void changeSubject(String subject) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { MUCLightSetConfigsIQ mucLightSetConfigIQ = new MUCLightSetConfigsIQ(room, null, subject, null); - connection.createPacketCollectorAndSend(mucLightSetConfigIQ).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(mucLightSetConfigIQ).nextResultOrThrow(); } /** @@ -466,7 +466,7 @@ public class MultiUserChatLight { public void changeRoomName(String roomName) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { MUCLightSetConfigsIQ mucLightSetConfigIQ = new MUCLightSetConfigsIQ(room, roomName, null); - connection.createPacketCollectorAndSend(mucLightSetConfigIQ).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(mucLightSetConfigIQ).nextResultOrThrow(); } /** @@ -496,7 +496,7 @@ public class MultiUserChatLight { public void setRoomConfigs(String roomName, HashMap customConfigs) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { MUCLightSetConfigsIQ mucLightSetConfigIQ = new MUCLightSetConfigsIQ(room, roomName, customConfigs); - connection.createPacketCollectorAndSend(mucLightSetConfigIQ).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(mucLightSetConfigIQ).nextResultOrThrow(); } } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java index 4a05da888..9d1566572 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/MultiUserChatLightManager.java @@ -230,7 +230,7 @@ public final class MultiUserChatLightManager extends Manager { mucLightBlockingIQ.setTo(mucLightService); StanzaFilter responseFilter = new IQReplyFilter(mucLightBlockingIQ, connection()); - IQ responseIq = connection().createPacketCollectorAndSend(responseFilter, mucLightBlockingIQ) + IQ responseIq = connection().createStanzaCollectorAndSend(responseFilter, mucLightBlockingIQ) .nextResultOrThrow(); MUCLightBlockingIQ muclIghtBlockingIQResult = (MUCLightBlockingIQ) responseIq; @@ -278,7 +278,7 @@ public final class MultiUserChatLightManager extends Manager { MUCLightBlockingIQ mucLightBlockingIQ = new MUCLightBlockingIQ(rooms, null); mucLightBlockingIQ.setType(Type.set); mucLightBlockingIQ.setTo(mucLightService); - connection().createPacketCollectorAndSend(mucLightBlockingIQ).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(mucLightBlockingIQ).nextResultOrThrow(); } /** @@ -322,7 +322,7 @@ public final class MultiUserChatLightManager extends Manager { MUCLightBlockingIQ mucLightBlockingIQ = new MUCLightBlockingIQ(null, users); mucLightBlockingIQ.setType(Type.set); mucLightBlockingIQ.setTo(mucLightService); - connection().createPacketCollectorAndSend(mucLightBlockingIQ).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(mucLightBlockingIQ).nextResultOrThrow(); } /** @@ -366,7 +366,7 @@ public final class MultiUserChatLightManager extends Manager { MUCLightBlockingIQ mucLightBlockingIQ = new MUCLightBlockingIQ(rooms, null); mucLightBlockingIQ.setType(Type.set); mucLightBlockingIQ.setTo(mucLightService); - connection().createPacketCollectorAndSend(mucLightBlockingIQ).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(mucLightBlockingIQ).nextResultOrThrow(); } /** @@ -410,7 +410,7 @@ public final class MultiUserChatLightManager extends Manager { MUCLightBlockingIQ mucLightBlockingIQ = new MUCLightBlockingIQ(null, users); mucLightBlockingIQ.setType(Type.set); mucLightBlockingIQ.setTo(mucLightService); - connection().createPacketCollectorAndSend(mucLightBlockingIQ).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(mucLightBlockingIQ).nextResultOrThrow(); } } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/PushNotificationsManager.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/PushNotificationsManager.java index 38a4b9a62..2f3602d62 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/PushNotificationsManager.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/PushNotificationsManager.java @@ -162,7 +162,7 @@ public final class PushNotificationsManager extends Manager { private boolean changePushNotificationsStatus(IQ iq) throws NotConnectedException, InterruptedException, NoResponseException, XMPPErrorException { final XMPPConnection connection = connection(); - IQ responseIQ = connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + IQ responseIQ = connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); return responseIQ.getType() != Type.error; } 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 6eb40cdbc..13c60a122 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 @@ -59,7 +59,7 @@ public class CompressionTest extends SmackTestCase { version.setTo(getXMPPServiceDomain()); // Create a packet collector to listen for a response. - PacketCollector collector = connection.createPacketCollector(new PacketIDFilter(version.getStanzaId())); + StanzaCollector collector = connection.createStanzaCollector(new PacketIDFilter(version.getStanzaId())); connection.sendStanza(version); 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 9a42dc272..38e3b529b 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 @@ -18,7 +18,7 @@ package org.jivesoftware.smackx; import org.jivesoftware.smack.Chat; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.ThreadFilter; import org.jivesoftware.smack.packet.Message; @@ -77,9 +77,9 @@ public class FormTest extends SmackTestCase { // Create the chats between the two participants Chat chat = getConnection(0).getChatManager().createChat(getBareJID(1), null); - PacketCollector collector = getConnection(0).createPacketCollector( + StanzaCollector collector = getConnection(0).createStanzaCollector( new ThreadFilter(chat.getThreadID())); - PacketCollector collector2 = getConnection(1).createPacketCollector( + StanzaCollector collector2 = getConnection(1).createStanzaCollector( new ThreadFilter(chat.getThreadID())); Message msg = new Message(); 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 6b80247ec..0be7e0d83 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 @@ -30,7 +30,7 @@ import org.jivesoftware.smack.filter.StanzaExtensionFilter; */ public class GroupChatInvitationTest extends SmackTestCase { - private PacketCollector collector = null; + private StanzaCollector collector = null; /** * Constructor for GroupChatInvitationTest. @@ -68,7 +68,7 @@ public class GroupChatInvitationTest extends SmackTestCase { super.setUp(); // Register listener for groupchat invitations. PacketFilter filter = new StanzaExtensionFilter("x", "jabber:x:conference"); - collector = getConnection(1).createPacketCollector(filter); + collector = getConnection(1).createStanzaCollector(filter); } protected void tearDown() throws Exception { diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java index 62391edaa..67332f077 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/MultipleRecipientManagerTest.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.MessageTypeFilter; @@ -45,12 +45,12 @@ public class MultipleRecipientManagerTest extends SmackTestCase { */ public void testSending() throws XMPPException { - PacketCollector collector1 = - getConnection(1).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); - PacketCollector collector2 = - getConnection(2).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); - PacketCollector collector3 = - getConnection(3).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector1 = + getConnection(1).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector2 = + getConnection(2).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector3 = + getConnection(3).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); Message message = new Message(); message.setBody("Hola"); @@ -110,14 +110,14 @@ public class MultipleRecipientManagerTest extends SmackTestCase { * Ensures that replying to packets is ok. */ public void testReplying() throws XMPPException { - PacketCollector collector0 = - getConnection(0).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); - PacketCollector collector1 = - getConnection(1).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); - PacketCollector collector2 = - getConnection(2).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); - PacketCollector collector3 = - getConnection(3).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector0 = + getConnection(0).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector1 = + getConnection(1).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector2 = + getConnection(2).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector3 = + getConnection(3).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); // Send the intial message with multiple recipients Message message = new Message(); @@ -192,12 +192,12 @@ public class MultipleRecipientManagerTest extends SmackTestCase { * Ensures that replying is not allowed when disabled. */ public void testNoReply() throws XMPPException { - PacketCollector collector1 = - getConnection(1).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); - PacketCollector collector2 = - getConnection(2).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); - PacketCollector collector3 = - getConnection(3).createPacketCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector1 = + getConnection(1).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector2 = + getConnection(2).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); + StanzaCollector collector3 = + getConnection(3).createStanzaCollector(new MessageTypeFilter(Message.Type.normal)); // Send the intial message with multiple recipients Message message = new Message(); 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 e99b65cac..13d4bd23c 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 @@ -18,7 +18,7 @@ package org.jivesoftware.smackx; import org.jivesoftware.smack.Chat; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.MessageTypeFilter; import org.jivesoftware.smack.packet.Message; @@ -98,7 +98,7 @@ public class OfflineMessageManagerTest extends SmackTestCase { assertEquals("Wrong number of offline messages", 2, offlineManager.getMessageCount()); // User2 becomes available again - PacketCollector collector = getConnection(1).createPacketCollector( + StanzaCollector collector = getConnection(1).createStanzaCollector( new MessageTypeFilter(Message.Type.chat)); getConnection(1).sendStanza(new Presence(Presence.Type.available)); @@ -156,7 +156,7 @@ public class OfflineMessageManagerTest extends SmackTestCase { assertEquals("Wrong number of offline messages", 2, offlineManager.getMessageCount()); // User2 becomes available again - PacketCollector collector = getConnection(1).createPacketCollector( + StanzaCollector collector = getConnection(1).createStanzaCollector( new MessageTypeFilter(Message.Type.chat)); getConnection(1).sendStanza(new Presence(Presence.Type.available)); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java index 58ad787fd..afea6f1d5 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/XHTMLManagerTest.java @@ -90,7 +90,7 @@ public class XHTMLManagerTest extends SmackTestCase { public void testSendSimpleXHTMLMessageAndDisplayReceivedXHTMLMessage() { // Create a chat for each connection Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - final PacketCollector chat2 = getConnection(1).createPacketCollector( + final StanzaCollector chat2 = getConnection(1).createStanzaCollector( new ThreadFilter(chat1.getThreadID())); // User1 creates a message to send to user2 @@ -150,7 +150,7 @@ public class XHTMLManagerTest extends SmackTestCase { public void testSendComplexXHTMLMessageAndDisplayReceivedXHTMLMessage() { // Create a chat for each connection Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - final PacketCollector chat2 = getConnection(1).createPacketCollector( + final StanzaCollector chat2 = getConnection(1).createStanzaCollector( new ThreadFilter(chat1.getThreadID())); // User1 creates a message to send to user2 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 b54867d91..fa21488db 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 @@ -19,7 +19,7 @@ import java.util.Random; import java.util.concurrent.SynchronousQueue; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.PacketIDFilter; import org.jivesoftware.smack.packet.Packet; @@ -61,7 +61,7 @@ public class InBandBytestreamTest extends SmackTestCase { open.setFrom(initiatorConnection.getUser()); open.setTo(targetConnection.getUser()); - PacketCollector collector = initiatorConnection.createPacketCollector(new PacketIDFilter( + StanzaCollector collector = initiatorConnection.createStanzaCollector(new PacketIDFilter( open.getStanzaId())); initiatorConnection.sendStanza(open); Packet result = collector.nextResult(); 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 da14f8f80..1486fdffc 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 @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.XMPPException; import org.jivesoftware.smack.filter.PacketIDFilter; @@ -82,7 +82,7 @@ public class Socks5ByteStreamTest extends SmackTestCase { initiatorConnection.getUser(), targetConnection.getUser(), "session_id"); bytestreamInitiation.addStreamHost("proxy.localhost", "127.0.0.1", 7777); - PacketCollector collector = initiatorConnection.createPacketCollector(new PacketIDFilter( + StanzaCollector collector = initiatorConnection.createStanzaCollector(new PacketIDFilter( bytestreamInitiation.getStanzaId())); initiatorConnection.sendStanza(bytestreamInitiation); Packet result = collector.nextResult(); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java index c74778d45..0f3e66942 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/muc/MultiUserChatTest.java @@ -29,7 +29,7 @@ import org.jivesoftware.smack.Chat; import org.jivesoftware.smack.ChatManagerListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.ConnectionConfiguration; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.TCPConnection; import org.jivesoftware.smack.XMPPException; @@ -453,7 +453,7 @@ public class MultiUserChatTest extends SmackTestCase { // Start a private chat with another participant Chat chat = muc2.createPrivateChat(room + "/testbot", null); - PacketCollector collector = chat.createCollector(); + StanzaCollector collector = chat.createCollector(); chat.sendMessage("Hello there"); Message response = (Message) collector.nextResult(2000); diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java index 57f180ae9..83f3e0cd8 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/MessageEventTest.java @@ -85,7 +85,7 @@ public class MessageEventTest extends SmackTestCase { // This listener will listen on the conn2 and answer an ACK if everything is ok PacketFilter packetFilter = new StanzaExtensionFilter("x", "jabber:x:event"); PacketListener packetListener = new PacketListener() { - public void processPacket(Packet packet) { + public void processStanza(Packet packet) { Message message = (Message) packet; try { MessageEvent messageEvent = diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java index e83890661..97f9001d9 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/RosterExchangeTest.java @@ -71,7 +71,7 @@ public class RosterExchangeTest extends SmackTestCase { public void testSendAndReceiveRosterEntries() { // Create a chat for each connection Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - final PacketCollector chat2 = getConnection(1).createPacketCollector( + final StanzaCollector chat2 = getConnection(1).createStanzaCollector( new ThreadFilter(chat1.getThreadID())); // Create the message to send with the roster @@ -115,7 +115,7 @@ public class RosterExchangeTest extends SmackTestCase { public void testSendAndAcceptRosterEntries() { // Create a chat for each connection Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - final PacketCollector chat2 = getConnection(1).createPacketCollector( + final StanzaCollector chat2 = getConnection(1).createStanzaCollector( new ThreadFilter(chat1.getThreadID())); // Create the message to send with the roster diff --git a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java index 4054e3cc5..8d5d01c40 100644 --- a/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java +++ b/smack-extensions/src/integration-test/java/org/jivesoftware/smackx/packet/XHTMLExtensionTest.java @@ -20,7 +20,7 @@ package org.jivesoftware.smackx.packet; import java.util.Iterator; import org.jivesoftware.smack.Chat; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.PacketListener; import org.jivesoftware.smack.filter.StanzaExtensionFilter; import org.jivesoftware.smack.filter.PacketFilter; @@ -83,7 +83,7 @@ public class XHTMLExtensionTest extends SmackTestCase { public void testSendSimpleXHTMLMessageAndDisplayReceivedXHTMLMessage() { // Create a chat for each connection Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - final PacketCollector chat2 = getConnection(1).createPacketCollector( + final StanzaCollector chat2 = getConnection(1).createStanzaCollector( new ThreadFilter(chat1.getThreadID())); // User1 creates a message to send to user2 @@ -136,7 +136,7 @@ public class XHTMLExtensionTest extends SmackTestCase { public void testSendComplexXHTMLMessageAndDisplayReceivedXHTMLMessage() { // Create a chat for each connection Chat chat1 = getConnection(0).getChatManager().createChat(getBareJID(1), null); - final PacketCollector chat2 = getConnection(1).createPacketCollector( + final StanzaCollector chat2 = getConnection(1).createStanzaCollector( new ThreadFilter(chat1.getThreadID())); // Create a Listener that listens for Messages with the extension @@ -146,7 +146,7 @@ public class XHTMLExtensionTest extends SmackTestCase { new StanzaExtensionFilter("html", "http://jabber.org/protocol/xhtml-im"); PacketListener packetListener = new PacketListener() { @Override - public void processPacket(Packet packet) { + public void processStanza(Packet packet) { } }; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java index d45458435..78b27c7f7 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/BlockingCommandManager.java @@ -165,7 +165,7 @@ public final class BlockingCommandManager extends Manager { if (blockListCached == null) { BlockListIQ blockListIQ = new BlockListIQ(); - BlockListIQ blockListIQResult = connection().createPacketCollectorAndSend(blockListIQ).nextResultOrThrow(); + BlockListIQ blockListIQResult = connection().createStanzaCollectorAndSend(blockListIQ).nextResultOrThrow(); blockListCached = blockListIQResult.getBlockedJidsCopy(); } @@ -184,7 +184,7 @@ public final class BlockingCommandManager extends Manager { public void blockContacts(List jids) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { BlockContactsIQ blockContactIQ = new BlockContactsIQ(jids); - connection().createPacketCollectorAndSend(blockContactIQ).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(blockContactIQ).nextResultOrThrow(); } /** @@ -199,7 +199,7 @@ public final class BlockingCommandManager extends Manager { public void unblockContacts(List jids) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { UnblockContactsIQ unblockContactIQ = new UnblockContactsIQ(jids); - connection().createPacketCollectorAndSend(unblockContactIQ).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(unblockContactIQ).nextResultOrThrow(); } /** @@ -213,7 +213,7 @@ public final class BlockingCommandManager extends Manager { public void unblockAll() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { UnblockContactsIQ unblockContactIQ = new UnblockContactsIQ(); - connection().createPacketCollectorAndSend(unblockContactIQ).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(unblockContactIQ).nextResultOrThrow(); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBManager.java index 365d2c22a..74336ccf3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/BoBManager.java @@ -147,7 +147,7 @@ public final class BoBManager extends Manager { requestBoBIQ.setTo(to); XMPPConnection connection = getAuthenticatedConnectionOrThrow(); - BoBIQ responseBoBIQ = connection.createPacketCollectorAndSend(requestBoBIQ).nextResultOrThrow(); + BoBIQ responseBoBIQ = connection.createStanzaCollectorAndSend(requestBoBIQ).nextResultOrThrow(); bobData = responseBoBIQ.getBoBData(); BOB_CACHE.put(bobHash, bobData); 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 579bdc494..e823c2cc7 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 @@ -426,7 +426,7 @@ public final class InBandBytestreamManager implements BytestreamManager { byteStreamRequest.setTo(targetJID); // sending packet will throw exception on timeout or error reply - connection.createPacketCollectorAndSend(byteStreamRequest).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(byteStreamRequest).nextResultOrThrow(); InBandBytestreamSession inBandBytestreamSession = new InBandBytestreamSession( this.connection, byteStreamRequest, targetJID); 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 254de044c..40f185af1 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 @@ -211,7 +211,7 @@ public class InBandBytestreamSession implements BytestreamSession { Close close = new Close(this.byteStreamRequest.getSessionID()); close.setTo(this.remoteJID); try { - connection.createPacketCollectorAndSend(close).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(close).nextResultOrThrow(); } catch (Exception e) { // Sadly we are unable to use the IOException(Throwable) constructor because this @@ -449,7 +449,7 @@ public class InBandBytestreamSession implements BytestreamSession { private long lastSequence = -1; - public void processPacket(Stanza packet) throws NotConnectedException, InterruptedException { + public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException { // get data packet extension DataPacketExtension data = ((Data) packet).getDataPacketExtension(); @@ -510,7 +510,7 @@ public class InBandBytestreamSession implements BytestreamSession { protected StanzaListener getDataPacketListener() { return new StanzaListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { // get data packet extension DataPacketExtension data = (DataPacketExtension) packet.getExtension( DataPacketExtension.ELEMENT, @@ -781,7 +781,7 @@ public class InBandBytestreamSession implements BytestreamSession { iq.setTo(remoteJID); try { - connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); } catch (Exception e) { // close session unless it is already closed @@ -824,7 +824,7 @@ public class InBandBytestreamSession implements BytestreamSession { * @throws InterruptedException */ public void processIQPacket(Data data) throws NotConnectedException, InterruptedException { - inputStream.dataPacketListener.processPacket(data); + inputStream.dataPacketListener.processStanza(data); } } 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 610538e24..268f63779 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 @@ -464,7 +464,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream Bytestream initiation = createBytestreamInitiation(sessionID, targetJID, streamHosts); // send initiation packet - Stanza response = connection.createPacketCollectorAndSend(initiation).nextResultOrThrow( + Stanza response = connection.createStanzaCollectorAndSend(initiation).nextResultOrThrow( getTargetResponseTimeout()); // extract used stream host from response @@ -590,7 +590,7 @@ public final class Socks5BytestreamManager extends Manager implements Bytestream for (Jid proxy : proxies) { Bytestream streamHostRequest = createStreamHostRequest(proxy); try { - Bytestream response = (Bytestream) connection.createPacketCollectorAndSend( + Bytestream response = (Bytestream) connection.createStanzaCollectorAndSend( streamHostRequest).nextResultOrThrow(); streamHosts.addAll(response.getStreamHosts()); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java index fa79ffd59..4bdbff82d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/Socks5ClientForInitiator.java @@ -113,7 +113,7 @@ class Socks5ClientForInitiator extends Socks5Client { private void activate() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { Bytestream activate = createStreamHostActivation(); // if activation fails #nextResultOrThrow() throws an exception - connection.get().createPacketCollectorAndSend(activate).nextResultOrThrow(); + connection.get().createStanzaCollectorAndSend(activate).nextResultOrThrow(); } /** 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 b9d35a06f..d61b7c4b1 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 @@ -317,7 +317,7 @@ public final class EntityCapsManager extends Manager { // Listen for remote presence stanzas with the caps extension // If we receive such a stanza, record the JID and nodeVer @Override - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { if (!entityCapsEnabled()) return; @@ -337,7 +337,7 @@ public final class EntityCapsManager extends Manager { connection.addPacketSendingListener(new StanzaListener() { @Override - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { presenceSend = (Presence) packet; } }, PresenceTypeFilter.OUTGOING_PRESENCE_BROADCAST); @@ -346,7 +346,7 @@ public final class EntityCapsManager extends Manager { // XEP-0115 specifies that a client SHOULD include entity capabilities // with every presence notification it sends. StanzaListener packetInterceptor = new StanzaListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { if (!entityCapsEnabled) { // Be sure to not send stanzas with the caps extension if it's not enabled packet.removeExtension(CapsExtension.ELEMENT, CapsExtension.NAMESPACE); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java index 7f99a5584..34a03ee6d 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/RemoteCommand.java @@ -145,7 +145,7 @@ public class RemoteCommand extends AdHocCommand { AdHocCommandData responseData = null; try { - responseData = connection.createPacketCollectorAndSend(data).nextResultOrThrow(); + responseData = connection.createStanzaCollectorAndSend(data).nextResultOrThrow(); } finally { // We set the response data in a 'finally' block, so that it also gets set even if an error IQ was returned. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java index fc57a5fd8..2a9b8cabf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java @@ -536,7 +536,7 @@ public final class ServiceDiscoveryManager extends Manager { disco.setTo(entityID); disco.setNode(node); - Stanza result = connection().createPacketCollectorAndSend(disco).nextResultOrThrow(); + Stanza result = connection().createStanzaCollectorAndSend(disco).nextResultOrThrow(); return (DiscoverInfo) result; } @@ -575,7 +575,7 @@ public final class ServiceDiscoveryManager extends Manager { disco.setTo(entityID); disco.setNode(node); - Stanza result = connection().createPacketCollectorAndSend(disco).nextResultOrThrow(); + Stanza result = connection().createStanzaCollectorAndSend(disco).nextResultOrThrow(); return (DiscoverItems) result; } @@ -647,7 +647,7 @@ public final class ServiceDiscoveryManager extends Manager { discoverItems.setTo(entityID); discoverItems.setNode(node); - connection().createPacketCollectorAndSend(discoverItems).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(discoverItems).nextResultOrThrow(); } /** 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 60292e69c..63db8c996 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 @@ -315,7 +315,7 @@ public final class FileTransferNegotiator extends Manager { si.setTo(userID); si.setType(IQ.Type.set); - Stanza siResponse = connection().createPacketCollectorAndSend(si).nextResultOrThrow( + Stanza siResponse = connection().createStanzaCollectorAndSend(si).nextResultOrThrow( responseTimeout); if (siResponse instanceof IQ) { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java index c414b9559..b49051ce8 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqlast/LastActivityManager.java @@ -135,7 +135,7 @@ public final class LastActivityManager extends Manager { // Listen to all the sent messages to reset the idle time on each one connection.addPacketSendingListener(new StanzaListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { Presence presence = (Presence) packet; Presence.Mode mode = presence.getMode(); if (mode == null) return; @@ -154,7 +154,7 @@ public final class LastActivityManager extends Manager { connection.addPacketSendingListener(new StanzaListener() { @Override - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { Message message = (Message) packet; // if it's not an error message, reset the idle time if (message.getType() == Message.Type.error) return; @@ -237,7 +237,7 @@ public final class LastActivityManager extends Manager { public LastActivity getLastActivity(Jid jid) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { LastActivity activity = new LastActivity(jid); - return (LastActivity) connection().createPacketCollectorAndSend(activity).nextResultOrThrow(); + return (LastActivity) connection().createStanzaCollectorAndSend(activity).nextResultOrThrow(); } /** diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java index 6b06c6869..79c5c3839 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqprivate/PrivateDataManager.java @@ -162,7 +162,7 @@ public final class PrivateDataManager extends Manager { // Create an IQ packet to get the private data. IQ privateDataGet = new PrivateDataIQ(elementName, namespace); - PrivateDataIQ response = connection().createPacketCollectorAndSend( + PrivateDataIQ response = connection().createStanzaCollectorAndSend( privateDataGet).nextResultOrThrow(); return response.getPrivateData(); } @@ -182,7 +182,7 @@ public final class PrivateDataManager extends Manager { // Create an IQ packet to set the private data. IQ privateDataSet = new PrivateDataIQ(privateData); - connection().createPacketCollectorAndSend(privateDataSet).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(privateDataSet).nextResultOrThrow(); } private static final PrivateData DUMMY_PRIVATE_DATA = new PrivateData() { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java index cc4a6d7c2..dd291013d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/AccountManager.java @@ -24,7 +24,7 @@ import java.util.Set; import java.util.WeakHashMap; import org.jivesoftware.smack.Manager; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException; @@ -283,7 +283,7 @@ public final class AccountManager extends Manager { Registration reg = new Registration(attributes); reg.setType(IQ.Type.set); reg.setTo(connection().getXMPPServiceDomain()); - createPacketCollectorAndSend(reg).nextResultOrThrow(); + createStanzaCollectorAndSend(reg).nextResultOrThrow(); } /** @@ -307,7 +307,7 @@ public final class AccountManager extends Manager { Registration reg = new Registration(map); reg.setType(IQ.Type.set); reg.setTo(connection().getXMPPServiceDomain()); - createPacketCollectorAndSend(reg).nextResultOrThrow(); + createStanzaCollectorAndSend(reg).nextResultOrThrow(); } /** @@ -328,7 +328,7 @@ public final class AccountManager extends Manager { Registration reg = new Registration(attributes); reg.setType(IQ.Type.set); reg.setTo(connection().getXMPPServiceDomain()); - createPacketCollectorAndSend(reg).nextResultOrThrow(); + createStanzaCollectorAndSend(reg).nextResultOrThrow(); } public boolean isSupported() @@ -356,11 +356,11 @@ public final class AccountManager extends Manager { private synchronized void getRegistrationInfo() throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { Registration reg = new Registration(); reg.setTo(connection().getXMPPServiceDomain()); - info = createPacketCollectorAndSend(reg).nextResultOrThrow(); + info = createStanzaCollectorAndSend(reg).nextResultOrThrow(); } - private PacketCollector createPacketCollectorAndSend(IQ req) throws NotConnectedException, InterruptedException { - PacketCollector collector = connection().createPacketCollectorAndSend(new StanzaIdFilter(req.getStanzaId()), req); + private StanzaCollector createStanzaCollectorAndSend(IQ req) throws NotConnectedException, InterruptedException { + StanzaCollector collector = connection().createStanzaCollectorAndSend(new StanzaIdFilter(req.getStanzaId()), req); return collector; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java index c9167404a..202a084dc 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqversion/VersionManager.java @@ -144,7 +144,7 @@ public final class VersionManager extends Manager { if (!isSupported(jid)) { return null; } - return connection().createPacketCollectorAndSend(new Version(jid)).nextResultOrThrow(); + return connection().createStanzaCollectorAndSend(new Version(jid)).nextResultOrThrow(); } private static Version generateVersionFrom(String name, String version, String os) { 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 d8fdd10b4..d4d0d1e84 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 @@ -28,7 +28,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import org.jivesoftware.smack.MessageListener; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.StanzaListener; import org.jivesoftware.smack.PresenceListener; import org.jivesoftware.smack.SmackException; @@ -143,7 +143,7 @@ public class MultiUserChat { private String subject; private Resourcepart nickname; private boolean joined = false; - private PacketCollector messageCollector; + private StanzaCollector messageCollector; MultiUserChat(XMPPConnection connection, EntityBareJid room, MultiUserChatManager multiUserChatManager) { this.connection = connection; @@ -155,7 +155,7 @@ public class MultiUserChat { messageListener = new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { Message message = (Message) packet; for (MessageListener listener : messageListeners) { listener.processMessage(message); @@ -165,7 +165,7 @@ public class MultiUserChat { // Create a listener for subject updates. subjectListener = new StanzaListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { Message msg = (Message) packet; EntityFullJid from = msg.getFrom().asEntityFullJidIfPossible(); if (from == null) { @@ -183,7 +183,7 @@ public class MultiUserChat { // Create a listener for all presence updates. presenceListener = new StanzaListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { Presence presence = (Presence) packet; final EntityFullJid from = presence.getFrom().asEntityFullJidIfPossible(); if (from == null) { @@ -253,7 +253,7 @@ public class MultiUserChat { // Listens for all messages that include a MUCUser extension and fire the invitation // rejection listeners if the message includes an invitation rejection. declinesListener = new StanzaListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { Message message = (Message) packet; // Get the MUC User extension MUCUser mucUser = MUCUser.from(packet); @@ -269,7 +269,7 @@ public class MultiUserChat { presenceInterceptor = new StanzaListener() { @Override - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { Presence presence = (Presence) packet; for (PresenceListener interceptor : presenceInterceptors) { interceptor.processPresence(presence); @@ -323,7 +323,7 @@ public class MultiUserChat { connection.addSyncStanzaListener(declinesListener, DECLINE_FILTER); connection.addPacketInterceptor(presenceInterceptor, new AndFilter(new ToFilter(room), StanzaTypeFilter.PRESENCE)); - messageCollector = connection.createPacketCollector(fromRoomGroupchatFilter); + messageCollector = connection.createStanzaCollector(fromRoomGroupchatFilter); // Wait for a presence packet back from the server. // Use a bare JID filter, since the room may rewrite the nickname. @@ -331,7 +331,7 @@ public class MultiUserChat { Presence.class), MUCUserStatusCodeFilter.STATUS_110_PRESENCE_TO_SELF); Presence presence; try { - presence = connection.createPacketCollectorAndSend(responseFilter, joinPresence).nextResultOrThrow(conf.getTimeout()); + presence = connection.createStanzaCollectorAndSend(responseFilter, joinPresence).nextResultOrThrow(conf.getTimeout()); } catch (InterruptedException | NoResponseException | XMPPErrorException e) { // Ensure that all callbacks are removed if there is an exception @@ -758,7 +758,7 @@ public class MultiUserChat { iq.setTo(room); iq.setType(IQ.Type.get); - IQ answer = connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + IQ answer = connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); return Form.getFormFrom(answer); } @@ -778,7 +778,7 @@ public class MultiUserChat { iq.setType(IQ.Type.set); iq.addExtension(form.getDataFormToSend()); - connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); } /** @@ -803,7 +803,7 @@ public class MultiUserChat { reg.setType(IQ.Type.get); reg.setTo(room); - IQ result = connection.createPacketCollectorAndSend(reg).nextResultOrThrow(); + IQ result = connection.createStanzaCollectorAndSend(reg).nextResultOrThrow(); return Form.getFormFrom(result); } @@ -830,7 +830,7 @@ public class MultiUserChat { reg.setTo(room); reg.addExtension(form.getDataFormToSend()); - connection.createPacketCollectorAndSend(reg).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(reg).nextResultOrThrow(); } /** @@ -857,7 +857,7 @@ public class MultiUserChat { Destroy destroy = new Destroy(alternateJID, reason); iq.setDestroy(destroy); - connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); // Reset occupant information. occupantsMap.clear(); @@ -1082,7 +1082,7 @@ public class MultiUserChat { new AndFilter( FromMatchesFilter.createFull(jid), new StanzaTypeFilter(Presence.class)); - PacketCollector response = connection.createPacketCollectorAndSend(responseFilter, joinPresence); + StanzaCollector response = connection.createStanzaCollectorAndSend(responseFilter, joinPresence); // Wait up to a certain number of seconds for a reply. If there is a negative reply, an // exception will be thrown response.nextResultOrThrow(); @@ -1563,7 +1563,7 @@ public class MultiUserChat { MUCItem item = new MUCItem(affiliation, jid, reason); iq.addItem(item); - connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); } private void changeAffiliationByAdmin(Collection jids, MUCAffiliation affiliation) @@ -1577,7 +1577,7 @@ public class MultiUserChat { iq.addItem(item); } - connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); } private void changeRole(Resourcepart nickname, MUCRole role, String reason) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { @@ -1588,7 +1588,7 @@ public class MultiUserChat { MUCItem item = new MUCItem(role, nickname, reason); iq.addItem(item); - connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); } private void changeRole(Collection nicknames, MUCRole role) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { @@ -1601,7 +1601,7 @@ public class MultiUserChat { iq.addItem(item); } - connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); } /** @@ -1759,7 +1759,7 @@ public class MultiUserChat { MUCItem item = new MUCItem(affiliation); iq.addItem(item); - MUCAdmin answer = (MUCAdmin) connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + MUCAdmin answer = (MUCAdmin) connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); // Get the list of affiliates from the server's answer List affiliates = new ArrayList(); @@ -1814,7 +1814,7 @@ public class MultiUserChat { MUCItem item = new MUCItem(role); iq.addItem(item); - MUCAdmin answer = (MUCAdmin) connection.createPacketCollectorAndSend(iq).nextResultOrThrow(); + MUCAdmin answer = (MUCAdmin) connection.createStanzaCollectorAndSend(iq).nextResultOrThrow(); // Get the list of participants from the server's answer List participants = new ArrayList(); for (MUCItem mucadminItem : answer.getItems()) { @@ -1975,13 +1975,13 @@ public class MultiUserChat { return subject.equals(msg.getSubject()); } }); - PacketCollector response = connection.createPacketCollectorAndSend(responseFilter, message); + StanzaCollector response = connection.createStanzaCollectorAndSend(responseFilter, message); // Wait up to a certain number of seconds for a reply. response.nextResultOrThrow(); } /** - * Remove the connection callbacks (PacketListener, PacketInterceptor, PacketCollector) used by this MUC from the + * Remove the connection callbacks (PacketListener, PacketInterceptor, StanzaCollector) used by this MUC from the * connection. */ private void removeConnectionCallbacks() { 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 33b4a7ebe..ae6556cbd 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 @@ -150,7 +150,7 @@ public final class MultiUserChatManager extends Manager { // Listens for all messages that include a MUCUser extension and fire the invitation // listeners if the message includes an invitation. StanzaListener invitationPacketListener = new StanzaListener() { - public void processPacket(Stanza packet) { + public void processStanza(Stanza packet) { final Message message = (Message) packet; // Get the MUCUser extension final MUCUser mucUser = MUCUser.from(message); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java index 0315868d1..69a3ec987 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/OfflineMessageManager.java @@ -17,7 +17,7 @@ package org.jivesoftware.smackx.offline; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException.NoResponseException; import org.jivesoftware.smack.SmackException.NotConnectedException; import org.jivesoftware.smack.XMPPConnection; @@ -158,9 +158,9 @@ public class OfflineMessageManager { return nodes.contains(info.getNode()); } }); - PacketCollector messageCollector = connection.createPacketCollector(messageFilter); + StanzaCollector messageCollector = connection.createStanzaCollector(messageFilter); try { - connection.createPacketCollectorAndSend(request).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(request).nextResultOrThrow(); // Collect the received offline messages Message message = messageCollector.nextResult(); while (message != null) { @@ -191,9 +191,9 @@ public class OfflineMessageManager { OfflineMessageRequest request = new OfflineMessageRequest(); request.setFetch(true); - PacketCollector resultCollector = connection.createPacketCollectorAndSend(request); - PacketCollector.Configuration messageCollectorConfiguration = PacketCollector.newConfiguration().setStanzaFilter(PACKET_FILTER).setCollectorToReset(resultCollector); - PacketCollector messageCollector = connection.createPacketCollector(messageCollectorConfiguration); + StanzaCollector resultCollector = connection.createStanzaCollectorAndSend(request); + StanzaCollector.Configuration messageCollectorConfiguration = StanzaCollector.newConfiguration().setStanzaFilter(PACKET_FILTER).setCollectorToReset(resultCollector); + StanzaCollector messageCollector = connection.createStanzaCollector(messageCollectorConfiguration); List messages = null; try { @@ -235,7 +235,7 @@ public class OfflineMessageManager { item.setAction("remove"); request.addItem(item); } - connection.createPacketCollectorAndSend(request).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(request).nextResultOrThrow(); } /** @@ -251,6 +251,6 @@ public class OfflineMessageManager { OfflineMessageRequest request = new OfflineMessageRequest(); request.setType(IQ.Type.set); request.setPurge(true); - connection.createPacketCollectorAndSend(request).nextResultOrThrow(); + connection.createStanzaCollectorAndSend(request).nextResultOrThrow(); } } 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 a7574e154..280296e96 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 @@ -91,7 +91,7 @@ public final class PEPManager extends Manager { private PEPManager(XMPPConnection connection) { super(connection); StanzaListener packetListener = new StanzaListener() { - public void processPacket(Stanza stanza) { + public void processStanza(Stanza stanza) { Message message = (Message) stanza; EventElement event = EventElement.from(stanza); assert(event != null); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java index 0171a1095..0535c0e0a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/ping/PingManager.java @@ -167,7 +167,7 @@ public final class PingManager extends Manager { } Ping ping = new Ping(jid); try { - connection.createPacketCollectorAndSend(ping).nextResultOrThrow(pingTimeout); + connection.createStanzaCollectorAndSend(ping).nextResultOrThrow(pingTimeout); } catch (XMPPException exc) { return jid.equals(connection.getXMPPServiceDomain()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java index b7631816b..73aa34c7a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/privacy/PrivacyListManager.java @@ -126,7 +126,7 @@ public final class PrivacyListManager extends Manager { // cached(Active|Default)ListName handling connection.addPacketSendingListener(new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { XMPPConnection connection = connection(); Privacy privacy = (Privacy) packet; StanzaFilter iqResultReplyFilter = new IQResultReplyFilter(privacy, connection); @@ -134,7 +134,7 @@ public final class PrivacyListManager extends Manager { final boolean declinceActiveList = privacy.isDeclineActiveList(); connection.addOneTimeSyncCallback(new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { if (declinceActiveList) { cachedActiveListName = null; } @@ -148,7 +148,7 @@ public final class PrivacyListManager extends Manager { }, SetActiveListFilter.INSTANCE); connection.addPacketSendingListener(new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { XMPPConnection connection = connection(); Privacy privacy = (Privacy) packet; StanzaFilter iqResultReplyFilter = new IQResultReplyFilter(privacy, connection); @@ -156,7 +156,7 @@ public final class PrivacyListManager extends Manager { final boolean declinceDefaultList = privacy.isDeclineDefaultList(); connection.addOneTimeSyncCallback(new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { if (declinceDefaultList) { cachedDefaultListName = null; } @@ -170,7 +170,7 @@ public final class PrivacyListManager extends Manager { }, SetDefaultListFilter.INSTANCE); connection.addSyncStanzaListener(new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { Privacy privacy = (Privacy) packet; // If a privacy IQ result stanza has an active or default list name set, then we use that // as cached list name. @@ -231,7 +231,7 @@ public final class PrivacyListManager extends Manager { // The request is a get iq type requestPrivacy.setType(Privacy.Type.get); - return connection().createPacketCollectorAndSend(requestPrivacy).nextResultOrThrow(); + return connection().createStanzaCollectorAndSend(requestPrivacy).nextResultOrThrow(); } /** @@ -250,7 +250,7 @@ public final class PrivacyListManager extends Manager { // The request is a get iq type requestPrivacy.setType(Privacy.Type.set); - return connection().createPacketCollectorAndSend(requestPrivacy).nextResultOrThrow(); + return connection().createStanzaCollectorAndSend(requestPrivacy).nextResultOrThrow(); } /** 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 3da8c9be0..cf53afdd5 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 @@ -58,7 +58,7 @@ public class LeafNode extends Node DiscoverItems items = new DiscoverItems(); items.setTo(pubSubManager.getServiceJid()); items.setNode(getId()); - return pubSubManager.getConnection().createPacketCollectorAndSend(items).nextResultOrThrow(); + return pubSubManager.getConnection().createStanzaCollectorAndSend(items).nextResultOrThrow(); } /** @@ -192,7 +192,7 @@ public class LeafNode extends Node private List getItems(PubSub request, List returnedExtensions) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { - PubSub result = pubSubManager.getConnection().createPacketCollectorAndSend(request).nextResultOrThrow(); + PubSub result = pubSubManager.getConnection().createStanzaCollectorAndSend(request).nextResultOrThrow(); ItemsExtension itemsElem = result.getExtension(PubSubElementType.ITEMS); if (returnedExtensions != null) { returnedExtensions.addAll(result.getExtensions()); @@ -289,7 +289,7 @@ public class LeafNode extends Node { PubSub packet = createPubsubPacket(Type.set, new NodeExtension(PubSubElementType.PUBLISH, getId())); - pubSubManager.getConnection().createPacketCollectorAndSend(packet).nextResultOrThrow(); + pubSubManager.getConnection().createStanzaCollectorAndSend(packet).nextResultOrThrow(); } /** @@ -346,7 +346,7 @@ public class LeafNode extends Node { PubSub packet = createPubsubPacket(Type.set, new PublishItem(getId(), items)); - pubSubManager.getConnection().createPacketCollectorAndSend(packet).nextResultOrThrow(); + pubSubManager.getConnection().createStanzaCollectorAndSend(packet).nextResultOrThrow(); } /** @@ -363,7 +363,7 @@ public class LeafNode extends Node { PubSub request = createPubsubPacket(Type.set, new NodeExtension(PubSubElementType.PURGE_OWNER, getId()), PubSubElementType.PURGE_OWNER.getNamespace()); - pubSubManager.getConnection().createPacketCollectorAndSend(request).nextResultOrThrow(); + pubSubManager.getConnection().createStanzaCollectorAndSend(request).nextResultOrThrow(); } /** @@ -400,6 +400,6 @@ public class LeafNode extends Node items.add(new Item(id)); } PubSub request = createPubsubPacket(Type.set, new ItemsExtension(ItemsExtension.ItemsElementType.retract, getId(), items)); - pubSubManager.getConnection().createPacketCollectorAndSend(request).nextResultOrThrow(); + pubSubManager.getConnection().createStanzaCollectorAndSend(request).nextResultOrThrow(); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java index 954c92328..22cc12b7a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Node.java @@ -105,7 +105,7 @@ abstract public class Node { PubSub packet = createPubsubPacket(Type.set, new FormNode(FormNodeType.CONFIGURE_OWNER, getId(), submitForm), PubSubNamespace.OWNER); - pubSubManager.getConnection().createPacketCollectorAndSend(packet).nextResultOrThrow(); + pubSubManager.getConnection().createStanzaCollectorAndSend(packet).nextResultOrThrow(); } /** @@ -122,7 +122,7 @@ abstract public class Node DiscoverInfo info = new DiscoverInfo(); info.setTo(pubSubManager.getServiceJid()); info.setNode(getId()); - return pubSubManager.getConnection().createPacketCollectorAndSend(info).nextResultOrThrow(); + return pubSubManager.getConnection().createStanzaCollectorAndSend(info).nextResultOrThrow(); } /** @@ -609,7 +609,7 @@ abstract public class Node } @SuppressWarnings({ "rawtypes", "unchecked" }) - public void processPacket(Stanza packet) + public void processStanza(Stanza packet) { // CHECKSTYLE:OFF EventElement event = (EventElement)packet.getExtension("event", PubSubNamespace.EVENT.getXmlns()); @@ -635,7 +635,7 @@ abstract public class Node listener = eventListener; } - public void processPacket(Stanza packet) + public void processStanza(Stanza packet) { // CHECKSTYLE:OFF EventElement event = (EventElement)packet.getExtension("event", PubSubNamespace.EVENT.getXmlns()); @@ -680,7 +680,7 @@ abstract public class Node listener = eventListener; } - public void processPacket(Stanza packet) + public void processStanza(Stanza packet) { // CHECKSTYLE:OFF EventElement event = (EventElement)packet.getExtension("event", PubSubNamespace.EVENT.getXmlns()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java index f2d8124ad..452c8af3a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PubSubManager.java @@ -234,7 +234,7 @@ public final class PubSubManager extends Manager { info.setTo(pubSubService); info.setNode(id); - DiscoverInfo infoReply = connection().createPacketCollectorAndSend(info).nextResultOrThrow(); + DiscoverInfo infoReply = connection().createStanzaCollectorAndSend(info).nextResultOrThrow(); if (infoReply.hasIdentity(PubSub.ELEMENT, "leaf")) { node = new LeafNode(this, id); @@ -283,7 +283,7 @@ public final class PubSubManager extends Manager { if (nodeId != null) items.setNode(nodeId); items.setTo(pubSubService); - DiscoverItems nodeItems = connection().createPacketCollectorAndSend(items).nextResultOrThrow(); + DiscoverItems nodeItems = connection().createStanzaCollectorAndSend(items).nextResultOrThrow(); return nodeItems; } @@ -434,7 +434,7 @@ public final class PubSubManager extends Manager { PubSub sendPubsubPacket(PubSub packet) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { - IQ resultIQ = connection().createPacketCollectorAndSend(packet).nextResultOrThrow(); + IQ resultIQ = connection().createStanzaCollectorAndSend(packet).nextResultOrThrow(); if (resultIQ instanceof EmptyResultIQ) { return null; } 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 a6ff3680d..eee423261 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 @@ -136,7 +136,7 @@ public final class DeliveryReceiptManager extends Manager { // Add the packet listener to handling incoming delivery receipts connection.addAsyncStanzaListener(new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { DeliveryReceipt dr = DeliveryReceipt.from((Message) packet); // notify listeners of incoming receipt for (ReceiptReceivedListener l : receiptReceivedListeners) { @@ -148,7 +148,7 @@ public final class DeliveryReceiptManager extends Manager { // Add the packet listener to handle incoming delivery receipt requests connection.addAsyncStanzaListener(new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException, InterruptedException { + public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException { final Jid from = packet.getFrom(); final XMPPConnection connection = connection(); switch (autoReceiptMode) { @@ -261,7 +261,7 @@ public final class DeliveryReceiptManager extends Manager { private static final StanzaListener AUTO_ADD_DELIVERY_RECEIPT_REQUESTS_LISTENER = new StanzaListener() { @Override - public void processPacket(Stanza packet) throws NotConnectedException { + public void processStanza(Stanza packet) throws NotConnectedException { Message message = (Message) packet; DeliveryReceiptRequest.addTo(message); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java index 4df17e8f3..fa59f53d2 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/search/UserSearch.java @@ -68,7 +68,7 @@ public class UserSearch extends SimpleIQ { search.setType(IQ.Type.get); search.setTo(searchService); - IQ response = (IQ) con.createPacketCollectorAndSend(search).nextResultOrThrow(); + IQ response = (IQ) con.createStanzaCollectorAndSend(search).nextResultOrThrow(); return Form.getFormFrom(response); } @@ -90,7 +90,7 @@ public class UserSearch extends SimpleIQ { search.setTo(searchService); search.addExtension(searchForm.getDataFormToSend()); - IQ response = (IQ) con.createPacketCollectorAndSend(search).nextResultOrThrow(); + IQ response = (IQ) con.createStanzaCollectorAndSend(search).nextResultOrThrow(); return ReportedData.getReportedDataFrom(response); } @@ -112,7 +112,7 @@ public class UserSearch extends SimpleIQ { search.setType(IQ.Type.set); search.setTo(searchService); - SimpleUserSearch response = (SimpleUserSearch) con.createPacketCollectorAndSend(search).nextResultOrThrow(); + SimpleUserSearch response = (SimpleUserSearch) con.createStanzaCollectorAndSend(search).nextResultOrThrow(); return response.getReportedData(); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java index 53d0adeb2..3fe6e81ad 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/sharedgroups/SharedGroupManager.java @@ -51,7 +51,7 @@ public class SharedGroupManager { SharedGroupsInfo info = new SharedGroupsInfo(); info.setType(IQ.Type.get); - SharedGroupsInfo result = (SharedGroupsInfo) connection.createPacketCollectorAndSend(info).nextResultOrThrow(); + SharedGroupsInfo result = (SharedGroupsInfo) connection.createStanzaCollectorAndSend(info).nextResultOrThrow(); return result.getGroups(); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java index 06f614c34..3e2a08632 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/time/EntityTimeManager.java @@ -110,7 +110,7 @@ public final class EntityTimeManager extends Manager { Time request = new Time(); // TODO Add Time(Jid) constructor and use this constructor instead request.setTo(jid); - Time response = (Time) connection().createPacketCollectorAndSend(request).nextResultOrThrow(); + Time response = (Time) connection().createStanzaCollectorAndSend(request).nextResultOrThrow(); return response; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java index 76acf2c48..12a58610d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/vcardtemp/VCardManager.java @@ -102,7 +102,7 @@ public final class VCardManager extends Manager { // Also make sure to generate a new stanza id (the given vcard could be a vcard result), in which case we don't // want to use the same stanza id again (although it wouldn't break if we did) vcard.setStanzaId(StanzaIdUtil.newStanzaId()); - connection().createPacketCollectorAndSend(vcard).nextResultOrThrow(); + connection().createStanzaCollectorAndSend(vcard).nextResultOrThrow(); } /** @@ -128,7 +128,7 @@ public final class VCardManager extends Manager { public VCard loadVCard(EntityBareJid bareJid) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException { VCard vcardRequest = new VCard(); vcardRequest.setTo(bareJid); - VCard result = connection().createPacketCollectorAndSend(vcardRequest).nextResultOrThrow(); + VCard result = connection().createStanzaCollectorAndSend(vcardRequest).nextResultOrThrow(); return result; } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java index 5b23aeb5c..0ebc90ab0 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionMessageTest.java @@ -274,7 +274,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions { dataMessage.addExtension(dpe); // add data packets - listener.processPacket(dataMessage); + listener.processStanza(dataMessage); // read until exception is thrown try { @@ -313,7 +313,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions { DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data); Message dataMessage = new Message(); dataMessage.addExtension(dpe); - listener.processPacket(dataMessage); + listener.processStanza(dataMessage); } byte[] bytes = new byte[3 * blockSize]; @@ -358,7 +358,7 @@ public class InBandBytestreamSessionMessageTest extends InitExtensions { DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data); Message dataMessage = new Message(); dataMessage.addExtension(dpe); - listener.processPacket(dataMessage); + listener.processStanza(dataMessage); } // read data diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java index 5ddc9d896..5aab18902 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/InBandBytestreamSessionTest.java @@ -316,7 +316,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { String base64Data = Base64.encode("Data"); DataPacketExtension dpe = new DataPacketExtension(sessionID, 0, base64Data); Data data = new Data(dpe); - listener.processPacket(data); + listener.processStanza(data); // verify no packet send protocol.verifyAll(); @@ -352,7 +352,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { DataPacketExtension dpe = new DataPacketExtension(sessionID, 0, base64Data); Data data = new Data(dpe); - listener.processPacket(data); + listener.processStanza(data); protocol.verifyAll(); @@ -392,8 +392,8 @@ public class InBandBytestreamSessionTest extends InitExtensions { Data data2 = new Data(dpe); // notify listener - listener.processPacket(data1); - listener.processPacket(data2); + listener.processStanza(data1); + listener.processStanza(data2); protocol.verifyAll(); @@ -428,7 +428,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { Data data = new Data(dpe); // notify listener - listener.processPacket(data); + listener.processStanza(data); protocol.verifyAll(); @@ -463,7 +463,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { Data data = new Data(dpe); // add data packets - listener.processPacket(data); + listener.processStanza(data); // read until exception is thrown try { @@ -504,7 +504,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { String base64Data = Base64.encodeToString(controlData, i * blockSize, blockSize); DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data); Data data = new Data(dpe); - listener.processPacket(data); + listener.processStanza(data); } byte[] bytes = new byte[3 * blockSize]; @@ -551,7 +551,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { String base64Data = Base64.encodeToString(controlData, i * blockSize, blockSize); DataPacketExtension dpe = new DataPacketExtension(sessionID, i, base64Data); Data data = new Data(dpe); - listener.processPacket(data); + listener.processStanza(data); } // read data @@ -592,7 +592,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { Data data = new Data(dpe); // add data packets - listener.processPacket(data); + listener.processStanza(data); inputStream.close(); @@ -635,7 +635,7 @@ public class InBandBytestreamSessionTest extends InitExtensions { Data data = new Data(dpe); // add data packets - listener.processPacket(data); + listener.processStanza(data); Thread closer = new Thread(new Runnable() { 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 2010272ce..22625e306 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java +++ b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java @@ -23,7 +23,7 @@ import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import org.jivesoftware.smack.PacketCollector; +import org.jivesoftware.smack.StanzaCollector; import org.jivesoftware.smack.SmackException; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPException.XMPPErrorException; @@ -49,11 +49,11 @@ public class ConnectionUtils { * form the protocol instance. *

* This mocked connection can used to collect packets that require a reply using a - * PacketCollector. + * StanzaCollector. * * 

      * 
-     *   PacketCollector collector = connection.createPacketCollector(new PacketFilter());
+     *   StanzaCollector collector = connection.createStanzaCollector(new PacketFilter());
      *   connection.sendStanza(packet);
      *   Stanza(/Packet) reply = collector.nextResult();
      * 
@@ -76,19 +76,19 @@ public class ConnectionUtils {
         when(connection.getXMPPServiceDomain()).thenReturn(xmppServer);
 
         // mock packet collector
-        final PacketCollector collector = mock(PacketCollector.class);
-        when(connection.createPacketCollector(isA(StanzaFilter.class))).thenReturn(
+        final StanzaCollector collector = mock(StanzaCollector.class);
+        when(connection.createStanzaCollector(isA(StanzaFilter.class))).thenReturn(
                         collector);
-        Answer collectorAndSend = new Answer() {
+        Answer collectorAndSend = new Answer() {
             @Override
-            public PacketCollector answer(InvocationOnMock invocation) throws Throwable {
+            public StanzaCollector answer(InvocationOnMock invocation) throws Throwable {
                 Stanza packet = (Stanza) invocation.getArguments()[0];
                 protocol.getRequests().add(packet);
                 return collector;
             }
 
         };
-        when(connection.createPacketCollectorAndSend(isA(IQ.class))).thenAnswer(collectorAndSend);
+        when(connection.createStanzaCollectorAndSend(isA(IQ.class))).thenAnswer(collectorAndSend);
 
         // mock send method
         Answer addIncoming = 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 e9cff8009..09e9c14c7 100644
--- a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
+++ b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java
@@ -51,7 +51,7 @@ import org.jivesoftware.smack.packet.Stanza;
  * 
  * public void methodToTest() {
  *   Stanza(/Packet) stanza(/packet) = new Packet(); // create an XMPP packet
- *   PacketCollector collector = connection.createPacketCollector(new StanzaIdFilter());
+ *   StanzaCollector collector = connection.createStanzaCollector(new StanzaIdFilter());
  *   connection.sendStanza(packet);
  *   Stanza(/Packet) reply = collector.nextResult();
  * }
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
index 88d8cc402..0a463b261 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/Chat.java
@@ -17,7 +17,7 @@
 
 package org.jivesoftware.smack.chat;
 
-import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.util.StringUtils;
@@ -155,14 +155,14 @@ public class Chat {
     }
 
     /**
-     * Creates a {@link org.jivesoftware.smack.PacketCollector} which will accumulate the Messages
-     * for this chat. Always cancel PacketCollectors when finished with them as they will accumulate
+     * Creates a {@link org.jivesoftware.smack.StanzaCollector} which will accumulate the Messages
+     * for this chat. Always cancel StanzaCollectors when finished with them as they will accumulate
      * messages indefinitely.
      *
-     * @return the PacketCollector which returns Messages for this chat.
+     * @return the StanzaCollector which returns Messages for this chat.
      */
-    public PacketCollector createCollector() {
-        return chatManager.createPacketCollector(this);
+    public StanzaCollector createCollector() {
+        return chatManager.createStanzaCollector(this);
     }
 
     /**
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 ada1e562c..683a59e63 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
@@ -28,7 +28,7 @@ import java.util.logging.Logger;
 
 import org.jivesoftware.smack.Manager;
 import org.jivesoftware.smack.MessageListener;
-import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.StanzaListener;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
@@ -149,7 +149,7 @@ public final class ChatManager extends Manager{
         // Add a listener for all message packets so that we can deliver
         // messages to the best Chat instance available.
         connection.addSyncStanzaListener(new StanzaListener() {
-            public void processPacket(Stanza packet) {
+            public void processStanza(Stanza packet) {
                 Message message = (Message) packet;
                 Chat chat;
                 if (message.getThread() == null) {
@@ -378,8 +378,8 @@ public final class ChatManager extends Manager{
         connection().sendStanza(message);
     }
 
-    PacketCollector createPacketCollector(Chat chat) {
-        return connection().createPacketCollector(new AndFilter(new ThreadFilter(chat.getThreadID()), 
+    StanzaCollector createStanzaCollector(Chat chat) {
+        return connection().createStanzaCollector(new AndFilter(new ThreadFilter(chat.getThreadID()), 
                         FromMatchesFilter.create(chat.getParticipant())));
     }
 
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 00c94762a..6082f9400 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
@@ -244,7 +244,7 @@ public final class Roster extends Manager {
 
         connection.addAsyncStanzaListener(new StanzaListener() {
             @Override
-            public void processPacket(Stanza stanza) throws NotConnectedException,
+            public void processStanza(Stanza stanza) throws NotConnectedException,
                             InterruptedException {
                 Presence presence = (Presence) stanza;
                 Jid from = presence.getFrom();
@@ -318,7 +318,7 @@ public final class Roster extends Manager {
 
         connection.addPacketSendingListener(new StanzaListener() {
             @Override
-            public void processPacket(Stanza stanzav) throws NotConnectedException, InterruptedException {
+            public void processStanza(Stanza stanzav) throws NotConnectedException, InterruptedException {
                 // Once we send an unavailable presence, the server is allowed to suppress sending presence status
                 // information to us as optimization (RFC 6121 § 4.4.2). Thus XMPP clients which are unavailable, should
                 // consider the presence information of their contacts as not up-to-date. We make the user obvious of
@@ -614,7 +614,7 @@ public final class Roster extends Manager {
             }
         }
         rosterPacket.addRosterItem(item);
-        connection.createPacketCollectorAndSend(rosterPacket).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(rosterPacket).nextResultOrThrow();
 
         sendSubscriptionRequest(user);
     }
@@ -744,7 +744,7 @@ public final class Roster extends Manager {
         // Set the item type as REMOVE so that the server will delete the entry
         item.setItemType(RosterPacket.ItemType.remove);
         packet.addRosterItem(item);
-        connection.createPacketCollectorAndSend(packet).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(packet).nextResultOrThrow();
     }
 
     /**
@@ -1189,11 +1189,11 @@ public final class Roster extends Manager {
                     }
                     packetUnavailable.setFrom(JidCreate.fullFrom(bareUserJid, resource));
                     try {
-                        presencePacketListener.processPacket(packetUnavailable);
+                        presencePacketListener.processStanza(packetUnavailable);
                     }
                     catch (NotConnectedException e) {
                         throw new IllegalStateException(
-                                        "presencePakcetListener should never throw a NotConnectedException when processPacket is called with a presence of type unavailable",
+                                        "presencePakcetListener should never throw a NotConnectedException when processStanza is called with a presence of type unavailable",
                                         e);
                     }
                     catch (InterruptedException e) {
@@ -1422,7 +1422,7 @@ public final class Roster extends Manager {
     private class PresencePacketListener implements StanzaListener {
 
         @Override
-        public void processPacket(Stanza packet) throws NotConnectedException, InterruptedException {
+        public void processStanza(Stanza packet) throws NotConnectedException, InterruptedException {
             // Try to ensure that the roster is loaded when processing presence stanzas. While the
             // presence listener is synchronous, the roster result listener is not, which means that
             // the presence listener may be invoked with a not yet loaded roster.
@@ -1562,7 +1562,7 @@ public final class Roster extends Manager {
     private class RosterResultListener implements StanzaListener {
 
         @Override
-        public void processPacket(Stanza packet) {
+        public void processStanza(Stanza packet) {
             final XMPPConnection connection = connection();
             LOGGER.fine("RosterResultListener received stanza");
             Collection addedEntries = new ArrayList<>();
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
index f0bb40017..e3d237339 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterEntry.java
@@ -109,7 +109,7 @@ public final class RosterEntry extends Manager {
         // Create a new roster item with the current RosterEntry and the *new* name. Note that we can't set the name of
         // RosterEntry right away, as otherwise the updated event wont get fired, because equalsDeep would return true.
         packet.addRosterItem(toRosterItem(this, name));
-        connection().createPacketCollectorAndSend(packet).nextResultOrThrow();
+        connection().createStanzaCollectorAndSend(packet).nextResultOrThrow();
 
         // We have received a result response to the IQ set, the name was successfully changed
         item.setName(name);
diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
index 27f810fa9..df5ca9757 100644
--- a/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
+++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/RosterGroup.java
@@ -84,7 +84,7 @@ public class RosterGroup extends Manager {
                 item.removeGroupName(this.name);
                 item.addGroupName(name);
                 packet.addRosterItem(item);
-                connection().createPacketCollectorAndSend(packet).nextResultOrThrow();
+                connection().createStanzaCollectorAndSend(packet).nextResultOrThrow();
             }
         }
     }
@@ -179,7 +179,7 @@ public class RosterGroup extends Manager {
                 item.addGroupName(getName());
                 packet.addRosterItem(item);
                 // Wait up to a certain number of seconds for a reply from the server.
-                connection().createPacketCollectorAndSend(packet).nextResultOrThrow();
+                connection().createStanzaCollectorAndSend(packet).nextResultOrThrow();
             }
         }
     }
@@ -210,7 +210,7 @@ public class RosterGroup extends Manager {
                 item.removeGroupName(this.getName());
                 packet.addRosterItem(item);
                 // Wait up to a certain number of seconds for a reply from the server.
-                connection().createPacketCollectorAndSend(packet).nextResultOrThrow();
+                connection().createStanzaCollectorAndSend(packet).nextResultOrThrow();
             }
         }
     }
diff --git a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java
index ef7f6d5fb..98c7e6400 100644
--- a/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java
+++ b/smack-integration-test/src/main/java/org/igniterealtime/smack/inttest/AbstractSmackIntTest.java
@@ -20,7 +20,7 @@ import java.util.Random;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPConnection;
@@ -44,9 +44,9 @@ public abstract class AbstractSmackIntTest {
 
     protected void performActionAndWaitUntilStanzaReceived(Runnable action, XMPPConnection connection, StanzaFilter filter)
                     throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
-        PacketCollector.Configuration configuration = PacketCollector.newConfiguration().setStanzaFilter(
+        StanzaCollector.Configuration configuration = StanzaCollector.newConfiguration().setStanzaFilter(
                         filter).setSize(1);
-        PacketCollector collector = connection.createPacketCollector(configuration);
+        StanzaCollector collector = connection.createStanzaCollector(configuration);
 
         try {
             action.run();
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/ChatTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/ChatTest.java
index 0e17c5e76..1a79e0a7b 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smack/ChatTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/ChatTest.java
@@ -67,7 +67,7 @@ public class ChatTest extends AbstractSmackIntegrationTest {
     @SmackIntegrationTest
     public void testProperties() throws XmppStringprepException, NotConnectedException, Exception {
         Chat newChat = chatManagerOne.createChat(conTwo.getUser());
-        PacketCollector collector = conTwo.createPacketCollector(new ThreadFilter(newChat.getThreadID()));
+        StanzaCollector collector = conTwo.createStanzaCollector(new ThreadFilter(newChat.getThreadID()));
 
         Message msg = new Message();
 
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smack/StreamManagementTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smack/StreamManagementTest.java
index 5f9394c57..befd83f82 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smack/StreamManagementTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smack/StreamManagementTest.java
@@ -53,7 +53,7 @@ public class StreamManagementTest extends AbstractSmackLowLevelIntegrationTest {
         final String body2 = "Hi, what's up? I've been just instantly shutdown" + testRunId;
         final String body3 = "Hi, what's up? I've been just resumed" + testRunId;
 
-        final PacketCollector collector = conTwo.createPacketCollector(new AndFilter(
+        final StanzaCollector collector = conTwo.createStanzaCollector(new AndFilter(
                         MessageWithBodiesFilter.INSTANCE,
                         FromMatchesFilter.createFull(conOne.getUser())));
 
@@ -84,7 +84,7 @@ public class StreamManagementTest extends AbstractSmackLowLevelIntegrationTest {
         from.sendStanza(message);
     }
 
-    private static void assertMessageWithBodyReceived(String body, PacketCollector collector) throws InterruptedException {
+    private static void assertMessageWithBodyReceived(String body, StanzaCollector collector) throws InterruptedException {
         Message message = collector.nextResult();
         assertNotNull(message);
         assertEquals(body, message.getBody());
diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java
index 57cf83cc7..a8280756a 100644
--- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java
+++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java
@@ -134,7 +134,7 @@ public class EntityCapsTest extends AbstractSmackIntegrationTest {
         conOne.addPacketSendingListener(new StanzaListener() {
 
             @Override
-            public void processPacket(Stanza stanza) {
+            public void processStanza(Stanza stanza) {
                 discoInfoSend = true;
             }
 
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 d48aafbe5..3acbd4c77 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
@@ -160,7 +160,7 @@ public class JingleManagerTest extends SmackTestCase {
 
         // Start a packet listener for session initiation requests
         getConnection(0).addAsyncPacketListener(new PacketListener() {
-            public void processPacket(final Packet packet) {
+            public void processStanza(final Packet packet) {
                 System.out.println("Packet detected... ");
                 incCounter();
             }
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 964b282d9..8c7bc156a 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
@@ -14,7 +14,7 @@
  */
 package org.jivesoftware.smackx.jingle.provider;
 
-import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.filter.StanzaTypeFilter;
@@ -70,7 +70,7 @@ public class JingleProviderTest extends SmackTestCase {
 
 		// Create a filter and a collector...
 		PacketFilter filter = new StanzaTypeFilter(IQ.class);
-		PacketCollector collector = getConnection(0).createPacketCollector(filter);
+		StanzaCollector collector = getConnection(0).createStanzaCollector(filter);
 
 		System.out.println("Testing if a Jingle IQ can be sent and received...");
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
index f0c214983..74dbe6b01 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleManager.java
@@ -467,7 +467,7 @@ public class JingleManager implements JingleSessionListener {
 
         // Start a packet listener for session initiation requests
         connection.addAsyncStanzaListener(new StanzaListener() {
-            public void processPacket(Stanza packet) {
+            public void processStanza(Stanza packet) {
                 triggerSessionRequested((Jingle) packet);
             }
         }, initRequestFilter);
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 fc9d18041..a26b5a98d 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
@@ -678,7 +678,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList
         LOGGER.fine("UpdatePacketListener");
 
         packetListener = new StanzaListener() {
-            public void processPacket(Stanza packet) {
+            public void processStanza(Stanza packet) {
                 try {
                     receivePacketAndRespond((IQ) packet);
                 } catch (Exception e) {
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
index a313a2cc9..92028b613 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/RTPBridge.java
@@ -29,7 +29,7 @@ import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.NoResponseException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.XMPPException.XMPPErrorException;
 import org.jivesoftware.smack.packet.IQ;
 import org.jivesoftware.smack.provider.IQProvider;
@@ -402,7 +402,7 @@ public class RTPBridge extends IQ {
         RTPBridge rtpPacket = new RTPBridge(sessionID);
         rtpPacket.setTo(RTPBridge.NAME + "." + connection.getXMPPServiceDomain());
 
-        PacketCollector collector = connection.createPacketCollectorAndSend(rtpPacket);
+        StanzaCollector collector = connection.createStanzaCollectorAndSend(rtpPacket);
 
         RTPBridge response = collector.nextResult();
 
@@ -479,7 +479,7 @@ public class RTPBridge extends IQ {
 
         // LOGGER.debug("Relayed to: " + candidate.getIp() + ":" + candidate.getPort());
 
-        PacketCollector collector = connection.createPacketCollectorAndSend(rtpPacket);
+        StanzaCollector collector = connection.createStanzaCollectorAndSend(rtpPacket);
 
         RTPBridge response = collector.nextResult();
 
@@ -510,7 +510,7 @@ public class RTPBridge extends IQ {
 
         // LOGGER.debug("Relayed to: " + candidate.getIp() + ":" + candidate.getPort());
 
-        PacketCollector collector = xmppConnection.createPacketCollectorAndSend(rtpPacket);
+        StanzaCollector collector = xmppConnection.createStanzaCollectorAndSend(rtpPacket);
 
         RTPBridge response = collector.nextResult();
 
diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
index dab8501f0..51dee98ef 100644
--- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
+++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/nat/STUN.java
@@ -24,7 +24,7 @@ import java.util.logging.Logger;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.NotConnectedException;
 import org.jivesoftware.smack.XMPPConnection;
-import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.SimpleIQ;
 import org.jivesoftware.smack.provider.IQProvider;
@@ -185,7 +185,7 @@ public class STUN extends SimpleIQ {
         STUN stunPacket = new STUN();
         stunPacket.setTo(DOMAIN + "." + connection.getXMPPServiceDomain());
 
-        PacketCollector collector = connection.createPacketCollectorAndSend(stunPacket);
+        StanzaCollector collector = connection.createStanzaCollectorAndSend(stunPacket);
 
         STUN response = collector.nextResult();
 
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
index 6dee818d1..4a4c42967 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/Agent.java
@@ -40,7 +40,7 @@ public class Agent {
     public static Collection getWorkgroups(Jid serviceJID, Jid agentJID, XMPPConnection connection) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         AgentWorkgroups request = new AgentWorkgroups(agentJID);
         request.setTo(serviceJID);
-        AgentWorkgroups response = (AgentWorkgroups) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        AgentWorkgroups response = (AgentWorkgroups) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response.getWorkgroups();
     }
 
@@ -75,7 +75,7 @@ public class Agent {
         agentInfo.setType(IQ.Type.get);
         agentInfo.setTo(workgroupJID);
         agentInfo.setFrom(getUser());
-        AgentInfo response = (AgentInfo) connection.createPacketCollectorAndSend(agentInfo).nextResultOrThrow();
+        AgentInfo response = (AgentInfo) connection.createStanzaCollectorAndSend(agentInfo).nextResultOrThrow();
         return response.getName();
     }
 
@@ -97,6 +97,6 @@ public class Agent {
         agentInfo.setTo(workgroupJID);
         agentInfo.setFrom(getUser());
         agentInfo.setName(newName);
-        connection.createPacketCollectorAndSend(agentInfo).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(agentInfo).nextResultOrThrow();
     }
 }
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 02eaa8a31..1ecbcc20d 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
@@ -283,7 +283,7 @@ public class AgentRoster {
      * Listens for all presence packets and processes them.
      */
     private class PresencePacketListener implements StanzaListener {
-        public void processPacket(Stanza packet) {
+        public void processStanza(Stanza packet) {
             Presence presence = (Presence)packet;
             EntityFullJid from = presence.getFrom().asEntityFullJidIfPossible();
             if (from == null) {
@@ -359,7 +359,7 @@ public class AgentRoster {
      */
     private class AgentStatusListener implements StanzaListener {
 
-        public void processPacket(Stanza packet) {
+        public void processStanza(Stanza packet) {
             if (packet instanceof AgentStatusRequest) {
                 AgentStatusRequest statusRequest = (AgentStatusRequest)packet;
                 for (Iterator i = statusRequest.getAgents().iterator(); i.hasNext();) {
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 2fc43d7a3..7572d2d46 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
@@ -29,7 +29,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.StanzaListener;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.NoResponseException;
@@ -147,7 +147,7 @@ public class AgentSession {
                         new StanzaTypeFilter(Message.class));
 
         packetListener = new StanzaListener() {
-            public void processPacket(Stanza packet) {
+            public void processStanza(Stanza packet) {
                 try {
                     handlePacket(packet);
                 }
@@ -335,7 +335,7 @@ public class AgentSession {
             presence.addExtension(new StandardExtensionElement(AgentStatus.ELEMENT_NAME,
                     AgentStatus.NAMESPACE));
 
-            PacketCollector collector = this.connection.createPacketCollectorAndSend(new AndFilter(
+            StanzaCollector collector = this.connection.createStanzaCollectorAndSend(new AndFilter(
                             new StanzaTypeFilter(Presence.class), FromMatchesFilter.create(workgroupJID)), presence);
 
             presence = (Presence)collector.nextResultOrThrow();
@@ -437,7 +437,7 @@ public class AgentSession {
         presence.addExtension(builder.build());
         presence.addExtension(new MetaData(this.metaData));
 
-        PacketCollector collector = this.connection.createPacketCollectorAndSend(new AndFilter(
+        StanzaCollector collector = this.connection.createStanzaCollectorAndSend(new AndFilter(
                         new StanzaTypeFilter(Presence.class),
                         FromMatchesFilter.create(workgroupJID)), presence);
 
@@ -482,7 +482,7 @@ public class AgentSession {
         }
         presence.addExtension(new MetaData(this.metaData));
 
-        PacketCollector collector = this.connection.createPacketCollectorAndSend(new AndFilter(new StanzaTypeFilter(Presence.class),
+        StanzaCollector collector = this.connection.createStanzaCollectorAndSend(new AndFilter(new StanzaTypeFilter(Presence.class),
                 FromMatchesFilter.create(workgroupJID)), presence);
 
         collector.nextResultOrThrow();
@@ -581,7 +581,7 @@ public class AgentSession {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        OccupantsInfo response = (OccupantsInfo) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        OccupantsInfo response = (OccupantsInfo) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 
@@ -837,7 +837,7 @@ public class AgentSession {
         notes.setTo(workgroupJID);
         notes.setSessionID(sessionID);
         notes.setNotes(note);
-        connection.createPacketCollectorAndSend(notes).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(notes).nextResultOrThrow();
     }
 
     /**
@@ -856,7 +856,7 @@ public class AgentSession {
         request.setTo(workgroupJID);
         request.setSessionID(sessionID);
 
-        ChatNotes response = (ChatNotes) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        ChatNotes response = (ChatNotes) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 
@@ -882,7 +882,7 @@ public class AgentSession {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        AgentChatHistory response = connection.createPacketCollectorAndSend(
+        AgentChatHistory response = connection.createStanzaCollectorAndSend(
                         request).nextResult();
 
         return response;
@@ -902,7 +902,7 @@ public class AgentSession {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        SearchSettings response = (SearchSettings) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        SearchSettings response = (SearchSettings) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 
@@ -922,7 +922,7 @@ public class AgentSession {
         request.setTo(workgroupJID);
         request.setPersonal(!global);
 
-        Macros response = (Macros) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        Macros response = (Macros) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response.getRootGroup();
     }
 
@@ -942,7 +942,7 @@ public class AgentSession {
         request.setPersonal(true);
         request.setPersonalMacroGroup(group);
 
-        connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
     }
 
     /**
@@ -960,7 +960,7 @@ public class AgentSession {
         request.setTo(workgroupJID);
         request.setSessionID(sessionID);
 
-        ChatMetadata response = connection.createPacketCollectorAndSend(request).nextResult();
+        ChatMetadata response = connection.createStanzaCollectorAndSend(request).nextResult();
 
         return response.getMetadata();
     }
@@ -1002,7 +1002,7 @@ public class AgentSession {
         iq.setTo(workgroupJID);
         iq.setFrom(connection.getUser());
 
-        connection.createPacketCollectorAndSend(iq).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(iq).nextResultOrThrow();
     }
 
     /**
@@ -1040,7 +1040,7 @@ public class AgentSession {
         iq.setTo(workgroupJID);
         iq.setFrom(connection.getUser());
 
-        connection.createPacketCollectorAndSend(iq).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(iq).nextResultOrThrow();
     }
 
     /**
@@ -1059,7 +1059,7 @@ public class AgentSession {
         setting.setType(IQ.Type.get);
         setting.setTo(workgroupJID);
 
-        GenericSettings response = (GenericSettings) connection.createPacketCollectorAndSend(
+        GenericSettings response = (GenericSettings) connection.createStanzaCollectorAndSend(
                         setting).nextResultOrThrow();
         return response;
     }
@@ -1069,7 +1069,7 @@ public class AgentSession {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        MonitorPacket response = (MonitorPacket) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        MonitorPacket response = (MonitorPacket) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response.isMonitor();
     }
 
@@ -1079,6 +1079,6 @@ public class AgentSession {
         request.setTo(workgroupJID);
         request.setSessionID(sessionID);
 
-        connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
     }
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
index 44f47a40a..db1c2d013 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptManager.java
@@ -53,7 +53,7 @@ public class TranscriptManager {
     public Transcript getTranscript(Jid workgroupJID, String sessionID) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         Transcript request = new Transcript(sessionID);
         request.setTo(workgroupJID);
-        Transcript response = (Transcript) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        Transcript response = (Transcript) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 
@@ -72,7 +72,7 @@ public class TranscriptManager {
     public Transcripts getTranscripts(Jid workgroupJID, Jid userID) throws NoResponseException, XMPPErrorException, NotConnectedException, InterruptedException {
         Transcripts request = new Transcripts(userID);
         request.setTo(workgroupJID);
-        Transcripts response = (Transcripts) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        Transcripts response = (Transcripts) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
index 99415303f..33498ce1a 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TranscriptSearchManager.java
@@ -58,7 +58,7 @@ public class TranscriptSearchManager {
         search.setType(IQ.Type.get);
         search.setTo(serviceJID);
 
-        TranscriptSearch response = (TranscriptSearch) connection.createPacketCollectorAndSend(
+        TranscriptSearch response = (TranscriptSearch) connection.createStanzaCollectorAndSend(
                         search).nextResultOrThrow();
         return Form.getFormFrom(response);
     }
@@ -82,7 +82,7 @@ public class TranscriptSearchManager {
         search.setTo(serviceJID);
         search.addExtension(completedForm.getDataFormToSend());
 
-        TranscriptSearch response = (TranscriptSearch) connection.createPacketCollectorAndSend(
+        TranscriptSearch response = (TranscriptSearch) connection.createStanzaCollectorAndSend(
                         search).nextResultOrThrow();
         return ReportedData.getReportedDataFrom(response);
     }
diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
index 68b0e7917..4b0e737e6 100644
--- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
+++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
@@ -21,7 +21,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import org.jivesoftware.smack.PacketCollector;
+import org.jivesoftware.smack.StanzaCollector;
 import org.jivesoftware.smack.StanzaListener;
 import org.jivesoftware.smack.SmackException;
 import org.jivesoftware.smack.SmackException.NoResponseException;
@@ -145,7 +145,7 @@ public class Workgroup {
         StanzaFilter typeFilter = new StanzaTypeFilter(Message.class);
 
         connection.addAsyncStanzaListener(new StanzaListener() {
-            public void processPacket(Stanza packet) {
+            public void processStanza(Stanza packet) {
                 handlePacket(packet);
             }
         }, typeFilter);
@@ -184,7 +184,7 @@ public class Workgroup {
         directedPresence.setTo(workgroupJID);
         StanzaFilter typeFilter = new StanzaTypeFilter(Presence.class);
         StanzaFilter fromFilter = FromMatchesFilter.create(workgroupJID);
-        PacketCollector collector = connection.createPacketCollectorAndSend(new AndFilter(fromFilter,
+        StanzaCollector collector = connection.createStanzaCollectorAndSend(new AndFilter(fromFilter,
                 typeFilter), directedPresence);
 
         Presence response = (Presence)collector.nextResultOrThrow();
@@ -342,7 +342,7 @@ public class Workgroup {
 
         JoinQueuePacket joinPacket = new JoinQueuePacket(workgroupJID, answerForm, userID);
 
-        connection.createPacketCollectorAndSend(joinPacket).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(joinPacket).nextResultOrThrow();
         // Notify listeners that we've joined the queue.
         fireQueueJoinedEvent();
     }
@@ -424,7 +424,7 @@ public class Workgroup {
         }
 
         DepartQueuePacket departPacket = new DepartQueuePacket(this.workgroupJID);
-        connection.createPacketCollectorAndSend(departPacket).nextResultOrThrow();
+        connection.createStanzaCollectorAndSend(departPacket).nextResultOrThrow();
 
         // Notify listeners that we're no longer in the queue.
         fireQueueDepartedEvent();
@@ -649,7 +649,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        ChatSettings response = (ChatSettings) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        ChatSettings response = (ChatSettings) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
 
         return response;
     }
@@ -689,7 +689,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        OfflineSettings response = (OfflineSettings) connection.createPacketCollectorAndSend(
+        OfflineSettings response = (OfflineSettings) connection.createStanzaCollectorAndSend(
                         request).nextResultOrThrow();
         return response;
     }
@@ -708,7 +708,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        SoundSettings response = (SoundSettings) connection.createPacketCollectorAndSend(request).nextResultOrThrow();
+        SoundSettings response = (SoundSettings) connection.createStanzaCollectorAndSend(request).nextResultOrThrow();
         return response;
     }
 
@@ -726,7 +726,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        WorkgroupProperties response = (WorkgroupProperties) connection.createPacketCollectorAndSend(
+        WorkgroupProperties response = (WorkgroupProperties) connection.createStanzaCollectorAndSend(
                         request).nextResultOrThrow();
         return response;
     }
@@ -747,7 +747,7 @@ public class Workgroup {
         request.setType(IQ.Type.get);
         request.setTo(workgroupJID);
 
-        WorkgroupProperties response = (WorkgroupProperties) connection.createPacketCollectorAndSend(
+        WorkgroupProperties response = (WorkgroupProperties) connection.createStanzaCollectorAndSend(
                         request).nextResultOrThrow();
         return response;
     }
@@ -769,7 +769,7 @@ public class Workgroup {
         workgroupForm.setType(IQ.Type.get);
         workgroupForm.setTo(workgroupJID);
 
-        WorkgroupForm response = (WorkgroupForm) connection.createPacketCollectorAndSend(
+        WorkgroupForm response = (WorkgroupForm) connection.createStanzaCollectorAndSend(
                         workgroupForm).nextResultOrThrow();
         return Form.getFormFrom(response);
     }
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 3959b485d..61cf22d2d 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
@@ -77,7 +77,7 @@ public final class MessageEventManager extends Manager {
         super(connection);
         // Listens for all message event packets and fire the proper message event listeners.
         connection.addAsyncStanzaListener(new StanzaListener() {
-            public void processPacket(Stanza packet) {
+            public void processStanza(Stanza packet) {
                 Message message = (Message) packet;
                 MessageEvent messageEvent =
                     (MessageEvent) message.getExtension("x", "jabber:x:event");
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 ff7004c45..506e02c93 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
@@ -78,7 +78,7 @@ public class RosterExchangeManager {
         weakRefConnection = new WeakReference(connection);
         // Listens for all roster exchange packets and fire the roster exchange listeners.
         packetListener = new StanzaListener() {
-            public void processPacket(Stanza packet) {
+            public void processStanza(Stanza packet) {
                 Message message = (Message) packet;
                 RosterExchange rosterExchange =
                     (RosterExchange) message.getExtension(ELEMENT, NAMESPACE);
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 a5f5d87bb..8e843a805 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
@@ -1857,7 +1857,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
                     for (Stanza ackedStanza : ackedStanzas) {
                         for (StanzaListener listener : stanzaAcknowledgedListeners) {
                             try {
-                                listener.processPacket(ackedStanza);
+                                listener.processStanza(ackedStanza);
                             }
                             catch (InterruptedException | NotConnectedException e) {
                                 LOGGER.log(Level.FINER, "Received exception", e);
@@ -1870,7 +1870,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
                         StanzaListener listener = stanzaIdAcknowledgedListeners.remove(id);
                         if (listener != null) {
                             try {
-                                listener.processPacket(ackedStanza);
+                                listener.processStanza(ackedStanza);
                             }
                             catch (InterruptedException | NotConnectedException e) {
                                 LOGGER.log(Level.FINER, "Received exception", e);