vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-10 17:49:38 +02:00
Code Issues Releases Wiki Activity

1. Clean up code

Browse source 
2. Refactoring work
3. Optimization work. SMACK-153
4. Fixed roster test cases. SMACK-154
4. Fixed vCard issue. SMACK-152

git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@4538 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Gaston Dombiak 2006-07-18 05:14:33 +00:00 • committed by gato
parent 14b50d790a
commit f57ff10ad9
77 changed files with 995 additions and 932 deletions
Download patch file Download diff file Expand all files Collapse all files

38
source/org/jivesoftware/smack/AccountManager.java
View file

@ -20,12 +20,18 @@
package org.jivesoftware.smack;
import org.jivesoftware.smack.packet.Registration;
import org.jivesoftware.smack.filter.AndFilter;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketIDFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.filter.*;
import org.jivesoftware.smack.packet.Registration;
import org.jivesoftware.smack.util.StringUtils;
import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
/**
* Allows creation and management of accounts on an XMPP server.
@ -90,17 +96,19 @@ public class AccountManager {
*
* @return the required account attributes.
*/
public Iterator getAccountAttributes() {
public Iterator<String> getAccountAttributes() {
try {
if (info == null) {
getRegistrationInfo();
}
Map attributes = info.getAttributes();
Map<String, String> attributes = info.getAttributes();
if (attributes != null) {
return attributes.keySet().iterator();
}
}
catch (XMPPException xe) { }
catch (XMPPException xe) {
xe.printStackTrace();
}
return Collections.EMPTY_LIST.iterator();
}
@ -117,9 +125,11 @@ public class AccountManager {
if (info == null) {
getRegistrationInfo();
}
return (String) info.getAttributes().get(name);
return info.getAttributes().get(name);
}
catch (XMPPException xe) {
xe.printStackTrace();
}
catch (XMPPException xe) { }
return null;
}
@ -159,9 +169,9 @@ public class AccountManager {
throw new XMPPException("Server does not support account creation.");
}
// Create a map for all the required attributes, but give them blank values.
Map attributes = new HashMap();
for (Iterator i=getAccountAttributes(); i.hasNext(); ) {
String attributeName = (String)i.next();
Map<String, String> attributes = new HashMap<String, String>();
for (Iterator<String> i=getAccountAttributes(); i.hasNext(); ) {
String attributeName = i.next();
attributes.put(attributeName, "");
}
createAccount(username, password, attributes);
@ -178,7 +188,7 @@ public class AccountManager {
* @throws XMPPException if an error occurs creating the account.
* @see #getAccountAttributes()
*/
public void createAccount(String username, String password, Map attributes)
public void createAccount(String username, String password, Map<String, String> attributes)
throws XMPPException
{
if (!supportsAccountCreation()) {
@ -217,7 +227,7 @@ public class AccountManager {
Registration reg = new Registration();
reg.setType(IQ.Type.SET);
reg.setTo(connection.getServiceName());
HashMap map = new HashMap();
Map<String, String> map = new HashMap<String, String>();
map.put("username",StringUtils.parseName(connection.getUser()));
map.put("password",newPassword);
reg.setAttributes(map);
@ -251,7 +261,7 @@ public class AccountManager {
Registration reg = new Registration();
reg.setType(IQ.Type.SET);
reg.setTo(connection.getServiceName());
Map attributes = new HashMap();
Map<String, String> attributes = new HashMap<String, String>();
// To delete an account, we add a single attribute, "remove", that is blank.
attributes.put("remove", "");
reg.setAttributes(attributes);

20
source/org/jivesoftware/smack/Chat.java
View file

@ -20,12 +20,15 @@
package org.jivesoftware.smack;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.ThreadFilter;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.filter.*;
import java.util.*;
import java.lang.ref.WeakReference;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
/**
* A chat is a series of messages sent between two users. Each chat has a unique
@ -66,7 +69,8 @@ public class Chat {
private String participant;
private PacketFilter messageFilter;
private PacketCollector messageCollector;
private Set listeners = new HashSet();
private final Set<WeakReference<PacketListener>> listeners =
new HashSet<WeakReference<PacketListener>>();
/**
* Creates a new chat with the specified user.
@ -94,7 +98,7 @@ public class Chat {
// Register with the map of chats so that messages with no thread ID
// set will be delivered to this Chat.
connection.chats.put(StringUtils.parseBareAddress(participant),
new WeakReference(this));
new WeakReference<Chat>(this));
// Filter the messages whose thread equals Chat's id
messageFilter = new ThreadFilter(threadID);
@ -222,7 +226,7 @@ public class Chat {
// Keep track of the listener so that we can manually deliver extra
// messages to it later if needed.
synchronized (listeners) {
listeners.add(new WeakReference(listener));
listeners.add(new WeakReference<PacketListener>(listener));
}
}
@ -242,10 +246,10 @@ public class Chat {
messageCollector.processPacket(message);
synchronized (listeners) {
for (Iterator i=listeners.iterator(); i.hasNext(); ) {
WeakReference listenerRef = (WeakReference)i.next();
for (Iterator<WeakReference<PacketListener>> i=listeners.iterator(); i.hasNext(); ) {
WeakReference<PacketListener> listenerRef = i.next();
PacketListener listener;
if ((listener = (PacketListener)listenerRef.get()) != null) {
if ((listener = listenerRef.get()) != null) {
listener.processPacket(message);
}
// If the reference was cleared, remove it from the set.

2
source/org/jivesoftware/smack/ConnectionConfiguration.java
View file

@ -62,7 +62,7 @@ public class ConnectionConfiguration implements Cloneable {
// Build the default path to the cacert truststore file. By default we are
// going to use the file located in $JREHOME/lib/security/cacerts.
String javaHome = System.getProperty("java.home");
StringBuffer buffer = new StringBuffer();
StringBuilder buffer = new StringBuilder();
buffer.append(javaHome).append(File.separator).append("lib");
buffer.append(File.separator).append("security");
buffer.append(File.separator).append("cacerts");

12
source/org/jivesoftware/smack/PacketCollector.java
View file

@ -48,7 +48,7 @@ public class PacketCollector {
private static final int MAX_PACKETS = 65536;
private PacketFilter packetFilter;
private LinkedList resultQueue;
private LinkedList<Packet> resultQueue;
private PacketReader packetReader;
private boolean cancelled = false;
@ -62,7 +62,7 @@ public class PacketCollector {
protected PacketCollector(PacketReader packetReader, PacketFilter packetFilter) {
this.packetReader = packetReader;
this.packetFilter = packetFilter;
this.resultQueue = new LinkedList();
this.resultQueue = new LinkedList<Packet>();
}
/**
@ -101,7 +101,7 @@ public class PacketCollector {
return null;
}
else {
return (Packet)resultQueue.removeLast();
return resultQueue.removeLast();
}
}
@ -121,7 +121,7 @@ public class PacketCollector {
// Ignore.
}
}
return (Packet)resultQueue.removeLast();
return resultQueue.removeLast();
}
/**
@ -159,12 +159,12 @@ public class PacketCollector {
}
// Return the packet that was found.
else {
return (Packet)resultQueue.removeLast();
return resultQueue.removeLast();
}
}
// There's already a packet waiting, so return it.
else {
return (Packet)resultQueue.removeLast();
return resultQueue.removeLast();
}
}

42
source/org/jivesoftware/smack/PacketReader.java
View file

@ -48,9 +48,11 @@ class PacketReader {
private XMPPConnection connection;
private XmlPullParser parser;
private boolean done = false;
private final VolatileMemberCollection collectors = new VolatileMemberCollection(50);
private final VolatileMemberCollection<PacketCollector> collectors =
new VolatileMemberCollection<PacketCollector>(50);
private final VolatileMemberCollection listeners = new VolatileMemberCollection(50);
protected final List connectionListeners = new ArrayList();
protected final List<ConnectionListener> connectionListeners =
new ArrayList<ConnectionListener>();
private String connectionID = null;
private final Object connectionIDLock = new Object();
@ -176,12 +178,11 @@ class PacketReader {
public void shutdown() {
// Notify connection listeners of the connection closing if done hasn't already been set.
if (!done) {
ArrayList listenersCopy;
List<ConnectionListener> listenersCopy;
synchronized (connectionListeners) {
// Make a copy since it's possible that a listener will be removed from the list
listenersCopy = new ArrayList(connectionListeners);
for (Iterator i=listenersCopy.iterator(); i.hasNext(); ) {
ConnectionListener listener = (ConnectionListener)i.next();
listenersCopy = new ArrayList<ConnectionListener>(connectionListeners);
for (ConnectionListener listener : listenersCopy) {
listener.connectionClosed();
}
}
@ -206,12 +207,11 @@ class PacketReader {
// Print the stack trace to help catch the problem
e.printStackTrace();
// Notify connection listeners of the error.
ArrayList listenersCopy;
List<ConnectionListener> listenersCopy;
synchronized (connectionListeners) {
// Make a copy since it's possible that a listener will be removed from the list
listenersCopy = new ArrayList(connectionListeners);
for (Iterator i=listenersCopy.iterator(); i.hasNext(); ) {
ConnectionListener listener = (ConnectionListener)i.next();
listenersCopy = new ArrayList<ConnectionListener>(connectionListeners);
for (ConnectionListener listener : listenersCopy) {
listener.connectionClosedOnError(e);
}
}
@ -489,8 +489,8 @@ class PacketReader {
* @return a collection of Stings with the mechanisms included in the mechanisms stanza.
* @throws Exception if an exception occurs while parsing the stanza.
*/
private Collection parseMechanisms(XmlPullParser parser) throws Exception {
List mechanisms = new ArrayList();
private Collection<String> parseMechanisms(XmlPullParser parser) throws Exception {
List<String> mechanisms = new ArrayList<String>();
boolean done = false;
while (!done) {
int eventType = parser.next();
@ -510,9 +510,9 @@ class PacketReader {
return mechanisms;
}
private Collection parseCompressionMethods(XmlPullParser parser)
private Collection<String> parseCompressionMethods(XmlPullParser parser)
throws IOException, XmlPullParserException {
List methods = new ArrayList();
List<String> methods = new ArrayList<String>();
boolean done = false;
while (!done) {
int eventType = parser.next();
@ -698,7 +698,7 @@ class PacketReader {
private Registration parseRegistration(XmlPullParser parser) throws Exception {
Registration registration = new Registration();
Map fields = null;
Map<String, String> fields = null;
boolean done = false;
while (!done) {
int eventType = parser.next();
@ -709,7 +709,7 @@ class PacketReader {
String name = parser.getName();
String value = "";
if (fields == null) {
fields = new HashMap();
fields = new HashMap<String, String>();
}
if (parser.next() == XmlPullParser.TEXT) {
@ -772,19 +772,19 @@ class PacketReader {
* volatile. In other words, many are added and deleted and 'null' values are skipped by the
* returned iterator.
*/
static class VolatileMemberCollection {
static class VolatileMemberCollection<E> {
private final Object mutex = new Object();
private final ArrayList collectors;
private final ArrayList<E> collectors;
private int nullIndex = -1;
private int[] nullArray;
VolatileMemberCollection(int initialCapacity) {
collectors = new ArrayList(initialCapacity);
collectors = new ArrayList<E>(initialCapacity);
nullArray = new int[initialCapacity];
}
public void add(Object member) {
public void add(E member) {
synchronized (mutex) {
if (nullIndex < 0) {
ensureCapacity();
@ -808,7 +808,7 @@ class PacketReader {
}
}
public void remove(Object member) {
public void remove(E member) {
synchronized (mutex) {
int index = collectors.lastIndexOf(member);
if (index >= 0) {

14
source/org/jivesoftware/smack/PacketWriter.java
View file

@ -41,10 +41,10 @@ class PacketWriter {
private Thread writerThread;
private Writer writer;
private XMPPConnection connection;
final private LinkedList queue;
final private LinkedList<Packet> queue;
private boolean done = false;
final private List listeners = new ArrayList();
final private List<ListenerWrapper> listeners = new ArrayList<ListenerWrapper>();
private boolean listenersDeleted = false;
/**
@ -72,7 +72,7 @@ class PacketWriter {
protected PacketWriter(XMPPConnection connection) {
this.connection = connection;
this.writer = connection.writer;
this.queue = new LinkedList();
this.queue = new LinkedList<Packet>();
writerThread = new Thread() {
public void run() {
@ -130,7 +130,7 @@ class PacketWriter {
public void removePacketListener(PacketListener packetListener) {
synchronized (listeners) {
for (int i=0; i<listeners.size(); i++) {
ListenerWrapper wrapper = (ListenerWrapper)listeners.get(i);
ListenerWrapper wrapper = listeners.get(i);
if (wrapper != null && wrapper.packetListener.equals(packetListener)) {
listeners.set(i, null);
// Set the flag to indicate that the listener list needs
@ -239,7 +239,7 @@ class PacketWriter {
}
}
if (queue.size() > 0) {
return (Packet)queue.removeLast();
return queue.removeLast();
}
else {
return null;
@ -308,7 +308,7 @@ class PacketWriter {
// Notify the listeners of the new sent packet
int size = listeners.size();
for (int i=0; i<size; i++) {
ListenerWrapper listenerWrapper = (ListenerWrapper)listeners.get(i);
ListenerWrapper listenerWrapper = listeners.get(i);
if (listenerWrapper != null) {
listenerWrapper.notifyListener(packet);
}
@ -357,7 +357,7 @@ class PacketWriter {
* @throws IOException If an error occurs while sending the stanza to the server.
*/
void openStream() throws IOException {
StringBuffer stream = new StringBuffer();
StringBuilder stream = new StringBuilder();
stream.append("<stream:stream");
stream.append(" to=\"").append(connection.serviceName).append("\"");
stream.append(" xmlns=\"jabber:client\"");

119
source/org/jivesoftware/smack/Roster.java
View file

@ -20,8 +20,13 @@
package org.jivesoftware.smack;
import org.jivesoftware.smack.packet.*;
import org.jivesoftware.smack.filter.*;
import org.jivesoftware.smack.filter.PacketFilter;
import org.jivesoftware.smack.filter.PacketIDFilter;
import org.jivesoftware.smack.filter.PacketTypeFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.Packet;
import org.jivesoftware.smack.packet.Presence;
import org.jivesoftware.smack.packet.RosterPacket;
import org.jivesoftware.smack.util.StringUtils;
import java.util.*;
@ -63,17 +68,17 @@ public class Roster {
public static final int SUBSCRIPTION_MANUAL = 2;
/**
* The default subscription processing mode to use when a Roster is created. By default
* all subscription requests are automatically accepted.
* The default subscription processing mode to use when a Roster is created. By default
* all subscription requests are automatically accepted.
*/
private static int defaultSubscriptionMode = SUBSCRIPTION_ACCEPT_ALL;
private XMPPConnection connection;
private Map<String,RosterGroup> groups;
private List entries;
private List unfiledEntries;
private List<RosterListener> rosterListeners;
private Map presenceMap;
private final Map<String, RosterGroup> groups;
private final List<RosterEntry> entries;
private final List<RosterEntry> unfiledEntries;
private final List<RosterListener> rosterListeners;
private Map<String, Map<String, Presence>> presenceMap;
// The roster is marked as initialized when at least a single roster packet
// has been recieved and processed.
boolean rosterInitialized = false;
@ -81,11 +86,11 @@ public class Roster {
private int subscriptionMode = getDefaultSubscriptionMode();
/**
* Returns the default subscription processing mode to use when a new Roster is created. The
* subscription processing mode dictates what action Smack will take when subscription
* requests from other users are made. The default subscription mode
* Returns the default subscription processing mode to use when a new Roster is created. The
* subscription processing mode dictates what action Smack will take when subscription
* requests from other users are made. The default subscription mode
* is {@link #SUBSCRIPTION_ACCEPT_ALL}.
*
*
* @return the default subscription mode to use for new Rosters
*/
public static int getDefaultSubscriptionMode() {
@ -93,9 +98,9 @@ public class Roster {
}
/**
* Sets the default subscription processing mode to use when a new Roster is created. The
* subscription processing mode dictates what action Smack will take when subscription
* requests from other users are made. The default subscription mode
* Sets the default subscription processing mode to use when a new Roster is created. The
* subscription processing mode dictates what action Smack will take when subscription
* requests from other users are made. The default subscription mode
* is {@link #SUBSCRIPTION_ACCEPT_ALL}.
*
* @param subscriptionMode the default subscription mode to use for new Rosters.
@ -112,10 +117,10 @@ public class Roster {
Roster(final XMPPConnection connection) {
this.connection = connection;
groups = new ConcurrentHashMap<String,RosterGroup>();
unfiledEntries = new ArrayList();
entries = new ArrayList();
unfiledEntries = new ArrayList<RosterEntry>();
entries = new ArrayList<RosterEntry>();
rosterListeners = new ArrayList<RosterListener>();
presenceMap = new HashMap();
presenceMap = new HashMap<String, Map<String, Presence>>();
// Listen for any roster packets.
PacketFilter rosterFilter = new PacketTypeFilter(RosterPacket.class);
connection.addPacketListener(new RosterPacketListener(), rosterFilter);
@ -230,9 +235,9 @@ public class Roster {
rosterPacket.setType(IQ.Type.SET);
RosterPacket.Item item = new RosterPacket.Item(user, name);
if (groups != null) {
for (int i=0; i<groups.length; i++) {
if (groups[i] != null) {
item.addGroupName(groups[i]);
for (String group : groups) {
if (group != null) {
item.addGroupName(group);
}
}
}
@ -258,7 +263,7 @@ public class Roster {
}
/**
* Removes a roster entry from the roster. The roster entry will also be removed from the
* Removes a roster entry from the roster. The roster entry will also be removed from the
* unfiled entries or from any roster group where it could belong and will no longer be part
* of the roster. Note that this is an asynchronous call -- Smack must wait for the server
* to send an updated subscription status.
@ -342,9 +347,10 @@ public class Roster {
*
* @return an iterator the unfiled roster entries.
*/
public Iterator getUnfiledEntries() {
public Iterator<RosterEntry> getUnfiledEntries() {
synchronized (unfiledEntries) {
return Collections.unmodifiableList(new ArrayList(unfiledEntries)).iterator();
return Collections.unmodifiableList(new ArrayList<RosterEntry>(unfiledEntries))
.iterator();
}
}
@ -362,8 +368,7 @@ public class Roster {
}
String userLowerCase = user.toLowerCase();
synchronized (entries) {
for (Iterator i=entries.iterator(); i.hasNext(); ) {
RosterEntry entry = (RosterEntry)i.next();
for (RosterEntry entry : entries) {
if (entry.getUser().equals(userLowerCase)) {
return entry;
}
@ -435,19 +440,19 @@ public class Roster {
*/
public Presence getPresence(String user) {
String key = getPresenceMapKey(user);
Map userPresences = (Map) presenceMap.get(key);
Map<String, Presence> userPresences = presenceMap.get(key);
if (userPresences == null) {
return null;
}
else {
// Find the resource with the highest priority
// Might be changed to use the resource with the highest availability instead.
Iterator it = userPresences.keySet().iterator();
Iterator<String> it = userPresences.keySet().iterator();
Presence p;
Presence presence = null;
while (it.hasNext()) {
p = (Presence) userPresences.get(it.next());
p = userPresences.get(it.next());
if (presence == null) {
presence = p;
}
@ -473,12 +478,12 @@ public class Roster {
public Presence getPresenceResource(String userResource) {
String key = getPresenceMapKey(userResource);
String resource = StringUtils.parseResource(userResource);
Map userPresences = (Map)presenceMap.get(key);
Map<String, Presence> userPresences = presenceMap.get(key);
if (userPresences == null) {
return null;
}
else {
return (Presence) userPresences.get(resource);
return userPresences.get(resource);
}
}
@ -492,15 +497,15 @@ public class Roster {
* or <tt>null</tt> if the user is unavailable or if no presence information
* is available.
*/
public Iterator getPresences(String user) {
public Iterator<Presence> getPresences(String user) {
String key = getPresenceMapKey(user);
Map userPresences = (Map)presenceMap.get(key);
Map<String, Presence> userPresences = presenceMap.get(key);
if (userPresences == null) {
return null;
}
else {
synchronized (userPresences) {
return new HashMap(userPresences).values().iterator();
return new HashMap<String, Presence>(userPresences).values().iterator();
}
}
}
@ -543,15 +548,15 @@ public class Roster {
listeners = new RosterListener[rosterListeners.size()];
rosterListeners.toArray(listeners);
}
for (int i=0; i<listeners.length; i++) {
for (RosterListener listener : listeners) {
if (!addedEntries.isEmpty()) {
listeners[i].entriesAdded(addedEntries);
listener.entriesAdded(addedEntries);
}
if (!updatedEntries.isEmpty()) {
listeners[i].entriesUpdated(updatedEntries);
listener.entriesUpdated(updatedEntries);
}
if (!deletedEntries.isEmpty()) {
listeners[i].entriesDeleted(deletedEntries);
listener.entriesDeleted(deletedEntries);
}
}
}
@ -565,8 +570,8 @@ public class Roster {
listeners = new RosterListener[rosterListeners.size()];
rosterListeners.toArray(listeners);
}
for (int i=0; i<listeners.length; i++) {
listeners[i].presenceChanged(user);
for (RosterListener listener : listeners) {
listener.presenceChanged(user);
}
}
@ -582,14 +587,14 @@ public class Roster {
// If an "available" packet, add it to the presence map. Each presence map will hold
// for a particular user a map with the presence packets saved for each resource.
if (presence.getType() == Presence.Type.available) {
Map userPresences;
Map<String, Presence> userPresences;
// Get the user presence map
if (presenceMap.get(key) == null) {
userPresences = new HashMap();
userPresences = new HashMap<String, Presence>();
presenceMap.put(key, userPresences);
}
else {
userPresences = (Map)presenceMap.get(key);
userPresences = presenceMap.get(key);
}
// Add the new presence, using the resources as a key.
synchronized (userPresences) {
@ -597,8 +602,7 @@ public class Roster {
}
// If the user is in the roster, fire an event.
synchronized (entries) {
for (Iterator i = entries.iterator(); i.hasNext();) {
RosterEntry entry = (RosterEntry) i.next();
for (RosterEntry entry : entries) {
if (entry.getUser().equals(key)) {
fireRosterPresenceEvent(from);
}
@ -608,7 +612,7 @@ public class Roster {
// If an "unavailable" packet, remove any entries in the presence map.
else if (presence.getType() == Presence.Type.unavailable) {
if (presenceMap.get(key) != null) {
Map userPresences = (Map) presenceMap.get(key);
Map<String, Presence> userPresences = presenceMap.get(key);
synchronized (userPresences) {
userPresences.remove(StringUtils.parseResource(from));
}
@ -618,8 +622,7 @@ public class Roster {
}
// If the user is in the roster, fire an event.
synchronized (entries) {
for (Iterator i=entries.iterator(); i.hasNext(); ) {
RosterEntry entry = (RosterEntry)i.next();
for (RosterEntry entry : entries) {
if (entry.getUser().equals(key)) {
fireRosterPresenceEvent(from);
}
@ -663,11 +666,11 @@ public class Roster {
public void processPacket(Packet packet) {
// Keep a registry of the entries that were added, deleted or updated. An event
// will be fired for each affected entry
Collection addedEntries = new ArrayList();
Collection updatedEntries = new ArrayList();
Collection deletedEntries = new ArrayList();
Collection<String> addedEntries = new ArrayList<String>();
Collection<String> updatedEntries = new ArrayList<String>();
Collection<String> deletedEntries = new ArrayList<String>();
RosterPacket rosterPacket = (RosterPacket)packet;
RosterPacket rosterPacket = (RosterPacket) packet;
for (RosterPacket.Item item : rosterPacket.getRosterItems()) {
RosterEntry entry = new RosterEntry(item.getUser(), item.getName(),
item.getItemType(), item.getItemStatus(), connection);
@ -701,8 +704,7 @@ public class Roster {
}
else {
// If the entry was in then list then update its state with the new values
RosterEntry existingEntry =
(RosterEntry) entries.get(entries.indexOf(entry));
RosterEntry existingEntry = entries.get(entries.indexOf(entry));
existingEntry
.updateState(entry.getName(), entry.getType(), entry.getStatus());
// Keep note that an entry has been updated
@ -752,15 +754,14 @@ public class Roster {
// We have the list of old and new group names. We now need to
// remove the entry from the all the groups it may no longer belong
// to. We do this by subracting the new group set from the old.
for (int m=0; m<newGroupNames.size(); m++) {
currentGroupNames.remove(newGroupNames.get(m));
for (String newGroupName : newGroupNames) {
currentGroupNames.remove(newGroupName);
}
}
// Loop through any groups that remain and remove the entries.
// This is neccessary for the case of remote entry removals.
for (int n=0; n<currentGroupNames.size(); n++) {
String groupName = (String)currentGroupNames.get(n);
for (String groupName : currentGroupNames) {
RosterGroup group = getGroup(groupName);
group.removeEntryLocal(entry);
if (group.getEntryCount() == 0) {

4
source/org/jivesoftware/smack/RosterEntry.java
View file

@ -20,8 +20,8 @@
package org.jivesoftware.smack;
import org.jivesoftware.smack.packet.RosterPacket;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.RosterPacket;
import java.util.*;
@ -146,7 +146,7 @@ public class RosterEntry {
}
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
if (name != null) {
buf.append(name).append(": ");
}

19
source/org/jivesoftware/smack/RosterGroup.java
View file

@ -20,12 +20,15 @@
package org.jivesoftware.smack;
import org.jivesoftware.smack.packet.RosterPacket;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.util.StringUtils;
import org.jivesoftware.smack.filter.PacketIDFilter;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.RosterPacket;
import org.jivesoftware.smack.util.StringUtils;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
/**
* A group of roster entries.
@ -37,7 +40,7 @@ public class RosterGroup {
private String name;
private XMPPConnection connection;
private List<RosterEntry> entries;
private final List<RosterEntry> entries;
/**
* Creates a new roster group instance.
@ -70,10 +73,9 @@ public class RosterGroup {
*/
public void setName(String name) {
synchronized (entries) {
for (int i=0; i<entries.size(); i++) {
for (RosterEntry entry : entries) {
RosterPacket packet = new RosterPacket();
packet.setType(IQ.Type.SET);
RosterEntry entry = (RosterEntry)entries.get(i);
RosterPacket.Item item = RosterEntry.toRosterItem(entry);
item.removeGroupName(this.name);
item.addGroupName(name);
@ -121,8 +123,7 @@ public class RosterGroup {
user = StringUtils.parseBareAddress(user);
String userLowerCase = user.toLowerCase();
synchronized (entries) {
for (Iterator i=entries.iterator(); i.hasNext(); ) {
RosterEntry entry = (RosterEntry)i.next();
for (RosterEntry entry : entries) {
if (entry.getUser().equals(userLowerCase)) {
return entry;
}

21
source/org/jivesoftware/smack/SASLAuthentication.java
View file

@ -59,11 +59,11 @@ import java.util.*;
*/
public class SASLAuthentication implements UserAuthentication {
private static Map implementedMechanisms = new HashMap();
private static List mechanismsPreferences = new ArrayList();
private static Map<String, Class> implementedMechanisms = new HashMap<String, Class>();
private static List<String> mechanismsPreferences = new ArrayList<String>();
private XMPPConnection connection;
private Collection serverMechanisms = new ArrayList();
private Collection<String> serverMechanisms = new ArrayList<String>();
private SASLMechanism currentMechanism = null;
/**
* Boolean indicating if SASL negotiation has finished and was successful.
@ -115,10 +115,10 @@ public class SASLAuthentication implements UserAuthentication {
*
* @return the registerd SASLMechanism classes sorted by the level of preference.
*/
public static List getRegisterSASLMechanisms() {
List answer = new ArrayList();
for (Iterator it = mechanismsPreferences.iterator(); it.hasNext();) {
answer.add(implementedMechanisms.get(it.next()));
public static List<Class> getRegisterSASLMechanisms() {
List<Class> answer = new ArrayList<Class>();
for (String mechanismsPreference : mechanismsPreferences) {
answer.add(implementedMechanisms.get(mechanismsPreference));
}
return answer;
}
@ -171,11 +171,10 @@ public class SASLAuthentication implements UserAuthentication {
throws XMPPException {
// Locate the SASLMechanism to use
Class selected = null;
for (Iterator it = mechanismsPreferences.iterator(); it.hasNext();) {
String mechanism = (String) it.next();
for (String mechanism : mechanismsPreferences) {
if (implementedMechanisms.containsKey(mechanism) &&
serverMechanisms.contains(mechanism)) {
selected = (Class) implementedMechanisms.get(mechanism);
selected = implementedMechanisms.get(mechanism);
break;
}
}
@ -339,7 +338,7 @@ public class SASLAuthentication implements UserAuthentication {
* @param mechanisms collection of strings with the available SASL mechanism reported
* by the server.
*/
void setAvailableSASLMethods(Collection mechanisms) {
void setAvailableSASLMethods(Collection<String> mechanisms) {
this.serverMechanisms = mechanisms;
}

9
source/org/jivesoftware/smack/SmackConfiguration.java
View file

@ -63,8 +63,8 @@ public final class SmackConfiguration {
try {
// Get an array of class loaders to try loading the providers files from.
ClassLoader[] classLoaders = getClassLoaders();
for (int i = 0; i < classLoaders.length; i++) {
Enumeration configEnum = classLoaders[i].getResources("META-INF/smack-config.xml");
for (ClassLoader classLoader : classLoaders) {
Enumeration configEnum = classLoader.getResources("META-INF/smack-config.xml");
while (configEnum.hasMoreElements()) {
URL url = (URL) configEnum.nextElement();
InputStream systemStream = null;
@ -81,7 +81,8 @@ public final class SmackConfiguration {
parseClassToLoad(parser);
}
else if (parser.getName().equals("packetReplyTimeout")) {
packetReplyTimeout = parseIntProperty(parser, packetReplyTimeout);
packetReplyTimeout =
parseIntProperty(parser, packetReplyTimeout);
}
else if (parser.getName().equals("keepAliveInterval")) {
keepAliveInterval = parseIntProperty(parser, keepAliveInterval);
@ -200,7 +201,7 @@ public final class SmackConfiguration {
*/
private static ClassLoader[] getClassLoaders() {
ClassLoader[] classLoaders = new ClassLoader[2];
classLoaders[0] = new SmackConfiguration().getClass().getClassLoader();
classLoaders[0] = SmackConfiguration.class.getClassLoader();
classLoaders[1] = Thread.currentThread().getContextClassLoader();
return classLoaders;
}

43
source/org/jivesoftware/smack/XMPPConnection.java
View file

@ -39,7 +39,11 @@ import java.lang.reflect.Constructor;
import java.lang.reflect.Method;
import java.net.Socket;
import java.net.UnknownHostException;
import java.util.*;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* Creates a connection to a XMPP server. A simple use of this API might
@ -73,7 +77,8 @@ public class XMPPConnection {
*/
public static boolean DEBUG_ENABLED = false;
private static List connectionEstablishedListeners = new ArrayList();
private final static List<ConnectionEstablishedListener> connectionEstablishedListeners =
new ArrayList<ConnectionEstablishedListener>();
static {
// Use try block since we may not have permission to get a system
@ -128,7 +133,7 @@ public class XMPPConnection {
* does not interfere with garbage collection. The map of chats must be stored
* with each connection.
*/
Map chats = Collections.synchronizedMap(new HashMap());
Map<String, WeakReference<Chat>> chats = new ConcurrentHashMap<String, WeakReference<Chat>>();
/**
* Collection of available stream compression methods offered by the server.
@ -289,7 +294,9 @@ public class XMPPConnection {
// constructor it cannot be modified
this.configuration = (ConnectionConfiguration) config.clone();
}
catch (CloneNotSupportedException e) {}
catch (CloneNotSupportedException e) {
// Do nothing
}
init();
}
@ -419,7 +426,7 @@ public class XMPPConnection {
// Do partial version of nameprep on the username.
username = username.toLowerCase().trim();
String response = null;
String response;
if (configuration.isSASLAuthenticationEnabled() &&
saslAuthentication.hasNonAnonymousAuthentication()) {
// Authenticate using SASL
@ -488,7 +495,7 @@ public class XMPPConnection {
throw new IllegalStateException("Already logged in to server.");
}
String response = null;
String response;
if (configuration.isSASLAuthenticationEnabled() &&
saslAuthentication.hasAnonymousAuthentication()) {
response = saslAuthentication.authenticateAnonymously();
@ -876,12 +883,12 @@ public class XMPPConnection {
if (message.getThread() == null &&
message.getType() != Message.Type.GROUP_CHAT &&
message.getType() != Message.Type.HEADLINE) {
WeakReference chatRef = (WeakReference)chats.get(
StringUtils.parseBareAddress(message.getFrom()));
WeakReference<Chat> chatRef =
chats.get(StringUtils.parseBareAddress(message.getFrom()));
if (chatRef != null) {
// Do some extra clean-up if the reference was cleared.
Chat chat;
if ((chat = (Chat)chatRef.get()) == null) {
Chat chat = chatRef.get();
if (chat == null) {
chats.remove(message.getFrom());
}
else {
@ -931,9 +938,9 @@ public class XMPPConnection {
}
else {
try {
Class zoClass = Class.forName("com.jcraft.jzlib.ZOutputStream");
Class<?> zoClass = Class.forName("com.jcraft.jzlib.ZOutputStream");
//ZOutputStream out = new ZOutputStream(socket.getOutputStream(), JZlib.Z_BEST_COMPRESSION);
Constructor constructor =
Constructor<?> constructor =
zoClass.getConstructor(new Class[]{OutputStream.class, Integer.TYPE});
Object out = constructor.newInstance(new Object[] {socket.getOutputStream(), new Integer(9)});
//out.setFlushMode(JZlib.Z_PARTIAL_FLUSH);
@ -941,7 +948,7 @@ public class XMPPConnection {
method.invoke(out, new Object[] {new Integer(1)});
writer = new BufferedWriter(new OutputStreamWriter((OutputStream) out, "UTF-8"));
Class ziClass = Class.forName("com.jcraft.jzlib.ZInputStream");
Class<?> ziClass = Class.forName("com.jcraft.jzlib.ZInputStream");
//ZInputStream in = new ZInputStream(socket.getInputStream());
constructor = ziClass.getConstructor(new Class[]{InputStream.class});
Object in = constructor.newInstance(new Object[] {socket.getInputStream()});
@ -976,7 +983,7 @@ public class XMPPConnection {
}
catch (Throwable t) {
}
Class debuggerClass = null;
Class<?> debuggerClass = null;
if (className != null) {
try {
debuggerClass = Class.forName(className);
@ -1002,7 +1009,7 @@ public class XMPPConnection {
// Create a new debugger instance. If an exception occurs then disable the debugging
// option
try {
Constructor constructor =
Constructor<?> constructor =
debuggerClass.getConstructor(
new Class[] { XMPPConnection.class, Writer.class, Reader.class });
debugger = (SmackDebugger) constructor
@ -1027,13 +1034,13 @@ public class XMPPConnection {
* Fires listeners on connection established events.
*/
private static void connectionEstablished(XMPPConnection connection) {
ConnectionEstablishedListener[] listeners = null;
ConnectionEstablishedListener[] listeners;
synchronized (connectionEstablishedListeners) {
listeners = new ConnectionEstablishedListener[connectionEstablishedListeners.size()];
connectionEstablishedListeners.toArray(listeners);
}
for (int i = 0; i < listeners.length; i++) {
listeners[i].connectionEstablished(connection);
for (ConnectionEstablishedListener listener : listeners) {
listener.connectionEstablished(connection);
}
}

4
source/org/jivesoftware/smack/XMPPException.java
View file

@ -20,8 +20,8 @@
package org.jivesoftware.smack;
import org.jivesoftware.smack.packet.XMPPError;
import org.jivesoftware.smack.packet.StreamError;
import org.jivesoftware.smack.packet.XMPPError;
import java.io.PrintStream;
import java.io.PrintWriter;
@ -199,7 +199,7 @@ public class XMPPException extends Exception {
}
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
String message = super.getMessage();
if (message != null) {
buf.append(message).append(": ");

2
source/org/jivesoftware/smack/packet/Authentication.java
View file

@ -146,7 +146,7 @@ public class Authentication extends IQ {
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<query xmlns=\"jabber:iq:auth\">");
if (username != null) {
if (username.equals("")) {

2
source/org/jivesoftware/smack/packet/Bind.java
View file

@ -57,7 +57,7 @@ public class Bind extends IQ {
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<bind xmlns=\"urn:ietf:params:xml:ns:xmpp-bind\">");
if (resource != null) {
buf.append("<resource>").append(resource).append("</resource>");

7
source/org/jivesoftware/smack/packet/DefaultPacketExtension.java
View file

@ -20,7 +20,10 @@
package org.jivesoftware.smack.packet;
import java.util.*;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
/**
* Default implementation of the PacketExtension interface. Unless a PacketExtensionProvider
@ -80,7 +83,7 @@ public class DefaultPacketExtension implements PacketExtension {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<").append(elementName).append(" xmlns=\"").append(namespace).append("\">");
for (Iterator i=getNames(); i.hasNext(); ) {
String name = (String)i.next();

2
source/org/jivesoftware/smack/packet/IQ.java
View file

@ -67,7 +67,7 @@ public abstract class IQ extends Packet {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<iq ");
if (getPacketID() != null) {
buf.append("id=\"" + getPacketID() + "\" ");

2
source/org/jivesoftware/smack/packet/Message.java
View file

@ -165,7 +165,7 @@ public class Message extends Packet {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<message");
if (getPacketID() != null) {
buf.append(" id=\"").append(getPacketID()).append("\"");

6
source/org/jivesoftware/smack/packet/Packet.java
View file

@ -22,8 +22,10 @@ package org.jivesoftware.smack.packet;
import org.jivesoftware.smack.util.StringUtils;
import java.io.ByteArrayOutputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;
import java.util.*;
import java.io.*;
/**
* Base class for XMPP packets. Every packet has a unique ID (which is automatically
@ -351,7 +353,7 @@ public abstract class Packet {
* are no packet extensions.
*/
protected synchronized String getExtensionsXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
// Add in all standard extension sub-packets.
Iterator extensions = getExtensions();
while (extensions.hasNext()) {

4
source/org/jivesoftware/smack/packet/Presence.java
View file

@ -169,7 +169,7 @@ public class Presence extends Packet {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<presence");
if (getPacketID() != null) {
buf.append(" id=\"").append(getPacketID()).append("\"");
@ -208,7 +208,7 @@ public class Presence extends Packet {
}
public String toString() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append(type);
if (mode != null) {
buf.append(": ").append(mode);

15
source/org/jivesoftware/smack/packet/Registration.java
View file

@ -21,7 +21,6 @@
package org.jivesoftware.smack.packet;
import java.util.Map;
import java.util.Iterator;
/**
* Represents registration packets. An empty GET query will cause the server to return information
@ -49,7 +48,7 @@ import java.util.Iterator;
public class Registration extends IQ {
private String instructions = null;
private Map attributes = null;
private Map<String, String> attributes = null;
/**
* Returns the registration instructions, or <tt>null</tt> if no instructions
@ -76,7 +75,7 @@ public class Registration extends IQ {
*
* @return the account attributes.
*/
public Map getAttributes() {
public Map<String, String> getAttributes() {
return attributes;
}
@ -85,21 +84,19 @@ public class Registration extends IQ {
*
* @param attributes the account attributes.
*/
public void setAttributes(Map attributes) {
public void setAttributes(Map<String, String> attributes) {
this.attributes = attributes;
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<query xmlns=\"jabber:iq:register\">");
if (instructions != null) {
buf.append("<instructions>").append(instructions).append("</instructions>");
}
if (attributes != null && attributes.size() > 0) {
Iterator fieldNames = attributes.keySet().iterator();
while (fieldNames.hasNext()) {
String name = (String)fieldNames.next();
String value = (String)attributes.get(name);
for (String name : attributes.keySet()) {
String value = attributes.get(name);
buf.append("<").append(name).append(">");
buf.append(value);
buf.append("</").append(name).append(">");

4
source/org/jivesoftware/smack/packet/RosterPacket.java
View file

@ -68,7 +68,7 @@ public class RosterPacket extends IQ {
}
public String getChildElementXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<query xmlns=\"jabber:iq:roster\">");
synchronized (rosterItems) {
for (Item entry : rosterItems) {
@ -197,7 +197,7 @@ public class RosterPacket extends IQ {
}
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<item jid=\"").append(user).append("\"");
if (name != null) {
buf.append(" name=\"").append(name).append("\"");

2
source/org/jivesoftware/smack/packet/StreamError.java
View file

@ -99,7 +99,7 @@ public class StreamError {
}
public String toString() {
StringBuffer txt = new StringBuffer();
StringBuilder txt = new StringBuilder();
txt.append("stream:error (").append(code).append(")");
return txt.toString();
}

4
source/org/jivesoftware/smack/packet/XMPPError.java
View file

@ -97,7 +97,7 @@ public class XMPPError {
* @return the error as XML.
*/
public String toXML() {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<error code=\"").append(code).append("\">");
if (message != null) {
buf.append(message);
@ -107,7 +107,7 @@ public class XMPPError {
}
public String toString() {
StringBuffer txt = new StringBuffer();
StringBuilder txt = new StringBuilder();
txt.append("(").append(code).append(")");
if (message != null) {
txt.append(" ").append(message);

31
source/org/jivesoftware/smack/provider/ProviderManager.java
View file

@ -22,11 +22,12 @@ package org.jivesoftware.smack.provider;
import org.jivesoftware.smack.packet.IQ;
import org.jivesoftware.smack.packet.PacketExtension;
import org.xmlpull.v1.*;
import org.xmlpull.mxp1.MXParser;
import org.xmlpull.v1.XmlPullParser;
import java.util.*;
import java.io.InputStream;
import java.net.URL;
import java.util.*;
/**
* Manages providers for parsing custom XML sub-documents of XMPP packets. Two types of
@ -117,12 +118,12 @@ public class ProviderManager {
try {
// Get an array of class loaders to try loading the providers files from.
ClassLoader[] classLoaders = getClassLoaders();
for (int i=0; i<classLoaders.length; i++) {
Enumeration providerEnum = classLoaders[i].getResources(
for (ClassLoader classLoader : classLoaders) {
Enumeration providerEnum = classLoader.getResources(
"META-INF/smack.providers");
while (providerEnum.hasMoreElements()) {
URL url = (URL)providerEnum.nextElement();
java.io.InputStream providerStream = null;
URL url = (URL) providerEnum.nextElement();
InputStream providerStream = null;
try {
providerStream = url.openStream();
XmlPullParser parser = new MXParser();
@ -187,13 +188,11 @@ public class ProviderManager {
// Add the provider to the map.
Class provider = Class.forName(className);
if (PacketExtensionProvider.class.isAssignableFrom(
provider))
{
provider)) {
extensionProviders.put(key, provider.newInstance());
}
else if (PacketExtension.class.isAssignableFrom(
provider))
{
provider)) {
extensionProviders.put(key, provider);
}
}
@ -204,11 +203,15 @@ public class ProviderManager {
}
}
eventType = parser.next();
} while (eventType != XmlPullParser.END_DOCUMENT);
}
while (eventType != XmlPullParser.END_DOCUMENT);
}
finally {
try { providerStream.close(); }
catch (Exception e) { }
try {
providerStream.close();
}
catch (Exception e) {
}
}
}
}
@ -362,7 +365,7 @@ public class ProviderManager {
* @return a unique key for the element name and namespace pair.
*/
private static String getProviderKey(String elementName, String namespace) {
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
buf.append("<").append(elementName).append("/><").append(namespace).append("/>");
return buf.toString();
}

4
source/org/jivesoftware/smack/sasl/SASLMechanism.java
View file

@ -55,7 +55,7 @@ public abstract class SASLMechanism {
*/
public void authenticate(String username, String host, String password) throws IOException {
// Build the authentication stanza encoding the authentication text
StringBuffer stanza = new StringBuffer();
StringBuilder stanza = new StringBuilder();
stanza.append("<auth mechanism=\"").append(getName());
stanza.append("\" xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
String authenticationText = getAuthenticationText(username, host, password);
@ -76,7 +76,7 @@ public abstract class SASLMechanism {
*/
public void challengeReceived(String challenge) throws IOException {
// Build the challenge response stanza encoding the response text
StringBuffer stanza = new StringBuffer();
StringBuilder stanza = new StringBuilder();
stanza.append("<response xmlns=\"urn:ietf:params:xml:ns:xmpp-sasl\">");
String authenticationText = getChallengeResponse(StringUtils.decodeBase64(challenge));
if (authenticationText != null) {

2
source/org/jivesoftware/smack/sasl/SASLPlainMechanism.java
View file

@ -42,7 +42,7 @@ public class SASLPlainMechanism extends SASLMechanism {
protected String getAuthenticationText(String username, String host, String password) {
// Build the text containing the "authorization identity" + NUL char +
// "authentication identity" + NUL char + "clear-text password"
StringBuffer text = new StringBuffer();
StringBuilder text = new StringBuilder();
text.append(username).append("@").append(host);
text.append('\0');
text.append(username);

2
source/org/jivesoftware/smack/util/Cache.java
View file

@ -549,7 +549,7 @@ public class Cache implements Map {
*/
public String toString() {
LinkedListNode node = head.next;
StringBuffer buf = new StringBuffer();
StringBuilder buf = new StringBuilder();
while (node != head) {
buf.append(node.toString()).append(", ");
node = node.next;

12
source/org/jivesoftware/smack/util/StringUtils.java
View file

@ -20,9 +20,9 @@
package org.jivesoftware.smack.util;
import java.io.UnsupportedEncodingException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.io.UnsupportedEncodingException;
import java.util.Random;
/**
@ -143,7 +143,7 @@ public class StringUtils {
int last=0;
char[] input = string.toCharArray();
int len = input.length;
StringBuffer out = new StringBuffer((int)(len*1.3));
StringBuilder out = new StringBuilder((int)(len*1.3));
for (; i < len; i++) {
ch = input[i];
if (ch > '>') {
@ -243,13 +243,13 @@ public class StringUtils {
* @return generated hex string.
*/
public static String encodeHex(byte[] bytes) {
StringBuffer hex = new StringBuffer(bytes.length * 2);
StringBuilder hex = new StringBuilder(bytes.length * 2);
for (int i=0; i<bytes.length; i++) {
if (((int) bytes[i] & 0xff) < 0x10) {
for (byte aByte : bytes) {
if (((int) aByte & 0xff) < 0x10) {
hex.append("0");
}
hex.append(Integer.toString((int) bytes[i] & 0xff, 16));
hex.append(Integer.toString((int) aByte & 0xff, 16));
}
return hex.toString();