[java] Process Selenium Manager output as JSON

Author: bonigarcia

java/src/org/openqa/selenium/manager/BUILD.bazel

@@ -19,6 +19,7 @@ java_export(
  deps = [
  "//java/src/org/openqa/selenium:core",
  artifact("com.google.guava:guava"),
+ artifact("com.google.code.gson:gson"),
  ],
 )
 

java/src/org/openqa/selenium/manager/SeleniumManager.java

@@ -18,6 +18,8 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.io.CharStreams;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
@@ -53,7 +55,7 @@ public class SeleniumManager {
 
  private static final String SELENIUM_MANAGER = "selenium-manager";
  private static final String EXE = ".exe";
- private static final String INFO = "INFO\t";
+ private static final String WARN = "WARN";
 
  private static SeleniumManager manager;
 
@@ -110,8 +112,12 @@ private static String runCommand(String... command) {
  throw new WebDriverException("Unsuccessful command executed: " + Arrays.toString(command) +
  "\n" + output);
  }
-
- return output.replace(INFO, "").trim();
+ Gson gson = new GsonBuilder().create();
+ SeleniumManagerJsonOutput jsonOutput = gson.fromJson(output,
+ SeleniumManagerJsonOutput.class);
+ jsonOutput.logs.stream().filter(log -> log.level.equalsIgnoreCase(WARN))
+ .forEach(log -> LOG.warning(log.message));
+ return jsonOutput.result.message;
  }
 
  /**
@@ -162,7 +168,7 @@ public String getDriverPath(String driverName) {
  File binaryFile = getBinary();
  if (binaryFile != null) {
  driverPath = runCommand(binaryFile.getAbsolutePath(),
- "--driver", driverName.replaceAll(EXE, ""));
+ "--output", "json", "--driver", driverName.replaceAll(EXE, ""));
  }
  return driverPath;
  }

java/src/org/openqa/selenium/manager/SeleniumManagerJsonOutput.java

@@ -0,0 +1,37 @@
+// Licensed to the Software Freedom Conservancy (SFC) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The SFC licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.openqa.selenium.manager;
+
+import java.util.List;
+
+public class SeleniumManagerJsonOutput {
+
+ List<Log> logs;
+ Result result;
+
+ class Log {
+ String level;
+ long timestamp;
+ String message;
+ }
+
+ class Result {
+ int code;
+ String message;
+ }
+
+}