Adjust changes from Trino 3c687c3 for Presto

Author: auden-woolfson

presto-main/src/main/java/com/facebook/presto/server/security/oauth2/JweTokenSerializer.java

@@ -99,12 +99,17 @@ public JweTokenSerializer(
     private JWEHeader createEncryptionHeader(SecretKey key)
     {
         int keyLength = key.getEncoded().length;
-        return switch (keyLength) {
-            case 16 -> new JWEHeader(JWEAlgorithm.A128GCMKW, EncryptionMethod.A128GCM);
-            case 24 -> new JWEHeader(JWEAlgorithm.A192GCMKW, EncryptionMethod.A192GCM);
-            case 32 -> new JWEHeader(JWEAlgorithm.A256GCMKW, EncryptionMethod.A256GCM);
-            default -> throw new IllegalArgumentException("Secret key size must be either 16, 24 or 32 bytes but was %d".formatted(keyLength));
-        };
+        switch (keyLength) {
+            case 16:
+                return new JWEHeader(JWEAlgorithm.A128GCMKW, EncryptionMethod.A128GCM);
+            case 24:
+                return new JWEHeader(JWEAlgorithm.A192GCMKW, EncryptionMethod.A192GCM);
+            case 32:
+                return new JWEHeader(JWEAlgorithm.A256GCMKW, EncryptionMethod.A256GCM);
+            default:
+                throw new IllegalArgumentException(
+                        String.format("Secret key size must be either 16, 24 or 32 bytes but was %d", keyLength));
+        }
     }
 
     @Override

presto-main/src/test/java/com/facebook/presto/server/security/oauth2/TestJweTokenSerializer.java

@@ -44,6 +44,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.testng.Assert.assertEquals;
 
 public class TestJweTokenSerializer
 {
@@ -99,7 +100,7 @@ public void testSerializationFailsWithWrongKeySize()
         for (int wrongKeySize : new int[] {8, 64, 128}) {
             String tooShortSecret = randomEncodedSecret(wrongKeySize);
             assertThatThrownBy(() -> assertRoundTrip(tooShortSecret, tooShortSecret))
-                    .hasStackTraceContaining("Secret key size must be either 16, 24 or 32 bytes but was " + wrongKeySize);
+                    .hasStackTraceContaining("The Key Encryption Key length must be 128 bits (16 bytes), 192 bits (24 bytes) or 256 bits (32 bytes)");
         }
     }
 
@@ -116,8 +117,10 @@ private void assertRoundTrip(Optional<String> serializerSecret, Optional<String>
         JweTokenSerializer deserializer = tokenSerializer(Clock.systemUTC(), succinctDuration(5, SECONDS), deserializerSecret);
         Date expiration = new Calendar.Builder().setDate(2023, 6, 22).build().getTime();
         TokenPair tokenPair = withAccessAndRefreshTokens(randomEncodedSecret(), expiration, randomEncodedSecret());
-        assertThat(deserializer.deserialize(serializer.serialize(tokenPair)))
-                .isEqualTo(tokenPair);
+        TokenPair postSerPair = deserializer.deserialize(serializer.serialize(tokenPair));
+        assertEquals(tokenPair.getAccessToken(), postSerPair.getAccessToken());
+        assertEquals(tokenPair.getRefreshToken(), postSerPair.getRefreshToken());
+        assertEquals(tokenPair.getExpiration(), postSerPair.getExpiration());
     }
 
     @Test
@@ -184,8 +187,8 @@ private JweTokenSerializer tokenSerializer(Clock clock, Duration tokenExpiration
         return new JweTokenSerializer(
                 refreshTokensConfig,
                 new Oauth2ClientStub(),
-                "trino_coordinator_test_version",
-                "trino_coordinator",
+                "presto_coordinator_test_version",
+                "presto_coordinator",
                 "sub",
                 clock,
                 tokenExpiration);