From 12e20c2d6c127fa746ed3e846a077d769e09691f Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 4 Apr 2020 13:03:03 +0200 Subject: [PATCH] Remove deprecated methods/fields scheduled for removal in Smack 4.4 --- .../org/jivesoftware/smack/SmackConfiguration.java | 12 ------------ .../java/org/jivesoftware/smack/SmackException.java | 7 ------- .../smackx/sid/provider/StanzaIdProvider.java | 4 ---- 3 files changed, 23 deletions(-) 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 9e15ef8b0..75f23a97f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackConfiguration.java @@ -240,18 +240,6 @@ public final class SmackConfiguration { compressionHandlers.add(xmppInputOutputStream); } - /** - * Get compression handlers. - * - * @return a list of compression handlers. - * @deprecated use {@link #getCompressionHandlers()} instead. - */ - @Deprecated - // TODO: Remove in Smack 4.4. - public static List getCompresionHandlers() { - return getCompressionHandlers(); - } - /** * Get compression handlers. * diff --git a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java index fbf6ebd40..f58ed10a4 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/SmackException.java @@ -98,13 +98,6 @@ public abstract class SmackException extends Exception { return new NoResponseException(sb.toString()); } - @Deprecated - // TODO: Remove in Smack 4.4. - public static NoResponseException newWith(long timeout, - StanzaCollector collector) { - return newWith(timeout, collector.getStanzaFilter(), false); - } - public static NoResponseException newWith(long timeout, StanzaCollector collector, boolean stanzaCollectorCancelled) { return newWith(timeout, collector.getStanzaFilter(), stanzaCollectorCancelled); diff --git a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/StanzaIdProvider.java b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/StanzaIdProvider.java index ce59799df..a45d34289 100644 --- a/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/StanzaIdProvider.java +++ b/smack-experimental/src/main/java/org/jivesoftware/smackx/sid/provider/StanzaIdProvider.java @@ -26,10 +26,6 @@ public class StanzaIdProvider extends ExtensionElementProvider public static final StanzaIdProvider INSTANCE = new StanzaIdProvider(); - // TODO: Remove in Smack 4.4. - @Deprecated - public static final StanzaIdProvider TEST_INSTANCE = INSTANCE; - @Override public StanzaIdElement parse(XmlPullParser parser, int initialDepth, XmlEnvironment xmlEnvironment) { String id = parser.getAttributeValue(null, StanzaIdElement.ATTR_ID);