From 1ad394f2569ee47bcb9af9c8a8c9dee112e9a677 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 16 Dec 2023 13:50:30 +0100 Subject: [PATCH] [urldata] Follow-up on initial merge of XEP-0103/0104 support This is a follow-up on 198c51356dd8 ("Add initial support for XEP-0103 and XEP-0104: URL Address Information"), which 1. adds the entries to the support XEPs table 2. registers the provider 3. renames the package from url_address_information to urldata (aka. the shortname of XEP-0130). --- .../element/DescElement.java | 2 +- .../element/MetaInformationElement.java | 2 +- .../element/UrlDataElement.java | 12 ++++--- .../element/package-info.java | 2 +- .../http/element/AuthParamElement.java | 2 +- .../http/element/CookieElement.java | 2 +- .../http/element/HeaderElement.java | 2 +- .../http/element/HttpAuthElement.java | 5 +-- .../http/element/NameValuePairElement.java | 5 +-- .../http/element/package-info.java | 2 +- .../http/package-info.java | 2 +- .../package-info.java | 2 +- .../provider/UrlDataElementProvider.java | 18 +++++------ .../provider/package-info.java | 2 +- .../extensions.providers | 7 +++++ .../UrlDataElementTest.java | 31 ++++++++++--------- .../org/jivesoftware/smackx/package-info.java | 12 +++++++ 17 files changed, 69 insertions(+), 41 deletions(-) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/element/DescElement.java (96%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/element/MetaInformationElement.java (91%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/element/UrlDataElement.java (94%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/element/package-info.java (92%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/http/element/AuthParamElement.java (97%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/http/element/CookieElement.java (98%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/http/element/HeaderElement.java (96%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/http/element/HttpAuthElement.java (95%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/http/element/NameValuePairElement.java (89%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/http/element/package-info.java (90%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/http/package-info.java (92%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/package-info.java (92%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/provider/UrlDataElementProvider.java (86%) rename smack-extensions/src/main/java/org/jivesoftware/smackx/{url_address_information => urldata}/provider/package-info.java (92%) rename smack-extensions/src/test/java/org/jivesoftware/smackx/{url_address_information => urldata}/UrlDataElementTest.java (87%) diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/DescElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/DescElement.java similarity index 96% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/DescElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/DescElement.java index 255436d3c..7cb6b4b6b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/DescElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/DescElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.element; +package org.jivesoftware.smackx.urldata.element; import org.jivesoftware.smack.packet.NamedElement; import org.jivesoftware.smack.packet.XmlEnvironment; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/MetaInformationElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/MetaInformationElement.java similarity index 91% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/MetaInformationElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/MetaInformationElement.java index 88acf13e4..95628092b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/MetaInformationElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/MetaInformationElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.element; +package org.jivesoftware.smackx.urldata.element; import org.jivesoftware.smack.packet.NamedElement; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/UrlDataElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/UrlDataElement.java similarity index 94% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/UrlDataElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/UrlDataElement.java index ad1317068..b10478e44 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/UrlDataElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/UrlDataElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.element; +package org.jivesoftware.smackx.urldata.element; import java.util.ArrayList; import java.util.List; @@ -25,10 +25,14 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.util.EqualsUtil; import org.jivesoftware.smack.util.HashCode; import org.jivesoftware.smack.util.XmlStringBuilder; -import org.jivesoftware.smackx.url_address_information.http.element.CookieElement; -import org.jivesoftware.smackx.url_address_information.http.element.HeaderElement; -import org.jivesoftware.smackx.url_address_information.http.element.HttpAuthElement; +import org.jivesoftware.smackx.urldata.http.element.CookieElement; +import org.jivesoftware.smackx.urldata.http.element.HeaderElement; +import org.jivesoftware.smackx.urldata.http.element.HttpAuthElement; + +/** + * The url-data element. + */ public class UrlDataElement implements ExtensionElement { public static final String ELEMENT = "url-data"; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/package-info.java similarity index 92% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/package-info.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/package-info.java index 634a7f534..0682aff01 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/element/package-info.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/element/package-info.java @@ -20,4 +20,4 @@ * * @see XEP-0103 - URL Address Information. */ -package org.jivesoftware.smackx.url_address_information.element; +package org.jivesoftware.smackx.urldata.element; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/AuthParamElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/AuthParamElement.java similarity index 97% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/AuthParamElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/AuthParamElement.java index 5497aab6c..42ca5218a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/AuthParamElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/AuthParamElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.http.element; +package org.jivesoftware.smackx.urldata.http.element; import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.util.EqualsUtil; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/CookieElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/CookieElement.java similarity index 98% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/CookieElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/CookieElement.java index d590499a1..3bd95347b 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/CookieElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/CookieElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.http.element; +package org.jivesoftware.smackx.urldata.http.element; import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.util.EqualsUtil; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/HeaderElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/HeaderElement.java similarity index 96% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/HeaderElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/HeaderElement.java index f49c5816c..0feb816e3 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/HeaderElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/HeaderElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.http.element; +package org.jivesoftware.smackx.urldata.http.element; import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.util.EqualsUtil; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/HttpAuthElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/HttpAuthElement.java similarity index 95% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/HttpAuthElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/HttpAuthElement.java index 31c84e2cc..ff11163f2 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/HttpAuthElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/HttpAuthElement.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.http.element; +package org.jivesoftware.smackx.urldata.http.element; import java.util.ArrayList; import java.util.List; @@ -23,7 +23,8 @@ import org.jivesoftware.smack.packet.XmlEnvironment; import org.jivesoftware.smack.util.EqualsUtil; import org.jivesoftware.smack.util.HashCode; import org.jivesoftware.smack.util.XmlStringBuilder; -import org.jivesoftware.smackx.url_address_information.element.MetaInformationElement; + +import org.jivesoftware.smackx.urldata.element.MetaInformationElement; public final class HttpAuthElement implements MetaInformationElement { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/NameValuePairElement.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/NameValuePairElement.java similarity index 89% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/NameValuePairElement.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/NameValuePairElement.java index 0b54a2289..911bdb339 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/NameValuePairElement.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/NameValuePairElement.java @@ -14,10 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.http.element; +package org.jivesoftware.smackx.urldata.http.element; import org.jivesoftware.smack.util.XmlStringBuilder; -import org.jivesoftware.smackx.url_address_information.element.MetaInformationElement; + +import org.jivesoftware.smackx.urldata.element.MetaInformationElement; public abstract class NameValuePairElement implements MetaInformationElement { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/package-info.java similarity index 90% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/package-info.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/package-info.java index dd934e656..7bc42714a 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/element/package-info.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/element/package-info.java @@ -18,4 +18,4 @@ /** * Element classes for XEP-0104. */ -package org.jivesoftware.smackx.url_address_information.http.element; +package org.jivesoftware.smackx.urldata.http.element; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/package-info.java similarity index 92% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/package-info.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/package-info.java index 645cd1def..4a7f1b8db 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/http/package-info.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/http/package-info.java @@ -20,4 +20,4 @@ * * @see XEP-0104 - HTTP Scheme for URL Address Information */ -package org.jivesoftware.smackx.url_address_information.http; +package org.jivesoftware.smackx.urldata.http; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/package-info.java similarity index 92% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/package-info.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/package-info.java index 0ad64cca1..06fec0af9 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/package-info.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/package-info.java @@ -18,4 +18,4 @@ /** * Smack's API for XEP-0103 - URL Address Information. */ -package org.jivesoftware.smackx.url_address_information; +package org.jivesoftware.smackx.urldata; diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/provider/UrlDataElementProvider.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/provider/UrlDataElementProvider.java similarity index 86% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/provider/UrlDataElementProvider.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/provider/UrlDataElementProvider.java index 705975047..f1a8a2b25 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/provider/UrlDataElementProvider.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/provider/UrlDataElementProvider.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information.provider; +package org.jivesoftware.smackx.urldata.provider; -import static org.jivesoftware.smackx.url_address_information.element.UrlDataElement.ATTR_SID; -import static org.jivesoftware.smackx.url_address_information.element.UrlDataElement.ATTR_TARGET; +import static org.jivesoftware.smackx.urldata.element.UrlDataElement.ATTR_SID; +import static org.jivesoftware.smackx.urldata.element.UrlDataElement.ATTR_TARGET; import java.io.IOException; import java.util.ArrayList; @@ -29,15 +29,15 @@ import org.jivesoftware.smack.provider.ExtensionElementProvider; import org.jivesoftware.smack.util.ParserUtils; import org.jivesoftware.smack.xml.XmlPullParser; import org.jivesoftware.smack.xml.XmlPullParserException; -import org.jivesoftware.smackx.url_address_information.element.UrlDataElement; -import org.jivesoftware.smackx.url_address_information.http.element.AuthParamElement; -import org.jivesoftware.smackx.url_address_information.http.element.CookieElement; -import org.jivesoftware.smackx.url_address_information.http.element.HeaderElement; -import org.jivesoftware.smackx.url_address_information.http.element.HttpAuthElement; + +import org.jivesoftware.smackx.urldata.element.UrlDataElement; +import org.jivesoftware.smackx.urldata.http.element.AuthParamElement; +import org.jivesoftware.smackx.urldata.http.element.CookieElement; +import org.jivesoftware.smackx.urldata.http.element.HeaderElement; +import org.jivesoftware.smackx.urldata.http.element.HttpAuthElement; public class UrlDataElementProvider extends ExtensionElementProvider { - public static UrlDataElementProvider INSTANCE = new UrlDataElementProvider(); @Override public UrlDataElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) throws XmlPullParserException, IOException, SmackParsingException { String target = parser.getAttributeValue(ATTR_TARGET); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/provider/package-info.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/provider/package-info.java similarity index 92% rename from smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/provider/package-info.java rename to smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/provider/package-info.java index eb2c9a21d..c31c44db0 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/url_address_information/provider/package-info.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/urldata/provider/package-info.java @@ -20,4 +20,4 @@ * * @see XEP-0103 - URL Address Information. */ -package org.jivesoftware.smackx.url_address_information.provider; +package org.jivesoftware.smackx.urldata.provider; diff --git a/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers index c2ac6921e..8dd5b32d3 100644 --- a/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers +++ b/smack-extensions/src/main/resources/org.jivesoftware.smack.extensions/extensions.providers @@ -365,6 +365,13 @@ org.jivesoftware.smackx.si.provider.StreamInitiationProvider + + + url-data + http://jabber.org/protocol/url-data + org.jivesoftware.smackx.urldata.provider.UrlDataElementProvider + + mood diff --git a/smack-extensions/src/test/java/org/jivesoftware/smackx/url_address_information/UrlDataElementTest.java b/smack-extensions/src/test/java/org/jivesoftware/smackx/urldata/UrlDataElementTest.java similarity index 87% rename from smack-extensions/src/test/java/org/jivesoftware/smackx/url_address_information/UrlDataElementTest.java rename to smack-extensions/src/test/java/org/jivesoftware/smackx/urldata/UrlDataElementTest.java index 8e88ba3d1..72bc4f32a 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/smackx/url_address_information/UrlDataElementTest.java +++ b/smack-extensions/src/test/java/org/jivesoftware/smackx/urldata/UrlDataElementTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jivesoftware.smackx.url_address_information; +package org.jivesoftware.smackx.urldata; import static org.jivesoftware.smack.test.util.XmlAssertUtil.assertXmlSimilar; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -27,16 +27,19 @@ import org.jivesoftware.smack.parsing.SmackParsingException; import org.jivesoftware.smack.test.util.SmackTestSuite; import org.jivesoftware.smack.test.util.TestUtils; import org.jivesoftware.smack.xml.XmlPullParserException; -import org.jivesoftware.smackx.url_address_information.element.UrlDataElement; -import org.jivesoftware.smackx.url_address_information.http.element.CookieElement; -import org.jivesoftware.smackx.url_address_information.http.element.HeaderElement; -import org.jivesoftware.smackx.url_address_information.http.element.HttpAuthElement; -import org.jivesoftware.smackx.url_address_information.provider.UrlDataElementProvider; + +import org.jivesoftware.smackx.urldata.element.UrlDataElement; +import org.jivesoftware.smackx.urldata.http.element.CookieElement; +import org.jivesoftware.smackx.urldata.http.element.HeaderElement; +import org.jivesoftware.smackx.urldata.http.element.HttpAuthElement; +import org.jivesoftware.smackx.urldata.provider.UrlDataElementProvider; import org.junit.jupiter.api.Test; public class UrlDataElementTest extends SmackTestSuite { + public static final UrlDataElementProvider URL_DATA_ELEMENT_PROVIDER = new UrlDataElementProvider(); + @Test public void simpleSerializationTest() throws XmlPullParserException, IOException, SmackParsingException { UrlDataElement urlDataElement = new UrlDataElement("http://www.jabber.org/members/index.php", @@ -52,7 +55,7 @@ public class UrlDataElementTest extends SmackTestSuite { ""; assertXmlSimilar(expectedXml, urlDataElement.toXML().toString()); - UrlDataElement parsed = UrlDataElementProvider.INSTANCE.parse(TestUtils.getParser(expectedXml)); + UrlDataElement parsed = URL_DATA_ELEMENT_PROVIDER.parse(TestUtils.getParser(expectedXml)); assertEquals(urlDataElement, parsed); } @@ -80,7 +83,7 @@ public class UrlDataElementTest extends SmackTestSuite { " "; assertXmlSimilar(expectedXml, urlDataElement.toXML().toString()); - UrlDataElement parsed = UrlDataElementProvider.INSTANCE.parse(TestUtils.getParser(expectedXml)); + UrlDataElement parsed = URL_DATA_ELEMENT_PROVIDER.parse(TestUtils.getParser(expectedXml)); assertEquals(urlDataElement, parsed); } @@ -93,7 +96,7 @@ public class UrlDataElementTest extends SmackTestSuite { " target='http://pass.jabber.org:8519/test.txt'/>"; assertXmlSimilar(expectedXml, urlDataElement.toXML().toString()); - UrlDataElement parsed = UrlDataElementProvider.INSTANCE.parse(TestUtils.getParser(expectedXml)); + UrlDataElement parsed = URL_DATA_ELEMENT_PROVIDER.parse(TestUtils.getParser(expectedXml)); assertEquals(urlDataElement, parsed); } @@ -106,7 +109,7 @@ public class UrlDataElementTest extends SmackTestSuite { " target='http://festhall.outer-planes.net/d20M/announce/latest/'/>"; assertXmlSimilar(expectedXml, urlDataElement.toXML().toString()); - UrlDataElement parsed = UrlDataElementProvider.INSTANCE.parse(TestUtils.getParser(expectedXml)); + UrlDataElement parsed = URL_DATA_ELEMENT_PROVIDER.parse(TestUtils.getParser(expectedXml)); assertEquals(urlDataElement, parsed); } @@ -126,7 +129,7 @@ public class UrlDataElementTest extends SmackTestSuite { ""; assertXmlSimilar(expectedXml, urlDataElement.toXML().toString()); - UrlDataElement parsed = UrlDataElementProvider.INSTANCE.parse(TestUtils.getParser(expectedXml)); + UrlDataElement parsed = URL_DATA_ELEMENT_PROVIDER.parse(TestUtils.getParser(expectedXml)); assertEquals(urlDataElement, parsed); } @@ -161,7 +164,7 @@ public class UrlDataElementTest extends SmackTestSuite { ""; assertXmlSimilar(expectedXml, urlDataElement.toXML().toString()); - UrlDataElement parsed = UrlDataElementProvider.INSTANCE.parse(TestUtils.getParser(expectedXml)); + UrlDataElement parsed = URL_DATA_ELEMENT_PROVIDER.parse(TestUtils.getParser(expectedXml)); assertEquals(urlDataElement, parsed); } @@ -181,7 +184,7 @@ public class UrlDataElementTest extends SmackTestSuite { " "; assertXmlSimilar(expectedXml, urlDataElement.toXML().toString()); - UrlDataElement parsed = UrlDataElementProvider.INSTANCE.parse(TestUtils.getParser(expectedXml)); + UrlDataElement parsed = URL_DATA_ELEMENT_PROVIDER.parse(TestUtils.getParser(expectedXml)); assertEquals(urlDataElement, parsed); } @@ -210,7 +213,7 @@ public class UrlDataElementTest extends SmackTestSuite { " "; assertXmlSimilar(expectedXml, urlDataElement.toXML().toString()); - UrlDataElement parsed = UrlDataElementProvider.INSTANCE.parse(TestUtils.getParser(expectedXml)); + UrlDataElement parsed = URL_DATA_ELEMENT_PROVIDER.parse(TestUtils.getParser(expectedXml)); assertEquals(urlDataElement, parsed); } } diff --git a/smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java b/smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java index 803afc7da..171472358 100644 --- a/smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java +++ b/smack-java8-full/src/main/java/org/jivesoftware/smackx/package-info.java @@ -206,6 +206,18 @@ * Transfer files between two users over XMPP. * * + * URL Address Information + * XEP-0103 + * {@link org.jivesoftware.smackx.urldata.element} + * Provide information about an Uniform Resource Locator (URL), and a protocol signaling retrieval states. + * + * + * HTTP Scheme for URL Data + * XEP-0104 + * + * A schema description for detailed information about HTTP URLs. + * + * * User Mood * XEP-0107 *