Delete deprecated servletHttp* wrappers

SeleniumHQ · Aug 7, 2018 · 63ebe33 · 63ebe33
1 parent e5fbba1
commit 63ebe33
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 71 deletions.
diff --git a/java/server/src/org/openqa/grid/BUCK b/java/server/src/org/openqa/grid/BUCK
@@ -21,7 +21,7 @@ java_library(name = 'grid',
     '//java/client/src/org/openqa/selenium/remote:remote',
     '//java/client/src/org/openqa/selenium/firefox:firefox',
     '//java/client/src/org/openqa/selenium/safari:safari',
-    '//java/server/src/org/openqa/selenium/grid/web:web',
+    '//java/server/src/org/openqa/selenium/grid/server:server',
     '//java/server/src/org/openqa/selenium/remote/server:server',
     '//java/server/src/org/openqa/selenium/remote/server:webdriver-servlet',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',

diff --git a/java/server/src/org/openqa/grid/web/servlet/ProxyStatusServlet.java b/java/server/src/org/openqa/grid/web/servlet/ProxyStatusServlet.java
@@ -25,11 +25,11 @@
 import org.openqa.grid.common.exception.GridException;
 import org.openqa.grid.internal.GridRegistry;
 import org.openqa.grid.internal.RemoteProxy;
+import org.openqa.selenium.grid.server.ServletRequestWrappingHttpRequest;
+import org.openqa.selenium.grid.server.ServletResponseWrappingHttpResponse;
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.grid.server.ServletRequestWrappingHttpRequest;
-import org.openqa.selenium.grid.server.ServletResponseWrappingHttpResponse;
 
 import java.lang.reflect.Method;
 import java.net.MalformedURLException;

diff --git a/java/server/src/org/openqa/selenium/grid/server/BUCK b/java/server/src/org/openqa/selenium/grid/server/BUCK
@@ -14,6 +14,6 @@ java_library(
         "//third_party/java/jetty:jetty",
     ],
     visibility = [
-        "//java/server/test/org/openqa/selenium/grid/...",
-    ],
+        "//java/server/...",
+    ]
 )
diff --git a/java/server/src/org/openqa/selenium/remote/server/BUCK b/java/server/src/org/openqa/selenium/remote/server/BUCK
@@ -28,8 +28,6 @@ java_library(name = 'server',
     'InputStreamWrappingServletInputStream.java',
     'JsonHttpCommandHandler.java',
     'JsonParametersAware.java',
-    'ServletRequestWrappingHttpRequest.java',
-    'ServletResponseWrappingHttpResponse.java',
     'SnapshotScreenListener.java',
     'StaticResourceHandler.java',
   ] + glob([
@@ -92,6 +90,7 @@ java_library(
     ':server',
     ':sessions',
     '//java/client/src/org/openqa/selenium/remote:remote',
+    '//java/server/src/org/openqa/selenium/grid/server:server',
     '//java/server/src/org/openqa/selenium/grid/web:web',
     '//java/server/src/org/openqa/selenium/injector:injector',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',

diff --git a/java/server/src/org/openqa/selenium/remote/server/ServletRequestWrappingHttpRequest.java b/java/server/src/org/openqa/selenium/remote/server/ServletRequestWrappingHttpRequest.java
diff --git a/java/server/src/org/openqa/selenium/remote/server/ServletResponseWrappingHttpResponse.java b/java/server/src/org/openqa/selenium/remote/server/ServletResponseWrappingHttpResponse.java