[Fix #1121] Ensuring service priority order

fjtirado · fjtirado · commit 40af63710b6c · 2026-01-27T13:33:49.000+01:00
Signed-off-by: fjtirado &lt;ftirados@redhat.com&gt;
diff --git a/impl/core/pom.xml b/impl/core/pom.xml
@@ -33,5 +33,10 @@
             <artifactId>junit-jupiter-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/FunctionReader.java b/impl/core/src/main/java/io/serverlessworkflow/impl/FunctionReader.java
@@ -19,4 +19,4 @@
 import io.serverlessworkflow.impl.resources.ExternalResourceHandler;
 import java.util.function.Function;
 
-public interface FunctionReader extends Function<ExternalResourceHandler, Task> {}
+public interface FunctionReader extends Function<ExternalResourceHandler, Task>, ServicePriority {}
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowApplication.java
@@ -15,6 +15,7 @@
  */
 package io.serverlessworkflow.impl;
 
+import static io.serverlessworkflow.impl.WorkflowUtils.loadFirst;
 import static io.serverlessworkflow.impl.WorkflowUtils.safeClose;
 
 import io.serverlessworkflow.api.types.SchemaInline;
@@ -305,8 +306,7 @@ public Builder withDefaultCatalogURI(URI defaultCatalogURI) {
     public WorkflowApplication build() {
       if (modelFactory == null) {
         modelFactory =
-            ServiceLoader.load(WorkflowModelFactory.class)
-                .findFirst()
+            loadFirst(WorkflowModelFactory.class)
                 .orElseThrow(
                     () ->
                         new IllegalStateException(
@@ -318,21 +318,17 @@ public WorkflowApplication build() {
       ServiceLoader.load(ExpressionFactory.class).forEach(exprFactories::add);
       if (schemaValidatorFactory == null) {
         schemaValidatorFactory =
-            ServiceLoader.load(SchemaValidatorFactory.class)
-                .findFirst()
+            loadFirst(SchemaValidatorFactory.class)
                 .orElseGet(() -> EmptySchemaValidatorHolder.instance);
       }
       if (taskFactory == null) {
         taskFactory =
-            ServiceLoader.load(TaskExecutorFactory.class)
-                .findFirst()
-                .orElseGet(() -> DefaultTaskExecutorFactory.get());
+            loadFirst(TaskExecutorFactory.class).orElseGet(() -> DefaultTaskExecutorFactory.get());
       }
       ServiceLoader.load(EventPublisher.class).forEach(e -> eventPublishers.add(e));
       if (eventConsumer == null) {
         eventConsumer =
-            ServiceLoader.load(EventConsumer.class)
-                .findFirst()
+            loadFirst(EventConsumer.class)
                 .orElseGet(
                     () -> {
                       InMemoryEvents inMemory = new InMemoryEvents(executorFactory);
@@ -353,18 +349,14 @@ public WorkflowApplication build() {
 
       if (configManager == null) {
         configManager =
-            ServiceLoader.load(ConfigManager.class)
-                .findFirst()
-                .orElseGet(() -> new SystemPropertyConfigManager());
+            loadFirst(ConfigManager.class).orElseGet(() -> new SystemPropertyConfigManager());
       }
       if (secretManager == null) {
         secretManager =
-            ServiceLoader.load(SecretManager.class)
-                .findFirst()
-                .orElseGet(() -> new ConfigSecretManager(configManager));
+            loadFirst(SecretManager.class).orElseGet(() -> new ConfigSecretManager(configManager));
       }
-      templateResolver = ServiceLoader.load(URITemplateResolver.class).findFirst();
-      functionReader = ServiceLoader.load(FunctionReader.class).findFirst();
+      templateResolver = loadFirst(URITemplateResolver.class);
+      functionReader = loadFirst(FunctionReader.class);
       if (defaultCatalogURI == null) {
         defaultCatalogURI = URI.create("https://github.com/serverlessworkflow/catalog");
       }
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java b/impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowUtils.java
@@ -39,6 +39,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.ServiceLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -304,4 +305,11 @@ public static WorkflowValueResolver<URI> getURISupplier(
     }
     throw new IllegalArgumentException("Invalid uritemplate definition " + template);
   }
+
+  public static <T extends ServicePriority> Optional<T> loadFirst(Class<T> serviceClass) {
+    return ServiceLoader.load(serviceClass).stream()
+        .map(ServiceLoader.Provider::get)
+        .sorted()
+        .findFirst();
+  }
 }
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/auth/AccessTokenProviderFactory.java b/impl/core/src/main/java/io/serverlessworkflow/impl/auth/AccessTokenProviderFactory.java
@@ -15,9 +15,10 @@
  */
 package io.serverlessworkflow.impl.auth;
 
+import io.serverlessworkflow.impl.ServicePriority;
 import java.util.List;
 
-public interface AccessTokenProviderFactory {
+public interface AccessTokenProviderFactory extends ServicePriority {
 
   AccessTokenProvider build(
       HttpRequestInfo requestInfo, List<String> issuers, JWTConverter converter);
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/auth/CommonOAuthProvider.java b/impl/core/src/main/java/io/serverlessworkflow/impl/auth/CommonOAuthProvider.java
@@ -16,6 +16,7 @@
 package io.serverlessworkflow.impl.auth;
 
 import static io.serverlessworkflow.impl.WorkflowUtils.checkSecret;
+import static io.serverlessworkflow.impl.WorkflowUtils.loadFirst;
 import static io.serverlessworkflow.impl.WorkflowUtils.secret;
 
 import io.serverlessworkflow.api.types.OAuth2AuthenticationData;
@@ -28,20 +29,17 @@
 import java.net.URI;
 import java.util.Arrays;
 import java.util.Map;
-import java.util.ServiceLoader;
 
 abstract class CommonOAuthProvider implements AuthProvider {
 
   private final WorkflowValueResolver<AccessTokenProvider> tokenProvider;
 
   private static JWTConverter jwtConverter =
-      ServiceLoader.load(JWTConverter.class)
-          .findFirst()
+      loadFirst(JWTConverter.class)
           .orElseThrow(() -> new IllegalStateException("No JWTConverter implementation found"));
 
   private static AccessTokenProviderFactory accessTokenProviderFactory =
-      ServiceLoader.load(AccessTokenProviderFactory.class)
-          .findFirst()
+      loadFirst(AccessTokenProviderFactory.class)
           .orElseThrow(() -> new IllegalStateException("No JWTConverter implementation found"));
 
   protected CommonOAuthProvider(WorkflowValueResolver<AccessTokenProvider> tokenProvider) {
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/auth/JWTConverter.java b/impl/core/src/main/java/io/serverlessworkflow/impl/auth/JWTConverter.java
@@ -15,7 +15,9 @@
  */
 package io.serverlessworkflow.impl.auth;
 
-public interface JWTConverter {
+import io.serverlessworkflow.impl.ServicePriority;
+
+public interface JWTConverter extends ServicePriority {
 
   /**
    * Converts a JWT token string into a JWT object.
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/events/EventConsumer.java b/impl/core/src/main/java/io/serverlessworkflow/impl/events/EventConsumer.java
@@ -17,12 +17,13 @@
 
 import io.cloudevents.CloudEvent;
 import io.serverlessworkflow.api.types.EventFilter;
+import io.serverlessworkflow.impl.ServicePriority;
 import io.serverlessworkflow.impl.WorkflowApplication;
 import java.util.Collection;
 import java.util.function.Consumer;
 
 public interface EventConsumer<T extends EventRegistration, V extends EventRegistrationBuilder>
-    extends AutoCloseable {
+    extends AutoCloseable, ServicePriority {
 
   V listen(EventFilter filter, WorkflowApplication workflowApplication);
 
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunScriptExecutorBuilder.java b/impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunScriptExecutorBuilder.java
@@ -68,6 +68,7 @@ public CallableTask build(RunScript taskConfiguration, WorkflowDefinition defini
         ServiceLoader.load(ScriptRunner.class).stream()
             .map(ServiceLoader.Provider::get)
             .filter(s -> s.identifier().equals(language))
+            .sorted()
             .findFirst()
             .orElseThrow(
                 () ->
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunTaskExecutor.java b/impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunTaskExecutor.java
@@ -44,6 +44,7 @@ protected RunTaskExecutorBuilder(
           runnables.stream()
               .map(Provider::get)
               .filter(r -> r.accept(config.getClass()))
+              .sorted()
               .findFirst()
               .map(r -> r.build(config, definition))
               .orElseThrow(
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunnableTaskBuilder.java b/impl/core/src/main/java/io/serverlessworkflow/impl/executors/RunnableTaskBuilder.java
@@ -16,9 +16,10 @@
 package io.serverlessworkflow.impl.executors;
 
 import io.serverlessworkflow.api.types.RunTaskConfiguration;
+import io.serverlessworkflow.impl.ServicePriority;
 import io.serverlessworkflow.impl.WorkflowDefinition;
 
-public interface RunnableTaskBuilder<T extends RunTaskConfiguration> {
+public interface RunnableTaskBuilder<T extends RunTaskConfiguration> extends ServicePriority {
   boolean accept(Class<? extends RunTaskConfiguration> clazz);
 
   CallableTask build(T taskConfiguration, WorkflowDefinition definition);
diff --git a/impl/core/src/main/java/io/serverlessworkflow/impl/resources/URITemplateResolver.java b/impl/core/src/main/java/io/serverlessworkflow/impl/resources/URITemplateResolver.java
@@ -15,12 +15,13 @@
  */
 package io.serverlessworkflow.impl.resources;
 
+import io.serverlessworkflow.impl.ServicePriority;
 import io.serverlessworkflow.impl.TaskContext;
 import io.serverlessworkflow.impl.WorkflowContext;
 import io.serverlessworkflow.impl.WorkflowModel;
 import java.net.URI;
 
-public interface URITemplateResolver {
+public interface URITemplateResolver extends ServicePriority {
   URI resolveTemplates(
       String uri, WorkflowContext workflowContext, TaskContext taskContext, WorkflowModel model);
 }
diff --git a/impl/core/src/test/java/io/serverlessworkflow/impl/LowestPriority.java b/impl/core/src/test/java/io/serverlessworkflow/impl/LowestPriority.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+public class LowestPriority implements ServicePriority {
+  public int priority() {
+    return DEFAULT_PRIORITY + 1;
+  }
+}
diff --git a/impl/core/src/test/java/io/serverlessworkflow/impl/MediumPriority.java b/impl/core/src/test/java/io/serverlessworkflow/impl/MediumPriority.java
@@ -0,0 +1,18 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+public class MediumPriority implements ServicePriority {}
diff --git a/impl/core/src/test/java/io/serverlessworkflow/impl/ServicePriorityTest.java b/impl/core/src/test/java/io/serverlessworkflow/impl/ServicePriorityTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+
+class ServicePriorityTest {
+
+  @Test
+  void testRightOrder() {
+    assertThat(WorkflowUtils.loadFirst(ServicePriority.class).orElseThrow())
+        .isInstanceOf(TopPriority.class);
+  }
+}
diff --git a/impl/core/src/test/java/io/serverlessworkflow/impl/TopPriority.java b/impl/core/src/test/java/io/serverlessworkflow/impl/TopPriority.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2020-Present The Serverless Workflow Specification Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.serverlessworkflow.impl;
+
+public class TopPriority implements ServicePriority {
+  public int priority() {
+    return DEFAULT_PRIORITY - 1;
+  }
+}
diff --git a/impl/core/src/test/resources/META-INF/services/io.serverlessworkflow.impl.ServicePriority b/impl/core/src/test/resources/META-INF/services/io.serverlessworkflow.impl.ServicePriority
@@ -0,0 +1,3 @@
+io.serverlessworkflow.impl.LowestPriority
+io.serverlessworkflow.impl.TopPriority
+io.serverlessworkflow.impl.MediumPriority
diff --git a/impl/jq/src/test/java/io/serverlessworkflow/impl/expressions/jq/JQExpressionFactoryTest.java b/impl/jq/src/test/java/io/serverlessworkflow/impl/expressions/jq/JQExpressionFactoryTest.java
@@ -15,6 +15,7 @@
  */
 package io.serverlessworkflow.impl.expressions.jq;
 
+import static io.serverlessworkflow.impl.WorkflowUtils.loadFirst;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import io.serverlessworkflow.impl.WorkflowContext;
@@ -26,7 +27,6 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.ServiceLoader;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
@@ -41,7 +41,7 @@ class JQExpressionFactoryTest {
   void setup() {
     workflowContext = Mockito.mock(WorkflowContext.class);
     factory = new JQExpressionFactory();
-    modelFactory = ServiceLoader.load(WorkflowModelFactory.class).findFirst().orElseThrow();
+    modelFactory = loadFirst(WorkflowModelFactory.class).orElseThrow();
   }
 
   @Test
diff --git a/impl/json-utils/src/main/java/io/serverlessworkflow/impl/jackson/ObjectMapperFactory.java b/impl/json-utils/src/main/java/io/serverlessworkflow/impl/jackson/ObjectMapperFactory.java
@@ -16,6 +16,7 @@
 package io.serverlessworkflow.impl.jackson;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.serverlessworkflow.impl.ServicePriority;
 import java.util.function.Supplier;
 
-public interface ObjectMapperFactory extends Supplier<ObjectMapper> {}
+public interface ObjectMapperFactory extends Supplier<ObjectMapper>, ServicePriority {}
diff --git a/impl/json-utils/src/main/java/io/serverlessworkflow/impl/jackson/ObjectMapperFactoryProvider.java b/impl/json-utils/src/main/java/io/serverlessworkflow/impl/jackson/ObjectMapperFactoryProvider.java
@@ -15,9 +15,10 @@
  */
 package io.serverlessworkflow.impl.jackson;
 
+import static io.serverlessworkflow.impl.WorkflowUtils.loadFirst;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.Objects;
-import java.util.ServiceLoader;
 import java.util.function.Supplier;
 
 public class ObjectMapperFactoryProvider implements Supplier<ObjectMapperFactory> {
@@ -40,8 +41,7 @@ public void setFactory(ObjectMapperFactory objectMapperFactory) {
   public ObjectMapperFactory get() {
     return objectMapperFactory != null
         ? objectMapperFactory
-        : ServiceLoader.load(ObjectMapperFactory.class)
-            .findFirst()
+        : loadFirst(ObjectMapperFactory.class)
             .orElseGet(() -> () -> new ObjectMapper().findAndRegisterModules());
   }
 }
diff --git a/impl/persistence/api/src/main/java/io/serverlessworkflow/impl/marshaller/CustomObjectMarshaller.java b/impl/persistence/api/src/main/java/io/serverlessworkflow/impl/marshaller/CustomObjectMarshaller.java
@@ -15,7 +15,9 @@
  */
 package io.serverlessworkflow.impl.marshaller;
 
-public interface CustomObjectMarshaller<T> {
+import io.serverlessworkflow.impl.ServicePriority;
+
+public interface CustomObjectMarshaller<T> extends ServicePriority {
   void write(WorkflowOutputBuffer buffer, T object);
 
   T read(WorkflowInputBuffer buffer);

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@`
`39`	`39`	`import java.util.Map;`
`40`	`40`	`import java.util.Objects;`
`41`	`41`	`import java.util.Optional;`
	`42`	`+import java.util.ServiceLoader;`
`42`	`43`	`import org.slf4j.Logger;`
`43`	`44`	`import org.slf4j.LoggerFactory;`
`44`	`45`
`@@ -304,4 +305,11 @@ public static WorkflowValueResolver<URI> getURISupplier(`
`304`	`305`	`}`
`305`	`306`	`throw new IllegalArgumentException("Invalid uritemplate definition " + template);`
`306`	`307`	`}`
	`308`	`+`
	`309`	`+ public static <T extends ServicePriority> Optional<T> loadFirst(Class<T> serviceClass) {`
	`310`	`+ return ServiceLoader.load(serviceClass).stream()`
	`311`	`+ .map(ServiceLoader.Provider::get)`
	`312`	`+ .sorted()`
	`313`	`+ .findFirst();`
	`314`	`+ }`
`307`	`315`	`}`