Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-09-10 18:59:41 +02:00
Code Issues Releases Wiki Activity

Remove deprecated constructor for FromMatchesFilter (SMACK-71)

Browse source
This commit is contained in:
Lars Noschinski 2014-03-06 21:05:49 +01:00 • committed by Florian Schmaus
parent 62de78ef7c
commit 86a4bfa43f
8 changed files with 16 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/org/jivesoftware/smack/ChatManager.java
View file

@ -313,7 +313,7 @@ public class ChatManager {
PacketCollector createPacketCollector(Chat chat) {
return connection.createPacketCollector(new AndFilter(new ThreadFilter(chat.getThreadID()),
new FromMatchesFilter(chat.getParticipant())));
FromMatchesFilter.create(chat.getParticipant())));
}
/**

13
core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java
View file

@ -1,6 +1,6 @@
/**
*
* Copyright 2003-2007 Jive Software.
* Copyright 2003-2014 Jive Software.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -36,14 +36,6 @@ public class FromMatchesFilter implements PacketFilter {
*/
private boolean matchBareJID = false;
/**
* @see FromMatchesFilter#create(String)
*/
@Deprecated
public FromMatchesFilter(String address) {
this(address, "".equals(StringUtils.parseResource(address)));
}
/**
* Creates a filter matching on the "from" field. The from address must be the same as the
* filter address. The second parameter specifies whether the full or the bare addresses are
@ -106,6 +98,7 @@ public class FromMatchesFilter implements PacketFilter {
}
public String toString() {
return "FromMatchesFilter: " + address;
String matchMode = matchBareJID ? "bare" : "full";
return "FromMatchesFilter (" +matchMode + "): " + address;
}
}

81
core/src/test/java/org/jivesoftware/smack/filters/FromMatchesFilterTest.java
View file

@ -40,87 +40,6 @@ public class FromMatchesFilterTest {
private static final String SERVICE_JID1 = "muc.myserver.com";
private static final String SERVICE_JID2 = "pubsub.myserver.com";
@Test
public void oldCompareMatchingFullJid()
{
FromMatchesFilter filter = new FromMatchesFilter(FULL_JID1_R1);
Packet packet = new Packet() {
@Override
public String toXML() { return null; }
};
packet.setFrom(FULL_JID1_R1);
assertTrue(filter.accept(packet));
packet.setFrom(BASE_JID1);
assertFalse(filter.accept(packet));
packet.setFrom(FULL_JID1_R2);
assertFalse(filter.accept(packet));
packet.setFrom(BASE_JID2);
assertFalse(filter.accept(packet));
packet.setFrom(FULL_JID2);
assertFalse(filter.accept(packet));
packet.setFrom(BASE_JID3);
assertFalse(filter.accept(packet));
}
@Test
public void oldCompareMatchingBaseJid()
{
FromMatchesFilter filter = new FromMatchesFilter(BASE_JID1);
Packet packet = new Packet() {
@Override
public String toXML() { return null; }
};
packet.setFrom(BASE_JID1);
assertTrue(filter.accept(packet));
packet.setFrom(FULL_JID1_R1);
assertTrue(filter.accept(packet));
packet.setFrom(FULL_JID1_R2);
assertTrue(filter.accept(packet));
packet.setFrom(BASE_JID2);
assertFalse(filter.accept(packet));
packet.setFrom(FULL_JID2);
assertFalse(filter.accept(packet));
packet.setFrom(BASE_JID3);
assertFalse(filter.accept(packet));
}
@Test
public void oldCompareMatchingServiceJid()
{
FromMatchesFilter filter = new FromMatchesFilter(SERVICE_JID1);
Packet packet = new Packet() {
@Override
public String toXML() { return null; }
};
packet.setFrom(SERVICE_JID1);
assertTrue(filter.accept(packet));
packet.setFrom(SERVICE_JID2);
assertFalse(filter.accept(packet));
packet.setFrom(BASE_JID1);
assertFalse(filter.accept(packet));
packet.setFrom(FULL_JID1_R1);
assertFalse(filter.accept(packet));
packet.setFrom(BASE_JID3);
assertFalse(filter.accept(packet));
}
@Test
public void autoCompareMatchingFullJid()
{