lesson 9

AlbertoJava · AlbertoJava · commit 64ac6aebce65 · 2019-10-06T00:10:10.000+03:00
diff --git a/src/com/urise/webapp/model/AbstractSection.java b/src/com/urise/webapp/model/AbstractSection.java
@@ -1,4 +1,6 @@
 package com.urise.webapp.model;
 
-public abstract class AbstractSection {
+import java.io.Serializable;
+
+public abstract class AbstractSection implements Serializable {
 }
diff --git a/src/com/urise/webapp/model/Link.java b/src/com/urise/webapp/model/Link.java
@@ -1,8 +1,10 @@
 package com.urise.webapp.model;
 
+import java.io.Serializable;
 import java.util.Objects;
 
-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/com/urise/webapp/model/ListSection.java b/src/com/urise/webapp/model/ListSection.java
@@ -6,9 +6,9 @@
 import java.util.Objects;
 
 public class ListSection extends AbstractSection {
+    private static final long serialVersionUID =1L;
     private final List<String> items;
-
-    public ListSection(String... items) {
+   public ListSection(String... items) {
         this(Arrays.asList(items));
     }
 
diff --git a/src/com/urise/webapp/model/Organization.java b/src/com/urise/webapp/model/Organization.java
@@ -2,6 +2,7 @@
 
 import com.urise.webapp.util.DateUtil;
 
+import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.Month;
 import java.util.ArrayList;
@@ -12,7 +13,7 @@
 import static com.urise.webapp.util.DateUtil.NOW;
 import static com.urise.webapp.util.DateUtil.of;
 
-public class Organization {
+public class Organization implements Serializable {
     private final Link homePage;
     private List<Position> positions = new ArrayList<>();
 
@@ -52,7 +53,8 @@ public int hashCode() {
         return result;
     }
 
-    public static class Position{
+    public static class Position implements Serializable{
+        private static final long serialVersionUID =1L;
         private final LocalDate startDate;
         private final LocalDate endDate;
         private final String title;
diff --git a/src/com/urise/webapp/model/OrganizationSection.java b/src/com/urise/webapp/model/OrganizationSection.java
@@ -6,6 +6,7 @@
 import java.util.Objects;
 
 public class OrganizationSection extends AbstractSection {
+    private static final long serialVersionUID =1L;
     private final List<Organization> organizations;
 
     public OrganizationSection(Organization... organizations) {
diff --git a/src/com/urise/webapp/model/Resume.java b/src/com/urise/webapp/model/Resume.java
@@ -1,12 +1,13 @@
 package com.urise.webapp.model;
 
+import java.io.Serializable;
 import java.util.*;
 
 /**
  * Initial resume class
  */
-public class Resume {
-
+public class Resume implements Serializable {
+private static final long serialVersionUID =1L;
     // Unique identifier
     private final String uuid;
     private final String fullName;
diff --git a/src/com/urise/webapp/model/TextSection.java b/src/com/urise/webapp/model/TextSection.java
@@ -3,6 +3,7 @@
 import java.util.Objects;
 
 public class TextSection extends AbstractSection {
+    private static final long serialVersionUID =1L;
     private final String content;
 
     public TextSection(String content) {
diff --git a/test/com/urise/webapp/storage/AbstractStorageTest.java b/test/com/urise/webapp/storage/AbstractStorageTest.java
@@ -6,6 +6,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.File;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,7 +27,7 @@ public abstract class AbstractStorageTest {
     private static final Resume R_3 = new Resume(UUID_3, "FullName_3");
     private static final Resume R_4 = new Resume(UUID_4, "FullName_4");
 
-
+    protected static final File STORAGE_DIR = new File("C:\\Java\\FileStorage");
     protected Storage storage;
 
     static {
diff --git a/test/com/urise/webapp/storage/AllStorageTest.java b/test/com/urise/webapp/storage/AllStorageTest.java
@@ -9,7 +9,8 @@
         SortedArrayStorageTest.class,
         ListStorageTest.class,
         MapStorageTest.class,
-        MapResumeStorageTest.class
+        MapResumeStorageTest.class,
+        ObjectStreamStorageTest.class
 })
 public class AllStorageTest {
 }
diff --git a/test/com/urise/webapp/storage/ObjectStreamStorageTest.java b/test/com/urise/webapp/storage/ObjectStreamStorageTest.java
@@ -0,0 +1,7 @@
+package com.urise.webapp.storage;
+
+public class ObjectStreamStorageTest extends AbstractStorageTest {
+    public ObjectStreamStorageTest() {
+        super(new ObjectStreamStorage(STORAGE_DIR));
+    }
+}
diff --git a/test/com/urise/webapp/storage/ResumeDataTest.java b/test/com/urise/webapp/storage/ResumeDataTest.java
@@ -23,7 +23,7 @@ public static Resume fillResumeSections (Resume r, int countJobOrganization, int
     List<Organization> educationList = new ArrayList<>();
     for (int i=0;i<countEducationOrganization;i++){
         positions= getPositions(i);
-        organizationList.add(new Organization(
+        educationList.add(new Organization(
                 "Education_" + i,
                 "http://education_"+ 1+".org",
                 positions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`	`package com.urise.webapp.model;`
`2`	`2`
`3`		`-public abstract class AbstractSection {`
	`3`	`+import java.io.Serializable;`
	`4`	`+`
	`5`	`+public abstract class AbstractSection implements Serializable {`
`4`	`6`	`}`