Skip to content

Fix infinite recursion when a @Suggestions method returns a CompletableFuture #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jpenilla merged 2 commits into from
Sep 11, 2024
Merged

Fix infinite recursion when a @Suggestions method returns a CompletableFuture #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37d1f9e
Fix infinite recursion when a `@Suggestions` method returns a Complet…
emilyy-dev Sep 11, 2024
c9e7dd4
Name future test suggestion source more properly
emilyy-dev Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ions/src/main/java/org/incendo/cloud/annotations/suggestion/MethodSuggestionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public MethodSuggestionProvider(
@SuppressWarnings("rawtypes")
public static @NonNull CompletableFuture<Iterable<@NonNull Suggestion>> mapSuggestions(final @NonNull Object input) {
if (input instanceof CompletableFuture) {
return mapSuggestions((CompletableFuture) input);
return mapFuture((CompletableFuture) input);
}
return CompletableFuture.completedFuture(mapCompleted(input));
}
Expand Down
13 changes: 13 additions & 0 deletions ...ons/src/test/java/org/incendo/cloud/annotations/feature/MethodSuggestionProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.incendo.cloud.CommandManager;
Expand Down Expand Up @@ -94,6 +95,7 @@ void testSuggestions(final @NonNull Object instance) {
named("set source", new TestClassSet()),
named("stream source", new TestClassStream()),
named("iterable source", new TestClassIterable()),
named("list future source", new TestClassFutureList()),
named("string list source", new TestClassListString()),
named("source with CommandInput injected", new TestClassCommandInput()),
named("source with injected value", new TestInjectedValue())
Expand Down Expand Up @@ -156,6 +158,17 @@ public static final class TestClassListString {
}
}

public static final class TestClassFutureList {

@Suggestions("suggestions")
public @NonNull CompletableFuture<@NonNull Iterable<@NonNull Suggestion>> suggestions(
final @NonNull CommandContext<TestCommandSender> context,
final @NonNull String input
) {
return CompletableFuture.completedFuture(Collections.singletonList(Suggestion.suggestion("foo")));
}
}

public static final class TestClassCommandInput {

@Suggestions("suggestions")
Expand Down