Skip to content

Commit f61eda4

Browse files
committed
Updated a lesson 09.
1 parent 8894164 commit f61eda4

File tree

7 files changed

+74
-63
lines changed

7 files changed

+74
-63
lines changed

src/main/java/com/yurii/salimov/lesson09/task01_02_03/Human.java

+19-16
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* @author Yuriy Salimov ([email protected])
77
* @version 1.0
88
*/
9-
public class Human implements Cloneable, Serializable {
9+
public final class Human implements Cloneable, Serializable {
1010

1111
private static final long serialVersionUID = 1L;
1212
private String name;
@@ -22,7 +22,10 @@ public Human() {
2222
this.weight = 70;
2323
}
2424

25-
public Human(String name, String surname, String birth, String sex) {
25+
public Human(
26+
final String name, final String surname,
27+
final String birth, final String sex
28+
) {
2629
this();
2730
this.name = name;
2831
this.surname = surname;
@@ -38,18 +41,18 @@ public Human clone() throws CloneNotSupportedException {
3841
@Override
3942
public String toString() {
4043
return "Human{" +
41-
"name='" + name + '\'' +
42-
", surname='" + surname + '\'' +
43-
", birth='" + birth + '\'' +
44-
", sex='" + sex + '\'' +
45-
", profession='" + profession + '\'' +
46-
", height=" + height +
47-
", weight=" + weight +
44+
"name='" + this.name + '\'' +
45+
", surname='" + this.surname + '\'' +
46+
", birth='" + this.birth + '\'' +
47+
", sex='" + this.sex + '\'' +
48+
", profession='" + this.profession + '\'' +
49+
", height=" + this.height +
50+
", weight=" + this.weight +
4851
'}';
4952
}
5053

5154
@Override
52-
public boolean equals(Object object) {
55+
public boolean equals(final Object object) {
5356
if (this == object) {
5457
return true;
5558
}
@@ -83,47 +86,47 @@ public String getName() {
8386
return this.name;
8487
}
8588

86-
public void setName(String name) {
89+
public void setName(final String name) {
8790
this.name = name;
8891
}
8992

9093
public String getSurname() {
9194
return this.surname;
9295
}
9396

94-
public void setSurname(String surname) {
97+
public void setSurname(final String surname) {
9598
this.surname = surname;
9699
}
97100

98101
public String getBirth() {
99102
return this.birth;
100103
}
101104

102-
public void setBirth(String birth) {
105+
public void setBirth(final String birth) {
103106
this.birth = birth;
104107
}
105108

106109
public String getSex() {
107110
return this.sex;
108111
}
109112

110-
public void setSex(String sex) {
113+
public void setSex(final String sex) {
111114
this.sex = sex;
112115
}
113116

114117
public String getProfession() {
115118
return this.profession;
116119
}
117120

118-
public void setProfession(String profession) {
121+
public void setProfession(final String profession) {
119122
this.profession = profession;
120123
}
121124

122125
public int getHeight() {
123126
return this.height;
124127
}
125128

126-
public void setHeight(int height) {
129+
public void setHeight(final int height) {
127130
this.height = height;
128131
}
129132

src/main/java/com/yurii/salimov/lesson09/task01_02_03/Main.java

+8-6
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,21 @@
2121
public class Main {
2222

2323
public static void main(String[] args) {
24+
final Serialization serialization = new Serialization();
2425
final File file = new File("List.txt");
2526
if (!file.exists() || !file.isFile() || file.length() == 0) {
2627
int number = 10;
27-
final MySet<Human> humanList = createHumanSet(number) ;
28-
humanList.print();
29-
Serialization.serialize(humanList, file);
28+
final MySet<Human> humans = createHumanSet(number) ;
29+
humans.print();
30+
serialization.serialize(humans, file);
3031
} else {
31-
((MySet) Serialization.deserialize(file)).print();
32+
final MySet humans = (MySet) serialization.deserialize(file);
33+
humans.print();
3234
}
3335
}
3436

35-
private static MySet<Human> createHumanSet(int number) {
36-
MySet<Human> humanMySet = new MySet<>();
37+
private static MySet<Human> createHumanSet(final int number) {
38+
final MySet<Human> humanMySet = new MySet<>();
3739
final Scanner scanner = new Scanner(System.in);
3840
System.out.println("Enter data about " + number + " persons:");
3941
for (int i = 0; i < number; i++) {

src/main/java/com/yurii/salimov/lesson09/task01_02_03/MySet.java

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,28 @@
11
package com.yurii.salimov.lesson09.task01_02_03;
22

33
import java.io.Serializable;
4+
import java.util.Collection;
45
import java.util.HashSet;
56
import java.util.Set;
67
/**
78
* @author Yuriy Salimov ([email protected])
89
* @version 1.0
910
*/
10-
public class MySet<T> implements Serializable {
11+
public final class MySet<T> implements Serializable {
1112

1213
private static final long serialVersionUID = 1L;
13-
private Set<T> set = new HashSet<>();
14+
private final Set<T> set = new HashSet<>();
1415

15-
public boolean add(T obj) {
16-
return set.add(obj);
16+
public boolean add(final T obj) {
17+
return this.set.add(obj);
18+
}
19+
20+
public boolean addAll(final Collection<T> collection) {
21+
return this.set.addAll(collection);
22+
}
23+
24+
public void clear() {
25+
this.set.clear();
1726
}
1827

1928
public void print() {
@@ -27,10 +36,6 @@ public Set getSet() {
2736
return set;
2837
}
2938

30-
public void setSet(Set<T> set) {
31-
this.set = set;
32-
}
33-
3439
public int size() {
3540
return set.size();
3641
}

src/main/java/com/yurii/salimov/lesson09/task01_02_03/Serialization.java

+9-7
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,25 @@
1111
* @author Yuriy Salimov ([email protected])
1212
* @version 1.0
1313
*/
14-
public class Serialization {
14+
public final class Serialization {
1515

16-
public static void serialize(Object obj, File file) {
17-
try (ObjectOutputStream output = new ObjectOutputStream(new FileOutputStream(file))) {
16+
public void serialize(final Object obj, final File file) {
17+
try (FileOutputStream fos = new FileOutputStream(file);
18+
ObjectOutputStream output = new ObjectOutputStream(fos)) {
1819
output.writeObject(obj);
1920
} catch (IOException ex) {
2021
System.out.println("ERROR save object!");
2122
}
2223
}
2324

24-
public static void serialize(Object obj, String path) {
25+
public void serialize(final Object obj, final String path) {
2526
serialize(obj, new File(path));
2627
}
2728

28-
public static Object deserialize(File file) {
29+
public Object deserialize(final File file) {
2930
Object obj = null;
30-
try (ObjectInputStream input = new ObjectInputStream(new FileInputStream(file))) {
31+
try (FileInputStream fis = new FileInputStream(file);
32+
ObjectInputStream input = new ObjectInputStream(fis)) {
3133
obj = input.readObject();
3234
} catch (IOException | ClassNotFoundException | ExceptionInInitializerError ex) {
3335
System.out.println("ERROR load object!");
@@ -36,7 +38,7 @@ public static Object deserialize(File file) {
3638
return obj;
3739
}
3840

39-
public static Object deserialize(String path) {
41+
public Object deserialize(final String path) {
4042
return deserialize(new File(path));
4143
}
4244
}

src/main/java/com/yurii/salimov/lesson09/task04/Files.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@
99
* @author Yuriy Salimov ([email protected])
1010
* @version 1.0
1111
*/
12-
public class Files implements Serializable {
12+
public final class Files implements Serializable {
1313

1414
private static final long serialVersionUID = 1L;
1515
private String name;
1616
private boolean isFile;
1717
private List<Files> list = new ArrayList<>();
1818
private Files fileSystem;
1919

20-
public Files(String name) {
20+
public Files(final String name) {
2121
this.name = name;
2222
}
2323

24-
public Files(String name, boolean isFile) {
24+
public Files(final String name, final boolean isFile) {
2525
this(name);
2626
this.isFile = isFile;
2727
}
2828

29-
public void add(Files file) {
29+
public void add(final Files file) {
3030
if (!this.isFile) {
3131
if (!find(file)) {
3232
file.fileSystem = this;

src/main/java/com/yurii/salimov/lesson09/task04/Main.java

+10-9
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,16 @@
1515
public class Main {
1616

1717
public static void main(String[] args) {
18-
Files fileSystem = new Files("c:");
19-
File file = new File("List.txt");
18+
final Serialization serialization = new Serialization();
19+
final Files fileSystem = new Files("c:");
20+
final File file = new File("List.txt");
2021

2122
if (!file.exists() || !file.isFile() || file.length() == 0) {
22-
Files file1 = new Files("file1", true);
23-
Files file2 = new Files("file2", true);
23+
final Files file1 = new Files("file1", true);
24+
final Files file2 = new Files("file2", true);
2425

25-
Files dir1 = new Files("dir1", false);
26-
Files dir2 = new Files("dir2", false);
26+
final Files dir1 = new Files("dir1", false);
27+
final Files dir2 = new Files("dir2", false);
2728

2829
dir1.add(file1);
2930
dir2.add(file1);
@@ -38,10 +39,10 @@ public static void main(String[] args) {
3839
fileSystem.add(dir2);
3940
fileSystem.print();
4041

41-
Serialization.serialize(fileSystem, file);
42+
serialization.serialize(fileSystem, file);
4243
} else {
43-
fileSystem = (Files) Serialization.deserialize(file);
44-
fileSystem.print();
44+
final Files files = (Files) serialization.deserialize(file);
45+
files.print();
4546
}
4647
}
4748
}
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,30 @@
11
package com.yurii.salimov.lesson09.task04;
22

3-
import java.io.File;
4-
import java.io.FileInputStream;
5-
import java.io.FileOutputStream;
6-
import java.io.IOException;
7-
import java.io.ObjectInputStream;
8-
import java.io.ObjectOutputStream;
3+
import java.io.*;
4+
95
/**
106
* @author Yuriy Salimov ([email protected])
117
* @version 1.0
128
*/
13-
public class Serialization {
9+
public final class Serialization {
1410

15-
public static void serialize(Object obj, File file) {
16-
try (ObjectOutputStream output = new ObjectOutputStream(new FileOutputStream(file))) {
11+
public void serialize(final Object obj, final File file) {
12+
try (FileOutputStream fos = new FileOutputStream(file);
13+
ObjectOutputStream output = new ObjectOutputStream(fos)) {
1714
output.writeObject(obj);
1815
} catch (IOException ex) {
1916
System.out.println("ERROR save object!");
2017
}
2118
}
2219

23-
public static void serialize(Object obj, String path) {
20+
public void serialize(final Object obj, final String path) {
2421
serialize(obj, new File(path));
2522
}
2623

27-
public static Object deserialize(File file) {
24+
public Object deserialize(final File file) {
2825
Object obj = null;
29-
try (ObjectInputStream input = new ObjectInputStream(new FileInputStream(file))) {
26+
try (FileInputStream fis = new FileInputStream(file);
27+
ObjectInputStream input = new ObjectInputStream(fis)) {
3028
obj = input.readObject();
3129
} catch (IOException | ClassNotFoundException | ExceptionInInitializerError ex) {
3230
System.out.println("ERROR load object!");
@@ -35,7 +33,7 @@ public static Object deserialize(File file) {
3533
return obj;
3634
}
3735

38-
public static Object deserialize(String path) {
36+
public Object deserialize(final String path) {
3937
return deserialize(new File(path));
4038
}
4139
}

0 commit comments

Comments
 (0)