java sprint 5 v1.2

Author: 1EVILGUN1

.idea/misc.xml

@@ -7,21 +7,18 @@
 import ru.yandex.javacource.golotin.schedule.service.HistoryManager;
 
 public class InMemoryHistoryManager implements HistoryManager {
-    private final int ARRAY_SIZE = 10;
-    List<Task> history = new ArrayList<>();
+    private static final int HISTOY_MAX_SIZE = 10;
+    private final List<Task> history = new ArrayList<>();
 
     @Override
     public void add(Task task) {
         if (task == null) {
             return;
         }
-        if (history.size() < ARRAY_SIZE) {
-
-            history.add(task);
-        } else {
+        if (history.size() >= HISTOY_MAX_SIZE) {
             history.remove(0);
-            history.add(task);
         }
+        history.add(task);
     }
 
     @Override

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

@@ -7,18 +7,17 @@
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 
 public class InMemoryTaskManager implements TaskManager {
-    //private final HistoryManager historyManager;
-    // this.historyManager = historyManager;
     private int counterId = 0;
     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();
+    private final HistoryManager historyManager = Manager.getDefaultHistory();
 
 
     @Override
@@ -160,34 +159,29 @@ public ArrayList<Subtask> getEpicSubtasks(int epicId) {
 
     @Override
     public Task getTask(int id) {
-        history.add(tasks.get(id));
-        return tasks.get(id);
+        final Task task = tasks.get(id);
+        historyManager.add(task);
+        return task;
 
     }
 
     @Override
     public Epic getEpic(int id) {
-        history.add(epics.get(id));
-        return epics.get(id);
+        final Epic epic = epics.get(id);
+        historyManager.add(epic);
+        return epic;
     }
 
     @Override
     public Subtask getSubtask(int id) {
-        history.add(subtasks.get(id));
-        return subtasks.get(id);
-    }
-
-
-    public Map<Integer, Task> getTask() {
-        return tasks;
-    }
-
-    public Map<Integer, Epic> getEpic() {
-        return epics;
+        final Subtask subtask = subtasks.get(id);
+        historyManager.add(subtask);
+        return subtask;
     }
 
-    public Map<Integer, Subtask> getSubtask() {
-        return subtasks;
+    @Override
+    public List<Task> getHistory() {
+        return historyManager.getHistory();
     }
 
     private void updateEpicStatus(int epicId) {

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

@@ -44,5 +44,6 @@ public interface TaskManager {
 
     Subtask getSubtask(int id);
 
+    List<Task> getHistory();
 
 }

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

@@ -35,7 +35,7 @@ void shouldCreateTask() {
         Task clone = taskManager.getTask(result.getId());
         assertEquals(clone.getId(), result.getId());
         assertEquals(clone.getName(), result.getName());
-        assertTrue(taskManager.getTask().containsValue(task));
+        assertTrue(taskManager.getTasks().containsValue(task));
 
     }
 
@@ -65,7 +65,7 @@ void shouldCleanTask() {
         taskManager.createTask(task);
         taskManager.createTask(task2);
         taskManager.cleanTasks();
-        assertEquals(taskManager.getTask(), taskManager.getEpic());
+        assertEquals(taskManager.getTasks(), taskManager.getEpics());
     }
 
     @Test