mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-24 19:47:58 +01:00
Reworked Interceptor and InterceptorWrapper
Allows interceptor to remove themselves in the interceptPacket() method.
Same change for Interceptors as was done in
15d59299a2
for (send|recv)Listeners.
This commit is contained in:
parent
c3528d082e
commit
36da216b4a
1 changed files with 23 additions and 39 deletions
|
@ -25,7 +25,6 @@ import java.util.LinkedList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
|
||||||
import java.util.concurrent.ConcurrentLinkedQueue;
|
import java.util.concurrent.ConcurrentLinkedQueue;
|
||||||
import java.util.concurrent.CopyOnWriteArraySet;
|
import java.util.concurrent.CopyOnWriteArraySet;
|
||||||
import java.util.concurrent.ScheduledExecutorService;
|
import java.util.concurrent.ScheduledExecutorService;
|
||||||
|
@ -129,8 +128,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
|
||||||
* sent to the server. These interceptors may modify the packet before it is being
|
* sent to the server. These interceptors may modify the packet before it is being
|
||||||
* actually sent to the server.
|
* actually sent to the server.
|
||||||
*/
|
*/
|
||||||
protected final Map<PacketInterceptor, InterceptorWrapper> interceptors =
|
private final Map<PacketInterceptor, InterceptorWrapper> interceptors =
|
||||||
new ConcurrentHashMap<PacketInterceptor, InterceptorWrapper>();
|
new HashMap<PacketInterceptor, InterceptorWrapper>();
|
||||||
|
|
||||||
protected final Lock connectionLock = new ReentrantLock();
|
protected final Lock connectionLock = new ReentrantLock();
|
||||||
|
|
||||||
|
@ -732,21 +731,17 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
|
||||||
if (packetInterceptor == null) {
|
if (packetInterceptor == null) {
|
||||||
throw new NullPointerException("Packet interceptor is null.");
|
throw new NullPointerException("Packet interceptor is null.");
|
||||||
}
|
}
|
||||||
interceptors.put(packetInterceptor, new InterceptorWrapper(packetInterceptor, packetFilter));
|
InterceptorWrapper interceptorWrapper = new InterceptorWrapper(packetInterceptor, packetFilter);
|
||||||
|
synchronized (interceptors) {
|
||||||
|
interceptors.put(packetInterceptor, interceptorWrapper);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removePacketInterceptor(PacketInterceptor packetInterceptor) {
|
public void removePacketInterceptor(PacketInterceptor packetInterceptor) {
|
||||||
interceptors.remove(packetInterceptor);
|
synchronized (interceptors) {
|
||||||
}
|
interceptors.remove(packetInterceptor);
|
||||||
|
}
|
||||||
/**
|
|
||||||
* Get a map of all packet interceptors for sending packets of this connection.
|
|
||||||
*
|
|
||||||
* @return a map of all packet interceptors for sending packets.
|
|
||||||
*/
|
|
||||||
protected Map<PacketInterceptor, InterceptorWrapper> getPacketInterceptors() {
|
|
||||||
return interceptors;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -758,11 +753,17 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
|
||||||
* @param packet the packet that is going to be sent to the server
|
* @param packet the packet that is going to be sent to the server
|
||||||
*/
|
*/
|
||||||
private void firePacketInterceptors(Packet packet) {
|
private void firePacketInterceptors(Packet packet) {
|
||||||
if (packet != null) {
|
List<PacketInterceptor> interceptorsToInvoke = new LinkedList<PacketInterceptor>();
|
||||||
|
synchronized (interceptors) {
|
||||||
for (InterceptorWrapper interceptorWrapper : interceptors.values()) {
|
for (InterceptorWrapper interceptorWrapper : interceptors.values()) {
|
||||||
interceptorWrapper.notifyListener(packet);
|
if (interceptorWrapper.filterMatches(packet)) {
|
||||||
|
interceptorsToInvoke.add(interceptorWrapper.getInterceptor());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
for (PacketInterceptor interceptor : interceptorsToInvoke) {
|
||||||
|
interceptor.interceptPacket(packet);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -956,8 +957,8 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
|
||||||
*/
|
*/
|
||||||
protected static class InterceptorWrapper {
|
protected static class InterceptorWrapper {
|
||||||
|
|
||||||
private PacketInterceptor packetInterceptor;
|
private final PacketInterceptor packetInterceptor;
|
||||||
private PacketFilter packetFilter;
|
private final PacketFilter packetFilter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a class which associates a packet filter with an interceptor.
|
* Create a class which associates a packet filter with an interceptor.
|
||||||
|
@ -970,29 +971,12 @@ public abstract class AbstractXMPPConnection implements XMPPConnection {
|
||||||
this.packetFilter = packetFilter;
|
this.packetFilter = packetFilter;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean equals(Object object) {
|
public boolean filterMatches(Packet packet) {
|
||||||
if (object == null) {
|
return packetFilter == null || packetFilter.accept(packet);
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (object instanceof InterceptorWrapper) {
|
|
||||||
return ((InterceptorWrapper) object).packetInterceptor
|
|
||||||
.equals(this.packetInterceptor);
|
|
||||||
}
|
|
||||||
else if (object instanceof PacketInterceptor) {
|
|
||||||
return object.equals(this.packetInterceptor);
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
public PacketInterceptor getInterceptor() {
|
||||||
* Notify and process the packet interceptor if the filter matches the packet.
|
return packetInterceptor;
|
||||||
*
|
|
||||||
* @param packet the packet which will be sent.
|
|
||||||
*/
|
|
||||||
public void notifyListener(Packet packet) {
|
|
||||||
if (packetFilter == null || packetFilter.accept(packet)) {
|
|
||||||
packetInterceptor.interceptPacket(packet);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue