From 5ab2903c3289a302efab62e3225188f6e8c26c99 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 25 Apr 2018 14:20:18 +0200 Subject: [PATCH] Change Element.toXml() to toXml(String enclosingNamespace) --- .../smack/bosh/XMPPBOSHConnection.java | 3 +- .../smack/compress/packet/Compress.java | 4 +- .../smack/compress/packet/Compressed.java | 2 +- .../smack/debugger/AbstractDebugger.java | 2 +- .../smack/packet/AbstractError.java | 2 +- .../smack/packet/AbstractTextElement.java | 2 +- .../org/jivesoftware/smack/packet/Bind.java | 2 +- .../smack/packet/DefaultExtensionElement.java | 2 +- .../jivesoftware/smack/packet/Element.java | 10 +- .../org/jivesoftware/smack/packet/IQ.java | 9 +- .../jivesoftware/smack/packet/Mechanisms.java | 2 +- .../jivesoftware/smack/packet/Message.java | 41 ++++++-- .../jivesoftware/smack/packet/Presence.java | 2 +- .../jivesoftware/smack/packet/Session.java | 2 +- .../packet/StandardExtensionElement.java | 4 - .../org/jivesoftware/smack/packet/Stanza.java | 2 +- .../jivesoftware/smack/packet/StartTls.java | 2 +- .../smack/packet/StreamError.java | 4 +- .../jivesoftware/smack/packet/StreamOpen.java | 8 +- .../smack/sasl/packet/SaslStreamElements.java | 12 +-- .../smack/util/XmlStringBuilder.java | 98 ++++++++++++++++--- .../smack/StanzaCollectorTest.java | 4 +- .../smack/packet/MessageTest.java | 14 +-- .../smack/packet/PresenceTest.java | 14 +-- .../StandardExtensionElementParserTest.java | 6 +- .../smack/util/PacketParserUtilsTest.java | 65 ++++++------ .../debugger/slf4j/SLF4JSmackDebugger.java | 4 +- .../smackx/debugger/EnhancedDebugger.java | 8 +- .../smackx/debugger/LiteDebugger.java | 4 +- .../carbons/packet/CarbonExtension.java | 6 +- .../element/ChatMarkersElements.java | 8 +- .../csi/packet/ClientStateIndication.java | 6 +- .../ExplicitMessageEncryptionElement.java | 2 +- .../smackx/hashes/element/HashElement.java | 4 +- .../smackx/hints/element/NoCopyHint.java | 2 +- .../hints/element/NoPermanentStoreHint.java | 2 +- .../smackx/hints/element/NoStoreHint.java | 2 +- .../smackx/hints/element/StoreHint.java | 2 +- .../hoxt/packet/AbstractHttpOverXmpp.java | 12 +-- .../smackx/hoxt/packet/Base64BinaryChunk.java | 2 +- .../element/FileTooLargeError.java | 2 +- .../smackx/iot/control/element/SetData.java | 2 +- .../smackx/iot/data/element/IoTDataField.java | 2 +- .../iot/data/element/IoTFieldsExtension.java | 2 +- .../smackx/iot/data/element/NodeElement.java | 2 +- .../iot/data/element/TimestampElement.java | 2 +- .../smackx/iot/discovery/element/Tag.java | 2 +- .../iot/provisioning/element/Friend.java | 2 +- .../iot/provisioning/element/Unfriend.java | 2 +- .../jingle_filetransfer/element/Checksum.java | 2 +- .../element/JingleFileTransferChild.java | 2 +- .../jingle_filetransfer/element/Range.java | 4 +- .../packet/AbstractJsonPacketExtension.java | 2 +- .../smackx/mam/element/MamElements.java | 6 +- .../element/BlockQuoteElement.java | 2 +- .../element/CodeBlockElement.java | 2 +- .../message_markup/element/ListElement.java | 6 +- .../message_markup/element/MarkupElement.java | 4 +- .../message_markup/element/SpanElement.java | 2 +- .../muclight/element/MUCLightElements.java | 12 +-- .../element/PushNotificationsElements.java | 2 +- .../reference/element/ReferenceElement.java | 4 +- .../smackx/sid/element/OriginIdElement.java | 2 +- .../smackx/sid/element/StanzaIdElement.java | 2 +- .../spoiler/element/SpoilerElement.java | 2 +- .../AcknowledgedExtensionTest.java | 2 +- .../chat_markers/DisplayedExtensionTest.java | 2 +- .../chat_markers/MarkableExtensionTest.java | 6 +- .../chat_markers/ReceivedExtensionTest.java | 2 +- .../smackx/hashes/HashElementTest.java | 4 +- .../FileTooLargeErrorCreateTest.java | 2 +- .../provider/SlotProviderTest.java | 6 +- .../jivesoftware/smackx/mam/FiltersTest.java | 8 +- .../jivesoftware/smackx/mam/PagingTest.java | 2 +- .../smackx/mam/PreferencesTest.java | 4 +- .../smackx/mam/QueryArchiveTest.java | 4 +- .../smackx/mam/ResultsLimitTest.java | 2 +- .../smackx/mam/RetrieveFormFieldsTest.java | 4 +- .../message_markup/MessageMarkupTest.java | 14 +-- .../smackx/muclight/MUCLightBlockingTest.java | 8 +- ...ightConfigurationsChangeExtensionTest.java | 6 +- .../smackx/muclight/MUCLightDestroyTest.java | 2 +- .../muclight/MUCLightGetAffiliationsTest.java | 2 +- .../muclight/MUCLightGetConfigsTest.java | 2 +- .../smackx/muclight/MUCLightInfoTest.java | 4 +- .../muclight/MUCLightSetConfigsIQTest.java | 6 +- .../DisablePushNotificationsIQTest.java | 4 +- .../EnablePushNotificationsIQTest.java | 4 +- .../smackx/reference/ReferenceTest.java | 8 +- .../smackx/sid/StableUniqueStanzaIdTest.java | 4 +- .../smackx/spoiler/SpoilerTest.java | 12 +-- .../address/MultipleRecipientManager.java | 10 +- .../address/packet/MultipleAddresses.java | 6 +- .../smackx/amp/packet/AMPExtension.java | 2 +- .../attention/packet/AttentionExtension.java | 2 +- .../element/BlockedErrorExtension.java | 2 +- .../smackx/bob/element/BoBExtension.java | 2 +- .../ibb/packet/DataPacketExtension.java | 2 +- .../bytestreams/socks5/packet/Bytestream.java | 12 +-- .../cache/SimpleDirectoryPersistentCache.java | 2 +- .../smackx/caps/packet/CapsExtension.java | 2 +- .../chatstates/packet/ChatStateExtension.java | 2 +- .../commands/packet/AdHocCommandData.java | 4 +- .../smackx/delay/packet/DelayInformation.java | 2 +- .../smackx/forward/packet/Forwarded.java | 4 +- .../smackx/geoloc/packet/GeoLocation.java | 2 +- .../iqregister/packet/Registration.java | 2 +- .../smackx/jingle/element/JingleContent.java | 2 +- .../element/JingleContentDescription.java | 2 +- .../element/JingleContentTransport.java | 2 +- .../smackx/jingle/element/JingleError.java | 2 +- .../smackx/jingle/element/JingleReason.java | 4 +- .../UnknownJingleContentDescription.java | 4 +- .../UnknownJingleContentTransport.java | 4 +- .../element/JingleIBBTransport.java | 2 +- .../elements/JingleS5BTransportCandidate.java | 2 +- .../elements/JingleS5BTransportInfo.java | 12 +-- .../packet/JivePropertiesExtension.java | 2 +- .../last_interaction/element/IdleElement.java | 2 +- .../element/MessageCorrectExtension.java | 2 +- .../smackx/muc/MultiUserChatManager.java | 2 +- .../org/jivesoftware/smackx/muc/RoomInfo.java | 2 +- .../smackx/muc/packet/Destroy.java | 2 +- .../muc/packet/GroupChatInvitation.java | 2 +- .../smackx/muc/packet/MUCAdmin.java | 2 +- .../smackx/muc/packet/MUCInitialPresence.java | 4 +- .../smackx/muc/packet/MUCItem.java | 2 +- .../smackx/muc/packet/MUCOwner.java | 2 +- .../smackx/muc/packet/MUCUser.java | 8 +- .../jivesoftware/smackx/nick/packet/Nick.java | 2 +- .../offline/packet/OfflineMessageInfo.java | 2 +- .../smackx/pubsub/Affiliation.java | 2 +- .../smackx/pubsub/AffiliationsExtension.java | 4 +- .../smackx/pubsub/EventElement.java | 4 +- .../jivesoftware/smackx/pubsub/FormNode.java | 6 +- .../smackx/pubsub/GetItemsRequest.java | 2 +- .../org/jivesoftware/smackx/pubsub/Item.java | 4 +- .../smackx/pubsub/ItemsExtension.java | 8 +- .../smackx/pubsub/NodeExtension.java | 4 +- .../smackx/pubsub/OptionsExtension.java | 2 +- .../smackx/pubsub/PayloadItem.java | 6 +- .../smackx/pubsub/PublishItem.java | 4 +- .../smackx/pubsub/RetractItem.java | 2 +- .../smackx/pubsub/SimplePayload.java | 4 +- .../smackx/pubsub/SubscribeExtension.java | 2 +- .../smackx/pubsub/Subscription.java | 2 +- .../smackx/pubsub/SubscriptionsExtension.java | 6 +- .../smackx/pubsub/UnsubscribeExtension.java | 2 +- .../smackx/receipts/DeliveryReceipt.java | 2 +- .../receipts/DeliveryReceiptRequest.java | 2 +- .../smackx/rsm/packet/RSMSet.java | 2 +- .../smackx/shim/packet/Header.java | 2 +- .../smackx/shim/packet/HeadersExtension.java | 2 +- .../smackx/si/packet/StreamInitiation.java | 10 +- .../jivesoftware/smackx/xdata/FormField.java | 10 +- .../smackx/xdata/packet/DataForm.java | 10 +- .../smackx/xdatalayout/packet/DataLayout.java | 12 +-- .../packet/ValidateElement.java | 4 +- .../smackx/xhtmlim/packet/XHTMLExtension.java | 2 +- .../smackx/amp/AMPExtensionTest.java | 2 +- .../smackx/blocking/BlockContactsIQTest.java | 2 +- .../smackx/blocking/GetBlockingListTest.java | 2 +- .../blocking/UnblockContactsIQTest.java | 4 +- .../jivesoftware/smackx/bob/BoBIQTest.java | 4 +- .../bytestreams/ibb/packet/CloseTest.java | 2 +- .../ibb/packet/DataPacketExtensionTest.java | 2 +- .../bytestreams/ibb/packet/DataTest.java | 2 +- .../bytestreams/ibb/packet/OpenTest.java | 2 +- .../smackx/caps/EntityCapsManagerTest.java | 2 +- .../FileTransferNegotiatorTest.java | 2 +- .../smackx/geoloc/packet/GeoLocationTest.java | 4 +- .../smackx/jingle/JingleContentTest.java | 6 +- .../smackx/jingle/JingleErrorTest.java | 8 +- .../smackx/jingle/JingleReasonTest.java | 34 +++---- .../smackx/jingle/JingleTest.java | 2 +- .../jingle_ibb/JingleIBBTransportTest.java | 4 +- .../jingle_s5b/JingleS5BTransportTest.java | 12 +-- .../smackx/last_interaction/IdleTest.java | 2 +- .../MessageCorrectExtensionTest.java | 4 +- .../pubsub/AffiliationsExtensionTest.java | 2 +- .../smackx/pubsub/ItemValidationTest.java | 24 ++--- .../smackx/pubsub/PubSubNodeTest.java | 2 +- .../smackx/pubsub/SimplePayloadTest.java | 2 +- .../smackx/xdata/packet/DataFormTest.java | 24 ++--- .../xdatalayout/packet/DataLayoutTest.java | 20 ++-- .../provider/DataValidationTest.java | 24 ++--- .../java/org/jivesoftware/util/Protocol.java | 4 +- .../jivesoftware/smack/chat/ChatManager.java | 2 +- .../smack/roster/packet/RosterPacket.java | 4 +- .../smack/roster/packet/RosterVer.java | 2 +- .../packet/SubscriptionPreApproval.java | 2 +- .../rosterstore/DirectoryRosterStore.java | 2 +- .../smackx/caps/EntityCapsTest.java | 2 +- .../smackx/jingleold/JingleSession.java | 12 +-- .../smackx/jingleold/packet/Jingle.java | 4 +- .../jingleold/packet/JingleContent.java | 6 +- .../packet/JingleContentDescription.java | 2 +- .../jingleold/packet/JingleContentInfo.java | 2 +- .../jingleold/packet/JingleDescription.java | 2 +- .../smackx/jingleold/packet/JingleError.java | 2 +- .../jingleold/packet/JingleTransport.java | 2 +- .../smackx/workgroup/MetaData.java | 2 +- .../smackx/workgroup/agent/AgentRoster.java | 2 +- .../smackx/workgroup/packet/AgentStatus.java | 2 +- .../workgroup/packet/OfferRevokeProvider.java | 4 +- .../smackx/workgroup/packet/QueueDetails.java | 2 +- .../workgroup/packet/QueueOverview.java | 2 +- .../smackx/workgroup/packet/QueueUpdate.java | 2 +- .../workgroup/packet/RoomInvitation.java | 2 +- .../smackx/workgroup/packet/RoomTransfer.java | 2 +- .../smackx/workgroup/packet/SessionID.java | 2 +- .../smackx/workgroup/packet/Transcript.java | 2 +- .../smackx/workgroup/packet/UserID.java | 2 +- .../packet/WorkgroupInformation.java | 2 +- .../smackx/workgroup/user/Workgroup.java | 4 +- .../smackx/xevent/packet/MessageEvent.java | 2 +- .../smackx/xroster/packet/RosterExchange.java | 2 +- .../omemo/element/OmemoBundleElement.java | 6 +- .../element/OmemoBundleVAxolotlElement.java | 2 +- .../omemo/element/OmemoDeviceListElement.java | 2 +- .../smackx/omemo/element/OmemoElement.java | 4 +- .../omemo/element/OmemoVAxolotlElement.java | 2 +- .../omemo/OmemoBundleVAxolotlElementTest.java | 2 +- .../OmemoDeviceListVAxolotlElementTest.java | 2 +- .../smack/omemo/OmemoVAxolotlElementTest.java | 4 +- .../igniterealtime/smack/smackrepl/IoT.java | 2 +- .../smack/sm/packet/StreamManagement.java | 14 +-- .../smack/tcp/XMPPTCPConnection.java | 8 +- .../provider/ParseStreamManagementTest.java | 4 +- 229 files changed, 634 insertions(+), 536 deletions(-) diff --git a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java index e4732bf40..5cab26ccb 100644 --- a/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java +++ b/smack-bosh/src/main/java/org/jivesoftware/smack/bosh/XMPPBOSHConnection.java @@ -39,6 +39,7 @@ import org.jivesoftware.smack.packet.Nonza; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.StanzaError; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure; import org.jivesoftware.smack.sasl.packet.SaslStreamElements.Success; import org.jivesoftware.smack.util.PacketParserUtils; @@ -234,7 +235,7 @@ public class XMPPBOSHConnection extends AbstractXMPPConnection { private void sendElement(Element element) { try { - send(ComposableBody.builder().setPayloadXML(element.toXML().toString()).build()); + send(ComposableBody.builder().setPayloadXML(element.toXML(StreamOpen.CLIENT_NAMESPACE).toString()).build()); if (element instanceof Stanza) { firePacketSendingListeners((Stanza) element); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compress.java b/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compress.java index 78b7cecdb..bb39fb911 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compress.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compress.java @@ -45,7 +45,7 @@ public class Compress implements Nonza { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.element("method", method); @@ -77,7 +77,7 @@ public class Compress implements Nonza { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); for (String method : methods) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compressed.java b/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compressed.java index 97b03ea2f..7075525a5 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compressed.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/compress/packet/Compressed.java @@ -39,7 +39,7 @@ public final class Compressed implements Nonza { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java b/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java index a345a7228..25dc98899 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/debugger/AbstractDebugger.java @@ -171,7 +171,7 @@ public abstract class AbstractDebugger extends SmackDebugger { @Override public void onIncomingStreamElement(TopLevelStreamElement streamElement) { if (printInterpreted) { - log("RCV PKT (" + connection.getConnectionCounter() + "): " + streamElement.toXML()); + log("RCV PKT (" + connection.getConnectionCounter() + "): " + streamElement.toXML(null)); } } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java index 17229df54..4be69478c 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractError.java @@ -114,7 +114,7 @@ public class AbstractError { xml.closeElement("text"); } for (ExtensionElement packetExtension : extensions) { - xml.append(packetExtension.toXML()); + xml.append(packetExtension.toXML(null)); } } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractTextElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractTextElement.java index 91f9f4582..1ca718f91 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractTextElement.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/AbstractTextElement.java @@ -37,7 +37,7 @@ public abstract class AbstractTextElement implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.optXmlLangAttribute(lang); xml.rightAngleBracket(); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java index a84bfbbbe..bffae930f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Bind.java @@ -89,7 +89,7 @@ public final class Bind extends IQ { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java index 04d5d1c52..708c0407b 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/DefaultExtensionElement.java @@ -86,7 +86,7 @@ public class DefaultExtensionElement implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(); buf.halfOpenElement(elementName).xmlnsAttribute(namespace).rightAngleBracket(); for (String name : getNames()) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java index f1285d967..06ad12fbc 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Element.java @@ -1,6 +1,6 @@ /** * - * Copyright © 2014 Florian Schmaus + * Copyright © 2014-2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,10 +23,14 @@ package org.jivesoftware.smack.packet; */ public interface Element { + // TODO: Add a toXML() non-parameter default method once Smack supports Java 8. + /** - * Returns the XML representation of this Element. + * Returns the XML representation of this Element. This method takes an optional argument for the enclosing + * namespace which may be null or the empty String if the value is not known. * + * @param enclosingNamespace the enclosing namespace or {@code null}. * @return the stanza extension as XML. */ - CharSequence toXML(); + CharSequence toXML(String enclosingNamespace); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java index de06f681a..088705597 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/IQ.java @@ -125,8 +125,8 @@ public abstract class IQ extends Stanza { } @Override - public final XmlStringBuilder toXML() { - XmlStringBuilder buf = new XmlStringBuilder(); + public final XmlStringBuilder toXML(String enclosingNamespace) { + XmlStringBuilder buf = new XmlStringBuilder(enclosingNamespace); buf.halfOpenElement(IQ_ELEMENT); addCommonAttributes(buf); if (type == null) { @@ -226,7 +226,7 @@ public abstract class IQ extends Stanza { protected final void initializeAsResultFor(IQ request) { if (!(request.getType() == Type.get || request.getType() == Type.set)) { throw new IllegalArgumentException( - "IQ must be of type 'set' or 'get'. Original IQ: " + request.toXML()); + "IQ must be of type 'set' or 'get'. Original IQ: " + request.toXML(null)); } setStanzaId(request.getStanzaId()); setFrom(request.getTo()); @@ -275,7 +275,7 @@ public abstract class IQ extends Stanza { public static ErrorIQ createErrorResponse(final IQ request, final StanzaError.Builder error) { if (!(request.getType() == Type.get || request.getType() == Type.set)) { throw new IllegalArgumentException( - "IQ must be of type 'set' or 'get'. Original IQ: " + request.toXML()); + "IQ must be of type 'set' or 'get'. Original IQ: " + request.toXML(null)); } final ErrorIQ result = new ErrorIQ(error); result.setStanzaId(request.getStanzaId()); @@ -367,6 +367,7 @@ public abstract class IQ extends Stanza { } private IQChildElementXmlStringBuilder(String element, String namespace) { + super(""); prelude(element, namespace); this.element = element; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Mechanisms.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Mechanisms.java index ae6a82a1a..0c8b58449 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Mechanisms.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Mechanisms.java @@ -53,7 +53,7 @@ public class Mechanisms implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); for (String mechanism : mechanisms) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java index eeae6fcf0..fcd6b0d72 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Message.java @@ -24,6 +24,7 @@ import java.util.List; import java.util.Locale; import java.util.Set; +import org.jivesoftware.smack.util.Objects; import org.jivesoftware.smack.util.TypedCloneable; import org.jivesoftware.smack.util.XmlStringBuilder; @@ -474,7 +475,7 @@ public final class Message extends Stanza implements TypedCloneable { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(); buf.halfOpenElement(ELEMENT); addCommonAttributes(buf); @@ -491,7 +492,7 @@ public final class Message extends Stanza implements TypedCloneable { // Skip the default language if (subject.equals(defaultSubject)) continue; - buf.append(subject.toXML()); + buf.append(subject.toXML(null)); } // Add the body in the default language Body defaultBody = getMessageBody(null); @@ -503,7 +504,7 @@ public final class Message extends Stanza implements TypedCloneable { // Skip the default language if (body.equals(defaultBody)) continue; - buf.append(body.toXML()); + buf.append(body.toXML(enclosingNamespace)); } buf.optElement("thread", thread); // Append the error subpacket if the message type is an error. @@ -606,7 +607,7 @@ public final class Message extends Stanza implements TypedCloneable { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(getElementName()).xmllangAttribute(getLanguage()).rightAngleBracket(); xml.escape(subject); @@ -624,10 +625,31 @@ public final class Message extends Stanza implements TypedCloneable { public static final String ELEMENT = "body"; public static final String NAMESPACE = StreamOpen.CLIENT_NAMESPACE; + enum BodyElementNamespace { + client(StreamOpen.CLIENT_NAMESPACE), + server(StreamOpen.SERVER_NAMESPACE), + ; + + private final String xmlNamespace; + + BodyElementNamespace(String xmlNamespace) { + this.xmlNamespace = xmlNamespace; + } + + public String getNamespace() { + return xmlNamespace; + } + } + private final String message; private final String language; + private final BodyElementNamespace namespace; - private Body(String language, String message) { + public Body(String language, String message) { + this(language, message, BodyElementNamespace.client); + } + + public Body(String language, String message, BodyElementNamespace namespace) { if (language == null) { throw new NullPointerException("Language cannot be null."); } @@ -636,6 +658,7 @@ public final class Message extends Stanza implements TypedCloneable { } this.language = language; this.message = message; + this.namespace = Objects.requireNonNull(namespace); } /** @@ -688,13 +711,13 @@ public final class Message extends Stanza implements TypedCloneable { @Override public String getNamespace() { - return NAMESPACE; + return namespace.xmlNamespace; } @Override - public XmlStringBuilder toXML() { - XmlStringBuilder xml = new XmlStringBuilder(); - xml.halfOpenElement(getElementName()).xmllangAttribute(getLanguage()).rightAngleBracket(); + public XmlStringBuilder toXML(String enclosingNamespace) { + XmlStringBuilder xml = new XmlStringBuilder(this, enclosingNamespace); + xml.xmllangAttribute(getLanguage()).rightAngleBracket(); xml.escape(message); xml.closeElement(getElementName()); return xml; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java index 7d2278c88..3402300c6 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Presence.java @@ -272,7 +272,7 @@ public final class Presence extends Stanza implements TypedCloneable { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(); buf.halfOpenElement(ELEMENT); addCommonAttributes(buf); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java index 448a2009c..4b5d793cd 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Session.java @@ -67,7 +67,7 @@ public class Session extends SimpleIQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); if (optional) { xml.rightAngleBracket(); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java index a092c9728..b4634e81d 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StandardExtensionElement.java @@ -132,10 +132,6 @@ public final class StandardExtensionElement implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { - return toXML(null); - } - public XmlStringBuilder toXML(String enclosingNamespace) { if (xmlCache != null) { return xmlCache; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java index 359f6da4a..e9d428092 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/Stanza.java @@ -490,7 +490,7 @@ public abstract class Stanza implements TopLevelStreamElement { XmlStringBuilder xml = new XmlStringBuilder(); // Add in all standard extension sub-packets. for (ExtensionElement extension : getExtensions()) { - xml.append(extension.toXML()); + xml.append(extension.toXML(null)); } return xml; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StartTls.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StartTls.java index f409dc704..7efbda799 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StartTls.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StartTls.java @@ -48,7 +48,7 @@ public class StartTls implements Nonza { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.condEmptyElement(required, "required"); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java index 5ec0c3453..def48dfbe 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamError.java @@ -136,11 +136,11 @@ public class StreamError extends AbstractError implements Nonza { @Override public String toString() { - return toXML().toString(); + return toXML(null).toString(); } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.openElement(ELEMENT); xml.halfOpenElement(condition.toString()).xmlnsAttribute(NAMESPACE).closeEmptyElement(); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamOpen.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamOpen.java index a6151e63c..21a4fce8e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamOpen.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/StreamOpen.java @@ -96,8 +96,12 @@ public class StreamOpen implements Nonza { } @Override - public XmlStringBuilder toXML() { - XmlStringBuilder xml = new XmlStringBuilder(this); + public XmlStringBuilder toXML(String enclosingNamespace) { + XmlStringBuilder xml = new XmlStringBuilder(); + xml.halfOpenElement(getElementName()); + // We always want to state 'xmlns' for stream open tags. + xml.attribute("xmlns", enclosingNamespace); + xml.attribute("to", to); xml.attribute("xmlns:stream", "http://etherx.jabber.org/streams"); xml.attribute("version", VERSION); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStreamElements.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStreamElements.java index 0c7200326..a0bca0c4a 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStreamElements.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/packet/SaslStreamElements.java @@ -44,7 +44,7 @@ public class SaslStreamElements { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).attribute("mechanism", mechanism).rightAngleBracket(); xml.optAppend(authenticationText); @@ -84,7 +84,7 @@ public class SaslStreamElements { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder().halfOpenElement(ELEMENT).xmlnsAttribute( NAMESPACE).rightAngleBracket(); xml.optAppend(data); @@ -120,7 +120,7 @@ public class SaslStreamElements { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket(); xml.optAppend(authenticationText); @@ -171,7 +171,7 @@ public class SaslStreamElements { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket(); xml.optAppend(data); @@ -236,7 +236,7 @@ public class SaslStreamElements { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(ELEMENT).xmlnsAttribute(NAMESPACE).rightAngleBracket(); xml.emptyElement(saslErrorString); @@ -247,7 +247,7 @@ public class SaslStreamElements { @Override public String toString() { - return toXML().toString(); + return toXML(null).toString(); } @Override diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java index 987ea9424..0f5f7e916 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/XmlStringBuilder.java @@ -1,6 +1,6 @@ /** * - * Copyright 2014-2017 Florian Schmaus + * Copyright 2014-2018 Florian Schmaus * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,13 +27,20 @@ import org.jivesoftware.smack.packet.NamedElement; import org.jxmpp.util.XmppDateTime; -public class XmlStringBuilder implements Appendable, CharSequence { +public class XmlStringBuilder implements Appendable, CharSequence, Element { public static final String RIGHT_ANGLE_BRACKET = Character.toString('>'); private final LazyStringBuilder sb; + private final String enclosingNamespace; + public XmlStringBuilder() { + this(""); + } + + public XmlStringBuilder(String enclosingNamespace) { sb = new LazyStringBuilder(); + this.enclosingNamespace = enclosingNamespace != null ? enclosingNamespace : ""; } public XmlStringBuilder(ExtensionElement pe) { @@ -47,13 +54,9 @@ public class XmlStringBuilder implements Appendable, CharSequence { } public XmlStringBuilder(ExtensionElement ee, String enclosingNamespace) { - this(); + this(enclosingNamespace); String namespace = ee.getNamespace(); - if (namespace.equals(enclosingNamespace)) { - halfOpenElement(ee.getElementName()); - } else { - prelude(ee); - } + prelude(ee); } public XmlStringBuilder escapedElement(String name, String escapedContent) { @@ -111,7 +114,7 @@ public class XmlStringBuilder implements Appendable, CharSequence { public XmlStringBuilder element(Element element) { assert element != null; - return append(element.toXML()); + return append(element.toXML(null)); } public XmlStringBuilder optElement(String name, String content) { @@ -146,7 +149,7 @@ public class XmlStringBuilder implements Appendable, CharSequence { public XmlStringBuilder optElement(Element element) { if (element != null) { - append(element.toXML()); + append(element.toXML(null)); } return this; } @@ -350,8 +353,41 @@ public class XmlStringBuilder implements Appendable, CharSequence { return this; } + private static final class XmlNsAttribute implements CharSequence { + private final String value; + private final String xmlFragment; + + private XmlNsAttribute(String value) { + this.value = StringUtils.requireNotNullOrEmpty(value, "Value must not be null"); + this.xmlFragment = " xmlns='" + value + '\''; + } + + @Override + public String toString() { + return xmlFragment; + } + + @Override + public int length() { + return xmlFragment.length(); + } + + @Override + public char charAt(int index) { + return xmlFragment.charAt(index); + } + + @Override + public CharSequence subSequence(int start, int end) { + return xmlFragment.subSequence(start, end); + } + } + public XmlStringBuilder xmlnsAttribute(String value) { - optAttribute("xmlns", value); + if (value != null && !enclosingNamespace.equals(value)) { + XmlNsAttribute xmlNsAttribute = new XmlNsAttribute(value); + append(xmlNsAttribute); + } return this; } @@ -409,7 +445,7 @@ public class XmlStringBuilder implements Appendable, CharSequence { public XmlStringBuilder optAppend(Element element) { if (element != null) { - append(element.toXML()); + append(element.toXML(enclosingNamespace)); } return this; } @@ -422,7 +458,7 @@ public class XmlStringBuilder implements Appendable, CharSequence { public XmlStringBuilder append(Collection elements) { for (Element element : elements) { - append(element.toXML()); + append(element.toXML(null)); } return this; } @@ -512,14 +548,46 @@ public class XmlStringBuilder implements Appendable, CharSequence { * @param writer * @throws IOException */ - public void write(Writer writer) throws IOException { + public void write(Writer writer, String enclosingNamespace) throws IOException { for (CharSequence csq : sb.getAsList()) { if (csq instanceof XmlStringBuilder) { - ((XmlStringBuilder) csq).write(writer); + ((XmlStringBuilder) csq).write(writer, enclosingNamespace); + } + else if (csq instanceof XmlNsAttribute) { + XmlNsAttribute xmlNsAttribute = (XmlNsAttribute) csq; + if (!xmlNsAttribute.value.equals(enclosingNamespace)) { + writer.write(xmlNsAttribute.toString()); + enclosingNamespace = xmlNsAttribute.value; + } } else { writer.write(csq.toString()); } } } + + @Override + public CharSequence toXML(String enclosingNamespace) { + StringBuilder res = new StringBuilder(); + appendXmlTo(res, enclosingNamespace); + return res; + } + + private void appendXmlTo(StringBuilder res, String enclosingNamespace) { + for (CharSequence csq : sb.getAsList()) { + if (csq instanceof XmlStringBuilder) { + ((XmlStringBuilder) csq).appendXmlTo(res, enclosingNamespace); + } + else if (csq instanceof XmlNsAttribute) { + XmlNsAttribute xmlNsAttribute = (XmlNsAttribute) csq; + if (!xmlNsAttribute.value.equals(enclosingNamespace)) { + sb.append(xmlNsAttribute); + enclosingNamespace = xmlNsAttribute.value; + } + } + else { + res.append(csq); + } + } + } } diff --git a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java index 40bd8f6fc..2b6884042 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/StanzaCollectorTest.java @@ -167,13 +167,13 @@ public class StanzaCollectorTest { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return "" + getStanzaId() + ""; } @Override public String toString() { - return toXML(); + return toXML(null); } } } diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java index 45d598240..73f0b5360 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/MessageTest.java @@ -49,7 +49,7 @@ public class MessageTest { Message messageTypeInConstructor = new Message(null, Message.Type.chat); messageTypeInConstructor.setStanzaId(null); assertEquals(type, messageTypeInConstructor.getType()); - assertXMLEqual(control, messageTypeInConstructor.toXML().toString()); + assertXMLEqual(control, messageTypeInConstructor.toXML(null).toString()); controlBuilder = new StringBuilder(); controlBuilder.append(" languages = message.getBodyLanguages(); List controlLanguages = new ArrayList<>(); @@ -183,7 +183,7 @@ public class MessageTest { message.setThread(messageThread); assertEquals(messageThread, message.getThread()); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); } @Test @@ -201,7 +201,7 @@ public class MessageTest { Message message = getNewMessage(); message.setLanguage(lang); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); } private static Message getNewMessage() { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java index 22836de92..69bdf0617 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/packet/PresenceTest.java @@ -43,7 +43,7 @@ public class PresenceTest { Presence presenceTypeInConstructor = new Presence(type); presenceTypeInConstructor.setStanzaId(null); assertEquals(type, presenceTypeInConstructor.getType()); - assertXMLEqual(control, presenceTypeInConstructor.toXML().toString()); + assertXMLEqual(control, presenceTypeInConstructor.toXML(null).toString()); controlBuilder = new StringBuilder(); controlBuilder.append("") @@ -155,7 +155,7 @@ public class PresenceTest { Presence presenceModeSet = getNewPresence(); presenceModeSet.setMode(mode2); assertEquals(mode2, presenceModeSet.getMode()); - assertXMLEqual(control, presenceModeSet.toXML().toString()); + assertXMLEqual(control, presenceModeSet.toXML(null).toString()); } @Test @@ -183,7 +183,7 @@ public class PresenceTest { Presence presence = getNewPresence(); presence.setLanguage(lang); - assertXMLEqual(control, presence.toXML().toString()); + assertXMLEqual(control, presence.toXML(null).toString()); } private static Presence getNewPresence() { diff --git a/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java b/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java index 8c38f08b4..a1bd44987 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/parsing/StandardExtensionElementParserTest.java @@ -32,7 +32,7 @@ public class StandardExtensionElementParserTest { builder.addAttribute("attr1", "attr1-value"); builder.addElement(StandardExtensionElement.builder("bar", "ns2").addAttribute("attr2", "attr2-value").build()); builder.addElement("another-element", "another-element-text"); - final String elementString = builder.build().toXML().toString(); + final String elementString = builder.build().toXML(null).toString(); StandardExtensionElement parsedElement = StandardExtensionElementProvider.INSTANCE.parse(getParserFor(elementString)); @@ -47,7 +47,7 @@ public class StandardExtensionElementParserTest { assertEquals("another-element-text", parsedElement.getFirstElement("another-element").getText()); - String parsedElementString = parsedElement.toXML().toString(); + String parsedElementString = parsedElement.toXML(null).toString(); assertEquals(elementString, parsedElementString); } @@ -56,7 +56,7 @@ public class StandardExtensionElementParserTest { Builder builder = StandardExtensionElement.builder("foo", "ns1-value"); builder.addAttribute("xmlns:ns2", "ns2-value"); builder.addAttribute("ns2:bar", "bar-ns2-value"); - final String elementString = builder.build().toXML().toString(); + final String elementString = builder.build().toXML(null).toString(); StandardExtensionElement parsedElement = StandardExtensionElementProvider.INSTANCE.parse(getParserFor(elementString)); assertEquals("foo", parsedElement.getElementName()); diff --git a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java index 261d1dce2..2bcbf71d9 100644 --- a/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java +++ b/smack-core/src/test/java/org/jivesoftware/smack/util/PacketParserUtilsTest.java @@ -38,6 +38,7 @@ import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.packet.Stanza; import org.jivesoftware.smack.packet.StanzaError; +import org.jivesoftware.smack.packet.StreamOpen; import org.jivesoftware.smack.sasl.SASLError; import org.jivesoftware.smack.sasl.packet.SaslStreamElements; import org.jivesoftware.smack.sasl.packet.SaslStreamElements.SASLFailure; @@ -82,7 +83,7 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().isEmpty()); assertEquals(defaultLanguage, message.getBody(defaultLanguage)); assertNull(message.getBody(otherLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has non-default language, body has no language control = XMLBuilder.create("message") @@ -101,7 +102,7 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().isEmpty()); assertEquals(otherLanguage, message.getBody(otherLanguage)); assertNull(message.getBody(defaultLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has no language, body has no language control = XMLBuilder.create("message") @@ -119,7 +120,7 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().isEmpty()); assertEquals(defaultLanguage, message.getBody(defaultLanguage)); assertNull(message.getBody(otherLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has no language, body has default language control = XMLBuilder.create("message") @@ -140,7 +141,7 @@ public class PacketParserUtilsTest { assertNull(message.getBody(otherLanguage)); // body attribute xml:lang is unnecessary - assertXMLNotEqual(control, message.toXML().toString()); + assertXMLNotEqual(control, message.toXML(null).toString()); // message has no language, body has non-default language control = XMLBuilder.create("message") @@ -160,7 +161,7 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().contains(otherLanguage)); assertEquals(otherLanguage, message.getBody(otherLanguage)); assertNull(message.getBody(defaultLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has default language, body has non-default language control = XMLBuilder.create("message") @@ -181,7 +182,7 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().contains(otherLanguage)); assertEquals(otherLanguage, message.getBody(otherLanguage)); assertNull(message.getBody(defaultLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has non-default language, body has default language control = XMLBuilder.create("message") @@ -202,7 +203,7 @@ public class PacketParserUtilsTest { assertTrue(message.getBodyLanguages().contains(defaultLanguage)); assertEquals(defaultLanguage, message.getBody(defaultLanguage)); assertNull(message.getBody(otherLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); } @@ -231,7 +232,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().isEmpty()); assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertNull(message.getSubject(otherLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has non-default language, subject has no language control = XMLBuilder.create("message") @@ -250,7 +251,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().isEmpty()); assertEquals(otherLanguage, message.getSubject(otherLanguage)); assertNull(message.getSubject(defaultLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has no language, subject has no language control = XMLBuilder.create("message") @@ -268,7 +269,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().isEmpty()); assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertNull(message.getSubject(otherLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has no language, subject has default language control = XMLBuilder.create("message") @@ -289,7 +290,7 @@ public class PacketParserUtilsTest { assertNull(message.getSubject(otherLanguage)); // subject attribute xml:lang is unnecessary - assertXMLNotEqual(control, message.toXML().toString()); + assertXMLNotEqual(control, message.toXML(null).toString()); // message has no language, subject has non-default language control = XMLBuilder.create("message") @@ -309,7 +310,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().contains(otherLanguage)); assertEquals(otherLanguage, message.getSubject(otherLanguage)); assertNull(message.getSubject(defaultLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has default language, subject has non-default language control = XMLBuilder.create("message") @@ -330,7 +331,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().contains(otherLanguage)); assertEquals(otherLanguage, message.getSubject(otherLanguage)); assertNull(message.getSubject(defaultLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has non-default language, subject has default language control = XMLBuilder.create("message") @@ -351,7 +352,7 @@ public class PacketParserUtilsTest { assertTrue(message.getSubjectLanguages().contains(defaultLanguage)); assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertNull(message.getSubject(otherLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); } @@ -386,7 +387,7 @@ public class PacketParserUtilsTest { assertEquals(2, message.getBodies().size()); assertEquals(1, message.getBodyLanguages().size()); assertTrue(message.getBodyLanguages().contains(otherLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has default language, first body no language, second body default language control = XMLBuilder.create("message") @@ -410,7 +411,7 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getBody(defaultLanguage)); assertEquals(1, message.getBodies().size()); assertEquals(0, message.getBodyLanguages().size()); - assertXMLNotEqual(control, message.toXML().toString()); + assertXMLNotEqual(control, message.toXML(null).toString()); // message has non-default language, first body no language, second body default language control = XMLBuilder.create("message") @@ -435,7 +436,7 @@ public class PacketParserUtilsTest { assertEquals(2, message.getBodies().size()); assertEquals(1, message.getBodyLanguages().size()); assertTrue(message.getBodyLanguages().contains(defaultLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has no language, first body no language, second body default language control = XMLBuilder.create("message") @@ -458,7 +459,7 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getBody(defaultLanguage)); assertEquals(1, message.getBodies().size()); assertEquals(0, message.getBodyLanguages().size()); - assertXMLNotEqual(control, message.toXML().toString()); + assertXMLNotEqual(control, message.toXML(null).toString()); // message has no language, first body no language, second body other language control = XMLBuilder.create("message") @@ -482,7 +483,7 @@ public class PacketParserUtilsTest { assertEquals(otherLanguage, message.getBody(otherLanguage)); assertEquals(2, message.getBodies().size()); assertEquals(1, message.getBodyLanguages().size()); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(StreamOpen.CLIENT_NAMESPACE).toString()); // message has no language, first body no language, second body no language control = XMLBuilder.create("message") @@ -504,7 +505,7 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getBody(defaultLanguage)); assertEquals(1, message.getBodies().size()); assertEquals(0, message.getBodyLanguages().size()); - assertXMLNotEqual(control, message.toXML().toString()); + assertXMLNotEqual(control, message.toXML(null).toString()); } @@ -539,7 +540,7 @@ public class PacketParserUtilsTest { assertEquals(2, message.getSubjects().size()); assertEquals(1, message.getSubjectLanguages().size()); assertTrue(message.getSubjectLanguages().contains(otherLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has default language, first subject no language, second subject default language control = XMLBuilder.create("message") @@ -563,7 +564,7 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertEquals(1, message.getSubjects().size()); assertEquals(0, message.getSubjectLanguages().size()); - assertXMLNotEqual(control, message.toXML().toString()); + assertXMLNotEqual(control, message.toXML(null).toString()); // message has non-default language, first subject no language, second subject default language control = XMLBuilder.create("message") @@ -588,7 +589,7 @@ public class PacketParserUtilsTest { assertEquals(2, message.getSubjects().size()); assertEquals(1, message.getSubjectLanguages().size()); assertTrue(message.getSubjectLanguages().contains(defaultLanguage)); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has no language, first subject no language, second subject default language control = XMLBuilder.create("message") @@ -611,7 +612,7 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertEquals(1, message.getSubjects().size()); assertEquals(0, message.getSubjectLanguages().size()); - assertXMLNotEqual(control, message.toXML().toString()); + assertXMLNotEqual(control, message.toXML(null).toString()); // message has no language, first subject no language, second subject other language control = XMLBuilder.create("message") @@ -635,7 +636,7 @@ public class PacketParserUtilsTest { assertEquals(otherLanguage, message.getSubject(otherLanguage)); assertEquals(2, message.getSubjects().size()); assertEquals(1, message.getSubjectLanguages().size()); - assertXMLEqual(control, message.toXML().toString()); + assertXMLEqual(control, message.toXML(null).toString()); // message has no language, first subject no language, second subject no language control = XMLBuilder.create("message") @@ -657,7 +658,7 @@ public class PacketParserUtilsTest { assertEquals(defaultLanguage, message.getSubject(defaultLanguage)); assertEquals(1, message.getSubjects().size()); assertEquals(0, message.getSubjectLanguages().size()); - assertXMLNotEqual(control, message.toXML().toString()); + assertXMLNotEqual(control, message.toXML(null).toString()); } @@ -684,7 +685,7 @@ public class PacketParserUtilsTest { Message message = PacketParserUtils.parseMessage(TestUtils.getMessageParser(control)); - fail("Should throw exception. Instead got message: " + message.toXML().toString()); + fail("Should throw exception. Instead got message: " + message.toXML(null).toString()); } @Test @@ -749,7 +750,7 @@ public class PacketParserUtilsTest { .asString(outputProperties); Stanza message = PacketParserUtils.parseStanza(control); - XmlUnitUtils.assertSimilar(control, message.toXML()); + XmlUnitUtils.assertSimilar(control, message.toXML(StreamOpen.CLIENT_NAMESPACE)); } @Test @@ -759,7 +760,7 @@ public class PacketParserUtilsTest { Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza)); - assertXMLEqual(stanza, presence.toXML().toString()); + assertXMLEqual(stanza, presence.toXML(null).toString()); // CHECKSTYLE:ON } @@ -770,7 +771,7 @@ public class PacketParserUtilsTest { Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza)); - assertXMLEqual(stanza, presence.toXML().toString()); + assertXMLEqual(stanza, presence.toXML(null).toString()); assertEquals(Presence.Type.unsubscribed, presence.getType()); // CHECKSTYLE:ON } @@ -785,7 +786,7 @@ public class PacketParserUtilsTest { + ""; Presence presence = PacketParserUtils.parsePresence(PacketParserUtils.getParserFor(stanza)); - assertXMLEqual(stanza, presence.toXML().toString()); + assertXMLEqual(stanza, presence.toXML(null).toString()); assertEquals(Presence.Type.unsubscribed, presence.getType()); assertEquals("dnd", presence.getMode().name()); assertEquals("en", presence.getLanguage()); @@ -851,7 +852,7 @@ public class PacketParserUtilsTest { // @formatter:on XmlPullParser parser = TestUtils.getParser(saslFailureString, SASLFailure.ELEMENT); SASLFailure saslFailure = PacketParserUtils.parseSASLFailure(parser); - XmlUnitUtils.assertSimilar(saslFailureString, saslFailure.toXML()); + XmlUnitUtils.assertSimilar(saslFailureString, saslFailure.toXML(StreamOpen.CLIENT_NAMESPACE)); } @SuppressWarnings("ReferenceEquality") diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java index 83b15aadf..78dddef3e 100644 --- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java +++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java @@ -113,14 +113,14 @@ public class SLF4JSmackDebugger extends SmackDebugger { @Override public void onIncomingStreamElement(TopLevelStreamElement streamElement) { if (SLF4JSmackDebugger.printInterpreted.get() && logger.isDebugEnabled()) { - logger.debug("IN {}: {}", streamElement.getClass().getName(), streamElement.toXML()); + logger.debug("IN {}: {}", streamElement.getClass().getName(), streamElement.toXML(null)); } } @Override public void onOutgoingStreamElement(TopLevelStreamElement streamElement) { if (SLF4JSmackDebugger.printInterpreted.get() && logger.isDebugEnabled()) { - logger.debug("OUT {}: {}", streamElement.getClass().getName(), streamElement.toXML()); + logger.debug("OUT {}: {}", streamElement.getClass().getName(), streamElement.toXML(null)); } } diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java index f2b7a074d..0b544a909 100644 --- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java +++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/EnhancedDebugger.java @@ -818,7 +818,7 @@ public class EnhancedDebugger extends SmackDebugger { messagesTable.addRow( new Object[] { - XmlUtil.prettyFormatXml(packet.toXML().toString()), + XmlUtil.prettyFormatXml(packet.toXML(null).toString()), dateFormatter.format(new Date()), packetReceivedIcon, packetTypeIcon, @@ -889,7 +889,7 @@ public class EnhancedDebugger extends SmackDebugger { messagesTable.addRow( new Object[] { - XmlUtil.prettyFormatXml(packet.toXML().toString()), + XmlUtil.prettyFormatXml(packet.toXML(null).toString()), dateFormatter.format(new Date()), packetSentIcon, packetTypeIcon, @@ -946,13 +946,13 @@ public class EnhancedDebugger extends SmackDebugger { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return text; } @Override public String toString() { - return toXML(); + return toXML(null); } } diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java index 0ce334e3b..da0bd163e 100644 --- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java +++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java @@ -331,8 +331,8 @@ public class LiteDebugger extends SmackDebugger { @Override public void onIncomingStreamElement(TopLevelStreamElement streamElement) { - interpretedText1.append(streamElement.toXML().toString()); - interpretedText2.append(streamElement.toXML().toString()); + interpretedText1.append(streamElement.toXML(null).toString()); + interpretedText2.append(streamElement.toXML(null).toString()); interpretedText1.append(NEWLINE); interpretedText2.append(NEWLINE); } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java index 1587996c0..0f9192cfd 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/carbons/packet/CarbonExtension.java @@ -79,10 +79,10 @@ public class CarbonExtension implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); - xml.append(fwd.toXML()); + xml.append(fwd.toXML(null)); xml.closeElement(this); return xml; } @@ -150,7 +150,7 @@ public class CarbonExtension implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return "<" + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java index c3f29ae6c..342839d85 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/chat_markers/element/ChatMarkersElements.java @@ -61,7 +61,7 @@ public class ChatMarkersElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.closeEmptyElement(); return xml; @@ -113,7 +113,7 @@ public class ChatMarkersElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("id", id); xml.closeEmptyElement(); @@ -166,7 +166,7 @@ public class ChatMarkersElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("id", id); xml.closeEmptyElement(); @@ -219,7 +219,7 @@ public class ChatMarkersElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("id", id); xml.closeEmptyElement(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/packet/ClientStateIndication.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/packet/ClientStateIndication.java index 0526b55eb..ff85fde46 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/packet/ClientStateIndication.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/csi/packet/ClientStateIndication.java @@ -45,7 +45,7 @@ public class ClientStateIndication { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } } @@ -68,7 +68,7 @@ public class ClientStateIndication { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } } @@ -86,7 +86,7 @@ public class ClientStateIndication { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java index 452d988a5..f41b9b317 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/eme/element/ExplicitMessageEncryptionElement.java @@ -134,7 +134,7 @@ public class ExplicitMessageEncryptionElement implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("namespace", getEncryptionNamespace()); xml.optAttribute("name", getName()); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java index d2d858875..03b4f32ee 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hashes/element/HashElement.java @@ -93,7 +93,7 @@ public class HashElement implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this); sb.attribute(ATTR_ALGO, algorithm.toString()); sb.rightAngleBracket(); @@ -117,6 +117,6 @@ public class HashElement implements ExtensionElement { @Override public int hashCode() { - return toXML().toString().hashCode(); + return toXML(null).toString().hashCode(); } } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoCopyHint.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoCopyHint.java index b726b2be2..2bd80cf7b 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoCopyHint.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoCopyHint.java @@ -38,7 +38,7 @@ public final class NoCopyHint extends MessageProcessingHint { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoPermanentStoreHint.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoPermanentStoreHint.java index d52ed693b..bd3bac500 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoPermanentStoreHint.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoPermanentStoreHint.java @@ -38,7 +38,7 @@ public final class NoPermanentStoreHint extends MessageProcessingHint { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoStoreHint.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoStoreHint.java index 1651dde18..508812ec9 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoStoreHint.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/NoStoreHint.java @@ -38,7 +38,7 @@ public final class NoStoreHint extends MessageProcessingHint { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/StoreHint.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/StoreHint.java index fdbc826fa..f468514b1 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/StoreHint.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hints/element/StoreHint.java @@ -38,7 +38,7 @@ public final class StoreHint extends MessageProcessingHint { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java index 8dbc5ad2a..ac708128c 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/AbstractHttpOverXmpp.java @@ -171,7 +171,7 @@ public abstract class AbstractHttpOverXmpp extends IQ { * @return xml representation of this object */ @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.element(child); @@ -215,7 +215,7 @@ public abstract class AbstractHttpOverXmpp extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.optAppend(text); @@ -259,7 +259,7 @@ public abstract class AbstractHttpOverXmpp extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.optAppend(text); @@ -303,7 +303,7 @@ public abstract class AbstractHttpOverXmpp extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.optAppend(text); @@ -347,7 +347,7 @@ public abstract class AbstractHttpOverXmpp extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("streamId", streamId); xml.closeEmptyElement(); @@ -390,7 +390,7 @@ public abstract class AbstractHttpOverXmpp extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("sid", sid); xml.closeEmptyElement(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java index 29da4bb75..d299d95c4 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/hoxt/packet/Base64BinaryChunk.java @@ -117,7 +117,7 @@ public class Base64BinaryChunk implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("streamId", streamId); xml.attribute("nr", nr); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/FileTooLargeError.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/FileTooLargeError.java index 909780e4e..94d3bf10e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/FileTooLargeError.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/httpfileupload/element/FileTooLargeError.java @@ -58,7 +58,7 @@ public class FileTooLargeError implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.element("max-file-size", String.valueOf(maxFileSize)); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java index c803c8cc9..766cf1545 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/control/element/SetData.java @@ -82,7 +82,7 @@ public abstract class SetData implements NamedElement { * @return the stanza extension as XML. */ @Override - public final XmlStringBuilder toXML() { + public final XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("name", name); xml.attribute("value", value); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataField.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataField.java index eb558571b..3a46f21a5 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataField.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTDataField.java @@ -52,7 +52,7 @@ public abstract class IoTDataField implements NamedElement { } @Override - public final XmlStringBuilder toXML() { + public final XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("name", name).attribute("value", getValueString()); // TODO handle 'unit' attribute as special case if is implemented. diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTFieldsExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTFieldsExtension.java index 577d4072a..0bdc0c773 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTFieldsExtension.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/IoTFieldsExtension.java @@ -68,7 +68,7 @@ public class IoTFieldsExtension implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("seqnr", Integer.toString(seqNr)); xml.attribute("done", done); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/NodeElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/NodeElement.java index 7855685c4..341039da7 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/NodeElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/NodeElement.java @@ -50,7 +50,7 @@ public class NodeElement implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); nodeInfo.appendTo(xml); xml.rightAngleBracket(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/TimestampElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/TimestampElement.java index bbc1c9389..61dc92edc 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/TimestampElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/element/TimestampElement.java @@ -45,7 +45,7 @@ public class TimestampElement implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("value", date); xml.rightAngleBracket(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java index 495e5019b..f5cb1bd3c 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/discovery/element/Tag.java @@ -58,7 +58,7 @@ public class Tag implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("name", name); xml.attribute("value", value); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Friend.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Friend.java index 50fa0df61..2f8f887e9 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Friend.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Friend.java @@ -45,7 +45,7 @@ public class Friend implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("jid", friend); xml.closeEmptyElement(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Unfriend.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Unfriend.java index 27da772cb..29ce71810 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Unfriend.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/iot/provisioning/element/Unfriend.java @@ -47,7 +47,7 @@ public class Unfriend implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("jid", jid); xml.closeEmptyElement(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Checksum.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Checksum.java index a841c8ae7..9f252bc23 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Checksum.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Checksum.java @@ -46,7 +46,7 @@ public class Checksum implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this); sb.optAttribute(ATTR_CREATOR, creator); sb.optAttribute(ATTR_NAME, name); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChild.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChild.java index 9634d0a1b..6308266ac 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChild.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/JingleFileTransferChild.java @@ -86,7 +86,7 @@ public class JingleFileTransferChild extends JingleContentDescriptionChildElemen } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this); sb.rightAngleBracket(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java index 9d4f867ad..db64d0466 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/jingle_filetransfer/element/Range.java @@ -99,7 +99,7 @@ public class Range implements NamedElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this); if (offset > 0) { @@ -130,6 +130,6 @@ public class Range implements NamedElement { @Override public int hashCode() { - return toXML().toString().hashCode(); + return toXML(null).toString().hashCode(); } } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/packet/AbstractJsonPacketExtension.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/packet/AbstractJsonPacketExtension.java index 616c6ea4d..3df8f7251 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/json/packet/AbstractJsonPacketExtension.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/json/packet/AbstractJsonPacketExtension.java @@ -32,7 +32,7 @@ public abstract class AbstractJsonPacketExtension implements ExtensionElement { } @Override - public final XmlStringBuilder toXML() { + public final XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.append(json); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamElements.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamElements.java index 97b0f80d0..3f48604d2 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamElements.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/mam/element/MamElements.java @@ -126,7 +126,7 @@ public class MamElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.xmlnsAttribute(NAMESPACE); @@ -167,7 +167,7 @@ public class MamElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.openElement("always"); @@ -201,7 +201,7 @@ public class MamElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.openElement("never"); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/BlockQuoteElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/BlockQuoteElement.java index fb22e08af..acd4aba6a 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/BlockQuoteElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/BlockQuoteElement.java @@ -51,7 +51,7 @@ public class BlockQuoteElement implements MarkupElement.BlockLevelMarkupElement } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.attribute(ATTR_START, getStart()); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/CodeBlockElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/CodeBlockElement.java index d80d02cae..655155cb2 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/CodeBlockElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/CodeBlockElement.java @@ -51,7 +51,7 @@ public class CodeBlockElement implements MarkupElement.BlockLevelMarkupElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.attribute(ATTR_START, getStart()); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/ListElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/ListElement.java index 3f11bba6d..ec3b7aa98 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/ListElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/ListElement.java @@ -68,7 +68,7 @@ public class ListElement implements MarkupElement.MarkupChildElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.attribute(ATTR_START, getStart()); @@ -76,7 +76,7 @@ public class ListElement implements MarkupElement.MarkupChildElement { xml.rightAngleBracket(); for (ListEntryElement li : getEntries()) { - xml.append(li.toXML()); + xml.append(li.toXML(null)); } xml.closeElement(this); @@ -110,7 +110,7 @@ public class ListElement implements MarkupElement.MarkupChildElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.attribute(ATTR_START, getStart()); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/MarkupElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/MarkupElement.java index ed86d3980..6088010b6 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/MarkupElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/MarkupElement.java @@ -68,11 +68,11 @@ public class MarkupElement implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this).rightAngleBracket(); for (MarkupChildElement child : getChildElements()) { - xml.append(child.toXML()); + xml.append(child.toXML(null)); } xml.closeElement(this); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/SpanElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/SpanElement.java index 8d3847716..476be80ab 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/SpanElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/message_markup/element/SpanElement.java @@ -76,7 +76,7 @@ public class SpanElement implements MarkupElement.MarkupChildElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.attribute(ATTR_START, getStart()); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightElements.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightElements.java index 75f94b433..0124e09de 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightElements.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/muclight/element/MUCLightElements.java @@ -94,7 +94,7 @@ public abstract class MUCLightElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); @@ -208,7 +208,7 @@ public abstract class MUCLightElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); @@ -255,7 +255,7 @@ public abstract class MUCLightElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.openElement("configuration"); @@ -296,7 +296,7 @@ public abstract class MUCLightElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.openElement("occupants"); @@ -335,7 +335,7 @@ public abstract class MUCLightElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement("user"); xml.attribute("affiliation", affiliation); @@ -373,7 +373,7 @@ public abstract class MUCLightElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); String tag = isRoom ? "room" : "user"; diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/PushNotificationsElements.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/PushNotificationsElements.java index d7e369320..c90a8bd1e 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/PushNotificationsElements.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/push_notifications/element/PushNotificationsElements.java @@ -78,7 +78,7 @@ public class PushNotificationsElements { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("node", node); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/element/ReferenceElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/element/ReferenceElement.java index f3490d175..3d1d6e25d 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/element/ReferenceElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/reference/element/ReferenceElement.java @@ -174,7 +174,7 @@ public class ReferenceElement implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this) .optIntAttribute(ATTR_BEGIN, begin != null ? begin : -1) .optIntAttribute(ATTR_END, end != null ? end : -1) @@ -186,7 +186,7 @@ public class ReferenceElement implements ExtensionElement { return xml.closeEmptyElement(); } else { return xml.rightAngleBracket() - .append(child.toXML()) + .append(child.toXML(null)) .closeElement(this); } } diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/OriginIdElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/OriginIdElement.java index e17966cac..5ff30b763 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/OriginIdElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/OriginIdElement.java @@ -76,7 +76,7 @@ public class OriginIdElement extends StableAndUniqueIdElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { return new XmlStringBuilder(this) .attribute(ATTR_ID, getId()) .closeEmptyElement(); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StanzaIdElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StanzaIdElement.java index 6c1e24bba..ca518a924 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StanzaIdElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/element/StanzaIdElement.java @@ -72,7 +72,7 @@ public class StanzaIdElement extends StableAndUniqueIdElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { return new XmlStringBuilder(this) .attribute(ATTR_ID, getId()) .attribute(ATTR_BY, getBy()) diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/element/SpoilerElement.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/element/SpoilerElement.java index 1f1794ff1..0d3e10280 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/element/SpoilerElement.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/spoiler/element/SpoilerElement.java @@ -151,7 +151,7 @@ public class SpoilerElement implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.optXmlLangAttribute(getLanguage()); if (getHint() == null) { diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java index b7d7eb595..86e3a3dcc 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/AcknowledgedExtensionTest.java @@ -40,7 +40,7 @@ public class AcknowledgedExtensionTest { Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster")); message.setStanzaId("message-2"); message.addExtension(new ChatMarkersElements.AcknowledgedExtension("message-1")); - Assert.assertEquals(acknowledgedMessageStanza, message.toXML().toString()); + Assert.assertEquals(acknowledgedMessageStanza, message.toXML(null).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java index bba42c13c..03f07d3d3 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/DisplayedExtensionTest.java @@ -40,7 +40,7 @@ public class DisplayedExtensionTest { Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster")); message.setStanzaId("message-2"); message.addExtension(new ChatMarkersElements.DisplayedExtension("message-1")); - Assert.assertEquals(displayedMessageStanza, message.toXML().toString()); + Assert.assertEquals(displayedMessageStanza, message.toXML(null).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java index e62e0cd98..4d0fc4430 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/MarkableExtensionTest.java @@ -42,18 +42,18 @@ public class MarkableExtensionTest { message.setStanzaId("message-1"); message.setBody("My lord, dispatch; read o'er these articles."); message.addExtension(new ChatMarkersElements.MarkableExtension()); - Assert.assertEquals(markableMessageStanza, message.toXML().toString()); + Assert.assertEquals(markableMessageStanza, message.toXML(null).toString()); } @Test public void checkMarkableProvider() throws Exception { XmlPullParser parser = PacketParserUtils.getParserFor(markableExtension); MarkableExtension markableExtension1 = new MarkableProvider().parse(parser); - Assert.assertEquals(markableExtension, markableExtension1.toXML().toString()); + Assert.assertEquals(markableExtension, markableExtension1.toXML(null).toString()); Message message = PacketParserUtils.parseStanza(markableMessageStanza); MarkableExtension markableExtension2 = MarkableExtension.from(message); - Assert.assertEquals(markableExtension, markableExtension2.toXML().toString()); + Assert.assertEquals(markableExtension, markableExtension2.toXML(null).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java index 31d668571..87963deab 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/chat_markers/ReceivedExtensionTest.java @@ -40,7 +40,7 @@ public class ReceivedExtensionTest { Message message = new Message(JidCreate.from("northumberland@shakespeare.lit/westminster")); message.setStanzaId("message-2"); message.addExtension(new ChatMarkersElements.ReceivedExtension("message-1")); - Assert.assertEquals(receivedMessageStanza, message.toXML().toString()); + Assert.assertEquals(receivedMessageStanza, message.toXML(null).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java index e67342a9e..dbaa57525 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/hashes/HashElementTest.java @@ -41,10 +41,10 @@ public class HashElementTest extends SmackTestSuite { String message = "Hello World!"; HashElement element = HashManager.calculateHashElement(SHA_256, StringUtils.toUtf8Bytes(message)); String expected = "f4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJtkGk="; - assertEquals(expected, element.toXML().toString()); + assertEquals(expected, element.toXML(null).toString()); HashElement parsed = new HashElementProvider().parse(TestUtils.getParser(expected)); - assertEquals(expected, parsed.toXML().toString()); + assertEquals(expected, parsed.toXML(null).toString()); assertEquals(SHA_256, parsed.getAlgorithm()); assertEquals("f4OxZX/x/FO5LcGBSKHWXfwtSx+j1ncoSt3SABJtkGk=", parsed.getHashB64()); assertArrayEquals(HashManager.sha_256(message), parsed.getHash()); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java index eb7333b6d..5562b8954 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/FileTooLargeErrorCreateTest.java @@ -32,7 +32,7 @@ public class FileTooLargeErrorCreateTest { FileTooLargeError fileTooLargeError = new FileTooLargeError(20000); Assert.assertEquals(20000, fileTooLargeError.getMaxFileSize()); - Assert.assertEquals(fileTooLargeErrorExtensionExample, fileTooLargeError.toXML().toString()); + Assert.assertEquals(fileTooLargeErrorExtensionExample, fileTooLargeError.toXML(null).toString()); } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java index dc16ef9e9..971c1d590 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/httpfileupload/provider/SlotProviderTest.java @@ -68,7 +68,7 @@ public class SlotProviderTest { checkUrls(slot); - assertXMLEqual(SLOT_IQ, slot.toXML().toString()); + assertXMLEqual(SLOT_IQ, slot.toXML(null).toString()); } private static final String SLOT_V0_2_IQ = @@ -88,7 +88,7 @@ public class SlotProviderTest { checkUrls(slot); - String slotXml = slot.toXML().toString(); + String slotXml = slot.toXML(null).toString(); assertXMLEqual(SLOT_V0_2_IQ, slotXml); } @@ -112,7 +112,7 @@ public class SlotProviderTest { checkUrls(slot); - String slotXml = slot.toXML().toString(); + String slotXml = slot.toXML(null).toString(); assertXMLEqual(SLOT_WITH_HEADERS_IQ, slotXml); } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java index c2c371c6e..c25790544 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/FiltersTest.java @@ -59,7 +59,7 @@ public class FiltersTest extends MamTest { List values = new ArrayList<>(); values.add(XmppDateTime.formatXEP0082Date(date)); - Assert.assertEquals(dataForm.toXML().toString(), getMamXMemberWith(fields, values)); + Assert.assertEquals(dataForm.toXML(null).toString(), getMamXMemberWith(fields, values)); } @Test @@ -76,7 +76,7 @@ public class FiltersTest extends MamTest { List values = new ArrayList<>(); values.add(XmppDateTime.formatXEP0082Date(date)); - Assert.assertEquals(dataForm.toXML().toString(), getMamXMemberWith(fields, values)); + Assert.assertEquals(dataForm.toXML(null).toString(), getMamXMemberWith(fields, values)); } @Test @@ -93,7 +93,7 @@ public class FiltersTest extends MamTest { List values = new ArrayList<>(); values.add(jid); - Assert.assertEquals(dataForm.toXML().toString(), getMamXMemberWith(fields, values)); + Assert.assertEquals(dataForm.toXML(null).toString(), getMamXMemberWith(fields, values)); } @Test @@ -113,7 +113,7 @@ public class FiltersTest extends MamTest { methodAddStartDateFilter.invoke(mamManager, date, dataForm); methodAddEndDateFilter.invoke(mamManager, date, dataForm); methodAddJidFilter.invoke(mamManager, JidCreate.from(jid), dataForm); - String dataFormResult = dataForm.toXML().toString(); + String dataFormResult = dataForm.toXML(null).toString(); List fields = new ArrayList<>(); List values = new ArrayList<>(); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java index 83cdba531..751530a5f 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PagingTest.java @@ -45,7 +45,7 @@ public class PagingTest extends MamTest { Assert.assertEquals(mamQueryIQ.getDataForm(), dataForm); Assert.assertEquals(mamQueryIQ.getDataForm().getFields().get(0).getValues().get(0), "urn:xmpp:mam:1"); - Assert.assertEquals(mamQueryIQ.toXML().toString(), pagingStanza); + Assert.assertEquals(mamQueryIQ.toXML(null).toString(), pagingStanza); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java index fc5b9951c..434151452 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/PreferencesTest.java @@ -41,7 +41,7 @@ public class PreferencesTest { public void checkRetrievePrefsStanza() throws Exception { MamPrefsIQ mamPrefIQ = new MamPrefsIQ(); mamPrefIQ.setStanzaId("sarasa"); - Assert.assertEquals(mamPrefIQ.toXML().toString(), retrievePrefsStanzaExample); + Assert.assertEquals(mamPrefIQ.toXML(null).toString(), retrievePrefsStanzaExample); } @Test @@ -55,7 +55,7 @@ public class PreferencesTest { MamPrefsIQ mamPrefIQ = new MamPrefsIQ(alwaysJids, neverJids, DefaultBehavior.roster); mamPrefIQ.setStanzaId("sarasa"); - Assert.assertEquals(mamPrefIQ.toXML().toString(), updatePrefsStanzaExample); + Assert.assertEquals(mamPrefIQ.toXML(null).toString(), updatePrefsStanzaExample); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java index af5d87a61..4b6d2e44b 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/QueryArchiveTest.java @@ -55,7 +55,7 @@ public class QueryArchiveTest extends MamTest { MamQueryIQ mamQueryIQ = new MamQueryIQ(queryId, dataForm); mamQueryIQ.setType(IQ.Type.set); mamQueryIQ.setStanzaId("sarasa"); - Assert.assertEquals(mamQueryIQ.toXML().toString(), mamSimpleQueryIQ); + Assert.assertEquals(mamQueryIQ.toXML(null).toString(), mamSimpleQueryIQ); } @Test @@ -80,7 +80,7 @@ public class QueryArchiveTest extends MamTest { message.addExtension(new MamResultExtension("g27", "34482-21985-73620", forwarded)); - Assert.assertEquals(message.toXML().toString(), mamQueryResultExample); + Assert.assertEquals(message.toXML(null).toString(), mamQueryResultExample); MamResultExtension mamResultExtension = MamResultExtension.from(message); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java index 721cc2298..d474a1198 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/ResultsLimitTest.java @@ -46,7 +46,7 @@ public class ResultsLimitTest extends MamTest { mamQueryIQ.setStanzaId("sarasa"); methodAddResultsLimit.invoke(mamManager, 10, mamQueryIQ); - Assert.assertEquals(mamQueryIQ.toXML().toString(), resultsLimitStanza); + Assert.assertEquals(mamQueryIQ.toXML(null).toString(), resultsLimitStanza); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java index e717bcfc0..070735143 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/mam/RetrieveFormFieldsTest.java @@ -44,7 +44,7 @@ public class RetrieveFormFieldsTest extends MamTest { MamQueryIQ mamQueryIQ = new MamQueryIQ(queryId); mamQueryIQ.setStanzaId("sarasa"); - Assert.assertEquals(mamQueryIQ.toXML().toString(), retrieveFormFieldStanza); + Assert.assertEquals(mamQueryIQ.toXML(null).toString(), retrieveFormFieldStanza); } @Test @@ -70,7 +70,7 @@ public class RetrieveFormFieldsTest extends MamTest { methodAddAdditionalFields.invoke(mamManager, additionalFields, dataForm); - String dataFormResult = dataForm.toXML().toString(); + String dataFormResult = dataForm.toXML(null).toString(); Assert.assertEquals(dataFormResult, additionalFieldsStanza); } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java index 7afcdc6e7..5c79c7aff 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/message_markup/MessageMarkupTest.java @@ -45,7 +45,7 @@ public class MessageMarkupTest extends SmackTestSuite { ""; MarkupElement.Builder m = MarkupElement.getBuilder(); m.setEmphasis(9, 15); - assertXMLEqual(xml, m.build().toXML().toString()); + assertXMLEqual(xml, m.build().toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); MarkupElement parsed = new MarkupElementProvider().parse(parser); @@ -69,7 +69,7 @@ public class MessageMarkupTest extends SmackTestSuite { ""; MarkupElement.Builder m = MarkupElement.getBuilder(); m.setCode(9, 15); - assertXMLEqual(xml, m.build().toXML().toString()); + assertXMLEqual(xml, m.build().toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); MarkupElement parsed = new MarkupElementProvider().parse(parser); @@ -93,7 +93,7 @@ public class MessageMarkupTest extends SmackTestSuite { ""; MarkupElement.Builder m = MarkupElement.getBuilder(); m.setDeleted(9, 15); - assertXMLEqual(xml, m.build().toXML().toString()); + assertXMLEqual(xml, m.build().toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); MarkupElement parsed = new MarkupElementProvider().parse(parser); @@ -127,7 +127,7 @@ public class MessageMarkupTest extends SmackTestSuite { ""; MarkupElement.Builder m = MarkupElement.getBuilder(); m.setCodeBlock(23, 48); - assertXMLEqual(xml, m.build().toXML().toString()); + assertXMLEqual(xml, m.build().toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); MarkupElement parsed = new MarkupElementProvider().parse(parser); @@ -157,7 +157,7 @@ public class MessageMarkupTest extends SmackTestSuite { .addEntry(61, 69) .addEntry(69, 89) .endList(); - assertXMLEqual(xml, m.build().toXML().toString()); + assertXMLEqual(xml, m.build().toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); MarkupElement parsed = new MarkupElementProvider().parse(parser); @@ -186,7 +186,7 @@ public class MessageMarkupTest extends SmackTestSuite { ""; MarkupElement.Builder m = MarkupElement.getBuilder(); m.setBlockQuote(9 ,32); - assertXMLEqual(xml, m.build().toXML().toString()); + assertXMLEqual(xml, m.build().toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); MarkupElement parsed = new MarkupElementProvider().parse(parser); @@ -208,7 +208,7 @@ public class MessageMarkupTest extends SmackTestSuite { MarkupElement.Builder m = MarkupElement.getBuilder(); m.setBlockQuote(0, 57); m.setBlockQuote(11, 34); - assertXMLEqual(xml, m.build().toXML().toString()); + assertXMLEqual(xml, m.build().toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); MarkupElement parsed = new MarkupElementProvider().parse(parser); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java index db34f9548..7ae843747 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightBlockingTest.java @@ -61,7 +61,7 @@ public class MUCLightBlockingTest { mucLightBlockingIQ.setStanzaId("getblock1"); mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit")); - Assert.assertEquals(getBlockingListIQExample, mucLightBlockingIQ.toXML().toString()); + Assert.assertEquals(getBlockingListIQExample, mucLightBlockingIQ.toXML(null).toString()); } @Test @@ -88,7 +88,7 @@ public class MUCLightBlockingTest { mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit")); mucLightBlockingIQ.setStanzaId("block1"); - Assert.assertEquals(blockingRoomsIQExample, mucLightBlockingIQ.toXML().toString()); + Assert.assertEquals(blockingRoomsIQExample, mucLightBlockingIQ.toXML(null).toString()); } @Test @@ -102,7 +102,7 @@ public class MUCLightBlockingTest { mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit")); mucLightBlockingIQ.setStanzaId("block2"); - Assert.assertEquals(blockingUsersIQExample, mucLightBlockingIQ.toXML().toString()); + Assert.assertEquals(blockingUsersIQExample, mucLightBlockingIQ.toXML(null).toString()); } @Test @@ -118,7 +118,7 @@ public class MUCLightBlockingTest { mucLightBlockingIQ.setTo(JidCreate.from("muclight.shakespeare.lit")); mucLightBlockingIQ.setStanzaId("unblock1"); - Assert.assertEquals(unblockingUsersAndRoomsExample, mucLightBlockingIQ.toXML().toString()); + Assert.assertEquals(unblockingUsersAndRoomsExample, mucLightBlockingIQ.toXML(null).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java index 0b95af0d3..1be967aea 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightConfigurationsChangeExtensionTest.java @@ -51,7 +51,7 @@ public class MUCLightConfigurationsChangeExtensionTest { Assert.assertEquals("To be or not to be?", configurationsChangeExtension.getSubject()); Assert.assertNull(configurationsChangeExtension.getRoomName()); Assert.assertNull(configurationsChangeExtension.getCustomConfigs()); - Assert.assertEquals(messageWithSubjectChangeExample, configurationsMessage.toXML().toString()); + Assert.assertEquals(messageWithSubjectChangeExample, configurationsMessage.toXML(null).toString()); } @Test @@ -65,7 +65,7 @@ public class MUCLightConfigurationsChangeExtensionTest { Assert.assertEquals("A Darker Cave", configurationsChangeExtension.getRoomName()); Assert.assertNull(configurationsChangeExtension.getSubject()); Assert.assertNull(configurationsChangeExtension.getCustomConfigs()); - Assert.assertEquals(messageWithRoomNameChangeExample, configurationsMessage.toXML().toString()); + Assert.assertEquals(messageWithRoomNameChangeExample, configurationsMessage.toXML(null).toString()); } @Test @@ -79,7 +79,7 @@ public class MUCLightConfigurationsChangeExtensionTest { Assert.assertEquals("A Darker Cave", configurationsChangeExtension.getRoomName()); Assert.assertNull(configurationsChangeExtension.getSubject()); Assert.assertEquals("blue", configurationsChangeExtension.getCustomConfigs().get("color")); - Assert.assertEquals(messageWithConfigsChangeExample, configurationsMessage.toXML().toString()); + Assert.assertEquals(messageWithConfigsChangeExample, configurationsMessage.toXML(null).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java index b00c5a0d4..854fd5f9f 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightDestroyTest.java @@ -31,7 +31,7 @@ public class MUCLightDestroyTest { public void checkDestroyMUCLightStanza() throws Exception { MUCLightDestroyIQ mucLightDestroyIQ = new MUCLightDestroyIQ(JidCreate.from("coven@muclight.shakespeare.lit")); mucLightDestroyIQ.setStanzaId("destroy1"); - Assert.assertEquals(mucLightDestroyIQ.toXML().toString(), stanza); + Assert.assertEquals(mucLightDestroyIQ.toXML(null).toString(), stanza); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java index 679772ea3..f1628b069 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetAffiliationsTest.java @@ -45,7 +45,7 @@ public class MUCLightGetAffiliationsTest { MUCLightGetAffiliationsIQ mucLightGetAffiliationsIQ = new MUCLightGetAffiliationsIQ( JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg"); mucLightGetAffiliationsIQ.setStanzaId("getmembers"); - Assert.assertEquals(getAffiliationsIQExample, mucLightGetAffiliationsIQ.toXML().toString()); + Assert.assertEquals(getAffiliationsIQExample, mucLightGetAffiliationsIQ.toXML(null).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java index 5b97c21c1..3ae8b558e 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightGetConfigsTest.java @@ -48,7 +48,7 @@ public class MUCLightGetConfigsTest { MUCLightGetConfigsIQ mucLightGetConfigsIQ = new MUCLightGetConfigsIQ( JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg"); mucLightGetConfigsIQ.setStanzaId("config0"); - Assert.assertEquals(getConfigsIQExample, mucLightGetConfigsIQ.toXML().toString()); + Assert.assertEquals(getConfigsIQExample, mucLightGetConfigsIQ.toXML(null).toString()); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java index f29d1e11b..1aaeb204d 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightInfoTest.java @@ -45,7 +45,7 @@ public class MUCLightInfoTest { MUCLightGetInfoIQ mucLightGetInfoIQWithVersion = new MUCLightGetInfoIQ( JidCreate.from("coven@muclight.shakespeare.lit"), "abcdefg"); mucLightGetInfoIQWithVersion.setStanzaId("getinfo1"); - Assert.assertEquals(mucLightGetInfoIQWithVersion.toXML().toString(), exampleWithVersion); + Assert.assertEquals(mucLightGetInfoIQWithVersion.toXML(null).toString(), exampleWithVersion); } @Test @@ -53,7 +53,7 @@ public class MUCLightInfoTest { MUCLightGetInfoIQ mucLightGetInfoIQWithoutVersion = new MUCLightGetInfoIQ( JidCreate.from("coven@muclight.shakespeare.lit"), null); mucLightGetInfoIQWithoutVersion.setStanzaId("getinfo1"); - Assert.assertEquals(mucLightGetInfoIQWithoutVersion.toXML().toString(), exampleWithoutVersion); + Assert.assertEquals(mucLightGetInfoIQWithoutVersion.toXML(null).toString(), exampleWithoutVersion); } @Test diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java index 69a66c755..5aa97c2d2 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/muclight/MUCLightSetConfigsIQTest.java @@ -47,7 +47,7 @@ public class MUCLightSetConfigsIQTest { JidCreate.from("coven@muclight.shakespeare.lit"), "A Darker Cave", customConfigs); mucLightSetConfigsIQ.setStanzaId("conf1"); - Assert.assertEquals(setConfigsIQExample, mucLightSetConfigsIQ.toXML().toString()); + Assert.assertEquals(setConfigsIQExample, mucLightSetConfigsIQ.toXML(null).toString()); } @Test @@ -56,7 +56,7 @@ public class MUCLightSetConfigsIQTest { JidCreate.from("coven@muclight.shakespeare.lit"), "A Darker Cave", null); mucLightChangeRoomNameIQ.setStanzaId("roomName1"); - Assert.assertEquals(changeRoomNameIQExample, mucLightChangeRoomNameIQ.toXML().toString()); + Assert.assertEquals(changeRoomNameIQExample, mucLightChangeRoomNameIQ.toXML(null).toString()); } @Test @@ -65,7 +65,7 @@ public class MUCLightSetConfigsIQTest { JidCreate.from("coven@muclight.shakespeare.lit"), null, "To be or not to be?", null); mucLightChangeSubjectIQ.setStanzaId("subject1"); - Assert.assertEquals(changeSubjectIQExample, mucLightChangeSubjectIQ.toXML().toString()); + Assert.assertEquals(changeSubjectIQExample, mucLightChangeSubjectIQ.toXML(null).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java index 76bd1de25..6d5041fa5 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/DisablePushNotificationsIQTest.java @@ -36,7 +36,7 @@ public class DisablePushNotificationsIQTest { DisablePushNotificationsIQ disablePushNotificationsIQ = new DisablePushNotificationsIQ( JidCreate.from("push-5.client.example")); disablePushNotificationsIQ.setStanzaId("x97"); - Assert.assertEquals(disableAllNotificationsIQExample, disablePushNotificationsIQ.toXML().toString()); + Assert.assertEquals(disableAllNotificationsIQExample, disablePushNotificationsIQ.toXML(null).toString()); } @Test @@ -44,7 +44,7 @@ public class DisablePushNotificationsIQTest { DisablePushNotificationsIQ disablePushNotificationsIQ = new DisablePushNotificationsIQ( JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo"); disablePushNotificationsIQ.setStanzaId("x97"); - Assert.assertEquals(disableNodeNotificationsIQExample, disablePushNotificationsIQ.toXML().toString()); + Assert.assertEquals(disableNodeNotificationsIQExample, disablePushNotificationsIQ.toXML(null).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java index 3b21ffe79..41df4e9b2 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/push_notifications/EnablePushNotificationsIQTest.java @@ -41,7 +41,7 @@ public class EnablePushNotificationsIQTest { EnablePushNotificationsIQ enablePushNotificationsIQ = new EnablePushNotificationsIQ( JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo"); enablePushNotificationsIQ.setStanzaId("x42"); - Assert.assertEquals(exampleEnableIQ, enablePushNotificationsIQ.toXML().toString()); + Assert.assertEquals(exampleEnableIQ, enablePushNotificationsIQ.toXML(null).toString()); } @Test @@ -53,7 +53,7 @@ public class EnablePushNotificationsIQTest { JidCreate.from("push-5.client.example"), "yxs32uqsflafdk3iuqo", publishOptions); enablePushNotificationsIQ.setStanzaId("x42"); - Assert.assertEquals(exampleEnableIQWithPublishOptions, enablePushNotificationsIQ.toXML().toString()); + Assert.assertEquals(exampleEnableIQWithPublishOptions, enablePushNotificationsIQ.toXML(null).toString()); } } diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java index 1e1eb6158..4860b5ada 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/reference/ReferenceTest.java @@ -41,7 +41,7 @@ public class ReferenceTest extends SmackTestSuite { "uri='xmpp:juliet@capulet.lit' />"; URI uri = new URI("xmpp:juliet@capulet.lit"); ReferenceElement element = new ReferenceElement(72, 78, ReferenceElement.Type.mention, null, uri); - assertXMLEqual(xml, element.toXML().toString()); + assertXMLEqual(xml, element.toXML(null).toString()); assertEquals(72, (int) element.getBegin()); assertEquals(78, (int) element.getEnd()); assertEquals(ReferenceElement.Type.mention, element.getType()); @@ -49,7 +49,7 @@ public class ReferenceTest extends SmackTestSuite { assertEquals(uri, element.getUri()); ReferenceElement parsed = ReferenceProvider.TEST_PROVIDER.parse(TestUtils.getParser(xml)); - assertXMLEqual(xml, parsed.toXML().toString()); + assertXMLEqual(xml, parsed.toXML(null).toString()); } /** @@ -64,7 +64,7 @@ public class ReferenceTest extends SmackTestSuite { "uri='xmpp:fdp.shakespeare.lit?;node=fdp/submitted/stan.isode.net/accidentreport;item=ndina872be' />"; URI uri = new URI("xmpp:fdp.shakespeare.lit?;node=fdp/submitted/stan.isode.net/accidentreport;item=ndina872be"); ReferenceElement element = new ReferenceElement(null, null, ReferenceElement.Type.data, null, uri); - assertXMLEqual(xml, element.toXML().toString()); + assertXMLEqual(xml, element.toXML(null).toString()); assertNull(element.getBegin()); assertNull(element.getEnd()); @@ -73,7 +73,7 @@ public class ReferenceTest extends SmackTestSuite { assertEquals(uri, element.getUri()); ReferenceElement parsed = ReferenceProvider.TEST_PROVIDER.parse(TestUtils.getParser(xml)); - assertXMLEqual(xml, parsed.toXML().toString()); + assertXMLEqual(xml, parsed.toXML(null).toString()); } @Test(expected = IllegalArgumentException.class) diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java index cf8ca2f33..f6486ee43 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/sid/StableUniqueStanzaIdTest.java @@ -40,7 +40,7 @@ public class StableUniqueStanzaIdTest extends SmackTestSuite { StanzaIdElement element = new StanzaIdElement("de305d54-75b4-431b-adb2-eb6b9e546013", "alice@wonderland.lit"); assertEquals("de305d54-75b4-431b-adb2-eb6b9e546013", element.getId()); assertEquals("alice@wonderland.lit", element.getBy()); - assertXMLEqual(xml, element.toXML().toString()); + assertXMLEqual(xml, element.toXML(null).toString()); StanzaIdElement parsed = StanzaIdProvider.TEST_INSTANCE.parse(TestUtils.getParser(xml)); assertEquals(element.getId(), parsed.getId()); @@ -52,7 +52,7 @@ public class StableUniqueStanzaIdTest extends SmackTestSuite { String xml = ""; OriginIdElement element = new OriginIdElement("de305d54-75b4-431b-adb2-eb6b9e546013"); assertEquals("de305d54-75b4-431b-adb2-eb6b9e546013", element.getId()); - assertXMLEqual(xml, element.toXML().toString()); + assertXMLEqual(xml, element.toXML(null).toString()); OriginIdElement parsed = OriginIdProvider.TEST_INSTANCE.parse(TestUtils.getParser(xml)); assertEquals(element.getId(), parsed.getId()); diff --git a/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java b/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java index d20ad6082..6939727f3 100644 --- a/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java +++ b/smack-experimental/src/test/java/org/jivesoftware/smackx/spoiler/SpoilerTest.java @@ -46,11 +46,11 @@ public class SpoilerTest extends SmackTestSuite { assertNull(empty.getHint()); assertNull(empty.getLanguage()); - assertXMLEqual(xml, empty.toXML().toString()); + assertXMLEqual(xml, empty.toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); SpoilerElement parsed = SpoilerProvider.INSTANCE.parse(parser); - assertXMLEqual(xml, parsed.toXML().toString()); + assertXMLEqual(xml, parsed.toXML(null).toString()); } @Test @@ -65,12 +65,12 @@ public class SpoilerTest extends SmackTestSuite { assertEquals("Love story end", withHint.getHint()); assertNull(withHint.getLanguage()); - assertXMLEqual(xml, withHint.toXML().toString()); + assertXMLEqual(xml, withHint.toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); SpoilerElement parsed = SpoilerProvider.INSTANCE.parse(parser); - assertXMLEqual(xml, parsed.toXML().toString()); + assertXMLEqual(xml, parsed.toXML(null).toString()); } @Test @@ -85,13 +85,13 @@ public class SpoilerTest extends SmackTestSuite { assertEquals("Der Kuchen ist eine Lüge!", i18nHint.getHint()); assertEquals("de", i18nHint.getLanguage()); - assertXMLEqual(xml, i18nHint.toXML().toString()); + assertXMLEqual(xml, i18nHint.toXML(null).toString()); XmlPullParser parser = TestUtils.getParser(xml); SpoilerElement parsed = SpoilerProvider.INSTANCE.parse(parser); assertEquals(i18nHint.getLanguage(), parsed.getLanguage()); - assertXMLEqual(xml, parsed.toXML().toString()); + assertXMLEqual(xml, parsed.toXML(null).toString()); } @Test diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java index fd281b396..8ae972f66 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java @@ -211,19 +211,19 @@ public class MultipleRecipientManager { if (to != null) { for (Jid jid : to) { packet.setTo(jid); - connection.sendStanza(new PacketCopy(packet.toXML())); + connection.sendStanza(new PacketCopy(packet.toXML(null))); } } if (cc != null) { for (Jid jid : cc) { packet.setTo(jid); - connection.sendStanza(new PacketCopy(packet.toXML())); + connection.sendStanza(new PacketCopy(packet.toXML(null))); } } if (bcc != null) { for (Jid jid : bcc) { packet.setTo(jid); - connection.sendStanza(new PacketCopy(packet.toXML())); + connection.sendStanza(new PacketCopy(packet.toXML(null))); } } } @@ -309,13 +309,13 @@ public class MultipleRecipientManager { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { return text; } @Override public String toString() { - return toXML().toString(); + return toXML(null).toString(); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java index 37790a6e0..c830b1e1b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/packet/MultipleAddresses.java @@ -118,12 +118,12 @@ public class MultipleAddresses implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); buf.rightAngleBracket(); // Loop through all the addresses and append them to the string buffer for (Address address : addresses) { - buf.append(address.toXML()); + buf.append(address.toXML(null)); } buf.closeElement(this); return buf; @@ -194,7 +194,7 @@ public class MultipleAddresses implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(); buf.halfOpenElement(this).attribute("type", type); buf.optAttribute("jid", jid); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java index 771deda11..c417fe9dc 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/amp/packet/AMPExtension.java @@ -154,7 +154,7 @@ public class AMPExtension implements ExtensionElement { * Returns the XML representation of a XHTML extension according the specification. **/ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(getElementName()).append(" xmlns=\"").append(getNamespace()).append('"'); if (status != null) { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java index deb3a506a..64ac4fdc5 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/attention/packet/AttentionExtension.java @@ -69,7 +69,7 @@ public class AttentionExtension implements ExtensionElement { * @see org.jivesoftware.smack.packet.PacketExtension#toXML() */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { final StringBuilder sb = new StringBuilder(); sb.append('<').append(getElementName()).append(" xmlns=\"").append( getNamespace()).append("\"/>"); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockedErrorExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockedErrorExtension.java index 2ab93ddeb..513f6f098 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockedErrorExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/blocking/element/BlockedErrorExtension.java @@ -46,7 +46,7 @@ public class BlockedErrorExtension implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.closeEmptyElement(); return xml; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBExtension.java index d69296575..ad5246974 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bob/element/BoBExtension.java @@ -68,7 +68,7 @@ public class BoBExtension extends XHTMLExtension { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java index 9ec335773..580c17191 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtension.java @@ -137,7 +137,7 @@ public class DataPacketExtension implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = getIQChildElementBuilder(new IQChildElementXmlStringBuilder(this)); xml.closeElement(this); return xml; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java index ae415fc16..39732bf08 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/bytestreams/socks5/packet/Bytestream.java @@ -232,11 +232,11 @@ public class Bytestream extends IQ { xml.rightAngleBracket(); if (getToActivate() == null) { for (StreamHost streamHost : getStreamHosts()) { - xml.append(streamHost.toXML()); + xml.append(streamHost.toXML(null)); } } else { - xml.append(getToActivate().toXML()); + xml.append(getToActivate().toXML(null)); } break; case result: @@ -246,7 +246,7 @@ public class Bytestream extends IQ { // constructions mechanisms of Bytestream // A result from the server can also contain stream hosts for (StreamHost host : streamHosts) { - xml.append(host.toXML()); + xml.append(host.toXML(null)); } break; case get: @@ -325,7 +325,7 @@ public class Bytestream extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("jid", getJID()); xml.attribute("host", getAddress()); @@ -375,7 +375,7 @@ public class Bytestream extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("jid", getJID()); xml.closeEmptyElement(); @@ -418,7 +418,7 @@ public class Bytestream extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.escape(getTarget()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java index f9e42e1d7..6caf1e9ee 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/cache/SimpleDirectoryPersistentCache.java @@ -132,7 +132,7 @@ public class SimpleDirectoryPersistentCache implements EntityCapsPersistentCache private static void writeInfoToFile(File file, DiscoverInfo info) throws IOException { DataOutputStream dos = new DataOutputStream(new FileOutputStream(file)); try { - dos.writeUTF(info.toXML().toString()); + dos.writeUTF(info.toXML(null).toString()); } finally { dos.close(); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java index c4dffbcb1..56405bef4 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/packet/CapsExtension.java @@ -69,7 +69,7 @@ public class CapsExtension implements ExtensionElement { * */ @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("hash", hash).attribute("node", node).attribute("ver", ver); xml.closeEmptyElement(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java index ca8233bde..745108b66 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/chatstates/packet/ChatStateExtension.java @@ -59,7 +59,7 @@ public class ChatStateExtension implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.closeEmptyElement(); return xml; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java index 4c3c58b28..de2a8c04d 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/packet/AdHocCommandData.java @@ -95,7 +95,7 @@ public class AdHocCommandData extends IQ { } if (form != null) { - xml.append(form.toXML()); + xml.append(form.toXML(null)); } for (AdHocCommandNote note : notes) { @@ -264,7 +264,7 @@ public class AdHocCommandData extends IQ { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(getElementName()); buf.append(" xmlns=\"").append(getNamespace()).append("\"/>"); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java index 8109a9ab1..c17068d43 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/delay/packet/DelayInformation.java @@ -102,7 +102,7 @@ public class DelayInformation implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("stamp", XmppDateTime.formatXEP0082Date(stamp)); xml.optAttribute("from", from); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java index 8f0fe64f6..81e0d4594 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/forward/packet/Forwarded.java @@ -66,11 +66,11 @@ public class Forwarded implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.optElement(getDelayInformation()); - xml.append(forwardedPacket.toXML()); + xml.append(forwardedPacket.toXML(null)); xml.closeElement(this); return xml; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java index 8582dfd8a..53e86bc82 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/geoloc/packet/GeoLocation.java @@ -214,7 +214,7 @@ public final class GeoLocation implements Serializable, ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.optElement("accuracy", accuracy); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/packet/Registration.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/packet/Registration.java index 10fff3c57..06548ce58 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/packet/Registration.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/iqregister/packet/Registration.java @@ -115,7 +115,7 @@ public class Registration extends IQ { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { return '<' + ELEMENT + " xmlns='" + NAMESPACE + "'/>"; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java index d18005024..a424884bf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContent.java @@ -132,7 +132,7 @@ public final class JingleContent implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute(CREATOR_ATTRIBUTE_NAME, creator); xml.optAttribute(DISPOSITION_ATTRIBUTE_NAME, disposition); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java index d7e5c7933..f37220f0e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentDescription.java @@ -56,7 +56,7 @@ public abstract class JingleContentDescription implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); addExtraAttributes(xml); xml.rightAngleBracket(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java index 5b641480f..e21b4c348 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleContentTransport.java @@ -66,7 +66,7 @@ public abstract class JingleContentTransport implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); addExtraAttributes(xml); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java index 77fc356e9..65735d0b6 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleError.java @@ -55,7 +55,7 @@ public final class JingleError implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.closeEmptyElement(); return xml; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java index 29ef9aa71..7aeb84be6 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/JingleReason.java @@ -114,7 +114,7 @@ public class JingleReason implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); @@ -143,7 +143,7 @@ public class JingleReason implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/UnknownJingleContentDescription.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/UnknownJingleContentDescription.java index 1f4994fc6..67518d381 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/UnknownJingleContentDescription.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/UnknownJingleContentDescription.java @@ -39,8 +39,8 @@ public final class UnknownJingleContentDescription extends JingleContentDescript } @Override - public XmlStringBuilder toXML() { - return standardExtensionElement.toXML(); + public XmlStringBuilder toXML(String enclosingNamespace) { + return standardExtensionElement.toXML(null); } public StandardExtensionElement getStandardExtensionElement() { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/UnknownJingleContentTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/UnknownJingleContentTransport.java index 8a98f6bae..d4d760daf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/UnknownJingleContentTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/element/UnknownJingleContentTransport.java @@ -41,8 +41,8 @@ public final class UnknownJingleContentTransport extends JingleContentTransport } @Override - public XmlStringBuilder toXML() { - return standardExtensionElement.toXML(); + public XmlStringBuilder toXML(String enclosingNamespace) { + return standardExtensionElement.toXML(null); } @Override diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java index 59afc8d58..4901cb7dd 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/element/JingleIBBTransport.java @@ -86,6 +86,6 @@ public class JingleIBBTransport extends JingleContentTransport { @Override public int hashCode() { - return this.toXML().toString().hashCode(); + return this.toXML(null).toString().hashCode(); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java index b16e5f563..03fc04680 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportCandidate.java @@ -130,7 +130,7 @@ public final class JingleS5BTransportCandidate extends JingleContentTransportCan } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.attribute(ATTR_CID, cid); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportInfo.java index 642e2fc86..95c6407cc 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/elements/JingleS5BTransportInfo.java @@ -38,7 +38,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo } @Override - public final XmlStringBuilder toXML() { + public final XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.attribute(ATTR_CID, getCandidateId()); @@ -53,7 +53,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo } JingleS5BCandidateTransportInfo otherCandidateTransportInfo = (JingleS5BCandidateTransportInfo) other; - return toXML().equals(otherCandidateTransportInfo.toXML()); + return toXML(null).equals(otherCandidateTransportInfo.toXML(null)); } @Override @@ -102,7 +102,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.closeEmptyElement(); @@ -116,7 +116,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo @Override public int hashCode() { - return toXML().toString().hashCode(); + return toXML(null).toString().hashCode(); } } @@ -134,7 +134,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(this); xml.closeEmptyElement(); @@ -148,7 +148,7 @@ public abstract class JingleS5BTransportInfo extends JingleContentTransportInfo @Override public int hashCode() { - return toXML().toString().hashCode(); + return toXML(null).toString().hashCode(); } } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java index b247cd18b..b61da73a4 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/jiveproperties/packet/JivePropertiesExtension.java @@ -136,7 +136,7 @@ public class JivePropertiesExtension implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); // Loop through all properties and write them out. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/last_interaction/element/IdleElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/last_interaction/element/IdleElement.java index 85c383b2c..1f98732db 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/last_interaction/element/IdleElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/last_interaction/element/IdleElement.java @@ -93,7 +93,7 @@ public class IdleElement implements ExtensionElement { * {@inheritDoc} */ @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { return new XmlStringBuilder(this) .attribute(ATTR_SINCE, since) .closeEmptyElement(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/element/MessageCorrectExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/element/MessageCorrectExtension.java index c7411dfaf..7336cc6ed 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/element/MessageCorrectExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/message_correct/element/MessageCorrectExtension.java @@ -68,7 +68,7 @@ public class MessageCorrectExtension implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute(ID_TAG, getIdInitialMessage()); xml.closeEmptyElement(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java index 50e6b0bf6..8d2600b1b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java @@ -161,7 +161,7 @@ public final class MultiUserChatManager extends Manager { if (mucUser.getInvite() != null) { EntityBareJid mucJid = message.getFrom().asEntityBareJidIfPossible(); if (mucJid == null) { - LOGGER.warning("Invite to non bare JID: '" + message.toXML() + "'"); + LOGGER.warning("Invite to non bare JID: '" + message.toXML(null) + "'"); return; } // Fire event for invitation listeners diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java index e0b283ec9..a7a94d0c4 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/RoomInfo.java @@ -152,7 +152,7 @@ public class RoomInfo { if (!identities.isEmpty()) { this.name = identities.get(0).getName(); } else { - LOGGER.warning("DiscoverInfo does not contain any Identity: " + info.toXML()); + LOGGER.warning("DiscoverInfo does not contain any Identity: " + info.toXML(null)); this.name = ""; } String subject = ""; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java index ef63eaf40..cf2fd22de 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/Destroy.java @@ -69,7 +69,7 @@ public class Destroy implements NamedElement, Serializable { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.optAttribute("jid", getJid()); xml.rightAngleBracket(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java index 7d96340d9..37ab7d63a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/GroupChatInvitation.java @@ -104,7 +104,7 @@ public class GroupChatInvitation implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("jid", getRoomAddress()); xml.closeEmptyElement(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java index 2b369082b..71dfa351e 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCAdmin.java @@ -71,7 +71,7 @@ public class MUCAdmin extends IQ { synchronized (items) { for (MUCItem item : items) { - xml.append(item.toXML()); + xml.append(item.toXML(null)); } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java index 60ce84d36..31154f571 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCInitialPresence.java @@ -84,7 +84,7 @@ public class MUCInitialPresence implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.optElement("password", getPassword()); @@ -286,7 +286,7 @@ public class MUCInitialPresence implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.optIntAttribute("maxchars", getMaxChars()); xml.optIntAttribute("maxstanzas", getMaxStanzas()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java index 9da830853..de39760bf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCItem.java @@ -161,7 +161,7 @@ public class MUCItem implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.optAttribute("affiliation", getAffiliation()); xml.optAttribute("jid", getJid()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java index cb3c7f82b..9a1c95224 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCOwner.java @@ -93,7 +93,7 @@ public class MUCOwner extends IQ { synchronized (items) { for (MUCItem item : items) { - xml.append(item.toXML()); + xml.append(item.toXML(null)); } } xml.optElement(getDestroy()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java index e6b39c4eb..b2300f9df 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/packet/MUCUser.java @@ -61,7 +61,7 @@ public class MUCUser implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.optElement(getInvite()); @@ -301,7 +301,7 @@ public class MUCUser implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.optAttribute("to", getTo()); xml.optAttribute("from", getFrom()); @@ -369,7 +369,7 @@ public class MUCUser implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.optAttribute("to", getTo()); xml.optAttribute("from", getFrom()); @@ -439,7 +439,7 @@ public class MUCUser implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("code", getCode()); xml.closeEmptyElement(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java index e9a33bd4d..25fde6317 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/nick/packet/Nick.java @@ -87,7 +87,7 @@ public class Nick implements ExtensionElement { * @see org.jivesoftware.smack.packet.PacketExtension#toXML() */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { final StringBuilder buf = new StringBuilder(); buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append( diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java index c4b7863b1..520b8c19c 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/offline/packet/OfflineMessageInfo.java @@ -82,7 +82,7 @@ public class OfflineMessageInfo implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(getElementName()).append(" xmlns=\"").append(getNamespace()).append( "\">"); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java index e33848714..7a02e1263 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Affiliation.java @@ -174,7 +174,7 @@ public class Affiliation implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.optAttribute("node", node); xml.optAttribute("jid", jid); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java index b874568ba..2dc6ea11b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/AffiliationsExtension.java @@ -61,9 +61,9 @@ public class AffiliationsExtension extends NodeExtension { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { if ((items == null) || (items.size() == 0)) { - return super.toXML(); + return super.toXML(enclosingNamespace); } else { // Can't use XmlStringBuilder(this), because we don't want the namespace to be included diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java index 09f785f64..8cd1f7c82 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/EventElement.java @@ -76,10 +76,10 @@ public class EventElement implements EmbeddedPacketExtension { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); - xml.append(ext.toXML()); + xml.append(ext.toXML(null)); xml.closeElement(this); return xml; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java index 68d5573e5..bff5956be 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/FormNode.java @@ -69,9 +69,9 @@ public class FormNode extends NodeExtension { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { if (configForm == null) { - return super.toXML(); + return super.toXML(enclosingNamespace); } else { StringBuilder builder = new StringBuilder("<"); @@ -84,7 +84,7 @@ public class FormNode extends NodeExtension { } else builder.append('>'); - builder.append(configForm.getDataFormToSend().toXML()); + builder.append(configForm.getDataFormToSend().toXML(null)); builder.append("'); return builder.toString(); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java index f35963d5c..5c55d844d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/GetItemsRequest.java @@ -54,7 +54,7 @@ public class GetItemsRequest extends NodeExtension { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(getElementName()); xml.attribute("node", getNode()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java index 053168224..af87f1e49 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Item.java @@ -147,7 +147,7 @@ public class Item extends NodeExtension { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = getCommonXml(); xml.closeEmptyElement(); @@ -166,7 +166,7 @@ public class Item extends NodeExtension { @Override public String toString() { - return getClass().getName() + " | Content [" + toXML() + "]"; + return getClass().getName() + " | Content [" + toXML(null) + "]"; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java index c49b52403..b6a6ee98d 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/ItemsExtension.java @@ -149,9 +149,9 @@ public class ItemsExtension extends NodeExtension implements EmbeddedPacketExten } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { if ((items == null) || (items.size() == 0)) { - return super.toXML(); + return super.toXML(enclosingNamespace); } else { StringBuilder builder = new StringBuilder("<"); @@ -169,7 +169,7 @@ public class ItemsExtension extends NodeExtension implements EmbeddedPacketExten else { builder.append("'>"); for (NamedElement item : items) { - builder.append(item.toXML()); + builder.append(item.toXML(null)); } } @@ -182,7 +182,7 @@ public class ItemsExtension extends NodeExtension implements EmbeddedPacketExten @Override public String toString() { - return getClass().getName() + "Content [" + toXML() + "]"; + return getClass().getName() + "Content [" + toXML(null) + "]"; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java index a699e51ee..619bfa8f6 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/NodeExtension.java @@ -78,12 +78,12 @@ public class NodeExtension implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { return '<' + getElementName() + (node == null ? "" : " node='" + node + '\'') + "/>"; } @Override public String toString() { - return getClass().getName() + " - content [" + toXML() + "]"; + return getClass().getName() + " - content [" + toXML(null) + "]"; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java index 9e1903a36..32c571b21 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/OptionsExtension.java @@ -50,7 +50,7 @@ public class OptionsExtension extends NodeExtension { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(); xml.halfOpenElement(getElementName()); xml.attribute("jid", jid); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java index d6860606d..12cc6fb0a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PayloadItem.java @@ -130,11 +130,11 @@ public class PayloadItem extends Item { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = getCommonXml(); xml.rightAngleBracket(); - xml.append(payload.toXML()); + xml.append(payload.toXML(null)); xml.closeElement(this); return xml; @@ -142,6 +142,6 @@ public class PayloadItem extends Item { @Override public String toString() { - return getClass().getName() + " | Content [" + toXML() + "]"; + return getClass().getName() + " | Content [" + toXML(null) + "]"; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java index 16638f578..0f0d26cc8 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/PublishItem.java @@ -51,7 +51,7 @@ public class PublishItem extends NodeExtension { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder builder = new StringBuilder("<"); builder.append(getElementName()); builder.append(" node='"); @@ -59,7 +59,7 @@ public class PublishItem extends NodeExtension { builder.append("'>"); for (Item item : items) { - builder.append(item.toXML()); + builder.append(item.toXML(null)); } builder.append(""); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java index b63e1c8d6..39e60fc3f 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/RetractItem.java @@ -54,7 +54,7 @@ public class RetractItem implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return ""; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java index 28433eec0..9e0ebf8b5 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SimplePayload.java @@ -93,12 +93,12 @@ public class SimplePayload implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return payload; } @Override public String toString() { - return getClass().getName() + "payload [" + toXML() + "]"; + return getClass().getName() + "payload [" + toXML(null) + "]"; } } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java index 90da90d89..5ddba2738 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscribeExtension.java @@ -39,7 +39,7 @@ public class SubscribeExtension extends NodeExtension { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder builder = new StringBuilder("<"); builder.append(getElementName()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java index a00fcc7e1..6f0b882da 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/Subscription.java @@ -138,7 +138,7 @@ public class Subscription extends NodeExtension { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder builder = new XmlStringBuilder(this); builder.attribute("jid", jid); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java index f67fa0a41..3180f048f 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/pubsub/SubscriptionsExtension.java @@ -91,9 +91,9 @@ public class SubscriptionsExtension extends NodeExtension { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { if ((items == null) || (items.size() == 0)) { - return super.toXML(); + return super.toXML(enclosingNamespace); } else { StringBuilder builder = new StringBuilder("<"); @@ -107,7 +107,7 @@ public class SubscriptionsExtension extends NodeExtension { builder.append('>'); for (Subscription item : items) { - builder.append(item.toXML()); + builder.append(item.toXML(null)); } builder.append(""; } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/packet/RSMSet.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/packet/RSMSet.java index 2c5861537..a8e7772b7 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/packet/RSMSet.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/rsm/packet/RSMSet.java @@ -127,7 +127,7 @@ public class RSMSet implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.optElement("after", after); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java index f50188c94..b3e1e68ab 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/Header.java @@ -55,7 +55,7 @@ public class Header implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { // Upcast to NamedElement since we don't want a xmlns attribute XmlStringBuilder xml = new XmlStringBuilder((NamedElement) this); xml.attribute("name", name); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java index ea6952c21..b70bf1620 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/shim/packet/HeadersExtension.java @@ -59,7 +59,7 @@ public class HeadersExtension implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); xml.append(headers); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java index 6c6ad98e3..b6c15d7f2 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/si/packet/StreamInitiation.java @@ -146,7 +146,7 @@ public class StreamInitiation extends IQ { buf.rightAngleBracket(); // Add the file section if there is one. - buf.optAppend(file.toXML()); + buf.optAppend(file.toXML(null)); break; case result: buf.rightAngleBracket(); @@ -155,7 +155,7 @@ public class StreamInitiation extends IQ { throw new IllegalArgumentException("IQ Type not understood"); } if (featureNegotiation != null) { - buf.append(featureNegotiation.toXML()); + buf.append(featureNegotiation.toXML(null)); } return buf; } @@ -327,7 +327,7 @@ public class StreamInitiation extends IQ { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buffer = new StringBuilder(); buffer.append('<').append(getElementName()).append(" xmlns=\"") @@ -405,11 +405,11 @@ public class StreamInitiation extends IQ { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf .append(""); - buf.append(data.toXML()); + buf.append(data.toXML(null)); buf.append(""); return buf.toString(); } diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java index c14a0c1a5..e785b7f7a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/FormField.java @@ -400,7 +400,7 @@ public class FormField implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); // Add attributes buf.optAttribute("label", getLabel()); @@ -416,7 +416,7 @@ public class FormField implements NamedElement { } // Loop through all the values and append them to the string buffer for (Option option : getOptions()) { - buf.append(option.toXML()); + buf.append(option.toXML(null)); } buf.optElement(validateElement); buf.closeElement(this); @@ -434,12 +434,12 @@ public class FormField implements NamedElement { FormField other = (FormField) obj; - return toXML().equals(other.toXML()); + return toXML(null).equals(other.toXML(null)); } @Override public int hashCode() { - return toXML().hashCode(); + return toXML(null).hashCode(); } /** @@ -492,7 +492,7 @@ public class FormField implements NamedElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); // Add attribute xml.optAttribute("label", getLabel()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java index d45ae5784..dd2544c49 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdata/packet/DataForm.java @@ -291,7 +291,7 @@ public class DataForm implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); buf.attribute("type", getType()); buf.rightAngleBracket(); @@ -310,10 +310,10 @@ public class DataForm implements ExtensionElement { } // Loop through all the form fields and append them to the string buffer for (FormField field : getFields()) { - buf.append(field.toXML()); + buf.append(field.toXML(null)); } for (Element element : extensionElements) { - buf.append(element.toXML()); + buf.append(element.toXML(null)); } buf.closeElement(this); return buf; @@ -358,7 +358,7 @@ public class DataForm implements ExtensionElement { buf.openElement(ELEMENT); // Loop through all the form items and append them to the string buffer for (FormField field : getFields()) { - buf.append(field.toXML()); + buf.append(field.toXML(null)); } buf.closeElement(ELEMENT); return buf; @@ -394,7 +394,7 @@ public class DataForm implements ExtensionElement { buf.openElement(ELEMENT); // Loop through all the form items and append them to the string buffer for (FormField field : getFields()) { - buf.append(field.toXML()); + buf.append(field.toXML(null)); } buf.closeElement(ELEMENT); return buf; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayout.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayout.java index 6cbf24d90..9507cd396 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayout.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayout.java @@ -91,7 +91,7 @@ public class DataLayout implements ExtensionElement { * @see org.jivesoftware.smack.packet.PacketExtension#toXML() */ @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); buf.optAttribute("label", getLabel()); buf.rightAngleBracket(); @@ -109,7 +109,7 @@ public class DataLayout implements ExtensionElement { */ private static void walkList(XmlStringBuilder buf, List pageLayout) { for (DataFormLayoutElement object : pageLayout) { - buf.append(object.toXML()); + buf.append(object.toXML(null)); } } @@ -127,7 +127,7 @@ public class DataLayout implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); buf.attribute("var", getVar()); buf.closeEmptyElement(); @@ -187,7 +187,7 @@ public class DataLayout implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); buf.optAttribute("label", getLabel()); buf.rightAngleBracket(); @@ -218,7 +218,7 @@ public class DataLayout implements ExtensionElement { public static final String ELEMENT = "reportedref"; @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); buf.closeEmptyElement(); return buf; @@ -244,7 +244,7 @@ public class DataLayout implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(); buf.element(ELEMENT, getText()); return buf; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java index bb5d0c136..46c432355 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xdatavalidation/packet/ValidateElement.java @@ -83,7 +83,7 @@ public abstract class ValidateElement implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); buf.optAttribute("datatype", datatype); buf.rightAngleBracket(); @@ -346,7 +346,7 @@ public abstract class ValidateElement implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder buf = new XmlStringBuilder(this); buf.optLongAttribute("min", getMin()); buf.optLongAttribute("max", getMax()); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java index 35d695dc0..059137b25 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/xhtmlim/packet/XHTMLExtension.java @@ -81,7 +81,7 @@ public class XHTMLExtension implements ExtensionElement { * */ @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.rightAngleBracket(); // Loop through all the bodies and append them to the string buffer diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java index 90b7a9ac8..4341c8265 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/amp/AMPExtensionTest.java @@ -59,7 +59,7 @@ public class AMPExtensionTest { ext.addRule(new AMPExtension.Rule(AMPExtension.Action.notify, new AMPMatchResourceCondition(AMPMatchResourceCondition.Value.exact))); ext.addRule(new AMPExtension.Rule(AMPExtension.Action.notify, new AMPMatchResourceCondition(AMPMatchResourceCondition.Value.other))); - assertEquals(correctStanza, ext.toXML()); + assertEquals(correctStanza, ext.toXML(null)); } @Test diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java index acf3e4926..6ad754efd 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/BlockContactsIQTest.java @@ -47,7 +47,7 @@ public class BlockContactsIQTest { BlockContactsIQ blockContactIQ = new BlockContactsIQ(jids); blockContactIQ.setStanzaId("block1"); - Assert.assertEquals(blockContactIQExample, blockContactIQ.toXML().toString()); + Assert.assertEquals(blockContactIQExample, blockContactIQ.toXML(null).toString()); } @Test diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java index 733be24d3..609671bbb 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/GetBlockingListTest.java @@ -42,7 +42,7 @@ public class GetBlockingListTest { BlockListIQ getBlockListIQ = new BlockListIQ(null); getBlockListIQ.setType(Type.get); getBlockListIQ.setStanzaId("blocklist1"); - Assert.assertEquals(getBlockingListIQExample, getBlockListIQ.toXML().toString()); + Assert.assertEquals(getBlockingListIQExample, getBlockListIQ.toXML(null).toString()); } @Test diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java index 04ff8eaf7..b7d6f3e05 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/blocking/UnblockContactsIQTest.java @@ -53,7 +53,7 @@ public class UnblockContactsIQTest { UnblockContactsIQ unblockContactIQ = new UnblockContactsIQ(jids); unblockContactIQ.setStanzaId("unblock1"); - Assert.assertEquals(unblockContactIQExample, unblockContactIQ.toXML().toString()); + Assert.assertEquals(unblockContactIQExample, unblockContactIQ.toXML(null).toString()); } @Test @@ -68,7 +68,7 @@ public class UnblockContactsIQTest { public void checkUnblockAllIQStanza() throws Exception { UnblockContactsIQ unblockAllIQ = new UnblockContactsIQ(null); unblockAllIQ.setStanzaId("unblock2"); - Assert.assertEquals(unblockAllIQExample, unblockAllIQ.toXML().toString()); + Assert.assertEquals(unblockAllIQExample, unblockAllIQ.toXML(null).toString()); } @Test diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java index 04bcb8748..2d377dd4f 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bob/BoBIQTest.java @@ -45,7 +45,7 @@ public class BoBIQTest extends SmackTestSuite { createdBoBIQ.setTo(JidCreate.from("ladymacbeth@shakespeare.lit/castle")); createdBoBIQ.setType(Type.get); - Assert.assertEquals(sampleBoBIQRequest, createdBoBIQ.toXML().toString()); + Assert.assertEquals(sampleBoBIQRequest, createdBoBIQ.toXML(null).toString()); } @Test @@ -65,7 +65,7 @@ public class BoBIQTest extends SmackTestSuite { Assert.assertEquals(bobIQ.getBoBData().getMaxAge(), createdBoBIQ.getBoBData().getMaxAge()); Assert.assertEquals(bobIQ.getBoBData().getType(), createdBoBIQ.getBoBData().getType()); Assert.assertEquals(bobIQ.getBoBData().getContentBase64Encoded(), createdBoBIQ.getBoBData().getContentBase64Encoded()); - Assert.assertEquals(bobIQ.toXML().toString(), createdBoBIQ.toXML().toString()); + Assert.assertEquals(bobIQ.toXML(null).toString(), createdBoBIQ.toXML(null).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java index 901d5bc8f..6cd9d0441 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/CloseTest.java @@ -80,7 +80,7 @@ public class CloseTest extends InitExtensions { close.setTo(JidCreate.from("juliet@capulet.lit/balcony")); close.setStanzaId("us71g45j"); - assertXMLEqual(control, close.toXML().toString()); + assertXMLEqual(control, close.toXML(null).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java index 75c13849b..45fd55835 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataPacketExtensionTest.java @@ -96,7 +96,7 @@ public class DataPacketExtensionTest extends InitExtensions { .asString(outputProperties); DataPacketExtension data = new DataPacketExtension("i781hf64", 0, "DATA"); - assertXMLEqual(control, data.toXML().toString()); + assertXMLEqual(control, data.toXML(null).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java index 1a05c0ea9..9f8857923 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/DataTest.java @@ -77,7 +77,7 @@ public class DataTest extends InitExtensions { data.setTo(JidCreate.from("juliet@capulet.lit/balcony")); data.setStanzaId("kr91n475"); - assertXMLEqual(control, data.toXML().toString()); + assertXMLEqual(control, data.toXML(null).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java index e74990bb5..231d7f4f2 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/bytestreams/ibb/packet/OpenTest.java @@ -102,7 +102,7 @@ public class OpenTest extends InitExtensions { open.setTo(JidCreate.from("juliet@capulet.lit/balcony")); open.setStanzaId("jn3h8g65"); - assertXMLEqual(control, open.toXML().toString()); + assertXMLEqual(control, open.toXML(null).toString()); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java index 7c0188b9a..4c019c9a2 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/caps/EntityCapsManagerTest.java @@ -92,7 +92,7 @@ public class EntityCapsManagerTest extends InitExtensions { DiscoverInfo restored_di = EntityCapsManager.getDiscoveryInfoByNodeVer(nodeVer); assertNotNull(restored_di); - assertEquals(di.toXML().toString(), restored_di.toXML().toString()); + assertEquals(di.toXML(null).toString(), restored_di.toXML(null).toString()); } private static DiscoverInfo createComplexSamplePacket() throws XmppStringprepException { diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java index cd0bf2e0e..ec401fd67 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/filetransfer/FileTransferNegotiatorTest.java @@ -56,7 +56,7 @@ public class FileTransferNegotiatorTest extends InitExtensions { // We do not expect an answer. This unit test only checks the request sent. } Stanza packet = connection.getSentPacket(); - String xml = packet.toXML().toString(); + String xml = packet.toXML(null).toString(); assertTrue(xml.indexOf("var='stream-method' type='list-single'") != -1); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java index 38f1b2a1d..1bb34b040 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/geoloc/packet/GeoLocationTest.java @@ -120,7 +120,7 @@ public class GeoLocationTest extends InitExtensions { GeoLocation geoLocation = messageWithGeoLocation.getExtension(GeoLocation.ELEMENT, GeoLocation.NAMESPACE); assertNotNull(geoLocation); - assertNotNull(geoLocation.toXML()); + assertNotNull(geoLocation.toXML(null)); GeoLocation constructedGeoLocation = GeoLocation.builder().setAccuracy(23d).setAlt(1000d).setAltAccuracy(10d).setArea("Delhi").setBearing( 10d).setBuilding("Small Building").setCountry("India").setCountryCode("IN").setDescription( @@ -129,7 +129,7 @@ public class GeoLocationTest extends InitExtensions { "Wall Street").setText("Unit Testing GeoLocation").setTimestamp( XmppDateTime.parseDate("2004-02-19")).setTzo("+5:30").setUri(new URI("http://xmpp.org")).build(); - assertEquals(constructedGeoLocation.toXML().toString(), geoLocation.toXML().toString()); + assertEquals(constructedGeoLocation.toXML(null).toString(), geoLocation.toXML(null).toString()); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java index bd1a430a8..ac7b5c85b 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleContentTest.java @@ -65,12 +65,12 @@ public class JingleContentTest extends SmackTestSuite { builder.setDisposition("session"); JingleContent content1 = builder.build(); assertEquals("session", content1.getDisposition()); - assertNotSame(content.toXML().toString(), content1.toXML().toString()); - assertEquals(content1.toXML().toString(), builder.build().toXML().toString()); + assertNotSame(content.toXML(null).toString(), content1.toXML(null).toString()); + assertEquals(content1.toXML(null).toString(), builder.build().toXML(null).toString()); String xml = "" + ""; - assertEquals(xml, content1.toXML().toString()); + assertEquals(xml, content1.toXML(null).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java index 6ca6d88a9..1f140bf9f 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleErrorTest.java @@ -34,28 +34,28 @@ public class JingleErrorTest extends SmackTestSuite { public void tieBreakTest() throws Exception { String xml = ""; JingleError error = new JingleErrorProvider().parse(TestUtils.getParser(xml)); - assertEquals(xml, error.toXML().toString()); + assertEquals(xml, error.toXML(null).toString()); } @Test public void unknownSessionTest() throws Exception { String xml = ""; JingleError error = new JingleErrorProvider().parse(TestUtils.getParser(xml)); - assertEquals(xml, error.toXML().toString()); + assertEquals(xml, error.toXML(null).toString()); } @Test public void unsupportedInfoTest() throws Exception { String xml = ""; JingleError error = new JingleErrorProvider().parse(TestUtils.getParser(xml)); - assertEquals(xml, error.toXML().toString()); + assertEquals(xml, error.toXML(null).toString()); } @Test public void outOfOrderTest() throws Exception { String xml = ""; JingleError error = new JingleErrorProvider().parse(TestUtils.getParser(xml)); - assertEquals(xml, error.toXML().toString()); + assertEquals(xml, error.toXML(null).toString()); } @Test(expected = IllegalArgumentException.class) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleReasonTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleReasonTest.java index d62de70b3..fc87f4668 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleReasonTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleReasonTest.java @@ -32,39 +32,39 @@ public class JingleReasonTest extends SmackTestSuite { @Test public void parserTest() { assertEquals("", - JingleReason.Success.toXML().toString()); + JingleReason.Success.toXML(null).toString()); assertEquals("", - JingleReason.Busy.toXML().toString()); + JingleReason.Busy.toXML(null).toString()); assertEquals("", - JingleReason.Cancel.toXML().toString()); + JingleReason.Cancel.toXML(null).toString()); assertEquals("", - JingleReason.ConnectivityError.toXML().toString()); + JingleReason.ConnectivityError.toXML(null).toString()); assertEquals("", - JingleReason.Decline.toXML().toString()); + JingleReason.Decline.toXML(null).toString()); assertEquals("", - JingleReason.Expired.toXML().toString()); + JingleReason.Expired.toXML(null).toString()); assertEquals("", - JingleReason.UnsupportedTransports.toXML().toString()); + JingleReason.UnsupportedTransports.toXML(null).toString()); assertEquals("", - JingleReason.FailedTransport.toXML().toString()); + JingleReason.FailedTransport.toXML(null).toString()); assertEquals("", - JingleReason.GeneralError.toXML().toString()); + JingleReason.GeneralError.toXML(null).toString()); assertEquals("", - JingleReason.Gone.toXML().toString()); + JingleReason.Gone.toXML(null).toString()); assertEquals("", - JingleReason.MediaError.toXML().toString()); + JingleReason.MediaError.toXML(null).toString()); assertEquals("", - JingleReason.SecurityError.toXML().toString()); + JingleReason.SecurityError.toXML(null).toString()); assertEquals("", - JingleReason.UnsupportedApplications.toXML().toString()); + JingleReason.UnsupportedApplications.toXML(null).toString()); assertEquals("", - JingleReason.Timeout.toXML().toString()); + JingleReason.Timeout.toXML(null).toString()); assertEquals("", - JingleReason.FailedApplication.toXML().toString()); + JingleReason.FailedApplication.toXML(null).toString()); assertEquals("", - JingleReason.IncompatibleParameters.toXML().toString()); + JingleReason.IncompatibleParameters.toXML(null).toString()); assertEquals("1234", - JingleReason.AlternativeSession("1234").toXML().toString()); + JingleReason.AlternativeSession("1234").toXML(null).toString()); } @Test(expected = NullPointerException.class) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java index c7827e475..ce868738c 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/JingleTest.java @@ -76,6 +76,6 @@ public class JingleTest extends SmackTestSuite { "action='session-initiate' " + "sid='" + sessionId + "'>" + ""; - assertTrue(jingle.toXML().toString().contains(xml)); + assertTrue(jingle.toXML(null).toString().contains(xml)); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportTest.java index e33b2b814..6a44cf3b7 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_ibb/JingleIBBTransportTest.java @@ -43,7 +43,7 @@ public class JingleIBBTransportTest extends SmackTestSuite { String xml = ""; JingleIBBTransport transport = new JingleIBBTransport(size, sid); - assertEquals(xml, transport.toXML().toString()); + assertEquals(xml, transport.toXML(null).toString()); assertEquals(size, transport.getBlockSize()); assertEquals(sid, transport.getSessionId()); @@ -51,7 +51,7 @@ public class JingleIBBTransportTest extends SmackTestSuite { .parse(TestUtils.getParser(xml)); assertEquals(transport, parsed); assertTrue(transport.equals(parsed)); - assertEquals(xml, parsed.toXML().toString()); + assertEquals(xml, parsed.toXML(null).toString()); JingleIBBTransport transport1 = new JingleIBBTransport((short) 1024); assertEquals((short) 1024, transport1.getBlockSize()); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java index 68ca37f06..fe5e1f119 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/jingle/transports/jingle_s5b/JingleS5BTransportTest.java @@ -113,7 +113,7 @@ public class JingleS5BTransportTest extends SmackTestSuite { assertEquals(7878787, candidate3.getPriority()); assertEquals(JingleS5BTransportCandidate.Type.proxy, candidate3.getType()); - assertEquals(xml, transport.toXML().toString()); + assertEquals(xml, transport.toXML(null).toString()); } @Test @@ -129,7 +129,7 @@ public class JingleS5BTransportTest extends SmackTestSuite { assertEquals("vj3hs98y", candidateErrorTransport.getStreamId()); assertEquals(JingleS5BTransportInfo.CandidateError.INSTANCE, candidateErrorTransport.getInfo()); - assertEquals(candidateError, candidateErrorTransport.toXML().toString()); + assertEquals(candidateError, candidateErrorTransport.toXML(null).toString()); String proxyError = "" + @@ -143,7 +143,7 @@ public class JingleS5BTransportTest extends SmackTestSuite { assertEquals("vj3hs98y", proxyErrorTransport.getStreamId()); assertEquals(JingleS5BTransportInfo.ProxyError.INSTANCE, proxyErrorTransport.getInfo()); - assertEquals(proxyError, proxyErrorTransport.toXML().toString()); + assertEquals(proxyError, proxyErrorTransport.toXML(null).toString()); String candidateUsed = "" + @@ -157,7 +157,7 @@ public class JingleS5BTransportTest extends SmackTestSuite { assertEquals("hr65dqyd", ((JingleS5BTransportInfo.CandidateUsed) candidateUsedTransport.getInfo()).getCandidateId()); - assertEquals(candidateUsed, candidateUsedTransport.toXML().toString()); + assertEquals(candidateUsed, candidateUsedTransport.toXML(null).toString()); String candidateActivated = "" + @@ -173,7 +173,7 @@ public class JingleS5BTransportTest extends SmackTestSuite { assertEquals("hr65dqyd", ((JingleS5BTransportInfo.CandidateActivated) candidateActivatedTransport.getInfo()).getCandidateId()); - assertEquals(candidateActivated, candidateActivatedTransport.toXML().toString()); + assertEquals(candidateActivated, candidateActivatedTransport.toXML(null).toString()); } @Test(expected = IllegalArgumentException.class) @@ -216,7 +216,7 @@ public class JingleS5BTransportTest extends SmackTestSuite { assertEquals(host, candidate.getHost()); assertEquals(port, candidate.getPort()); - assertEquals(streamHost.toXML().toString(), candidate.getStreamHost().toXML().toString()); + assertEquals(streamHost.toXML(null).toString(), candidate.getStreamHost().toXML(null).toString()); } @Test(expected = IllegalArgumentException.class) diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java index 59bee0cf0..3ef5eb7dc 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/last_interaction/IdleTest.java @@ -44,7 +44,7 @@ public class IdleTest extends SmackTestSuite { assertEquals(date, parsed.getSince()); IdleElement element = new IdleElement(date); - assertXMLEqual("", element.toXML().toString()); + assertXMLEqual("", element.toXML(null).toString()); } @Test diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java index ef9d72954..8120c987c 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/message_correct/MessageCorrectExtensionTest.java @@ -42,11 +42,11 @@ public class MessageCorrectExtensionTest { Message initialMessage = PacketParserUtils.parseStanza(initialMessageXml); MessageCorrectExtension messageCorrectExtension = new MessageCorrectExtension(idInitialMessage); - Assert.assertEquals(messageCorrectExtension.toXML().toString(), messageCorrectionXml); + Assert.assertEquals(messageCorrectExtension.toXML(null).toString(), messageCorrectionXml); initialMessage.addExtension(messageCorrectExtension); - Assert.assertEquals(initialMessage.toXML(), expectedXml); + Assert.assertEquals(initialMessage.toXML(null), expectedXml); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java index 079733aab..9b0c52042 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/AffiliationsExtensionTest.java @@ -40,7 +40,7 @@ public class AffiliationsExtensionTest { AffiliationsExtension affiliationsExtension = new AffiliationsExtension(affiliationsList, "testNode"); - CharSequence xml = affiliationsExtension.toXML(); + CharSequence xml = affiliationsExtension.toXML(null); assertXMLEqual("", xml.toString()); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java index 0ada02f3d..4069d7a12 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/ItemValidationTest.java @@ -62,15 +62,15 @@ public class ItemValidationTest extends InitExtensions { public void verifyBasicItem() throws Exception { Item simpleItem = new Item(); String simpleCtrl = ""; - assertXMLEqual(simpleCtrl, simpleItem.toXML().toString()); + assertXMLEqual(simpleCtrl, simpleItem.toXML(null).toString()); Item idItem = new Item("uniqueid"); String idCtrl = ""; - assertXMLEqual(idCtrl, idItem.toXML().toString()); + assertXMLEqual(idCtrl, idItem.toXML(null).toString()); Item itemWithNodeId = new Item("testId", "testNode"); String nodeIdCtrl = ""; - assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML().toString()); + assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML(null).toString()); } @Test @@ -78,16 +78,16 @@ public class ItemValidationTest extends InitExtensions { SimplePayload payload = new SimplePayload("This is the payload"); PayloadItem simpleItem = new PayloadItem<>(payload); - String simpleCtrl = "" + payload.toXML() + ""; - assertXMLEqual(simpleCtrl, simpleItem.toXML().toString()); + String simpleCtrl = "" + payload.toXML(null) + ""; + assertXMLEqual(simpleCtrl, simpleItem.toXML(null).toString()); PayloadItem idItem = new PayloadItem<>("uniqueid", payload); - String idCtrl = "" + payload.toXML() + ""; - assertXMLEqual(idCtrl, idItem.toXML().toString()); + String idCtrl = "" + payload.toXML(null) + ""; + assertXMLEqual(idCtrl, idItem.toXML(null).toString()); PayloadItem itemWithNodeId = new PayloadItem<>("testId", "testNode", payload); - String nodeIdCtrl = "" + payload.toXML() + ""; - assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML().toString()); + String nodeIdCtrl = "" + payload.toXML(null) + ""; + assertXMLEqual(nodeIdCtrl, itemWithNodeId.toXML(null).toString()); } @Test @@ -145,7 +145,7 @@ public class ItemValidationTest extends InitExtensions { SimplePayload payload = (SimplePayload) item.getPayload(); assertEquals("foo", payload.getElementName()); assertEquals("smack:test", payload.getNamespace()); - assertXMLEqual(itemContent, payload.toXML().toString()); + assertXMLEqual(itemContent, payload.toXML(null).toString()); } @Test @@ -191,7 +191,7 @@ public class ItemValidationTest extends InitExtensions { SimplePayload payload = (SimplePayload) item.getPayload(); assertEquals("entry", payload.getElementName()); assertEquals("http://www.w3.org/2005/Atom", payload.getNamespace()); - assertXMLEqual(itemContent, payload.toXML().toString()); + assertXMLEqual(itemContent, payload.toXML(null).toString()); } @Test @@ -226,6 +226,6 @@ public class ItemValidationTest extends InitExtensions { assertEquals("testid1", item.getId()); assertTrue(item.getPayload() instanceof SimplePayload); - assertXMLEqual(itemContent, item.getPayload().toXML().toString()); + assertXMLEqual(itemContent, item.getPayload().toXML(null).toString()); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java index 3d2341a9b..4c8496725 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/PubSubNodeTest.java @@ -61,7 +61,7 @@ public class PubSubNodeTest extends SmackTestSuite { assertEquals("http://jabber.org/protocol/pubsub#owner", request.getChildElementNamespace()); assertEquals("pubsub", request.getChildElementName()); - XmlPullParser parser = TestUtils.getIQParser(request.toXML().toString()); + XmlPullParser parser = TestUtils.getIQParser(request.toXML(null).toString()); PubSub pubsubResult = (PubSub) PacketParserUtils.parseIQ(parser); SubscriptionsExtension subElem = pubsubResult.getExtension(PubSubElementType.SUBSCRIPTIONS_OWNER); List subscriptions = subElem.getSubscriptions(); diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/SimplePayloadTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/SimplePayloadTest.java index 2fd7d3c67..2bb046ad4 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/SimplePayloadTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/pubsub/SimplePayloadTest.java @@ -29,6 +29,6 @@ public class SimplePayloadTest { assertEquals("element", simplePayload.getElementName()); assertEquals("https://example.org", simplePayload.getNamespace()); - assertEquals(xmlPayload, simplePayload.toXML()); + assertEquals(xmlPayload, simplePayload.toXML(null)); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java index 5500125e9..58e17b078 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdata/packet/DataFormTest.java @@ -57,8 +57,8 @@ public class DataFormTest { FormField field = new FormField("testField1"); df.addField(field); - assertNotNull(df.toXML()); - String output = df.toXML().toString(); + assertNotNull(df.toXML(null)); + String output = df.toXML(null).toString(); assertEquals(TEST_OUTPUT_1, output); XmlPullParser parser = PacketParserUtils.getParserFor(output); @@ -70,8 +70,8 @@ public class DataFormTest { assertEquals(1 , df.getFields().size()); assertEquals(1 , df.getInstructions().size()); - assertNotNull(df.toXML()); - output = df.toXML().toString(); + assertNotNull(df.toXML(null)); + output = df.toXML(null).toString(); assertEquals(TEST_OUTPUT_1, output); } @@ -95,8 +95,8 @@ public class DataFormTest { df.addExtensionElement(layout); - assertNotNull(df.toXML()); - String output = df.toXML().toString(); + assertNotNull(df.toXML(null)); + String output = df.toXML(null).toString(); assertEquals(TEST_OUTPUT_2, output); XmlPullParser parser = PacketParserUtils.getParserFor(output); @@ -112,8 +112,8 @@ public class DataFormTest { assertEquals(3 , layout.getPageLayout().size()); - assertNotNull(df.toXML()); - output = df.toXML().toString(); + assertNotNull(df.toXML(null)); + output = df.toXML(null).toString(); assertEquals(TEST_OUTPUT_2, output); } @@ -129,8 +129,8 @@ public class DataFormTest { ValidateElement dv = new RangeValidateElement("xs:integer","1111", "9999"); field.setValidateElement(dv); - assertNotNull(df.toXML()); - String output = df.toXML().toString(); + assertNotNull(df.toXML(null)); + String output = df.toXML(null).toString(); assertEquals(TEST_OUTPUT_3, output); XmlPullParser parser = PacketParserUtils.getParserFor(output); @@ -146,8 +146,8 @@ public class DataFormTest { assertEquals("xs:integer" , dv.getDatatype()); - assertNotNull(df.toXML()); - output = df.toXML().toString(); + assertNotNull(df.toXML(null)); + output = df.toXML(null).toString(); assertEquals(TEST_OUTPUT_3, output); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java index fadbaf70c..5b3d5018e 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatalayout/packet/DataLayoutTest.java @@ -80,8 +80,8 @@ public class DataLayoutTest { layout.getPageLayout().add(section); layout.getPageLayout().add(new Text("PageText")); - assertNotNull(layout.toXML()); - String output = layout.toXML().toString(); + assertNotNull(layout.toXML(null)); + String output = layout.toXML(null).toString(); assertEquals(TEST_OUTPUT_2, output); XmlPullParser parser = PacketParserUtils.getParserFor(output); @@ -91,8 +91,8 @@ public class DataLayoutTest { assertEquals(3 , layout.getPageLayout().size()); assertEquals("Label", layout.getLabel()); - assertNotNull(layout.toXML()); - output = layout.toXML().toString(); + assertNotNull(layout.toXML(null)); + output = layout.toXML(null).toString(); assertEquals(TEST_OUTPUT_2, output); } @@ -114,8 +114,8 @@ public class DataLayoutTest { layout.getPageLayout().add(new Text("DO NOT DELAY
supply further information")); - assertNotNull(layout.toXML()); - String output = layout.toXML().toString(); + assertNotNull(layout.toXML(null)); + String output = layout.toXML(null).toString(); assertEquals(TEST_OUTPUT_SPECIAL, output); XmlPullParser parser = PacketParserUtils.getParserFor(output); @@ -134,8 +134,8 @@ public class DataLayoutTest { assertEquals("DO NOT DELAY
supply further information", text.getText()); - assertNotNull(layout.toXML()); - output = layout.toXML().toString(); + assertNotNull(layout.toXML(null)); + output = layout.toXML(null).toString(); assertEquals(TEST_OUTPUT_SPECIAL, output); } @@ -165,8 +165,8 @@ public class DataLayoutTest { assertEquals("DO NOT DELAY
supply further information", text.getText()); - assertNotNull(layout.toXML()); - String output = layout.toXML().toString(); + assertNotNull(layout.toXML(null)); + String output = layout.toXML(null).toString(); assertEquals(TEST_OUTPUT_SPECIAL, output); } } diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java index 641f417f3..96a5369e9 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/xdatavalidation/provider/DataValidationTest.java @@ -52,8 +52,8 @@ public class DataValidationTest { ValidateElement dv = new BasicValidateElement(null); - assertNotNull(dv.toXML()); - String output = dv.toXML().toString(); + assertNotNull(dv.toXML(null)); + String output = dv.toXML(null).toString(); assertEquals(TEST_OUTPUT_MIN, output); XmlPullParser parser = getParser(TEST_INPUT_MIN); @@ -64,8 +64,8 @@ public class DataValidationTest { assertEquals("xs:string", dv.getDatatype()); assertTrue(dv instanceof BasicValidateElement); - assertNotNull(dv.toXML()); - output = dv.toXML().toString(); + assertNotNull(dv.toXML(null)); + output = dv.toXML(null).toString(); assertEquals(TEST_OUTPUT_MIN, output); } @@ -77,8 +77,8 @@ public class DataValidationTest { ListRange listRange = new ListRange(111L, 999L); dv.setListRange(listRange); - assertNotNull(dv.toXML()); - String output = dv.toXML().toString(); + assertNotNull(dv.toXML(null)); + String output = dv.toXML(null).toString(); assertEquals(TEST_OUTPUT_RANGE, output); XmlPullParser parser = getParser(output); @@ -96,8 +96,8 @@ public class DataValidationTest { assertEquals(999, rdv.getListRange().getMax().intValue()); - assertNotNull(dv.toXML()); - output = dv.toXML().toString(); + assertNotNull(dv.toXML(null)); + output = dv.toXML(null).toString(); assertEquals(TEST_OUTPUT_RANGE, output); } @@ -106,8 +106,8 @@ public class DataValidationTest { ValidateElement dv = new RangeValidateElement(null, null, null); - assertNotNull(dv.toXML()); - String output = dv.toXML().toString(); + assertNotNull(dv.toXML(null)); + String output = dv.toXML(null).toString(); assertEquals(TEST_OUTPUT_RANGE2, output); XmlPullParser parser = getParser(output); @@ -121,8 +121,8 @@ public class DataValidationTest { assertEquals(null, rdv.getMin()); assertEquals(null, rdv.getMax()); - assertNotNull(rdv.toXML()); - output = rdv.toXML().toString(); + assertNotNull(rdv.toXML(null)); + output = rdv.toXML(null).toString(); assertEquals(TEST_OUTPUT_RANGE2, output); } diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java index 21845c008..3cb075bdc 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java +++ b/smack-extensions/src/test/java/org/jivesoftware/util/Protocol.java @@ -131,10 +131,10 @@ public class Protocol { if (printProtocol) { System.out.println("------------------- Request -------------\n"); - System.out.println(XmlUtil.prettyFormatXml(request.toXML())); + System.out.println(XmlUtil.prettyFormatXml(request.toXML(null))); System.out.println("------------------- Response ------------\n"); if (response != null) { - System.out.println(XmlUtil.prettyFormatXml(response.toXML())); + System.out.println(XmlUtil.prettyFormatXml(response.toXML(null))); } else { System.out.println("No response"); diff --git a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java index 65373c284..d621713c4 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/chat/ChatManager.java @@ -294,7 +294,7 @@ public final class ChatManager extends Manager{ EntityJid userJID = from.asEntityJidIfPossible(); if (userJID == null) { - LOGGER.warning("Message from JID without localpart: '" + message.toXML() + "'"); + LOGGER.warning("Message from JID without localpart: '" + message.toXML(null) + "'"); return null; } String threadID = message.getThread(); diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java index d888f769e..248fe4028 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterPacket.java @@ -91,7 +91,7 @@ public class RosterPacket extends IQ { synchronized (rosterItems) { for (Item entry : rosterItems) { - buf.append(entry.toXML()); + buf.append(entry.toXML(null)); } } return buf; @@ -272,7 +272,7 @@ public class RosterPacket extends IQ { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.attribute("jid", jid); xml.optAttribute("name", name); diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterVer.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterVer.java index 49b509106..17061253b 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterVer.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/RosterVer.java @@ -40,7 +40,7 @@ public final class RosterVer implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.closeEmptyElement(); return xml; diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/SubscriptionPreApproval.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/SubscriptionPreApproval.java index e75f009c0..426526937 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/SubscriptionPreApproval.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/packet/SubscriptionPreApproval.java @@ -40,7 +40,7 @@ public final class SubscriptionPreApproval implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = new XmlStringBuilder(this); xml.closeEmptyElement(); return xml; diff --git a/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java b/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java index 473777569..933d2dd25 100644 --- a/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java +++ b/smack-im/src/main/java/org/jivesoftware/smack/roster/rosterstore/DirectoryRosterStore.java @@ -213,7 +213,7 @@ public final class DirectoryRosterStore implements RosterStore { } private boolean addEntryRaw (Item item) { - return FileUtils.writeFile(getBareJidFile(item.getJid()), item.toXML()); + return FileUtils.writeFile(getBareJidFile(item.getJid()), item.toXML(null)); } private File getBareJidFile(Jid bareJid) { diff --git a/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java b/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java index 9612d5158..08d403a11 100644 --- a/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java +++ b/smack-integration-test/src/main/java/org/jivesoftware/smackx/caps/EntityCapsTest.java @@ -217,7 +217,7 @@ public class EntityCapsTest extends AbstractSmackIntegrationTest { DiscoverInfo entityInfo = EntityCapsManager.CAPS_CACHE.lookup(u1ver); assertNotNull(entityInfo); - assertEquals(info.toXML(), entityInfo.toXML()); + assertEquals(info.toXML(null), entityInfo.toXML(null)); } private static void dropWholeEntityCapsCache() { diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java index 65113b998..fe4409276 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/JingleSession.java @@ -288,7 +288,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList String responseId; - LOGGER.fine("Packet: " + iq.toXML()); + LOGGER.fine("Packet: " + iq.toXML(null)); try { @@ -718,21 +718,21 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList String sid = jin.getSid(); if (sid == null || !sid.equals(getSid())) { - LOGGER.fine("Ignored Jingle(SID) " + sid + "|" + getSid() + " :" + iq.toXML()); + LOGGER.fine("Ignored Jingle(SID) " + sid + "|" + getSid() + " :" + iq.toXML(null)); return false; } Jid ini = jin.getInitiator(); if (!ini.equals(getInitiator())) { - LOGGER.fine("Ignored Jingle(INI): " + iq.toXML()); + LOGGER.fine("Ignored Jingle(INI): " + iq.toXML(null)); return false; } } else { // We accept some non-Jingle IQ packets: ERRORs and ACKs if (iq.getType().equals(IQ.Type.set)) { - LOGGER.fine("Ignored Jingle(TYPE): " + iq.toXML()); + LOGGER.fine("Ignored Jingle(TYPE): " + iq.toXML(null)); return false; } else if (iq.getType().equals(IQ.Type.get)) { - LOGGER.fine("Ignored Jingle(TYPE): " + iq.toXML()); + LOGGER.fine("Ignored Jingle(TYPE): " + iq.toXML(null)); return false; } } @@ -1062,7 +1062,7 @@ public class JingleSession extends JingleNegotiator implements MediaReceivedList // NO! Let the normal state machinery do all of the sending. // getConnection().sendStanza(perror); - LOGGER.severe("Error sent: " + errorPacket.toXML()); + LOGGER.severe("Error sent: " + errorPacket.toXML(null)); } return errorPacket; } diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java index 7712a3474..acc7295dd 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/Jingle.java @@ -363,13 +363,13 @@ public class Jingle extends IQ { synchronized (contents) { for (JingleContent content : contents) { - buf.append(content.toXML()); + buf.append(content.toXML(null)); } } // and the same for audio jmf info if (contentInfo != null) { - buf.append(contentInfo.toXML()); + buf.append(contentInfo.toXML(null)); } return buf; diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java index f49958c44..e93c049b2 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContent.java @@ -160,7 +160,7 @@ public class JingleContent implements ExtensionElement { * @return a string with the XML representation */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); synchronized (transports) { @@ -171,12 +171,12 @@ public class JingleContent implements ExtensionElement { // Add the description. if (description != null) { - buf.append(description.toXML()); + buf.append(description.toXML(null)); } // Add all of the transports. for (JingleTransport transport : transports) { - buf.append(transport.toXML()); + buf.append(transport.toXML(null)); } buf.append("'); } diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java index 7935cc87c..f09969fd0 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentDescription.java @@ -148,7 +148,7 @@ public abstract class JingleContentDescription implements ExtensionElement { * @return a string with the XML representation */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); synchronized (payloads) { diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java index 4507a6175..acd85e6c5 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleContentInfo.java @@ -84,7 +84,7 @@ public class JingleContentInfo implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(getElementName()).append(" xmlns=\""); buf.append(getNamespace()).append("\" "); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java index 1713cce6b..ac291426a 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleDescription.java @@ -155,7 +155,7 @@ public abstract class JingleDescription implements ExtensionElement { * @return a string with the XML representation */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); synchronized (payloads) { diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java index 3717d68a8..1559bfac1 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleError.java @@ -76,7 +76,7 @@ public class JingleError implements ExtensionElement { * @return the error as XML. */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); if (message != null) { buf.append(""); diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java index 08151ff10..6ba7cddab 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/packet/JingleTransport.java @@ -152,7 +152,7 @@ public class JingleTransport implements ExtensionElement { * Return the XML representation for this element. */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(getElementName()).append(" xmlns=\""); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java index f20545230..53ecdb542 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/MetaData.java @@ -64,7 +64,7 @@ public class MetaData implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { return MetaDataUtils.serializeMetaData(this.getMetaData()); } } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java index 76e2224df..d42eea21d 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java @@ -299,7 +299,7 @@ public class AgentRoster { EntityFullJid from = presence.getFrom().asEntityFullJidIfPossible(); if (from == null) { // TODO Check if we need to ignore these presences or this is a server bug? - LOGGER.warning("Presence with non full JID from: " + presence.toXML()); + LOGGER.warning("Presence with non full JID from: " + presence.toXML(null)); return; } Jid key = getPresenceMapKey(from); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java index 26ff59933..873678f85 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/AgentStatus.java @@ -95,7 +95,7 @@ public class AgentStatus implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append(NAMESPACE).append('"'); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java index 2486e9043..6f2ed224b 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/OfferRevokeProvider.java @@ -107,10 +107,10 @@ public class OfferRevokeProvider extends IQProvider { buf.append("").append(reason).append(""); } if (sessionID != null) { - buf.append(new SessionID(sessionID).toXML()); + buf.append(new SessionID(sessionID).toXML(null)); } if (userID != null) { - buf.append(new UserID(userID).toXML()); + buf.append(new UserID(userID).toXML(null)); } return buf; } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java index bae5eb6f5..d8bdf8171 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueDetails.java @@ -104,7 +104,7 @@ public final class QueueDetails implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append(NAMESPACE).append("\">"); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java index 530678c6b..f8541c42f 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueOverview.java @@ -101,7 +101,7 @@ public class QueueOverview implements ExtensionElement { } @Override - public String toXML () { + public String toXML (String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append(NAMESPACE).append("\">"); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java index 1f5cb577f..05f90ffd2 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/QueueUpdate.java @@ -71,7 +71,7 @@ public class QueueUpdate implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append(""); if (position != -1) { diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java index 1d0722772..e7b3bd0cd 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomInvitation.java @@ -112,7 +112,7 @@ public class RoomInvitation implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = getIQChildElementBuilder(new IQChildElementXmlStringBuilder(this)); xml.closeElement(this); return xml; diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java index 6db80362d..234f8eb9c 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/RoomTransfer.java @@ -108,7 +108,7 @@ public class RoomTransfer implements ExtensionElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder xml = getIQChildElementBuilder(new IQChildElementXmlStringBuilder(this)); xml.closeElement(this); return xml; diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java index 8d0924e5b..9e19c6c04 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/SessionID.java @@ -58,7 +58,7 @@ public class SessionID implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append(NAMESPACE).append("\" "); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java index 0b1c7826e..5ea2c9bd5 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/Transcript.java @@ -83,7 +83,7 @@ public class Transcript extends IQ { .append("\">"); for (Stanza packet : packets) { - buf.append(packet.toXML()); + buf.append(packet.toXML(null)); } return buf; diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java index ba0162619..9203a33fd 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/UserID.java @@ -60,7 +60,7 @@ public class UserID implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(ELEMENT_NAME).append(" xmlns=\"").append(NAMESPACE).append("\" "); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java index c4a80de84..fd00df2c6 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/packet/WorkgroupInformation.java @@ -64,7 +64,7 @@ public class WorkgroupInformation implements ExtensionElement { } @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(ELEMENT_NAME); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java index bae251605..6965fb973 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/user/Workgroup.java @@ -587,11 +587,11 @@ public class Workgroup { buf.append(""); // Add the user unique identification if the session is anonymous if (connection.isAnonymous()) { - buf.append(new UserID(userID).toXML()); + buf.append(new UserID(userID).toXML(null)); } // Append data form text - buf.append(form.toXML()); + buf.append(form.toXML(null)); return buf; } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java index 78ca6c8f7..5bf041a2a 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/packet/MessageEvent.java @@ -306,7 +306,7 @@ public class MessageEvent implements ExtensionElement { * */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(getElementName()).append(" xmlns=\"").append(getNamespace()).append( "\">"); diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java index d646f3c16..eef658cac 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/packet/RosterExchange.java @@ -167,7 +167,7 @@ public class RosterExchange implements ExtensionElement { * */ @Override - public String toXML() { + public String toXML(String enclosingNamespace) { StringBuilder buf = new StringBuilder(); buf.append('<').append(getElementName()).append(" xmlns=\"").append(getNamespace()).append( "\">"); diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleElement.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleElement.java index 30bd6e059..c0edbe3de 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleElement.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleElement.java @@ -37,7 +37,7 @@ public abstract class OmemoBundleElement implements ExtensionElement { public static final String PRE_KEY_ID = "preKeyId"; @Override - public abstract XmlStringBuilder toXML(); + public abstract XmlStringBuilder toXML(String enclosingNamespace); @Override public boolean equals(Object other) { @@ -46,11 +46,11 @@ public abstract class OmemoBundleElement implements ExtensionElement { } OmemoBundleElement otherOmemoBundleElement = (OmemoBundleElement) other; - return toXML().equals(otherOmemoBundleElement.toXML()); + return toXML(null).equals(otherOmemoBundleElement.toXML(null)); } @Override public int hashCode() { - return this.toXML().hashCode(); + return this.toXML(null).hashCode(); } } diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleVAxolotlElement.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleVAxolotlElement.java index 557386b67..d27df5d87 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleVAxolotlElement.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoBundleVAxolotlElement.java @@ -166,7 +166,7 @@ public class OmemoBundleVAxolotlElement extends OmemoBundleElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this).rightAngleBracket(); sb.halfOpenElement(SIGNED_PRE_KEY_PUB).attribute(SIGNED_PRE_KEY_ID, signedPreKeyId).rightAngleBracket() diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoDeviceListElement.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoDeviceListElement.java index 8fc5a814b..9c4daac21 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoDeviceListElement.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoDeviceListElement.java @@ -59,7 +59,7 @@ public abstract class OmemoDeviceListElement implements ExtensionElement { } @Override - public final XmlStringBuilder toXML() { + public final XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this).rightAngleBracket(); for (Integer id : deviceIds) { diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoElement.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoElement.java index 97ab8b8a8..a68c5913d 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoElement.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoElement.java @@ -120,7 +120,7 @@ public abstract class OmemoElement implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this); sb.attribute(SID, getSid()).rightAngleBracket(); @@ -176,7 +176,7 @@ public abstract class OmemoElement implements ExtensionElement { } @Override - public CharSequence toXML() { + public CharSequence toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this); if (isPreKey()) { diff --git a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoVAxolotlElement.java b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoVAxolotlElement.java index e734294e6..3f189d594 100644 --- a/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoVAxolotlElement.java +++ b/smack-omemo/src/main/java/org/jivesoftware/smackx/omemo/element/OmemoVAxolotlElement.java @@ -47,7 +47,7 @@ public class OmemoVAxolotlElement extends OmemoElement { } @Override - public XmlStringBuilder toXML() { + public XmlStringBuilder toXML(String enclosingNamespace) { XmlStringBuilder sb = new XmlStringBuilder(this).rightAngleBracket(); sb.element(header); diff --git a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoBundleVAxolotlElementTest.java b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoBundleVAxolotlElementTest.java index 1707d1456..3af01893f 100644 --- a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoBundleVAxolotlElementTest.java +++ b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoBundleVAxolotlElementTest.java @@ -76,7 +76,7 @@ public class OmemoBundleVAxolotlElementTest extends SmackTestSuite { "" + "" + ""; - String actual = bundle.toXML().toString(); + String actual = bundle.toXML(null).toString(); assertEquals("Bundles XML must match.", expected, actual); byte[] signedPreKey = "SignedPreKey".getBytes(StringUtils.UTF8); diff --git a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoDeviceListVAxolotlElementTest.java b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoDeviceListVAxolotlElementTest.java index ac87e300e..984b5e8da 100644 --- a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoDeviceListVAxolotlElementTest.java +++ b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoDeviceListVAxolotlElementTest.java @@ -42,7 +42,7 @@ public class OmemoDeviceListVAxolotlElementTest extends SmackTestSuite { ids.add(9876); OmemoDeviceListVAxolotlElement element = new OmemoDeviceListVAxolotlElement(ids); - String xml = element.toXML().toString(); + String xml = element.toXML(null).toString(); XmlPullParser parser = TestUtils.getParser(xml); OmemoDeviceListVAxolotlElement parsed = new OmemoDeviceListVAxolotlProvider().parse(parser); diff --git a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoVAxolotlElementTest.java b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoVAxolotlElementTest.java index 0ab22cd9e..12030e5c9 100644 --- a/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoVAxolotlElementTest.java +++ b/smack-omemo/src/test/java/org/jivesoftware/smack/omemo/OmemoVAxolotlElementTest.java @@ -66,10 +66,10 @@ public class OmemoVAxolotlElementTest extends SmackTestSuite { "" + ""; - String actual = element.toXML().toString(); + String actual = element.toXML(null).toString(); assertEquals("Serialized xml of OmemoElement must match.", expected, actual); OmemoVAxolotlElement parsed = new OmemoVAxolotlProvider().parse(TestUtils.getParser(actual)); - assertEquals("Parsed OmemoElement must equal the original.", element.toXML().toString(), parsed.toXML().toString()); + assertEquals("Parsed OmemoElement must equal the original.", element.toXML(null).toString(), parsed.toXML(null).toString()); } } diff --git a/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java index 163ca53b6..cb5601da2 100644 --- a/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java +++ b/smack-repl/src/main/java/org/igniterealtime/smack/smackrepl/IoT.java @@ -126,7 +126,7 @@ public class IoT { throw new IllegalStateException("Unexpected number of values returned: " + values.size()); } IoTFieldsExtension field = values.get(0); - printStatus("DATA READ-OUT SUCCESS: " + field.toXML()); + printStatus("DATA READ-OUT SUCCESS: " + field.toXML(null)); printStatus("IoT SCENARIO FINISHED SUCCESSFULLY"); } }; diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java index da7e496cf..f8ac7caaf 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/sm/packet/StreamManagement.java @@ -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 + "'/>"; } diff --git a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java index 9f0ad638d..6c1efbca9 100644 --- a/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java +++ b/smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java @@ -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 { diff --git a/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java b/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java index 15bae3c11..c51b8ef29 100644 --- a/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java +++ b/smack-tcp/src/test/java/org/jivesoftware/smack/sm/provider/ParseStreamManagementTest.java @@ -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