lesson 9

AlbertoJava · AlbertoJava · commit b79f7cbec2e3 · 2019-10-08T17:23:53.000+03:00
&#1076;&#1086;&#1073;&#1072;&#1074;&#1083;&#1077;&#1085; &#1080;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089; StreamSerializer
diff --git a/src/com/urise/webapp/storage/FileStorage.java b/src/com/urise/webapp/storage/FileStorage.java
@@ -2,17 +2,20 @@
 
 import com.urise.webapp.exception.StorageException;
 import com.urise.webapp.model.Resume;
+import com.urise.webapp.storage.serializer.StreamSerializer;
 
 import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-public abstract class AbstractFileStorage extends AbstractStorage {
+public class FileStorage extends AbstractStorage {
     private File directory;
+    private StreamSerializer streamSerializer;
 
-    protected AbstractFileStorage(File directory) {
+    protected FileStorage(File directory, StreamSerializer streamSerializer) {
         Objects.requireNonNull(directory, "directory must not null");
+        this.streamSerializer=streamSerializer;
         if (!directory.isDirectory()) {
             throw new IllegalArgumentException(directory.getAbsolutePath() + " is not directory");
         }
@@ -22,15 +25,12 @@ protected AbstractFileStorage(File directory) {
         this.directory = directory;
     }
 
-    protected abstract void doWrite(Resume resume, OutputStream os) throws IOException;
-
-    protected abstract Resume doRead(InputStream is) throws IOException;
 
     @Override
     protected void doUpdate(Resume resume, Object searchKey) {
         File file = (File) searchKey;
         try {
-            doWrite(resume, new BufferedOutputStream(new FileOutputStream(file)));
+            streamSerializer.doWrite(resume, new BufferedOutputStream(new FileOutputStream(file)));
         } catch (IOException e) {
             throw new StorageException("File write error", resume.getUuid(), e);
         }
@@ -57,7 +57,7 @@ protected void doSave(Resume resume, Object file) {
     protected Resume doGet(Object searchKey) {
         File file = (File) searchKey;
         try {
-            return doRead(new BufferedInputStream(new FileInputStream(file)));
+            return streamSerializer.doRead(new BufferedInputStream(new FileInputStream(file)));
         } catch (IOException e) {
             throw new StorageException("File read error", file.getName(), e);
         }
diff --git a/src/com/urise/webapp/storage/ObjectStreamStorage.java b/src/com/urise/webapp/storage/ObjectStreamStorage.java
@@ -2,24 +2,21 @@
 
 import com.urise.webapp.exception.StorageException;
 import com.urise.webapp.model.Resume;
+import com.urise.webapp.storage.serializer.StreamSerializer;
 
 import java.io.*;
 
-public class ObjectStreamStorage extends AbstractFileStorage {
-
-    public ObjectStreamStorage(File directory) {
-        super(directory);
-    }
+public class ObjectStreamStorage implements StreamSerializer {
 
     @Override
-    protected void doWrite(Resume resume, OutputStream os) throws IOException {
+    public void doWrite(Resume resume, OutputStream os) throws IOException {
         try (ObjectOutputStream oos = new ObjectOutputStream(os)) {
             oos.writeObject(resume);
         }
     }
 
     @Override
-    protected Resume doRead(InputStream is) throws IOException {
+    public Resume doRead(InputStream is) throws IOException {
         try (ObjectInputStream ois = new ObjectInputStream(is)) {
             return (Resume) ois.readObject();
         } catch (ClassNotFoundException e) {
diff --git a/src/com/urise/webapp/storage/PathStorage.java b/src/com/urise/webapp/storage/PathStorage.java
@@ -2,6 +2,7 @@
 
 import com.urise.webapp.exception.StorageException;
 import com.urise.webapp.model.Resume;
+import com.urise.webapp.storage.serializer.StreamSerializer;
 
 import java.io.*;
 import java.nio.file.Files;
@@ -13,27 +14,25 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-public abstract class AbstractPathStorage extends AbstractStorage {
+public class PathStorage extends AbstractStorage {
     private Path directory;
+    private StreamSerializer streamSerializer;
 
-    protected AbstractPathStorage(String dir) {
+    protected PathStorage(String dir, StreamSerializer streamSerializer) {
         Path directory = Paths.get(dir);
         Objects.requireNonNull(directory, "directory must not null");
+        this.streamSerializer=streamSerializer;
         if (!Files.isDirectory(directory)||!Files.isWritable(directory) ) {
             throw new IllegalArgumentException(dir + " is not directory or is not writable");
         }
         this.directory = directory;
     }
 
-    protected abstract void doWrite(Resume resume, OutputStream os) throws IOException;
-
-    protected abstract Resume doRead(InputStream is) throws IOException;
-
     @Override
     protected void doUpdate(Resume resume, Object searchKey) {
         Path file = (Path) searchKey;
         try {
-            doWrite(resume, new BufferedOutputStream(new FileOutputStream(file.toString())));
+            streamSerializer.doWrite(resume, new BufferedOutputStream(new FileOutputStream(file.toString())));
         } catch (IOException e) {
             throw new StorageException("File write error", resume.getUuid(), e);
         }
@@ -60,7 +59,7 @@ protected void doSave(Resume resume, Object file) {
     protected Resume doGet(Object searchKey) {
         Path path = (Path) searchKey;
         try {
-            return doRead(new BufferedInputStream(new FileInputStream(path.toString())));
+            return streamSerializer.doRead(new BufferedInputStream(new FileInputStream(path.toString())));
         } catch (IOException e) {
             throw new StorageException("File read error", path.toString(), e);
         }
diff --git a/src/com/urise/webapp/storage/serializer/ObjectStreamSerializer.java b/src/com/urise/webapp/storage/serializer/ObjectStreamSerializer.java
@@ -1,25 +1,21 @@
-package com.urise.webapp.storage;
+package com.urise.webapp.storage.serializer;
 
 import com.urise.webapp.exception.StorageException;
 import com.urise.webapp.model.Resume;
 
 import java.io.*;
 
-public class ObjectStreamPathStorage extends AbstractPathStorage {
-
-    public ObjectStreamPathStorage(String directory) {
-        super(directory);
-    }
+public class ObjectStreamSerializer implements StreamSerializer {
 
     @Override
-    protected void doWrite(Resume resume, OutputStream os) throws IOException {
+    public void doWrite(Resume resume, OutputStream os) throws IOException {
         try (ObjectOutputStream oos = new ObjectOutputStream(os)) {
             oos.writeObject(resume);
         }
     }
 
     @Override
-    protected Resume doRead(InputStream is) throws IOException {
+    public Resume doRead(InputStream is) throws IOException {
         try (ObjectInputStream ois = new ObjectInputStream(is)) {
             return (Resume) ois.readObject();
         } catch (ClassNotFoundException e) {
diff --git a/src/com/urise/webapp/storage/serializer/StreamSerializer.java b/src/com/urise/webapp/storage/serializer/StreamSerializer.java
@@ -0,0 +1,12 @@
+package com.urise.webapp.storage.serializer;
+
+import com.urise.webapp.model.Resume;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+public interface StreamSerializer {
+    void doWrite (Resume r, OutputStream os) throws IOException;
+    Resume doRead (InputStream is) throws IOException;
+}
diff --git a/test/com/urise/webapp/storage/AllStorageTest.java b/test/com/urise/webapp/storage/AllStorageTest.java
@@ -10,8 +10,8 @@
         ListStorageTest.class,
         MapStorageTest.class,
         MapResumeStorageTest.class,
-        ObjectStreamStorageTest.class,
-        ObjectStreamPathStorageTest.class
+        ObjectFileStorageTest.class,
+        ObjectPathStorageTest.class
 })
 public class AllStorageTest {
 }
diff --git a/test/com/urise/webapp/storage/ObjectFileStorageTest.java b/test/com/urise/webapp/storage/ObjectFileStorageTest.java
@@ -0,0 +1,9 @@
+package com.urise.webapp.storage;
+
+import com.urise.webapp.storage.serializer.ObjectStreamSerializer;
+
+public class ObjectFileStorageTest extends AbstractStorageTest {
+    public ObjectFileStorageTest() {
+        super(new FileStorage(STORAGE_DIR, new ObjectStreamSerializer()));
+    }
+}
diff --git a/test/com/urise/webapp/storage/ObjectPathStorageTest.java b/test/com/urise/webapp/storage/ObjectPathStorageTest.java
@@ -0,0 +1,10 @@
+package com.urise.webapp.storage;
+
+import com.urise.webapp.storage.serializer.ObjectStreamSerializer;
+
+public class ObjectPathStorageTest extends AbstractStorageTest {
+
+    public ObjectPathStorageTest() {
+        super(new PathStorage(STORAGE_DIR.getAbsolutePath(),new ObjectStreamSerializer()));
+    }
+}
diff --git a/test/com/urise/webapp/storage/ObjectStreamPathStorageTest.java b/test/com/urise/webapp/storage/ObjectStreamPathStorageTest.java
diff --git a/test/com/urise/webapp/storage/ObjectStreamStorageTest.java b/test/com/urise/webapp/storage/ObjectStreamStorageTest.java
