default methods for collections

Author: HSGamer

core/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

core/src/main/java/io/github/projectunified/unidialog/core/dialog/Dialog.java

@@ -67,29 +67,41 @@ public interface Dialog<I, BB extends DialogBodyBuilder<I>, IB extends DialogInp
     T body(Consumer<BB> bodyBuilder);
 
     /**
-     * Set the body of the dialog using a collection of body builders
+     * Set the input for the dialog
      *
-     * @param bodyBuilders the collection of body builders for the dialog
+     * @param key          the key for the input
+     * @param inputBuilder the input builder for the dialog
      * @return the dialog itself for method chaining
      */
-    T body(Collection<Consumer<BB>> bodyBuilders);
+    T input(String key, Consumer<IB> inputBuilder);
 
     /**
-     * Set the input for the dialog
+     * Set the body of the dialog using a collection of body builders
      *
-     * @param key          the key for the input
-     * @param inputBuilder the input builder for the dialog
+     * @param bodyBuilders the collection of body builders for the dialog
      * @return the dialog itself for method chaining
      */
-    T input(String key, Consumer<IB> inputBuilder);
+    default T body(Collection<Consumer<BB>> bodyBuilders) {
+        for (Consumer<BB> bodyBuilder : bodyBuilders) {
+            body(bodyBuilder);
+        }
+        //noinspection unchecked
+        return (T) this;
+    }
 
     /**
      * Set the input for the dialog using a map of input builders
      *
      * @param inputBuilders the map of input builders for the dialog
      * @return the dialog itself for method chaining
      */
-    T input(Map<String, Consumer<IB>> inputBuilders);
+    default T input(Map<String, Consumer<IB>> inputBuilders) {
+        for (Map.Entry<String, Consumer<IB>> entry : inputBuilders.entrySet()) {
+            input(entry.getKey(), entry.getValue());
+        }
+        //noinspection unchecked
+        return (T) this;
+    }
 
     /**
      * Create an opener for the dialog

core/src/main/java/io/github/projectunified/unidialog/core/dialog/MultiActionDialog.java

@@ -35,18 +35,24 @@ public interface MultiActionDialog<I, BB extends DialogBodyBuilder<I>, IB extend
     T action(Consumer<AB> action);
 
     /**
-     * Add multiple actions to the dialog
+     * Set the exit action for the dialog
      *
-     * @param actions a collection of actions to be performed
+     * @param action the action to be performed when exiting the dialog
      * @return the dialog itself for method chaining
      */
-    T action(Collection<Consumer<AB>> actions);
+    T exitAction(@Nullable Consumer<AB> action);
 
     /**
-     * Set the exit action for the dialog
+     * Add multiple actions to the dialog
      *
-     * @param action the action to be performed when exiting the dialog
+     * @param actions a collection of actions to be performed
      * @return the dialog itself for method chaining
      */
-    T exitAction(@Nullable Consumer<AB> action);
+    default T action(Collection<Consumer<AB>> actions) {
+        for (Consumer<AB> action : actions) {
+            action(action);
+        }
+        //noinspection unchecked
+        return (T) this;
+    }
 }

packetevents/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>

packetevents/src/main/java/io/github/projectunified/unidialog/packetevents/dialog/PEDialog.java

@@ -17,7 +17,10 @@
 import net.kyori.adventure.text.Component;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -101,19 +104,6 @@ public T body(Consumer<PEDialogBodyBuilder> bodyBuilder) {
         return (T) this;
     }
 
-    @Override
-    public T body(Collection<Consumer<PEDialogBodyBuilder>> bodyBuilders) {
-        if (bodies == null) {
-            bodies = new ArrayList<>();
-        }
-        for (Consumer<PEDialogBodyBuilder> bodyBuilder : bodyBuilders) {
-            PEDialogBodyBuilder builder = new PEDialogBodyBuilder();
-            bodyBuilder.accept(builder);
-            bodies.add(builder.getDialogBody());
-        }
-        return (T) this;
-    }
-
     @Override
     public T input(String key, Consumer<PEDialogInputBuilder> inputBuilder) {
         if (inputs == null) {
@@ -126,22 +116,6 @@ public T input(String key, Consumer<PEDialogInputBuilder> inputBuilder) {
         return (T) this;
     }
 
-    @Override
-    public T input(Map<String, Consumer<PEDialogInputBuilder>> inputBuilders) {
-        if (inputs == null) {
-            inputs = new ArrayList<>();
-        }
-        for (Map.Entry<String, Consumer<PEDialogInputBuilder>> entry : inputBuilders.entrySet()) {
-            String key = entry.getKey();
-            Consumer<PEDialogInputBuilder> inputBuilder = entry.getValue();
-            PEDialogInputBuilder builder = new PEDialogInputBuilder();
-            inputBuilder.accept(builder);
-            InputControl inputControl = builder.getInput();
-            inputs.add(new Input(key, inputControl));
-        }
-        return (T) this;
-    }
-
     protected ActionButton getAction(Consumer<PEDialogActionBuilder> action) {
         PEDialogActionBuilder actionBuilder = new PEDialogActionBuilder(defaultNamespace);
         action.accept(actionBuilder);

packetevents/src/main/java/io/github/projectunified/unidialog/packetevents/dialog/PEMultiActionDialog.java

@@ -10,7 +10,10 @@
 import io.github.projectunified.unidialog.packetevents.input.PEDialogInputBuilder;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.function.Function;
 
@@ -39,18 +42,6 @@ public PEMultiActionDialog action(Consumer<PEDialogActionBuilder> action) {
         return this;
     }
 
-    @Override
-    public PEMultiActionDialog action(Collection<Consumer<PEDialogActionBuilder>> actions) {
-        if (this.actions == null) {
-            this.actions = new ArrayList<>();
-        }
-        for (Consumer<PEDialogActionBuilder> action : actions) {
-            ActionButton actionButton = getAction(action);
-            this.actions.add(actionButton);
-        }
-        return this;
-    }
-
     @Override
     public PEMultiActionDialog exitAction(@Nullable Consumer<PEDialogActionBuilder> action) {
         this.exitAction = action == null ? null : getAction(action);

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>