From 7fcc62067b76a51a7c0f14d1d018ff11075a939e Mon Sep 17 00:00:00 2001 From: 2008Choco Date: Mon, 7 Jul 2025 20:48:37 +1000 Subject: [PATCH] #3858: Replace pre-Java 8 functional interface instantiation in CommandServer --- .../module/cmd/server/CommandServer.java | 26 ++++--------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java index 59c104d3..f479a888 100644 --- a/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java +++ b/module/cmd-server/src/main/java/net/md_5/bungee/module/cmd/server/CommandServer.java @@ -1,9 +1,5 @@ package net.md_5.bungee.module.cmd.server; -import com.google.common.base.Function; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; -import java.util.Collections; import java.util.Locale; import java.util.Map; import net.md_5.bungee.api.CommandSender; @@ -83,22 +79,10 @@ public class CommandServer extends Command implements TabExecutor @Override public Iterable onTabComplete(final CommandSender sender, final String[] args) { - return ( args.length > 1 ) ? Collections.EMPTY_LIST : Iterables.transform( Iterables.filter( ProxyServer.getInstance().getServers().values(), new Predicate() - { - private final String lower = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT ); - - @Override - public boolean apply(ServerInfo input) - { - return input.getName().toLowerCase( Locale.ROOT ).startsWith( lower ) && input.canAccess( sender ); - } - } ), new Function() - { - @Override - public String apply(ServerInfo input) - { - return input.getName(); - } - } ); + final String serverFilter = ( args.length == 0 ) ? "" : args[0].toLowerCase( Locale.ROOT ); + return () -> ProxyServer.getInstance().getServers().values().stream() + .filter( serverInfo -> serverInfo.getName().toLowerCase( Locale.ROOT ).startsWith( serverFilter ) && serverInfo.canAccess( sender ) ) + .map( ServerInfo::getName ) + .iterator(); } }