java sprint 5 v1.1

Author: 1EVILGUN1

src/ru/yandex/javacource/golotin/schedule/service/HistoryManager.java

@@ -0,0 +1,13 @@
+package ru.yandex.javacource.golotin.schedule.service;
+
+import java.util.List;
+
+import ru.yandex.javacource.golotin.schedule.model.Task;
+
+public interface HistoryManager {
+    void add(Task task);
+
+    List<Task> getHistory();
+
+
+}

src/ru/yandex/javacource/golotin/schedule/service/InMemoryHistoryManager.java

@@ -0,0 +1,31 @@
+package ru.yandex.javacource.golotin.schedule.service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import ru.yandex.javacource.golotin.schedule.model.Task;
+import ru.yandex.javacource.golotin.schedule.service.HistoryManager;
+
+public class InMemoryHistoryManager implements HistoryManager {
+    private final int ARRAY_SIZE = 10;
+    List<Task> history = new ArrayList<>();
+
+    @Override
+    public void add(Task task) {
+        if (task == null) {
+            return;
+        }
+        if (history.size() < ARRAY_SIZE) {
+
+            history.add(task);
+        } else {
+            history.remove(0);
+            history.add(task);
+        }
+    }
+
+    @Override
+    public List<Task> getHistory() {
+        return history;
+    }
+}

src/ru/yandex/javacource/golotin/schedule/service/InMemoryTaskManager.java

@@ -7,14 +7,19 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 
 
 public class InMemoryTaskManager implements TaskManager {
+    //private final HistoryManager historyManager;
+    // this.historyManager = historyManager;
     private int counterId = 0;
-    private final HashMap<Integer, Task> tasks = new HashMap<>();
-    private final HashMap<Integer, Epic> epics = new HashMap<>();
-    private final HashMap<Integer, Subtask> subtasks = new HashMap<>();
-    private final ArrayList<Object> history = new ArrayList<>(10);
+    private final Map<Integer, Task> tasks = new HashMap<>();
+    private final Map<Integer, Epic> epics = new HashMap<>();
+    private final Map<Integer, Subtask> subtasks = new HashMap<>();
+
+    InMemoryHistoryManager history = new InMemoryHistoryManager();
+
 
     @Override
     public Task createTask(Task task) {
@@ -155,38 +160,33 @@ public ArrayList<Subtask> getEpicSubtasks(int epicId) {
 
     @Override
     public Task getTask(int id) {
-        checkArray(tasks.get(id));
+        history.add(tasks.get(id));
         return tasks.get(id);
 
     }
 
     @Override
     public Epic getEpic(int id) {
-        checkArray(epics.get(id));
+        history.add(epics.get(id));
         return epics.get(id);
     }
 
     @Override
     public Subtask getSubtask(int id) {
-        checkArray(subtasks.get(id));
+        history.add(subtasks.get(id));
         return subtasks.get(id);
     }
 
-    @Override
-    public <T> ArrayList<T> getHistory() {
-        System.out.println(history.size());
-        return (ArrayList<T>) history;
-    }
 
-    public HashMap<Integer, Task> getTask() {
+    public Map<Integer, Task> getTask() {
         return tasks;
     }
 
-    public HashMap<Integer, Epic> getEpic() {
+    public Map<Integer, Epic> getEpic() {
         return epics;
     }
 
-    public HashMap<Integer, Subtask> getSubtask() {
+    public Map<Integer, Subtask> getSubtask() {
         return subtasks;
     }
 
@@ -222,13 +222,4 @@ private void updateEpicStatus(int epicId) {
         }
     }
 
-    private <T> void checkArray(T t) {
-        if (history.size() < 10) {
-
-            history.add(t);
-        } else {
-            history.remove(0);
-            history.add(t);
-        }
-    }
 }

src/ru/yandex/javacource/golotin/schedule/service/Manager.java

@@ -1,7 +1,11 @@
 package ru.yandex.javacource.golotin.schedule.service;
 
 public class Manager {
-    public static TaskManager getDefaults(){
+    public static TaskManager getDefaults() {
         return new InMemoryTaskManager();
     }
+
+    public static InMemoryHistoryManager getDefaultHistory() {
+        return new InMemoryHistoryManager();
+    }
 }

src/ru/yandex/javacource/golotin/schedule/service/TaskManager.java

@@ -5,6 +5,7 @@
 import ru.yandex.javacource.golotin.schedule.model.Task;
 
 import java.util.ArrayList;
+import java.util.List;
 
 public interface TaskManager {
     Task createTask(Task task);
@@ -31,18 +32,17 @@ public interface TaskManager {
 
     void deleteEpic(int id);
 
-    ArrayList<Task> getTasks();
+    List<Task> getTasks();
 
-    ArrayList<Epic> getEpics();
+    List<Epic> getEpics();
 
-    ArrayList<Subtask> getEpicSubtasks(int epicId);
+    List<Subtask> getEpicSubtasks(int epicId);
 
     Task getTask(int id);
 
     Epic getEpic(int id);
 
     Subtask getSubtask(int id);
 
-    <T> ArrayList<T> getHistory();
 
 }

src/ru/yandex/javacource/golotin/schedule/test/model/EpicTest.java renamed to test/ru/yandex/javacource/golotin/schedule/module/EpicTest.java

@@ -8,6 +8,7 @@
 
 
 import java.util.ArrayList;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -74,7 +75,7 @@ void shouldGetTasks() {
         taskManager.createTask(task);
         taskManager.createTask(task2);
 
-        ArrayList<Task> tasks = new ArrayList<>();
+        List<Task> tasks = new ArrayList<>();
         tasks.add(task);
         tasks.add(task2);
         assertEquals(tasks, taskManager.getTasks());