Release: merge dev into master

src/main/java/com/bdtripp/hauntedhouse/engine/CliRunner.java

@@ -1,6 +1,7 @@
 package com.bdtripp.hauntedhouse.engine;
 
 import com.bdtripp.hauntedhouse.model.Command;
+import com.bdtripp.hauntedhouse.model.World;
 
 /**
  * Runs the game in a command-line environment.
@@ -12,12 +13,17 @@
  */
 public class CliRunner {
     private Parser parser = new Parser(System.in);
-    private GameEngine gameEngine = new GameEngine();
+    private GameEngine gameEngine;
 
     /**
      * Initializes the parser and game engine for cli play.
      */
     public CliRunner() {
+        World world = new WorldBuilder().createWorld();
+        GameEngine engine = new GameEngine(world);
+        CommandProcessor processor = new CommandProcessor(world, engine);
+        engine.setCommandProcessor(processor);
+        this.gameEngine = engine;
     }
 
     /**

src/main/java/com/bdtripp/hauntedhouse/engine/GameEngine.java

@@ -19,15 +19,26 @@
  */
 public class GameEngine {
     private final World world;
-    private final CommandProcessor commandProcessor;
+    private CommandProcessor commandProcessor;
     private boolean gameOver;
 
     /**
-     * Creates the GameEngine and the game world.
+     * Creates the GameEngine.
      */
-    public GameEngine() {
-        world = new WorldBuilder().createWorld();
-        commandProcessor = new CommandProcessor(world, this);
+    public GameEngine(World world) {
+        this.world = world;
+    }
+
+    /**
+     * Injects the CommandProcessor used by the engine to interpret and execute player commands.
+     *
+     * This setter is required because the CommandProcessor also depends on the GameEngine, and
+     * therefore cannot be constructed until after the engine itself is created.
+     *
+     * @param processor the CommandProcessor responsible for handling commands
+     */
+    public void setCommandProcessor(CommandProcessor processor) {
+        this.commandProcessor = processor;
     }
 
     /**

src/main/java/com/bdtripp/hauntedhouse/service/GameService.java

@@ -1,11 +1,15 @@
 package com.bdtripp.hauntedhouse.service;
 
 import com.bdtripp.hauntedhouse.engine.Parser;
+import com.bdtripp.hauntedhouse.engine.WorldBuilder;
 import com.bdtripp.hauntedhouse.model.Command;
 import com.bdtripp.hauntedhouse.api.GameRequest;
 import com.bdtripp.hauntedhouse.api.GameResponse;
+import com.bdtripp.hauntedhouse.engine.CommandProcessor;
 import com.bdtripp.hauntedhouse.engine.GameEngine;
 import com.bdtripp.hauntedhouse.model.GameStatus;
+import com.bdtripp.hauntedhouse.model.World;
+
 import org.springframework.stereotype.Service;
 import org.springframework.web.context.annotation.SessionScope;
 
@@ -32,7 +36,11 @@ public GameService() {
      * @return a response containing a welcome message and status of the game
      */
     public GameResponse startGame() {
-        gameEngine = new GameEngine();
+        World world = new WorldBuilder().createWorld();
+        GameEngine engine = new GameEngine(world);
+        CommandProcessor processor = new CommandProcessor(world, engine);
+        engine.setCommandProcessor(processor);
+        this.gameEngine = engine;
         gameEngine.startGame();
         String output = gameEngine.buildWelcomeMessage() + "\n";
         return new GameResponse(output, GameStatus.RUNNING);