[Fix #805] WorkflowDefinitionId should be public

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

Author: fjtirado

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

@@ -16,7 +16,6 @@
 package io.serverlessworkflow.impl;
 
 import com.github.f4b6a3.ulid.UlidCreator;
-import io.serverlessworkflow.api.types.Document;
 import io.serverlessworkflow.api.types.SchemaInline;
 import io.serverlessworkflow.api.types.Workflow;
 import io.serverlessworkflow.impl.events.EventConsumer;
@@ -36,6 +35,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
+import java.util.Optional;
 import java.util.ServiceLoader;
 import java.util.ServiceLoader.Provider;
 import java.util.concurrent.ConcurrentHashMap;
@@ -52,9 +52,9 @@ public class WorkflowApplication implements AutoCloseable {
   private final ExpressionFactory exprFactory;
   private final ResourceLoaderFactory resourceLoaderFactory;
   private final SchemaValidatorFactory schemaValidatorFactory;
-  private final WorkflowIdFactory idFactory;
+  private final WorkflowInstanceIdFactory idFactory;
   private final Collection<WorkflowExecutionListener> listeners;
-  private final Map<WorkflowId, WorkflowDefinition> definitions;
+  private final Map<WorkflowDefinitionId, WorkflowDefinition> definitions;
   private final WorkflowPositionFactory positionFactory;
   private final ExecutorServiceFactory executorFactory;
   private final RuntimeDescriptorFactory runtimeDescriptorFactory;
@@ -106,7 +106,7 @@ public Collection<EventPublisher> eventPublishers() {
     return eventPublishers;
   }
 
-  public WorkflowIdFactory idFactory() {
+  public WorkflowInstanceIdFactory idFactory() {
     return idFactory;
   }
 
@@ -142,7 +142,7 @@ public SchemaValidator getValidator(SchemaInline inline) {
     private ResourceLoaderFactory resourceLoaderFactory = DefaultResourceLoaderFactory.get();
     private SchemaValidatorFactory schemaValidatorFactory;
     private WorkflowPositionFactory positionFactory = () -> new QueueWorkflowPosition();
-    private WorkflowIdFactory idFactory = () -> UlidCreator.getMonotonicUlid().toString();
+    private WorkflowInstanceIdFactory idFactory = () -> UlidCreator.getMonotonicUlid().toString();
     private ExecutorServiceFactory executorFactory = new DefaultExecutorServiceFactory();
     private EventConsumer<?, ?> eventConsumer;
     private Collection<EventPublisher> eventPublishers = new ArrayList<>();
@@ -192,7 +192,7 @@ public Builder withSchemaValidatorFactory(SchemaValidatorFactory factory) {
       return this;
     }
 
-    public Builder withIdFactory(WorkflowIdFactory factory) {
+    public Builder withIdFactory(WorkflowInstanceIdFactory factory) {
       this.idFactory = factory;
       return this;
     }
@@ -249,15 +249,13 @@ public WorkflowApplication build() {
     }
   }
 
-  private static record WorkflowId(String namespace, String name, String version) {
-    static WorkflowId of(Document document) {
-      return new WorkflowId(document.getNamespace(), document.getName(), document.getVersion());
-    }
+  public Optional<WorkflowDefinition> workflowDefinition(WorkflowDefinitionId workflowId) {
+    return Optional.ofNullable(definitions.get(workflowId));
   }
 
   public WorkflowDefinition workflowDefinition(Workflow workflow) {
     return definitions.computeIfAbsent(
-        WorkflowId.of(workflow.getDocument()), k -> WorkflowDefinition.of(this, workflow));
+        WorkflowDefinitionId.of(workflow), k -> WorkflowDefinition.of(this, workflow));
   }
 
   @Override

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

@@ -0,0 +1,35 @@
+/*
+ * 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 io.serverlessworkflow.api.types.Document;
+import io.serverlessworkflow.api.types.Workflow;
+
+record WorkflowDefinitionId(String namespace, String name, String version) {
+
+  public static final String DEFAULT_VERSION = "0.0.1";
+  public static final String DEFAULT_NAMESPACE = "org.acme";
+
+  public static WorkflowDefinitionId of(Workflow workflow) {
+    Document document = workflow.getDocument();
+    return new WorkflowDefinitionId(
+        document.getNamespace(), document.getName(), document.getVersion());
+  }
+
+  public static WorkflowDefinitionId fromName(String name) {
+    return new WorkflowDefinitionId(DEFAULT_NAMESPACE, name, DEFAULT_VERSION);
+  }
+}

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowIdFactory.java renamed to impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowInstanceIdFactory.java

@@ -18,4 +18,4 @@
 import java.util.function.Supplier;
 
 @FunctionalInterface
-public interface WorkflowIdFactory extends Supplier<String> {}
+public interface WorkflowInstanceIdFactory extends Supplier<String> {}