Fix method addCredential()

Author: VietND96

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

@@ -36,6 +36,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.HashMap;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
@@ -1248,12 +1249,9 @@ public String getId() {
 
     @Override
     public void addCredential(Credential credential) {
-      execute(
-          DriverCommand.ADD_CREDENTIAL,
-          Stream.concat(
-                  credential.toMap().entrySet().stream(),
-                  Stream.of(Map.entry("authenticatorId", id)))
-              .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue)));
+      Map<String, Object> map = new HashMap<>(credential.toMap());
+      map.put("authenticatorId", id);
+      execute(DriverCommand.ADD_CREDENTIAL, map);
     }
 
     @Override

java/src/org/openqa/selenium/virtualauthenticator/Credential.java

@@ -66,7 +66,7 @@ public static Credential fromMap(Map<String, Object> map) {
     Object credentialId = Require.nonNull("credentialId", map.get("credentialId"));
     Object isResidentCredential =
         Require.nonNull("isResidentCredential", map.get("isResidentCredential"));
-    Object rpId = map.get("rpId");
+    Object rpId = Require.nonNull("rpId", map.get("rpId"));
     Object privateKey = Require.nonNull("privateKey", map.get("privateKey"));
     Object userHandle = map.get("userHandle");
     Object signCount = Require.nonNull("signCount", map.get("signCount"));