Issue 893

factory-method/README.md

@@ -42,13 +42,13 @@ public interface Blacksmith {
 
 public class ElfBlacksmith implements Blacksmith {
   public Weapon manufactureWeapon(WeaponType weaponType) {
-    return new ElfWeapon(weaponType);
+    return ELFARSENAL.get(weaponType);
   }
 }
 
 public class OrcBlacksmith implements Blacksmith {
   public Weapon manufactureWeapon(WeaponType weaponType) {
-    return new OrcWeapon(weaponType);
+    return ORCARSENAL.get(weaponType);
   }
 }
 ```

factory-method/src/main/java/com/iluwatar/factory/method/ElfBlacksmith.java

@@ -23,16 +23,27 @@
 
 package com.iluwatar.factory.method;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 
  * Concrete subclass for creating new objects.
  * 
  */
 public class ElfBlacksmith implements Blacksmith {
 
+  private static Map<WeaponType, ElfWeapon> ELFARSENAL;
+  static {
+	ELFARSENAL= new HashMap<>(WeaponType.values().length);
+	for (WeaponType type : WeaponType.values()) {
+		ELFARSENAL.put(type, new ElfWeapon(type));
+	}
+  }
+
   @Override
   public Weapon manufactureWeapon(WeaponType weaponType) {
-    return new ElfWeapon(weaponType);
+    return ELFARSENAL.get(weaponType);
   }
-
+  
 }

factory-method/src/main/java/com/iluwatar/factory/method/OrcBlacksmith.java

@@ -23,15 +23,26 @@
 
 package com.iluwatar.factory.method;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 
  * Concrete subclass for creating new objects.
  * 
  */
 public class OrcBlacksmith implements Blacksmith {
 
+  private static Map<WeaponType, OrcWeapon> ORCARSENAL;
+  static {
+    ORCARSENAL= new HashMap<>(WeaponType.values().length);
+	for (WeaponType type : WeaponType.values()) {
+	  ORCARSENAL.put(type, new OrcWeapon(type));
+	}
+  }
+
   @Override
   public Weapon manufactureWeapon(WeaponType weaponType) {
-    return new OrcWeapon(weaponType);
+    return ORCARSENAL.get(weaponType);
   }
 }