Refactor DesiredCapabilities constructor and merge method to use Optional for null handling

Author: iampopovich

java/src/org/openqa/selenium/remote/DesiredCapabilities.java

@@ -23,6 +23,8 @@
 import static org.openqa.selenium.remote.CapabilityType.PLATFORM_NAME;
 
 import java.util.Map;
+import java.util.Optional;
+import org.jspecify.annotations.Nullable;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.MutableCapabilities;
 import org.openqa.selenium.Platform;
@@ -39,12 +41,8 @@ public DesiredCapabilities() {
     // no-arg constructor
   }
 
-  public DesiredCapabilities(Map<String, ?> rawMap) {
-    if (rawMap == null) {
-      return;
-    }
-
-    rawMap.forEach(this::setCapability);
+  public DesiredCapabilities(@Nullable Map<String, ?> rawMap) {
+    Optional.ofNullable(rawMap).ifPresent(map -> map.forEach(this::setCapability));
   }
 
   public DesiredCapabilities(Capabilities other) {
@@ -94,10 +92,9 @@ public void setAcceptInsecureCerts(boolean acceptInsecureCerts) {
    * @return DesiredCapabilities after the merge
    */
   @Override
-  public DesiredCapabilities merge(Capabilities extraCapabilities) {
-    if (extraCapabilities != null) {
-      extraCapabilities.asMap().forEach(this::setCapability);
-    }
+  public DesiredCapabilities merge(@Nullable Capabilities extraCapabilities) {
+    Optional.ofNullable(extraCapabilities)
+        .ifPresent(caps -> caps.asMap().forEach(this::setCapability));
     return this;
   }
 }