Create new events and move filter functions

Signed-off-by: pacien <pacien.trangirard@pacien.net>

10 files changed, 128 insertions, 16 deletions

diff --git a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
index f5e2584..e41c57f 100644
--- a/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
+++ b/src/main/java/fr/umlv/java/wallj/block/RobotBlock.java
@@ -5,10 +5,8 @@ import fr.umlv.java.wallj.board.PathFinder;
 import fr.umlv.java.wallj.board.TileVec2;
 import fr.umlv.java.wallj.context.Context;
 import fr.umlv.java.wallj.context.GraphicsContext;
-import fr.umlv.java.wallj.event.BombSetupEvent;
-import fr.umlv.java.wallj.event.BombSetupOrder;
+import fr.umlv.java.wallj.event.*;
 import fr.umlv.java.wallj.event.Event;
-import fr.umlv.java.wallj.event.MoveRobotOrder;
 import org.jbox2d.common.Vec2;
 import org.jbox2d.dynamics.World;
 
@@ -45,7 +43,7 @@ public class RobotBlock extends Block {
 
   @Override
   public List<Event> update(Context context) {
-    Event.findFirst(context.getEvents(), MoveRobotOrder.class)
+    Events.findFirst(context.getEvents(), MoveRobotOrder.class)
     .ifPresent(event -> updatePath(context.getGame().getCurrentStage().getBoard(), event.getTarget()));
 
     if (!path.isEmpty()) move(context.getTimeDelta());
@@ -54,7 +52,7 @@ public class RobotBlock extends Block {
   }
 
   private List<Event> setupBomb(List<Event> events) {
-    return Event.findFirst(events, BombSetupOrder.class)
+    return Events.findFirst(events, BombSetupOrder.class)
            .map(event -> Collections.<Event>singletonList(new BombSetupEvent(TileVec2.of(pos))))
            .orElse(Collections.emptyList());
   }
diff --git a/src/main/java/fr/umlv/java/wallj/event/BlockCreateEvent.java b/src/main/java/fr/umlv/java/wallj/event/BlockCreateEvent.java
new file mode 100644
index 0000000..1df177a
--- /dev/null
+++ b/src/main/java/fr/umlv/java/wallj/event/BlockCreateEvent.java
@@ -0,0 +1,39 @@
+package fr.umlv.java.wallj.event;
+
+import fr.umlv.java.wallj.block.BlockType;
+import fr.umlv.java.wallj.board.TileVec2;
+
+import java.util.Objects;
+
+/**
+ * Block creation request.
+ *
+ * @author Pacien TRAN-GIRARD
+ */
+public class BlockCreateEvent implements GameEvent {
+  private final BlockType blockType;
+  private final TileVec2 pos;
+
+  /**
+   * @param blockType the type of the block to create
+   * @param pos the position of the block to create
+   */
+  public BlockCreateEvent(BlockType blockType, TileVec2 pos) {
+    this.blockType = Objects.requireNonNull(blockType);
+    this.pos = Objects.requireNonNull(pos);
+  }
+
+  /**
+   * @return the type of the block to create
+   */
+  public BlockType getBlockType() {
+    return blockType;
+  }
+
+  /**
+   * @return the position of the block to create
+   */
+  public TileVec2 getPos() {
+    return pos;
+  }
+}
diff --git a/src/main/java/fr/umlv/java/wallj/event/BlockDestroyEvent.java b/src/main/java/fr/umlv/java/wallj/event/BlockDestroyEvent.java
new file mode 100644
index 0000000..d954fa0
--- /dev/null
+++ b/src/main/java/fr/umlv/java/wallj/event/BlockDestroyEvent.java
@@ -0,0 +1,28 @@
+package fr.umlv.java.wallj.event;
+
+import fr.umlv.java.wallj.block.Block;
+
+import java.util.Objects;
+
+/**
+ * Block destroy request.
+ *
+ * @author Pacien TRAN-GIRARD
+ */
+public class BlockDestroyEvent implements GameEvent {
+  private final Block block;
+
+  /**
+   * @param block the block to destroy
+   */
+  public BlockDestroyEvent(Block block) {
+    this.block = Objects.requireNonNull(block);
+  }
+
+  /**
+   * @return the block to destroy
+   */
+  public Block getBlock() {
+    return block;
+  }
+}
diff --git a/src/main/java/fr/umlv/java/wallj/event/BombSetupOrder.java b/src/main/java/fr/umlv/java/wallj/event/BombSetupOrder.java
index 99c0942..25f0048 100644
--- a/src/main/java/fr/umlv/java/wallj/event/BombSetupOrder.java
+++ b/src/main/java/fr/umlv/java/wallj/event/BombSetupOrder.java
@@ -6,5 +6,5 @@ package fr.umlv.java.wallj.event;
  * @author Adam NAILI
  */
 public final class BombSetupOrder implements InputEvent {
-
+  // void
 }
diff --git a/src/main/java/fr/umlv/java/wallj/event/ConfirmOrder.java b/src/main/java/fr/umlv/java/wallj/event/ConfirmOrder.java
index a3e3525..eb384cb 100644
--- a/src/main/java/fr/umlv/java/wallj/event/ConfirmOrder.java
+++ b/src/main/java/fr/umlv/java/wallj/event/ConfirmOrder.java
@@ -6,4 +6,5 @@ package fr.umlv.java.wallj.event;
  * @author Adam NAILI
  */
 public class ConfirmOrder implements InputEvent {
+  // void
 }
diff --git a/src/main/java/fr/umlv/java/wallj/event/Event.java b/src/main/java/fr/umlv/java/wallj/event/Event.java
index 5b8b500..e373002 100644
--- a/src/main/java/fr/umlv/java/wallj/event/Event.java
+++ b/src/main/java/fr/umlv/java/wallj/event/Event.java
@@ -1,18 +1,10 @@
 package fr.umlv.java.wallj.event;
 
-import java.util.List;
-import java.util.Optional;
-
 /**
  * An application event
  *
  * @author Pacien TRAN-GIRARD
  */
 public interface Event {
-  static <T extends Event> Optional<T> findFirst(List<Event> eventList, Class<T> eventClass) {
-    return eventList.stream()
-           .filter(e -> e.getClass().isInstance(eventClass))
-           .findFirst()
-           .map(eventClass::cast);
-  }
+  // void
 }
diff --git a/src/main/java/fr/umlv/java/wallj/event/Events.java b/src/main/java/fr/umlv/java/wallj/event/Events.java
new file mode 100644
index 0000000..da8b199
--- /dev/null
+++ b/src/main/java/fr/umlv/java/wallj/event/Events.java
@@ -0,0 +1,38 @@
+package fr.umlv.java.wallj.event;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+/**
+ * Events filtering utilities.
+ *
+ * @author Pacien TRAN-GIRARD
+ */
+public final class Events {
+  /**
+   * @param eventList  list of events to filter
+   * @param eventClass event class to keep
+   * @param <T>        type of events to keep
+   * @return a filtered stream of events
+   */
+  public static <T extends Event> Stream<T> filter(List<Event> eventList, Class<T> eventClass) {
+    return eventList.stream()
+           .filter(e -> e.getClass().isInstance(eventClass))
+           .map(eventClass::cast);
+  }
+
+  /**
+   * @param eventList  list of events to filter
+   * @param eventClass event class to keep
+   * @param <T>        type of events to keep
+   * @return any matching event
+   */
+  public static <T extends Event> Optional<T> findFirst(List<Event> eventList, Class<T> eventClass) {
+    return filter(eventList, eventClass).findFirst();
+  }
+
+  private Events() {
+    // static class
+  }
+}
diff --git a/src/main/java/fr/umlv/java/wallj/event/GameOverEvent.java b/src/main/java/fr/umlv/java/wallj/event/GameOverEvent.java
index 93ec049..4365dc4 100644
--- a/src/main/java/fr/umlv/java/wallj/event/GameOverEvent.java
+++ b/src/main/java/fr/umlv/java/wallj/event/GameOverEvent.java
@@ -1,4 +1,10 @@
 package fr.umlv.java.wallj.event;
 
+/**
+ * Signals that the game is over.
+ *
+ * @author Pacien TRAN-GIRARD
+ */