Skip to content

Commit 2b70df4

Browse files
author
Mark Kuhn
committed
apply formatting
1 parent 1c2d8f4 commit 2b70df4

File tree

2 files changed

+45
-42
lines changed

2 files changed

+45
-42
lines changed

src/main/java/software/amazon/cloudwatchlogs/emf/sinks/TCPClient.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.net.InetSocketAddress;
2222
import java.net.Socket;
2323
import java.util.concurrent.*;
24-
2524
import lombok.extern.slf4j.Slf4j;
2625

2726
/** A client that would connect to a TCP socket. */
@@ -72,10 +71,7 @@ public synchronized void sendMessage(String message) {
7271
}
7372
}
7473

75-
/**
76-
* Performs checks to see if the socket is connected.
77-
* If not, it will attempt to connect.
78-
*/
74+
/** Performs checks to see if the socket is connected. If not, it will attempt to connect. */
7975
private void checkConnection() {
8076
if (socket == null || socket.isClosed() || shouldConnect) {
8177
connect();

src/test/java/software/amazon/cloudwatchlogs/emf/sinks/TCPClientTest.java

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -55,43 +55,50 @@ protected Socket createSocket() {
5555
public void testSendMessageAfterAgentReconnect() throws InterruptedException {
5656
String[] messages = new String[2];
5757

58-
Thread server = new Thread(() -> {
59-
try {
60-
ServerSocket serverSocket = new ServerSocket(Endpoint.DEFAULT_TCP_ENDPOINT.getPort());
61-
Socket socket = serverSocket.accept();
62-
InputStream is = socket.getInputStream();
63-
byte[] bytes = new byte[1024];
64-
int read = is.read(bytes);
65-
messages[0] = new String(bytes, 0, read);
66-
67-
// Disconnect
68-
socket.close();
69-
serverSocket.close();
70-
71-
// Reconnect
72-
serverSocket = new ServerSocket(Endpoint.DEFAULT_TCP_ENDPOINT.getPort());
73-
socket = serverSocket.accept();
74-
is = socket.getInputStream();
75-
bytes = new byte[1024];
76-
read = is.read(bytes);
77-
messages[1] = new String(bytes, 0, read);
78-
79-
socket.close();
80-
serverSocket.close();
81-
} catch (IOException e) {
82-
throw new RuntimeException(e);
83-
}
84-
});
85-
86-
Thread client = new Thread(() -> {
87-
try (TCPClient tcpClient = new TCPClient(Endpoint.DEFAULT_TCP_ENDPOINT)) {
88-
tcpClient.sendMessage("Test message 1");
89-
Thread.sleep(1000);
90-
tcpClient.sendMessage("Test message 2");
91-
} catch (InterruptedException | IOException e) {
92-
throw new RuntimeException(e);
93-
}
94-
});
58+
Thread server =
59+
new Thread(
60+
() -> {
61+
try {
62+
ServerSocket serverSocket =
63+
new ServerSocket(Endpoint.DEFAULT_TCP_ENDPOINT.getPort());
64+
Socket socket = serverSocket.accept();
65+
InputStream is = socket.getInputStream();
66+
byte[] bytes = new byte[1024];
67+
int read = is.read(bytes);
68+
messages[0] = new String(bytes, 0, read);
69+
70+
// Disconnect
71+
socket.close();
72+
serverSocket.close();
73+
74+
// Reconnect
75+
serverSocket =
76+
new ServerSocket(Endpoint.DEFAULT_TCP_ENDPOINT.getPort());
77+
socket = serverSocket.accept();
78+
is = socket.getInputStream();
79+
bytes = new byte[1024];
80+
read = is.read(bytes);
81+
messages[1] = new String(bytes, 0, read);
82+
83+
socket.close();
84+
serverSocket.close();
85+
} catch (IOException e) {
86+
throw new RuntimeException(e);
87+
}
88+
});
89+
90+
Thread client =
91+
new Thread(
92+
() -> {
93+
try (TCPClient tcpClient =
94+
new TCPClient(Endpoint.DEFAULT_TCP_ENDPOINT)) {
95+
tcpClient.sendMessage("Test message 1");
96+
Thread.sleep(1000);
97+
tcpClient.sendMessage("Test message 2");
98+
} catch (InterruptedException | IOException e) {
99+
throw new RuntimeException(e);
100+
}
101+
});
95102

96103
server.start();
97104
client.start();

0 commit comments

Comments
 (0)