zhdev/bukman
1
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Use Collection instead of List

Browse source
This commit is contained in:
Roman Zhuravlev 2025-09-20 01:33:23 +05:00
parent 864839a96b
commit e820028143
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Common/src/main/java/net/frankheijden/serverutils/common/managers/AbstractPluginManager.java
View file

@ -39,7 +39,7 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
* Loads a list of files as plugins. * Loads a list of files as plugins.
*/ */
public PluginResults<P> loadPlugins(List<File> files) { public PluginResults<P> loadPlugins(List<File> files) {
List<D> descriptions = new ArrayList<>(files.size()); Set<D> descriptions = new HashSet<>(files.size());
for (File file : files) { for (File file : files) {
D description; D description;
@ -117,7 +117,7 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
* Finds the first plugin where the enabled state does not match the given state it must be in. * Finds the first plugin where the enabled state does not match the given state it must be in.
* This method can be overridden by implementations which don't support the enabled state. * This method can be overridden by implementations which don't support the enabled state.
*/ */
protected Optional<P> checkPluginStates(List<P> plugins, boolean enabled) { protected Optional<P> checkPluginStates(Collection<P> plugins, boolean enabled) {
for (P plugin : plugins) { for (P plugin : plugins) {
if (isPluginEnabled(plugin) != enabled) { if (isPluginEnabled(plugin) != enabled) {
return Optional.of(plugin); return Optional.of(plugin);
@ -142,7 +142,7 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
/** /**
* Disables a list of plugins. * Disables a list of plugins.
*/ */
public PluginResults<P> disablePlugins(List<P> plugins) { public PluginResults<P> disablePlugins(Collection<P> plugins) {
Optional<P> pluginOptional = checkPluginStates(plugins, true); Optional<P> pluginOptional = checkPluginStates(plugins, true);
if (pluginOptional.isPresent()) { if (pluginOptional.isPresent()) {
return new PluginResults<P>().addResult(getPluginId(pluginOptional.get()), Result.ALREADY_DISABLED); return new PluginResults<P>().addResult(getPluginId(pluginOptional.get()), Result.ALREADY_DISABLED);
@ -235,7 +235,7 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
/** /**
* Unloads a list of plugins. * Unloads a list of plugins.
*/ */
public CloseablePluginResults<P> unloadPlugins(List<P> plugins) { public CloseablePluginResults<P> unloadPlugins(Collection<P> plugins) {
List<P> orderedPlugins; List<P> orderedPlugins;
try { try {
orderedPlugins = determineLoadOrder(plugins); orderedPlugins = determineLoadOrder(plugins);
@ -259,7 +259,7 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
/** /**
* Determines the load order of a list of plugins. * Determines the load order of a list of plugins.
*/ */
public List<P> determineLoadOrder(List<P> plugins) throws IllegalStateException { public List<P> determineLoadOrder(Collection<P> plugins) throws IllegalStateException {
Map<D, P> descriptionMap = new HashMap<>(plugins.size()); Map<D, P> descriptionMap = new HashMap<>(plugins.size());
for (P plugin : plugins) { for (P plugin : plugins) {
descriptionMap.put(getLoadedPluginDescription(plugin), plugin); descriptionMap.put(getLoadedPluginDescription(plugin), plugin);
@ -276,7 +276,7 @@ public abstract class AbstractPluginManager<P, D extends ServerUtilsPluginDescri
* Determines the load order for a given collection of descriptions. * Determines the load order for a given collection of descriptions.
* @throws IllegalStateException Iff circular dependency * @throws IllegalStateException Iff circular dependency
*/ */
public List<D> determineLoadOrder(Collection<? extends D> descriptions) throws IllegalStateException { public List<D> determineLoadOrder(Set<? extends D> descriptions) throws IllegalStateException {
Map<String, D> pluginIdToDescriptionMap = new HashMap<>(); Map<String, D> pluginIdToDescriptionMap = new HashMap<>();
for (D description : descriptions) { for (D description : descriptions) {
pluginIdToDescriptionMap.put(description.getId(), description); pluginIdToDescriptionMap.put(description.getId(), description);