Replace public constructors with factory functions

Author: emlun

webauthn-server-core/src/main/java/com/yubico/webauthn/data/AssertionExtensionInputs.java

@@ -197,8 +197,8 @@ public AssertionExtensionInputsBuilder prf(
         Extensions.Prf.PrfValues eval,
         Map<PublicKeyCredentialDescriptor, Extensions.Prf.PrfValues> evalByCredential) {
       this.prf =
-          new Extensions.Prf.PrfAuthenticationInput(
-              eval, Extensions.Prf.PrfAuthenticationInput.descriptorsToIds(evalByCredential));
+          Extensions.Prf.PrfAuthenticationInput.evalByCredentialWithFallback(
+              evalByCredential, eval);
       return this;
     }
 

webauthn-server-core/src/main/java/com/yubico/webauthn/data/Extensions.java

@@ -774,7 +774,7 @@ public static class PrfValues {
       @JsonProperty public final ByteArray second;
 
       @JsonCreator
-      public PrfValues(
+      private PrfValues(
           @JsonProperty("first") @NonNull final ByteArray first,
           @JsonProperty("second") final ByteArray second) {
         this.first = first;
@@ -784,6 +784,19 @@ public PrfValues(
       public Optional<ByteArray> getSecond() {
         return Optional.ofNullable(second);
       }
+
+      public static PrfValues one(@NonNull ByteArray first) {
+        return new PrfValues(first, null);
+      }
+
+      public static PrfValues two(@NonNull ByteArray first, @NonNull ByteArray second) {
+        return new PrfValues(first, second);
+      }
+
+      public static PrfValues oneOrTwo(
+          @NonNull ByteArray first, @NonNull Optional<ByteArray> second) {
+        return new PrfValues(first, second.orElse(null));
+      }
     }
 
     /**
@@ -801,7 +814,7 @@ public static class PrfAuthenticationInput {
       @JsonProperty private final Map<ByteArray, PrfValues> evalByCredential;
 
       @JsonCreator
-      public PrfAuthenticationInput(
+      private PrfAuthenticationInput(
           @JsonProperty("eval") PrfValues eval,
           @JsonProperty("evalByCredential") Map<ByteArray, PrfValues> evalByCredential) {
         this.eval = eval;
@@ -817,7 +830,7 @@ public Optional<Map<ByteArray, PrfValues>> getEvalByCredential() {
         return Optional.ofNullable(evalByCredential);
       }
 
-      static HashMap<ByteArray, PrfValues> descriptorsToIds(
+      private static HashMap<ByteArray, PrfValues> descriptorsToIds(
           Map<PublicKeyCredentialDescriptor, PrfValues> evalByCredential) {
         return evalByCredential.entrySet().stream()
             .reduce(
@@ -831,6 +844,21 @@ static HashMap<ByteArray, PrfValues> descriptorsToIds(
                   return a;
                 });
       }
+
+      public static PrfAuthenticationInput eval(@NonNull PrfValues eval) {
+        return new PrfAuthenticationInput(eval, null);
+      }
+
+      public static PrfAuthenticationInput evalByCredential(
+          @NonNull Map<PublicKeyCredentialDescriptor, PrfValues> evalByCredential) {
+        return new PrfAuthenticationInput(null, descriptorsToIds(evalByCredential));
+      }
+
+      public static PrfAuthenticationInput evalByCredentialWithFallback(
+          @NonNull Map<PublicKeyCredentialDescriptor, PrfValues> evalByCredential,
+          @NonNull PrfValues eval) {
+        return new PrfAuthenticationInput(eval, descriptorsToIds(evalByCredential));
+      }
     }
 
     /**
@@ -846,13 +874,21 @@ public static class PrfRegistrationInput {
       @JsonProperty private final PrfValues eval;
 
       @JsonCreator
-      public PrfRegistrationInput(@JsonProperty("eval") PrfValues eval) {
+      private PrfRegistrationInput(@JsonProperty("eval") PrfValues eval) {
         this.eval = eval;
       }
 
       public Optional<PrfValues> getEval() {
         return Optional.ofNullable(eval);
       }
+
+      public static PrfRegistrationInput enable() {
+        return new PrfRegistrationInput(null);
+      }
+
+      public static PrfRegistrationInput eval(@NonNull PrfValues eval) {
+        return new PrfRegistrationInput(eval);
+      }
     }
 
     /**

webauthn-server-core/src/main/java/com/yubico/webauthn/data/RegistrationExtensionInputs.java

@@ -364,7 +364,7 @@ public RegistrationExtensionInputsBuilder largeBlob(
      *     Large blob storage extension (largeBlob)</a>
      */
     public RegistrationExtensionInputsBuilder prf(Extensions.Prf.PrfValues eval) {
-      this.prf = new Extensions.Prf.PrfRegistrationInput(eval);
+      this.prf = Extensions.Prf.PrfRegistrationInput.eval(eval);
       return this;
     }