Skip to content

Commit a9ab17a

Browse files
committed
[java] implement Edge Driver Service using log level with enum and deprecate using String
1 parent b329114 commit a9ab17a

File tree

1 file changed

+17
-4
lines changed

1 file changed

+17
-4
lines changed

java/src/org/openqa/selenium/edge/EdgeDriverService.java

+17-4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
import org.openqa.selenium.Capabilities;
2323
import org.openqa.selenium.WebDriverException;
24+
import org.openqa.selenium.chromium.ChromiumDriverLogLevel;
2425
import org.openqa.selenium.remote.service.DriverService;
2526

2627
import java.io.File;
@@ -132,7 +133,7 @@ public static class Builder extends DriverService.Builder<
132133
private boolean readableTimestamp = Boolean.getBoolean(EDGE_DRIVER_READABLE_TIMESTAMP);
133134
private boolean appendLog = Boolean.getBoolean(EDGE_DRIVER_APPEND_LOG_PROPERTY);
134135
private boolean verbose = Boolean.getBoolean(EDGE_DRIVER_VERBOSE_LOG_PROPERTY);
135-
private String logLevel = System.getProperty(EDGE_DRIVER_LOG_LEVEL_PROPERTY);
136+
private ChromiumDriverLogLevel logLevel = ChromiumDriverLogLevel.fromString(System.getProperty(EDGE_DRIVER_LOG_LEVEL_PROPERTY));
136137
private boolean silent = Boolean.getBoolean(EDGE_DRIVER_SILENT_OUTPUT_PROPERTY);
137138
private String allowedListIps = System.getProperty(EDGE_DRIVER_ALLOWED_IPS_PROPERTY);
138139

@@ -186,16 +187,28 @@ public Builder withBuildCheckDisabled(boolean noBuildCheck) {
186187
*/
187188
public Builder withVerbose(boolean verbose) {
188189
if (verbose) {
189-
this.logLevel = "ALL";
190+
this.logLevel = ChromiumDriverLogLevel.ALL;
190191
}
191192
this.verbose = false;
192193
return this;
193194
}
194195

195196
/**
196197
* Configures the driver server log level.
198+
* @deprecated Use {@link #withLoglevel(ChromiumDriverLogLevel)} instead.
197199
*/
200+
@Deprecated
198201
public Builder withLoglevel(String logLevel) {
202+
this.verbose = false;
203+
this.silent = false;
204+
this.logLevel = ChromiumDriverLogLevel.fromString(logLevel);
205+
return this;
206+
}
207+
208+
/**
209+
* Configures the driver server log level.
210+
*/
211+
public Builder withLoglevel(ChromiumDriverLogLevel logLevel) {
199212
this.verbose = false;
200213
this.silent = false;
201214
this.logLevel = logLevel;
@@ -210,7 +223,7 @@ public Builder withLoglevel(String logLevel) {
210223
*/
211224
public Builder withSilent(boolean silent) {
212225
if (silent) {
213-
this.logLevel = "OFF";
226+
this.logLevel = ChromiumDriverLogLevel.OFF;
214227
}
215228
this.silent = false;
216229
return this;
@@ -278,7 +291,7 @@ protected List<String> createArgs() {
278291
args.add("--append-log");
279292
}
280293
if (logLevel != null) {
281-
args.add(String.format("--log-level=%s", logLevel));
294+
args.add(String.format("--log-level=%s", logLevel.toString().toUpperCase()));
282295
}
283296
if (allowedListIps != null) {
284297
args.add(String.format("--allowed-ips=%s", allowedListIps));

0 commit comments

Comments
 (0)