rft: extract JsonWireUtils class from ProxyServlet

Author: innokenty

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

@@ -76,8 +76,8 @@ public Map<String, Browsers> getQuotaMap() {
         return userBrowsers;
     }
 
-    public Map<String, String> getRoutes() {
-        return routes;
+    public String getRoute(String routeId) {
+        return routes.get(routeId);
     }
 
     public Version findVersion(String user, JsonCapabilities caps) {

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

@@ -0,0 +1,61 @@
+package ru.qatools.gridrouter;
+
+import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.UnsupportedEncodingException;
+import java.net.URISyntaxException;
+import java.net.URLDecoder;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.springframework.http.HttpMethod.DELETE;
+
+/**
+ * @author Alexander Andyashin [email protected]
+ * @author Innokenty Shuvalov [email protected]
+ * @author Dmitry Baev [email protected]
+ * @author Artem Eroshenko [email protected]
+ */
+public final class JsonWireUtils {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(JsonWireUtils.class);
+
+    public static final String WD_HUB_SESSION = "/wd/hub/session/";
+
+    public static final int SESSION_HASH_LENGTH = 32;
+
+    private JsonWireUtils() {
+    }
+
+    public static boolean isUriValid(String uri) {
+        return uri.length() > getUriPrefixLength();
+    }
+
+    public static boolean isSessionDeleteRequest(HttpServletRequest request, String command) {
+        return DELETE.name().equalsIgnoreCase(request.getMethod()) && !command.contains("/");
+    }
+
+    public static String getSessionHash(String uri) {
+        return uri.substring(WD_HUB_SESSION.length(), getUriPrefixLength());
+    }
+
+    public static int getUriPrefixLength() {
+        return WD_HUB_SESSION.length() + SESSION_HASH_LENGTH;
+    }
+
+    public static String redirectionUrl(String host, String command) throws URISyntaxException {
+        return new URIBuilder(host).setPath(WD_HUB_SESSION + command).build().toString();
+    }
+
+    public static String getCommand(String uri) {
+        String encodedCommand = uri.substring(getUriPrefixLength());
+        try {
+            return URLDecoder.decode(encodedCommand, UTF_8.name());
+        } catch (UnsupportedEncodingException e) {
+            LOGGER.error("[UNABLE_TO_DECODE_COMMAND] - could not decode command: {}", encodedCommand, e);
+            return encodedCommand;
+        }
+    }
+}

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

@@ -1,7 +1,6 @@
 package ru.qatools.gridrouter;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.http.client.utils.URIBuilder;
 import org.eclipse.jetty.client.api.Request;
 import org.eclipse.jetty.client.util.StringContentProvider;
 import org.slf4j.Logger;
@@ -18,13 +17,10 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URISyntaxException;
-import java.net.URLDecoder;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.springframework.http.HttpMethod.DELETE;
 import static org.springframework.web.context.support.SpringBeanAutowiringSupport.processInjectionBasedOnServletContext;
+import static ru.qatools.gridrouter.JsonWireUtils.*;
 import static ru.qatools.gridrouter.RequestUtils.getRemoteHost;
 
 /**
@@ -34,7 +30,7 @@
  * @author Artem Eroshenko [email protected]
  */
 @WebServlet(
-        urlPatterns = {ProxyServlet.WD_HUB_SESSION + "*"},
+        urlPatterns = {WD_HUB_SESSION + "*"},
         asyncSupported = true,
         initParams = {
                 @WebInitParam(name = "timeout", value = "300000"),
@@ -45,10 +41,6 @@ public class ProxyServlet extends org.eclipse.jetty.proxy.ProxyServlet {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ProxyServlet.class);
 
-    public static final String WD_HUB_SESSION = "/wd/hub/session/";
-
-    public static final int SESSION_HASH_LENGTH = 32;
-
     @Autowired
     private ConfigRepository config;
 
@@ -85,7 +77,7 @@ protected String rewriteTarget(HttpServletRequest request) {
             return null;
         }
 
-        String route = getRoute(uri);
+        String route = config.getRoute(getSessionHash(uri));
         String command = getCommand(uri);
 
         if (route == null) {
@@ -132,39 +124,4 @@ private String removeSessionIdSafe(String content, String remoteHost) {
         }
         return content;
     }
-
-    protected String redirectionUrl(String host, String command) throws URISyntaxException {
-        return new URIBuilder(host).setPath(WD_HUB_SESSION + command).build().toString();
-    }
-
-    protected String getRoute(String uri) {
-        return config.getRoutes().get(getSessionHash(uri));
-    }
-
-    protected String getCommand(String uri) {
-        String encodedCommand = uri.substring(getUriPrefixLength());
-        try {
-            return URLDecoder.decode(encodedCommand, UTF_8.name());
-        } catch (UnsupportedEncodingException e) {
-            LOGGER.error("[UNABLE_TO_DECODE_COMMAND] - could not decode command: {}", encodedCommand, e);
-            return encodedCommand;
-        }
-    }
-
-    protected boolean isUriValid(String uri) {
-        return uri.length() > getUriPrefixLength();
-    }
-
-    protected boolean isSessionDeleteRequest(HttpServletRequest request, String command) {
-        return DELETE.name().equalsIgnoreCase(request.getMethod())
-                && !command.contains("/");
-    }
-
-    protected String getSessionHash(String uri) {
-        return uri.substring(WD_HUB_SESSION.length(), getUriPrefixLength());
-    }
-
-    protected int getUriPrefixLength() {
-        return WD_HUB_SESSION.length() + SESSION_HASH_LENGTH;
-    }
 }

proxy/src/test/java/ru/qatools/gridrouter/CommandDecodingTest.java

@@ -41,10 +41,6 @@ public static Collection<Object[]> getData() {
 
     @Test
     public void testOutput() throws Exception {
-        ProxyServlet proxyServlet = new ProxyServlet();
-        String command = proxyServlet.getCommand(requestUri);
-        assertThat(command, endsWith(elementId));
+        assertThat(JsonWireUtils.getCommand(requestUri), endsWith(elementId));
     }
-
-
 }