From 87cf6b791cefcba99a5894141078464d2805c870 Mon Sep 17 00:00:00 2001
From: Vladislav Golubinov <vlad.vdlald@gmail.com>
Date: Sun, 6 Sep 2020 11:48:40 +0300
Subject: [PATCH] refactor

---
 .../com/iluwatar/abstractfactory/App.java     | 16 ++++++------
 .../abstractfactory/AbstractFactoryTest.java  | 25 ++++++-------------
 2 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
index bebf5c894..05aa8d118 100644
--- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
+++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/App.java
@@ -26,8 +26,6 @@ package com.iluwatar.abstractfactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.List;
-
 /**
  * The Abstract Factory pattern provides a way to encapsulate a group of individual factories that
  * have a common theme without specifying their concrete classes. In normal usage, the client
@@ -64,13 +62,13 @@ public class App implements Runnable {
   @Override
   public void run() {
     log.info("Elf Kingdom");
-    createKingdom(Kingdom.FactoryMaker.makeFactory(Kingdom.FactoryMaker.KingdomType.ELF));
+    createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     log.info(kingdom.getArmy().getDescription());
     log.info(kingdom.getCastle().getDescription());
     log.info(kingdom.getKing().getDescription());
 
     log.info("Orc Kingdom");
-    createKingdom(Kingdom.FactoryMaker.makeFactory(Kingdom.FactoryMaker.KingdomType.ORC));
+    createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
     log.info(kingdom.getArmy().getDescription());
     log.info(kingdom.getCastle().getDescription());
     log.info(kingdom.getKing().getDescription());
@@ -78,10 +76,12 @@ public class App implements Runnable {
 
   /**
    * Creates kingdom.
+   * @param kingdomType
    */
-  public void createKingdom(final KingdomFactory factory) {
-    kingdom.setKing(factory.createKing());
-    kingdom.setCastle(factory.createCastle());
-    kingdom.setArmy(factory.createArmy());
+  public void createKingdom(final Kingdom.FactoryMaker.KingdomType kingdomType) {
+    final KingdomFactory kingdomFactory = Kingdom.FactoryMaker.makeFactory(kingdomType);
+    kingdom.setKing(kingdomFactory.createKing());
+    kingdom.setCastle(kingdomFactory.createCastle());
+    kingdom.setArmy(kingdomFactory.createArmy());
   }
 }
\ No newline at end of file
diff --git a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
index 54c3b68f1..17c09be88 100644
--- a/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
+++ b/abstract-factory/src/test/java/com/iluwatar/abstractfactory/AbstractFactoryTest.java
@@ -23,7 +23,6 @@
 
 package com.iluwatar.abstractfactory;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -35,25 +34,17 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 public class AbstractFactoryTest {
 
   private final App app = new App();
-  private KingdomFactory elfFactory;
-  private KingdomFactory orcFactory;
-
-  @BeforeEach
-  public void setUp() {
-    elfFactory = Kingdom.FactoryMaker.makeFactory(Kingdom.FactoryMaker.KingdomType.ELF);
-    orcFactory = Kingdom.FactoryMaker.makeFactory(Kingdom.FactoryMaker.KingdomType.ORC);
-  }
 
   @Test
   public void king() {
-    app.createKingdom(elfFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     final var kingdom = app.getKingdom();
 
     final var elfKing = kingdom.getKing();
     assertTrue(elfKing instanceof ElfKing);
     assertEquals(ElfKing.DESCRIPTION, elfKing.getDescription());
 
-    app.createKingdom(orcFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
     final var orcKing = kingdom.getKing();
     assertTrue(orcKing instanceof OrcKing);
     assertEquals(OrcKing.DESCRIPTION, orcKing.getDescription());
@@ -61,14 +52,14 @@ public class AbstractFactoryTest {
 
   @Test
   public void castle() {
-    app.createKingdom(elfFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     final var kingdom = app.getKingdom();
 
     final var elfCastle = kingdom.getCastle();
     assertTrue(elfCastle instanceof ElfCastle);
     assertEquals(ElfCastle.DESCRIPTION, elfCastle.getDescription());
 
-    app.createKingdom(orcFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
     final var orcCastle = kingdom.getCastle();
     assertTrue(orcCastle instanceof OrcCastle);
     assertEquals(OrcCastle.DESCRIPTION, orcCastle.getDescription());
@@ -76,14 +67,14 @@ public class AbstractFactoryTest {
 
   @Test
   public void army() {
-    app.createKingdom(elfFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     final var kingdom = app.getKingdom();
 
     final var elfArmy = kingdom.getArmy();
     assertTrue(elfArmy instanceof ElfArmy);
     assertEquals(ElfArmy.DESCRIPTION, elfArmy.getDescription());
 
-    app.createKingdom(orcFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
     final var orcArmy = kingdom.getArmy();
     assertTrue(orcArmy instanceof OrcArmy);
     assertEquals(OrcArmy.DESCRIPTION, orcArmy.getDescription());
@@ -91,7 +82,7 @@ public class AbstractFactoryTest {
 
   @Test
   public void createElfKingdom() {
-    app.createKingdom(elfFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ELF);
     final var kingdom = app.getKingdom();
 
     final var king = kingdom.getKing();
@@ -107,7 +98,7 @@ public class AbstractFactoryTest {
 
   @Test
   public void createOrcKingdom() {
-    app.createKingdom(orcFactory);
+    app.createKingdom(Kingdom.FactoryMaker.KingdomType.ORC);
     final var kingdom = app.getKingdom();
 
     final var king = kingdom.getKing();