Skip to content

Commit 461c612

Browse files
suoapvssuoapvs
committed
Updated a 12 lesson.
1 parent a3b81a6 commit 461c612

File tree

9 files changed

+45
-66
lines changed

9 files changed

+45
-66
lines changed

‎src/main/java/com/yurii/salimov/lesson12/task01/Files.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@
1111
* @author Yuriy Salimov (yuriy.alex.salimov@gmail.com)
1212
* @version 1.0
1313
*/
14-
public class Files {
14+
public final class Files {
1515

1616
public static void write(final String fileName, final Object obj) {
17-
try (final BufferedWriter output = new BufferedWriter(new FileWriter(fileName))) {
17+
try (FileWriter fileWriter = new FileWriter(fileName);
18+
BufferedWriter output = new BufferedWriter(fileWriter)) {
1819
output.write(obj.toString());
1920
} catch (IOException ex) {
2021
ex.printStackTrace();
@@ -23,7 +24,8 @@ public static void write(final String fileName, final Object obj) {
2324

2425
public static String read(final String fileName) throws FileNotFoundException {
2526
final StringBuilder sb = new StringBuilder();
26-
try (final BufferedReader input = new BufferedReader(new FileReader(fileName))) {
27+
try (FileReader fileReader = new FileReader(fileName);
28+
BufferedReader input = new BufferedReader(fileReader)) {
2729
String str;
2830
while ((str = input.readLine()) != null) {
2931
sb.append(str).append("\r\n");

‎src/main/java/com/yurii/salimov/lesson12/task01/Server.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @author Yuriy Salimov (yuriy.alex.salimov@gmail.com)
1111
* @version 1.0
1212
*/
13-
public class Server {
13+
public final class Server {
1414

1515
private final String filePath;
1616
private final String reportPath;
@@ -37,7 +37,7 @@ public void getStatusConnectionReport() throws InterruptedException, IOException
3737
Files.write(this.reportPath, sb);
3838
}
3939

40-
private int getStatusServer(String address) throws InterruptedException, IOException {
40+
private int getStatusServer(final String address) throws InterruptedException, IOException {
4141
final Runtime runtime = Runtime.getRuntime();
4242
final Process process = runtime.exec("ping " + address);
4343
return process.waitFor();

‎src/main/java/com/yurii/salimov/lesson12/task02/Client.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
* @author Yuriy Salimov (yuriy.alex.salimov@gmail.com)
77
* @version 1.0
88
*/
9-
public class Client extends Thread {
9+
public final class Client extends Thread {
1010

11-
private Parameters parameters;
11+
private final Parameters parameters;
1212

1313
public Client(final Parameters parameters) {
1414
this.parameters = parameters;
@@ -32,10 +32,6 @@ public void run() {
3232
}
3333
}
3434

35-
public void setParameters(final Parameters parameters) {
36-
this.parameters = parameters;
37-
}
38-
3935
public Parameters getParameters() {
4036
return this.parameters;
4137
}

‎src/main/java/com/yurii/salimov/lesson12/task02/Parameters.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
* @author Yuriy Salimov (yuriy.alex.salimov@gmail.com)
55
* @version 1.0
66
*/
7-
public class Parameters {
7+
public final class Parameters {
88

99
private static Parameters parameters = new Parameters();
1010

11-
private String link;
12-
private int connectNumber;
13-
private long timer;
14-
private boolean reconnect;
11+
private final String link;
12+
private final int connectNumber;
13+
private final long timer;
14+
private final boolean reconnect;
1515

1616
private Parameters() {
17-
this.link = "https://www.olx.ua/uk/obyavlenie/besprovodnoy-naushnik-s-bluetooth-garnituroy-IDsNUCm.html";
17+
this.link = "https://SITE.com";
1818
this.connectNumber = 100;
1919
this.timer = 10000;
2020
this.reconnect = false;

‎src/main/java/com/yurii/salimov/lesson12/task02/Server.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,17 @@
1212
*/
1313
public abstract class Server {
1414

15-
public static int getStatus(String link) throws IOException, InterruptedException {
16-
link = link.replace("https://", "").replace("http://", "");
15+
public static int getStatus(final String link) throws IOException, InterruptedException {
16+
String _link = link.replace("https://", "").replace("http://", "");
1717
Runtime runtime = Runtime.getRuntime();
18-
Process process = runtime.exec("ping " + link);
19-
int status = process.waitFor();
20-
return status;
18+
Process process = runtime.exec("ping " + _link);
19+
return process.waitFor();
2120
}
2221

23-
public static void /*String*/ getPage(String link) throws IOException {
22+
public static void /*String*/ getPage(final String link) throws IOException {
2423
//StringBuilder page = new StringBuilder();
25-
URL url = new URL(link);
26-
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
24+
final URL url = new URL(link);
25+
final HttpURLConnection connection = (HttpURLConnection) url.openConnection();
2726
try (InputStreamReader is = new InputStreamReader(connection.getInputStream());
2827
BufferedReader br = new BufferedReader(is)) {
2928
char[] buffer = new char[1024];

‎src/main/java/com/yurii/salimov/lesson12/task02/Stress.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
* @author Yuriy Salimov (yuriy.alex.salimov@gmail.com)
88
* @version 1.0
99
*/
10-
public class Stress extends Thread {
10+
public final class Stress extends Thread {
1111

12-
private Parameters parameters;
12+
private final Parameters parameters;
1313

1414
public Stress(final Parameters parameters) {
1515
this.parameters = parameters;
@@ -32,10 +32,6 @@ public void run() {
3232
}
3333
}
3434

35-
public void setParameters(final Parameters parameters) {
36-
this.parameters = parameters;
37-
}
38-
3935
public Parameters getParameters() {
4036
return this.parameters;
4137
}

‎src/main/java/com/yurii/salimov/lesson12/task03/Main.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ public static void main(String[] args) {
1717
"Mojno ya poidu spat`?", "Eto SPARTA!", "=)",};
1818

1919
for (int i = 0; i < 5; i++) {
20-
new Thread(
21-
new StressClient("192.168.0.100", 5000, logins, messages)
22-
).start();
20+
final StressClient stressClient = new StressClient("192.168.0.100", 5000, logins, messages);
21+
final Thread thread = new Thread(stressClient);
22+
thread.start();
2323
}
2424
}
2525
}

‎src/main/java/com/yurii/salimov/lesson12/task03/Message.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@
66
* @author Yuriy Salimov (yuriy.alex.salimov@gmail.com)
77
* @version 1.0
88
*/
9-
public class Message implements Serializable {
9+
public final class Message implements Serializable {
1010

1111
private static final long serialVersionUID = 1L;
1212

1313
private final String from;
1414
private final String to;
1515
private final transient String text;
16-
private boolean isFile;
1716

1817
public Message(final String from, final String to, final String text) {
1918
this.from = from;
@@ -31,13 +30,11 @@ public String toString() {
3130
}
3231

3332
public void writeToStream(final OutputStream out) throws IOException {
34-
try (final ByteArrayOutputStream bs = new ByteArrayOutputStream();
35-
final ObjectOutputStream os = new ObjectOutputStream(bs);
36-
final DataOutputStream ds = new DataOutputStream(out);) {
33+
try (ByteArrayOutputStream bs = new ByteArrayOutputStream();
34+
ObjectOutputStream os = new ObjectOutputStream(bs);
35+
DataOutputStream ds = new DataOutputStream(out);) {
3736
os.writeObject(this);
38-
if (!this.isFile) {
39-
os.writeUTF(this.text);
40-
}
37+
os.writeUTF(this.text);
4138
byte[] packet = bs.toByteArray();
4239
ds.writeInt(packet.length);
4340
ds.write(packet);

‎src/main/java/com/yurii/salimov/lesson12/task03/StressClient.java

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,17 @@
88
* @author Yuriy Salimov (yuriy.alex.salimov@gmail.com)
99
* @version 1.0
1010
*/
11-
public class StressClient extends Thread {
11+
public final class StressClient extends Thread {
1212

13-
private String ip;
14-
private int port;
15-
private String[] logins;
16-
private String[] messages;
13+
private final String ip;
14+
private final int port;
15+
private final String[] logins;
16+
private final String[] messages;
1717

18-
public StressClient(String ip, int port, String[] logins, String[] messages) {
18+
public StressClient(
19+
final String ip, final int port,
20+
final String[] logins, final String[] messages
21+
) {
1922
this.ip = ip;
2023
this.port = port;
2124
this.logins = logins;
@@ -37,42 +40,28 @@ public void run() {
3740
}
3841

3942
private String getRandomLogin() {
40-
return this.logins[new Random().nextInt(this.logins.length)];
43+
final int index = new Random().nextInt(this.logins.length);
44+
return this.logins[index];
4145
}
4246

4347
private String getRandomMessage() {
44-
return messages[new Random().nextInt(messages.length)];
48+
final int index = new Random().nextInt(this.messages.length);
49+
return this.messages[index];
4550
}
4651

4752
public String getIp() {
4853
return ip;
4954
}
5055

51-
public void setIp(String ip) {
52-
this.ip = ip;
53-
}
54-
5556
public int getPort() {
5657
return port;
5758
}
5859

59-
public void setPort(int port) {
60-
this.port = port;
61-
}
62-
6360
public String[] setLogins() {
6461
return logins;
6562
}
6663

67-
public void setLogins(String[] logins) {
68-
this.logins = logins;
69-
}
70-
7164
public String[] setMessages() {
7265
return messages;
7366
}
74-
75-
public void setMessagesList(String[] messages) {
76-
this.messages = messages;
77-
}
7867
}

0 commit comments

Comments
 (0)