vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 09:09:38 +02:00
Code Issues Releases Wiki Activity

Rename 'Packet' class to 'Stanza'

Browse source 
Smack still uses the term 'Packet' in some places. This is just the
first step towards using correct XMPP terms in Smack.
This commit is contained in:
Florian Schmaus 2015-02-05 11:17:27 +01:00
parent 9fc26f1d83
commit 4698805a34
142 changed files with 595 additions and 572 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/AfterXStanzas.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class AfterXStanzas implements PacketFilter {
@ -30,7 +30,7 @@ public class AfterXStanzas implements PacketFilter {
}
@Override
public synchronized boolean accept(Packet packet) {
public synchronized boolean accept(Stanza packet) {
currentCount++;
if (currentCount == count) {
resetCounter();

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ForEveryMessage.java
View file

@ -18,7 +18,7 @@ package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class ForEveryMessage implements PacketFilter {
@ -28,7 +28,7 @@ public class ForEveryMessage implements PacketFilter {
}
@Override
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
if (packet instanceof Message) {
return true;
}

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ForEveryStanza.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class ForEveryStanza implements PacketFilter {
@ -27,7 +27,7 @@ public class ForEveryStanza implements PacketFilter {
}
@Override
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
return true;
}

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ForMatchingPredicateOrAfterXStanzas.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class ForMatchingPredicateOrAfterXStanzas implements PacketFilter {
@ -30,7 +30,7 @@ public class ForMatchingPredicateOrAfterXStanzas implements PacketFilter {
}
@Override
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
if (predicate.accept(packet)) {
afterXStanzas.resetCounter();
return true;

12
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/OnceForThisStanza.java
View file

@ -17,7 +17,7 @@
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.tcp.XMPPTCPConnection;
import org.jivesoftware.smack.util.StringUtils;
@ -26,22 +26,22 @@ public class OnceForThisStanza implements PacketFilter {
private final String id;
private final XMPPTCPConnection connection;
public static void setup(XMPPTCPConnection connection, Packet packet) {
public static void setup(XMPPTCPConnection connection, Stanza packet) {
PacketFilter packetFilter = new OnceForThisStanza(connection, packet);
connection.addRequestAckPredicate(packetFilter);
}
private OnceForThisStanza(XMPPTCPConnection connection, Packet packet) {
private OnceForThisStanza(XMPPTCPConnection connection, Stanza packet) {
this.connection = connection;
this.id = packet.getPacketID();
this.id = packet.getStanzaId();
if (StringUtils.isNullOrEmpty(id)) {
throw new IllegalArgumentException("Stanza ID must be set");
}
}
@Override
public boolean accept(Packet packet) {
String otherId = packet.getPacketID();
public boolean accept(Stanza packet) {
String otherId = packet.getStanzaId();
if (StringUtils.isNullOrEmpty(otherId)) {
return false;
}

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/predicates/ShortcutPredicates.java
View file

@ -21,7 +21,7 @@ import java.util.LinkedHashSet;
import java.util.Set;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
public class ShortcutPredicates implements PacketFilter {
@ -43,7 +43,7 @@ public class ShortcutPredicates implements PacketFilter {
}
@Override
public boolean accept(Packet packet) {
public boolean accept(Stanza packet) {
for (PacketFilter predicate : predicates) {
if (predicate.accept(packet)) {
return true;

38
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View file

@ -44,7 +44,7 @@ import org.jivesoftware.smack.packet.Element;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.StreamOpen;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.StartTls;
import org.jivesoftware.smack.sasl.packet.SaslStreamElements;
@ -233,7 +233,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
*/
private long clientHandledStanzasCount = 0;
private BlockingQueue<Packet> unacknowledgedStanzas;
private BlockingQueue<Stanza> unacknowledgedStanzas;
/**
* Set to true if Stream Management was at least once enabled for this connection.
@ -360,7 +360,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
bindResourceAndEstablishSession(resource);
List<Packet> previouslyUnackedStanzas = new LinkedList<Packet>();
List<Stanza> previouslyUnackedStanzas = new LinkedList<Stanza>();
if (unacknowledgedStanzas != null) {
// There was a previous connection with SM enabled but that was either not resumable or
// failed to resume. Make sure that we (re-)send the unacknowledged stanzas.
@ -368,7 +368,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
if (isSmAvailable() && useSm) {
// Remove what is maybe left from previously stream managed sessions
unacknowledgedStanzas = new ArrayBlockingQueue<Packet>(QUEUE_SIZE);
unacknowledgedStanzas = new ArrayBlockingQueue<Stanza>(QUEUE_SIZE);
serverHandledStanzasCount = 0;
// XEP-198 3. Enabling Stream Management. If the server response to 'Enable' is 'Failed'
// then this is a non recoverable error and we therefore throw an exception.
@ -383,7 +383,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
}
// (Re-)send the stanzas *after* we tried to enable SM
for (Packet stanza : previouslyUnackedStanzas) {
for (Stanza stanza : previouslyUnackedStanzas) {
sendPacketInternal(stanza);
}
@ -495,7 +495,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
@Override
protected void sendPacketInternal(Packet packet) throws NotConnectedException {
protected void sendPacketInternal(Stanza packet) throws NotConnectedException {
packetWriter.sendStreamElement(packet);
if (isSmEnabled()) {
for (PacketFilter requestAckPredicate : requestAckPredicates) {
@ -1069,9 +1069,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
// First, drop the stanzas already handled by the server
processHandledCount(resumed.getHandledCount());
// Then re-send what is left in the unacknowledged queue
List<Packet> stanzasToResend = new LinkedList<Packet>();
List<Stanza> stanzasToResend = new LinkedList<Stanza>();
stanzasToResend.addAll(unacknowledgedStanzas);
for (Packet stanza : stanzasToResend) {
for (Stanza stanza : stanzasToResend) {
packetWriter.sendStreamElement(stanza);
}
smResumedSyncPoint.reportSuccess();
@ -1249,9 +1249,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
if (element == null) {
continue;
}
Packet packet = null;
if (element instanceof Packet) {
packet = (Packet) element;
Stanza packet = null;
if (element instanceof Stanza) {
packet = (Stanza) element;
}
// Check if the stream element should be put to the unacknowledgedStanza
// queue. Note that we can not do the put() in sendPacketInternal() and the
@ -1335,8 +1335,8 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
List<Element> elements = new ArrayList<Element>(queue.size());
queue.drainTo(elements);
for (Element element : elements) {
if (element instanceof Packet) {
unacknowledgedStanzas.add((Packet) element);
if (element instanceof Stanza) {
unacknowledgedStanzas.add((Stanza) element);
}
}
}
@ -1623,11 +1623,11 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
private void processHandledCount(long handledCount) throws NotConnectedException {
long ackedStanzasCount = SMUtils.calculateDelta(handledCount, serverHandledStanzasCount);
final List<Packet> ackedStanzas = new ArrayList<Packet>(
final List<Stanza> ackedStanzas = new ArrayList<Stanza>(
handledCount <= Integer.MAX_VALUE ? (int) handledCount
: Integer.MAX_VALUE);
for (long i = 0; i < ackedStanzasCount; i++) {
Packet ackedStanza = unacknowledgedStanzas.poll();
Stanza ackedStanza = unacknowledgedStanzas.poll();
// If the server ack'ed a stanza, then it must be in the
// unacknowledged stanza queue. There can be no exception.
assert(ackedStanza != null);
@ -1641,8 +1641,8 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
else {
// Otherwise we look for a matching id in the stanza *id* acknowledged listeners
for (Packet ackedStanza : ackedStanzas) {
String id = ackedStanza.getPacketID();
for (Stanza ackedStanza : ackedStanzas) {
String id = ackedStanza.getStanzaId();
if (id != null && stanzaIdAcknowledgedListeners.containsKey(id)) {
atLeastOneStanzaAcknowledgedListener = true;
break;
@ -1655,7 +1655,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
asyncGo(new Runnable() {
@Override
public void run() {
for (Packet ackedStanza : ackedStanzas) {
for (Stanza ackedStanza : ackedStanzas) {
for (PacketListener listener : stanzaAcknowledgedListeners) {
try {
listener.processPacket(ackedStanza);
@ -1664,7 +1664,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
LOGGER.log(Level.FINER, "Received not connected exception", e);
}
}
String id = ackedStanza.getPacketID();
String id = ackedStanza.getStanzaId();
if (StringUtils.isNullOrEmpty(id)) {
return;
}