JavaDependencyInjection

src/main/java/mate.academy/Main.java

@@ -1,17 +1,12 @@
 package mate.academy;
 
-import java.util.List;
 import mate.academy.lib.Injector;
-import mate.academy.model.Product;
 import mate.academy.service.ProductService;
 
 public class Main {
-
     public static void main(String[] args) {
-        // Please test your Injector here. Feel free to push this class as a part of your solution
         Injector injector = Injector.getInjector();
-        ProductService productService = null;
-        List<Product> products = productService.getAllFromFile("products.txt");
-        products.forEach(System.out::println);
+        ProductService productService = injector.getInstance(ProductService.class);
+        productService.getAllProducts().forEach(System.out::println);
     }
 }

src/main/java/mate.academy/lib/Component.java

@@ -1,5 +1,11 @@
 package mate.academy.lib;
 
-public @interface Component {
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Component {
 }

src/main/java/mate.academy/lib/Inject.java

@@ -1,5 +1,8 @@
 package mate.academy.lib;
 
-public @interface Inject {
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Inject {
 }

src/main/java/mate.academy/lib/Injector.java

@@ -1,13 +1,40 @@
 package mate.academy.lib;
 
+import java.util.HashMap;
+import java.util.Map;
+import mate.academy.service.FileReaderService;
+import mate.academy.service.ProductParser;
+import mate.academy.service.ProductService;
+import mate.academy.service.impl.FileReaderServiceImpl;
+import mate.academy.service.impl.ProductParserImpl;
+import mate.academy.service.impl.ProductServiceImpl;
+
 public class Injector {
+    private static final Map<Class<?>, Class<?>> interfaceToImplementation = new HashMap<>();
     private static final Injector injector = new Injector();
 
+    static {
+        interfaceToImplementation.put(ProductService.class, ProductServiceImpl.class);
+        interfaceToImplementation.put(ProductParser.class, ProductParserImpl.class);
+        interfaceToImplementation.put(FileReaderService.class, FileReaderServiceImpl.class);
+    }
+
+    private Injector() {
+    }
+
     public static Injector getInjector() {
         return injector;
     }
 
-    public Object getInstance(Class<?> interfaceClazz) {
-        return null;
+    public <T> T getInstance(Class<T> interfaceClazz) {
+        Class<?> implClass = interfaceToImplementation.get(interfaceClazz);
+        if (implClass == null) {
+            throw new RuntimeException("No implementation found for " + interfaceClazz.getName());
+        }
+        try {
+            return (T) implClass.getDeclaredConstructor().newInstance();
+        } catch (Exception e) {
+            throw new RuntimeException("Can't create instance of " + implClass.getName(), e);
+        }
     }
 }

src/main/java/mate.academy/model/Product.java

@@ -3,18 +3,12 @@
 import java.math.BigDecimal;
 
 public class Product {
-    private Long id;
     private String name;
-    private String category;
-    private String description;
     private BigDecimal price;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
+    public Product(String name, BigDecimal price) {
+        this.name = name;
+        this.price = price;
     }
 
     public String getName() {
@@ -25,38 +19,11 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public String getCategory() {
-        return category;
-    }
-
-    public void setCategory(String category) {
-        this.category = category;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
     public BigDecimal getPrice() {
         return price;
     }
 
     public void setPrice(BigDecimal price) {
         this.price = price;
     }
-
-    @Override
-    public String toString() {
-        return "Product{"
-                + "id=" + id
-                + ", name='" + name + '\''
-                + ", category='" + category + '\''
-                + ", description='" + description + '\''
-                + ", price=" + price
-                + '}';
-    }
 }

src/main/java/mate.academy/service/ProductParser.java

@@ -3,12 +3,5 @@
 import mate.academy.model.Product;
 
 public interface ProductParser {
-    /**
-     * Parse the productInfo and return created {@link Product} object.
-     * The `productInfo` could be received from any source.
-     * For example from file with all products stored in the shop.
-     * @param productInfo - the information about a product
-     * @return newly create {@link Product} object based on the `productInfo` input.
-     */
-    Product parse(String productInfo);
+    Product parse(String line);
 }

src/main/java/mate.academy/service/ProductService.java

@@ -4,5 +4,7 @@
 import mate.academy.model.Product;
 
 public interface ProductService {
-    List<Product> getAllFromFile(String filePath);
+    List<Product> getAllProducts();
+
+    List<Product> getAllFromFile(String fileName);
 }

src/main/java/mate.academy/service/impl/FileReaderServiceImpl.java

@@ -4,15 +4,19 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.List;
+import java.util.stream.Collectors;
+import mate.academy.lib.Component;
 import mate.academy.service.FileReaderService;
 
+@Component
 public class FileReaderServiceImpl implements FileReaderService {
     @Override
     public List<String> readFile(String fileName) {
         try {
-            return Files.readAllLines(new File(fileName).toPath());
+            return Files.lines(new File(fileName).toPath())
+                    .collect(Collectors.toList());
         } catch (IOException e) {
-            throw new RuntimeException("Can't read file: " + fileName, e);
+            throw new RuntimeException("Can't read file " + fileName, e);
         }
     }
 }

src/main/java/mate.academy/service/impl/ProductParserImpl.java

@@ -1,25 +1,17 @@
 package mate.academy.service.impl;
 
 import java.math.BigDecimal;
+import mate.academy.lib.Component;
 import mate.academy.model.Product;
 import mate.academy.service.ProductParser;
 
+@Component
 public class ProductParserImpl implements ProductParser {
-    public static final int ID_POSITION = 0;
-    public static final int NAME_POSITION = 1;
-    public static final int CATEGORY_POSITION = 2;
-    public static final int DESCRIPTION_POSITION = 3;
-    public static final int PRICE_POSITION = 4;
-
     @Override
-    public Product parse(String productInfo) {
-        String[] data = productInfo.split(",");
-        Product product = new Product();
-        product.setId(Long.valueOf(data[ID_POSITION]));
-        product.setName(data[NAME_POSITION]);
-        product.setCategory(data[CATEGORY_POSITION]);
-        product.setDescription(data[DESCRIPTION_POSITION]);
-        product.setPrice(new BigDecimal(data[PRICE_POSITION]));
-        return product;
+    public Product parse(String line) {
+        String[] parts = line.split(",");
+        String name = parts[0];
+        BigDecimal price = new BigDecimal(parts[1]);
+        return new Product(name, price);
     }
 }

src/main/java/mate.academy/service/impl/ProductServiceImpl.java

@@ -2,18 +2,31 @@
 
 import java.util.List;
 import java.util.stream.Collectors;
+import mate.academy.lib.Component;
+import mate.academy.lib.Inject;
 import mate.academy.model.Product;
 import mate.academy.service.FileReaderService;
 import mate.academy.service.ProductParser;
 import mate.academy.service.ProductService;
 
+@Component
 public class ProductServiceImpl implements ProductService {
+    @Inject
     private ProductParser productParser;
+    @Inject
     private FileReaderService fileReaderService;
 
     @Override
-    public List<Product> getAllFromFile(String filePath) {
-        return fileReaderService.readFile(filePath)
+    public List<Product> getAllProducts() {
+        return fileReaderService.readFile("products.txt")
+                .stream()
+                .map(productParser::parse)
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Product> getAllFromFile(String fileName) {
+        return fileReaderService.readFile(fileName)
                 .stream()
                 .map(productParser::parse)
                 .collect(Collectors.toList());