diff --git a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java index fb6c8f4a7..d203aa097 100644 --- a/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java +++ b/smack-android-extensions/src/main/java/org/jivesoftware/smackx/ping/android/ServerPingWithAlarmManager.java @@ -17,7 +17,6 @@ package org.jivesoftware.smackx.ping.android; -import java.util.Collections; import java.util.Iterator; import java.util.Map; import java.util.WeakHashMap; @@ -67,8 +66,7 @@ public class ServerPingWithAlarmManager extends Manager { private static final String PING_ALARM_ACTION = "org.igniterealtime.smackx.ping.ACTION"; - private static final Map INSTANCES = Collections - .synchronizedMap(new WeakHashMap()); + private static final Map INSTANCES = new WeakHashMap(); static { XMPPConnectionRegistry.addConnectionCreationListener(new ConnectionCreationListener() { diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java index eaff2d4a9..13957cf43 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/caps/EntityCapsManager.java @@ -47,7 +47,6 @@ import org.jivesoftware.smackx.xdata.FormField; import org.jivesoftware.smackx.xdata.packet.DataForm; import org.jxmpp.util.cache.LruCache; -import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.LinkedList; @@ -89,8 +88,7 @@ public class EntityCapsManager extends Manager { private static boolean autoEnableEntityCaps = true; - private static Map instances = Collections - .synchronizedMap(new WeakHashMap()); + private static Map instances = new WeakHashMap<>(); private static final PacketFilter PRESENCES_WITH_CAPS = new AndFilter(new PacketTypeFilter(Presence.class), new PacketExtensionFilter( ELEMENT, NAMESPACE)); diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java index b96332188..3cc1648f6 100755 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/commands/AdHocCommandManager.java @@ -19,7 +19,6 @@ package org.jivesoftware.smackx.commands; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.WeakHashMap; @@ -71,8 +70,7 @@ public class AdHocCommandManager extends Manager { * Map a XMPPConnection with it AdHocCommandManager. This map have a key-value * pair for every active connection. */ - private static Map instances = - Collections.synchronizedMap(new WeakHashMap()); + private static Map instances = new WeakHashMap<>(); /** * Register the listener for all the connection creations. When a new @@ -96,7 +94,10 @@ public class AdHocCommandManager extends Manager { */ public static synchronized AdHocCommandManager getAddHocCommandsManager(XMPPConnection connection) { AdHocCommandManager ahcm = instances.get(connection); - if (ahcm == null) ahcm = new AdHocCommandManager(connection); + if (ahcm == null) { + ahcm = new AdHocCommandManager(connection); + instances.put(connection, ahcm); + } return ahcm; } @@ -125,9 +126,6 @@ public class AdHocCommandManager extends Manager { private AdHocCommandManager(XMPPConnection connection) { super(connection); this.serviceDiscoveryManager = ServiceDiscoveryManager.getInstanceFor(connection); - - // Register the new instance and associate it with the connection - instances.put(connection, this); // Add the feature to the service discovery manage to show that this // connection supports the AdHoc-Commands protocol. diff --git a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java index 0f7b96871..59cb67acf 100644 --- a/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java +++ b/smack-extensions/src/main/java/org/jivesoftware/smackx/disco/ServiceDiscoveryManager.java @@ -82,8 +82,7 @@ public class ServiceDiscoveryManager extends Manager { private EntityCapsManager capsManager; - private static Map instances = - Collections.synchronizedMap(new WeakHashMap()); + private static Map instances = new WeakHashMap<>(); private final Set features = new HashSet(); private DataForm extendedInfo = null; diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java index c3592b88f..14f8b9d13 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xevent/MessageEventManager.java @@ -18,7 +18,6 @@ package org.jivesoftware.smackx.xevent; import java.lang.reflect.Method; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.WeakHashMap; @@ -51,8 +50,7 @@ import org.jivesoftware.smackx.xevent.packet.MessageEvent; public class MessageEventManager extends Manager { private static final Logger LOGGER = Logger.getLogger(MessageEventManager.class.getName()); - private static final Map INSTANCES = Collections - .synchronizedMap(new WeakHashMap()); + private static final Map INSTANCES = new WeakHashMap<>(); private static final PacketFilter PACKET_FILTER = new AndFilter(new PacketExtensionFilter( new MessageEvent()), new NotFilter(MessageTypeFilter.ERROR)); @@ -64,6 +62,7 @@ public class MessageEventManager extends Manager { MessageEventManager messageEventManager = INSTANCES.get(connection); if (messageEventManager == null) { messageEventManager = new MessageEventManager(connection); + INSTANCES.put(connection, messageEventManager); } return messageEventManager; } @@ -97,7 +96,6 @@ public class MessageEventManager extends Manager { eventType.concat("Notification")); } }, PACKET_FILTER); - INSTANCES.put(connection, this); } /** diff --git a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java index da1df08c0..b4daaf764 100644 --- a/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java +++ b/smack-legacy/src/main/java/org/jivesoftware/smackx/xroster/RosterExchangeManager.java @@ -50,8 +50,7 @@ public class RosterExchangeManager { public final static String NAMESPACE = "jabber:x:roster"; public final static String ELEMENT = "x"; - private final static Map INSTANCES = - Collections.synchronizedMap(new WeakHashMap()); + private final static Map INSTANCES = new WeakHashMap<>(); private final static PacketFilter PACKET_FILTER = new PacketExtensionFilter(ELEMENT, NAMESPACE); @@ -64,6 +63,7 @@ public class RosterExchangeManager { RosterExchangeManager rosterExchangeManager = INSTANCES.get(connection); if (rosterExchangeManager == null) { rosterExchangeManager = new RosterExchangeManager(connection); + INSTANCES.put(connection, rosterExchangeManager); } return rosterExchangeManager; }