Minor performance improvements

This reduces duplicate calls to things like .trim() and .indexOf.
It also improves condition checking slightly and includes a threadly version bump.

Author: jentfoo

gradle.properties

@@ -1,5 +1,5 @@
 group = org.threadly
-version = 0.7
-threadlyVersion = 5.1
+version = 0.8
+threadlyVersion = 5.3
 litesocketsVersion = 4.0
 org.gradle.parallel=true

protocol/src/main/java/org/threadly/litesockets/protocols/http/request/HTTPRequest.java

@@ -69,5 +69,4 @@ public HTTPRequestBuilder makeBuilder() {
     HTTPRequestBuilder hrb = new HTTPRequestBuilder().replaceHTTPHeaders(headers).setHTTPRequestHeader(request);
     return hrb;
   }
-  
 }

protocol/src/main/java/org/threadly/litesockets/protocols/http/request/HTTPRequestBuilder.java

@@ -148,4 +148,3 @@ public HTTPRequest build() {
     return new HTTPRequest(request, new HTTPHeaders(headers));
   }
 }
-

protocol/src/main/java/org/threadly/litesockets/protocols/http/request/HTTPRequestHeader.java

@@ -22,19 +22,19 @@ public class HTTPRequestHeader {
 
   public HTTPRequestHeader(final String requestHeader) {
     this.rawRequest = requestHeader.trim();
-    String[] tmp = requestHeader.trim().split(" ");
+    String[] tmp = rawRequest.split(" ");
     if(tmp.length != REQUIRED_REQUEST_ITEMS) {
       throw new IllegalArgumentException("HTTPRequestHeader can only have 3 arguments! :"+requestHeader);
     }
     requestType = tmp[0].trim().toUpperCase();
     String ptmp = tmp[1].trim();
-    if(ptmp.indexOf("?") >= 0) {
-      int pos = tmp[1].indexOf("?");
-      requestPath = ptmp.substring(0, pos);
-      requestQuery = HTTPUtils.queryToMap(ptmp.substring(pos+1));
+    int queryParamPos = ptmp.indexOf('?');
+    if(queryParamPos >= 0) {
+      requestPath = ptmp.substring(0, queryParamPos);
+      requestQuery = HTTPUtils.queryToMap(ptmp.substring(queryParamPos+1));
     } else {
       requestPath = ptmp;
-      requestQuery = HTTPUtils.queryToMap("");
+      requestQuery = Collections.emptyMap();
     }
 
     httpVersion = tmp[2].trim().toUpperCase();
@@ -50,31 +50,31 @@ public HTTPRequestHeader(HTTPRequestType requestType, String requestPath, Map<St
   public HTTPRequestHeader(String requestType, String requestPath, Map<String, String> requestQuery, String httpVersion){
     this.requestType = requestType;
     final HashMap<String, String> rqm = new HashMap<>();
-    if(requestPath.contains("?")) {
-      int pos = requestPath.indexOf("?");
-      this.requestPath = requestPath.substring(0, pos);
-      rqm.putAll(HTTPUtils.queryToMap(requestPath.substring(pos+1)));
+    int queryParamPos = requestPath.indexOf("?");
+    if(queryParamPos >= 0) {
+      this.requestPath = requestPath.substring(0, queryParamPos);
+      rqm.putAll(HTTPUtils.queryToMap(requestPath.substring(queryParamPos+1)));
     } else {
       this.requestPath = requestPath;
     }
     if(requestQuery != null) {
       rqm.putAll(requestQuery);
     }
     this.requestQuery = Collections.unmodifiableMap(rqm);
+    if(!HTTPConstants.HTTP_VERSION_1_1.equals(httpVersion) && !HTTPConstants.HTTP_VERSION_1_0.equals(httpVersion)) {
+      throw new UnsupportedOperationException("Unknown HTTP Version!:"+httpVersion);
+    }
     this.httpVersion = httpVersion.trim().toUpperCase();
     StringBuilder sb = new StringBuilder();
     sb.append(requestType.toString());
     sb.append(HTTPConstants.SPACE);
     sb.append(requestPath);
-    if(requestQuery != null && requestQuery.size() > 0) {
+    if(requestQuery != null && ! requestQuery.isEmpty()) {
       sb.append(HTTPUtils.queryToString(requestQuery));
     }
     sb.append(HTTPConstants.SPACE);
     sb.append(this.httpVersion);
     rawRequest = sb.toString();
-    if(!httpVersion.equals(HTTPConstants.HTTP_VERSION_1_1) && !httpVersion.equals(HTTPConstants.HTTP_VERSION_1_0)) {
-      throw new UnsupportedOperationException("Unknown HTTP Version!:"+httpVersion);
-    }
   }
 
   public String getRequestType() {
@@ -113,13 +113,14 @@ public int hashCode() {
 
   @Override
   public boolean equals(Object o) {
-    if(o instanceof HTTPRequestHeader) {
+    if(o == this) {
+      return true;
+    } else if(o instanceof HTTPRequestHeader) {
       HTTPRequestHeader hrh = (HTTPRequestHeader)o;
       if(hrh.toString().equals(this.toString())) {
         return true;
       }
     }
     return false;
   }
-  
 }

protocol/src/main/java/org/threadly/litesockets/protocols/http/response/HTTPResponseHeader.java

@@ -16,7 +16,7 @@ public class HTTPResponseHeader {
 
   public HTTPResponseHeader(String stringResponse) {
     this.rawResponse = stringResponse.trim();
-    String[] tmp = stringResponse.trim().split(" ", MAX_RESPONSE_ITEMS);
+    String[] tmp = rawResponse.split(" ", MAX_RESPONSE_ITEMS);
     try {
       httpVersion = tmp[0].trim();
       if(!httpVersion.equalsIgnoreCase(HTTPConstants.HTTP_VERSION_1_1) && !httpVersion.equalsIgnoreCase(HTTPConstants.HTTP_VERSION_1_0)) {
@@ -72,6 +72,4 @@ public boolean equals(Object o) {
   public String toString() {
     return rawResponse;
   }
-  
-
 }

protocol/src/main/java/org/threadly/litesockets/protocols/http/shared/HTTPHeaders.java

@@ -26,10 +26,13 @@ public HTTPHeaders(String headerString) {
       this.rawHeaders = headerString;
     }
 
-    String[] rows = headerString.trim().split(HTTPConstants.HTTP_NEWLINE_DELIMINATOR);
+    String[] rows = headerString.split(HTTPConstants.HTTP_NEWLINE_DELIMINATOR);
     for(String h: rows) {
       int delim = h.indexOf(':');
-      map.put(h.substring(0, delim), h.substring(delim + 1).trim());
+      if (delim < 0) {
+        throw new IllegalArgumentException("Header is missing key value delim: " + h);
+      }
+      map.put(h.substring(0, delim).trim(), h.substring(delim + 1).trim());
     }
 
     headers = Collections.unmodifiableMap(map);