From e81c4814ed154dfdcbedbbb331997a6b18856198 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Mon, 6 Jan 2020 18:41:30 +0100
Subject: [PATCH 1/2] Make use of XmlStringBuilder in AttentionElement

---
 .../smackx/attention/packet/AttentionExtension.java       | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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 cdc47d2cc..c107fe5c3 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
@@ -19,6 +19,7 @@ package org.jivesoftware.smackx.attention.packet;
 import org.jivesoftware.smack.packet.ExtensionElement;
 import org.jivesoftware.smack.packet.XmlEnvironment;
 import org.jivesoftware.smack.provider.ExtensionElementProvider;
+import org.jivesoftware.smack.util.XmlStringBuilder;
 import org.jivesoftware.smack.xml.XmlPullParser;
 
 /**
@@ -69,11 +70,8 @@ public class AttentionExtension implements ExtensionElement {
      * @see org.jivesoftware.smack.packet.PacketExtension#toXML()
      */
     @Override
-    public String toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
-        final StringBuilder sb = new StringBuilder();
-        sb.append('<').append(getElementName()).append(" xmlns=\"").append(
-                getNamespace()).append("\"/>");
-        return sb.toString();
+    public XmlStringBuilder toXML(org.jivesoftware.smack.packet.XmlEnvironment enclosingNamespace) {
+        return new XmlStringBuilder(this).closeEmptyElement();
     }
 
     /**

From ffbd97ff102703cf9665511e1ef7ec4685142081 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Wed, 8 Apr 2020 22:09:13 +0200
Subject: [PATCH 2/2] Add AttentionElementTest

---
 .../attention/AttentionElementTest.java       | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java

diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java
new file mode 100644
index 000000000..52be8b713
--- /dev/null
+++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/attention/AttentionElementTest.java
@@ -0,0 +1,38 @@
+/**
+ *
+ * Copyright 2020 Paul Schaub
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jivesoftware.smackx.attention;
+
+import static org.jivesoftware.smack.test.util.XmlUnitUtils.assertXmlSimilar;
+
+import org.jivesoftware.smackx.attention.packet.AttentionExtension;
+
+import org.junit.Test;
+
+public class AttentionElementTest {
+
+    /**
+     * Serialized Attention element.
+     * @see <a href="https://xmpp.org/extensions/xep-0224.html#example-2">XEP-0224: Attention - Example 2</a>
+     */
+    private static final String XML = "<attention xmlns='urn:xmpp:attention:0'/>";
+
+    @Test
+    public void serializationTest() {
+        AttentionExtension extension = new AttentionExtension();
+        assertXmlSimilar(XML, extension.toXML());
+    }
+}