Fix checkstyle and compilation issues

vanitasvitae · vanitasvitae · commit fd7fbf89998e · 2025-06-30T13:16:52.000+02:00
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/api/KeyPairGeneratorCallback.java b/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()
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/api/test/OpenPGPV6KeyGeneratorTest.java b/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()
                         {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ public interface KeyPairGeneratorCallback`
`19`	`19`	`PGPKeyPair generateFrom(PGPKeyPairGenerator generator)`
`20`	`20`	`throws PGPException;`
`21`	`21`
`22`		`- static class Util {`
	`22`	`+ static class Util`
	`23`	`+ {`
`23`	`24`	`public static KeyPairGeneratorCallback primaryKey()`
`24`	`25`	`{`
`25`	`26`	`return new KeyPairGeneratorCallback()`
Original file line number	Diff line number	Diff line change
`@@ -581,7 +581,7 @@ private void testGenerateKeyWithoutSignatures(OpenPGPApi api)`
`581`	`581`	`{`
`582`	`582`	`OpenPGPKey key = api.generateKey()`
`583`	`583`	`.withPrimaryKey(`
`584`		`- KeyPairGeneratorCallback.primaryKey(),`
	`584`	`+ KeyPairGeneratorCallback.Util.primaryKey(),`
`585`	`585`	`// No direct-key sig`
`586`	`586`	`new SignatureParameters.Callback()`
`587`	`587`	`{`
`@@ -591,7 +591,7 @@ public SignatureParameters apply(SignatureParameters parameters) {`
`591`	`591`	`}`
`592`	`592`	`})`
`593`	`593`	`.addSigningSubkey(`
`594`		`- KeyPairGeneratorCallback.signingKey(),`
	`594`	`+ KeyPairGeneratorCallback.Util.signingKey(),`
`595`	`595`	`// No subkey binding sig`
`596`	`596`	`new SignatureParameters.Callback()`
`597`	`597`	`{`
`@@ -611,7 +611,7 @@ public SignatureParameters apply(SignatureParameters parameters)`
`611`	`611`	`}`
`612`	`612`	`})`
`613`	`613`	`.addEncryptionSubkey(`
`614`		`- KeyPairGeneratorCallback.encryptionKey(),`
	`614`	`+ KeyPairGeneratorCallback.Util.encryptionKey(),`
`615`	`615`	`// No subkey binding sig`
`616`	`616`	`new SignatureParameters.Callback()`
`617`	`617`	`{`