post review

Signed-off-by: Dmitrii Tikhomirov <[email protected]>

Author: treblereel

impl/http/pom.xml

@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-impl-jwt</artifactId>
+            <artifactId>serverlessworkflow-impl-jackson-jwt</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/OAuth2AuthProvider.java

@@ -29,18 +29,15 @@
 
 public class OAuth2AuthProvider implements AuthProvider {
 
-  private Oauth2 oauth2;
-
-  private final WorkflowApplication workflowApplication;
+  private OAuthRequestBuilder requestBuilder;
 
   private static final String BEARER_TOKEN = "%s %s";
 
   public OAuth2AuthProvider(
       WorkflowApplication application, Workflow workflow, OAuth2AuthenticationPolicy authPolicy) {
-    this.workflowApplication = application;
     Oauth2 oauth2 = authPolicy.getOauth2();
     if (oauth2.getOAuth2ConnectAuthenticationProperties() != null) {
-      this.oauth2 = oauth2;
+      this.requestBuilder = new OAuthRequestBuilder(application, oauth2);
     } else if (oauth2.getOAuth2AuthenticationPolicySecret() != null) {
       throw new UnsupportedOperationException("Secrets are still not supported");
     }
@@ -55,11 +52,7 @@ public Builder build(
   @Override
   public void preRequest(
       Invocation.Builder builder, WorkflowContext workflow, TaskContext task, WorkflowModel model) {
-    JWT token =
-        new OAuthRequestBuilder(workflowApplication, oauth2)
-            .build(workflow, task, model)
-            .validateAndGet();
-
+    JWT token = requestBuilder.build(workflow, task, model).validateAndGet();
     String tokenType = (String) token.getClaim("typ");
     builder.header(
         AuthProviderFactory.AUTH_HEADER_NAME,

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/AccessTokenProvider.java

@@ -38,14 +38,10 @@ public class AccessTokenProvider {
     this.issuers = issuers;
     this.context = context;
 
-    ServiceLoader<JWTConverter> jwtConverters =
-        ServiceLoader.load(JWTConverter.class, AccessTokenProvider.class.getClassLoader());
-
-    if (jwtConverters.iterator().hasNext()) {
-      this.jwtConverter = jwtConverters.iterator().next();
-    } else {
-      throw new RuntimeException("No JWTConverter implementation found");
-    }
+    this.jwtConverter =
+        ServiceLoader.load(JWTConverter.class)
+            .findFirst()
+            .orElseThrow(() -> new IllegalStateException("No JWTConverter implementation found"));
   }
 
   public JWT validateAndGet() {
@@ -54,12 +50,12 @@ public JWT validateAndGet() {
     try {
       jwt = jwtConverter.fromToken((String) token.get("access_token"));
     } catch (IllegalArgumentException e) {
-      throw new RuntimeException("Failed to parse JWT token: " + e.getMessage(), e);
+      throw new IllegalStateException("Failed to parse JWT token: " + e.getMessage(), e);
     }
     if (!(issuers == null || issuers.isEmpty())) {
       String tokenIssuer = (String) jwt.getClaim("iss");
       if (tokenIssuer == null || tokenIssuer.isEmpty() || !issuers.contains(tokenIssuer)) {
-        throw new RuntimeException("Token issuer is not valid: " + tokenIssuer);
+        throw new IllegalStateException("Token issuer is not valid: " + tokenIssuer);
       }
     }
     return jwt;

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/HttpRequestBuilder.java

@@ -39,6 +39,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 class HttpRequestBuilder {
 
@@ -137,12 +138,7 @@ InvocationHolder build(WorkflowContext workflow, TaskContext task, WorkflowModel
   }
 
   private void validate() {
-    if (uri == null) {
-      throw new IllegalStateException("URI must be set before building the request");
-    }
-
-    if (grantType == null) {
-      throw new IllegalStateException("Grant type must be set before building the request");
-    }
+    Objects.requireNonNull(uri, "URI must be set before building the request");
+    Objects.requireNonNull(grantType, "Grant type must be set before building the request");
   }
 }

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/InvocationHolder.java

@@ -18,9 +18,11 @@
 
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.core.Response;
+import java.io.Closeable;
+import java.util.concurrent.Callable;
 import java.util.function.Supplier;
 
-class InvocationHolder {
+class InvocationHolder implements Callable<Response>, Closeable {
 
   private final Client client;
   private final Supplier<Response> call;
@@ -30,11 +32,11 @@ class InvocationHolder {
     this.call = call;
   }
 
-  Response invoke() {
+  public Response call() {
     return call.get();
   }
 
-  void close() {
+  public void close() {
     if (client != null) {
       client.close();
     }

impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/TokenResponseHandler.java

@@ -30,7 +30,7 @@ public class TokenResponseHandler
 
   @Override
   public Map<String, Object> apply(InvocationHolder invocation, TaskContext context) {
-    try (Response response = invocation.invoke()) {
+    try (Response response = invocation.call()) {
       if (response.getStatus() < 200 || response.getStatus() >= 300) {
         throw new WorkflowException(
             WorkflowError.communication(

impl/jwt-impl/pom.xml

@@ -9,7 +9,7 @@
         <version>8.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>serverlessworkflow-impl-jwt</artifactId>
+    <artifactId>serverlessworkflow-impl-jackson-jwt</artifactId>
     <name>Serverless Workflow :: Impl :: JWT</name>
 
     <dependencies>

impl/jwt-impl/src/main/java/io/serverlessworkflow/impl/http/jwt/DefaultJWTConverter.java renamed to impl/jwt-impl/src/main/java/io/serverlessworkflow/impl/http/jwt/JacksonJWTConverter.java

@@ -24,7 +24,7 @@
 import java.util.Base64;
 import java.util.Map;
 
-public class DefaultJWTConverter implements JWTConverter {
+public class JacksonJWTConverter implements JWTConverter {
 
   private static final ObjectMapper MAPPER = new ObjectMapper();
 
@@ -37,7 +37,7 @@ public JWT fromToken(String token) throws IllegalArgumentException {
     try {
       String payloadJson =
           new String(Base64.getUrlDecoder().decode(parts[1]), StandardCharsets.UTF_8);
-      return new DefaultJWTImpl(token, MAPPER.readValue(payloadJson, Map.class));
+      return new JacksonJWTImpl(token, MAPPER.readValue(payloadJson, Map.class));
     } catch (JsonProcessingException e) {
       throw new IllegalArgumentException("Failed to parse JWT token payload: " + e.getMessage(), e);
     }

impl/jwt-impl/src/main/java/io/serverlessworkflow/impl/http/jwt/DefaultJWTImpl.java renamed to impl/jwt-impl/src/main/java/io/serverlessworkflow/impl/http/jwt/JacksonJWTImpl.java

@@ -19,12 +19,12 @@
 import io.serverlessworkflow.http.jwt.JWT;
 import java.util.Map;
 
-public class DefaultJWTImpl implements JWT {
+public class JacksonJWTImpl implements JWT {
 
   private final Map<String, Object> claims;
   private final String token;
 
-  DefaultJWTImpl(String token, Map<String, Object> claims) {
+  JacksonJWTImpl(String token, Map<String, Object> claims) {
     this.token = token;
     this.claims = claims;
   }

impl/jwt-impl/src/main/resources/META-INF/services/io.serverlessworkflow.http.jwt.JWTConverter

@@ -1 +1 @@
-io.serverlessworkflow.impl.http.jwt.DefaultJWTConverter
+io.serverlessworkflow.impl.http.jwt.JacksonJWTConverter