Work on the DI example. Added second Wizard with injected Tobacco.

iluwatar · iluwatar · commit b2bfdb1752d2 · 2015-05-25T18:42:36.000+03:00
diff --git a/dependency-injection/src/main/java/com/iluwatar/AdvancedWizard.java b/dependency-injection/src/main/java/com/iluwatar/AdvancedWizard.java
@@ -0,0 +1,15 @@
+package com.iluwatar;
+
+public class AdvancedWizard implements Wizard {
+	
+	private Tobacco tobacco;
+
+	public AdvancedWizard(Tobacco tobacco) {
+		this.tobacco = tobacco;
+	}
+
+	@Override
+	public void smoke() {
+		tobacco.smoke(this);
+	}
+}
diff --git a/dependency-injection/src/main/java/com/iluwatar/App.java b/dependency-injection/src/main/java/com/iluwatar/App.java
@@ -3,7 +3,10 @@
 public class App {
 	
     public static void main( String[] args ) {
-    	Wizard wizard = new Wizard();
-    	wizard.smoke();
+    	SimpleWizard simpleWizard = new SimpleWizard();
+    	simpleWizard.smoke();
+    	
+    	AdvancedWizard advancedWizard = new AdvancedWizard(new SecondBreakfastTobacco());
+    	advancedWizard.smoke();
     }
 }
diff --git a/dependency-injection/src/main/java/com/iluwatar/OldTobyTobacco.java b/dependency-injection/src/main/java/com/iluwatar/OldTobyTobacco.java
@@ -1,9 +1,4 @@
 package com.iluwatar;
 
-public class OldTobyTobacco implements Tobacco {
-
-	@Override
-	public void smoke() {
-		System.out.println(String.format("Smoking %s", this.getClass().getSimpleName()));
-	}
+public class OldTobyTobacco extends Tobacco {
 }
diff --git a/dependency-injection/src/main/java/com/iluwatar/SecondBreakfastTobacco.java b/dependency-injection/src/main/java/com/iluwatar/SecondBreakfastTobacco.java
@@ -0,0 +1,4 @@
+package com.iluwatar;
+
+public class SecondBreakfastTobacco extends Tobacco {
+}
diff --git a/dependency-injection/src/main/java/com/iluwatar/SimpleWizard.java b/dependency-injection/src/main/java/com/iluwatar/SimpleWizard.java
@@ -0,0 +1,10 @@
+package com.iluwatar;
+
+public class SimpleWizard implements Wizard {
+	
+	private OldTobyTobacco tobacco = new OldTobyTobacco();
+	
+	public void smoke() {
+		tobacco.smoke(this);
+	}
+}
diff --git a/dependency-injection/src/main/java/com/iluwatar/Tobacco.java b/dependency-injection/src/main/java/com/iluwatar/Tobacco.java
@@ -1,7 +1,8 @@
 package com.iluwatar;
 
-public interface Tobacco {
+public abstract class Tobacco {
 	
-	public void smoke();
-
+	public void smoke(Wizard wizard) {
+		System.out.println(String.format("%s smoking %s", wizard.getClass().getSimpleName(), this.getClass().getSimpleName()));
+	}
 }
diff --git a/dependency-injection/src/main/java/com/iluwatar/Wizard.java b/dependency-injection/src/main/java/com/iluwatar/Wizard.java
@@ -1,10 +1,7 @@
 package com.iluwatar;
 
-public class Wizard {
+public interface Wizard {
 	
-	private OldTobyTobacco tobacco = new OldTobyTobacco();
-	
-	public void smoke() {
-		tobacco.smoke();
-	}
+	void smoke();
+
 }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,10 @@`
`3`	`3`	`public class App {`
`4`	`4`
`5`	`5`	`public static void main( String[] args ) {`
`6`		`- Wizard wizard = new Wizard();`
`7`		`- wizard.smoke();`
	`6`	`+ SimpleWizard simpleWizard = new SimpleWizard();`
	`7`	`+ simpleWizard.smoke();`
	`8`	`+`
	`9`	`+ AdvancedWizard advancedWizard = new AdvancedWizard(new SecondBreakfastTobacco());`
	`10`	`+ advancedWizard.smoke();`
`8`	`11`	`}`
`9`	`12`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +package com.iluwatar;
++
 +public class SecondBreakfastTobacco extends Tobacco {
 +}