Swiftdiff options
| author | Alan Young <consult.awy@gmail.com> | 2015-04-30 16:12:17 (GMT) |
|---|---|---|
| committer | Alan Young <consult.awy@gmail.com> | 2015-05-01 08:18:03 (GMT) |
| commit | 6385fd0f848ffd829ca52a04a90989730a10616f (patch) | |
| tree | 53aaf2b63d2a974c3fa26429c6d235203ff9893b /src/com/isode/stroke/serializer | |
| parent | cd8e073cabc9a39abb14527b6e968ece1586b7ec (diff) | |
| download | stroke-6385fd0f848ffd829ca52a04a90989730a10616f.zip stroke-6385fd0f848ffd829ca52a04a90989730a10616f.tar.bz2 | |
Add parser & serializer for SecurityLabel & SecurityLabelsCatalog
Change visibility of some methods in SecurityLabel &
SecurityLabelsCatalog and provide default values for strings and
collections in those clases.
Change-Id: I1ea3f6b20deac1d1ac7999dd304e2e755d5e7c8a
Diffstat (limited to 'src/com/isode/stroke/serializer')
3 files changed, 93 insertions, 2 deletions
diff --git a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java index f4caa29..a0dcebd 100644 --- a/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java +++ b/src/com/isode/stroke/serializer/payloadserializers/FullPayloadSerializerCollection.java @@ -37,8 +37,8 @@ public class FullPayloadSerializerCollection extends PayloadSerializerCollection addSerializer(new CapsInfoSerializer()); addSerializer(new ResourceBindSerializer()); addSerializer(new StartSessionSerializer()); - //addSerializer(new SecurityLabelSerializer()); - //addSerializer(new SecurityLabelsCatalogSerializer()); + addSerializer(new SecurityLabelSerializer()); + addSerializer(new SecurityLabelsCatalogSerializer()); //addSerializer(new StreamInitiationSerializer()); //addSerializer(new BytestreamsSerializer()); addSerializer(new VCardSerializer()); diff --git a/src/com/isode/stroke/serializer/payloadserializers/SecurityLabelSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/SecurityLabelSerializer.java new file mode 100644 index 0000000..69d087b --- /dev/null +++ b/src/com/isode/stroke/serializer/payloadserializers/SecurityLabelSerializer.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2010-2015 Isode Limited, London, England. + * All rights reserved. + */ + +package com.isode.stroke.serializer.payloadserializers; + +import com.isode.stroke.elements.SecurityLabel; +import com.isode.stroke.serializer.GenericPayloadSerializer; +import com.isode.stroke.serializer.xml.XMLElement; +import com.isode.stroke.serializer.xml.XMLRawTextNode; +import com.isode.stroke.serializer.xml.XMLTextNode; + +public class SecurityLabelSerializer extends GenericPayloadSerializer<SecurityLabel> { + + public SecurityLabelSerializer() { + super(SecurityLabel.class); + } + + @Override + protected String serializePayload(SecurityLabel label) { + XMLElement element = new XMLElement("securitylabel", "urn:xmpp:sec-label:0"); + if (!label.getDisplayMarking().isEmpty()) { + XMLElement displayMarking = new XMLElement("displaymarking"); + if (!label.getForegroundColor().isEmpty()) { + displayMarking.setAttribute("fgcolor", label.getForegroundColor()); + } + if (!label.getBackgroundColor().isEmpty()) { + displayMarking.setAttribute("bgcolor", label.getBackgroundColor()); + } + displayMarking.addNode(new XMLTextNode(label.getDisplayMarking())); + element.addNode(displayMarking); + } + + XMLElement labelElement = new XMLElement("label"); + labelElement.addNode(new XMLRawTextNode(label.getLabel())); + element.addNode(labelElement); + + for(String equivalentLabel : label.getEquivalentLabels()) { + XMLElement equivalentLabelElement = new XMLElement("equivalentlabel"); + equivalentLabelElement.addNode(new XMLRawTextNode(equivalentLabel)); + element.addNode(equivalentLabelElement); + } + return element.serialize(); + } +} diff --git a/src/com/isode/stroke/serializer/payloadserializers/SecurityLabelsCatalogSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/SecurityLabelsCatalogSerializer.java new file mode 100644 index 0000000..e203157 --- /dev/null +++ b/src/com/isode/stroke/serializer/payloadserializers/SecurityLabelsCatalogSerializer.java @@ -0,0 +1,45 @@ +/* + * Copyright (c) 2010-2015 Isode Limited, London, England. + * All rights reserved. + */ + +package com.isode.stroke.serializer.payloadserializers; + +import com.isode.stroke.elements.SecurityLabelsCatalog; +import com.isode.stroke.serializer.GenericPayloadSerializer; +import com.isode.stroke.serializer.xml.XMLElement; +import com.isode.stroke.serializer.xml.XMLRawTextNode; + +public class SecurityLabelsCatalogSerializer extends GenericPayloadSerializer<SecurityLabelsCatalog> { + + public SecurityLabelsCatalogSerializer() { + super(SecurityLabelsCatalog.class); + } + + @Override + protected String serializePayload(SecurityLabelsCatalog catalog) { + XMLElement element = new XMLElement("catalog", "urn:xmpp:sec-label:catalog:2"); + if (!catalog.getName().isEmpty()) { + element.setAttribute("name", catalog.getName()); + } + if (catalog.getTo().isValid()) { + element.setAttribute("to", catalog.getTo().toString()); + } + if (!catalog.getDescription().isEmpty()) { + element.setAttribute("desc", catalog.getDescription()); + } + for (SecurityLabelsCatalog.Item item : catalog.getItems()) { + XMLElement itemElement = new XMLElement("item"); + itemElement.setAttribute("selector", item.getSelector()); + if (item.getIsDefault()) { + itemElement.setAttribute("default", "true"); + } + if (item.getLabel() != null) { + String serializedLabel = new SecurityLabelSerializer().serialize(item.getLabel()); + itemElement.addNode(new XMLRawTextNode(serializedLabel)); + } + element.addNode(itemElement); + } + return element.serialize(); + } +} |