for Merge

Egor97 · Egor97 · commit 4ea5e6e03cd8 · 2019-12-03T23:44:30.000+04:00
diff --git a/src/main/java/com/epam/izh/rd/online/Main.java b/src/main/java/com/epam/izh/rd/online/Main.java
@@ -2,12 +2,9 @@
 
 import com.epam.izh.rd.online.entity.Author;
 import com.epam.izh.rd.online.repository.SimpleAuthorRepository;
-import com.epam.izh.rd.online.service.AuthorService;
-import com.epam.izh.rd.online.service.SimpleAuthorService;
 
 import java.time.LocalDate;
 
-import static java.lang.System.console;
 import static java.lang.System.out;
 
 public class Main {
@@ -20,17 +17,19 @@ public static void main(String[] args) {
         SimpleAuthorRepository author1 = new SimpleAuthorRepository();
 
         out.println(author1.save(authorFirst));
+        out.println("-------------");
         out.println(author1.findByFullName(authorFirst.getName(), authorFirst.getLastName()));
         out.println(author1.findByFullName(authorSecond.getName(), authorSecond.getLastName()));
         out.println(author1.count());
         out.println(author1.save(authorThird));
-//        author1.countInArray();
+        out.println("-------------");
         out.println(author1.findByFullName(authorThird.getName(), authorThird.getLastName()));
         out.println(author1.count());
         out.println(author1.save(authorSecond));
+        out.println("-------------");
         out.println(author1.findByFullName(authorSecond.getName(), authorSecond.getLastName()));
         out.println(author1.count());
-//        author1.countInArray();
+
 
     }
 
diff --git a/src/main/java/com/epam/izh/rd/online/repository/SimpleAuthorRepository.java b/src/main/java/com/epam/izh/rd/online/repository/SimpleAuthorRepository.java
@@ -1,57 +1,40 @@
 package com.epam.izh.rd.online.repository;
 
 import com.epam.izh.rd.online.entity.Author;
+import com.epam.izh.rd.online.service.AuthorService;
 
 import java.util.Arrays;
 
 public class SimpleAuthorRepository implements AuthorRepository {
 
     @Override
     public boolean save(Author author) {
-        int countPropInArray = authors.length;
-        System.out.println(Arrays.toString(authors));
-        System.out.println(author.getName() + " " + author.getLastName());
-        if (authors.length == 0 ) {
+        if (authors.length == 0) {
             authors = new Author[1];
-            authors[0] = author;
+            authors[authors.length-1] = author;
+            return true;
         } else {
             for (int i = 0; i < authors.length; i++) {
-                if (authors[i].getName().equals(author.getName()) && authors[i].getLastName().equals(author.getLastName())) {
-                    break;
-                } else {
-                    authors = new Author[countPropInArray + 1];
+                if (author.getName().equals(authors[i].getName()) && author.getLastName().equals(authors[i].getLastName())) {
+                    return false;
                 }
             }
-        }
 
-//        authors
-        Author[] arraysForCopy = Arrays.copyOf(authors, authors.length);
-
-//        System.out.println(Arrays.toString(arraysForCopy));
-//        authors =  Arrays.copyOf(arraysForCopy, arraysForCopy.length)
-//        System.out.println(Arrays.toString(authors));
-        if (authors.length != countPropInArray) {
-            authors[authors.length-1] = author;
+            Author[] arrayForCopy = Arrays.copyOf(authors, authors.length + 1);
+            authors = Arrays.copyOf(arrayForCopy, arrayForCopy.length);
+            authors[authors.length - 1] = author;
             return true;
         }
-
-        return false;
     }
 
     @Override
     public Author findByFullName(String name, String lastname) {
-        for (int i = 0; i < authors.length; i++) {
-            if (authors[i].getName().equals(name) && authors[i].getLastName().equals(lastname)) {
-                return authors[i];
+        for (Author element: authors) {
+            if (element.getName().equals(name) && element.getLastName().equals(lastname)){
+                return element;
             }
         }
-//        for (Author element : authors) {
-//            if (element.getName().equals(name) && element.getLastName().equals(lastname)) {
-//                return element;
-//            }
-//        }
-
-        return null;
+    return null;
     }
 
     @Override
@@ -77,10 +60,6 @@ public boolean remove(Author author) {
         }
     }
 
-//    public void countInArray(){
-//        System.out.println(Arrays.toString(authors));
-//    }
-
     @Override
     public int count() {
         return authors.length;
