Simplify Key Generation API even more

src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeyRingBuilder.java

@@ -44,11 +44,21 @@ public class KeyRingBuilder implements KeyRingBuilderInterface {
     private String userId;
     private char[] passphrase;
 
+    /**
+     * Creates a simple RSA KeyPair of length {@code length} with user-id {@code userId}.
+     *
+     * @param userId user id.
+     * @param length length in bits.
+     * @return {@link PGPSecretKeyRing} containing the KeyPair.
+     * @throws PGPException
+     * @throws NoSuchAlgorithmException
+     * @throws NoSuchProviderException
+     * @throws InvalidAlgorithmParameterException
+     */
     public PGPSecretKeyRing simpleRsaKeyRing(String userId, RsaLength length)
             throws PGPException, NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
         return withMasterKey(
-                        KeySpec.getBuilder()
+                        KeySpec.getBuilder(RSA_GENERAL.withLength(length))
-                                .ofType(RSA_GENERAL.withLength(length))
                                 .withDefaultKeyFlags()
                                 .withDefaultAlgorithms())
                 .withPrimaryUserId(userId)
@@ -59,13 +69,11 @@ public class KeyRingBuilder implements KeyRingBuilderInterface {
     public PGPSecretKeyRing simpleEcKeyRing(String userId)
             throws PGPException, NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
         return withSubKey(
-                        KeySpec.getBuilder()
+                        KeySpec.getBuilder(ECDH.fromCurve(EllipticCurve._P256))
-                                .ofType(ECDH.fromCurve(EllipticCurve._P256))
                                 .withKeyFlags(KeyFlag.ENCRYPT_STORAGE, KeyFlag.ENCRYPT_COMMS)
                                 .withDefaultAlgorithms())
                 .withMasterKey(
-                        KeySpec.getBuilder()
+                        KeySpec.getBuilder(ECDSA.fromCurve(EllipticCurve._P256))
-                                .ofType(ECDSA.fromCurve(EllipticCurve._P256))
                                 .withKeyFlags(KeyFlag.AUTHENTICATION, KeyFlag.CERTIFY_OTHER, KeyFlag.SIGN_DATA)
                                 .withDefaultAlgorithms())
                 .withPrimaryUserId(userId)

src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpec.java

@@ -30,7 +30,7 @@ public class KeySpec {
         return inheritedSubPackets;
     }
 
-    public static KeySpecBuilder getBuilder() {
+    public static KeySpecBuilder getBuilder(KeyType type) {
-        return new KeySpecBuilder();
+        return new KeySpecBuilder(type);
     }
 }

src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpecBuilder.java

@@ -1,7 +1,5 @@
 package de.vanitasvitae.crypto.pgpainless.key.generation;
 
-import java.util.Arrays;
-
 import de.vanitasvitae.crypto.pgpainless.algorithm.AlgorithmSuite;
 import de.vanitasvitae.crypto.pgpainless.algorithm.CompressionAlgorithm;
 import de.vanitasvitae.crypto.pgpainless.algorithm.Feature;
@@ -17,21 +15,17 @@ public class KeySpecBuilder implements KeySpecBuilderInterface {
     private KeyType type;
     private PGPSignatureSubpacketGenerator hashedSubPackets = new PGPSignatureSubpacketGenerator();
 
-    @Override
+    KeySpecBuilder(KeyType type) {
-    public WithKeyFlags ofType(KeyType type) {
+        this.type = type;
-        KeySpecBuilder.this.type = type;
-        return new WithKeyFlagsImpl();
     }
 
-    class WithKeyFlagsImpl implements WithKeyFlags {
-
     @Override
     public WithDetailedConfiguration withKeyFlags(KeyFlag... flags) {
         int val = 0;
         for (KeyFlag f : flags) {
             val |= f.getFlag();
         }
-            KeySpecBuilder.this.hashedSubPackets.setKeyFlags(false, val);
+        this.hashedSubPackets.setKeyFlags(false, val);
         return new WithDetailedConfigurationImpl();
     }
 
@@ -49,7 +43,6 @@ public class KeySpecBuilder implements KeySpecBuilderInterface {
     public KeySpec withInheritedSubPackets() {
         return new KeySpec(type, null, true);
     }
-    }
 
     class WithDetailedConfigurationImpl implements WithDetailedConfiguration {
 

src/main/java/de/vanitasvitae/crypto/pgpainless/key/generation/KeySpecBuilderInterface.java

@@ -5,20 +5,14 @@ import de.vanitasvitae.crypto.pgpainless.algorithm.Feature;
 import de.vanitasvitae.crypto.pgpainless.algorithm.HashAlgorithm;
 import de.vanitasvitae.crypto.pgpainless.algorithm.KeyFlag;
 import de.vanitasvitae.crypto.pgpainless.algorithm.SymmetricKeyAlgorithm;
-import de.vanitasvitae.crypto.pgpainless.key.generation.type.KeyType;
 
 public interface KeySpecBuilderInterface {
 
-    WithKeyFlags ofType(KeyType type);
-
-    interface WithKeyFlags {
-
     WithDetailedConfiguration withKeyFlags(KeyFlag... flags);
 
     WithDetailedConfiguration withDefaultKeyFlags();
 
     KeySpec withInheritedSubPackets();
-    }
 
     interface WithDetailedConfiguration {