From 85f7e1d39cf1aa7f7d1a0eaa92783d13006ae5cc Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sat, 16 Feb 2019 17:17:25 +0100 Subject: [PATCH] Remove deprecated methods scheduled for removal in Smack 4.4 --- .../org/jivesoftware/smack/XMPPException.java | 13 ----------- .../smackx/muc/MultiUserChatManager.java | 22 ------------------- 2 files changed, 35 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java index 9ac7518d3..fff02a214 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPException.java @@ -122,19 +122,6 @@ public abstract class XMPPException extends Exception { this.request = request; } - /** - * Returns the XMPPError associated with this exception, or null if there isn't - * one. - * - * @return the XMPPError associated with this exception. - * @deprecated use {@link #getStanzaError()} instead. - */ - @Deprecated - // TODO Remove in Smack 4.4. - public StanzaError getXMPPError() { - return error; - } - /** * Returns the stanza error extension element associated with this exception. * diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java index 0169cd4a4..98e3dfdc0 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/muc/MultiUserChatManager.java @@ -383,28 +383,6 @@ public final class MultiUserChatManager extends Manager { MUCInitialPresence.NAMESPACE); } - /** - * Returns a List of HostedRooms where each HostedRoom has the XMPP address of the room and the room's name. - * Once discovered the rooms hosted by a chat service it is possible to discover more detailed room information or - * join the room. - * - * @param serviceName the service that is hosting the rooms to discover. - * @return a collection of HostedRooms. - * @throws XMPPErrorException - * @throws NoResponseException - * @throws NotConnectedException - * @throws InterruptedException - * @throws NotAMucServiceException - * @deprecated use {@link #getRoomsHostedBy(DomainBareJid)} instead. - */ - @Deprecated - // TODO: Remove in Smack 4.4. - public List getHostedRooms(DomainBareJid serviceName) throws NoResponseException, XMPPErrorException, - NotConnectedException, InterruptedException, NotAMucServiceException { - Map hostedRooms = getRoomsHostedBy(serviceName); - return new ArrayList<>(hostedRooms.values()); - } - /** * Returns a Map of HostedRooms where each HostedRoom has the XMPP address of the room and the room's name. * Once discovered the rooms hosted by a chat service it is possible to discover more detailed room information or