From fe3dcba9b205f2e8425d42c9c8920ce2581c0902 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Sun, 2 Nov 2014 12:12:56 +0100 Subject: [PATCH] Fix javadoc warnings and deprecated methods --- .../src/main/java/org/jivesoftware/smack/ChatManager.java | 6 +++--- .../src/main/java/org/jivesoftware/smack/Roster.java | 8 ++++---- .../src/main/java/org/jivesoftware/smack/RosterGroup.java | 2 +- .../main/java/org/jivesoftware/smack/XMPPConnection.java | 2 +- .../org/jivesoftware/smack/filter/FromMatchesFilter.java | 4 ++-- .../java/org/jivesoftware/smack/filter/IQReplyFilter.java | 2 +- .../jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java | 4 ++-- .../smackx/debugger/slf4j/SLF4JSmackDebugger.java | 2 +- .../org/jivesoftware/smackx/debugger/LiteDebugger.java | 2 +- .../smackx/address/MultipleRecipientManager.java | 2 +- .../jivesoftware/smackx/workgroup/agent/AgentRoster.java | 6 +++--- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java b/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java index 27967367d..c568ed191 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/ChatManager.java @@ -235,7 +235,7 @@ public class ChatManager extends Manager{ Chat chat = new Chat(this, userJID, threadID); threadChats.put(threadID, chat); jidChats.put(userJID, chat); - baseJidChats.put(XmppStringUtils.parseBareAddress(userJID), chat); + baseJidChats.put(XmppStringUtils.parseBareJid(userJID), chat); for(ChatManagerListener listener : chatManagerListeners) { listener.chatCreated(chat, createdLocally); @@ -248,7 +248,7 @@ public class ChatManager extends Manager{ threadChats.remove(chat.getThreadID()); String userJID = chat.getParticipant(); jidChats.remove(userJID); - baseJidChats.remove(XmppStringUtils.parseBareAddress(userJID)); + baseJidChats.remove(XmppStringUtils.parseBareJid(userJID)); } /** @@ -294,7 +294,7 @@ public class ChatManager extends Manager{ Chat match = jidChats.get(userJID); if (match == null && (matchMode == MatchMode.BARE_JID)) { - match = baseJidChats.get(XmppStringUtils.parseBareAddress(userJID)); + match = baseJidChats.get(XmppStringUtils.parseBareJid(userJID)); } return match; } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java index 1df1238db..1de0f3833 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/Roster.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/Roster.java @@ -491,7 +491,7 @@ public class Roster { * or if no presence information is available.. */ public Presence getPresence(String user) { - String key = getPresenceMapKey(XmppStringUtils.parseBareAddress(user)); + String key = getPresenceMapKey(XmppStringUtils.parseBareJid(user)); Map userPresences = presenceMap.get(key); if (userPresences == null) { Presence presence = new Presence(Presence.Type.unavailable); @@ -629,7 +629,7 @@ public class Roster { } String key = user; if (!contains(user)) { - key = XmppStringUtils.parseBareAddress(user); + key = XmppStringUtils.parseBareJid(user); } return key.toLowerCase(Locale.US); } @@ -752,7 +752,7 @@ public class Roster { String user = entry.getUser(); entries.remove(user); unfiledEntries.remove(entry); - presenceMap.remove(XmppStringUtils.parseBareAddress(user)); + presenceMap.remove(XmppStringUtils.parseBareJid(user)); deletedEntries.add(user); for (Entry e: groups.entrySet()) { @@ -1029,7 +1029,7 @@ public class Roster { // Roster push (RFC 6121, 2.1.6) // A roster push with a non-empty from not matching our address MUST be ignored - String jid = XmppStringUtils.parseBareAddress(connection.getUser()); + String jid = XmppStringUtils.parseBareJid(connection.getUser()); if (rosterPacket.getFrom() != null && !rosterPacket.getFrom().equals(jid)) { LOGGER.warning("Ignoring roster push with a non matching 'from' ourJid=" + jid diff --git a/smack-core/src/main/java/org/jivesoftware/smack/RosterGroup.java b/smack-core/src/main/java/org/jivesoftware/smack/RosterGroup.java index 9007b0879..5b76ec242 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/RosterGroup.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/RosterGroup.java @@ -122,7 +122,7 @@ public class RosterGroup { } // Roster entries never include a resource so remove the resource // if it's a part of the XMPP address. - user = XmppStringUtils.parseBareAddress(user); + user = XmppStringUtils.parseBareJid(user); String userLowerCase = user.toLowerCase(Locale.US); synchronized (entries) { for (RosterEntry entry : entries) { diff --git a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java index 4440b064a..d3f2c303f 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/XMPPConnection.java @@ -395,7 +395,7 @@ public interface XMPPConnection { * * @param element * @param namespace - * @return + * @return true if the server supports the stream feature. */ public boolean hasFeature(String element, String namespace); diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java index 2e1354b1a..83eb2648c 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/FromMatchesFilter.java @@ -72,7 +72,7 @@ public class FromMatchesFilter implements PacketFilter { * have a from address. */ public static FromMatchesFilter createBare(String address) { - address = (address == null) ? null : XmppStringUtils.parseBareAddress(address); + address = (address == null) ? null : XmppStringUtils.parseBareJid(address); return new FromMatchesFilter(address, true); } @@ -96,7 +96,7 @@ public class FromMatchesFilter implements PacketFilter { // Simplest form of NAMEPREP/STRINGPREP from = from.toLowerCase(Locale.US); if (matchBareJID) { - from = XmppStringUtils.parseBareAddress(from); + from = XmppStringUtils.parseBareJid(from); } return from.equals(address); } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java index 3f7cb1127..1c3ec64f6 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/filter/IQReplyFilter.java @@ -100,7 +100,7 @@ public class IQReplyFilter implements PacketFilter { fromFilter.addFilter(FromMatchesFilter.createBare(local)); fromFilter.addFilter(FromMatchesFilter.createFull(server)); } - else if (to.equals(XmppStringUtils.parseBareAddress(local))) { + else if (to.equals(XmppStringUtils.parseBareJid(local))) { fromFilter.addFilter(FromMatchesFilter.createFull(null)); } } diff --git a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java index db265834e..71e9fc89e 100644 --- a/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java +++ b/smack-core/src/main/java/org/jivesoftware/smack/sasl/core/SCRAMSHA1Mechanism.java @@ -295,7 +295,7 @@ public class SCRAMSHA1Mechanism extends SASLMechanism { * * @param key * @param str - * @return + * @return the HMAC-SHA1 value of the input. * @throws SmackException */ private static byte[] hmac(byte[] key, byte[] str) throws SmackException { @@ -317,7 +317,7 @@ public class SCRAMSHA1Mechanism extends SASLMechanism { * @param str * @param salt * @param iterations - * @return + * @return the result of the Hi function. * @throws SmackException */ private static byte[] hi(String str, byte[] salt, int iterations) throws SmackException { diff --git a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java index 0f5fe14c0..c9dd213d8 100644 --- a/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java +++ b/smack-debug-slf4j/src/main/java/org/jivesoftware/smackx/debugger/slf4j/SLF4JSmackDebugger.java @@ -101,7 +101,7 @@ public class SLF4JSmackDebugger implements SmackDebugger { } private String getUserTitle(String user) { - if (("@" + connection.getServiceName()).equals(XmppStringUtils.parseBareAddress(user))) { + if (("@" + connection.getServiceName()).equals(XmppStringUtils.parseBareJid(user))) { return "@" + connection.getServiceName(); } else { return user; diff --git a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java index 9e2286217..1584ac859 100644 --- a/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java +++ b/smack-debug/src/main/java/org/jivesoftware/smackx/debugger/LiteDebugger.java @@ -328,7 +328,7 @@ public class LiteDebugger implements SmackDebugger { boolean isAnonymous = "".equals(XmppStringUtils.parseLocalpart(user)); String title = "Smack Debug Window -- " - + (isAnonymous ? "" : XmppStringUtils.parseBareAddress(user)) + + (isAnonymous ? "" : XmppStringUtils.parseBareJid(user)) + "@" + connection.getServiceName() + ":" diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java index 2a2edf4a3..a5d1bebf0 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/address/MultipleRecipientManager.java @@ -164,7 +164,7 @@ public class MultipleRecipientManager { // Remove the sender from the TO/CC list (try with bare JID too) String from = connection.getUser(); if (!to.remove(from) && !cc.remove(from)) { - String bareJID = XmppStringUtils.parseBareAddress(from); + String bareJID = XmppStringUtils.parseBareJid(from); to.remove(bareJID); cc.remove(bareJID); } diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java index 663bd24fc..f0bbc8caa 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/workgroup/agent/AgentRoster.java @@ -249,7 +249,7 @@ public class AgentRoster { private String getPresenceMapKey(String user) { String key = user; if (!contains(user)) { - key = XmppStringUtils.parseBareAddress(user).toLowerCase(Locale.US); + key = XmppStringUtils.parseBareJid(user).toLowerCase(Locale.US); } return key; } @@ -323,7 +323,7 @@ public class AgentRoster { synchronized (entries) { for (Iterator i = entries.iterator(); i.hasNext();) { String entry = i.next(); - if (entry.toLowerCase(Locale.US).equals(XmppStringUtils.parseBareAddress(key).toLowerCase())) { + if (entry.toLowerCase(Locale.US).equals(XmppStringUtils.parseBareJid(key).toLowerCase())) { fireEvent(EVENT_PRESENCE_CHANGED, packet); } } @@ -344,7 +344,7 @@ public class AgentRoster { synchronized (entries) { for (Iterator i = entries.iterator(); i.hasNext();) { String entry = (String)i.next(); - if (entry.toLowerCase(Locale.US).equals(XmppStringUtils.parseBareAddress(key).toLowerCase())) { + if (entry.toLowerCase(Locale.US).equals(XmppStringUtils.parseBareJid(key).toLowerCase())) { fireEvent(EVENT_PRESENCE_CHANGED, packet); } }