Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2025-12-08 22:21:08 +01:00
Code Issues Releases Wiki Activity

Make PubSub's SimplePayload infer the XML Element name and namespace

Browse source 
Fixes SMACK-816.
This commit is contained in:
Florian Schmaus 2018-04-23 22:00:12 +02:00
parent a3e365bfb9
commit 6c4a02691e
5 changed files with 94 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

49
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java
View file

@ -16,7 +16,17 @@
*/
package org.jivesoftware.smackx.pubsub;
import java.io.IOException;
import javax.xml.namespace.QName;
import org.jivesoftware.smack.packet.ExtensionElement;
import org.jivesoftware.smack.util.PacketParserUtils;
import org.jivesoftware.smack.util.ParserUtils;
import org.jivesoftware.smack.util.StringUtils;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
/**
* The default payload representation for {@link PayloadItem#getPayload()}. It simply
@ -27,7 +37,29 @@ import org.jivesoftware.smack.packet.ExtensionElement;
public class SimplePayload implements ExtensionElement {
private final String elemName;
private final String ns;
private final CharSequence payload;
private final String payload;
/**
* Construct a <tt>SimplePayload</tt> object with the specified element name,
* namespace and content. The content must be well formed XML.
*
* @param xmlPayload The payload data
*/
public SimplePayload(String xmlPayload) {
XmlPullParser parser;
try {
parser = PacketParserUtils.getParserFor(xmlPayload);
}
catch (XmlPullParserException | IOException e) {
throw new AssertionError(e);
}
QName qname = ParserUtils.getQName(parser);
payload = xmlPayload;
elemName = StringUtils.requireNotNullOrEmpty(qname.getLocalPart(), "Could not determine element name from XML payload");
ns = StringUtils.requireNotNullOrEmpty(qname.getNamespaceURI(), "Could not determine namespace from XML payload");
}
/**
* Construct a <tt>SimplePayload</tt> object with the specified element name,
@ -36,11 +68,18 @@ public class SimplePayload implements ExtensionElement {
* @param elementName The root element name (of the payload)
* @param namespace The namespace of the payload, null if there is none
* @param xmlPayload The payload data
* @deprecated use {@link #SimplePayload(String)} insteas.
*/
// TODO: Remove in Smack 4.5
@Deprecated
public SimplePayload(String elementName, String namespace, CharSequence xmlPayload) {
elemName = elementName;
payload = xmlPayload;
ns = namespace;
this(xmlPayload.toString());
if (!elementName.equals(this.elemName)) {
throw new IllegalArgumentException();
}
if (!namespace.equals(this.ns)) {
throw new IllegalArgumentException();
}
}
@Override
@ -54,7 +93,7 @@ public class SimplePayload implements ExtensionElement {
}
@Override
public CharSequence toXML() {
public String toXML() {
return payload;
}

2
smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/provider/ItemProvider.java
View file

@ -59,7 +59,7 @@ public class ItemProvider extends ExtensionElementProvider<Item> {
if (extensionProvider == null) {
// TODO: Should we use StandardExtensionElement in this case? And probably remove SimplePayload all together.
CharSequence payloadText = PacketParserUtils.parseElement(parser, true);
return new PayloadItem<>(itemNamespace, id, node, new SimplePayload(payloadElemName, payloadNS, payloadText));
return new PayloadItem<>(itemNamespace, id, node, new SimplePayload(payloadText.toString()));
}
else {
return new PayloadItem<>(itemNamespace, id, node, extensionProvider.parse(parser));