PandacubeFr/BungeeCord
1
0
Fork 0
Code Releases Activity

#3882: Reduce lock boilerplate by using lomboks @Locked

Browse Source
This commit is contained in:
Outfluencer
2025-09-26 10:03:05 +10:00
committed by md_5
parent 4c02676b7a
commit d37a430f5a
3 changed files with 49 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java
View File

@@ -30,6 +30,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.logging.Level;
import lombok.Locked;
import lombok.RequiredArgsConstructor;
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.CommandSender;
@@ -98,21 +99,15 @@ public final class PluginManager
* @param plugin the plugin owning this command
* @param command the command to register
*/
@Locked.Write("commandsLock")
public void registerCommand(Plugin plugin, Command command)
{
commandsLock.writeLock().lock();
try
commandMap.put( command.getName().toLowerCase( Locale.ROOT ), command );
for ( String alias : command.getAliases() )
{
commandMap.put( command.getName().toLowerCase( Locale.ROOT ), command );
for ( String alias : command.getAliases() )
{
commandMap.put( alias.toLowerCase( Locale.ROOT ), command );
}
commandsByPlugin.put( plugin, command );
} finally
{
commandsLock.writeLock().unlock();
commandMap.put( alias.toLowerCase( Locale.ROOT ), command );
}
commandsByPlugin.put( plugin, command );
}
/**
@@ -120,17 +115,11 @@ public final class PluginManager
*
* @param command the command to unregister
*/
@Locked.Write("commandsLock")
public void unregisterCommand(Command command)
{
commandsLock.writeLock().lock();
try
{
while ( commandMap.values().remove( command ) );
commandsByPlugin.values().remove( command );
} finally
{
commandsLock.writeLock().unlock();
}
while ( commandMap.values().remove( command ) );
commandsByPlugin.values().remove( command );
}
/**
@@ -138,20 +127,14 @@ public final class PluginManager
*
* @param plugin the plugin to register the commands of
*/
@Locked.Write("commandsLock")
public void unregisterCommands(Plugin plugin)
{
commandsLock.writeLock().lock();
try
for ( Iterator<Command> it = commandsByPlugin.get( plugin ).iterator(); it.hasNext(); )
{
for ( Iterator<Command> it = commandsByPlugin.get( plugin ).iterator(); it.hasNext(); )
{
Command command = it.next();
while ( commandMap.values().remove( command ) );
it.remove();
}
} finally
{
commandsLock.writeLock().unlock();
Command command = it.next();
while ( commandMap.values().remove( command ) );
it.remove();
}
}
@@ -467,21 +450,15 @@ public final class PluginManager
* @param plugin the owning plugin
* @param listener the listener to register events for
*/
@Locked("listenersLock")
public void registerListener(Plugin plugin, Listener listener)
{
listenersLock.lock();
try
for ( Method method : listener.getClass().getDeclaredMethods() )
{
for ( Method method : listener.getClass().getDeclaredMethods() )
{
Preconditions.checkArgument( !method.isAnnotationPresent( Subscribe.class ), "Listener %s has registered using deprecated subscribe annotation! Please update to @EventHandler.", listener );
}
eventBus.register( listener );
listenersByPlugin.put( plugin, listener );
} finally
{
listenersLock.unlock();
Preconditions.checkArgument( !method.isAnnotationPresent( Subscribe.class ), "Listener %s has registered using deprecated subscribe annotation! Please update to @EventHandler.", listener );
}
eventBus.register( listener );
listenersByPlugin.put( plugin, listener );
}
/**
@@ -489,17 +466,11 @@ public final class PluginManager
*
* @param listener the listener to unregister
*/
@Locked("listenersLock")
public void unregisterListener(Listener listener)
{
listenersLock.lock();
try
{
eventBus.unregister( listener );
listenersByPlugin.values().remove( listener );
} finally
{
listenersLock.unlock();
}
eventBus.unregister( listener );
listenersByPlugin.values().remove( listener );
}
/**
@@ -507,19 +478,13 @@ public final class PluginManager
*
* @param plugin target plugin
*/
@Locked("listenersLock")
public void unregisterListeners(Plugin plugin)
{
listenersLock.lock();
try
for ( Iterator<Listener> it = listenersByPlugin.get( plugin ).iterator(); it.hasNext(); )
{
for ( Iterator<Listener> it = listenersByPlugin.get( plugin ).iterator(); it.hasNext(); )
{
eventBus.unregister( it.next() );
it.remove();
}
} finally
{
listenersLock.unlock();
eventBus.unregister( it.next() );
it.remove();
}
}
@@ -528,16 +493,10 @@ public final class PluginManager
*
* @return commands
*/
@Locked.Read("commandsLock")
public Collection<Map.Entry<String, Command>> getCommands()
{
commandsLock.readLock().lock();
try
{
return Collections.unmodifiableCollection( commandMap.entrySet() );
} finally
{
commandsLock.readLock().unlock();
}
return Collections.unmodifiableCollection( commandMap.entrySet() );
}
boolean isTransitiveDepend(PluginDescription plugin, PluginDescription depend)