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

Bump "Error Prone" to 2.3.2

Browse source 
and gradle-errorprone-plugin to 0.6.
This commit is contained in:
Florian Schmaus 2018-10-31 16:06:31 +01:00
parent ec7badfda0
commit b7ea226c56
65 changed files with 173 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

6
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentSession.java
View file

@ -276,7 +276,7 @@ public class AgentSession {
synchronized (this.metaData) {
List<String> oldVals = metaData.get(key);
if ((oldVals == null) || (!oldVals.get(0).equals(val))) {
if (oldVals == null || !oldVals.get(0).equals(val)) {
oldVals.set(0, val);
setStatus(presenceMode, maxChats);
@ -635,7 +635,7 @@ public class AgentSession {
}
public Iterator<WorkgroupQueue> getQueues() {
return Collections.unmodifiableMap((new HashMap<>(queues))).values().iterator();
return Collections.unmodifiableMap(new HashMap<>(queues)).values().iterator();
}
public void addQueueUsersListener(QueueUsersListener listener) {
@ -703,7 +703,7 @@ public class AgentSession {
private void fireOfferRequestEvent(OfferRequestProvider.OfferRequestPacket requestPacket) {
Offer offer = new Offer(this.connection, this, requestPacket.getUserID(),
requestPacket.getUserJID(), this.getWorkgroupJID(),
new Date((new Date()).getTime() + (requestPacket.getTimeout() * 1000)),
new Date(new Date().getTime() + (requestPacket.getTimeout() * 1000)),
requestPacket.getSessionID(), requestPacket.getMetaData(), requestPacket.getContent());
synchronized (offerListeners) {

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

@ -103,7 +103,7 @@ public class AgentChatHistory extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("chat-session".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "chat-session".equals(parser.getName())) {
agentChatHistory.addChatSession(parseChatSetting(parser));
}
@ -126,24 +126,24 @@ public class AgentChatHistory extends IQ {
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("date".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "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.START_TAG && "duration".equals(parser.getName())) {
duration = Long.valueOf(parser.nextText()).longValue();
}
else if ((eventType == XmlPullParser.START_TAG) && ("visitorsName".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "visitorsName".equals(parser.getName())) {
visitorsName = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("visitorsEmail".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "visitorsEmail".equals(parser.getName())) {
visitorsEmail = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("sessionID".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "sessionID".equals(parser.getName())) {
sessionID = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("question".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "question".equals(parser.getName())) {
question = parser.nextText();
}
else if (eventType == XmlPullParser.END_TAG && "chat-session".equals(parser.getName())) {

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

@ -127,7 +127,7 @@ public class AgentStatusRequest extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("agent".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "agent".equals(parser.getName())) {
statusRequest.agents.add(parseAgent(parser));
}
else if (eventType == XmlPullParser.END_TAG &&
@ -146,7 +146,7 @@ public class AgentStatusRequest extends IQ {
String name = null;
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("name".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "name".equals(parser.getName())) {
name = parser.nextText();
}
else if (eventType == XmlPullParser.END_TAG &&

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

@ -86,7 +86,7 @@ public class MonitorPacket extends IQ {
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("isMonitor".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "isMonitor".equals(parser.getName())) {
String value = parser.nextText();
if ("false".equalsIgnoreCase(value)) {
packet.setMonitor(false);

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

@ -142,8 +142,8 @@ public class OccupantsInfo extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) &&
("occupant".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG &&
"occupant".equals(parser.getName())) {
occupantsInfo.occupants.add(parseOccupantInfo(parser));
} else if (eventType == XmlPullParser.END_TAG &&
ELEMENT_NAME.equals(parser.getName())) {
@ -161,13 +161,13 @@ public class OccupantsInfo extends IQ {
Date joined = null;
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("jid".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "jid".equals(parser.getName())) {
jid = parser.nextText();
} else if ((eventType == XmlPullParser.START_TAG) &&
("nickname".equals(parser.getName()))) {
} else if (eventType == XmlPullParser.START_TAG &&
"nickname".equals(parser.getName())) {
nickname = parser.nextText();
} else if ((eventType == XmlPullParser.START_TAG) &&
("joined".equals(parser.getName()))) {
} else if (eventType == XmlPullParser.START_TAG &&
"joined".equals(parser.getName())) {
try {
synchronized (UTC_FORMAT) {
joined = UTC_FORMAT.parse(parser.nextText());

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

@ -168,8 +168,8 @@ public final class QueueDetails implements ExtensionElement {
}
eventType = parser.next();
while ((eventType != XmlPullParser.END_TAG)
|| (!"user".equals(parser.getName()))) {
while (eventType != XmlPullParser.END_TAG
|| !"user".equals(parser.getName())) {
if ("position".equals(parser.getName())) {
position = Integer.parseInt(parser.nextText());
}

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

@ -133,8 +133,8 @@ public class QueueOverview implements ExtensionElement {
SimpleDateFormat dateFormat = new SimpleDateFormat(DATE_FORMAT);
eventType = parser.next();
while ((eventType != XmlPullParser.END_TAG)
|| (!ELEMENT_NAME.equals(parser.getName()))) {
while (eventType != XmlPullParser.END_TAG
|| !ELEMENT_NAME.equals(parser.getName())) {
if ("count".equals(parser.getName())) {
queueOverview.setUserCount(Integer.parseInt(parser.nextText()));
}
@ -143,7 +143,7 @@ public class QueueOverview implements ExtensionElement {
}
else if ("oldest".equals(parser.getName())) {
try {
queueOverview.setOldestEntry((dateFormat.parse(parser.nextText())));
queueOverview.setOldestEntry(dateFormat.parse(parser.nextText()));
} catch (ParseException e) {
throw new SmackException(e);
}

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

@ -136,7 +136,7 @@ public class ChatSettings extends IQ {
boolean done = false;
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("chat-setting".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "chat-setting".equals(parser.getName())) {
chatSettings.addSetting(parseChatSetting(parser));
}
@ -156,13 +156,13 @@ public class ChatSettings extends IQ {
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("key".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "key".equals(parser.getName())) {
key = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("value".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "value".equals(parser.getName())) {
value = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("type".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "type".equals(parser.getName())) {
type = Integer.parseInt(parser.nextText());
}
else if (eventType == XmlPullParser.END_TAG && "chat-setting".equals(parser.getName())) {

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

@ -88,7 +88,7 @@ public class GenericSettings extends IQ {
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("entry".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "entry".equals(parser.getName())) {
eventType = parser.next();
String name = parser.nextText();
eventType = parser.next();

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

@ -118,16 +118,16 @@ public class OfflineSettings extends SimpleIQ {
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("redirectPage".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "redirectPage".equals(parser.getName())) {
redirectPage = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("subject".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "subject".equals(parser.getName())) {
subject = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("offlineText".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "offlineText".equals(parser.getName())) {
offlineText = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("emailAddress".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "emailAddress".equals(parser.getName())) {
emailAddress = parser.nextText();
}
else if (eventType == XmlPullParser.END_TAG && "offline-settings".equals(parser.getName())) {

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

@ -87,10 +87,10 @@ public class SearchSettings extends SimpleIQ {
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("forums".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "forums".equals(parser.getName())) {
forums = parser.nextText();
}
else if ((eventType == XmlPullParser.START_TAG) && ("kb".equals(parser.getName()))) {
else if ((eventType == XmlPullParser.START_TAG) && "kb".equals(parser.getName())) {
kb = parser.nextText();
}
else if (eventType == XmlPullParser.END_TAG && "search-settings".equals(parser.getName())) {

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

@ -76,10 +76,10 @@ public class SoundSettings extends SimpleIQ {
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("outgoingSound".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "outgoingSound".equals(parser.getName())) {
soundSettings.setOutgoingSound(parser.nextText());
}
else if ((eventType == XmlPullParser.START_TAG) && ("incomingSound".equals(parser.getName()))) {
else if ((eventType == XmlPullParser.START_TAG) && "incomingSound".equals(parser.getName())) {
soundSettings.setIncomingSound(parser.nextText());
}
else if (eventType == XmlPullParser.END_TAG && "sound-settings".equals(parser.getName())) {

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

@ -103,13 +103,13 @@ public class WorkgroupProperties extends IQ {
while (!done) {
int eventType = parser.next();
if ((eventType == XmlPullParser.START_TAG) && ("authRequired".equals(parser.getName()))) {
if (eventType == XmlPullParser.START_TAG && "authRequired".equals(parser.getName())) {
props.setAuthRequired(Boolean.valueOf(parser.nextText()).booleanValue());
}
else if ((eventType == XmlPullParser.START_TAG) && ("email".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "email".equals(parser.getName())) {
props.setEmail(parser.nextText());
}
else if ((eventType == XmlPullParser.START_TAG) && ("name".equals(parser.getName()))) {
else if (eventType == XmlPullParser.START_TAG && "name".equals(parser.getName())) {
props.setFullName(parser.nextText());
}
else if (eventType == XmlPullParser.END_TAG && "workgroup-properties".equals(parser.getName())) {

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

@ -58,7 +58,7 @@ public class MetaDataUtils {
// Keep parsing until we've gotten to end of meta-data.
while ((eventType != XmlPullParser.END_TAG)
|| (!parser.getName().equals(MetaData.ELEMENT_NAME))) {
|| !parser.getName().equals(MetaData.ELEMENT_NAME)) {
String name = parser.getAttributeValue(0);
String value = parser.nextText();