[java] Fixed NullAway errors in capabilities

Author: mk868

java/src/org/openqa/selenium/ImmutableCapabilities.java

@@ -148,10 +148,9 @@ public ImmutableCapabilities(Map<?, ?> capabilities) {
     capabilities.forEach(
         (key, value) -> {
           Require.argument("Capability key", key).instanceOf(String.class);
-          Object v = capabilities.get(key);
           Require.nonNull("Capability value", value);
 
-          setCapability(delegate, (String) key, v);
+          setCapability(delegate, (String) key, value);
         });
 
     this.delegate = Collections.unmodifiableMap(delegate);

java/src/org/openqa/selenium/PersistentCapabilities.java

@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.function.Function;
 import java.util.stream.Collector;
 import java.util.stream.Collectors;
@@ -60,8 +61,10 @@ public PersistentCapabilities setCapability(String name, Object value) {
 
   @Override
   public Map<String, Object> asMap() {
-    return getCapabilityNames().stream()
-        .collect(toUnmodifiableMap(Function.identity(), this::getCapability));
+    Map<String, Object> toReturn = new TreeMap<>();
+    toReturn.putAll(caps.asMap());
+    toReturn.putAll(overrides.asMap());
+    return Collections.unmodifiableMap(toReturn);
   }
 
   @Override