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

Replace XPP3 by XmlPullParser interface wrapping StAX and XPP3

Browse source 
Introducing Smack's own XmlPullParser interface which tries to stay as
compatible as possible to XPP3. The interface is used to either wrap
StAX's XMLStreamReader if Smack is used on Java SE, and XPP3's
XmlPullParser if Smack is used on on Android.

Fixes SMACK-591.

Also introduce JUnit 5 and non-strict javadoc projects.
This commit is contained in:
Florian Schmaus 2019-05-06 22:06:13 +02:00
parent b3646abecd
commit 4133eb175c
414 changed files with 3855 additions and 2041 deletions
Download patch file Download diff file Expand all files Collapse all files

10
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/OfferConfirmation.java
View file

@ -25,10 +25,10 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.SimpleIQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class OfferConfirmation extends SimpleIQ {
@ -72,21 +72,21 @@ public class OfferConfirmation extends SimpleIQ {
while (!done) {
parser.next();
String elementName = parser.getName();
if (parser.getEventType() == XmlPullParser.START_TAG && "user-jid".equals(elementName)) {
if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT && "user-jid".equals(elementName)) {
try {
confirmation.setUserJID(parser.nextText());
}
catch (NumberFormatException nfe) {
}
}
else if (parser.getEventType() == XmlPullParser.START_TAG && "session-id".equals(elementName)) {
else if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT && "session-id".equals(elementName)) {
try {
confirmation.setSessionID(Long.valueOf(parser.nextText()));
}
catch (NumberFormatException nfe) {
}
}
else if (parser.getEventType() == XmlPullParser.END_TAG && "offer-confirmation".equals(elementName)) {
else if (parser.getEventType() == XmlPullParser.Event.END_ELEMENT && "offer-confirmation".equals(elementName)) {
done = true;
}
}

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/forms/WorkgroupForm.java
View file

@ -24,9 +24,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.parsing.SmackParsingException;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class WorkgroupForm extends SimpleIQ {
@ -57,12 +56,12 @@ public class WorkgroupForm extends SimpleIQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
// Parse the packet extension
PacketParserUtils.addExtensionElement(answer, parser, xmlEnvironment);
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals(ELEMENT_NAME)) {
done = true;
}

28
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/AgentChatHistory.java
View file

@ -26,10 +26,10 @@ import java.util.List;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.EntityBareJid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* IQ provider used to retrieve individual agent information. Each chat session can be mapped
@ -95,7 +95,7 @@ public class AgentChatHistory extends IQ {
@Override
public AgentChatHistory parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
if (parser.getEventType() != XmlPullParser.START_TAG) {
if (parser.getEventType() != XmlPullParser.Event.START_ELEMENT) {
throw new IllegalStateException("Parser not in proper position, or bad XML.");
}
@ -103,12 +103,12 @@ public class AgentChatHistory extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "chat-session".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "chat-session".equals(parser.getName())) {
agentChatHistory.addChatSession(parseChatSetting(parser));
}
else if (eventType == XmlPullParser.END_TAG && ELEMENT_NAME.equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(parser.getName())) {
done = true;
}
}
@ -126,28 +126,28 @@ public class AgentChatHistory extends IQ {
String question = null;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "date".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "date".equals(parser.getName())) {
String dateStr = parser.nextText();
long l = Long.valueOf(dateStr).longValue();
date = new Date(l);
}
else if (eventType == XmlPullParser.START_TAG && "duration".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "duration".equals(parser.getName())) {
duration = Long.valueOf(parser.nextText()).longValue();
}
else if (eventType == XmlPullParser.START_TAG && "visitorsName".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "visitorsName".equals(parser.getName())) {
visitorsName = parser.nextText();
}
else if (eventType == XmlPullParser.START_TAG && "visitorsEmail".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "visitorsEmail".equals(parser.getName())) {
visitorsEmail = parser.nextText();
}
else if (eventType == XmlPullParser.START_TAG && "sessionID".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "sessionID".equals(parser.getName())) {
sessionID = parser.nextText();
}
else if (eventType == XmlPullParser.START_TAG && "question".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "question".equals(parser.getName())) {
question = parser.nextText();
}
else if (eventType == XmlPullParser.END_TAG && "chat-session".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && "chat-session".equals(parser.getName())) {
done = true;
}
}

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/history/ChatMetadata.java
View file

@ -25,12 +25,11 @@ import java.util.Map;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class ChatMetadata extends IQ {
/**
@ -91,8 +90,8 @@ public class ChatMetadata extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("sessionID")) {
chatM.setSessionID(parser.nextText());
}
@ -101,7 +100,7 @@ public class ChatMetadata extends IQ {
chatM.setMetadata(map);
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals(ELEMENT_NAME)) {
done = true;
}

36
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/macros/Macros.java
View file

@ -18,16 +18,14 @@
package org.jivesoftware.smackx.workgroup.ext.macros;
import java.io.IOException;
import java.io.StringReader;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.jivesoftware.smack.util.StringUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.xmlpull.v1.XmlPullParserFactory;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
/**
* Macros iq is responsible for handling global and personal macros in the a Live Assistant
@ -108,15 +106,15 @@ public class Macros extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("model")) {
String macros = parser.nextText();
MacroGroup group = parseMacroGroups(macros);
macroGroup.setRootGroup(group);
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals(ELEMENT_NAME)) {
done = true;
}
@ -130,8 +128,8 @@ public class Macros extends IQ {
Macro macro = new Macro();
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("title")) {
parser.next();
macro.setTitle(parser.getText());
@ -146,7 +144,7 @@ public class Macros extends IQ {
macro.setType(Integer.valueOf(parser.nextText()).intValue());
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("macro")) {
done = true;
}
@ -160,8 +158,8 @@ public class Macros extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("macrogroup")) {
group.addMacroGroup(parseMacroGroup(parser));
}
@ -172,7 +170,7 @@ public class Macros extends IQ {
group.addMacro(parseMacro(parser));
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("macrogroup")) {
done = true;
}
@ -183,12 +181,12 @@ public class Macros extends IQ {
public MacroGroup parseMacroGroups(String macros) throws XmlPullParserException, IOException {
MacroGroup group = null;
XmlPullParser parser = XmlPullParserFactory.newInstance().newPullParser();
parser.setInput(new StringReader(macros));
int eventType = parser.getEventType();
while (eventType != XmlPullParser.END_DOCUMENT) {
XmlPullParser parser = PacketParserUtils.getParserFor(macros);
XmlPullParser.Event eventType = parser.getEventType();
while (eventType != XmlPullParser.Event.END_DOCUMENT) {
eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("macrogroup")) {
group = parseMacroGroup(parser);
}

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/ext/notes/ChatNotes.java
View file

@ -22,9 +22,8 @@ import java.io.IOException;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
/**
* IQ stanza for retrieving and adding Chat Notes.
@ -90,8 +89,8 @@ public class ChatNotes extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("sessionID")) {
chatNotes.setSessionID(parser.nextText());
}
@ -101,7 +100,7 @@ public class ChatNotes extends IQ {
chatNotes.setNotes(note);
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals(ELEMENT_NAME)) {
done = true;
}

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentInfo.java
View file

@ -22,9 +22,8 @@ import java.io.IOException;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
/**
* IQ stanza for retrieving and changing the Agent personal information.
@ -113,8 +112,8 @@ public class AgentInfo extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("jid")) {
answer.setJid(parser.nextText());
}
@ -122,7 +121,7 @@ public class AgentInfo extends IQ {
answer.setName(parser.nextText());
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals(ELEMENT_NAME)) {
done = true;
}

10
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java
View file

@ -30,10 +30,10 @@ import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.EntityBareJid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* Agent status packet.
@ -245,9 +245,9 @@ public class AgentStatus implements ExtensionElement {
boolean done = false;
while (!done) {
int eventType = parser.next();
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if ("chat".equals(parser.getName())) {
agentStatus.currentChats.add(parseChatInfo(parser));
}
@ -255,7 +255,7 @@ public class AgentStatus implements ExtensionElement {
agentStatus.maxChats = Integer.parseInt(parser.nextText());
}
}
else if (eventType == XmlPullParser.END_TAG &&
else if (eventType == XmlPullParser.Event.END_ELEMENT &&
ELEMENT_NAME.equals(parser.getName())) {
done = true;
}

16
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatusRequest.java
View file

@ -27,10 +27,10 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.EntityBareJid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* Agent status request packet. This stanza is used by agents to request the list of
@ -127,11 +127,11 @@ public class AgentStatusRequest extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "agent".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "agent".equals(parser.getName())) {
statusRequest.agents.add(parseAgent(parser));
}
else if (eventType == XmlPullParser.END_TAG &&
else if (eventType == XmlPullParser.Event.END_ELEMENT &&
"agent-status-request".equals(parser.getName())) {
done = true;
}
@ -146,11 +146,11 @@ public class AgentStatusRequest extends IQ {
String type = parser.getAttributeValue("", "type");
String name = null;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "name".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "name".equals(parser.getName())) {
name = parser.nextText();
}
else if (eventType == XmlPullParser.END_TAG &&
else if (eventType == XmlPullParser.Event.END_ELEMENT &&
"agent".equals(parser.getName())) {
done = true;
}

10
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentWorkgroups.java
View file

@ -27,10 +27,10 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* Represents a request for getting the jid of the workgroups where an agent can work or could
@ -112,13 +112,13 @@ public class AgentWorkgroups extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("workgroup")) {
workgroups.add(parser.getAttributeValue("", "jid"));
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("workgroups")) {
done = true;
}

5
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MetaDataProvider.java
View file

@ -23,13 +23,12 @@ import java.util.Map;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.workgroup.MetaData;
import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* This provider parses meta data if it's not contained already in a larger extension provider.
*

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/MonitorPacket.java
View file

@ -21,9 +21,8 @@ import java.io.IOException;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class MonitorPacket extends IQ {
@ -86,8 +85,8 @@ public class MonitorPacket extends IQ {
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "isMonitor".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "isMonitor".equals(parser.getName())) {
String value = parser.nextText();
if ("false".equalsIgnoreCase(value)) {
packet.setMonitor(false);
@ -96,7 +95,7 @@ public class MonitorPacket extends IQ {
packet.setMonitor(true);
}
}
else if (eventType == XmlPullParser.END_TAG && "monitor".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && "monitor".equals(parser.getName())) {
done = true;
}
}

21
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OccupantsInfo.java
View file

@ -31,9 +31,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.parsing.SmackParsingException;
import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
import org.jivesoftware.smack.provider.IQProvider;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
/**
* Stanza used for requesting information about occupants of a room or for retrieving information
@ -143,11 +142,11 @@ public class OccupantsInfo extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG &&
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT &&
"occupant".equals(parser.getName())) {
occupantsInfo.occupants.add(parseOccupantInfo(parser));
} else if (eventType == XmlPullParser.END_TAG &&
} else if (eventType == XmlPullParser.Event.END_ELEMENT &&
ELEMENT_NAME.equals(parser.getName())) {
done = true;
}
@ -162,13 +161,13 @@ public class OccupantsInfo extends IQ {
String nickname = null;
Date joined = null;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "jid".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "jid".equals(parser.getName())) {
jid = parser.nextText();
} else if (eventType == XmlPullParser.START_TAG &&
} else if (eventType == XmlPullParser.Event.START_ELEMENT &&
"nickname".equals(parser.getName())) {
nickname = parser.nextText();
} else if (eventType == XmlPullParser.START_TAG &&
} else if (eventType == XmlPullParser.Event.START_ELEMENT &&
"joined".equals(parser.getName())) {
synchronized (UTC_FORMAT) {
try {
@ -177,7 +176,7 @@ public class OccupantsInfo extends IQ {
throw new SmackParsingException.SmackTextParseException(e);
}
}
} else if (eventType == XmlPullParser.END_TAG &&
} else if (eventType == XmlPullParser.Event.END_ELEMENT &&
"occupant".equals(parser.getName())) {
done = true;
}

12
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRequestProvider.java
View file

@ -28,6 +28,8 @@ import org.jivesoftware.smack.parsing.SmackParsingException;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.workgroup.MetaData;
import org.jivesoftware.smackx.workgroup.agent.InvitationRequest;
@ -37,8 +39,6 @@ import org.jivesoftware.smackx.workgroup.agent.UserRequest;
import org.jivesoftware.smackx.workgroup.util.MetaDataUtils;
import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* An IQProvider for agent offer requests.
@ -53,14 +53,14 @@ public class OfferRequestProvider extends IQProvider<IQ> {
@Override
public OfferRequestPacket parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException {
int eventType = parser.getEventType();
XmlPullParser.Event eventType = parser.getEventType();
String sessionID = null;
int timeout = -1;
OfferContent content = null;
boolean done = false;
Map<String, List<String>> metaData = new HashMap<>();
if (eventType != XmlPullParser.START_TAG) {
if (eventType != XmlPullParser.Event.START_ELEMENT) {
// throw exception
}
@ -71,7 +71,7 @@ public class OfferRequestProvider extends IQProvider<IQ> {
while (!done) {
eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
if (eventType == XmlPullParser.Event.START_ELEMENT) {
String elemName = parser.getName();
if ("timeout".equals(elemName)) {
@ -101,7 +101,7 @@ public class OfferRequestProvider extends IQProvider<IQ> {
content = new TransferRequest(transfer.getInviter(), transfer.getRoom(), transfer.getReason());
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if ("offer".equals(parser.getName())) {
done = true;
}

14
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java
View file

@ -23,10 +23,10 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* An IQProvider class which has savvy about the offer-revoke tag.<br>
@ -46,20 +46,20 @@ public class OfferRevokeProvider extends IQProvider<IQ> {
boolean done = false;
while (!done) {
int eventType = parser.next();
XmlPullParser.Event eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && parser.getName().equals("reason")) {
if ((eventType == XmlPullParser.Event.START_ELEMENT) && parser.getName().equals("reason")) {
reason = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG)
else if ((eventType == XmlPullParser.Event.START_ELEMENT)
&& parser.getName().equals(SessionID.ELEMENT_NAME)) {
sessionID = parser.getAttributeValue("", "id");
}
else if ((eventType == XmlPullParser.START_TAG)
else if ((eventType == XmlPullParser.Event.START_ELEMENT)
&& parser.getName().equals(UserID.ELEMENT_NAME)) {
userID = ParserUtils.getJidAttribute(parser, "id");
}
else if ((eventType == XmlPullParser.END_TAG) && parser.getName().equals(
else if ((eventType == XmlPullParser.Event.END_ELEMENT) && parser.getName().equals(
"offer-revoke")) {
done = true;
}

15
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java
View file

@ -31,12 +31,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.parsing.SmackParsingException;
import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.workgroup.QueueUser;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* Queue details stanza extension, which contains details about the users
* currently in a queue.
@ -153,11 +152,11 @@ public final class QueueDetails implements ExtensionElement {
SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
QueueDetails queueDetails = new QueueDetails();
int eventType = parser.getEventType();
while (eventType != XmlPullParser.END_TAG &&
XmlPullParser.Event eventType = parser.getEventType();
while (eventType != XmlPullParser.Event.END_ELEMENT &&
"notify-queue-details".equals(parser.getName())) {
eventType = parser.next();
while ((eventType == XmlPullParser.START_TAG) && "user".equals(parser.getName())) {
while ((eventType == XmlPullParser.Event.START_ELEMENT) && "user".equals(parser.getName())) {
String uid;
int position = -1;
int time = -1;
@ -170,7 +169,7 @@ public final class QueueDetails implements ExtensionElement {
}
eventType = parser.next();
while (eventType != XmlPullParser.END_TAG
while (eventType != XmlPullParser.Event.END_ELEMENT
|| !"user".equals(parser.getName())) {
if ("position".equals(parser.getName())) {
position = Integer.parseInt(parser.nextText());
@ -197,7 +196,7 @@ public final class QueueDetails implements ExtensionElement {
eventType = parser.next();
if (eventType != XmlPullParser.END_TAG) {
if (eventType != XmlPullParser.Event.END_ELEMENT) {
// throw exception
}
}

13
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java
View file

@ -27,12 +27,11 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.parsing.SmackParsingException;
import org.jivesoftware.smack.parsing.SmackParsingException.SmackTextParseException;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.workgroup.agent.WorkgroupQueue;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class QueueOverview implements ExtensionElement {
/**
@ -130,12 +129,12 @@ public class QueueOverview implements ExtensionElement {
public QueueOverview parse(XmlPullParser parser,
int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException,
IOException, SmackTextParseException {
int eventType = parser.getEventType();
XmlPullParser.Event eventType = parser.getEventType();
QueueOverview queueOverview = new QueueOverview();
SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
eventType = parser.next();
while (eventType != XmlPullParser.END_TAG
while (eventType != XmlPullParser.Event.END_ELEMENT
|| !ELEMENT_NAME.equals(parser.getName())) {
if ("count".equals(parser.getName())) {
queueOverview.setUserCount(Integer.parseInt(parser.nextText()));
@ -156,12 +155,12 @@ public class QueueOverview implements ExtensionElement {
eventType = parser.next();
if (eventType != XmlPullParser.END_TAG) {
if (eventType != XmlPullParser.Event.END_ELEMENT) {
// throw exception
}
}
if (eventType != XmlPullParser.END_TAG) {
if (eventType != XmlPullParser.Event.END_ELEMENT) {
// throw exception
}

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java
View file

@ -22,9 +22,8 @@ import java.io.IOException;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
/**
* An IQ stanza that encapsulates both types of workgroup queue
@ -106,21 +105,21 @@ public class QueueUpdate implements ExtensionElement {
while (!done) {
parser.next();
String elementName = parser.getName();
if (parser.getEventType() == XmlPullParser.START_TAG && "position".equals(elementName)) {
if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT && "position".equals(elementName)) {
try {
position = Integer.parseInt(parser.nextText());
}
catch (NumberFormatException nfe) {
}
}
else if (parser.getEventType() == XmlPullParser.START_TAG && "time".equals(elementName)) {
else if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT && "time".equals(elementName)) {
try {
timeRemaining = Integer.parseInt(parser.nextText());
}
catch (NumberFormatException nfe) {
}
}
else if (parser.getEventType() == XmlPullParser.END_TAG && "queue-status".equals(elementName)) {
else if (parser.getEventType() == XmlPullParser.Event.END_ELEMENT && "queue-status".equals(elementName)) {
done = true;
}
}

8
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java
View file

@ -25,13 +25,13 @@ import org.jivesoftware.smack.packet.IQ.IQChildElementXmlStringBuilder;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.EntityBareJid;
import org.jxmpp.jid.EntityJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.impl.JidCreate;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* Stanza extension for {@link org.jivesoftware.smackx.workgroup.agent.InvitationRequest}.
@ -179,7 +179,7 @@ public class RoomInvitation implements ExtensionElement {
while (!done) {
parser.next();
String elementName = parser.getName();
if (parser.getEventType() == XmlPullParser.START_TAG) {
if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT) {
if ("session".equals(elementName)) {
invitation.sessionID = parser.getAttributeValue("", "id");
}
@ -199,7 +199,7 @@ public class RoomInvitation implements ExtensionElement {
invitation.room = JidCreate.entityBareFrom(roomString);
}
}
else if (parser.getEventType() == XmlPullParser.END_TAG && ELEMENT_NAME.equals(elementName)) {
else if (parser.getEventType() == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(elementName)) {
done = true;
}
}

9
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java
View file

@ -25,9 +25,8 @@ import org.jivesoftware.smack.packet.IQ.IQChildElementXmlStringBuilder;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.XmlStringBuilder;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
/**
* Stanza extension for {@link org.jivesoftware.smackx.workgroup.agent.TransferRequest}.
@ -175,7 +174,7 @@ public class RoomTransfer implements ExtensionElement {
while (!done) {
parser.next();
String elementName = parser.getName();
if (parser.getEventType() == XmlPullParser.START_TAG) {
if (parser.getEventType() == XmlPullParser.Event.START_ELEMENT) {
if ("session".equals(elementName)) {
invitation.sessionID = parser.getAttributeValue("", "id");
}
@ -192,7 +191,7 @@ public class RoomTransfer implements ExtensionElement {
invitation.room = parser.nextText();
}
}
else if (parser.getEventType() == XmlPullParser.END_TAG && ELEMENT_NAME.equals(elementName)) {
else if (parser.getEventType() == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(elementName)) {
done = true;
}
}

5
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java
View file

@ -22,9 +22,8 @@ import java.io.IOException;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class SessionID implements ExtensionElement {

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptProvider.java
View file

@ -26,9 +26,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.parsing.SmackParsingException;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
/**
* An IQProvider for transcripts.
@ -44,8 +43,8 @@ public class TranscriptProvider extends IQProvider<Transcript> {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("message")) {
packets.add(PacketParserUtils.parseMessage(parser));
}
@ -53,7 +52,7 @@ public class TranscriptProvider extends IQProvider<Transcript> {
packets.add(PacketParserUtils.parsePresence(parser));
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("transcript")) {
done = true;
}

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptSearch.java
View file

@ -24,9 +24,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.parsing.SmackParsingException;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
/**
* IQ stanza for retrieving the transcript search form, submitting the completed search form
@ -63,12 +62,12 @@ public class TranscriptSearch extends SimpleIQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
// Parse the packet extension
PacketParserUtils.addExtensionElement(answer, parser, xmlEnvironment);
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals(ELEMENT_NAME)) {
done = true;
}

22
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/TranscriptsProvider.java
View file

@ -28,10 +28,10 @@ import java.util.TimeZone;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* An IQProvider for transcripts summaries.
@ -53,13 +53,13 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("transcript")) {
summaries.add(parseSummary(parser));
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("transcripts")) {
done = true;
}
@ -78,8 +78,8 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("joinTime")) {
try {
synchronized (UTC_FORMAT) {
@ -98,7 +98,7 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
agents = parseAgents(parser);
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("transcript")) {
done = true;
}
@ -116,8 +116,8 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("agentJID")) {
agentJID = parser.nextText();
}
@ -141,7 +141,7 @@ public class TranscriptsProvider extends IQProvider<Transcripts> {
leftTime = null;
}
}
else if (eventType == XmlPullParser.END_TAG) {
else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("agents")) {
done = true;
}

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java
View file

@ -23,10 +23,10 @@ import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
public class UserID implements ExtensionElement {

4
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java
View file

@ -23,10 +23,10 @@ import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jxmpp.jid.EntityBareJid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* A stanza extension that contains information about the user and agent in a

23
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/ChatSettings.java
View file

@ -26,9 +26,8 @@ import java.util.List;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class ChatSettings extends IQ {
@ -128,7 +127,7 @@ public class ChatSettings extends IQ {
@Override
public ChatSettings parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException {
if (parser.getEventType() != XmlPullParser.START_TAG) {
if (parser.getEventType() != XmlPullParser.Event.START_ELEMENT) {
throw new IllegalStateException("Parser not in proper position, or bad XML.");
}
@ -136,12 +135,12 @@ public class ChatSettings extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "chat-setting".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "chat-setting".equals(parser.getName())) {
chatSettings.addSetting(parseChatSetting(parser));
}
else if (eventType == XmlPullParser.END_TAG && ELEMENT_NAME.equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(parser.getName())) {
done = true;
}
}
@ -156,17 +155,17 @@ public class ChatSettings extends IQ {
int type = 0;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "key".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "key".equals(parser.getName())) {
key = parser.nextText();
}
else if (eventType == XmlPullParser.START_TAG && "value".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "value".equals(parser.getName())) {
value = parser.nextText();
}
else if (eventType == XmlPullParser.START_TAG && "type".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "type".equals(parser.getName())) {
type = Integer.parseInt(parser.nextText());
}
else if (eventType == XmlPullParser.END_TAG && "chat-setting".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && "chat-setting".equals(parser.getName())) {
done = true;
}
}

11
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/GenericSettings.java
View file

@ -25,9 +25,8 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.StringUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class GenericSettings extends IQ {
@ -88,15 +87,15 @@ public class GenericSettings extends IQ {
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "entry".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "entry".equals(parser.getName())) {
eventType = parser.next();
String name = parser.nextText();
eventType = parser.next();
String value = parser.nextText();
setting.getMap().put(name, value);
}
else if (eventType == XmlPullParser.END_TAG && ELEMENT_NAME.equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && ELEMENT_NAME.equals(parser.getName())) {
done = true;
}
}

17
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/OfflineSettings.java
View file

@ -23,9 +23,8 @@ import org.jivesoftware.smack.packet.SimpleIQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.StringUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class OfflineSettings extends SimpleIQ {
private String redirectURL;
@ -118,20 +117,20 @@ public class OfflineSettings extends SimpleIQ {
String emailAddress = null;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "redirectPage".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "redirectPage".equals(parser.getName())) {
redirectPage = parser.nextText();
}
else if (eventType == XmlPullParser.START_TAG && "subject".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "subject".equals(parser.getName())) {
subject = parser.nextText();
}
else if (eventType == XmlPullParser.START_TAG && "offlineText".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "offlineText".equals(parser.getName())) {
offlineText = parser.nextText();
}
else if (eventType == XmlPullParser.START_TAG && "emailAddress".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "emailAddress".equals(parser.getName())) {
emailAddress = parser.nextText();
}
else if (eventType == XmlPullParser.END_TAG && "offline-settings".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && "offline-settings".equals(parser.getName())) {
done = true;
}
}

13
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SearchSettings.java
View file

@ -22,9 +22,8 @@ import org.jivesoftware.smack.packet.SimpleIQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.StringUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class SearchSettings extends SimpleIQ {
private String forumsLocation;
@ -87,14 +86,14 @@ public class SearchSettings extends SimpleIQ {
String forums = null;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "forums".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "forums".equals(parser.getName())) {
forums = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && "kb".equals(parser.getName())) {
else if ((eventType == XmlPullParser.Event.START_ELEMENT) && "kb".equals(parser.getName())) {
kb = parser.nextText();
}
else if (eventType == XmlPullParser.END_TAG && "search-settings".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && "search-settings".equals(parser.getName())) {
done = true;
}
}

13
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/SoundSettings.java
View file

@ -23,9 +23,8 @@ import org.jivesoftware.smack.packet.SimpleIQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.stringencoder.Base64;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class SoundSettings extends SimpleIQ {
private String outgoingSound;
@ -76,14 +75,14 @@ public class SoundSettings extends SimpleIQ {
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "outgoingSound".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "outgoingSound".equals(parser.getName())) {
soundSettings.setOutgoingSound(parser.nextText());
}
else if ((eventType == XmlPullParser.START_TAG) && "incomingSound".equals(parser.getName())) {
else if ((eventType == XmlPullParser.Event.START_ELEMENT) && "incomingSound".equals(parser.getName())) {
soundSettings.setIncomingSound(parser.nextText());
}
else if (eventType == XmlPullParser.END_TAG && "sound-settings".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && "sound-settings".equals(parser.getName())) {
done = true;
}
}

15
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/settings/WorkgroupProperties.java
View file

@ -23,9 +23,8 @@ import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.IQProvider;
import org.jivesoftware.smack.util.StringUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
public class WorkgroupProperties extends IQ {
@ -103,19 +102,19 @@ public class WorkgroupProperties extends IQ {
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG && "authRequired".equals(parser.getName())) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT && "authRequired".equals(parser.getName())) {
// CHECKSTYLE:OFF
props.setAuthRequired(Boolean.valueOf(parser.nextText()).booleanValue());
// CHECKSTYLE:ON
}
else if (eventType == XmlPullParser.START_TAG && "email".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "email".equals(parser.getName())) {
props.setEmail(parser.nextText());
}
else if (eventType == XmlPullParser.START_TAG && "name".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.START_ELEMENT && "name".equals(parser.getName())) {
props.setFullName(parser.nextText());
}
else if (eventType == XmlPullParser.END_TAG && "workgroup-properties".equals(parser.getName())) {
else if (eventType == XmlPullParser.Event.END_ELEMENT && "workgroup-properties".equals(parser.getName())) {
done = true;
}
}

16
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/MetaDataUtils.java
View file

@ -24,10 +24,10 @@ import java.util.List;
import java.util.Map;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smackx.workgroup.MetaData;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
import org.jivesoftware.smackx.workgroup.MetaData;
/**
* Utility class for meta-data parsing and writing.
@ -46,18 +46,18 @@ public class MetaDataUtils {
* @throws IOException if an error occurs while parsing the XML.
*/
public static Map<String, List<String>> parseMetaData(XmlPullParser parser) throws XmlPullParserException, IOException {
int eventType = parser.getEventType();
XmlPullParser.Event eventType = parser.getEventType();
// If correctly positioned on an opening meta-data tag, parse meta-data.
if ((eventType == XmlPullParser.START_TAG)
if ((eventType == XmlPullParser.Event.START_ELEMENT)
&& parser.getName().equals(MetaData.ELEMENT_NAME)
&& parser.getNamespace().equals(MetaData.NAMESPACE)) {
Map<String, List<String>> metaData = new Hashtable<>();
eventType = parser.nextTag();
eventType = parser.next();
// Keep parsing until we've gotten to end of meta-data.
while ((eventType != XmlPullParser.END_TAG)
while ((eventType != XmlPullParser.Event.END_ELEMENT)
|| !parser.getName().equals(MetaData.ELEMENT_NAME)) {
String name = parser.getAttributeValue(0);
String value = parser.nextText();
@ -72,7 +72,7 @@ public class MetaDataUtils {
metaData.put(name, values);
}
eventType = parser.nextTag();
eventType = parser.next();
}
return metaData;

11
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/provider/MessageEventProvider.java
View file

@ -21,12 +21,11 @@ import java.io.IOException;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.xevent.packet.MessageEvent;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
*
* The MessageEventProvider parses Message Event packets.
@ -49,8 +48,8 @@ public class MessageEventProvider extends ExtensionElementProvider<MessageEvent>
MessageEvent messageEvent = new MessageEvent();
boolean done = false;
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("id"))
messageEvent.setStanzaId(parser.nextText());
if (parser.getName().equals(MessageEvent.COMPOSING))
@ -61,7 +60,7 @@ public class MessageEventProvider extends ExtensionElementProvider<MessageEvent>
messageEvent.setDisplayed(true);
if (parser.getName().equals(MessageEvent.OFFLINE))
messageEvent.setOffline(true);
} else if (eventType == XmlPullParser.END_TAG) {
} else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("x")) {
done = true;
}

10
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/provider/RosterExchangeProvider.java
View file

@ -23,13 +23,13 @@ import java.util.ArrayList;
import org.jivesoftware.smack.packet.XmlEnvironment;
import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import org.jivesoftware.smackx.xroster.RemoteRosterEntry;
import org.jivesoftware.smackx.xroster.packet.RosterExchange;
import org.jxmpp.jid.Jid;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
*
@ -58,8 +58,8 @@ public class RosterExchangeProvider extends ExtensionElementProvider<RosterExcha
String name = "";
ArrayList<String> groupsName = new ArrayList<>();
while (!done) {
int eventType = parser.next();
if (eventType == XmlPullParser.START_TAG) {
XmlPullParser.Event eventType = parser.next();
if (eventType == XmlPullParser.Event.START_ELEMENT) {
if (parser.getName().equals("item")) {
// Reset this variable since they are optional for each item
groupsName = new ArrayList<>();
@ -70,7 +70,7 @@ public class RosterExchangeProvider extends ExtensionElementProvider<RosterExcha
if (parser.getName().equals("group")) {
groupsName.add(parser.nextText());
}
} else if (eventType == XmlPullParser.END_TAG) {
} else if (eventType == XmlPullParser.Event.END_ELEMENT) {
if (parser.getName().equals("item")) {
// Create packet.
remoteRosterEntry = new RemoteRosterEntry(jid, name, groupsName.toArray(new String[groupsName.size()]));

4
smack-legacy/src/test/java/org/jivesoftware/smackx/LegacyInitializerTest.java
View file

@ -16,13 +16,13 @@
*/
package org.jivesoftware.smackx;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.util.List;
import org.jivesoftware.smack.legacy.LegacyInitializer;
import org.junit.Test;
import org.junit.jupiter.api.Test;
public class LegacyInitializerTest {