Cleanup and update for litesockets 4.0 release

Author: jentfoo

client/config/checkstyle/checkstyle.xml

@@ -74,7 +74,7 @@
       <property name="ignoredMethodNames" value="finalize, call, acceptConsumedItem"/>
     </module>
     <module name="MagicNumber">
-      <property name="ignoreNumbers" value="-2, -1, 0, 1, 2, 10, 100, 1000"/>
+      <property name="ignoreNumbers" value="-2, -1, 0, 1, 2, 8, 10, 100, 1000"/>
     </module>
     <module name="MissingSwitchDefault"/>
     <module name="NoFinalizer">

client/src/main/java/org/threadly/litesockets/client/http/HTTPClient.java

@@ -20,7 +20,7 @@
 import org.threadly.concurrent.future.ListenableFuture;
 import org.threadly.concurrent.future.SettableListenableFuture;
 import org.threadly.litesockets.Client;
-import org.threadly.litesockets.Client.CloseListener;
+import org.threadly.litesockets.Client.ClientCloseListener;
 import org.threadly.litesockets.Client.Reader;
 import org.threadly.litesockets.NoThreadSocketExecuter;
 import org.threadly.litesockets.SocketExecuter;
@@ -45,8 +45,7 @@
 /**
  * <p>This is a HTTPClient for doing many simple HTTPRequests.  Every request will be make a new connection and requests
  * can be done in parallel.  This is mainly used for doing many smaller Request and Response messages as the full Request/Response 
- * is kept in memory and are not handled as streams.  See {@link HTTPStreamClient} for use with large HTTP data sets.</p>   
- * 
+ * is kept in memory and are not handled as streams.  See {@link HTTPStreamClient} for use with large HTTP data sets.</p>
  */
 public class HTTPClient extends AbstractService {
   public static final int DEFAULT_CONCURRENT = 2;
@@ -466,10 +465,9 @@ public void run() {
   }
 
   /**
-   * 
-   *
+   * Class for accepting data into the request processor as well handling the close event.
    */
-  private class MainClientProcessor implements Reader, CloseListener {
+  private class MainClientProcessor implements Reader, ClientCloseListener {
     @Override
     public void onClose(Client client) {
       HTTPRequestWrapper hrw = inProcess.get(client);
@@ -502,7 +500,6 @@ public void onRead(Client client) {
 
   /**
    * 
-   *    
    */
   private class HTTPRequestWrapper implements HTTPResponseCallback {
     private final SettableListenableFuture<HTTPResponseData> slf = new SettableListenableFuture<>(false);
@@ -562,7 +559,7 @@ public void hasError(Throwable t) {
   }
 
   /**
-   * This is a simple, full HttpResponse with data  
+   * This is a simple, full HttpResponse with data.
    */
   public static class HTTPResponseData {
     private final HTTPResponse hr;

client/src/main/java/org/threadly/litesockets/client/http/HTTPStreamClient.java

@@ -11,7 +11,7 @@
 import org.threadly.concurrent.future.ListenableFuture;
 import org.threadly.concurrent.future.SettableListenableFuture;
 import org.threadly.litesockets.Client;
-import org.threadly.litesockets.Client.CloseListener;
+import org.threadly.litesockets.Client.ClientCloseListener;
 import org.threadly.litesockets.Client.Reader;
 import org.threadly.litesockets.SocketExecuter;
 import org.threadly.litesockets.TCPClient;
@@ -44,7 +44,7 @@
 public class HTTPStreamClient implements StreamingClient {
   private static final int DEFAULT_TIMEOUT = 20000;
   private final Reader classReader = new HTTPReader();
-  private final CloseListener classCloser = new HTTPCloser();
+  private final ClientCloseListener classCloser = new HTTPCloser();
   private final RunnableListenerHelper closeListener = new RunnableListenerHelper(true);
   private final RequestCallback requestCB = new RequestCallback();
   private final TCPClient client;
@@ -238,7 +238,7 @@ public void onRead(Client client) {
    * @author lwahlmeier
    *
    */
-  private class HTTPCloser implements CloseListener {
+  private class HTTPCloser implements ClientCloseListener {
     @Override
     public void onClose(Client client) {
       isConnected = false;

client/src/test/java/org/threadly/litesockets/client/http/HTTPClientTests.java

@@ -5,7 +5,6 @@
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.nio.ByteBuffer;
 import java.util.HashMap;
@@ -25,8 +24,6 @@
 import org.threadly.litesockets.SocketExecuter;
 import org.threadly.litesockets.TCPServer;
 import org.threadly.litesockets.ThreadedSocketExecuter;
-import org.threadly.litesockets.buffers.MergedByteBuffers;
-import org.threadly.litesockets.buffers.ReuseableMergedByteBuffers;
 import org.threadly.litesockets.client.http.HTTPClient.HTTPResponseData;
 import org.threadly.litesockets.protocols.http.request.HTTPRequest;
 import org.threadly.litesockets.protocols.http.request.HTTPRequestBuilder;
@@ -37,10 +34,9 @@
 import org.threadly.litesockets.protocols.http.shared.HTTPHeaders;
 import org.threadly.litesockets.protocols.http.shared.HTTPParsingException;
 import org.threadly.litesockets.utils.IOUtils;
+import org.threadly.litesockets.utils.PortUtils;
 import org.threadly.test.concurrent.TestCondition;
 import org.threadly.util.Clock;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
 
 public class HTTPClientTests {
   static String CONTENT = "TEST123";
@@ -86,7 +82,7 @@ public void stop() {
   @Test
   public void manyRequestsConcurrent() throws IOException {
     final int number = 500;
-    final int port = TestUtils.findTCPPort();
+    final int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_CL, CONTENT, false, false);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder().setPort(port);
     final HTTPClient httpClient = new HTTPClient();
@@ -140,7 +136,7 @@ public boolean get() {
   @Test
   public void manyRequestsConcurrentJavaExecutor() throws IOException, InterruptedException {
     final int number = 500;
-    final int port = TestUtils.findTCPPort();
+    final int port = PortUtils.findTCPPort();
     final ThreadedSocketExecuter TSE = new ThreadedSocketExecuter(PS);
     TSE.start();
     fakeServer = new TestHTTPServer(port, RESPONSE_CL, CONTENT, false, false);
@@ -200,7 +196,7 @@ public boolean get() {
   @Test
   public void manyRequestsConcurrentOnPool() throws IOException {
     final int number = 500;
-    final int port = TestUtils.findTCPPort();
+    final int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_CL, CONTENT, false, false);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
     final ThreadedSocketExecuter TSE = new ThreadedSocketExecuter(PS);
@@ -257,7 +253,7 @@ public boolean get() {
 
   @Test
   public void blockingRequest() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_CL, CONTENT, false, true);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
     final HTTPClient httpClient = new HTTPClient();
@@ -267,7 +263,7 @@ public void blockingRequest() throws IOException, HTTPParsingException {
 
   @Test
   public void noContentLengthNoBody() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_NO_CL, "", false, true);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
     final HTTPClient httpClient = new HTTPClient();
@@ -278,7 +274,7 @@ public void noContentLengthNoBody() throws IOException, HTTPParsingException {
 
   @Test
   public void noContentLengthWithBody() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_NO_CL, CONTENT, false, true);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
     final HTTPClient httpClient = new HTTPClient();
@@ -290,7 +286,7 @@ public void noContentLengthWithBody() throws IOException, HTTPParsingException {
 
   @Test
   public void closeBeforeLength() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_HUGE, CONTENT, false, true);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
     final HTTPClient httpClient = new HTTPClient();
@@ -306,7 +302,7 @@ public void closeBeforeLength() throws IOException, HTTPParsingException {
 
   @Test
   public void timeoutRequest() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     TCPServer server = SEI.createTCPServer("localhost", port);
     server.start();
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
@@ -322,7 +318,7 @@ public void timeoutRequest() throws IOException, HTTPParsingException {
 
   @Test
   public void expireRequest() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_CL, "", false, false);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
     final HTTPClient httpClient = new HTTPClient();
@@ -339,7 +335,7 @@ public void expireRequest() throws IOException, HTTPParsingException {
 
   @Test
   public void sslRequest() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_CL, CONTENT, true, false);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("https://localhost:"+port));
     final HTTPClient httpClient = new HTTPClient();
@@ -349,7 +345,7 @@ public void sslRequest() throws IOException, HTTPParsingException {
 
   @Test
   public void toLargeRequest() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_HUGE, LARGE_CONTENT, false, false);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
     final HTTPClient httpClient = new HTTPClient();
@@ -364,7 +360,7 @@ public void toLargeRequest() throws IOException, HTTPParsingException {
 
   @Test
   public void toLargeRequestNoContentLength() throws IOException, HTTPParsingException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_NO_CL, LARGE_CONTENT, false, true);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost:"+port));
     final HTTPClient httpClient = new HTTPClient();
@@ -409,7 +405,7 @@ public void toLargeRequestNoContentLength() throws IOException, HTTPParsingExcep
 
   @Test
   public void timeOut() throws IOException, InterruptedException, ExecutionException, TimeoutException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     TCPServer server =  SEI.createTCPServer("localhost", port);
     server.setClientAcceptor(new ClientAcceptor() {
       @Override
@@ -437,7 +433,7 @@ public void accept(Client c) {
 
   @Test
   public void urlRequest() throws HTTPParsingException, IOException {
-    int port = TestUtils.findTCPPort();
+    int port = PortUtils.findTCPPort();
     fakeServer = new TestHTTPServer(port, RESPONSE_CL, CONTENT, false, false);
     final HTTPClient httpClient = new HTTPClient();
     httpClient.start();

client/src/test/java/org/threadly/litesockets/client/http/HTTPStreamClientTest.java

@@ -23,6 +23,7 @@
 import org.threadly.litesockets.protocols.http.response.HTTPResponse;
 import org.threadly.litesockets.protocols.http.response.HTTPResponseBuilder;
 import org.threadly.litesockets.protocols.http.shared.HTTPConstants;
+import org.threadly.litesockets.utils.PortUtils;
 import org.threadly.test.concurrent.TestCondition;
 
 public class HTTPStreamClientTest {
@@ -50,7 +51,7 @@ public void stop() {
 
   @Test
   public void chunkRecvTest() throws IOException, InterruptedException, ExecutionException {
-    final int port = TestUtils.findTCPPort();
+    final int port = PortUtils.findTCPPort();
     final int number = 300;
     fakeServer = new FakeHTTPStreamingServer(port, RESPONSE_CHUNKED, "", number, false, true);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost/dl.php"));//.setChunked();
@@ -91,8 +92,7 @@ public boolean get() {
 
   @Test
   public void CLRecvTest() throws IOException, InterruptedException, ExecutionException {
-    final int port = TestUtils.findTCPPort();
-    final int number = 300;
+    final int port = PortUtils.findTCPPort();
     fakeServer = new FakeHTTPStreamingServer(port, HTTPClientTests.RESPONSE_HUGE, HTTPClientTests.LARGE_CONTENT, 0, false, false);
     final HTTPRequestBuilder hrb = new HTTPRequestBuilder(new URL("http://localhost/dl.php"));//.setChunked();
     final HTTPStreamClient hsc = new HTTPStreamClient(SEI, "localhost", port);