mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-10-29 11:47:01 +00:00
Code Issues Projects Releases Wiki Activity

SPARK-2355: Add QNAME field to classes that implements ExtensionElement

Browse Source
This commit is contained in:
Sergey Ponomarev 2025-10-04 20:46:57 +03:00 committed by Guus der Kinderen
parent 1e7860fe70
commit 91a421009a
10 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java
View File

@ -35,6 +35,7 @@ import org.jxmpp.jid.Jid;
import org.jxmpp.jid.impl.JidCreate;
import org.jxmpp.stringprep.XmppStringprepException;
import javax.xml.namespace.QName;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@ -205,15 +206,18 @@ public class TransportUtils {
static class GatewayRegisterExtension implements ExtensionElement {
public static final String ELEMENT_NAME = "x";
public static final String NAMESPACE = "jabber:iq:gateway:register";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
@Override
public String getElementName() {
return "x";
return ELEMENT_NAME;
}
@Override
public String getNamespace() {
return "jabber:iq:gateway:register";
return NAMESPACE;
}
@Override

3
core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java
View File

@ -21,6 +21,7 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import javax.xml.namespace.QName;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@ -49,6 +50,8 @@ public class Features implements ExtensionElement {
*/
public static final String NAMESPACE = "http://jabber.org/protocol/disco#info";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
@Override
public String getElementName() {

7
core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java
View File

@ -22,14 +22,21 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import javax.xml.namespace.QName;
import java.io.IOException;
/**
* XEP-0008: IQ-Based Avatars
* TODO Should be replaced with XEP-0084: User Avatar
*/
public class JabberAvatarExtension implements ExtensionElement {
public static final String ELEMENT_NAME = "x";
public static final String NAMESPACE = "jabber:x:avatar";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
private String photoHash;
public void setPhotoHash(String hash) {

3
core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java
View File

@ -22,6 +22,7 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import javax.xml.namespace.QName;
import java.io.IOException;
public class VCardUpdateExtension implements ExtensionElement {
@ -30,6 +31,8 @@ public class VCardUpdateExtension implements ExtensionElement {
public static final String NAMESPACE = "vcard-temp:x:update";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
private String photoHash;
public void setPhotoHash(String hash) {

1
plugins/battleships/src/main/java/battleship/packets/MoveAnswerPacket.java
View File

@ -28,6 +28,7 @@ public class MoveAnswerPacket implements ExtensionElement
public static final String ELEMENT_NAME = "bs-move";
public static final String NAMESPACE = "battleship";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
private int posx;
private int posy;

1
plugins/battleships/src/main/java/battleship/packets/MovePacket.java
View File

@ -27,6 +27,7 @@ public class MovePacket implements ExtensionElement {
public static final String ELEMENT_NAME = "bs-move";
public static final String NAMESPACE = "battleship";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
private int posx;
private int posy;

2
plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java
View File

@ -21,6 +21,7 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import javax.xml.namespace.QName;
import java.io.IOException;
/**
@ -30,6 +31,7 @@ public class GameForfeit implements ExtensionElement {
public static final String ELEMENT_NAME = "reversi-forfeit";
public static final String NAMESPACE = "http://jivesoftware.org/protocol/game/reversi";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
private int gameID;

2
plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java
View File

@ -21,6 +21,7 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import javax.xml.namespace.QName;
import java.io.IOException;
/**
@ -37,6 +38,7 @@ public class GameMove implements ExtensionElement {
public static final String ELEMENT_NAME = "reversi-move";
public static final String NAMESPACE = "http://jivesoftware.org/protocol/game/reversi";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
private int gameID;
private int position;

2
plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java
View File

@ -6,12 +6,14 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import javax.xml.namespace.QName;
import java.io.IOException;
public class InvalidMove implements ExtensionElement {
public static final String ELEMENT_NAME = "ttt-invalid";
public static final String NAMESPACE = "tictactoe";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
private int _gameID;
private int _posx;

2
plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java
View File

@ -21,6 +21,7 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider;
import org.jivesoftware.smack.xml.XmlPullParser;
import org.jivesoftware.smack.xml.XmlPullParserException;
import javax.xml.namespace.QName;
import java.io.IOException;
/**
@ -33,6 +34,7 @@ public class MovePacket implements ExtensionElement {
public static final String ELEMENT_NAME = "ttt-move";
public static final String NAMESPACE = "tictactoe";
public static final QName QNAME = new QName(NAMESPACE, ELEMENT_NAME);
private int posx;
private int posy;