Fix checkstyle and compilation issues

Author: vanitasvitae

pg/src/main/java/org/bouncycastle/openpgp/api/KeyPairGeneratorCallback.java

@@ -19,7 +19,8 @@ public interface KeyPairGeneratorCallback
     PGPKeyPair generateFrom(PGPKeyPairGenerator generator)
         throws PGPException;
 
-    static class Util {
+    static class Util
+    {
         public static KeyPairGeneratorCallback primaryKey()
         {
             return new KeyPairGeneratorCallback()

pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPV6KeyGeneratorTest.java

@@ -581,7 +581,7 @@ private void testGenerateKeyWithoutSignatures(OpenPGPApi api)
     {
         OpenPGPKey key = api.generateKey()
                 .withPrimaryKey(
-                        KeyPairGeneratorCallback.primaryKey(),
+                        KeyPairGeneratorCallback.Util.primaryKey(),
                         // No direct-key sig
                         new SignatureParameters.Callback()
                         {
@@ -591,7 +591,7 @@ public SignatureParameters apply(SignatureParameters parameters) {
                             }
                         })
                 .addSigningSubkey(
-                        KeyPairGeneratorCallback.signingKey(),
+                        KeyPairGeneratorCallback.Util.signingKey(),
                         // No subkey binding sig
                         new SignatureParameters.Callback()
                         {
@@ -611,7 +611,7 @@ public SignatureParameters apply(SignatureParameters parameters)
                             }
                         })
                 .addEncryptionSubkey(
-                        KeyPairGeneratorCallback.encryptionKey(),
+                        KeyPairGeneratorCallback.Util.encryptionKey(),
                         // No subkey binding sig
                         new SignatureParameters.Callback()
                         {