From 91b5471bd2dfa42b687944e492b15860907dc6a2 Mon Sep 17 00:00:00 2001
From: Peter Hertkorn <peter.hertkorn@reutlingen-university.de>
Date: Wed, 21 Oct 2020 21:02:58 +0200
Subject: [PATCH] Avoid null pointer, gitignore
---
.gitignore | 1 +
src/pizzeria/PizzaStore.java | 16 +++++++++++-----
src/pizzeria/PizzaStoreModule.java | 3 ++-
src/pizzeria/PizzaTestDrive.java | 4 +++-
4 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9ad1779..292a944 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
HELP.md
target/
+out/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/
diff --git a/src/pizzeria/PizzaStore.java b/src/pizzeria/PizzaStore.java
index 38b89ec..8fb564e 100644
--- a/src/pizzeria/PizzaStore.java
+++ b/src/pizzeria/PizzaStore.java
@@ -6,11 +6,17 @@ public abstract class PizzaStore {
public final Pizza orderPizza(String type) {
Pizza pizza = createPizza(type);
- System.out.println("--- Making a " + pizza.getName() + " ---");
- pizza.prepare();
- pizza.bake();
- pizza.cut();
- pizza.box();
+
+ if (pizza != null) {
+ System.out.println("--- Making a " + pizza.getName() + " ---");
+ pizza.prepare();
+ pizza.bake();
+ pizza.cut();
+ pizza.box();
+ } else {
+ System.out.println("There is no such pizza like " + type);
+ }
+
return pizza;
}
}
diff --git a/src/pizzeria/PizzaStoreModule.java b/src/pizzeria/PizzaStoreModule.java
index 28eaec9..f302740 100644
--- a/src/pizzeria/PizzaStoreModule.java
+++ b/src/pizzeria/PizzaStoreModule.java
@@ -8,6 +8,7 @@ public class PizzaStoreModule extends AbstractModule {
protected void configure() {
bind(PizzaStore.class)
//.to(ChicagoPizzaStore.class);
- .to(NYPizzaStore.class);
+ //.to(NYPizzaStore.class);
+ .to(TestPizzaStore.class);
}
}
diff --git a/src/pizzeria/PizzaTestDrive.java b/src/pizzeria/PizzaTestDrive.java
index 3698d99..9f2b87d 100644
--- a/src/pizzeria/PizzaTestDrive.java
+++ b/src/pizzeria/PizzaTestDrive.java
@@ -13,7 +13,9 @@ public class PizzaTestDrive {
for (int j = 0; j < pizzaType.length; j++) {
Pizza pizza = franchise.orderPizza(pizzaType[j]);
- System.out.println("Customer ordered a " + pizza.getName() + "\n");
+ if (pizza != null) {
+ System.out.println("Customer ordered a " + pizza.getName() + "\n");
+ }
}
}
}
--
GitLab