Lesson 6

AlbertoJava · AlbertoJava · commit 13e623a2c0e3 · 2019-08-16T11:25:44.000+03:00
finish
diff --git a/src/com/urise/webapp/storage/AbstractArrayStorage.java b/src/com/urise/webapp/storage/AbstractArrayStorage.java
@@ -4,14 +4,16 @@
 import com.urise.webapp.model.Resume;
 
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 
 public abstract class AbstractArrayStorage extends AbstractStorage {
     protected static final int MAX_SIZE = 10_000;
-
+    protected final Comparator<Resume> RESUME_COMPARATOR_UUID = Comparator.comparing(Resume::getUuid);
     protected Resume[] storage = new Resume[MAX_SIZE];
     protected int resumeCounter = 0;
 
+    @Override
     public void clear() {
         Arrays.fill(storage, 0, resumeCounter, null);
         resumeCounter = 0;
@@ -29,12 +31,6 @@ public void doDelete(Object index) {
         resumeCounter--;
     }
 
-    public List<Resume> getAllSorted() {
-        List<Resume> sortedList = doCopyAll();
-        sortedList.sort(RESUME_COMPARATOR_FULLNAME);
-        return sortedList;
-    }
-
     @Override
     protected void doUpdate(Resume resume, Object index) {
         storage[(Integer) index] = resume;
@@ -54,6 +50,7 @@ protected List<Resume> doCopyAll() {
         return Arrays.asList(Arrays.copyOfRange(storage, 0, resumeCounter));
     }
 
+    @Override
     public int size() {
         return resumeCounter;
     }
diff --git a/src/com/urise/webapp/storage/AbstractStorage.java b/src/com/urise/webapp/storage/AbstractStorage.java
@@ -10,7 +10,6 @@
 
 
 public abstract class AbstractStorage implements Storage {
-    protected final Comparator<Resume> RESUME_COMPARATOR_UUID = Comparator.comparing(Resume::getUuid);
     protected final Comparator<Resume> RESUME_COMPARATOR_FULLNAME = Comparator.comparing(Resume::getFullName).thenComparing(Resume::getUuid);
 
     protected abstract void doUpdate(Resume resume, Object searchKey);
diff --git a/src/com/urise/webapp/storage/ArrayStorage.java b/src/com/urise/webapp/storage/ArrayStorage.java
@@ -8,6 +8,7 @@
  */
 public class ArrayStorage extends AbstractArrayStorage {
 
+    @Override
     protected Integer getSearchKey(String uuid) {
         for (int i = 0; i < resumeCounter; i++) {
             if (storage[i].getUuid().equals(uuid)) {
