[pull] master from jh3nd3rs0n:master

src/main/java/com/github/jh3nd3rs0n/jargyle/server/XmlFileSourceConfigurationRepository.java

@@ -42,22 +42,22 @@ public ConfigurationFileStatusListener(
 		@Override
 		public void onFileCreated(final File file) {
 			LOGGER.info(String.format(
-					"File created: %s",
+					"Created file: %s",
 					file));
 			this.updateConfigurationRepositoryFrom(file);
 		}
 
 		@Override
 		public void onFileDeleted(final File file) {
 			LOGGER.info(String.format(
-					"File deleted (using in-memory copy): %s",
+					"Relying on in-memory copy of deleted file: %s",
 					file));
 		}
 
 		@Override
 		public void onFileModified(final File file) {
 			LOGGER.info(String.format(
-					"File modified: %s",
+					"Modified file: %s",
 					file));
 			this.updateConfigurationRepositoryFrom(file);
 		}

src/main/java/com/github/jh3nd3rs0n/jargyle/server/socks5/userpassauth/CsvFileSourceUserRepository.java

@@ -42,22 +42,22 @@ public UsersFileStatusListener(
 		@Override
 		public void onFileCreated(final File file) {
 			LOGGER.info(String.format(
-					"File created: %s",
+					"Created file: %s",
 					file));
 			this.updateUserRepositoryFrom(file);
 		}
 
 		@Override
 		public void onFileDeleted(final File file) {
 			LOGGER.info(String.format(
-					"File deleted (using in-memory copy): %s",
+					"Relying on in-memory copy of deleted file: %s",
 					file));
 		}
 
 		@Override
 		public void onFileModified(final File file) {
 			LOGGER.info(String.format(
-					"File modified: %s",
+					"Modified file: %s",
 					file));
 			this.updateUserRepositoryFrom(file);
 		}

src/test/java/com/github/jh3nd3rs0n/jargyle/client/DatagramEchoClientHelper.java

@@ -0,0 +1,50 @@
+package com.github.jh3nd3rs0n.jargyle.client;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.util.Arrays;
+
+public final class DatagramEchoClientHelper {
+
+	private static final int ECHO_CLIENT_TIMEOUT = 60000;
+
+	public static String echoThroughNewDatagramSocket(
+			final String string, 
+			final NetObjectFactory netObjectFactory) throws IOException {
+		NetObjectFactory netObjFactory = netObjectFactory; 
+		if (netObjFactory == null) {
+			netObjFactory = new DefaultNetObjectFactory();
+		}
+		DatagramSocket echoClient = null;
+		String returningString = null;
+		try {
+			echoClient = netObjFactory.newDatagramSocket(null);
+			echoClient.setSoTimeout(ECHO_CLIENT_TIMEOUT);
+			echoClient.bind(null);
+			echoClient.connect(
+					InetAddress.getLoopbackAddress(), DatagramEchoServer.PORT);
+			byte[] buffer = string.getBytes();
+			DatagramPacket packet = new DatagramPacket(
+					buffer, 
+					buffer.length, 
+					InetAddress.getLoopbackAddress(), 
+					DatagramEchoServer.PORT);
+			echoClient.send(packet);
+			buffer = new byte[DatagramEchoServer.BUFFER_SIZE];
+			packet = new DatagramPacket(buffer, buffer.length);
+			echoClient.receive(packet);
+			returningString = new String(Arrays.copyOfRange(
+					packet.getData(), packet.getOffset(), packet.getLength()));
+		} finally {
+			if (echoClient != null) {
+				echoClient.close();
+			}
+		}
+		return returningString;
+	}
+
+	private DatagramEchoClientHelper() { }
+
+}

src/test/java/com/github/jh3nd3rs0n/jargyle/client/DatagramEchoServer.java

@@ -0,0 +1,99 @@
+package com.github.jh3nd3rs0n.jargyle.client;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.util.Arrays;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import com.github.jh3nd3rs0n.jargyle.server.internal.concurrent.ExecutorHelper;
+
+public final class DatagramEchoServer {
+
+	private static final class Listener implements Runnable {
+
+		private final DatagramSocket serverSocket;
+
+		public Listener(final DatagramSocket serverSock) {
+			this.serverSocket = serverSock;
+		}
+
+		public void run() {
+			ExecutorService executor = ExecutorHelper.newExecutor();
+			while (true) {
+				try {
+					byte[] buffer = new byte[BUFFER_SIZE];
+					DatagramPacket packet = new DatagramPacket(
+							buffer, buffer.length);
+					this.serverSocket.receive(packet);
+					executor.execute(new Worker(this.serverSocket, packet));
+				} catch (SocketException e) {
+					break;
+				} catch (IOException e) {
+					e.printStackTrace();
+					break;
+				}
+			}
+			executor.shutdownNow();
+		}
+
+	}
+
+	private static final class Worker implements Runnable {
+
+		private final DatagramPacket packet;
+		private final DatagramSocket serverSocket;
+
+		public Worker(
+				final DatagramSocket serverSock, 
+				final DatagramPacket pckt) {
+			this.packet = pckt;
+			this.serverSocket = serverSock;
+		}
+
+		public void run() {
+			InetAddress address = this.packet.getAddress();
+			int port = this.packet.getPort();
+			String string = new String(Arrays.copyOfRange(
+					this.packet.getData(), 
+					this.packet.getOffset(), 
+					this.packet.getLength()));
+			byte[] stringBytes = string.getBytes();
+			DatagramPacket newPacket = new DatagramPacket(
+					stringBytes, stringBytes.length, address, port);
+			try {
+				this.serverSocket.send(newPacket);
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+		}
+
+	}
+
+	public static final int BUFFER_SIZE = 1024;
+	public static final int PORT = 1081;
+
+	private ExecutorService executor;
+	private DatagramSocket serverSocket;
+
+	public DatagramEchoServer() {
+		this.executor = null;
+		this.serverSocket = null;
+	}
+
+	public void start() throws IOException {
+		this.serverSocket = new DatagramSocket(PORT);
+		this.executor = Executors.newSingleThreadExecutor();
+		this.executor.execute(new Listener(this.serverSocket));
+	}
+
+	public void stop() throws IOException {
+		this.serverSocket.close();
+		this.serverSocket = null;
+		this.executor.shutdownNow();
+		this.executor = null;
+	}
+}