Fix more Sonar issues

nbaars · Mar 24, 2023 · 3f0cf71 · 3f0cf71
1 parent fbd9531
commit 3f0cf71
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/commons/src/main/java/org/paseto4j/commons/Pair.java b/commons/src/main/java/org/paseto4j/commons/Pair.java
@@ -1,12 +1,19 @@
 package org.paseto4j.commons;
 
 public class Pair<T> {
-
-  public T first;
-  public T second;
+  private T first;
+  private T second;
 
   public Pair(T first, T second) {
     this.first = first;
     this.second = second;
   }
+
+  public T getFirst() {
+    return first;
+  }
+
+  public T getSecond() {
+    return second;
+  }
 }
diff --git a/commons/src/test/java/org/paseto4j/commons/ByteUtilsTest.java b/commons/src/test/java/org/paseto4j/commons/ByteUtilsTest.java
@@ -62,8 +62,8 @@ void splitEqual() {
 
     var result = ByteUtils.split(b, 1);
 
-    Assertions.assertArrayEquals(new byte[] {'a'}, result.first);
-    Assertions.assertArrayEquals(new byte[] {'b'}, result.second);
+    Assertions.assertArrayEquals(new byte[] {'a'}, result.getFirst());
+    Assertions.assertArrayEquals(new byte[] {'b'}, result.getSecond());
   }
 
   @Test
@@ -72,7 +72,7 @@ void splitEmpty() {
 
     var result = ByteUtils.split(b, 1);
 
-    Assertions.assertEquals(0, result.first.length);
-    Assertions.assertEquals(0, result.first.length);
+    Assertions.assertEquals(0, result.getFirst().length);
+    Assertions.assertEquals(0, result.getSecond().length);
   }
 }
diff --git a/version2/src/test/java/org/paseto4j/version2/PasetoPublicTest.java b/version2/src/test/java/org/paseto4j/version2/PasetoPublicTest.java
@@ -159,9 +159,9 @@ void signTokenWithSeed() {
 
   @Test
   void keyTooSmall() {
+    PrivateKey privateKey = new PrivateKey(new byte[] {'0'}, V2);
     Assertions.assertThrows(
-        PasetoException.class,
-        () -> PasetoPublic.sign(new PrivateKey(new byte[] {'0'}, V2), " test", "test"));
+        PasetoException.class, () -> PasetoPublic.sign(privateKey, " test", "test"));
   }
 
   @Test

diff --git a/version3/src/main/java/org/paseto4j/version3/CryptoFunctions.java b/version3/src/main/java/org/paseto4j/version3/CryptoFunctions.java
@@ -180,8 +180,8 @@ public static boolean verify(PublicKey publicKey, byte[] msg, byte[] signature)
       DERSequence seq =
           new DERSequence(
               new ASN1Integer[] {
-                new ASN1Integer(new BigInteger(1, pair.first)),
-                new ASN1Integer(new BigInteger(1, pair.second))
+                new ASN1Integer(new BigInteger(1, pair.getFirst())),
+                new ASN1Integer(new BigInteger(1, pair.getSecond()))
               });
 
       return verifier.verify(seq.getEncoded());

diff --git a/version3/src/main/java/org/paseto4j/version3/PasetoLocal.java b/version3/src/main/java/org/paseto4j/version3/PasetoLocal.java
@@ -75,8 +75,8 @@ static String encrypt(
     // 4
     byte[] tmp = encryptionKey(key, nonce);
     Pair<byte[]> split = ByteUtils.split(tmp, 32);
-    byte[] ek = split.first;
-    byte[] n2 = split.second;
+    byte[] ek = split.getFirst();
+    byte[] n2 = split.getSecond();
     byte[] ak = authenticationKey(key, nonce);
 
     // 5
@@ -135,8 +135,8 @@ static String decrypt(SecretKey key, String token, String footer, String implici
     // 5
     byte[] tmp = encryptionKey(key, nonce);
     Pair<byte[]> split = ByteUtils.split(tmp, 32);
-    byte[] ek = split.first;
-    byte[] n2 = split.second;
+    byte[] ek = split.getFirst();
+    byte[] n2 = split.getSecond();
     byte[] ak = authenticationKey(key, nonce);
 
     // 6