From 2288825b1cd72847031029b8dda91cbff2de53ea Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 19 Dec 2017 15:06:40 +0100 Subject: [PATCH 1/2] 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. * From e1acf0cfd2d19d57dd115b821b4e61762e2cafaa Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 19 Dec 2017 15:06:55 +0100 Subject: [PATCH 2/2] Retain smack-jingle-old API --- .../mediaimpl/jmf/AudioMediaSession.java | 34 ++++++++++++++++++- .../mediaimpl/jspeex/AudioMediaSession.java | 32 +++++++++++++++++ .../mediaimpl/sshare/ScreenShareSession.java | 32 +++++++++++++++++ 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java index c67f8d1e5..295728b57 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jmf/AudioMediaSession.java @@ -88,6 +88,16 @@ public class AudioMediaSession extends JingleMediaSession { audioChannel = new AudioChannel(new MediaLocator(this.getMediaLocator()), localIp, ip, localPort, remotePort, AudioFormatUtils.getAudioFormat(this.getPayloadType()),this); } + /** + * Starts transmission and for NAT Traversal reasons start receiving also. + * + * @deprecated use {@link #startTransmit()} instead. + */ + @Deprecated + public void startTrasmit() { + startTransmit(); + } + /** * Starts transmission and for NAT Traversal reasons start receiving also. */ @@ -97,7 +107,19 @@ public class AudioMediaSession extends JingleMediaSession { } /** - * Set transmit activity. If the active is true, the instance should trasmit. + * Set transmit activity. If the active is true, the instance should transmit. + * If it is set to false, the instance should pause transmit. + * + * @param active active state + * @deprecated use {@link #setTransmit(boolean)} instead. + */ + @Deprecated + public void setTrasmit(boolean active) { + setTransmit(active); + } + + /** + * Set transmit activity. If the active is true, the instance should transmit. * If it is set to false, the instance should pause transmit. * * @param active active state @@ -115,6 +137,16 @@ public class AudioMediaSession extends JingleMediaSession { // Do nothing } + /** + * Stops transmission and for NAT Traversal reasons stop receiving also. + * + * @deprecated use {@link #stopTransmit()} instead. + */ + @Deprecated + public void stopTrasmit() { + stopTransmit(); + } + /** * Stops transmission and for NAT Traversal reasons stop receiving also. */ diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java index 656182767..dcea33c02 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/jspeex/AudioMediaSession.java @@ -153,6 +153,16 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio } } + /** + * Starts transmission and for NAT Traversal reasons start receiving also. + * + * @deprecated use {@link #startTransmit()} instead. + */ + @Deprecated + public void startTrasmit() { + startTransmit(); + } + /** * Starts transmission and for NAT Traversal reasons start receiving also. */ @@ -168,6 +178,18 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio } } + /** + * Set transmit activity. If the active is true, the instance should transmit. + * If it is set to false, the instance should pause transmit. + * + * @param active active state + * @deprecated use {@link #setTransmit(boolean)} instead. + */ + @Deprecated + public void setTrasmit(boolean active) { + setTransmit(active); + } + /** * Set transmit activity. If the active is true, the instance should transmit. * If it is set to false, the instance should pause transmit. @@ -187,6 +209,16 @@ public class AudioMediaSession extends JingleMediaSession implements MediaSessio // Do nothing } + /** + * Stops transmission and for NAT Traversal reasons stop receiving also. + * + * @deprecated use {@link #stopTransmit()} instead. + */ + @Deprecated + public void stopTrasmit() { + stopTransmit(); + } + /** * Stops transmission and for NAT Traversal reasons stop receiving also. */ diff --git a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java index 8da3be121..93cb9cf09 100644 --- a/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java +++ b/smack-jingle-old/src/main/java/org/jivesoftware/smackx/jingleold/mediaimpl/sshare/ScreenShareSession.java @@ -119,6 +119,16 @@ public class ScreenShareSession extends JingleMediaSession { } } + /** + * Starts transmission and for NAT Traversal reasons start receiving also. + * + * @deprecated use {@link #startTransmit()} instead. + */ + @Deprecated + public void startTrasmit() { + startTransmit(); + } + /** * Starts transmission and for NAT Traversal reasons start receiving also. */ @@ -127,6 +137,18 @@ public class ScreenShareSession extends JingleMediaSession { new Thread(transmitter).start(); } + /** + * Set transmit activity. If the active is true, the instance should transmit. + * If it is set to false, the instance should pause transmit. + * + * @param active active state + * @deprecated use {@link #setTransmit(boolean)} instead. + */ + @Deprecated + public void setTrasmit(boolean active) { + setTransmit(active); + } + /** * Set transmit activity. If the active is true, the instance should transmit. * If it is set to false, the instance should pause transmit. @@ -146,6 +168,16 @@ public class ScreenShareSession extends JingleMediaSession { // Do nothing } + /** + * Stops transmission and for NAT Traversal reasons stop receiving also. + * + * @deprecated use {@link #stopTransmit()} instead. + */ + @Deprecated + public void stopTrasmit() { + stopTransmit(); + } + /** * Stops transmission and for NAT Traversal reasons stop receiving also. */