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

Change Element.toXml() to toXml(String enclosingNamespace)

Browse source
This commit is contained in:
Florian Schmaus 2018-04-25 14:20:18 +02:00
parent 380f9a2b72
commit 5ab2903c32
229 changed files with 634 additions and 536 deletions
Download patch file Download diff file Expand all files Collapse all files

14
smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java
View file

@ -47,7 +47,7 @@ public class StreamManagement {
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.closeEmptyElement();
return xml;
@ -113,7 +113,7 @@ public class StreamManagement {
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
maybeAddResumeAttributeTo(xml);
maybeAddMaxAttributeTo(xml);
@ -174,7 +174,7 @@ public class StreamManagement {
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.optAttribute("id", id);
maybeAddResumeAttributeTo(xml);
@ -220,7 +220,7 @@ public class StreamManagement {
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
if (condition == null && textElements.isEmpty()) {
xml.closeEmptyElement();
@ -273,7 +273,7 @@ public class StreamManagement {
}
@Override
public final XmlStringBuilder toXML() {
public final XmlStringBuilder toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.attribute("h", Long.toString(handledCount));
xml.attribute("previd", previd);
@ -322,7 +322,7 @@ public class StreamManagement {
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
XmlStringBuilder xml = new XmlStringBuilder(this);
xml.attribute("h", Long.toString(handledCount));
xml.closeEmptyElement();
@ -348,7 +348,7 @@ public class StreamManagement {
}
@Override
public CharSequence toXML() {
public CharSequence toXML(String enclosingNamespace) {
return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>";
}

8
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View file

@ -1438,9 +1438,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
maybeAddToUnacknowledgedStanzas(packet);
CharSequence elementXml = element.toXML();
CharSequence elementXml = element.toXML(StreamOpen.CLIENT_NAMESPACE);
if (elementXml instanceof XmlStringBuilder) {
((XmlStringBuilder) elementXml).write(writer);
((XmlStringBuilder) elementXml).write(writer, StreamOpen.CLIENT_NAMESPACE);
}
else {
writer.write(elementXml.toString());
@ -1462,7 +1462,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
Stanza stanza = (Stanza) packet;
maybeAddToUnacknowledgedStanzas(stanza);
}
writer.write(packet.toXML().toString());
writer.write(packet.toXML(null).toString());
}
writer.flush();
}
@ -1530,7 +1530,7 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
// If the unacknowledgedStanza queue is nearly full, request an new ack
// from the server in order to drain it
if (unacknowledgedStanzas.size() == 0.8 * XMPPTCPConnection.QUEUE_SIZE) {
writer.write(AckRequest.INSTANCE.toXML().toString());
writer.write(AckRequest.INSTANCE.toXML(null).toString());
writer.flush();
}
try {

4
smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java
View file

@ -68,11 +68,11 @@ public class ParseStreamManagementTest {
@Test
public void testParseEnabledInvariant() throws XmlPullParserException, IOException {
String enabledString = (new StreamManagement.Enabled("stream-id", false)).toXML().toString();
String enabledString = (new StreamManagement.Enabled("stream-id", false)).toXML(null).toString();
XmlPullParser parser = PacketParserUtils.getParserFor(enabledString);
StreamManagement.Enabled enabled = ParseStreamManagement.enabled(parser);
assertEquals(enabledString, enabled.toXML().toString());
assertEquals(enabledString, enabled.toXML(null).toString());
}
@Test