fix abstract factory ex

Author: lor6

patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractFactory.java

@@ -1,6 +1,5 @@
 package com.baeldung.creational.abstractfactory;
 
-public interface AbstractFactory {
-    Animal getAnimal(String toyType) ;
-    Color getColor(String colorType);
+public interface AbstractFactory<T> {
+    T create(String type) ;
 }

patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AbstractPatternDriver.java

@@ -6,10 +6,10 @@ public static void main(String[] args) {
 
         //creating a brown toy dog
         abstractFactory = FactoryProvider.getFactory("Toy");
-        Animal toy = abstractFactory.getAnimal("Dog");
+        Animal toy =(Animal) abstractFactory.create("Dog");
 
         abstractFactory = FactoryProvider.getFactory("Color");
-        Color color = abstractFactory.getColor("Brown");
+        Color color =(Color) abstractFactory.create("Brown");
 
         String result = "A " + toy.getType() + " with " + color.getColor() + " color " + toy.makeSound();
 

patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/AnimalFactory.java

@@ -1,9 +1,9 @@
 package com.baeldung.creational.abstractfactory;
 
-public class AnimalFactory implements AbstractFactory {
+public class AnimalFactory implements AbstractFactory<Animal> {
 
     @Override
-    public Animal getAnimal(String animalType) {
+    public Animal create(String animalType) {
         if ("Dog".equalsIgnoreCase(animalType)) {
             return new Dog();
         } else if ("Duck".equalsIgnoreCase(animalType)) {
@@ -13,9 +13,4 @@ public Animal getAnimal(String animalType) {
         return null;
     }
 
-    @Override
-    public Color getColor(String color) {
-        throw new UnsupportedOperationException();
-    }
-
 }

patterns/design-patterns/src/main/java/com/baeldung/creational/abstractfactory/ColorFactory.java

@@ -1,9 +1,9 @@
 package com.baeldung.creational.abstractfactory;
 
-public class ColorFactory implements AbstractFactory {
+public class ColorFactory implements AbstractFactory<Color> {
 
     @Override
-    public Color getColor(String colorType) {
+    public Color create(String colorType) {
         if ("Brown".equalsIgnoreCase(colorType)) {
             return new Brown();
         } else if ("White".equalsIgnoreCase(colorType)) {
@@ -13,9 +13,4 @@ public Color getColor(String colorType) {
         return null;
     }
 
-    @Override
-    public Animal getAnimal(String toyType) {
-        throw new UnsupportedOperationException();
-    }
-
 }

patterns/design-patterns/src/test/java/com/baeldung/creational/abstractfactory/AbstractPatternIntegrationTest.java

@@ -11,10 +11,10 @@ public void givenAbstractFactory_whenGettingObjects_thenSuccessful() {
 
         //creating a brown toy dog
         abstractFactory = FactoryProvider.getFactory("Toy");
-        Animal toy = abstractFactory.getAnimal("Dog");
+        Animal toy = (Animal) abstractFactory.create("Dog");
 
         abstractFactory = FactoryProvider.getFactory("Color");
-        Color color = abstractFactory.getColor("Brown");
+        Color color =(Color) abstractFactory.create("Brown");
 
         String result = "A " + toy.getType() + " with " + color.getColor() + " color " + toy.makeSound();
         assertEquals("A Dog with brown color Barks", result);