Skip to content

Commit 6ed9007

Browse files
committed
Remove redundant Function
1 parent f1a3360 commit 6ed9007

2 files changed

Lines changed: 12 additions & 16 deletions

File tree

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/internal/CraftBukkitReflection.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import java.lang.reflect.Field;
3333
import java.lang.reflect.Method;
3434
import java.util.Arrays;
35-
import java.util.function.Function;
3635
import java.util.function.Supplier;
3736
import java.util.stream.Stream;
3837

@@ -68,7 +67,7 @@ public final class CraftBukkitReflection {
6867

6968
@SafeVarargs
7069
public static <T> @Nullable T firstNonNullOrNull(
71-
final @Nullable T @NonNull... elements
70+
final @Nullable T @NonNull ... elements
7271
) {
7372
for (final T element : elements) {
7473
if (element != null) {
@@ -82,7 +81,7 @@ public final class CraftBukkitReflection {
8281
@SuppressWarnings("varargs")
8382
public static <T> @NonNull T firstNonNullOrThrow(
8483
final @NonNull Supplier<@NonNull String> errorMessage,
85-
final @Nullable T @NonNull... elements
84+
final @Nullable T @NonNull ... elements
8685
) {
8786
final @Nullable T t = firstNonNullOrNull(elements);
8887
if (t == null) {
@@ -205,11 +204,8 @@ public static boolean classExists(final @NonNull String className) {
205204
}
206205
}
207206

208-
public static <T> T streamMethods(
209-
final @NonNull Class<?> clazz,
210-
final @NonNull Function<Stream<Method>, T> function
211-
) {
212-
return function.apply(Arrays.stream(clazz.getDeclaredMethods()));
207+
public static Stream<Method> streamMethods(final @NonNull Class<?> clazz) {
208+
return Arrays.stream(clazz.getDeclaredMethods());
213209
}
214210

215211
private CraftBukkitReflection() {

cloud-minecraft/cloud-bukkit/src/main/java/cloud/commandframework/bukkit/parsers/BlockPredicateArgument.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -203,18 +203,18 @@ public static final class Parser<C> implements ArgumentParser<C, BlockPredicate>
203203
CraftBukkitReflection.findMethod(ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS, "create", TAG_CONTAINER_CLASS),
204204
CraftBukkitReflection.findMethod(ARGUMENT_BLOCK_PREDICATE_RESULT_CLASS, "a", TAG_CONTAINER_CLASS)
205205
);
206-
private static final Method GET_SERVER_METHOD = CraftBukkitReflection.streamMethods(
207-
COMMAND_LISTENER_WRAPPER_CLASS,
208-
stream -> stream.filter(it -> it.getReturnType().equals(MINECRAFT_SERVER_CLASS) && it.getParameterCount() == 0)
209-
.findFirst().orElseThrow(() -> new IllegalStateException("Could not find CommandSourceStack#getServer."))
210-
);
206+
private static final Method GET_SERVER_METHOD = CraftBukkitReflection.streamMethods(COMMAND_LISTENER_WRAPPER_CLASS)
207+
.filter(it -> it.getReturnType().equals(MINECRAFT_SERVER_CLASS) && it.getParameterCount() == 0)
208+
.findFirst()
209+
.orElseThrow(() -> new IllegalStateException("Could not find CommandSourceStack#getServer."));
211210
private static final Method GET_TAG_REGISTRY_METHOD = CraftBukkitReflection.firstNonNullOrThrow(
212211
() -> "getTags method on MinecraftServer",
213212
CraftBukkitReflection.findMethod(MINECRAFT_SERVER_CLASS, "getTagRegistry"),
214213
CraftBukkitReflection.findMethod(MINECRAFT_SERVER_CLASS, "getTags"),
215-
CraftBukkitReflection.streamMethods(MINECRAFT_SERVER_CLASS, stream ->
216-
stream.filter(it -> it.getReturnType().equals(TAG_CONTAINER_CLASS) && it.getParameterCount() == 0)
217-
.findFirst().orElse(null))
214+
CraftBukkitReflection.streamMethods(MINECRAFT_SERVER_CLASS)
215+
.filter(it -> it.getReturnType().equals(TAG_CONTAINER_CLASS) && it.getParameterCount() == 0)
216+
.findFirst()
217+
.orElse(null)
218218
);
219219

220220
private final ArgumentParser<C, BlockPredicate> parser;

0 commit comments

Comments
 (0)