From 2f3498acca2ae04bb2b72200d437eaaaffffbefd Mon Sep 17 00:00:00 2001
From: Kevin Wooten <kevin@wooten.com>
Date: Thu, 6 May 2021 13:40:42 -0700
Subject: [PATCH] Remove use of optionals when calculating option overrides

---
 .../vault/runtime/VaultTransitManager.java    | 22 ++++++++++++-------
 .../vault/transit/SignVerifyOptions.java      | 18 +++++++--------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTransitManager.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTransitManager.java
index c0e4e164882c1..93a629dc8a061 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTransitManager.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/VaultTransitManager.java
@@ -279,10 +279,10 @@ private void signBatch(String keyName, int keyVersion, List<SigningRequestResult
         }
 
         if (options != null) {
-            hashAlgorithm = options.getHashAlgorithm().orElse(hashAlgorithm);
-            body.signatureAlgorithm = options.getSignatureAlgorithm().orElse(body.signatureAlgorithm);
-            body.prehashed = options.getPrehashed().orElse(body.prehashed);
-            body.marshalingAlgorithm = options.getMarshalingAlgorithm().orElse(null);
+            hashAlgorithm = defaultIfNull(options.getHashAlgorithm(), hashAlgorithm);
+            body.signatureAlgorithm = defaultIfNull(options.getSignatureAlgorithm(), body.signatureAlgorithm);
+            body.prehashed = defaultIfNull(options.getPrehashed(), body.prehashed);
+            body.marshalingAlgorithm = defaultIfNull(options.getMarshalingAlgorithm(), null);
         }
 
         VaultTransitSign sign = vaultInternalTransitSecretEngine.sign(getToken(), keyName, hashAlgorithm, body);
@@ -344,10 +344,10 @@ private List<VerificationResult> verifyBatch(String keyName, List<VerificationRe
         }
 
         if (options != null) {
-            hashAlgorithm = options.getHashAlgorithm().orElse(hashAlgorithm);
-            body.signatureAlgorithm = options.getSignatureAlgorithm().orElse(body.signatureAlgorithm);
-            body.prehashed = options.getPrehashed().orElse(body.prehashed);
-            body.marshalingAlgorithm = options.getMarshalingAlgorithm().orElse(null);
+            hashAlgorithm = defaultIfNull(options.getHashAlgorithm(), hashAlgorithm);
+            body.signatureAlgorithm = defaultIfNull(options.getSignatureAlgorithm(), body.signatureAlgorithm);
+            body.prehashed = defaultIfNull(options.getPrehashed(), body.prehashed);
+            body.marshalingAlgorithm = defaultIfNull(options.getMarshalingAlgorithm(), null);
         }
 
         VaultTransitVerify verify = vaultInternalTransitSecretEngine.verify(getToken(), keyName, hashAlgorithm, body);
@@ -521,4 +521,10 @@ private <K, T, V> Map<K, V> zip(List<K> keys, List<T> values, Function<T, V> f)
         return map;
     }
 
+    private <T> T defaultIfNull(T value, T defaultValue) {
+        if (value != null)
+            return value;
+        return defaultValue;
+    }
+
 }
diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/SignVerifyOptions.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/SignVerifyOptions.java
index 2a5d179986839..423e6fb611c4a 100644
--- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/SignVerifyOptions.java
+++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/transit/SignVerifyOptions.java
@@ -1,7 +1,5 @@
 package io.quarkus.vault.transit;
 
-import java.util.Optional;
-
 public class SignVerifyOptions {
 
     private String signatureAlgorithm;
@@ -9,8 +7,8 @@ public class SignVerifyOptions {
     private Boolean prehashed;
     private String marshalingAlgorithm;
 
-    public Optional<String> getSignatureAlgorithm() {
-        return Optional.ofNullable(signatureAlgorithm);
+    public String getSignatureAlgorithm() {
+        return signatureAlgorithm;
     }
 
     public SignVerifyOptions setSignatureAlgorithm(String signatureAlgorithm) {
@@ -18,8 +16,8 @@ public SignVerifyOptions setSignatureAlgorithm(String signatureAlgorithm) {
         return this;
     }
 
-    public Optional<String> getHashAlgorithm() {
-        return Optional.ofNullable(hashAlgorithm);
+    public String getHashAlgorithm() {
+        return hashAlgorithm;
     }
 
     public SignVerifyOptions setHashAlgorithm(String hashAlgorithm) {
@@ -27,8 +25,8 @@ public SignVerifyOptions setHashAlgorithm(String hashAlgorithm) {
         return this;
     }
 
-    public Optional<Boolean> getPrehashed() {
-        return Optional.ofNullable(prehashed);
+    public Boolean getPrehashed() {
+        return prehashed;
     }
 
     public SignVerifyOptions setPrehashed(Boolean prehashed) {
@@ -36,8 +34,8 @@ public SignVerifyOptions setPrehashed(Boolean prehashed) {
         return this;
     }
 
-    public Optional<String> getMarshalingAlgorithm() {
-        return Optional.ofNullable(marshalingAlgorithm);
+    public String getMarshalingAlgorithm() {
+        return marshalingAlgorithm;
     }
 
     public SignVerifyOptions setMarshalingAlgorithm(String marshalingAlgorithm) {