Made example App a bit easier to understand

npathai · npathai · commit b5d4445d635e · 2016-02-10T17:53:32.000+05:30
diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
@@ -52,14 +52,6 @@ public void createKingdom(final KingdomFactory factory) {
     setArmy(factory.createArmy());
   }
 
-  ElfKingdomFactory getElfKingdomFactory() {
-    return new ElfKingdomFactory();
-  }
-
-  OrcKingdomFactory getOrcKingdomFactory() {
-    return new OrcKingdomFactory();
-  }
-
   King getKing(final KingdomFactory factory) {
     return factory.createKing();
   }
@@ -107,17 +99,13 @@ public static void main(String[] args) {
     App app = new App();
 
     System.out.println("Elf Kingdom");
-    KingdomFactory elfKingdomFactory;
-    elfKingdomFactory = app.getElfKingdomFactory();
-    app.createKingdom(elfKingdomFactory);
+    app.createKingdom(new ElfKingdomFactory());
     System.out.println(app.getArmy().getDescription());
     System.out.println(app.getCastle().getDescription());
     System.out.println(app.getKing().getDescription());
 
     System.out.println("\nOrc Kingdom");
-    KingdomFactory orcKingdomFactory;
-    orcKingdomFactory = app.getOrcKingdomFactory();
-    app.createKingdom(orcKingdomFactory);
+    app.createKingdom(new OrcKingdomFactory());
     System.out.println(app.getArmy().getDescription());
     System.out.println(app.getCastle().getDescription());
     System.out.println(app.getKing().getDescription());
diff --git a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
@@ -36,8 +36,8 @@ public class AbstractFactoryTest {
 
   @Before
   public void setUp() {
-    elfFactory = app.getElfKingdomFactory();
-    orcFactory = app.getOrcKingdomFactory();
+    elfFactory = new ElfKingdomFactory();
+    orcFactory = new OrcKingdomFactory();
   }
 
   @Test

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ public class AbstractFactoryTest {`
`36`	`36`
`37`	`37`	`@Before`
`38`	`38`	`public void setUp() {`
`39`		`- elfFactory = app.getElfKingdomFactory();`
`40`		`- orcFactory = app.getOrcKingdomFactory();`
	`39`	`+ elfFactory = new ElfKingdomFactory();`
	`40`	`+ orcFactory = new OrcKingdomFactory();`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`@Test`