Merge pull request #5265 from sberyozkin/smallrye_jwt_2.0.10

Update to smallrye-jwt-2.0.10

Author: sberyozkin

bom/runtime/pom.xml

@@ -37,7 +37,7 @@
         <smallrye-open-api.version>1.1.19</smallrye-open-api.version>
         <smallrye-opentracing.version>1.3.2</smallrye-opentracing.version>
         <smallrye-fault-tolerance.version>2.1.2</smallrye-fault-tolerance.version>
-        <smallrye-jwt.version>2.0.9</smallrye-jwt.version>
+        <smallrye-jwt.version>2.0.10</smallrye-jwt.version>
         <smallrye-context-propagation.version>1.0.11</smallrye-context-propagation.version>
         <smallrye-reactive-streams-operators.version>1.0.10</smallrye-reactive-streams-operators.version>
         <smallrye-converter-api.version>1.0.10</smallrye-converter-api.version>

extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcJsonWebTokenProducer.java

@@ -1,7 +1,5 @@
 package io.quarkus.oidc.runtime;
 
-import java.util.Set;
-
 import javax.annotation.Priority;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Alternative;
@@ -16,6 +14,7 @@
 import io.quarkus.oidc.IdToken;
 import io.quarkus.security.credential.TokenCredential;
 import io.quarkus.security.identity.SecurityIdentity;
+import io.smallrye.jwt.auth.cdi.NullJsonWebToken;
 
 @Priority(2)
 @Alternative
@@ -78,22 +77,4 @@ private JsonWebToken getTokenCredential(Class<? extends TokenCredential> type) {
         }
         throw new IllegalStateException("Current identity not associated with an access token");
     }
-
-    private static class NullJsonWebToken implements JsonWebToken {
-
-        @Override
-        public String getName() {
-            return null;
-        }
-
-        @Override
-        public Set<String> getClaimNames() {
-            return null;
-        }
-
-        @Override
-        public <T> T getClaim(String claimName) {
-            return null;
-        }
-    }
 }

extensions/smallrye-jwt/runtime/src/main/java/io/quarkus/smallrye/jwt/runtime/auth/JwtPrincipalProducer.java

@@ -1,7 +1,5 @@
 package io.quarkus.smallrye.jwt.runtime.auth;
 
-import java.util.Set;
-
 import javax.annotation.Priority;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Alternative;
@@ -11,6 +9,7 @@
 import org.eclipse.microprofile.jwt.JsonWebToken;
 
 import io.quarkus.security.identity.SecurityIdentity;
+import io.smallrye.jwt.auth.cdi.NullJsonWebToken;
 
 @Priority(1)
 @Alternative
@@ -36,22 +35,4 @@ JsonWebToken currentJWTPrincipalOrNull() {
         }
         throw new IllegalStateException("Current principal " + identity.getPrincipal() + " is not a JSON web token");
     }
-
-    private static class NullJsonWebToken implements JsonWebToken {
-
-        @Override
-        public String getName() {
-            return null;
-        }
-
-        @Override
-        public Set<String> getClaimNames() {
-            return null;
-        }
-
-        @Override
-        public <T> T getClaim(String claimName) {
-            return null;
-        }
-    }
 }