Partial backport of graphql from v4 trunk (036ee7f)

pczerkas · Jul 31, 2022 · d62f2a9 · d62f2a9
1 parent e82be7d
commit d62f2a9
Show file tree

Hide file tree

Showing 41 changed files with 2,615 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -102,11 +102,11 @@ third_party/py/googlestorage/client_secrets.json
 venv
 venv3
 py/.idea
+.vscode
 
 # Bazel stuff
 bazel-bin
 bazel-genfiles
 bazel-out
 bazel-selenium
 bazel-testlogs
-
diff --git a/Rakefile b/Rakefile
@@ -44,11 +44,11 @@ end
 verbose($DEBUG)
 
 def release_version
-  "3.141"
+  "3.200"
 end
 
 def version
-  "#{release_version}.59"
+  "#{release_version}.11"
 end
 
 # The build system used by webdriver is layered on top of rake, and we call it

diff --git a/common/.project b/common/.project
@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1659277340837</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/java/client/.project b/java/client/.project
@@ -33,5 +33,14 @@
 				<arguments>1.0-name-matches-false-false-build.desc</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1659277340828</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>
diff --git a/java/client/src/org/openqa/selenium/json/Json.java b/java/client/src/org/openqa/selenium/json/Json.java
@@ -30,6 +30,8 @@
 import java.util.Map;
 
 public class Json {
+  public static final String JSON_UTF_8 = "application/json; charset=utf-8";
+
   public static final Type LIST_OF_MAPS_TYPE = new TypeToken<List<Map<String, Object>>>() {}.getType();
   public static final Type MAP_TYPE = new TypeToken<Map<String, Object>>() {}.getType();
   public static final Type OBJECT_TYPE = new TypeToken<Object>() {}.getType();

diff --git a/java/client/src/org/openqa/selenium/json/JsonOutput.java b/java/client/src/org/openqa/selenium/json/JsonOutput.java
@@ -101,6 +101,7 @@ public class JsonOutput implements Closeable {
   private String indent = "";
   private String lineSeparator = "\n";
   private String indentBy = "  ";
+  private boolean writeClassName = true;
 
   JsonOutput(Appendable appendable) {
     this.appendable = Objects.requireNonNull(appendable);
@@ -197,6 +198,11 @@ public JsonOutput setPrettyPrint(boolean enablePrettyPrinting) {
     return this;
   }
 
+  public JsonOutput writeClassName(boolean writeClassName) {
+    this.writeClassName = writeClassName;
+    return this;
+  }
+
   public JsonOutput beginObject() {
     stack.getFirst().write("{" + lineSeparator);
     indent += indentBy;
@@ -355,6 +361,10 @@ private void mapObject(Object toConvert, int maxDepth) {
         continue;
       }
 
+      if (!writeClassName && "class".equals(pd.getName())) {
+        continue;
+      }
+
       name(pd.getName());
       write(pd.getReadMethod().apply(toConvert), maxDepth - 1);
     }

diff --git a/java/server/.project b/java/server/.project
@@ -33,5 +33,14 @@
 				<arguments>1.0-name-matches-false-false-build.desc</arguments>
 			</matcher>
 		</filter>
+		<filter>
+			<id>1659277340839</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
 	</filteredResources>
 </projectDescription>
diff --git a/java/server/src/org/openqa/grid/BUCK b/java/server/src/org/openqa/grid/BUCK
@@ -1,11 +1,15 @@
 java_library(name = 'grid',
   srcs = glob([
     'common/**/*.java',
+    'graphql/**/*.java',
     'internal/**/*.java',
+    'remote/**/*.java',
+    'server/**/*.java',
     'shared/**/*.java',
     'web/**/*.java',
   ]),
   resources = glob([
+    'graphql/selenium-grid-schema.graphqls',
     'images/*.css',
     'images/*.gif',
     'images/*.html',
@@ -26,11 +30,15 @@ java_library(name = 'grid',
     '//java/server/src/org/openqa/selenium/remote/server:webdriver-servlet',
     '//java/server/src/org/openqa/selenium/remote/server/log:log',
     '//java/server/src/org/openqa/selenium/remote/server/jmx:jmx',
+    '//third_party/java/antlr:antlr',
     '//third_party/java/beust:jcommander',
     '//third_party/java/guava:guava',
+    '//third_party/java/graphql:graphql-java',
+    '//third_party/java/graphql:java-dataloader',
     '//third_party/java/jcip:jcip-annotations',
     '//third_party/java/jetty:jetty',
     '//third_party/java/servlet:javax.servlet-api',
+    '//third_party/java/slf4j:slf4j-api',
     '//third_party/java/yaml:snakeyaml',
   ],
   visibility = [