mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2025-12-06 13:11:08 +01:00
Bump ErrorProne to 2.5.1 and refactor Providers a bit
This also resulted in a refactoring of the Providers and parsing Exceptions. NumberFormatException and ParseException can now be thrown directly, the wrapping in a SmackParsingException is down at a higher layer, i.e. in AbstractProvider.
This commit is contained in:
Florian Schmaus
parent
1df0763f92
commit
a7b3303f3e
136 changed files with 574 additions and 551 deletions
|
|
@ -24,7 +24,6 @@ import static org.junit.Assert.assertTrue;
|
|||
|
||||
import org.jivesoftware.smack.DummyConnection;
|
||||
import org.jivesoftware.smack.packet.Message;
|
||||
import org.jivesoftware.smack.packet.Message.Type;
|
||||
import org.jivesoftware.smack.packet.MessageBuilder;
|
||||
import org.jivesoftware.smack.packet.Stanza;
|
||||
import org.jivesoftware.smack.packet.StanzaBuilder;
|
||||
|
|
@ -92,7 +91,7 @@ public class ChatConnectionTest {
|
|||
@Test
|
||||
public void validateMessageTypeWithDefaults1() {
|
||||
MessageBuilder incomingChat = createChatPacket("134", true);
|
||||
incomingChat.ofType(Type.chat);
|
||||
incomingChat.ofType(Message.Type.chat);
|
||||
processServerMessage(incomingChat.build());
|
||||
assertNotNull(listener.getNewChat());
|
||||
}
|
||||
|
|
@ -100,14 +99,14 @@ public class ChatConnectionTest {
|
|||
@Test
|
||||
public void validateMessageTypeWithDefaults2() {
|
||||
MessageBuilder incomingChat = createChatPacket("134", true);
|
||||
incomingChat.ofType(Type.normal);
|
||||
incomingChat.ofType(Message.Type.normal);
|
||||
processServerMessage(incomingChat.build());
|
||||
assertNotNull(listener.getNewChat());
|
||||
}
|
||||
@Test
|
||||
public void validateMessageTypeWithDefaults3() {
|
||||
MessageBuilder incomingChat = createChatPacket("134", true);
|
||||
incomingChat.ofType(Type.groupchat);
|
||||
incomingChat.ofType(Message.Type.groupchat);
|
||||
processServerMessage(incomingChat.build());
|
||||
assertNull(listener.getNewChat());
|
||||
}
|
||||
|
|
@ -115,7 +114,7 @@ public class ChatConnectionTest {
|
|||
@Test
|
||||
public void validateMessageTypeWithDefaults4() {
|
||||
MessageBuilder incomingChat = createChatPacket("134", true);
|
||||
incomingChat.ofType(Type.headline);
|
||||
incomingChat.ofType(Message.Type.headline);
|
||||
assertNull(listener.getNewChat());
|
||||
}
|
||||
|
||||
|
|
@ -123,7 +122,7 @@ public class ChatConnectionTest {
|
|||
public void validateMessageTypeWithNoNormal1() {
|
||||
cm.setNormalIncluded(false);
|
||||
MessageBuilder incomingChat = createChatPacket("134", true);
|
||||
incomingChat.ofType(Type.chat);
|
||||
incomingChat.ofType(Message.Type.chat);
|
||||
processServerMessage(incomingChat.build());
|
||||
assertNotNull(listener.getNewChat());
|
||||
}
|
||||
|
|
@ -132,7 +131,7 @@ public class ChatConnectionTest {
|
|||
public void validateMessageTypeWithNoNormal2() {
|
||||
cm.setNormalIncluded(false);
|
||||
MessageBuilder incomingChat = createChatPacket("134", true);
|
||||
incomingChat.ofType(Type.normal);
|
||||
incomingChat.ofType(Message.Type.normal);
|
||||
processServerMessage(incomingChat.build());
|
||||
assertNull(listener.getNewChat());
|
||||
}
|
||||
|
|
@ -318,7 +317,7 @@ public class ChatConnectionTest {
|
|||
cm.setNormalIncluded(false);
|
||||
|
||||
MessageBuilder incomingChat = createChatPacket(null, false);
|
||||
incomingChat.ofType(Type.normal);
|
||||
incomingChat.ofType(Message.Type.normal);
|
||||
processServerMessage(incomingChat.build());
|
||||
|
||||
assertNull(listener.getNewChat());
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ import org.jivesoftware.smack.SmackException;
|
|||
import org.jivesoftware.smack.im.InitSmackIm;
|
||||
import org.jivesoftware.smack.packet.ErrorIQ;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.IQ.Type;
|
||||
import org.jivesoftware.smack.packet.Presence;
|
||||
import org.jivesoftware.smack.packet.Stanza;
|
||||
import org.jivesoftware.smack.packet.StanzaError.Condition;
|
||||
|
|
@ -385,7 +384,7 @@ public class RosterTest extends InitSmackIm {
|
|||
public void testIgnoreInvalidFrom() throws XmppStringprepException {
|
||||
final BareJid spammerJid = JidCreate.entityBareFrom("spam@example.com");
|
||||
RosterPacket packet = new RosterPacket();
|
||||
packet.setType(Type.set);
|
||||
packet.setType(IQ.Type.set);
|
||||
packet.setTo(connection.getUser());
|
||||
packet.setFrom(JidCreate.entityBareFrom("mallory@example.com"));
|
||||
packet.addRosterItem(new Item(spammerJid, "Cool products!"));
|
||||
|
|
@ -530,7 +529,7 @@ public class RosterTest extends InitSmackIm {
|
|||
for (RosterEntry entry : roster.getEntries()) {
|
||||
// prepare the roster push packet
|
||||
final RosterPacket rosterPush = new RosterPacket();
|
||||
rosterPush.setType(Type.set);
|
||||
rosterPush.setType(IQ.Type.set);
|
||||
rosterPush.setTo(connection.getUser());
|
||||
|
||||
// prepare the buddy's item entry which should be removed
|
||||
|
|
@ -555,7 +554,7 @@ public class RosterTest extends InitSmackIm {
|
|||
roster.reload();
|
||||
while (true) {
|
||||
final Stanza sentPacket = connection.getSentPacket();
|
||||
if (sentPacket instanceof RosterPacket && ((IQ) sentPacket).getType() == Type.get) {
|
||||
if (sentPacket instanceof RosterPacket && ((IQ) sentPacket).getType() == IQ.Type.get) {
|
||||
// setup the roster get request
|
||||
final RosterPacket rosterRequest = (RosterPacket) sentPacket;
|
||||
assertSame("The <query/> element MUST NOT contain any <item/> child elements!",
|
||||
|
|
@ -565,7 +564,7 @@ public class RosterTest extends InitSmackIm {
|
|||
// prepare the roster result
|
||||
final RosterPacket rosterResult = new RosterPacket();
|
||||
rosterResult.setTo(connection.getUser());
|
||||
rosterResult.setType(Type.result);
|
||||
rosterResult.setType(IQ.Type.result);
|
||||
rosterResult.setStanzaId(rosterRequest.getStanzaId());
|
||||
|
||||
// prepare romeo's roster entry
|
||||
|
|
@ -674,7 +673,7 @@ public class RosterTest extends InitSmackIm {
|
|||
try {
|
||||
while (true) {
|
||||
final Stanza packet = connection.getSentPacket();
|
||||
if (packet instanceof RosterPacket && ((IQ) packet).getType() == Type.set) {
|
||||
if (packet instanceof RosterPacket && ((IQ) packet).getType() == IQ.Type.set) {
|
||||
final RosterPacket rosterRequest = (RosterPacket) packet;
|
||||
|
||||
// Prepare and process the roster push
|
||||
|
|
@ -683,7 +682,7 @@ public class RosterTest extends InitSmackIm {
|
|||
if (item.getItemType() != ItemType.remove) {
|
||||
item.setItemType(ItemType.none);
|
||||
}
|
||||
rosterPush.setType(Type.set);
|
||||
rosterPush.setType(IQ.Type.set);
|
||||
rosterPush.setTo(connection.getUser());
|
||||
rosterPush.addRosterItem(item);
|
||||
connection.processStanza(rosterPush);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ import org.jivesoftware.smack.DummyConnection;
|
|||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.IQ.Type;
|
||||
import org.jivesoftware.smack.packet.Stanza;
|
||||
import org.jivesoftware.smack.roster.RosterTest.TestRosterListener;
|
||||
import org.jivesoftware.smack.roster.packet.RosterPacket;
|
||||
|
|
@ -146,7 +145,7 @@ public class RosterVersioningTest {
|
|||
RosterPacket sentRP = (RosterPacket) sentPacket;
|
||||
RosterPacket answer = new RosterPacket();
|
||||
answer.setStanzaId(sentRP.getStanzaId());
|
||||
answer.setType(Type.result);
|
||||
answer.setType(IQ.Type.result);
|
||||
answer.setTo(sentRP.getFrom());
|
||||
|
||||
answer.setVersion("newVersion");
|
||||
|
|
@ -188,7 +187,7 @@ public class RosterVersioningTest {
|
|||
{
|
||||
RosterPacket rosterPush = new RosterPacket();
|
||||
rosterPush.setTo(JidCreate.from("rostertest@example.com/home"));
|
||||
rosterPush.setType(Type.set);
|
||||
rosterPush.setType(IQ.Type.set);
|
||||
rosterPush.setVersion("v97");
|
||||
|
||||
Item pushedItem = vaglafItem();
|
||||
|
|
@ -214,7 +213,7 @@ public class RosterVersioningTest {
|
|||
{
|
||||
RosterPacket rosterPush = new RosterPacket();
|
||||
rosterPush.setTo(JidCreate.from("rostertest@example.com/home"));
|
||||
rosterPush.setType(Type.set);
|
||||
rosterPush.setType(IQ.Type.set);
|
||||
rosterPush.setVersion("v98");
|
||||
|
||||
Item item = new Item(JidCreate.entityBareFrom("vaglaf@example.com"), "vaglaf the only");
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ import org.jivesoftware.smack.DummyConnection;
|
|||
import org.jivesoftware.smack.SmackException.FeatureNotSupportedException;
|
||||
import org.jivesoftware.smack.im.InitSmackIm;
|
||||
import org.jivesoftware.smack.packet.IQ;
|
||||
import org.jivesoftware.smack.packet.IQ.Type;
|
||||
import org.jivesoftware.smack.packet.Presence;
|
||||
import org.jivesoftware.smack.packet.Stanza;
|
||||
import org.jivesoftware.smack.roster.RosterTest.TestRosterListener;
|
||||
|
|
@ -161,7 +160,7 @@ public class SubscriptionPreApprovalTest extends InitSmackIm {
|
|||
try {
|
||||
while (true) {
|
||||
final Stanza packet = connection.getSentPacket();
|
||||
if (packet instanceof RosterPacket && ((IQ) packet).getType() == Type.set) {
|
||||
if (packet instanceof RosterPacket && ((IQ) packet).getType() == IQ.Type.set) {
|
||||
final RosterPacket rosterRequest = (RosterPacket) packet;
|
||||
|
||||
// Prepare and process the roster push
|
||||
|
|
@ -170,7 +169,7 @@ public class SubscriptionPreApprovalTest extends InitSmackIm {
|
|||
if (item.getItemType() != ItemType.remove) {
|
||||
item.setItemType(ItemType.none);
|
||||
}
|
||||
rosterPush.setType(Type.set);
|
||||
rosterPush.setType(IQ.Type.set);
|
||||
rosterPush.setTo(connection.getUser());
|
||||
rosterPush.addRosterItem(item);
|
||||
connection.processStanza(rosterPush);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue