From de82ebf91667e90bb7109a75734d97fc536a7e60 Mon Sep 17 00:00:00 2001 From: Max Lambrecht Date: Fri, 5 Feb 2021 10:37:44 -0300 Subject: [PATCH] Minor exception messages improvements. Signed-off-by: Max Lambrecht --- .../main/java/io/spiffe/internal/JwtSignatureAlgorithm.java | 4 ++-- .../test/java/io/spiffe/bundle/jwtbundle/JwtBundleTest.java | 2 +- .../io/spiffe/svid/jwtsvid/JwtSignatureAlgorithmTest.java | 4 ++-- .../io/spiffe/svid/jwtsvid/JwtSvidParseAndValidateTest.java | 2 +- .../java/io/spiffe/svid/jwtsvid/JwtSvidParseInsecureTest.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/java-spiffe-core/src/main/java/io/spiffe/internal/JwtSignatureAlgorithm.java b/java-spiffe-core/src/main/java/io/spiffe/internal/JwtSignatureAlgorithm.java index a7856de..6f05209 100644 --- a/java-spiffe-core/src/main/java/io/spiffe/internal/JwtSignatureAlgorithm.java +++ b/java-spiffe-core/src/main/java/io/spiffe/internal/JwtSignatureAlgorithm.java @@ -97,7 +97,7 @@ public enum JwtSignatureAlgorithm { } else if (s.equals(EC.getName())) { family = EC; } else { - throw new IllegalArgumentException("Unsupported JWT token family algorithm: " + s); + throw new IllegalArgumentException("Unsupported JWT family algorithm: " + s); } return family; } @@ -124,7 +124,7 @@ public enum JwtSignatureAlgorithm { } else if (s.equals(PS512.getName())) { algorithm = PS512; } else { - throw new IllegalArgumentException("Unsupported JWT token algorithm: " + s); + throw new IllegalArgumentException("Unsupported JWT algorithm: " + s); } return algorithm; } diff --git a/java-spiffe-core/src/test/java/io/spiffe/bundle/jwtbundle/JwtBundleTest.java b/java-spiffe-core/src/test/java/io/spiffe/bundle/jwtbundle/JwtBundleTest.java index 01c4480..8ff9760 100644 --- a/java-spiffe-core/src/test/java/io/spiffe/bundle/jwtbundle/JwtBundleTest.java +++ b/java-spiffe-core/src/test/java/io/spiffe/bundle/jwtbundle/JwtBundleTest.java @@ -165,7 +165,7 @@ class JwtBundleTest { JwtBundle.load(trustDomain, path); fail("should have thrown exception"); } catch (JwtBundleException e) { - assertEquals("Unsupported JWT token family algorithm: OKP", e.getCause().getMessage()); + assertEquals("Unsupported JWT family algorithm: OKP", e.getCause().getMessage()); } } diff --git a/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSignatureAlgorithmTest.java b/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSignatureAlgorithmTest.java index 639968f..bd6c087 100644 --- a/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSignatureAlgorithmTest.java +++ b/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSignatureAlgorithmTest.java @@ -77,7 +77,7 @@ class JwtSignatureAlgorithmTest { JwtSignatureAlgorithm.Family.parse("unknown family"); fail(); } catch (IllegalArgumentException e) { - assertEquals("Unsupported JWT token family algorithm: unknown family", e.getMessage()); + assertEquals("Unsupported JWT family algorithm: unknown family", e.getMessage()); } } @@ -87,7 +87,7 @@ class JwtSignatureAlgorithmTest { JwtSignatureAlgorithm.parse("HS256"); fail(); } catch (IllegalArgumentException e) { - assertEquals("Unsupported JWT token algorithm: HS256", e.getMessage()); + assertEquals("Unsupported JWT algorithm: HS256", e.getMessage()); } } } \ No newline at end of file diff --git a/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSvidParseAndValidateTest.java b/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSvidParseAndValidateTest.java index c5e3067..44429c4 100644 --- a/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSvidParseAndValidateTest.java +++ b/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSvidParseAndValidateTest.java @@ -154,7 +154,7 @@ class JwtSvidParseAndValidateTest { .jwtBundle(jwtBundle) .expectedAudience(Collections.singleton("audience")) .generateToken(() -> HS256TOKEN) - .expectedException(new JwtSvidException("Unsupported JWT token algorithm: HS256")) + .expectedException(new JwtSvidException("Unsupported JWT algorithm: HS256")) .build()), Arguments.of(TestCase.builder() .name("5. missing subject") diff --git a/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSvidParseInsecureTest.java b/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSvidParseInsecureTest.java index 55198f3..5b6539f 100644 --- a/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSvidParseInsecureTest.java +++ b/java-spiffe-core/src/test/java/io/spiffe/svid/jwtsvid/JwtSvidParseInsecureTest.java @@ -156,7 +156,7 @@ class JwtSvidParseInsecureTest { .name("unsupported algorithm") .expectedAudience(Collections.singleton("audience")) .generateToken(() -> HS256TOKEN) - .expectedException(new JwtSvidException("Unsupported JWT token algorithm: HS256")) + .expectedException(new JwtSvidException("Unsupported JWT algorithm: HS256")) .build()) ); }