Rename SocketReader to StreamReader and SocketWriter to StreamWriter

Author: rogermb

src/main/java/com/github/theholywaffle/teamspeak3/Connection.java

@@ -36,8 +36,8 @@ class Connection {
 
 	private final TS3Query ts3Query;
 	private final IOChannel ioChannel;
-	private final SocketReader socketReader;
-	private final SocketWriter socketWriter;
+	private final StreamReader streamReader;
+	private final StreamWriter streamWriter;
 	private final KeepAlive keepAlive;
 
 	private final AtomicReference<CommandQueue> commandQueue;
@@ -57,16 +57,16 @@ class Connection {
 				ioChannel = new SocketChannel(config);
 			}
 
-			socketReader = new SocketReader(this, ioChannel.getInputStream(), query, config);
-			socketWriter = new SocketWriter(this, ioChannel.getOutputStream(), config);
+			streamReader = new StreamReader(this, ioChannel.getInputStream(), query, config);
+			streamWriter = new StreamWriter(this, ioChannel.getOutputStream(), config);
 			keepAlive = new KeepAlive(this);
 		} catch (IOException ioe) {
 			closeSocket();
 			throw new TS3ConnectionFailedException(ioe);
 		}
 
-		socketReader.start();
-		socketWriter.start();
+		streamReader.start();
+		streamWriter.start();
 		keepAlive.start();
 	}
 
@@ -83,12 +83,12 @@ void internalDisconnect() {
 
 	void disconnect() {
 		keepAlive.interrupt();
-		socketWriter.interrupt();
-		socketReader.interrupt();
+		streamWriter.interrupt();
+		streamReader.interrupt();
 
 		boolean wasInterrupted = joinThread(keepAlive);
-		wasInterrupted |= joinThread(socketWriter);
-		wasInterrupted |= joinThread(socketReader);
+		wasInterrupted |= joinThread(streamWriter);
+		wasInterrupted |= joinThread(streamReader);
 
 		if (wasInterrupted) {
 			// Restore the interrupt for the caller

src/main/java/com/github/theholywaffle/teamspeak3/SocketReader.java renamed to src/main/java/com/github/theholywaffle/teamspeak3/StreamReader.java

@@ -42,9 +42,9 @@
 import java.net.SocketTimeoutException;
 import java.nio.charset.StandardCharsets;
 
-class SocketReader extends Thread {
+class StreamReader extends Thread {
 
-	private static final Logger log = LoggerFactory.getLogger(SocketReader.class);
+	private static final Logger log = LoggerFactory.getLogger(StreamReader.class);
 
 	private final TS3Query ts3;
 	private final Connection con;
@@ -55,8 +55,8 @@ class SocketReader extends Thread {
 	private ResponseBuilder responseBuilder = null;
 	private String lastEvent = "";
 
-	SocketReader(Connection connection, InputStream inStream, TS3Query query, TS3Config config) throws IOException {
-		super("[TeamSpeak-3-Java-API] SocketReader");
+	StreamReader(Connection connection, InputStream inStream, TS3Query query, TS3Config config) throws IOException {
+		super("[TeamSpeak-3-Java-API] StreamReader");
 
 		ts3 = query;
 		con = connection;

src/main/java/com/github/theholywaffle/teamspeak3/SocketWriter.java renamed to src/main/java/com/github/theholywaffle/teamspeak3/StreamWriter.java

@@ -35,17 +35,17 @@
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 
-class SocketWriter extends Thread {
+class StreamWriter extends Thread {
 
-	private static final Logger log = LoggerFactory.getLogger(SocketWriter.class);
+	private static final Logger log = LoggerFactory.getLogger(StreamWriter.class);
 
 	private final Connection con;
 	private final PrintWriter out;
 	private final int floodRate;
 	private final boolean logComms;
 
-	SocketWriter(Connection connection, OutputStream outStream, TS3Config config) {
-		super("[TeamSpeak-3-Java-API] SocketWriter");
+	StreamWriter(Connection connection, OutputStream outStream, TS3Config config) {
+		super("[TeamSpeak-3-Java-API] StreamWriter");
 
 		con = connection;
 		out = new PrintWriter(new OutputStreamWriter(outStream, StandardCharsets.UTF_8), true);
@@ -75,7 +75,7 @@ public void run() {
 		out.close();
 
 		if (!isInterrupted()) {
-			log.warn("SocketWriter has stopped!");
+			log.warn("StreamWriter has stopped!");
 			con.internalDisconnect();
 		}
 	}