Merge pull request #14 from innokenty/master

Tiny refactoring

Author: innokenty

config/src/main/java/ru/qatools/gridrouter/config/WithRoute.java

@@ -10,17 +10,19 @@
  */
 public interface WithRoute {
 
-    int getPort();
-
-    String getName();
-
-    int getCount();
+    default String getAddress() {
+        return getName() + ":" + getPort();
+    }
 
     default String getRoute() {
-        return String.format("http://%s:%d", getName(), getPort());
+        return "http://" + getAddress();
     }
 
     default String getRouteId() {
         return DigestUtils.md5Hex(getRoute().getBytes(StandardCharsets.UTF_8));
     }
+
+    String getName();
+
+    int getPort();
 }

proxy/src/main/java/ru/qatools/gridrouter/ProxyServlet.java

@@ -68,8 +68,8 @@ protected void sendProxyRequest(
             Request request = getRequestWithoutSessionId(clientRequest, proxyRequest);
             super.sendProxyRequest(clientRequest, proxyResponse, request);
         } catch (Exception exception) {
-            LOGGER.error("[{}] [{}] - could not read client request, proxying request as is",
-                    "REQUEST_READ_FAILURE", clientRequest.getRemoteHost(), exception);
+            LOGGER.error("[REQUEST_READ_FAILURE] [{}] - could not read client request, proxying request as is",
+                    clientRequest.getRemoteHost(), exception);
             super.sendProxyRequest(clientRequest, proxyResponse, proxyRequest);
         }
     }
@@ -81,32 +81,31 @@ protected String rewriteTarget(HttpServletRequest request) {
         String remoteHost = getRemoteHost(request);
 
         if (!isUriValid(uri)) {
-            LOGGER.warn("[{}] [{}] - request uri is {}", "INVALID_SESSION_HASH", remoteHost, uri);
+            LOGGER.warn("[INVALID_SESSION_HASH] [{}] - request uri is {}", remoteHost, uri);
             return null;
         }
 
         String route = getRoute(uri);
         String command = getCommand(uri);
 
         if (route == null) {
-            LOGGER.error("[{}] [{}] - request uri is {}", "ROUTE_NOT_FOUND", remoteHost, uri);
+            LOGGER.error("[ROUTE_NOT_FOUND] [{}] - request uri is {}", remoteHost, uri);
             return null;
         }
 
         if (isSessionDeleteRequest(request, command)) {
-            LOGGER.info("[{}] [{}] [{}] [{}]", "SESSION_DELETED", remoteHost, route, command);
+            LOGGER.info("[SESSION_DELETED] [{}] [{}] [{}]", remoteHost, route, command);
             stats.stopSession();
         }
 
         try {
             return redirectionUrl(route, command);
         } catch (Exception exception) {
-            LOGGER.error("[{}] [{}] - error building redirection uri because of {}\n"
+            LOGGER.error("[REDIRECTION_URL_ERROR] [{}] - error building redirection uri because of {}\n"
                             + "    request uri:    {}\n"
                             + "    parsed route:   {}\n"
                             + "    parsed command: {}",
-                    "REDIRECTION_URL_ERROR", remoteHost,
-                    exception.toString(), uri, route,  command);
+                    remoteHost, exception.toString(), uri, route,  command);
         }
         return null;
     }
@@ -127,11 +126,9 @@ private String removeSessionIdSafe(String content, String remoteHost) {
             message.setSessionId(null);
             return message.toJson();
         } catch (IOException exception) {
-            LOGGER.error("[{}] [{}] - could not create proxy request without session id, "
+            LOGGER.error("[UNABLE_TO_REMOVE_SESSION_ID] [{}] - could not create proxy request without session id, "
                             + "proxying request as is. Request content is: {}",
-                    "UNABLE_TO_REMOVE_SESSION_ID", remoteHost,
-                    content,
-                    exception);
+                    remoteHost, content, exception);
         }
         return content;
     }
@@ -149,8 +146,7 @@ protected String getCommand(String uri) {
         try {
             return URLDecoder.decode(encodedCommand, UTF_8.name());
         } catch (UnsupportedEncodingException e) {
-            LOGGER.error("[{}] - could not decode command: {}",
-                    "UNABLE_TO_DECODE_COMMAND", encodedCommand, e);
+            LOGGER.error("[UNABLE_TO_DECODE_COMMAND] - could not decode command: {}", encodedCommand, e);
             return encodedCommand;
         }
     }

proxy/src/main/java/ru/qatools/gridrouter/RouteServlet.java

@@ -88,7 +88,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         Version actualVersion = config.findVersion(user, caps);
 
         if (actualVersion == null) {
-            LOGGER.warn("[{}] [{}] [{}] [{}]", "UNSUPPORTED_BROWSER", user, remoteHost, browser);
+            LOGGER.warn("[UNSUPPORTED_BROWSER] [{}] [{}] [{}]", user, remoteHost, browser);
             replyWithError(format("Cannot find %s capabilities on any available node",
                     caps.describe()), response);
             return;
@@ -111,7 +111,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
 
             String route = host.getRoute();
             try (CloseableHttpClient client = newHttpClient()) {
-                LOGGER.info("[{}] [{}] [{}] [{}] [{}] [{}]", "SESSION_ATTEMPTED", user, remoteHost, browser, route, attempt);
+                LOGGER.info("[SESSION_ATTEMPTED] [{}] [{}] [{}] [{}] [{}]", user, remoteHost, browser, route, attempt);
 
                 String target = route + request.getRequestURI();
                 HttpResponse hubResponse = client.execute(post(target, message));
@@ -121,18 +121,18 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
                     String sessionId = hubMessage.getSessionId();
                     hubMessage.setSessionId(host.getRouteId() + sessionId);
                     replyWithOk(hubMessage, response);
-                    LOGGER.info("[{}] [{}] [{}] [{}] [{}] [{}] [{}]",
-                            "SESSION_CREATED", user, remoteHost, browser, route, sessionId, attempt);
+                    LOGGER.info("[SESSION_CREATED] [{}] [{}] [{}] [{}] [{}] [{}]",
+                            user, remoteHost, browser, route, sessionId, attempt);
                     stats.startSession();
                     return;
                 }
-                LOGGER.warn("[{}] [{}] [{}] [{}] [{}] - {}",
-                        "SESSION_FAILED", user, remoteHost, browser, route, hubMessage.getErrorMessage());
+                LOGGER.warn("[SESSION_FAILED] [{}] [{}] [{}] [{}] - {}",
+                        user, remoteHost, browser, route, hubMessage.getErrorMessage());
             } catch (JsonProcessingException exception) {
-                LOGGER.error("[{}] [{}] [{}] [{}] - {}", "BAD_HUB_JSON",
+                LOGGER.error("[BAD_HUB_JSON] [{}] [{}] [{}] - {}", "",
                         user, remoteHost, browser, route, exception.getMessage());
             } catch (IOException exception) {
-                LOGGER.error("[{}] [{}] [{}] [{}] - {}", "HUB_COMMUNICATION_FAILURE",
+                LOGGER.error("[HUB_COMMUNICATION_FAILURE] [{}] [{}] [{}] - {}",
                         user, remoteHost, browser, route, exception.getMessage());
             }
 
@@ -147,7 +147,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
             }
         }
 
-        LOGGER.error("[{}] [{}] [{}] [{}]", "SESSION_NOT_CREATED", user, remoteHost, browser);
+        LOGGER.error("[SESSION_NOT_CREATED] [{}] [{}] [{}]", user, remoteHost, browser);
         replyWithError("Cannot create session on any available node", response);
     }