Updated Diner example for Command Pattern to show non-Lambda version,…

… and add separate Lambda version

src/headfirst/designpatterns/command/diner/Customer.java

@@ -2,10 +2,14 @@
 
 public class Customer {
 	Waitress waitress;
+	Order order;
 	public Customer(Waitress waitress) {
 		this.waitress = waitress;
 	}
-	public void hungry(Order o) {
-		waitress.takeOrder(o);
+	public void createOrder(Order order) {
+		this.order = order;
+	}
+	public void hungry() {
+		waitress.takeOrder(order);
 	}
 }

src/headfirst/designpatterns/command/diner/Diner.java

@@ -5,8 +5,7 @@ public static void main(String[] args) {
 		Cook cook = new Cook();
 		Waitress waitress = new Waitress();
 		Customer customer = new Customer(waitress);
-
-		Order o = () -> { cook.makeBurger(); cook.makeFries(); };
-		customer.hungry(o);
+		customer.createOrder(new BurgerAndFriesOrder(cook));
+		customer.hungry();
 	}
 }

src/headfirst/designpatterns/command/dinerLambda/Cook.java

@@ -0,0 +1,14 @@
+package headfirst.designpatterns.command.dinerLambda;
+
+public class Cook {
+
+	public Cook() {}
+
+	public void makeBurger() {
+		System.out.println("Making a burger");
+	}
+
+	public void makeFries() {
+		System.out.println("Making fries");
+	}
+}

src/headfirst/designpatterns/command/dinerLambda/Customer.java

@@ -0,0 +1,17 @@
+package headfirst.designpatterns.command.dinerLambda;
+
+public class Customer {
+	Waitress waitress;
+	Cook cook;
+	Order o;
+	public Customer(Waitress waitress, Cook cook) {
+		this.waitress = waitress;
+		this.cook = cook;
+	}
+	public void createOrder() {
+		Order o = () -> { cook.makeBurger(); cook.makeFries(); };
+	}
+	public void hungry() {
+		waitress.takeOrder(o);
+	}
+}

src/headfirst/designpatterns/command/dinerLambda/Diner.java

@@ -0,0 +1,11 @@
+package headfirst.designpatterns.command.dinerLambda;
+
+public class Diner {
+	public static void main(String[] args) {
+		Cook cook = new Cook();
+		Waitress waitress = new Waitress();
+		Customer customer = new Customer(waitress, cook);
+		customer.createOrder();
+		customer.hungry();
+	}
+}

src/headfirst/designpatterns/command/dinerLambda/Order.java

@@ -0,0 +1,6 @@
+package headfirst.designpatterns.command.dinerLambda;
+
+@FunctionalInterface
+public interface Order {
+	public void orderUp();
+}

src/headfirst/designpatterns/command/dinerLambda/Waitress.java

@@ -0,0 +1,10 @@
+package headfirst.designpatterns.command.dinerLambda;
+
+public class Waitress {
+	Order order;
+	public Waitress() {}
+	public void takeOrder(Order order) {
+		this.order = order; 
+		order.orderUp();
+	}
+}