refactored Resume[] getAll() to List<Resume> getAllSorted()

src/MainArray.java

@@ -1,3 +1,4 @@
+import java.util.List;
 import ru.javawebinar.basejava.model.Resume;
 import ru.javawebinar.basejava.storage.ArrayStorage;
 import java.io.BufferedReader;
@@ -65,9 +66,9 @@ public static void main(String[] args) throws IOException {
   }
 
   static void printAll() {
-    Resume[] all = ARRAY_STORAGE.getAll();
+    List<Resume> all = ARRAY_STORAGE.getAllSorted();
     System.out.println("----------------------------");
-    if (all.length == 0) {
+    if (all.size() == 0) {
       System.out.println("Empty");
     } else {
       for (Resume r : all) {

src/MainTestArrayStorage.java

@@ -34,7 +34,7 @@ public static void main(String[] args) {
 
   static void printAll() {
     System.out.println("\nGet All");
-    for (Resume r : ARRAY_STORAGE.getAll()) {
+    for (Resume r : ARRAY_STORAGE.getAllSorted()) {
       System.out.println(r);
     }
   }

src/ru/javawebinar/basejava/model/Resume.java

@@ -6,7 +6,7 @@
 /**
  * Initial resume class
  */
-public class Resume {
+public class Resume implements Comparable<Resume> {
 
   // Unique identifier
   private final String uuid;
@@ -51,4 +51,10 @@ public String toString() {
         ", fullName='" + fullName + '\'' +
         '}';
   }
+
+  @Override
+  public int compareTo(Resume o) {
+    int compareFullName = fullName.compareTo(o.fullName);
+    return compareFullName != 0 ? compareFullName : uuid.compareTo(o.uuid);
+  }
 }

src/ru/javawebinar/basejava/storage/AbstractArrayStorage.java

@@ -1,8 +1,7 @@
 package ru.javawebinar.basejava.storage;
 
 import java.util.Arrays;
-import ru.javawebinar.basejava.exception.ExistStorageException;
-import ru.javawebinar.basejava.exception.NotExistStorageException;
+import java.util.List;
 import ru.javawebinar.basejava.exception.StorageException;
 import ru.javawebinar.basejava.model.Resume;
 
@@ -57,8 +56,9 @@ public Resume doGet(Object index) {
   /**
    * @return array, contains only Resumes in storage (without null)
    */
-  public Resume[] getAll() {
-    return Arrays.copyOf(storage, storageSize);
+  @Override
+  public List<Resume> doCopyAll() {
+    return Arrays.asList(Arrays.copyOf(storage, storageSize));
   }
 
   public void clear() {

src/ru/javawebinar/basejava/storage/AbstractStorage.java

@@ -1,5 +1,7 @@
 package ru.javawebinar.basejava.storage;
 
+import java.util.Collections;
+import java.util.List;
 import ru.javawebinar.basejava.exception.ExistStorageException;
 import ru.javawebinar.basejava.exception.NotExistStorageException;
 import ru.javawebinar.basejava.model.Resume;
@@ -18,6 +20,8 @@ public abstract class AbstractStorage implements Storage {
 
   protected abstract Resume doGet(Object searchKey);
 
+  protected abstract List<Resume> doCopyAll();
+
   public void update(Resume r) {
     Object searchKey = getExistedSearchKey(r.getUuid());
     doUpdate(r, searchKey);
@@ -43,7 +47,6 @@ private Object getNotExistedSearchKey(String uuid) {
     if (isExist(searchKey)) {
       throw new ExistStorageException(uuid);
     }
-    // TODO: Возвращать ключ в рамках которого можно положить следующую запись
     return searchKey;
   }
 
@@ -54,4 +57,11 @@ private Object getExistedSearchKey(String uuid) {
     }
     return searchKey;
   }
+
+  @Override
+  public List<Resume> getAllSorted() {
+    List<Resume> list = doCopyAll();
+    Collections.sort(list);
+    return list;
+  }
 }

src/ru/javawebinar/basejava/storage/ListStorage.java

@@ -2,9 +2,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
-import ru.javawebinar.basejava.exception.ExistStorageException;
-import ru.javawebinar.basejava.exception.NotExistStorageException;
 import ru.javawebinar.basejava.model.Resume;
 
 public class ListStorage extends AbstractStorage {
@@ -52,8 +49,8 @@ public void doDelete(Object index) {
   }
 
   @Override
-  public Resume[] getAll() {
-    return storage.toArray(new Resume[storage.size()]);
+  public List<Resume> doCopyAll() {
+    return new ArrayList<>(storage);
   }
 
   @Override

src/ru/javawebinar/basejava/storage/Storage.java

@@ -1,5 +1,6 @@
 package ru.javawebinar.basejava.storage;
 
+import java.util.List;
 import ru.javawebinar.basejava.model.Resume;
 
 public interface Storage {
@@ -17,7 +18,7 @@ public interface Storage {
   /**
    * @return array, contains only Resumes in storage (without null)
    */
-  Resume[] getAll();
+  List<Resume> getAllSorted();
 
   int size();
 }

test/ru/javawebinar/basejava/storage/AbstractStorageTest.java

@@ -1,6 +1,8 @@
 package ru.javawebinar.basejava.storage;
 
 
+import java.util.Arrays;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
@@ -92,12 +94,10 @@ public void getNotExist() throws Exception {
   }
 
   @Test
-  public void getAll() throws Exception {
-    Resume[] testStorage = storage.getAll();
-    Assertions.assertEquals(3, testStorage.length);
-    Assertions.assertEquals(RESUME_1, testStorage[0]);
-    Assertions.assertEquals(RESUME_2, testStorage[1]);
-    Assertions.assertEquals(RESUME_3, testStorage[2]);
+  public void getAllSorted() throws Exception {
+    List<Resume> testStorage = storage.getAllSorted();
+    Assertions.assertEquals(3, testStorage.size());
+    Assertions.assertEquals(testStorage, Arrays.asList(RESUME_1, RESUME_2,RESUME_3));
   }
 
   @Test