From 91a421009ac90a71fbec3de76189f5a006dccfea Mon Sep 17 00:00:00 2001 From: Sergey Ponomarev Date: Sat, 4 Oct 2025 20:46:57 +0300 Subject: [PATCH] SPARK-2355: Add QNAME field to classes that implements ExtensionElement --- .../plugin/gateways/transports/TransportUtils.java | 8 ++++++-- .../jivesoftware/sparkimpl/plugin/manager/Features.java | 3 +++ .../sparkimpl/profile/ext/JabberAvatarExtension.java | 7 +++++++ .../sparkimpl/profile/ext/VCardUpdateExtension.java | 3 +++ .../main/java/battleship/packets/MoveAnswerPacket.java | 1 + .../src/main/java/battleship/packets/MovePacket.java | 1 + .../java/org/jivesoftware/game/reversi/GameForfeit.java | 2 ++ .../main/java/org/jivesoftware/game/reversi/GameMove.java | 2 ++ .../src/main/java/tic/tac/toe/packet/InvalidMove.java | 2 ++ .../src/main/java/tic/tac/toe/packet/MovePacket.java | 2 ++ 10 files changed, 29 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java index ef540474..43f3dc4d 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/gateways/transports/TransportUtils.java @@ -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 diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java index 50be453a..1169e7a6 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/plugin/manager/Features.java @@ -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() { diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java b/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java index 6ab7ba09..0ac736e1 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/JabberAvatarExtension.java @@ -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) { diff --git a/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java b/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java index be4eda30..53703ff0 100644 --- a/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java +++ b/core/src/main/java/org/jivesoftware/sparkimpl/profile/ext/VCardUpdateExtension.java @@ -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) { diff --git a/plugins/battleships/src/main/java/battleship/packets/MoveAnswerPacket.java b/plugins/battleships/src/main/java/battleship/packets/MoveAnswerPacket.java index e8afff2e..9ea881f2 100644 --- a/plugins/battleships/src/main/java/battleship/packets/MoveAnswerPacket.java +++ b/plugins/battleships/src/main/java/battleship/packets/MoveAnswerPacket.java @@ -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; diff --git a/plugins/battleships/src/main/java/battleship/packets/MovePacket.java b/plugins/battleships/src/main/java/battleship/packets/MovePacket.java index 91e718b0..75352636 100644 --- a/plugins/battleships/src/main/java/battleship/packets/MovePacket.java +++ b/plugins/battleships/src/main/java/battleship/packets/MovePacket.java @@ -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; diff --git a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java index f62bd1ff..cff49ef3 100644 --- a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java +++ b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameForfeit.java @@ -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; diff --git a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java index 28040b2d..656f9589 100644 --- a/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java +++ b/plugins/reversi/src/main/java/org/jivesoftware/game/reversi/GameMove.java @@ -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; diff --git a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java index 8ae072ef..6adcf9c0 100644 --- a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java +++ b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/InvalidMove.java @@ -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; diff --git a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java index c627244f..731f276c 100644 --- a/plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java +++ b/plugins/tictactoe/src/main/java/tic/tac/toe/packet/MovePacket.java @@ -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;