Use OptionalUtil.orElseOptional instead of weird Optional-wrapping workaround

Author: emlun

webauthn-server-attestation/src/main/java/com/yubico/fido/metadata/FidoMetadataService.java

@@ -26,6 +26,7 @@
 
 import com.yubico.fido.metadata.FidoMetadataService.Filters.AuthenticatorToBeFiltered;
 import com.yubico.internal.util.CertificateParser;
+import com.yubico.internal.util.OptionalUtil;
 import com.yubico.webauthn.RegistrationResult;
 import com.yubico.webauthn.RelyingParty;
 import com.yubico.webauthn.RelyingParty.RelyingPartyBuilder;
@@ -505,22 +506,19 @@ public Set<MetadataBLOBPayloadEntry> findEntries(
             .collect(Collectors.toSet());
 
     final Optional<AAGUID> nonzeroAaguid =
-        Optional.ofNullable(
-            aaguid
-                .filter(a -> !a.isZero())
-                .orElseGet(
-                    () -> {
-                      log.debug("findEntries: attempting to look up AAGUID from certificate");
-                      if (!attestationCertificateChain.isEmpty()) {
-                        return CertificateParser.parseFidoAaguidExtension(
-                                attestationCertificateChain.get(0))
-                            .map(ByteArray::new)
-                            .map(AAGUID::new)
-                            .orElse(null);
-                      } else {
-                        return null;
-                      }
-                    }));
+        OptionalUtil.orElseOptional(
+            aaguid.filter(a -> !a.isZero()),
+            () -> {
+              log.debug("findEntries: attempting to look up AAGUID from certificate");
+              if (attestationCertificateChain.isEmpty()) {
+                return Optional.empty();
+              } else {
+                return CertificateParser.parseFidoAaguidExtension(
+                        attestationCertificateChain.get(0))
+                    .map(ByteArray::new)
+                    .map(AAGUID::new);
+              }
+            });
 
     log.debug(
         "findEntries(certSubjectKeyIdentifiers = {}, aaguid = {}, nonzeroAaguid= {})",

webauthn-server-core/src/main/java/com/yubico/webauthn/FinishAssertionSteps.java

@@ -27,6 +27,7 @@
 import static com.yubico.internal.util.ExceptionUtil.assertTrue;
 
 import COSE.CoseException;
+import com.yubico.internal.util.OptionalUtil;
 import com.yubico.webauthn.data.AuthenticatorAssertionResponse;
 import com.yubico.webauthn.data.ByteArray;
 import com.yubico.webauthn.data.COSEAlgorithmIdentifier;
@@ -124,20 +125,20 @@ public void validate() {
   class Step6 implements Step<Step7> {
 
     private final Optional<ByteArray> userHandle =
-        request
-            .getUserHandle()
-            .map(Optional::of)
-            .orElseGet(() -> response.getResponse().getUserHandle())
-            .map(Optional::of)
-            .orElseGet(
-                () ->
-                    request.getUsername().flatMap(credentialRepository::getUserHandleForUsername));
+        OptionalUtil.orElseOptional(
+            request.getUserHandle(),
+            () ->
+                OptionalUtil.orElseOptional(
+                    response.getResponse().getUserHandle(),
+                    () ->
+                        request
+                            .getUsername()
+                            .flatMap(credentialRepository::getUserHandleForUsername)));
 
     private final Optional<String> username =
-        request
-            .getUsername()
-            .map(Optional::of)
-            .orElseGet(() -> userHandle.flatMap(credentialRepository::getUsernameForUserHandle));
+        OptionalUtil.orElseOptional(
+            request.getUsername(),
+            () -> userHandle.flatMap(credentialRepository::getUsernameForUserHandle));
 
     private final Optional<RegisteredCredential> registration =
         userHandle.flatMap(uh -> credentialRepository.lookup(response.getId(), uh));