[Fix #737] Adding test module

Signed-off-by: fjtirado <[email protected]>

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java

@@ -141,8 +141,8 @@ public SchemaValidator getValidator(SchemaInline inline) {
     private WorkflowPositionFactory positionFactory = () -> new QueueWorkflowPosition();
     private WorkflowIdFactory idFactory = () -> UlidCreator.getMonotonicUlid().toString();
     private ExecutorServiceFactory executorFactory = new DefaultExecutorServiceFactory();
-    private EventConsumer<?, ?> eventConsumer = InMemoryEvents.get();
-    private EventPublisher eventPublisher = InMemoryEvents.get();
+    private EventConsumer<?, ?> eventConsumer;
+    private EventPublisher eventPublisher;
     private RuntimeDescriptorFactory descriptorFactory =
         () -> new RuntimeDescriptor("reference impl", "1.0.0_alpha", Collections.emptyMap());
 
@@ -193,12 +193,9 @@ public Builder withDescriptorFactory(RuntimeDescriptorFactory factory) {
       return this;
     }
 
-    public Builder withEventConsumer(EventConsumer<?, ?> eventConsumer) {
+    public Builder withEventHandler(
+        EventPublisher eventPublisher, EventConsumer<?, ?> eventConsumer) {
       this.eventConsumer = eventConsumer;
-      return this;
-    }
-
-    public Builder withEventPublisher(EventPublisher eventPublisher) {
       this.eventPublisher = eventPublisher;
       return this;
     }
@@ -222,6 +219,11 @@ public WorkflowApplication build() {
                 .findFirst()
                 .orElseGet(() -> DefaultTaskExecutorFactory.get());
       }
+      if (eventConsumer == null && eventPublisher == null) {
+        InMemoryEvents inMemory = new InMemoryEvents(executorFactory);
+        eventPublisher = inMemory;
+        eventConsumer = inMemory;
+      }
       return new WorkflowApplication(this);
     }
   }

impl/core/src/main/java/io/serverlessworkflow/impl/events/InMemoryEvents.java

@@ -16,7 +16,6 @@
 package io.serverlessworkflow.impl.events;
 
 import io.cloudevents.CloudEvent;
-import io.serverlessworkflow.impl.DefaultExecutorServiceFactory;
 import io.serverlessworkflow.impl.ExecutorServiceFactory;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
@@ -30,15 +29,11 @@
  */
 public class InMemoryEvents extends AbstractTypeConsumer implements EventPublisher {
 
-  private static InMemoryEvents instance = new InMemoryEvents();
-
-  private InMemoryEvents() {}
-
-  public static InMemoryEvents get() {
-    return instance;
+  public InMemoryEvents(ExecutorServiceFactory serviceFactory) {
+    this.serviceFactory = serviceFactory;
   }
 
-  private ExecutorServiceFactory serviceFactory = new DefaultExecutorServiceFactory();
+  private ExecutorServiceFactory serviceFactory;
 
   private Map<String, Consumer<CloudEvent>> topicMap = new ConcurrentHashMap<>();
 

impl/http/pom.xml

@@ -16,58 +16,5 @@
            <groupId>io.serverlessworkflow</groupId>
            <artifactId>serverlessworkflow-impl-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-jwt</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>org.glassfish.jersey.media</groupId>
-          <artifactId>jersey-media-json-jackson</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish.jersey.core</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-impl-jackson</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.serverlessworkflow</groupId>
-            <artifactId>serverlessworkflow-impl-jackson-jwt</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-        </dependency>
-        <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>

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

@@ -18,11 +18,11 @@
 import io.serverlessworkflow.api.types.OAuth2AuthenticationPolicy;
 import io.serverlessworkflow.api.types.Oauth2;
 import io.serverlessworkflow.api.types.Workflow;
-import io.serverlessworkflow.http.jwt.JWT;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
+import io.serverlessworkflow.impl.executors.http.oauth.JWT;
 import io.serverlessworkflow.impl.executors.http.oauth.OAuthRequestBuilder;
 import jakarta.ws.rs.client.Invocation;
 import jakarta.ws.rs.client.Invocation.Builder;
@@ -54,11 +54,7 @@ public void preRequest(
       Invocation.Builder builder, WorkflowContext workflow, TaskContext task, WorkflowModel model) {
     JWT jwt = requestBuilder.build(workflow, task, model).validateAndGet();
     String type =
-        jwt.claim("typ", String.class)
-            .map(String::trim)
-            .filter(t -> !t.isEmpty())
-            .orElseThrow(() -> new IllegalStateException("Token type is not present"));
-
+        jwt.type().orElseThrow(() -> new IllegalStateException("Token type is not present"));
     builder.header(
         AuthProviderFactory.AUTH_HEADER_NAME, String.format(BEARER_TOKEN, type, jwt.token()));
   }

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

@@ -15,8 +15,6 @@
  */
 package io.serverlessworkflow.impl.executors.http.oauth;
 
-import io.serverlessworkflow.http.jwt.JWT;
-import io.serverlessworkflow.http.jwt.JWTConverter;
 import io.serverlessworkflow.impl.TaskContext;
 import java.util.List;
 import java.util.Map;

impl/jwt/src/main/java/io/serverlessworkflow/http/jwt/JWT.java renamed to impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/JWT.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.http.jwt;
+package io.serverlessworkflow.impl.executors.http.oauth;
 
 import java.time.Instant;
 import java.util.List;

impl/jwt/src/main/java/io/serverlessworkflow/http/jwt/JWTConverter.java renamed to impl/http/src/main/java/io/serverlessworkflow/impl/executors/http/oauth/JWTConverter.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.http.jwt;
+package io.serverlessworkflow.impl.executors.http.oauth;
 
 public interface JWTConverter {
 

impl/jackson/pom.xml

@@ -28,34 +28,5 @@
             <groupId>net.thisptr</groupId>
             <artifactId>jackson-jq</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-          <scope>test</scope>
-        </dependency>
-        <dependency>
-          <groupId>org.mockito</groupId>
-          <artifactId>mockito-core</artifactId>
-        </dependency>
     </dependencies>
 </project>

impl/jackson/src/main/java/io/serverlessworkflow/impl/expressions/jq/JacksonModelFactory.java

@@ -27,8 +27,8 @@
 import io.serverlessworkflow.impl.WorkflowModel;
 import io.serverlessworkflow.impl.WorkflowModelCollection;
 import io.serverlessworkflow.impl.WorkflowModelFactory;
-import io.serverlessworkflow.impl.events.json.JacksonCloudEventUtils;
 import io.serverlessworkflow.impl.jackson.JsonUtils;
+import io.serverlessworkflow.impl.jackson.events.JacksonCloudEventUtils;
 import java.math.BigDecimal;
 import java.time.OffsetDateTime;
 import java.util.Map;

impl/jackson/src/main/java/io/serverlessworkflow/impl/events/json/JacksonCloudEventUtils.java renamed to impl/jackson/src/main/java/io/serverlessworkflow/impl/jackson/events/JacksonCloudEventUtils.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.serverlessworkflow.impl.events.json;
+package io.serverlessworkflow.impl.jackson.events;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.NullNode;