- Removed AeadResult.Builder as there was only ever a single OutputStream argument. Because there was not multiple parameters, it didn't make sense to have a builder.

- Suppressed compiler 'unused' checks for Supplier/Factory classes used by `io.jsonwebtoken.security.Suppliers`

Author: lhazlewood

api/src/main/java/io/jsonwebtoken/security/AeadResult.java

@@ -51,24 +51,6 @@ public interface AeadResult extends DigestSupplier, IvSupplier {
      */
     AeadResult setIv(byte[] iv);
 
-    /**
-     * A builder for creating new {@link AeadResult} instances.
-     *
-     * @since JJWT_RELEASE_VERSION
-     */
-    interface Builder extends io.jsonwebtoken.lang.Builder<AeadResult> {
-
-        /**
-         * Sets the {@code OutputStream} the AeadAlgorithm will use to write the resulting ciphertext during
-         * encryption or plaintext during decryption.
-         *
-         * @param out the {@code OutputStream} the AeadAlgorithm will use to write the resulting ciphertext during
-         *            encryption or plaintext during decryption.
-         * @return the builder for instance chaining.
-         */
-        Builder out(OutputStream out);
-    }
-
     /**
      * Returns a new {@link AeadResult} with the specified {@link OutputStream} that will be used to write the
      * resulting ciphertext during encryption or plaintext during decryption.
@@ -77,8 +59,8 @@ interface Builder extends io.jsonwebtoken.lang.Builder<AeadResult> {
      * resulting ciphertext during encryption or plaintext during decryption.
      * @since JJWT_RELEASE_VERSION
      */
-    static AeadResult of(OutputStream out) {
-        return Suppliers.AEAD_RESULT_BUILDER.get().out(out).build();
+    static AeadResult with(OutputStream out) {
+        return Suppliers.AEAD_RESULT_FACTORY.apply(out);
     }
 
 }

api/src/main/java/io/jsonwebtoken/security/Suppliers.java

@@ -2,6 +2,8 @@
 
 import io.jsonwebtoken.lang.Classes;
 
+import java.io.OutputStream;
+import java.util.function.Function;
 import java.util.function.Supplier;
 
 /**
@@ -38,7 +40,6 @@ private Suppliers() { // for coverage
     static final Supplier<DecryptAeadRequest.Builder> DECRYPT_AEAD_REQUEST_BUILDER =
             Classes.newInstance("io.jsonwebtoken.impl.security.DefaultDecryptAeadRequest$Builder$Supplier");
 
-    static final Supplier<AeadResult.Builder> AEAD_RESULT_BUILDER =
-            Classes.newInstance("io.jsonwebtoken.impl.security.DefaultAeadResult$Builder$Supplier");
-
+    static final Function<OutputStream, AeadResult> AEAD_RESULT_FACTORY =
+            Classes.newInstance("io.jsonwebtoken.impl.security.DefaultAeadResult$Factory");
 }

impl/src/main/java/io/jsonwebtoken/impl/DefaultJwtBuilder.java

@@ -677,7 +677,7 @@ private String encrypt(final Payload content, final Key key, final Provider keyP
         //only expose (mutable) JweHeader functionality to KeyAlgorithm instances, not the full headerBuilder
         // (which exposes this JwtBuilder and shouldn't be referenced by KeyAlgorithms):
         JweHeader delegate = new DefaultMutableJweHeader(this.headerBuilder);
-        KeyRequest<Key> keyRequest = KeyRequest.<Key>builder()
+        KeyRequest<Key> keyRequest = KeyRequest.builder()
                 .provider(keyProvider).random(this.secureRandom)
                 .payload(key).header(delegate).encryptionAlgorithm(enc)
                 .build();
@@ -706,12 +706,12 @@ private String encrypt(final Payload content, final Key key, final Provider keyP
 
         // During encryption, the configured Provider applies to the KeyAlgorithm, not the AeadAlgorithm, mostly
         // because all JVMs support the standard AeadAlgorithms (especially with BouncyCastle in the classpath).
-        // As such, the provider here is intentionally omitted (null):
+        // As such, the provider here is intentionally omitted when building the AeadRequest:
         // TODO: add encProvider(Provider) builder method that applies to this request only?
         ByteArrayOutputStream ciphertextOut = new ByteArrayOutputStream(8192);
         AeadRequest req = AeadRequest.builder().random(secureRandom) // no .provider call, see message above
                 .payload(plaintext).key(cek).associatedData(aad).build();
-        AeadResult res = AeadResult.of(ciphertextOut);
+        AeadResult res = AeadResult.with(ciphertextOut);
         encrypt(req, res);
 
         byte[] iv = Assert.notEmpty(res.getIv(), "Encryption result must have a non-empty initialization vector.");

impl/src/main/java/io/jsonwebtoken/impl/security/DefaultAeadRequest.java

@@ -68,7 +68,7 @@ public M associatedData(InputStream aad) {
         }
     }
 
-    @SuppressWarnings("unused") // used via reflection in Jwts.ENC
+    @SuppressWarnings("unused") // instantiated via reflection in io.jsonwebtoken.security.Suppliers
     public static class Builder extends AbstractAeadRequestParams<AeadRequest.Builder>
             implements AeadRequest.Builder {
 

impl/src/main/java/io/jsonwebtoken/impl/security/DefaultAeadResult.java

@@ -21,6 +21,7 @@
 import io.jsonwebtoken.security.IvSupplier;
 
 import java.io.OutputStream;
+import java.util.function.Function;
 
 public class DefaultAeadResult implements AeadResult, DigestSupplier, IvSupplier {
 
@@ -59,26 +60,11 @@ public byte[] getIv() {
         return this.iv;
     }
 
-    public static class Builder implements AeadResult.Builder {
-
-        private OutputStream out;
-
+    @SuppressWarnings("unused") // instantiated via reflection in io.jsonwebtoken.security.Suppliers
+    public static class Factory implements Function<OutputStream, AeadResult> {
         @Override
-        public AeadResult.Builder out(OutputStream out) {
-            this.out = out;
-            return this;
-        }
-
-        @Override
-        public AeadResult build() {
-            return new DefaultAeadResult(this.out); // constructor validates out != null
-        }
-
-        public static class Supplier implements java.util.function.Supplier<AeadResult.Builder> {
-            @Override
-            public AeadResult.Builder get() {
-                return new Builder();
-            }
+        public AeadResult apply(OutputStream out) {
+            return new DefaultAeadResult(out);
         }
     }
 }

impl/src/main/java/io/jsonwebtoken/impl/security/DefaultDecryptAeadRequest.java

@@ -39,7 +39,7 @@ public byte[] getDigest() {
         return this.TAG;
     }
 
-    @SuppressWarnings("unused") // used via reflection in Jwts.ENC
+    @SuppressWarnings("unused") // instantiated via reflection in io.jsonwebtoken.security.Suppliers
     public static class Builder extends AbstractAeadRequestParams<DecryptAeadRequest.Builder>
             implements DecryptAeadRequest.Builder {
 

impl/src/main/java/io/jsonwebtoken/impl/security/DefaultDecryptionKeyRequest.java

@@ -44,6 +44,7 @@ public K getKey() {
         return this.decryptionKey;
     }
 
+    @SuppressWarnings("unused") // instantiated via reflection in io.jsonwebtoken.security.Suppliers
     public static class Builder<K extends Key> extends AbstractKeyRequestParams<byte[], DecryptionKeyRequest.Builder<K>>
             implements DecryptionKeyRequest.Builder<K> {
 

impl/src/main/java/io/jsonwebtoken/impl/security/DefaultKeyRequest.java

@@ -64,6 +64,7 @@ public M header(JweHeader header) {
         }
     }
 
+    @SuppressWarnings("unused") // instantiated via reflection in io.jsonwebtoken.security.Suppliers
     public static class Builder<K extends Key> extends AbstractKeyRequestParams<K, KeyRequest.Builder<K>>
             implements KeyRequest.Builder<K> {
 

impl/src/main/java/io/jsonwebtoken/impl/security/DefaultRequest.java

@@ -72,6 +72,7 @@ public M random(SecureRandom random) {
         }
     }
 
+    @SuppressWarnings("unused") // instantiated via reflection in io.jsonwebtoken.security.Suppliers
     public static class Builder<T> extends AbstractRequestParams<T, Request.Builder<T>> implements Request.Builder<T> {
 
         @Override

impl/src/main/java/io/jsonwebtoken/impl/security/DefaultSecureRequest.java

@@ -48,6 +48,7 @@ public M key(K key) {
         }
     }
 
+    @SuppressWarnings("unused") // instantiated via reflection in io.jsonwebtoken.security.Suppliers
     public static class Builder<T, K extends Key> extends AbstractSecureRequestParams<T, K, SecureRequest.Builder<T, K>>
             implements SecureRequest.Builder<T, K> {