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 PacketFilter (and implementing classes) and PacketExtension

Browse source 
to StanzaFilter and ExtensionElement.
This commit is contained in:
Florian Schmaus 2015-02-26 18:41:17 +01:00
parent 2250ac20ed
commit d4a6d8e653
233 changed files with 1175 additions and 895 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java
View file

@ -17,14 +17,14 @@
package org.jivesoftware.smack.sm.packet;
import org.jivesoftware.smack.packet.FullStreamElement;
import org.jivesoftware.smack.packet.PacketExtension;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.util.XmlStringBuilder;
public class StreamManagement {
public static final String NAMESPACE = "urn:xmpp:sm:3";
public static class StreamManagementFeature implements PacketExtension {
public static class StreamManagementFeature implements ExtensionElement {
public static final String ELEMENT = "sm";
public static final StreamManagementFeature INSTANCE = new StreamManagementFeature();

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

@ -16,10 +16,10 @@
*/
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.Stanza;
public class AfterXStanzas implements PacketFilter {
public class AfterXStanzas implements StanzaFilter {
final int count;
int currentCount;

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

@ -16,11 +16,11 @@
*/
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.packet.Stanza;
public class ForEveryMessage implements PacketFilter {
public class ForEveryMessage implements StanzaFilter {
public static final ForEveryMessage INSTANCE = new ForEveryMessage();

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

@ -16,10 +16,10 @@
*/
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.Stanza;
public class ForEveryStanza implements PacketFilter {
public class ForEveryStanza implements StanzaFilter {
public static final ForEveryStanza INSTANCE = new ForEveryStanza();

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

@ -16,15 +16,15 @@
*/
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.Stanza;
public class ForMatchingPredicateOrAfterXStanzas implements PacketFilter {
public class ForMatchingPredicateOrAfterXStanzas implements StanzaFilter {
private final PacketFilter predicate;
private final StanzaFilter predicate;
private final AfterXStanzas afterXStanzas;
public ForMatchingPredicateOrAfterXStanzas(PacketFilter predicate, int count) {
public ForMatchingPredicateOrAfterXStanzas(StanzaFilter predicate, int count) {
this.predicate = predicate;
this.afterXStanzas = new AfterXStanzas(count);
}

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

@ -16,18 +16,18 @@
*/
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.tcp.XMPPTCPConnection;
import org.jivesoftware.smack.util.StringUtils;
public class OnceForThisStanza implements PacketFilter {
public class OnceForThisStanza implements StanzaFilter {
private final String id;
private final XMPPTCPConnection connection;
public static void setup(XMPPTCPConnection connection, Stanza packet) {
PacketFilter packetFilter = new OnceForThisStanza(connection, packet);
StanzaFilter packetFilter = new OnceForThisStanza(connection, packet);
connection.addRequestAckPredicate(packetFilter);
}

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

@ -16,11 +16,11 @@
*/
package org.jivesoftware.smack.sm.predicates;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
public class Predicate {
public static PacketFilter forMessagesOrAfter5Stanzas() {
public static StanzaFilter forMessagesOrAfter5Stanzas() {
return new ForMatchingPredicateOrAfterXStanzas(ForEveryMessage.INSTANCE, 5);
}

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

@ -20,31 +20,31 @@ import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.Set;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.packet.Stanza;
public class ShortcutPredicates implements PacketFilter {
public class ShortcutPredicates implements StanzaFilter {
private final Set<PacketFilter> predicates = new LinkedHashSet<PacketFilter>();
private final Set<StanzaFilter> predicates = new LinkedHashSet<StanzaFilter>();
public ShortcutPredicates() {
}
public ShortcutPredicates(Collection<? extends PacketFilter> predicates) {
public ShortcutPredicates(Collection<? extends StanzaFilter> predicates) {
this.predicates.addAll(predicates);
}
public boolean addPredicate(PacketFilter predicate) {
public boolean addPredicate(StanzaFilter predicate) {
return predicates.add(predicate);
}
public boolean removePredicate(PacketFilter prediacte) {
public boolean removePredicate(StanzaFilter prediacte) {
return predicates.remove(prediacte);
}
@Override
public boolean accept(Stanza packet) {
for (PacketFilter predicate : predicates) {
for (StanzaFilter predicate : predicates) {
if (predicate.accept(packet)) {
return true;
}

4
smack-tcp/src/main/java/org/jivesoftware/smack/sm/provider/StreamManagementStreamFeatureProvider.java
View file

@ -16,11 +16,11 @@
*/
package org.jivesoftware.smack.sm.provider;
import org.jivesoftware.smack.provider.PacketExtensionProvider;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.sm.packet.StreamManagement.StreamManagementFeature;
import org.xmlpull.v1.XmlPullParser;
public class StreamManagementStreamFeatureProvider extends PacketExtensionProvider<StreamManagementFeature> {
public class StreamManagementStreamFeatureProvider extends ExtensionElementProvider<StreamManagementFeature> {
@Override
public StreamManagementFeature parse(XmlPullParser parser,

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

@ -38,7 +38,7 @@ import org.jivesoftware.smack.XMPPException;
import org.jivesoftware.smack.XMPPException.XMPPErrorException;
import org.jivesoftware.smack.compress.packet.Compressed;
import org.jivesoftware.smack.compression.XMPPInputOutputStream;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.StanzaFilter;
import org.jivesoftware.smack.compress.packet.Compress;
import org.jivesoftware.smack.packet.Element;
import org.jivesoftware.smack.packet.IQ;
@ -279,7 +279,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
* order in which they are invoked in order to determine if an ack request should be send or not.
* </p>
*/
private final Set<PacketFilter> requestAckPredicates = new LinkedHashSet<PacketFilter>();
private final Set<StanzaFilter> requestAckPredicates = new LinkedHashSet<StanzaFilter>();
private final XMPPTCPConnectionConfiguration config;
@ -534,7 +534,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
protected void sendPacketInternal(Stanza packet) throws NotConnectedException {
packetWriter.sendStreamElement(packet);
if (isSmEnabled()) {
for (PacketFilter requestAckPredicate : requestAckPredicates) {
for (StanzaFilter requestAckPredicate : requestAckPredicates) {
if (requestAckPredicate.accept(packet)) {
requestSmAcknowledgementInternal();
break;
@ -1487,7 +1487,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
* @param predicate the predicate to add.
* @return if the predicate was not already active.
*/
public boolean addRequestAckPredicate(PacketFilter predicate) {
public boolean addRequestAckPredicate(StanzaFilter predicate) {
synchronized (requestAckPredicates) {
return requestAckPredicates.add(predicate);
}
@ -1498,7 +1498,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
* @param predicate the predicate to remove.
* @return true if the predicate was removed.
*/
public boolean removeRequestAckPredicate(PacketFilter predicate) {
public boolean removeRequestAckPredicate(StanzaFilter predicate) {
synchronized (requestAckPredicates) {
return requestAckPredicates.remove(predicate);
}