Swiftdiff options
| author | Edwin Mons <edwin.mons@isode.com> | 2014-05-19 13:08:55 (GMT) |
|---|---|---|
| committer | Swift Review <review@swift.im> | 2014-05-26 17:40:21 (GMT) |
| commit | b249168a5c7dfd4846729dcb79445afc2cf37391 (patch) | |
| tree | 130bbb00157888a0847b007ea830e08146e6bb5b /Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp | |
| parent | 168538129a69fa37a19e768149b32ca262bb85a3 (diff) | |
| download | swift-contrib-b249168a5c7dfd4846729dcb79445afc2cf37391.zip swift-contrib-b249168a5c7dfd4846729dcb79445afc2cf37391.tar.bz2 | |
Fix serialization of PubSubItem id attribute
Extended the serialization unit tests with PubSubItem and PubSubItems
test, also added a warning when serializing PubSubItems without a node
name.
Change-Id: Ie4c4021b1cca593187c4aa333aa43dd34239b1ca
Diffstat (limited to 'Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp')
| -rw-r--r-- | Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp b/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp index e2f7d6e..7c6d1f1 100644 --- a/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp +++ b/Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.cpp @@ -7,34 +7,38 @@ #pragma clang diagnostic ignored "-Wunused-private-field" #include <Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.h> #include <Swiften/Serializer/XML/XMLElement.h> #include <boost/lexical_cast.hpp> #include <boost/smart_ptr/make_shared.hpp> #include <Swiften/Serializer/PayloadSerializerCollection.h> #include <Swiften/Base/foreach.h> +#include <Swiften/Base/Log.h> #include <Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h> #include <Swiften/Serializer/XML/XMLRawTextNode.h> using namespace Swift; PubSubItemsSerializer::PubSubItemsSerializer(PayloadSerializerCollection* serializers) : serializers(serializers) { } PubSubItemsSerializer::~PubSubItemsSerializer() { } std::string PubSubItemsSerializer::serializePayload(boost::shared_ptr<PubSubItems> payload) const { if (!payload) { return ""; } XMLElement element("items", "http://jabber.org/protocol/pubsub"); + if (payload->getNode().empty()) { + SWIFT_LOG(warning) << "Serializing PubSubItems with empty node attribute"; + } element.setAttribute("node", payload->getNode()); foreach(boost::shared_ptr<PubSubItem> item, payload->getItems()) { element.addNode(boost::make_shared<XMLRawTextNode>(PubSubItemSerializer(serializers).serialize(item))); } if (payload->getMaximumItems()) { element.setAttribute("max_items", boost::lexical_cast<std::string>(*payload->getMaximumItems())); } if (payload->getSubscriptionID()) { element.setAttribute("subid", *payload->getSubscriptionID()); |