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

Bump "Error Prone" to 2.0.15

Browse source 
and fix a few things :)
This commit is contained in:
Florian Schmaus 2017-02-11 16:16:41 +01:00
parent ef0af66b21
commit 4c646436a5
246 changed files with 1122 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

3
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java
View file

@ -53,14 +53,17 @@ public class MetaData implements ExtensionElement {
return metaData;
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}
@Override
public String toXML() {
return MetaDataUtils.serializeMetaData(this.getMetaData());
}

27
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java
View file

@ -28,8 +28,9 @@ import org.jivesoftware.smack.packet.Stanza;
import org.jivesoftware.smack.packet.Presence;
import org.jxmpp.jid.EntityFullJid;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.jid.parts.Resourcepart;
import org.jxmpp.util.XmppStringUtils;
import org.jxmpp.stringprep.XmppStringprepException;
import java.util.ArrayList;
import java.util.Collections;
@ -117,7 +118,14 @@ public class AgentRoster {
if (entries.contains(jid)) {
// Fire the agent added event
listener.agentAdded(jid);
Map<Resourcepart, Presence> userPresences = presenceMap.get(jid);
Jid j;
try {
j = JidCreate.from(jid);
}
catch (XmppStringprepException e) {
throw new IllegalStateException(e);
}
Map<Resourcepart, Presence> userPresences = presenceMap.get(j);
if (userPresences != null) {
Iterator<Presence> presences = userPresences.values().iterator();
while (presences.hasNext()) {
@ -175,6 +183,7 @@ public class AgentRoster {
* or "user@domain/resource").
* @return true if the XMPP address is an agent in the workgroup.
*/
@SuppressWarnings("EqualsIncompatibleType")
public boolean contains(Jid jid) {
if (jid == null) {
return false;
@ -282,7 +291,9 @@ public class AgentRoster {
/**
* Listens for all presence packets and processes them.
*/
@SuppressWarnings("EqualsIncompatibleType")
private class PresencePacketListener implements StanzaListener {
@Override
public void processStanza(Stanza packet) {
Presence presence = (Presence)packet;
EntityFullJid from = presence.getFrom().asEntityFullJidIfPossible();
@ -359,6 +370,7 @@ public class AgentRoster {
*/
private class AgentStatusListener implements StanzaListener {
@Override
public void processStanza(Stanza packet) {
if (packet instanceof AgentStatusRequest) {
AgentStatusRequest statusRequest = (AgentStatusRequest)packet;
@ -369,9 +381,14 @@ public class AgentRoster {
// Removing the user from the roster, so remove any presence information
// about them.
String key = XmppStringUtils.parseLocalpart(XmppStringUtils.parseLocalpart(agentJID) + "@" +
XmppStringUtils.parseDomain(agentJID));
presenceMap.remove(key);
Jid agentJid;
try {
agentJid = JidCreate.from(agentJID);
}
catch (XmppStringprepException e) {
throw new IllegalStateException(e);
}
presenceMap.remove(agentJid.asBareJid());
// Fire event for roster listeners.
fireEvent(EVENT_AGENT_REMOVED, agentJID);
}

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

@ -77,6 +77,7 @@ import org.jivesoftware.smackx.workgroup.settings.SearchSettings;
import org.jivesoftware.smackx.xdata.Form;
import org.jxmpp.jid.Jid;
import org.jxmpp.jid.parts.Resourcepart;
import org.jxmpp.stringprep.XmppStringprepException;
/**
* This class embodies the agent's active presence within a given workgroup. The application
@ -147,6 +148,7 @@ public class AgentSession {
new StanzaTypeFilter(Message.class));
packetListener = new StanzaListener() {
@Override
public void processStanza(Stanza packet) {
try {
handlePacket(packet);
@ -609,6 +611,23 @@ public class AgentSession {
* @return an instance of WorkgroupQueue for the argument queue name, or null if none exists
*/
public WorkgroupQueue getQueue(String queueName) {
Resourcepart queueNameResourcepart;
try {
queueNameResourcepart = Resourcepart.from(queueName);
}
catch (XmppStringprepException e) {
throw new IllegalArgumentException(e);
}
return getQueue(queueNameResourcepart);
}
/**
* Get queue.
*
* @param queueName the name of the queue
* @return an instance of WorkgroupQueue for the argument queue name, or null if none exists
*/
public WorkgroupQueue getQueue(Resourcepart queueName) {
return queues.get(queueName);
}

3
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/InvitationRequest.java
View file

@ -46,14 +46,17 @@ public class InvitationRequest extends OfferContent {
return reason;
}
@Override
boolean isUserRequest() {
return false;
}
@Override
boolean isInvitation() {
return true;
}
@Override
boolean isTransfer() {
return false;
}

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

@ -98,7 +98,7 @@ public class OfferConfirmation extends SimpleIQ {
/**
* Stanza(/Packet) for notifying server of RoomName
*/
private class NotifyServicePacket extends IQ {
private static class NotifyServicePacket extends IQ {
String roomName;
NotifyServicePacket(Jid workgroup, String roomName) {

3
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/TransferRequest.java
View file

@ -46,14 +46,17 @@ public class TransferRequest extends OfferContent {
return reason;
}
@Override
boolean isUserRequest() {
return false;
}
@Override
boolean isInvitation() {
return false;
}
@Override
boolean isTransfer() {
return true;
}

3
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/UserRequest.java
View file

@ -30,14 +30,17 @@ public class UserRequest extends OfferContent {
return instance;
}
@Override
boolean isUserRequest() {
return true;
}
@Override
boolean isInvitation() {
return false;
}
@Override
boolean isTransfer() {
return false;
}

1
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/WorkgroupQueue.java
View file

@ -221,6 +221,7 @@ public class WorkgroupQueue {
this.value = value;
}
@Override
public String toString() {
return value;
}

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

@ -80,14 +80,17 @@ public class AgentStatus implements ExtensionElement {
return maxChats;
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}
@Override
public String toXML() {
StringBuilder buf = new StringBuilder();

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

@ -39,6 +39,7 @@ public class MetaDataProvider extends ExtensionElementProvider<MetaData> {
* @throws IOException
* @throws XmlPullParserException
*/
@Override
public MetaData parse(XmlPullParser parser, int initialDepth) throws XmlPullParserException, IOException {
Map<String, List<String>> metaData = MetaDataUtils.parseMetaData(parser);

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

@ -67,7 +67,7 @@ public class OfferRevokeProvider extends IQProvider<IQ> {
return new OfferRevokePacket(userJID, userID, reason, sessionID);
}
public class OfferRevokePacket extends IQ {
public static class OfferRevokePacket extends IQ {
public static final String ELEMENT = "offer-revoke";
public static final String NAMESPACE = "http://jabber.org/protocol/workgroup";

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

@ -91,14 +91,17 @@ public final class QueueDetails implements ExtensionElement {
}
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}
@Override
public String toXML() {
StringBuilder buf = new StringBuilder();
buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append(NAMESPACE).append("\">");

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

@ -88,14 +88,17 @@ public class QueueOverview implements ExtensionElement {
this.status = status;
}
@Override
public String getElementName () {
return ELEMENT_NAME;
}
@Override
public String getNamespace () {
return NAMESPACE;
}
@Override
public String toXML () {
StringBuilder buf = new StringBuilder();
buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append(NAMESPACE).append("\">");

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

@ -69,6 +69,7 @@ public class QueueUpdate implements ExtensionElement {
return remainingTime;
}
@Override
public String toXML() {
StringBuilder buf = new StringBuilder();
buf.append("<queue-status xmlns=\"http://jabber.org/protocol/workgroup\">");
@ -82,10 +83,12 @@ public class QueueUpdate implements ExtensionElement {
return buf.toString();
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}

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

@ -80,10 +80,12 @@ public class RoomInvitation implements ExtensionElement {
private RoomInvitation() {
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}

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

@ -80,10 +80,12 @@ public class RoomTransfer implements ExtensionElement {
private RoomTransfer() {
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}

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

@ -46,14 +46,17 @@ public class SessionID implements ExtensionElement {
return this.sessionID;
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}
@Override
public String toXML() {
StringBuilder buf = new StringBuilder();

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

@ -48,14 +48,17 @@ public class UserID implements ExtensionElement {
return this.userID;
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}
@Override
public String toXML() {
StringBuilder buf = new StringBuilder();

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

@ -50,14 +50,17 @@ public class WorkgroupInformation implements ExtensionElement {
return workgroupJID;
}
@Override
public String getElementName() {
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return NAMESPACE;
}
@Override
public String toXML() {
StringBuilder buf = new StringBuilder();

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

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

5
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java
View file

@ -108,20 +108,24 @@ public class Workgroup {
// Register as a queue listener for internal usage by this instance.
addQueueListener(new QueueListener() {
@Override
public void joinedQueue() {
inQueue = true;
}
@Override
public void departedQueue() {
inQueue = false;
queuePosition = -1;
queueRemainingTime = -1;
}
@Override
public void queuePositionUpdated(int currentPosition) {
queuePosition = currentPosition;
}
@Override
public void queueWaitTimeUpdated(int secondsRemaining) {
queueRemainingTime = secondsRemaining;
}
@ -145,6 +149,7 @@ public class Workgroup {
StanzaFilter typeFilter = new StanzaTypeFilter(Message.class);
connection.addAsyncStanzaListener(new StanzaListener() {
@Override
public void processStanza(Stanza packet) {
handlePacket(packet);
}

3
smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/util/ListenerEventDispatcher.java
View file

@ -84,6 +84,7 @@ public class ListenerEventDispatcher implements Runnable {
return this.hasFinishedDispatching;
}
@Override
public void run() {
ListIterator<TripletContainer> li = null;
@ -104,7 +105,7 @@ public class ListenerEventDispatcher implements Runnable {
}
protected class TripletContainer {
protected static class TripletContainer {
protected Object listenerInstance;
protected Method listenerMethod;

4
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/DefaultMessageEventRequestListener.java
View file

@ -31,6 +31,7 @@ import org.jxmpp.jid.Jid;
*/
public class DefaultMessageEventRequestListener implements MessageEventRequestListener {
@Override
public void deliveredNotificationRequested(Jid from, String packetID,
MessageEventManager messageEventManager) throws NotConnectedException, InterruptedException
{
@ -38,16 +39,19 @@ public class DefaultMessageEventRequestListener implements MessageEventRequestLi
messageEventManager.sendDeliveredNotification(from, packetID);
}
@Override
public void displayedNotificationRequested(Jid from, String packetID,
MessageEventManager messageEventManager)
{
}
@Override
public void composingNotificationRequested(Jid from, String packetID,
MessageEventManager messageEventManager)
{
}
@Override
public void offlineNotificationRequested(Jid from, String packetID,
MessageEventManager messageEventManager)
{

1
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java
View file

@ -77,6 +77,7 @@ public final class MessageEventManager extends Manager {
super(connection);
// Listens for all message event packets and fire the proper message event listeners.
connection.addAsyncStanzaListener(new StanzaListener() {
@Override
public void processStanza(Stanza packet) {
Message message = (Message) packet;
MessageEvent messageEvent =

3
smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java
View file

@ -78,6 +78,7 @@ public class MessageEvent implements ExtensionElement {
*
* @return the XML element name of the stanza(/packet) extension.
*/
@Override
public String getElementName() {
return ELEMENT;
}
@ -88,6 +89,7 @@ public class MessageEvent implements ExtensionElement {
*
* @return the XML namespace of the stanza(/packet) extension.
*/
@Override
public String getNamespace() {
return NAMESPACE;
}
@ -303,6 +305,7 @@ public class MessageEvent implements ExtensionElement {
* </pre>
*
*/
@Override
public String toXML() {
StringBuilder buf = new StringBuilder();
buf.append('<').append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(

1
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java
View file

@ -78,6 +78,7 @@ public class RosterExchangeManager {
weakRefConnection = new WeakReference<XMPPConnection>(connection);
// Listens for all roster exchange packets and fire the roster exchange listeners.
packetListener = new StanzaListener() {
@Override
public void processStanza(Stanza packet) {
Message message = (Message) packet;
RosterExchange rosterExchange =

3
smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java
View file

@ -110,6 +110,7 @@ public class RosterExchange implements ExtensionElement {
*
* @return the XML element name of the stanza(/packet) extension.
*/
@Override
public String getElementName() {
return RosterExchangeManager.ELEMENT;
}
@ -121,6 +122,7 @@ public class RosterExchange implements ExtensionElement {
*
* @return the XML namespace of the stanza(/packet) extension.
*/
@Override
public String getNamespace() {
return RosterExchangeManager.NAMESPACE;
}
@ -163,6 +165,7 @@ public class RosterExchange implements ExtensionElement {
* </pre>
*
*/
@Override
public String toXML() {
StringBuilder buf = new StringBuilder();
buf.append('<').append(getElementName()).append(" xmlns=\"").append(getNamespace()).append(