Revert changes made to DummyStatsDServer files

Author: sarahchen6

src/test/java/com/timgroup/statsd/UnixDatagramSocketDummyStatsDServer.java

@@ -3,54 +3,30 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
-import java.net.SocketAddress;
 import jnr.unixsocket.UnixDatagramChannel;
 import jnr.unixsocket.UnixSocketAddress;
 
 import static com.timgroup.statsd.NonBlockingStatsDClient.DEFAULT_UDS_MAX_PACKET_SIZE_BYTES;
 
 public class UnixDatagramSocketDummyStatsDServer extends DummyStatsDServer {
     private final DatagramChannel server;
-    private volatile boolean serverRunning = true;
 
     public UnixDatagramSocketDummyStatsDServer(String socketPath) throws IOException {
-        if (ClientChannelUtils.hasNativeUdsSupport()) {
-            try {
-                Class<?> udsAddressClass = Class.forName("java.net.UnixDomainSocketAddress");
-                Object udsAddress = udsAddressClass.getMethod("of", String.class).invoke(null, socketPath);
-
-                DatagramChannel nativeServer = DatagramChannel.open();
-                nativeServer.bind((SocketAddress) udsAddress);
-                this.server = nativeServer;
-            } catch (ReflectiveOperationException e) {
-                throw new IOException(e);
-            }
-        } else {
-            UnixDatagramChannel jnrServer = UnixDatagramChannel.open();
-            jnrServer.bind(new UnixSocketAddress(socketPath));
-            this.server = jnrServer;
-        }
+        server = UnixDatagramChannel.open();
+        server.bind(new UnixSocketAddress(socketPath));
         this.listen();
     }
 
     @Override
     protected boolean isOpen() {
-        return serverRunning && server.isOpen();
+        return server.isOpen();
     }
 
     protected void receive(ByteBuffer packet) throws IOException {
         server.receive(packet);
     }
 
-    @Override
     public void close() throws IOException {
-        serverRunning = false;
-        try {
-            // Give the listening thread a chance to stop
-            Thread.sleep(1000);
-        } catch (InterruptedException e) {
-            // ignore
-        }
         try {
             server.close();
         } catch (Exception e) {

src/test/java/com/timgroup/statsd/UnixStreamSocketDummyStatsDServer.java

@@ -4,9 +4,7 @@
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
-import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Logger;
 import jnr.unixsocket.UnixServerSocketChannel;
@@ -16,37 +14,21 @@
 import static com.timgroup.statsd.NonBlockingStatsDClient.DEFAULT_UDS_MAX_PACKET_SIZE_BYTES;
 
 public class UnixStreamSocketDummyStatsDServer extends DummyStatsDServer {
-    private final Object server; // Object is either ServerSocketChannel or UnixServerSocketChannel
-    private final ConcurrentLinkedQueue<SocketChannel> channels = new ConcurrentLinkedQueue<>();
-    private final boolean useNativeUds;
+    private final UnixServerSocketChannel server;
+    private final ConcurrentLinkedQueue<UnixSocketChannel> channels = new ConcurrentLinkedQueue<>();
 
     private final Logger logger = Logger.getLogger(UnixStreamSocketDummyStatsDServer.class.getName());
 
     public UnixStreamSocketDummyStatsDServer(String socketPath) throws IOException {
-        this.useNativeUds = ClientChannelUtils.hasNativeUdsSupport();
-        if (useNativeUds) {
-            try {
-                Class<?> udsAddressClass = Class.forName("java.net.UnixDomainSocketAddress");
-                Object udsAddress = udsAddressClass.getMethod("of", String.class).invoke(null, socketPath);
-                
-                ServerSocketChannel nativeServer = ServerSocketChannel.open();
-                nativeServer.bind((SocketAddress) udsAddress);
-                this.server = nativeServer;
-            } catch (ReflectiveOperationException e) {
-                throw new IOException(e);
-            }
-        } else {
-            UnixServerSocketChannel jnrServer = UnixServerSocketChannel.open();
-            jnrServer.configureBlocking(true);
-            jnrServer.socket().bind(new UnixSocketAddress(socketPath));
-            this.server = jnrServer;
-        }
+        server = UnixServerSocketChannel.open();
+        server.configureBlocking(true);
+        server.socket().bind(new UnixSocketAddress(socketPath));
         this.listen();
     }
 
     @Override
     protected boolean isOpen() {
-        return useNativeUds ? ((ServerSocketChannel)server).isOpen() : ((UnixServerSocketChannel)server).isOpen();
+        return server.isOpen();
     }
 
     @Override
@@ -56,43 +38,39 @@ protected void receive(ByteBuffer packet) throws IOException {
 
     @Override
     protected void listen() {
-        try {
-            String localAddressMessage = useNativeUds ? "Listening on " + ((ServerSocketChannel)server).getLocalAddress() : "Listening on " + ((UnixServerSocketChannel)server).getLocalSocketAddress();
-            logger.info(localAddressMessage);
-        } catch (Exception e) {
-            logger.warning("Failed to get local address: " + e);
-        }
+        logger.info("Listening on " + server.getLocalSocketAddress());
         Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
                 while(isOpen()) {
                     if (sleepIfFrozen()) {
                         continue;
                     }
-                    try {
-                        logger.info("Waiting for connection");
-                        SocketChannel clientChannel = null;
-                        clientChannel = useNativeUds ? ((ServerSocketChannel)server).accept() : ((UnixServerSocketChannel)server).accept();
-                        if (clientChannel != null) {
-                            clientChannel.configureBlocking(true);
-                            String connectionMessage = useNativeUds ? "Accepted connection from " + clientChannel.getRemoteAddress() : "Accepted connection from " + ((UnixSocketChannel)clientChannel).getRemoteSocketAddress();
-                            logger.info(connectionMessage);
-                            channels.add(clientChannel);
-                            readChannel(clientChannel);
+                        try {
+                            logger.info("Waiting for connection");
+                            UnixSocketChannel clientChannel = server.accept();
+                            if (clientChannel != null) {
+                                clientChannel.configureBlocking(true);
+                                try {
+                                    logger.info("Accepted connection from " + clientChannel.getRemoteSocketAddress());
+                                } catch (Exception e) {
+                                    logger.warning("Failed to get remote socket address");
+                                }
+                                channels.add(clientChannel);
+                                readChannel(clientChannel);
+                            }
+                        } catch (IOException e) {
                         }
-                    } catch (Exception e) {
-                        // ignore
-                    }
                 }
             }
         });
         thread.setDaemon(true);
         thread.start();
     }
 
-    public void readChannel(final SocketChannel clientChannel) {
-        logger.info("Reading from " + clientChannel);
-        Thread thread = new Thread(new Runnable() {
+    public void readChannel(final UnixSocketChannel clientChannel) {
+            logger.info("Reading from " + clientChannel);
+            Thread thread = new Thread(new Runnable() {
             @Override
             public void run() {
                 final ByteBuffer packet = ByteBuffer.allocate(DEFAULT_UDS_MAX_PACKET_SIZE_BYTES);
@@ -112,6 +90,7 @@ public void run() {
                             logger.warning("Failed to close channel: " + e);
                         }
                     }
+
                 }
                 logger.info("Disconnected from " + clientChannel);
             }
@@ -149,16 +128,13 @@ private boolean readPacket(SocketChannel channel, ByteBuffer packet) {
 
     public void close() throws IOException {
         try {
-            if (useNativeUds) {
-                ((ServerSocketChannel)server).close();
-            } else {
-                ((UnixServerSocketChannel)server).close();
-            }
-            for (SocketChannel channel : channels) {
+            server.close();
+            for (UnixSocketChannel channel : channels) {
                 channel.close();
             }
         } catch (Exception e) {
             //ignore
         }
     }
+
 }