[java] simplify several statements with isEmpty function call (#16836)

iampopovich · web-flow · commit 87f1be2a5267 · 2026-01-04T14:29:03.000+02:00
diff --git a/java/src/org/openqa/selenium/devtools/v141/v141Events.java b/java/src/org/openqa/selenium/devtools/v141/v141Events.java
@@ -87,7 +87,7 @@ protected JavascriptException toJsException(ExceptionThrown event) {
 
     JavascriptException exception = new JavascriptException(message);
 
-    if (!maybeTrace.isPresent()) {
+    if (maybeTrace.isEmpty()) {
       StackTraceElement element =
           new StackTraceElement(
               "unknown", "unknown", details.getUrl().orElse("unknown"), details.getLineNumber());
diff --git a/java/src/org/openqa/selenium/devtools/v142/v142Events.java b/java/src/org/openqa/selenium/devtools/v142/v142Events.java
@@ -87,7 +87,7 @@ protected JavascriptException toJsException(ExceptionThrown event) {
 
     JavascriptException exception = new JavascriptException(message);
 
-    if (!maybeTrace.isPresent()) {
+    if (maybeTrace.isEmpty()) {
       StackTraceElement element =
           new StackTraceElement(
               "unknown", "unknown", details.getUrl().orElse("unknown"), details.getLineNumber());
diff --git a/java/src/org/openqa/selenium/devtools/v143/v143Events.java b/java/src/org/openqa/selenium/devtools/v143/v143Events.java
@@ -87,7 +87,7 @@ protected JavascriptException toJsException(ExceptionThrown event) {
 
     JavascriptException exception = new JavascriptException(message);
 
-    if (!maybeTrace.isPresent()) {
+    if (maybeTrace.isEmpty()) {
       StackTraceElement element =
           new StackTraceElement(
               "unknown", "unknown", details.getUrl().orElse("unknown"), details.getLineNumber());
diff --git a/java/src/org/openqa/selenium/docker/Docker.java b/java/src/org/openqa/selenium/docker/Docker.java
@@ -95,7 +95,7 @@ private Optional<DockerProtocol> getDocker() {
     }
 
     synchronized (this) {
-      if (!dockerClient.isPresent()) {
+      if (dockerClient.isEmpty()) {
         VersionCommand versionCommand = new VersionCommand(client);
         dockerClient =
             apiVersion != null
diff --git a/java/src/org/openqa/selenium/grid/config/Config.java b/java/src/org/openqa/selenium/grid/config/Config.java
@@ -48,7 +48,7 @@ default Optional<Boolean> getBool(String section, String option) {
 
   default Optional<List<List<String>>> getArray(String section, String option) {
     Optional<List<String>> flatConfigs = getAll(section, option);
-    if (!flatConfigs.isPresent()) {
+    if (flatConfigs.isEmpty()) {
       return Optional.empty();
     }
 
diff --git a/java/src/org/openqa/selenium/grid/distributor/local/LocalGridModel.java b/java/src/org/openqa/selenium/grid/distributor/local/LocalGridModel.java
@@ -339,7 +339,7 @@ public boolean reserve(SlotId slotId) {
       Optional<Slot> maybeSlot =
           node.getSlots().stream().filter(slot -> slotId.equals(slot.getId())).findFirst();
 
-      if (!maybeSlot.isPresent()) {
+      if (maybeSlot.isEmpty()) {
         LOG.warning(
             String.format(
                 "Asked to reserve slot on node %s, but no slot with id %s found",
@@ -437,7 +437,7 @@ public void setSession(SlotId slotId, Session session) {
       Optional<Slot> maybeSlot =
           node.getSlots().stream().filter(slot -> slotId.equals(slot.getId())).findFirst();
 
-      if (!maybeSlot.isPresent()) {
+      if (maybeSlot.isEmpty()) {
         LOG.warning("Grid model and reality have diverged. Unable to find slot " + slotId);
         return;
       }
diff --git a/java/src/org/openqa/selenium/grid/distributor/selector/DefaultSlotSelector.java b/java/src/org/openqa/selenium/grid/distributor/selector/DefaultSlotSelector.java
@@ -59,8 +59,7 @@ public Set<SlotId> selectSlot(
                 // Then sort by stereotype browserVersion (descending order). SemVer comparison with
                 // considering empty value at first.
                 .thenComparing(
-                    Comparator.comparing(
-                        NodeStatus::getBrowserVersion, new SemanticVersionComparator().reversed()))
+                    NodeStatus::getBrowserVersion, new SemanticVersionComparator().reversed())
                 // And use the node id as a tie-breaker.
                 .thenComparing(NodeStatus::getNodeId))
         .flatMap(
diff --git a/java/src/org/openqa/selenium/grid/distributor/selector/GreedySlotSelector.java b/java/src/org/openqa/selenium/grid/distributor/selector/GreedySlotSelector.java
@@ -61,8 +61,7 @@ public Set<SlotId> selectSlot(
                 .thenComparingLong(NodeStatus::getLastSessionCreated)
                 // Then sort by stereotype browserVersion (descending order)
                 .thenComparing(
-                    Comparator.comparing(
-                        NodeStatus::getBrowserVersion, new SemanticVersionComparator().reversed())))
+                    NodeStatus::getBrowserVersion, new SemanticVersionComparator().reversed()))
         .flatMap(
             node ->
                 node.getSlots().stream()
diff --git a/java/src/org/openqa/selenium/grid/node/docker/DockerOptions.java b/java/src/org/openqa/selenium/grid/node/docker/DockerOptions.java
@@ -120,7 +120,7 @@ private String getApiVersion() {
   }
 
   private boolean isEnabled(Docker docker) {
-    if (!config.getAll(DOCKER_SECTION, "configs").isPresent()) {
+    if (config.getAll(DOCKER_SECTION, "configs").isEmpty()) {
       return false;
     }
 
diff --git a/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java b/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java
@@ -470,7 +470,7 @@ private TimeZone getTimeZone(Capabilities sessionRequestCapabilities) {
   private Dimension getScreenResolution(Capabilities sessionRequestCapabilities) {
     Optional<Object> screenResolution =
         ofNullable(sessionRequestCapabilities.getCapability("se:screenResolution"));
-    if (!screenResolution.isPresent()) {
+    if (screenResolution.isEmpty()) {
       return null;
     }
     try {
diff --git a/java/src/org/openqa/selenium/grid/node/k8s/OneShotNode.java b/java/src/org/openqa/selenium/grid/node/k8s/OneShotNode.java
@@ -194,7 +194,7 @@ public Either<WebDriverException, CreateSessionResponse> newSession(
     }
 
     Optional<WebDriver> driver = driverInfo.createDriver(sessionRequest.getDesiredCapabilities());
-    if (!driver.isPresent()) {
+    if (driver.isEmpty()) {
       return Either.left(new WebDriverException("Unable to create a driver instance"));
     }
 
diff --git a/java/src/org/openqa/selenium/grid/node/relay/RelayOptions.java b/java/src/org/openqa/selenium/grid/node/relay/RelayOptions.java
@@ -89,7 +89,7 @@ public URI getServiceUri() {
 
   public URI getServiceStatusUri() {
     try {
-      if (!config.get(RELAY_SECTION, "status-endpoint").isPresent()) {
+      if (config.get(RELAY_SECTION, "status-endpoint").isEmpty()) {
         return null;
       }
       String statusEndpoint = config.get(RELAY_SECTION, "status-endpoint").orElse("/status");
diff --git a/java/src/org/openqa/selenium/grid/security/SecretOptions.java b/java/src/org/openqa/selenium/grid/security/SecretOptions.java
@@ -41,7 +41,7 @@ public SecretOptions(Config config) {
 
   public Secret getRegistrationSecret() {
     String secret = "";
-    if ((isSecure()) && !config.get(SERVER_SECTION, "registration-secret").isPresent()) {
+    if ((isSecure()) && config.get(SERVER_SECTION, "registration-secret").isEmpty()) {
       try {
         secret =
             getEncoder()
@@ -62,7 +62,7 @@ public UsernameAndPassword getServerAuthentication() {
     Optional<String> username = config.get(ROUTER_SECTION, "username");
     Optional<String> password = config.get(ROUTER_SECTION, "password");
 
-    if (!username.isPresent() || !password.isPresent()) {
+    if (username.isEmpty() || password.isEmpty()) {
       return null;
     }
 
diff --git a/java/src/org/openqa/selenium/grid/web/MergedResource.java b/java/src/org/openqa/selenium/grid/web/MergedResource.java
@@ -52,7 +52,7 @@ public Optional<Resource> get(String path) {
       return resource;
     }
 
-    if (!next.isPresent()) {
+    if (next.isEmpty()) {
       return Optional.empty();
     }
 
@@ -78,7 +78,7 @@ public Optional<byte[]> read() {
       return data;
     }
 
-    if (!next.isPresent()) {
+    if (next.isEmpty()) {
       return Optional.empty();
     }
 
diff --git a/java/src/org/openqa/selenium/grid/web/ResourceHandler.java b/java/src/org/openqa/selenium/grid/web/ResourceHandler.java
@@ -68,7 +68,7 @@ public boolean matches(HttpRequest req) {
   public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
     Optional<Resource> result = resource.get(req.getUri());
 
-    if (!result.isPresent()) {
+    if (result.isEmpty()) {
       String errorMessage;
       try {
         new URL(req.getUri());
diff --git a/java/src/org/openqa/selenium/json/JsonOutput.java b/java/src/org/openqa/selenium/json/JsonOutput.java
@@ -216,7 +216,7 @@ public class JsonOutput implements Closeable {
           ((Map<?, ?>) obj)
               .forEach(
                   (key, value) -> {
-                    if (value instanceof Optional && !((Optional) value).isPresent()) {
+                    if (value instanceof Optional && ((Optional) value).isEmpty()) {
                       return;
                     }
                     name(String.valueOf(key)).write0(value, maxDepth, depthRemaining - 1);
@@ -241,7 +241,7 @@ public class JsonOutput implements Closeable {
         Optional.class::isAssignableFrom,
         (obj, maxDepth, depthRemaining) -> {
           Optional<?> optional = (Optional<?>) obj;
-          if (!optional.isPresent()) {
+          if (optional.isEmpty()) {
             append("null");
             return;
           }
diff --git a/java/src/org/openqa/selenium/netty/server/WebSocketUpgradeHandler.java b/java/src/org/openqa/selenium/netty/server/WebSocketUpgradeHandler.java
@@ -136,7 +136,7 @@ private void handleHttpRequest(ChannelHandlerContext ctx, HttpRequest req) {
     Optional<Consumer<Message>> maybeHandler =
         factory.apply(
             req.uri(), msg -> ctx.channel().writeAndFlush(Require.nonNull("Message to send", msg)));
-    if (!maybeHandler.isPresent()) {
+    if (maybeHandler.isEmpty()) {
       sendHttpResponse(
           ctx, req, new DefaultFullHttpResponse(HTTP_1_1, BAD_REQUEST, ctx.alloc().buffer(0)));
       return;
diff --git a/java/src/org/openqa/selenium/remote/RemoteWebDriverBuilder.java b/java/src/org/openqa/selenium/remote/RemoteWebDriverBuilder.java
@@ -359,7 +359,7 @@ WebDriver getLocalDriver() {
                                                         "Unable to create session with " + caps))))
             .findFirst();
 
-    if (!first.isPresent()) {
+    if (first.isEmpty()) {
       throw new SessionNotCreatedException("Unable to find matching driver for capabilities");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ private Optional<DockerProtocol> getDocker() {`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`synchronized (this) {`
`98`		`- if (!dockerClient.isPresent()) {`
	`98`	`+ if (dockerClient.isEmpty()) {`
`99`	`99`	`VersionCommand versionCommand = new VersionCommand(client);`
`100`	`100`	`dockerClient =`
`101`	`101`	`apiVersion != null`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ default Optional<Boolean> getBool(String section, String option) {`
`48`	`48`
`49`	`49`	`default Optional<List<List<String>>> getArray(String section, String option) {`
`50`	`50`	`Optional<List<String>> flatConfigs = getAll(section, option);`
`51`		`- if (!flatConfigs.isPresent()) {`
	`51`	`+ if (flatConfigs.isEmpty()) {`
`52`	`52`	`return Optional.empty();`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ private String getApiVersion() {`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`private boolean isEnabled(Docker docker) {`
`123`		`- if (!config.getAll(DOCKER_SECTION, "configs").isPresent()) {`
	`123`	`+ if (config.getAll(DOCKER_SECTION, "configs").isEmpty()) {`
`124`	`124`	`return false;`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -470,7 +470,7 @@ private TimeZone getTimeZone(Capabilities sessionRequestCapabilities) {`
`470`	`470`	`private Dimension getScreenResolution(Capabilities sessionRequestCapabilities) {`
`471`	`471`	`Optional<Object> screenResolution =`
`472`	`472`	`ofNullable(sessionRequestCapabilities.getCapability("se:screenResolution"));`
`473`		`- if (!screenResolution.isPresent()) {`
	`473`	`+ if (screenResolution.isEmpty()) {`
`474`	`474`	`return null;`
`475`	`475`	`}`
`476`	`476`	`try {`