patch

Matserator · Matserator · commit 95877a3d289f · 2021-11-04T22:53:19.000+02:00
diff --git a/src/Resume.java b/src/Resume.java
diff --git a/src/ru/javawebinar/basejava/MainArray.java b/src/ru/javawebinar/basejava/MainArray.java
@@ -1,3 +1,8 @@
+package ru.javawebinar.basejava;
+
+import ru.javawebinar.basejava.model.Resume;
+import ru.javawebinar.basejava.storage.ArrayStorage;
+
 /**
  *
  * Test for ArrayStorage
@@ -7,21 +12,21 @@ public class MainArray {
 
     public static void main(String[] args) {
         Resume r1 = new Resume();
-        r1.uuid = "uuid1";
+        r1.setUuid("uuid1");
         Resume r2 = new Resume();
-        r2.uuid = "uuid2";
+        r2.setUuid("uuid2");
         Resume r3 = new Resume();
-        r3.uuid = "uuid3";
+        r3.setUuid("uuid3");
 
         arrayStorage.save(r1);
         arrayStorage.save(r2);
         arrayStorage.save(r3);
 
-        System.out.println("Get r1: " + arrayStorage.get(r1.uuid));
+        System.out.println("Get r1: " + arrayStorage.get(r1.getUuid()));
         System.out.println("Size: " + arrayStorage.size());
 
         printAll();
-        arrayStorage.delete(r1.uuid);
+        arrayStorage.delete(r1.getUuid());
         printAll();
         arrayStorage.clear();
         printAll();
diff --git a/src/ru/javawebinar/basejava/model/Resume.java b/src/ru/javawebinar/basejava/model/Resume.java
@@ -0,0 +1,23 @@
+package ru.javawebinar.basejava.model;
+
+/**
+ * ru.javawebinar.basejava.model.Resume class
+ */
+public class Resume {
+
+    // Unique identifier
+    private String uuid;
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    @Override
+    public String toString() {
+        return uuid;
+    }
+}
diff --git a/src/ru/javawebinar/basejava/storage/ArrayStorage.java b/src/ru/javawebinar/basejava/storage/ArrayStorage.java
@@ -1,3 +1,7 @@
+package ru.javawebinar.basejava.storage;
+
+import ru.javawebinar.basejava.model.Resume;
+
 import java.util.Arrays;
 
 /**
@@ -25,7 +29,7 @@ public void save(Resume r) {
 
     public Resume get(String uuid) {
         for (int i = 0; i < size; i++) {
-            if (uuid.equals(storage[i].uuid)) {
+            if (uuid.equals(storage[i].getUuid())) {
                 return storage[i];
             }
         }
@@ -36,7 +40,7 @@ public Resume get(String uuid) {
     public void delete(String uuid) {
         // TODO check if resume present
         for (int i = 0; i < size; i++) {
-            if (uuid.equals(storage[i].uuid)) {
+            if (uuid.equals(storage[i].getUuid())) {
                 storage[i] = storage[size - 1];
                 storage[size - 1] = null;
                 size--;
@@ -49,9 +53,8 @@ public void delete(String uuid) {
      */
 
     public Resume[] getAll() {
-        Resume[] result = new Resume[size];
-        result = Arrays.copyOf(storage, size);
-        return result;
+        return Arrays.copyOf(storage, size);
+
 
     }
 
