Refactor keytype related classes

pgpainless-core/src/main/java/org/pgpainless/key/generation/KeyRingBuilder.java

@@ -53,8 +53,8 @@ import org.pgpainless.algorithm.HashAlgorithm;
 import org.pgpainless.algorithm.KeyFlag;
 import org.pgpainless.algorithm.SignatureType;
 import org.pgpainless.key.generation.type.KeyType;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
+import org.pgpainless.key.generation.type.EllipticCurve;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
 import org.pgpainless.key.util.UserId;
 import org.pgpainless.provider.ProviderFactory;
 import org.pgpainless.util.Passphrase;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/EDDSA.java

@@ -1,35 +0,0 @@
-package org.pgpainless.key.generation.type;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.curve.EdDSACurve;
-
-public class EDDSA implements KeyType {
-
-    private final EdDSACurve curve;
-
-    private EDDSA(EdDSACurve curve) {
-        this.curve = curve;
-    }
-
-    public static EDDSA fromCurve(EdDSACurve curve) {
-        return new EDDSA(curve);
-    }
-
-    @Override
-    public String getName() {
-        return "EdDSA";
-    }
-
-    @Override
-    public PublicKeyAlgorithm getAlgorithm() {
-        return PublicKeyAlgorithm.EDDSA;
-    }
-
-    @Override
-    public AlgorithmParameterSpec getAlgorithmSpec() {
-        return new ECNamedCurveGenParameterSpec(curve.getName());
-    }
-}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/EllipticCurve.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type.curve;
+package org.pgpainless.key.generation.type;
 
 import javax.annotation.Nonnull;
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/KeyLength.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type.length;
+package org.pgpainless.key.generation.type;
 
 public interface KeyLength {
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/KeyType.java

@@ -18,8 +18,10 @@ package org.pgpainless.key.generation.type;
 import java.security.spec.AlgorithmParameterSpec;
 
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
+import org.pgpainless.key.generation.type.ecdh.ECDH;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.ecdsa.ECDSA;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
+import org.pgpainless.key.generation.type.rsa.RSA;
 
 public interface KeyType {
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/XDH.java

@@ -1,35 +0,0 @@
-package org.pgpainless.key.generation.type;
-
-import java.security.spec.AlgorithmParameterSpec;
-
-import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
-import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.curve.XDHCurve;
-
-public class XDH implements KeyType {
-
-    private XDHCurve curve;
-
-    private XDH(XDHCurve curve) {
-        this.curve = curve;
-    }
-
-    public static XDH fromCurve(XDHCurve curve) {
-        return new XDH(curve);
-    }
-
-    @Override
-    public String getName() {
-        return "XDH";
-    }
-
-    @Override
-    public PublicKeyAlgorithm getAlgorithm() {
-        return PublicKeyAlgorithm.ECDH;
-    }
-
-    @Override
-    public AlgorithmParameterSpec getAlgorithmSpec() {
-        return new ECNamedCurveGenParameterSpec(curve.getName());
-    }
-}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/curve/EdDSACurve.java

@@ -1,18 +0,0 @@
-package org.pgpainless.key.generation.type.curve;
-
-import javax.annotation.Nonnull;
-
-public enum EdDSACurve {
-    _Ed25519("ed25519"),
-    ;
-
-    final String name;
-
-    EdDSACurve(@Nonnull String curveName) {
-        this.name = curveName;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/curve/XDHCurve.java

@@ -1,18 +0,0 @@
-package org.pgpainless.key.generation.type.curve;
-
-import javax.annotation.Nonnull;
-
-public enum XDHCurve {
-    _X25519("X25519"),
-    ;
-
-    final String name;
-
-    XDHCurve(@Nonnull String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecdh/ECDH.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Paul Schaub.
+ * Copyright 2020 Paul Schaub.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,20 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type;
+package org.pgpainless.key.generation.type.ecdh;
 
 import javax.annotation.Nonnull;
 import java.security.spec.AlgorithmParameterSpec;
 
 import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
+import org.pgpainless.key.generation.type.KeyType;
+import org.pgpainless.key.generation.type.EllipticCurve;
 
-public class ECDH implements KeyType {
+public final class ECDH implements KeyType {
 
     private final EllipticCurve curve;
 
-    ECDH(EllipticCurve curve) {
+    private ECDH(EllipticCurve curve) {
         this.curve = curve;
     }
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecdh/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 Paul Schaub.
+ * Copyright 2020 Paul Schaub.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,6 @@
  * limitations under the License.
  */
 /**
- * Classes related to elliptic curve cryptography.
+ * Classes related to ECDH.
  */
-package org.pgpainless.key.generation.type.curve;
+package org.pgpainless.key.generation.type.ecdh;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecdsa/ECDSA.java

@@ -13,18 +13,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type;
+package org.pgpainless.key.generation.type.ecdsa;
 
 
+import java.security.spec.AlgorithmParameterSpec;
 import javax.annotation.Nonnull;
 
+import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
+import org.pgpainless.key.generation.type.EllipticCurve;
+import org.pgpainless.key.generation.type.KeyType;
 
-public class ECDSA extends ECDH {
+public final class ECDSA implements KeyType {
 
-    ECDSA(@Nonnull EllipticCurve curve) {
+    private final EllipticCurve curve;
-        super(curve);
+
+    private ECDSA(@Nonnull EllipticCurve curve) {
+        this.curve = curve;
     }
 
     public static ECDSA fromCurve(@Nonnull EllipticCurve curve) {
@@ -40,4 +45,9 @@ public class ECDSA extends ECDH {
     public PublicKeyAlgorithm getAlgorithm() {
         return PublicKeyAlgorithm.ECDSA;
     }
+
+    @Override
+    public AlgorithmParameterSpec getAlgorithmSpec() {
+        return new ECNamedCurveGenParameterSpec(curve.getName());
+    }
 }

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/ecdsa/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Classes related to ECDSA.
+ */
+package org.pgpainless.key.generation.type.ecdsa;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/EdDSA.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.pgpainless.key.generation.type.eddsa;
+
+import java.security.spec.AlgorithmParameterSpec;
+
+import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
+import org.pgpainless.key.generation.type.KeyType;
+
+public final class EdDSA implements KeyType {
+
+    private final EdDSACurve curve;
+
+    private EdDSA(EdDSACurve curve) {
+        this.curve = curve;
+    }
+
+    public static EdDSA fromCurve(EdDSACurve curve) {
+        return new EdDSA(curve);
+    }
+
+    @Override
+    public String getName() {
+        return "EdDSA";
+    }
+
+    @Override
+    public PublicKeyAlgorithm getAlgorithm() {
+        return PublicKeyAlgorithm.EDDSA;
+    }
+
+    @Override
+    public AlgorithmParameterSpec getAlgorithmSpec() {
+        return new ECNamedCurveGenParameterSpec(curve.getName());
+    }
+}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/EdDSACurve.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.pgpainless.key.generation.type.eddsa;
+
+import javax.annotation.Nonnull;
+
+public enum EdDSACurve {
+    _Ed25519("ed25519"),
+    ;
+
+    final String name;
+
+    EdDSACurve(@Nonnull String curveName) {
+        this.name = curveName;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/eddsa/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Classes related to EdDSA.
+ */
+package org.pgpainless.key.generation.type.eddsa;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/ElGamalLength.java

@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type.length;
+package org.pgpainless.key.generation.type.elgamal;
 
 import java.math.BigInteger;
 
+import org.pgpainless.key.generation.type.KeyLength;
+
 /**
  * The following primes are taken from RFC-3526.
  *

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/ElGamal_ENCRYPT.java

@@ -13,12 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type;
+package org.pgpainless.key.generation.type.elgamal;
 
 import javax.annotation.Nonnull;
 
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.length.ElGamalLength;
 
 public class ElGamal_ENCRYPT extends ElGamal_GENERAL {
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/ElGamal_GENERAL.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type;
+package org.pgpainless.key.generation.type.elgamal;
 
 import javax.annotation.Nonnull;
 import java.security.spec.AlgorithmParameterSpec;
 
 import org.bouncycastle.jce.spec.ElGamalParameterSpec;
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.length.ElGamalLength;
+import org.pgpainless.key.generation.type.KeyType;
 
 public class ElGamal_GENERAL implements KeyType {
 

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/elgamal/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Classes related to ElGamal.
+ */
+package org.pgpainless.key.generation.type.elgamal;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/length/DiffieHellmanLength.java

@@ -15,6 +15,8 @@
  */
 package org.pgpainless.key.generation.type.length;
 
+import org.pgpainless.key.generation.type.KeyLength;
+
 public enum DiffieHellmanLength implements KeyLength {
 
     _1024(1024),

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/rsa/RSA.java

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type;
+package org.pgpainless.key.generation.type.rsa;
 
 import javax.annotation.Nonnull;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.RSAKeyGenParameterSpec;
 
 import org.pgpainless.algorithm.PublicKeyAlgorithm;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.KeyType;
 
 /**
  * Key type that specifies the RSA_GENERAL algorithm.

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/rsa/RsaLength.java

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.pgpainless.key.generation.type.length;
+package org.pgpainless.key.generation.type.rsa;
+
+import org.pgpainless.key.generation.type.KeyLength;
 
 public enum RsaLength implements KeyLength {
     @Deprecated

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/rsa/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Classes related to RSA.
+ */
+package org.pgpainless.key.generation.type.rsa;

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/XDH.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.pgpainless.key.generation.type.xdh;
+
+import java.security.spec.AlgorithmParameterSpec;
+
+import org.bouncycastle.jce.spec.ECNamedCurveGenParameterSpec;
+import org.pgpainless.algorithm.PublicKeyAlgorithm;
+import org.pgpainless.key.generation.type.KeyType;
+
+public final class XDH implements KeyType {
+
+    private final XDHCurve curve;
+
+    private XDH(XDHCurve curve) {
+        this.curve = curve;
+    }
+
+    public static XDH fromCurve(XDHCurve curve) {
+        return new XDH(curve);
+    }
+
+    @Override
+    public String getName() {
+        return "XDH";
+    }
+
+    @Override
+    public PublicKeyAlgorithm getAlgorithm() {
+        return PublicKeyAlgorithm.ECDH;
+    }
+
+    @Override
+    public AlgorithmParameterSpec getAlgorithmSpec() {
+        return new ECNamedCurveGenParameterSpec(curve.getName());
+    }
+}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/XDHCurve.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.pgpainless.key.generation.type.xdh;
+
+import javax.annotation.Nonnull;
+
+public enum XDHCurve {
+    _X25519("X25519"),
+    ;
+
+    final String name;
+
+    XDHCurve(@Nonnull String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

pgpainless-core/src/main/java/org/pgpainless/key/generation/type/xdh/package-info.java

@@ -0,0 +1,19 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/**
+ * Classes related to Diffie-Hellman on the X25519 curve.
+ */
+package org.pgpainless.key.generation.type.xdh;

pgpainless-core/src/test/java/org/pgpainless/encryption_signing/EncryptDecryptTest.java

@@ -45,10 +45,10 @@ import org.pgpainless.decryption_verification.OpenPgpMetadata;
 import org.pgpainless.key.OpenPgpV4Fingerprint;
 import org.pgpainless.key.TestKeys;
 import org.pgpainless.key.generation.KeySpec;
-import org.pgpainless.key.generation.type.ElGamal_GENERAL;
+import org.pgpainless.key.generation.type.elgamal.ElGamal_GENERAL;
 import org.pgpainless.key.generation.type.KeyType;
-import org.pgpainless.key.generation.type.length.ElGamalLength;
+import org.pgpainless.key.generation.type.elgamal.ElGamalLength;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
 import org.pgpainless.key.protection.SecretKeyRingProtector;
 import org.pgpainless.key.protection.UnprotectedKeysProtector;
 import org.pgpainless.key.util.KeyRingUtils;

pgpainless-core/src/test/java/org/pgpainless/encryption_signing/LengthTest.java

@@ -33,7 +33,7 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.bouncycastle.util.io.Streams;
 import org.pgpainless.PGPainless;
 import org.pgpainless.key.TestKeys;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
 import org.pgpainless.key.protection.SecretKeyRingProtector;
 import org.pgpainless.key.protection.UnprotectedKeysProtector;
 import org.pgpainless.key.util.KeyRingUtils;

pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateEllipticCurveKeyTest.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 2020 Paul Schaub.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.pgpainless.key.generation;
 
 import java.io.IOException;
@@ -5,13 +20,13 @@ import java.security.InvalidAlgorithmParameterException;
 import java.security.NoSuchAlgorithmException;
 
 import org.bouncycastle.openpgp.PGPException;
+import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.PGPainless;
-import org.pgpainless.key.collection.PGPKeyRing;
+import org.pgpainless.key.generation.type.eddsa.EdDSA;
-import org.pgpainless.key.generation.type.EDDSA;
+import org.pgpainless.key.generation.type.xdh.XDH;
-import org.pgpainless.key.generation.type.XDH;
+import org.pgpainless.key.generation.type.eddsa.EdDSACurve;
-import org.pgpainless.key.generation.type.curve.EdDSACurve;
+import org.pgpainless.key.generation.type.xdh.XDHCurve;
-import org.pgpainless.key.generation.type.curve.XDHCurve;
 import org.pgpainless.key.util.UserId;
 import org.pgpainless.util.ArmorUtils;
 
@@ -19,17 +34,18 @@ public class GenerateEllipticCurveKeyTest {
 
     @Test
     public void test() throws InvalidAlgorithmParameterException, NoSuchAlgorithmException, PGPException, IOException {
-        PGPKeyRing keyRing = PGPainless.generateKeyRing()
+        PGPSecretKeyRing keyRing = PGPainless.generateKeyRing()
                 .withSubKey(KeySpec.getBuilder(XDH.fromCurve(XDHCurve._X25519))
                         .withDefaultKeyFlags()
                         .withDefaultAlgorithms())
-                .withMasterKey(KeySpec.getBuilder(EDDSA.fromCurve(EdDSACurve._Ed25519))
+                .withMasterKey(KeySpec.getBuilder(EdDSA.fromCurve(EdDSACurve._Ed25519))
                         .withDefaultKeyFlags()
                         .withDefaultAlgorithms())
                 .withPrimaryUserId(UserId.onlyEmail("alice@wonderland.lit").toString())
                 .withoutPassphrase()
                 .build();
-
+        // CHECKSTYLE:OFF
-        System.out.println(ArmorUtils.toAsciiArmoredString(keyRing.getPublicKeys()));
+        System.out.println(ArmorUtils.toAsciiArmoredString(keyRing));
+        // CHECKSTYLE:ON
     }
 }

pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateKeyWithAdditionalUserIdTest.java

@@ -31,7 +31,7 @@ import org.bouncycastle.openpgp.PGPSecretKeyRing;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.PGPainless;
 import org.pgpainless.key.generation.type.KeyType;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
 import org.pgpainless.key.util.KeyRingUtils;
 
 public class GenerateKeyWithAdditionalUserIdTest {

pgpainless-core/src/test/java/org/pgpainless/key/generation/GenerateWithEmptyPassphrase.java

@@ -25,7 +25,7 @@ import org.bouncycastle.openpgp.PGPException;
 import org.junit.jupiter.api.Test;
 import org.pgpainless.PGPainless;
 import org.pgpainless.key.generation.type.KeyType;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
 import org.pgpainless.util.Passphrase;
 
 /**

pgpainless-core/src/test/java/org/pgpainless/key/modification/AddSubKeyTest.java

@@ -34,8 +34,8 @@ import org.pgpainless.PGPainless;
 import org.pgpainless.algorithm.KeyFlag;
 import org.pgpainless.key.TestKeys;
 import org.pgpainless.key.generation.KeySpec;
-import org.pgpainless.key.generation.type.ECDSA;
+import org.pgpainless.key.generation.type.ecdsa.ECDSA;
-import org.pgpainless.key.generation.type.curve.EllipticCurve;
+import org.pgpainless.key.generation.type.EllipticCurve;
 import org.pgpainless.key.protection.PasswordBasedSecretKeyRingProtector;
 import org.pgpainless.util.Passphrase;
 

pgpainless-core/src/test/java/org/pgpainless/util/BCUtilTest.java

@@ -37,7 +37,7 @@ import org.junit.jupiter.api.Test;
 import org.pgpainless.PGPainless;
 import org.pgpainless.key.generation.KeySpec;
 import org.pgpainless.key.generation.type.KeyType;
-import org.pgpainless.key.generation.type.length.RsaLength;
+import org.pgpainless.key.generation.type.rsa.RsaLength;
 import org.pgpainless.key.util.KeyRingUtils;
 
 public class BCUtilTest {