Move remote dialects into their own packages

This sets the stage for us pulling the OSS dialect out into a legacy package without us breaking the java module system's rules on split packages.
SeleniumHQ · Apr 2, 2019 · b0b69e6 · b0b69e6
1 parent 0b1a4b5
commit b0b69e6
Show file tree

Hide file tree

Showing 24 changed files with 137 additions and 178 deletions.
diff --git a/.buckconfig b/.buckconfig
@@ -64,4 +64,4 @@
   ie-test       = //java/client/test/org/openqa/selenium/ie:ie
   opera-test    = //java/client/test/org/openqa/selenium/opera:opera
   safari-test   = //java/client/test/org/openqa/selenium/safari:safari
-  java-small-tests = //java/client/test/org/openqa/selenium:small-tests //java/client/test/org/openqa/selenium/json:small-tests //java/client/test/org/openqa/selenium/support:small-tests //java/client/test/org/openqa/selenium/remote:common-tests //java/client/test/org/openqa/selenium/remote:client-tests //java/server/test/org/openqa/grid/selenium/node:node //java/server/test/org/openqa/grid/selenium/proxy:proxy //java/server/test/org/openqa/selenium/remote/server:small-tests //java/server/test/org/openqa/selenium/remote/server/log:test //java/server/test/org/openqa/selenium/injector:small-tests
+  java-small-tests = //java/client/test/org/openqa/selenium:small-tests //java/client/test/org/openqa/selenium/json:small-tests //java/client/test/org/openqa/selenium/support:small-tests //java/client/test/org/openqa/selenium/remote:small-tests //java/server/test/org/openqa/grid/selenium/node:node //java/server/test/org/openqa/grid/selenium/proxy:proxy //java/server/test/org/openqa/selenium/remote/server:small-tests //java/server/test/org/openqa/selenium/remote/server/log:test //java/server/test/org/openqa/selenium/injector:small-tests
diff --git a/java/client/src/org/openqa/selenium/remote/BUCK b/java/client/src/org/openqa/selenium/remote/BUCK
@@ -108,22 +108,14 @@ java_library(
         "html5/RemoteLocationContext.java",
         "html5/RemoteSessionStorage.java",
         "html5/RemoteWebStorage.java",
-        "http/HttpClient.java",
-        "http/HttpMessage.java",
-        "http/HttpMethod.java",
-        "http/HttpRequest.java",
-        "http/HttpResponse.java",
-        "http/AbstractHttpCommandCodec.java",
-        "http/AbstractHttpResponseCodec.java",
-        "http/JsonHttpCommandCodec.java",
-        "http/JsonHttpResponseCodec.java",
-        "http/W3CHttpCommandCodec.java",
-        "http/W3CHttpResponseCodec.java",
         "internal/OkHttpClient.java",
         "internal/JsonToWebElementConverter.java",
         "internal/WebElementToJsonConverter.java",
         "mobile/RemoteNetworkConnection.java",
     ] + glob([
+        "codec/*.java",
+        "codec/jwp/*.java",
+        "codec/w3c/*.java",
         "service/*.java",
     ]),
     resources = [
@@ -133,6 +125,7 @@ java_library(
     exported_deps = [
         ":api",
         ":capabilities",
+        "//java/client/src/org/openqa/selenium/remote/http:http",
         "//java/client/src/org/openqa/selenium/json:json",
         "//java/client/src/org/openqa/selenium/remote/session:session",
         "//third_party/java/okhttp3:okhttp",

diff --git a/java/client/src/org/openqa/selenium/remote/Dialect.java b/java/client/src/org/openqa/selenium/remote/Dialect.java
@@ -19,10 +19,10 @@
 
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.http.JsonHttpCommandCodec;
-import org.openqa.selenium.remote.http.JsonHttpResponseCodec;
-import org.openqa.selenium.remote.http.W3CHttpCommandCodec;
-import org.openqa.selenium.remote.http.W3CHttpResponseCodec;
+import org.openqa.selenium.remote.codec.jwp.JsonHttpCommandCodec;
+import org.openqa.selenium.remote.codec.jwp.JsonHttpResponseCodec;
+import org.openqa.selenium.remote.codec.w3c.W3CHttpCommandCodec;
+import org.openqa.selenium.remote.codec.w3c.W3CHttpResponseCodec;
 
 public enum Dialect {
   OSS {

diff --git a/java/client/src/org/openqa/selenium/remote/RemoteWebDriverBuilder.java b/java/client/src/org/openqa/selenium/remote/RemoteWebDriverBuilder.java
@@ -35,8 +35,8 @@
 import org.openqa.selenium.remote.http.HttpClient;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
-import org.openqa.selenium.remote.http.W3CHttpCommandCodec;
-import org.openqa.selenium.remote.http.W3CHttpResponseCodec;
+import org.openqa.selenium.remote.codec.w3c.W3CHttpCommandCodec;
+import org.openqa.selenium.remote.codec.w3c.W3CHttpResponseCodec;
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.IOException;

diff --git a/...remote/http/AbstractHttpCommandCodec.java → ...emote/codec/AbstractHttpCommandCodec.java b/...remote/http/AbstractHttpCommandCodec.java → ...emote/codec/AbstractHttpCommandCodec.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.http;
+package org.openqa.selenium.remote.codec;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -105,6 +105,8 @@
 import org.openqa.selenium.remote.Command;
 import org.openqa.selenium.remote.CommandCodec;
 import org.openqa.selenium.remote.SessionId;
+import org.openqa.selenium.remote.http.HttpMethod;
+import org.openqa.selenium.remote.http.HttpRequest;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...emote/http/AbstractHttpResponseCodec.java → ...mote/codec/AbstractHttpResponseCodec.java b/...emote/http/AbstractHttpResponseCodec.java → ...mote/codec/AbstractHttpResponseCodec.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.http;
+package org.openqa.selenium.remote.codec;
 
 import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.net.HttpHeaders.CACHE_CONTROL;
@@ -32,6 +32,7 @@
 import org.openqa.selenium.remote.ErrorCodes;
 import org.openqa.selenium.remote.Response;
 import org.openqa.selenium.remote.ResponseCodec;
+import org.openqa.selenium.remote.http.HttpResponse;
 
 import java.util.Optional;
 import java.util.function.Supplier;

diff --git a/...ium/remote/http/JsonHttpCommandCodec.java → ...emote/codec/jwp/JsonHttpCommandCodec.java b/...ium/remote/http/JsonHttpCommandCodec.java → ...emote/codec/jwp/JsonHttpCommandCodec.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.http;
+package org.openqa.selenium.remote.codec.jwp;
 
 import static org.openqa.selenium.remote.DriverCommand.ACCEPT_ALERT;
 import static org.openqa.selenium.remote.DriverCommand.CLEAR_LOCAL_STORAGE;
@@ -67,6 +67,7 @@
 
 import org.openqa.selenium.InvalidArgumentException;
 import org.openqa.selenium.remote.DriverCommand;
+import org.openqa.selenium.remote.codec.AbstractHttpCommandCodec;
 
 import java.util.Map;
 

diff --git a/...um/remote/http/JsonHttpResponseCodec.java → ...mote/codec/jwp/JsonHttpResponseCodec.java b/...um/remote/http/JsonHttpResponseCodec.java → ...mote/codec/jwp/JsonHttpResponseCodec.java
@@ -15,10 +15,11 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.http;
+package org.openqa.selenium.remote.codec.jwp;
 
 import org.openqa.selenium.remote.ErrorHandler;
 import org.openqa.selenium.remote.Response;
+import org.openqa.selenium.remote.codec.AbstractHttpResponseCodec;
 import org.openqa.selenium.remote.internal.JsonToWebElementConverter;
 
 import java.util.function.Function;

diff --git a/...nium/remote/http/W3CHttpCommandCodec.java → ...remote/codec/w3c/W3CHttpCommandCodec.java b/...nium/remote/http/W3CHttpCommandCodec.java → ...remote/codec/w3c/W3CHttpCommandCodec.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.http;
+package org.openqa.selenium.remote.codec.w3c;
 
 import static org.openqa.selenium.remote.DriverCommand.ACCEPT_ALERT;
 import static org.openqa.selenium.remote.DriverCommand.ACTIONS;
@@ -76,6 +76,7 @@
 import org.openqa.selenium.interactions.PointerInput;
 import org.openqa.selenium.interactions.Sequence;
 import org.openqa.selenium.remote.RemoteWebElement;
+import org.openqa.selenium.remote.codec.AbstractHttpCommandCodec;
 import org.openqa.selenium.remote.internal.WebElementToJsonConverter;
 
 import java.io.IOException;

diff --git a/...ium/remote/http/W3CHttpResponseCodec.java → ...emote/codec/w3c/W3CHttpResponseCodec.java b/...ium/remote/http/W3CHttpResponseCodec.java → ...emote/codec/w3c/W3CHttpResponseCodec.java
@@ -15,7 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-package org.openqa.selenium.remote.http;
+package org.openqa.selenium.remote.codec.w3c;
 
 import static com.google.common.base.Strings.nullToEmpty;
 import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
@@ -32,6 +32,8 @@
 import org.openqa.selenium.json.Json;
 import org.openqa.selenium.remote.ErrorCodes;
 import org.openqa.selenium.remote.Response;
+import org.openqa.selenium.remote.codec.AbstractHttpResponseCodec;
+import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.internal.JsonToWebElementConverter;
 
 import java.lang.reflect.Constructor;

diff --git a/java/client/src/org/openqa/selenium/remote/http/BUCK b/java/client/src/org/openqa/selenium/remote/http/BUCK
@@ -0,0 +1,11 @@
+java_library(
+    name = "http",
+    srcs = glob(["*.java"]),
+    deps = [
+        "//java/client/src/org/openqa/selenium:selenium",
+        "//third_party/java/guava:guava",
+    ],
+    visibility = [
+        "//java/client/src/org/openqa/selenium/remote/...",
+    ],
+)
diff --git a/java/client/test/org/openqa/selenium/remote/BUCK b/java/client/test/org/openqa/selenium/remote/BUCK
@@ -1,34 +1,12 @@
 java_test(
-    name = "common-tests",
-    srcs = [
-        "DesiredCapabilitiesTest.java",
-        "RemoteCommonTests.java",
-        "http/JsonHttpCommandCodecTest.java",
-        "http/JsonHttpResponseCodecTest.java",
-        "http/W3CHttpResponseCodecTest.java",
-    ],
-    labels = [
-        "small",
-    ],
-    deps = [
-        "//java/client/src/org/openqa/selenium:selenium",
-        "//java/client/src/org/openqa/selenium/remote:remote",
-        "//third_party/java/guava:guava",
-        "//third_party/java/assertj:assertj",
-        "//third_party/java/junit:junit",
-    ],
-)
-
-java_test(
-    name = "client-tests",
+    name = "small-tests",
     srcs = [
         "AugmenterTest.java",
         "BaseAugmenterTest.java",
+        "DesiredCapabilitiesTest.java",
         "ErrorHandlerTest.java",
         "JdkAugmenterTest.java",
-        "JsonWireProtocolResponseTest.java",
         "ProtocolHandshakeTest.java",
-        "RemoteClientTests.java",
         "RemoteLogsTest.java",
         "RemoteWebDriverInitializationTest.java",
         "RemoteWebDriverUnitTest.java",
@@ -45,6 +23,11 @@ java_test(
         "//third_party/java/servlet:javax.servlet-api",
     ],
     deps = [
+        "//java/client/src/org/openqa/selenium:selenium",
+        "//java/client/src/org/openqa/selenium/remote:remote",
+        "//third_party/java/guava:guava",
+        "//third_party/java/assertj:assertj",
+        "//third_party/java/junit:junit",
         "//java/client/src/org/openqa/selenium:selenium",
         "//java/client/src/org/openqa/selenium/chrome:chrome",
         "//java/client/src/org/openqa/selenium/firefox:firefox",

diff --git a/java/client/test/org/openqa/selenium/remote/RemoteClientTests.java b/java/client/test/org/openqa/selenium/remote/RemoteClientTests.java
diff --git a/java/client/test/org/openqa/selenium/remote/RemoteCommonTests.java b/java/client/test/org/openqa/selenium/remote/RemoteCommonTests.java
diff --git a/java/client/test/org/openqa/selenium/remote/codec/jwp/BUCK b/java/client/test/org/openqa/selenium/remote/codec/jwp/BUCK
@@ -0,0 +1,13 @@
+java_test(
+    name = "jwp",
+    srcs = glob(["*.java"]),
+    labels = [
+        "small",
+    ],
+    deps = [
+        "//java/client/src/org/openqa/selenium/remote:remote",
+        "//third_party/java/assertj:assertj",
+        "//third_party/java/guava:guava",
+        "//third_party/java/junit:junit",
+    ],
+)