Lesson09 ObjectStreamStorage

Tanechka · Tanechka · commit 7a80d1d7feba · 2017-07-22T20:55:12.000-07:00
diff --git a/src/ru/javawebinar/basejava/model/Link.java b/src/ru/javawebinar/basejava/model/Link.java
@@ -1,12 +1,15 @@
 package ru.javawebinar.basejava.model;
 
+import java.io.Serializable;
 import java.util.Objects;
 
 /**
  * gkislin
  * 14.07.2016
  */
-public class Link {
+public class Link implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private final String name;
     private final String url;
 
diff --git a/src/ru/javawebinar/basejava/model/ListSection.java b/src/ru/javawebinar/basejava/model/ListSection.java
@@ -9,6 +9,9 @@
  * 14.07.2016
  */
 public class ListSection extends Section {
+
+    private static final long serialVersionUID = 1L;
+
     private final List<String> items;
 
     public ListSection(String... items) {
diff --git a/src/ru/javawebinar/basejava/model/Organization.java b/src/ru/javawebinar/basejava/model/Organization.java
@@ -1,5 +1,6 @@
 package ru.javawebinar.basejava.model;
 
+import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.Month;
 import java.util.ArrayList;
@@ -10,7 +11,9 @@
 import static ru.javawebinar.basejava.util.DateUtil.NOW;
 import static ru.javawebinar.basejava.util.DateUtil.of;
 
-public class Organization {
+public class Organization implements Serializable {
+    private static final long serialVersionUID = 1L;
+
     private final Link homePage;
     private List<Position> positions = new ArrayList<>();
 
@@ -46,7 +49,7 @@ public String toString() {
      * gkislin
      * 28.07.2016
      */
-    public static class Position {
+    public static class Position implements Serializable{
         private final LocalDate startDate;
         private final LocalDate endDate;
         private final String title;
diff --git a/src/ru/javawebinar/basejava/model/OrganizationSection.java b/src/ru/javawebinar/basejava/model/OrganizationSection.java
@@ -9,6 +9,9 @@
  * 19.07.2016
  */
 public class OrganizationSection extends Section {
+
+    private static final long serialVersionUID = 1L;
+
     private final List<Organization> organizations;
 
     public OrganizationSection(Organization... organizations) {
diff --git a/src/ru/javawebinar/basejava/model/Resume.java b/src/ru/javawebinar/basejava/model/Resume.java
@@ -1,15 +1,13 @@
 package ru.javawebinar.basejava.model;
 
+import java.io.Serializable;
 import java.util.EnumMap;
 import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 
-/**
- * com.urise.webapp.model.Resume class
- */
-public class Resume implements Comparable<Resume> {
-
+public class Resume implements Comparable<Resume>, Serializable {
+    private static final long serialVersionUID = 1L;
     // Unique identifier
     private final String uuid;
 
diff --git a/src/ru/javawebinar/basejava/model/Section.java b/src/ru/javawebinar/basejava/model/Section.java
@@ -1,8 +1,10 @@
 package ru.javawebinar.basejava.model;
 
+import java.io.Serializable;
+
 /**
  * gkislin
  * 19.07.2016
  */
-abstract public class Section {
+abstract public class Section implements Serializable{
 }
diff --git a/src/ru/javawebinar/basejava/model/TextSection.java b/src/ru/javawebinar/basejava/model/TextSection.java
@@ -3,6 +3,9 @@
 import java.util.Objects;
 
 public class TextSection extends Section {
+
+    private static final long serialVersionUID = 1L;
+
     private final String content;
 
     public TextSection(String content) {
diff --git a/src/ru/javawebinar/basejava/storage/AbstractFileStorage.java b/src/ru/javawebinar/basejava/storage/AbstractFileStorage.java
@@ -3,8 +3,7 @@
 import ru.javawebinar.basejava.exception.StorageException;
 import ru.javawebinar.basejava.model.Resume;
 
-import java.io.File;
-import java.io.IOException;
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -16,6 +15,10 @@
 public abstract class AbstractFileStorage extends AbstractStorage<File> {
     private File directory;
 
+    protected abstract void doWrite(Resume r, OutputStream os) throws IOException;
+
+    protected abstract Resume doRead(InputStream is) throws IOException;
+
     protected AbstractFileStorage(File directory) {
         Objects.requireNonNull(directory, "directory must not be null");
         if (!directory.isDirectory()) {
@@ -54,7 +57,7 @@ protected File getSearchKey(String uuid) {
     @Override
     protected void doUpdate(Resume r, File file) {
         try {
-            doWrite(r, file);
+            doWrite(r, new BufferedOutputStream(new FileOutputStream(file)));
         } catch (IOException e) {
             throw new StorageException("File write error", r.getUuid(), e);
         }
@@ -75,14 +78,10 @@ protected void doSave(Resume r, File file) {
         doUpdate(r, file);
     }
 
-    protected abstract void doWrite(Resume r, File file) throws IOException;
-
-    protected abstract Resume doRead(File file) throws IOException;
-
     @Override
     protected Resume doGet(File file) {
         try {
-            return doRead(file);
+            return doRead(new BufferedInputStream(new FileInputStream(file)));
         } catch (IOException e) {
             throw new StorageException("File read error", file.getName(), e);
         }
@@ -107,4 +106,4 @@ protected List<Resume> doCopyAll() {
         }
         return list;
     }
-}
+}
diff --git a/src/ru/javawebinar/basejava/storage/ObjectStreamStorage.java b/src/ru/javawebinar/basejava/storage/ObjectStreamStorage.java
@@ -0,0 +1,28 @@
+package ru.javawebinar.basejava.storage;
+
+import ru.javawebinar.basejava.exception.StorageException;
+import ru.javawebinar.basejava.model.Resume;
+
+import java.io.*;
+
+public class ObjectStreamStorage extends AbstractFileStorage {
+    protected ObjectStreamStorage(File directory) {
+        super(directory);
+    }
+
+    @Override
+    protected void doWrite(Resume r, OutputStream os) throws IOException {
+        try (ObjectOutputStream oos = new ObjectOutputStream(os)) {
+            oos.writeObject(r);
+        }
+    }
+
+    @Override
+    protected Resume doRead(InputStream is) throws IOException {
+        try (ObjectInputStream ois = new ObjectInputStream(is)) {
+            return (Resume) ois.readObject();
+        } catch (ClassNotFoundException e) {
+            throw new StorageException("Error read resume", null, e);
+        }
+    }
+}
diff --git a/test/ru/javawebinar/basejava/storage/AbstractStorageTest.java b/test/ru/javawebinar/basejava/storage/AbstractStorageTest.java
@@ -6,6 +6,7 @@
 import ru.javawebinar.basejava.exception.NotExistStorageException;
 import ru.javawebinar.basejava.model.*;
 
+import java.io.File;
 import java.time.Month;
 import java.util.Arrays;
 import java.util.List;
@@ -14,6 +15,8 @@
 import static org.junit.Assert.assertTrue;
 
 public abstract class AbstractStorageTest {
+    protected static final File STORAGE_DIR = new File("C:\\projects\\storage");
+
     protected Storage storage;
 
     private static final String UUID_1 = "uuid1";
@@ -84,7 +87,7 @@ public void clear() throws Exception {
     public void update() throws Exception {
         Resume newResume = new Resume(UUID_1, "New Name");
         storage.update(newResume);
-        assertTrue(newResume == storage.get(UUID_1));
+        assertTrue(newResume.equals(storage.get(UUID_1)));
     }
 
     @Test(expected = NotExistStorageException.class)
diff --git a/test/ru/javawebinar/basejava/storage/ObjectStreamStorageTest.java b/test/ru/javawebinar/basejava/storage/ObjectStreamStorageTest.java
@@ -0,0 +1,8 @@
+package ru.javawebinar.basejava.storage;
+
+public class ObjectStreamStorageTest extends AbstractStorageTest {
+
+    public ObjectStreamStorageTest() {
+        super(new ObjectStreamStorage(STORAGE_DIR));
+    }
+}
