replaced .toList() with .collect(Collectors.toList())

ZrdJ · Feb 15, 2024 · f6c23e0 · f6c23e0
1 parent 0589895
commit f6c23e0
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 10 deletions.
diff --git a/...com/github/zrdj/javachord/command/option/autocomplete/LongAutocompleteOptionalOption.java b/...com/github/zrdj/javachord/command/option/autocomplete/LongAutocompleteOptionalOption.java
@@ -7,6 +7,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public abstract class LongAutocompleteOptionalOption  extends AutocompleteOptionalOption<Long>{
     public LongAutocompleteOptionalOption(final String name, final String description) {
@@ -16,7 +17,7 @@ public LongAutocompleteOptionalOption(final String name, final String descriptio
     @Override
     protected final List<SlashCommandOptionChoice> onAutocomplete(final Optional<SlashCommandInteractionOption> option) {
         return onAutocompleteChoice(option.flatMap(SlashCommandInteractionOption::getLongValue))
-                .stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).toList();
+                .stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).collect(Collectors.toList());
     }
 
     protected abstract List<Choice<Long>> onAutocompleteChoice(final Optional<Long> option);

diff --git a/...com/github/zrdj/javachord/command/option/autocomplete/LongAutocompleteRequiredOption.java b/...com/github/zrdj/javachord/command/option/autocomplete/LongAutocompleteRequiredOption.java
@@ -7,6 +7,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public abstract class LongAutocompleteRequiredOption extends AutocompleteRequiredOption<Long> {
     public LongAutocompleteRequiredOption(final String name, final String description) {
@@ -16,7 +17,7 @@ public LongAutocompleteRequiredOption(final String name, final String descriptio
     @Override
     protected final List<SlashCommandOptionChoice> onAutocomplete(final Optional<SlashCommandInteractionOption> option) {
         return onAutocompleteChoice(option.flatMap(SlashCommandInteractionOption::getLongValue))
-                .stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).toList();
+                .stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).collect(Collectors.toList());
     }
 
     protected abstract List<Choice<Long>> onAutocompleteChoice(final Optional<Long> option);

diff --git a/...m/github/zrdj/javachord/command/option/autocomplete/StringAutocompleteOptionalOption.java b/...m/github/zrdj/javachord/command/option/autocomplete/StringAutocompleteOptionalOption.java
@@ -7,6 +7,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public abstract class StringAutocompleteOptionalOption  extends AutocompleteOptionalOption<String> {
     public StringAutocompleteOptionalOption(final String name, final String description) {
@@ -16,7 +17,7 @@ public StringAutocompleteOptionalOption(final String name, final String descript
     @Override
     protected final List<SlashCommandOptionChoice> onAutocomplete(final Optional<SlashCommandInteractionOption> option) {
         return onAutocompleteChoice(option.flatMap(SlashCommandInteractionOption::getStringValue))
-                .stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).toList();
+                .stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).collect(Collectors.toList());
     }
 
     protected abstract List<Choice<String>> onAutocompleteChoice(final Optional<String> option);

diff --git a/...m/github/zrdj/javachord/command/option/autocomplete/StringAutocompleteRequiredOption.java b/...m/github/zrdj/javachord/command/option/autocomplete/StringAutocompleteRequiredOption.java
@@ -7,6 +7,7 @@
 
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 public abstract class StringAutocompleteRequiredOption extends AutocompleteRequiredOption<String> {
     public StringAutocompleteRequiredOption(final String name, final String description) {
@@ -16,7 +17,7 @@ public StringAutocompleteRequiredOption(final String name, final String descript
     @Override
     protected final List<SlashCommandOptionChoice> onAutocomplete(final Optional<SlashCommandInteractionOption> option) {
         return onAutocompleteChoice(option.flatMap(SlashCommandInteractionOption::getStringValue))
-                .stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).toList();
+                .stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).collect(Collectors.toList());
     }
 
     protected abstract List<Choice<String>> onAutocompleteChoice(final Optional<String> option);

diff --git a/src/main/java/com/github/zrdj/javachord/command/option/choice/ChoiceLongOptionalOption.java b/src/main/java/com/github/zrdj/javachord/command/option/choice/ChoiceLongOptionalOption.java
@@ -6,6 +6,7 @@
 import org.javacord.api.interaction.SlashCommandOptionType;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ChoiceLongOptionalOption extends OptionalOption<Long> {
     private final List<Choice<Long>> _choices;
@@ -17,7 +18,7 @@ public ChoiceLongOptionalOption(final String name, final String description, fin
 
     @Override
     protected final SlashCommandOptionBuilder buildSlashCommandOption(final SlashCommandOptionBuilder builder) {
-        var choices = _choices.stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).toList();
+        var choices = _choices.stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).collect(Collectors.toList());
         return builder.setChoices(choices);
     }
 }
diff --git a/src/main/java/com/github/zrdj/javachord/command/option/choice/ChoiceLongRequiredOption.java b/src/main/java/com/github/zrdj/javachord/command/option/choice/ChoiceLongRequiredOption.java
@@ -6,6 +6,7 @@
 import org.javacord.api.interaction.SlashCommandOptionType;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ChoiceLongRequiredOption extends RequiredOption<Long> {
     private final List<Choice<Long>> _choices;
@@ -17,7 +18,7 @@ public ChoiceLongRequiredOption(final String name, final String description, fin
 
     @Override
     protected final SlashCommandOptionBuilder buildSlashCommandOption(final SlashCommandOptionBuilder builder) {
-        var choices = _choices.stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).toList();
+        var choices = _choices.stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).collect(Collectors.toList());
         return builder.setChoices(choices);
     }
 }
diff --git a/...main/java/com/github/zrdj/javachord/command/option/choice/ChoiceStringOptionalOption.java b/...main/java/com/github/zrdj/javachord/command/option/choice/ChoiceStringOptionalOption.java
@@ -6,6 +6,7 @@
 import org.javacord.api.interaction.SlashCommandOptionType;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ChoiceStringOptionalOption extends OptionalOption<String> {
     private final List<Choice<String>> _choices;
@@ -17,7 +18,7 @@ public ChoiceStringOptionalOption(final String name, final String description, f
 
     @Override
     protected final SlashCommandOptionBuilder buildSlashCommandOption(final SlashCommandOptionBuilder builder) {
-        var choices = _choices.stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).toList();
+        var choices = _choices.stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).collect(Collectors.toList());
         return builder.setChoices(choices);
     }
 }
diff --git a/...main/java/com/github/zrdj/javachord/command/option/choice/ChoiceStringRequiredOption.java b/...main/java/com/github/zrdj/javachord/command/option/choice/ChoiceStringRequiredOption.java
@@ -6,6 +6,7 @@
 import org.javacord.api.interaction.SlashCommandOptionType;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 public class ChoiceStringRequiredOption extends RequiredOption<String> {
     private final List<Choice<String>> _choices;
@@ -17,7 +18,7 @@ public ChoiceStringRequiredOption(final String name, final String description, f
 
     @Override
     protected final SlashCommandOptionBuilder buildSlashCommandOption(final SlashCommandOptionBuilder builder) {
-        var choices = _choices.stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).toList();
+        var choices = _choices.stream().map(c -> SlashCommandOptionChoice.create(c.name(), c.value())).collect(Collectors.toList());
         return builder.setChoices(choices);
     }
 }
diff --git a/src/main/java/com/github/zrdj/javachord/component/select/SelectMenuStringComponent.java b/src/main/java/com/github/zrdj/javachord/component/select/SelectMenuStringComponent.java
@@ -26,15 +26,15 @@ public SelectMenuStringComponent(final String identifier, final List<SelectMenuC
     @Override
     protected final void onInteraction(final MessageComponentInteraction event) {
         var interaction = event.asSelectMenuInteraction().get();
-        var choices = interaction.getChosenOptions().stream().map(o -> _choiceByValue.get(o.getValue())).toList();
+        var choices = interaction.getChosenOptions().stream().map(o -> _choiceByValue.get(o.getValue())).collect(Collectors.toList());
         onChoicesSelected(interaction, choices);
     }
 
     protected abstract void onChoicesSelected(final SelectMenuInteraction interaction, final List<SelectMenuChoice<T>> choices);
 
     @Override
     public final LowLevelComponent component() {
-        var options = _choices.stream().map(SelectMenuChoice::toSelectMenuOption).toList();
+        var options = _choices.stream().map(SelectMenuChoice::toSelectMenuOption).collect(Collectors.toList());
         return new SelectMenuBuilder(ComponentType.SELECT_MENU_STRING, _identifier)
                 .addOptions(options)
                 .setDisabled(_disabled)