From 2288825b1cd72847031029b8dda91cbff2de53ea Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 19 Dec 2017 15:06:40 +0100 Subject: [PATCH] Retain smack-core API --- .../jivesoftware/smack/SmackConfiguration.java | 10 ++++++++++ .../java/org/jivesoftware/smack/packet/IQ.java | 8 ++++++++ .../org/jivesoftware/smack/util/ByteUtils.java | 11 +++++++++++ .../org/jivesoftware/smack/util/PacketUtil.java | 16 ++++++++++++++++ 4 files changed, 45 insertions(+) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java index 7c4f8fd5f..5f700a431 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java @@ -280,6 +280,16 @@ public final class SmackConfiguration { compressionHandlers.add(xmppInputOutputStream); } + /** + * Get compression handlers. + * + * @deprecated use {@link #getCompressionHandlers()} instead. + */ + @Deprecated + public static List getCompresionHandlers() { + return getCompressionHandlers(); + } + public static List getCompressionHandlers() { List res = new ArrayList<>(compressionHandlers.size()); for (XMPPInputOutputStream ios : compressionHandlers) { 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 87217346d..049e66f38 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 @@ -215,6 +215,14 @@ public abstract class IQ extends Stanza { */ protected abstract IQChildElementXmlStringBuilder getIQChildElementBuilder(IQChildElementXmlStringBuilder xml); + /** + * @deprecated use {@link #initializeAsResultFor(IQ)} instead. + */ + @Deprecated + protected final void initialzeAsResultFor(IQ request) { + initializeAsResultFor(request); + } + protected final void initializeAsResultFor(IQ request) { if (!(request.getType() == Type.get || request.getType() == Type.set)) { throw new IllegalArgumentException( diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java b/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java index 6d52b4cf2..4621bac9c 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/ByteUtils.java @@ -17,6 +17,17 @@ package org.jivesoftware.smack.util; public class ByteUtils { + + /** + * Concatenate two byte arrays. + * + * @deprecated use {@link #concat(byte[], byte[])} instead. + */ + @Deprecated + public static byte[] concact(byte[] arrayOne, byte[] arrayTwo) { + return concat(arrayOne, arrayTwo); + } + public static byte[] concat(byte[] arrayOne, byte[] arrayTwo) { int combinedLength = arrayOne.length + arrayTwo.length; byte[] res = new byte[combinedLength]; diff --git a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java index 138f6d32a..f11fd7321 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/util/PacketUtil.java @@ -22,6 +22,22 @@ import org.jivesoftware.smack.packet.ExtensionElement; public class PacketUtil { + /** + * Get a extension element from a collection. + * @param collection + * @param element + * @param namespace + * @param + * @return the extension element + * @deprecated use {@link #extensionElementFrom(Collection, String, String)} instead. + */ + @Deprecated + public static PE packetExtensionfromCollection( + Collection collection, String element, + String namespace) { + return extensionElementFrom(collection, element, namespace); + } + /** * Get a extension element from a collection. *