fixed checkstyle issues.

Author: dghgit

pg/src/main/java/org/bouncycastle/bcpg/FingerprintUtil.java

@@ -6,6 +6,7 @@ public class FingerprintUtil
     /**
      * Derive a 64 bit key-id from a version 6 OpenPGP fingerprint.
      * For v6 keys, the key-id corresponds to the left-most 8 octets of the fingerprint.
+     *
      * @param v6Fingerprint 32 byte fingerprint
      * @return key-id
      */
@@ -17,6 +18,7 @@ public static long keyIdFromV6Fingerprint(byte[] v6Fingerprint)
     /**
      * Derive a 64 bit key-id from a version 5 LibrePGP fingerprint.
      * For such keys, the key-id corresponds to the left-most 8 octets of the fingerprint.
+     *
      * @param v5Fingerprint 32 byte fingerprint
      * @return key-id
      */
@@ -28,6 +30,7 @@ public static long keyIdFromLibrePgpFingerprint(byte[] v5Fingerprint)
     /**
      * Derive a 64 bit key-id from a version 4 OpenPGP fingerprint.
      * For v4 keys, the key-id corresponds to the right-most 8 octets of the fingerprint.
+     *
      * @param v4Fingerprint 20 byte fingerprint
      * @return key-id
      */
@@ -38,6 +41,7 @@ public static long keyIdFromV4Fingerprint(byte[] v4Fingerprint)
 
     /**
      * Convert the left-most 8 bytes from the given array to a long.
+     *
      * @param bytes bytes
      * @return long
      */
@@ -47,18 +51,19 @@ public static long longFromLeftMostBytes(byte[] bytes)
         {
             throw new IllegalArgumentException("Byte array MUST contain at least 8 bytes");
         }
-        return  ((bytes[0] & 0xffL) << 56) |
-                ((bytes[1] & 0xffL) << 48) |
-                ((bytes[2] & 0xffL) << 40) |
-                ((bytes[3] & 0xffL) << 32) |
-                ((bytes[4] & 0xffL) << 24) |
-                ((bytes[5] & 0xffL) << 16) |
-                ((bytes[6] & 0xffL) << 8) |
-                ((bytes[7] & 0xffL));
+        return ((bytes[0] & 0xffL) << 56) |
+            ((bytes[1] & 0xffL) << 48) |
+            ((bytes[2] & 0xffL) << 40) |
+            ((bytes[3] & 0xffL) << 32) |
+            ((bytes[4] & 0xffL) << 24) |
+            ((bytes[5] & 0xffL) << 16) |
+            ((bytes[6] & 0xffL) << 8) |
+            ((bytes[7] & 0xffL));
     }
 
     /**
      * Convert the right-most 8 bytes from the given array to a long.
+     *
      * @param bytes bytes
      * @return long
      */
@@ -69,13 +74,13 @@ public static long longFromRightMostBytes(byte[] bytes)
             throw new IllegalArgumentException("Byte array MUST contain at least 8 bytes");
         }
         int i = bytes.length;
-        return  ((bytes[i - 8] & 0xffL) << 56) |
-                ((bytes[i - 7] & 0xffL) << 48) |
-                ((bytes[i - 6] & 0xffL) << 40) |
-                ((bytes[i - 5] & 0xffL) << 32) |
-                ((bytes[i - 4] & 0xffL) << 24) |
-                ((bytes[i - 3] & 0xffL) << 16) |
-                ((bytes[i - 2] & 0xffL) << 8) |
-                ((bytes[i - 1] & 0xffL));
+        return ((bytes[i - 8] & 0xffL) << 56) |
+            ((bytes[i - 7] & 0xffL) << 48) |
+            ((bytes[i - 6] & 0xffL) << 40) |
+            ((bytes[i - 5] & 0xffL) << 32) |
+            ((bytes[i - 4] & 0xffL) << 24) |
+            ((bytes[i - 3] & 0xffL) << 16) |
+            ((bytes[i - 2] & 0xffL) << 8) |
+            ((bytes[i - 1] & 0xffL));
     }
 }

pg/src/test/java/org/bouncycastle/bcpg/test/FingerprintUtilTest.java

@@ -4,54 +4,66 @@
 import org.bouncycastle.util.encoders.Hex;
 import org.bouncycastle.util.test.SimpleTest;
 
-public class FingerprintUtilTest extends SimpleTest {
-
-    private void testKeyIdFromTooShortFails() {
+public class FingerprintUtilTest
+    extends SimpleTest
+{
+    private void testKeyIdFromTooShortFails()
+    {
         byte[] decoded = new byte[1];
-        try {
+        try
+        {
             FingerprintUtil.keyIdFromV4Fingerprint(decoded);
             fail("Expected exception");
-        } catch (IllegalArgumentException e) {
+        }
+        catch (IllegalArgumentException e)
+        {
             // expected
         }
     }
 
-    private void testV4KeyIdFromFingerprint() {
+    private void testV4KeyIdFromFingerprint()
+    {
         String fingerprint = "1D018C772DF8C5EF86A1DCC9B4B509CB5936E03E";
         byte[] decoded = Hex.decode(fingerprint);
         isEquals("v4 key-id from fingerprint mismatch",
-                -5425419407118114754L, FingerprintUtil.keyIdFromV4Fingerprint(decoded));
+            -5425419407118114754L, FingerprintUtil.keyIdFromV4Fingerprint(decoded));
     }
 
-    private void testV6KeyIdFromFingerprint() {
+    private void testV6KeyIdFromFingerprint()
+    {
         String fingerprint = "cb186c4f0609a697e4d52dfa6c722b0c1f1e27c18a56708f6525ec27bad9acc9";
         byte[] decoded = Hex.decode(fingerprint);
         isEquals("v6 key-id from fingerprint mismatch",
-                -3812177997909612905L, FingerprintUtil.keyIdFromV6Fingerprint(decoded));
+            -3812177997909612905L, FingerprintUtil.keyIdFromV6Fingerprint(decoded));
     }
 
-    private void testLibrePgpKeyIdFromFingerprint() {
+    private void testLibrePgpKeyIdFromFingerprint()
+    {
         // v6 key-ids are derived from fingerprints the same way as LibrePGP does
         String fingerprint = "cb186c4f0609a697e4d52dfa6c722b0c1f1e27c18a56708f6525ec27bad9acc9";
         byte[] decoded = Hex.decode(fingerprint);
         isEquals("LibrePGP key-id from fingerprint mismatch",
-                -3812177997909612905L, FingerprintUtil.keyIdFromLibrePgpFingerprint(decoded));
+            -3812177997909612905L, FingerprintUtil.keyIdFromLibrePgpFingerprint(decoded));
     }
 
     @Override
-    public String getName() {
+    public String getName()
+    {
         return "FingerprintUtilTest";
     }
 
     @Override
-    public void performTest() throws Exception {
+    public void performTest()
+        throws Exception
+    {
         testV4KeyIdFromFingerprint();
         testV6KeyIdFromFingerprint();
         testKeyIdFromTooShortFails();
         testLibrePgpKeyIdFromFingerprint();
     }
 
-    public static void main(String[] args) {
+    public static void main(String[] args)
+    {
         runTest(new FingerprintUtilTest());
     }
 }