From f0ddaf7694211d7258146770a357a323f8b3aafd Mon Sep 17 00:00:00 2001 From: 0264408 Date: Sun, 20 Sep 2026 11:18:10 +0800 Subject: [PATCH] refactor: split public types into definition, runtime, and spi packages Keep Maven modules unchanged. Hosts import models and SPIs from the new packages; OrdoEngine stays at com.jetlumen.ordo.api. Co-authored-by: Cursor --- .../com/jetlumen/ordo/api/OrdoEngine.java | 6 ++ .../api/{ => definition}/ApprovalPolicy.java | 4 +- .../api/{ => definition}/ApprovalStep.java | 4 +- .../ordo/api/{ => definition}/DueThen.java | 2 +- .../api/{ => definition}/ParallelBranch.java | 3 +- .../{ => definition}/ParallelMembership.java | 2 +- .../{ => definition}/ProcessDefinition.java | 3 +- .../ProcessDefinitionParser.java | 3 +- .../{ => definition}/RoutingPredicate.java | 4 +- .../api/{ => definition}/RoutingWhen.java | 5 +- .../ordo/api/{ => definition}/StepDue.java | 3 +- .../ordo/api/{ => definition}/StepKind.java | 2 +- .../api/{ => definition}/StepTransition.java | 4 +- .../ordo/api/query/InstanceQuery.java | 2 +- .../jetlumen/ordo/api/query/TaskQuery.java | 2 +- .../repository/ActionExecutionRepository.java | 4 +- .../repository/ApprovalTaskRepository.java | 2 +- .../repository/InstanceTokenRepository.java | 2 +- .../ProcessDefinitionRepository.java | 2 +- .../repository/ProcessHistoryRepository.java | 2 +- .../repository/ProcessInstanceRepository.java | 2 +- .../api/{ => runtime}/ActionExecution.java | 3 +- .../{ => runtime}/ActionExecutionStatus.java | 2 +- .../ordo/api/{ => runtime}/ApprovalTask.java | 2 +- .../ordo/api/{ => runtime}/InstanceToken.java | 4 +- .../api/{ => runtime}/ProcessContext.java | 2 +- .../ordo/api/{ => runtime}/ProcessEvent.java | 3 +- .../api/{ => runtime}/ProcessEventType.java | 2 +- .../api/{ => runtime}/ProcessInstance.java | 2 +- .../api/{ => runtime}/ProcessRuntime.java | 3 +- .../ordo/api/{ => runtime}/ProcessStatus.java | 2 +- .../ordo/api/{ => runtime}/TaskAction.java | 3 +- .../ordo/api/{ => runtime}/TaskStatus.java | 2 +- .../ordo/api/{ => runtime}/TokenStatus.java | 2 +- .../ordo/api/{ => spi}/ActionHandler.java | 4 +- .../ordo/api/{ => spi}/AssigneeResolver.java | 5 +- .../ordo/api/{ => spi}/NamedAction.java | 3 +- .../ordo/api/{ => spi}/NamedCondition.java | 3 +- .../ordo/api/{ => spi}/OrdoCatalog.java | 3 +- .../ordo/api/{ => spi}/OrdoEventListener.java | 4 +- .../ordo/api/{ => spi}/RoutingCondition.java | 3 +- .../jetlumen/ordo/api/{ => util}/Jsons.java | 2 +- .../jetlumen/ordo/api/{ => util}/Texts.java | 2 +- .../ordo/api/ProcessDefinitionParserTest.java | 7 +++ .../ordo/api/ProcessDefinitionTest.java | 8 +++ .../jetlumen/ordo/api/RoutingWhenTest.java | 1 + .../ordo/api/query/QueryTypesTest.java | 2 +- .../jetlumen/ordo/core/DefaultOrdoEngine.java | 56 ++++++++++--------- .../ordo/core/InMemoryOrdoEngine.java | 20 +++---- .../InMemoryActionExecutionRepository.java | 4 +- .../InMemoryApprovalTaskRepository.java | 6 +- .../InMemoryInstanceTokenRepository.java | 4 +- .../InMemoryProcessDefinitionRepository.java | 2 +- .../InMemoryProcessHistoryRepository.java | 2 +- .../InMemoryProcessInstanceRepository.java | 4 +- .../RoutingPredicateEvaluator.java | 18 +++--- .../core/spi/DispatchingActionHandler.java | 6 +- .../core/spi/DispatchingRoutingCondition.java | 6 +- .../jetlumen/ordo/core/spi/NamedHandlers.java | 2 +- .../ordo/core/spi/RegistryOrdoCatalog.java | 6 +- .../ordo/core/InMemoryOrdoEngineTest.java | 40 ++++++------- .../core/RoutingPredicateEvaluatorTest.java | 5 +- .../InMemoryApprovalTaskRepositoryTest.java | 10 ++-- ...MemoryProcessDefinitionRepositoryTest.java | 4 +- ...InMemoryProcessInstanceRepositoryTest.java | 6 +- .../core/spi/DispatchingHandlersTest.java | 8 +-- .../ordo/example/LeaveRequestExample.java | 6 +- .../{jdbc => }/OrdoDefinitionLoader.java | 6 +- .../ordo/spring/{jdbc => }/OrdoDuePoller.java | 2 +- .../jdbc/OrdoJdbcAutoConfiguration.java | 14 +++-- .../ordo/spring/rest/DefinitionJson.java | 6 +- .../spring/rest/OrdoCatalogController.java | 2 +- .../spring/rest/OrdoDefinitionController.java | 4 +- .../spring/rest/OrdoInstanceController.java | 12 ++-- .../rest/OrdoRestAutoConfiguration.java | 6 +- .../ordo/spring/rest/OrdoTaskController.java | 4 +- .../jdbc/OrdoJdbcAutoConfigurationTest.java | 29 +++++----- .../rest/OrdoRestAutoConfigurationTest.java | 8 +-- .../jdbc/JdbcActionExecutionRepository.java | 4 +- .../jdbc/JdbcApprovalTaskRepository.java | 2 +- .../jdbc/JdbcInstanceTokenRepository.java | 4 +- .../jdbc/JdbcProcessDefinitionRepository.java | 10 ++-- .../jdbc/JdbcProcessHistoryRepository.java | 2 +- .../jdbc/JdbcProcessInstanceRepository.java | 4 +- .../jdbc/mapper/ActionExecutionMapper.java | 4 +- .../jdbc/mapper/ApprovalStepMapper.java | 11 ++-- .../jdbc/mapper/ApprovalTaskMapper.java | 6 +- .../jdbc/mapper/ProcessContextCodec.java | 4 +- .../jdbc/mapper/ProcessEventMapper.java | 4 +- .../jdbc/mapper/ProcessInstanceMapper.java | 4 +- .../jdbc/mapper/StepTransitionMapper.java | 2 +- .../JdbcActionExecutionRepositoryTest.java | 14 ++--- .../jdbc/JdbcApprovalTaskRepositoryTest.java | 16 +++--- .../jdbc/JdbcMysqlIntegrationTest.java | 26 ++++----- .../jdbc/JdbcOrdoEngineIntegrationTest.java | 36 ++++++------ .../jdbc/JdbcPostgresIntegrationTest.java | 26 ++++----- .../JdbcProcessDefinitionRepositoryTest.java | 16 +++--- .../JdbcProcessHistoryRepositoryTest.java | 14 ++--- .../JdbcProcessInstanceRepositoryTest.java | 10 ++-- 99 files changed, 365 insertions(+), 304 deletions(-) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/ApprovalPolicy.java (87%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/ApprovalStep.java (97%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/DueThen.java (74%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/ParallelBranch.java (90%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/ParallelMembership.java (78%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/ProcessDefinition.java (99%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/ProcessDefinitionParser.java (99%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/RoutingPredicate.java (98%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/RoutingWhen.java (95%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/StepDue.java (95%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/StepKind.java (57%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => definition}/StepTransition.java (96%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ActionExecution.java (90%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ActionExecutionStatus.java (77%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ApprovalTask.java (87%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/InstanceToken.java (83%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ProcessContext.java (93%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ProcessEvent.java (90%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ProcessEventType.java (91%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ProcessInstance.java (86%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ProcessRuntime.java (93%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/ProcessStatus.java (68%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/TaskAction.java (83%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/TaskStatus.java (81%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => runtime}/TokenStatus.java (70%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => spi}/ActionHandler.java (85%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => spi}/AssigneeResolver.java (79%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => spi}/NamedAction.java (87%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => spi}/NamedCondition.java (87%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => spi}/OrdoCatalog.java (95%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => spi}/OrdoEventListener.java (76%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => spi}/RoutingCondition.java (87%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => util}/Jsons.java (91%) rename ordo-api/src/main/java/com/jetlumen/ordo/api/{ => util}/Texts.java (92%) rename ordo-core/src/main/java/com/jetlumen/ordo/core/{ => routing}/RoutingPredicateEvaluator.java (86%) rename ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/{jdbc => }/OrdoDefinitionLoader.java (93%) rename ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/{jdbc => }/OrdoDuePoller.java (98%) diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoEngine.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoEngine.java index 00741cc..d3b079e 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoEngine.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoEngine.java @@ -1,9 +1,15 @@ package com.jetlumen.ordo.api; +import com.jetlumen.ordo.api.definition.ProcessDefinition; import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.query.TaskQuery; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessInstance; import java.util.List; import java.util.Optional; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalPolicy.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ApprovalPolicy.java similarity index 87% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalPolicy.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ApprovalPolicy.java index 0dd3f82..3d44726 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalPolicy.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ApprovalPolicy.java @@ -1,4 +1,6 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; + +import com.jetlumen.ordo.api.runtime.TaskStatus; /** * Decision rule applied when an approval step has more than one candidate. diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalStep.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ApprovalStep.java similarity index 97% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalStep.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ApprovalStep.java index 66871e5..13ce86a 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalStep.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ApprovalStep.java @@ -1,9 +1,11 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; import java.util.HashSet; import java.util.List; import java.util.Objects; import java.util.Set; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.util.Texts; /** * A named step in a process definition. Approval steps have one or more candidate assignees; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/DueThen.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/DueThen.java similarity index 74% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/DueThen.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/DueThen.java index 5e63650..7a4698c 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/DueThen.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/DueThen.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; /** What happens when an approval step's due time is reached. */ public enum DueThen { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ParallelBranch.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ParallelBranch.java similarity index 90% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ParallelBranch.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ParallelBranch.java index 3195ea6..d40182b 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ParallelBranch.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ParallelBranch.java @@ -1,8 +1,9 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; import java.util.HashSet; import java.util.List; import java.util.Set; +import com.jetlumen.ordo.api.util.Texts; /** One branch inside a {@link StepKind#PARALLEL} block. The first step id is the branch start. */ public record ParallelBranch(String id, List stepIds) { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ParallelMembership.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ParallelMembership.java similarity index 78% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ParallelMembership.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ParallelMembership.java index 54c1eaa..3279829 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ParallelMembership.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ParallelMembership.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; /** Locates an inner step inside a {@link StepKind#PARALLEL} block. */ public record ParallelMembership(ApprovalStep parallel, ParallelBranch branch) { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessDefinition.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ProcessDefinition.java similarity index 99% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessDefinition.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ProcessDefinition.java index 1c4e0f7..b42c7d5 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessDefinition.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ProcessDefinition.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; import java.util.ArrayList; import java.util.Comparator; @@ -9,6 +9,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; +import com.jetlumen.ordo.api.util.Texts; /** Immutable blueprint for an approval process with explicit step transitions. */ public record ProcessDefinition(String id, int version, String name, List steps, diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessDefinitionParser.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ProcessDefinitionParser.java similarity index 99% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessDefinitionParser.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ProcessDefinitionParser.java index 40c6689..c3ef6e5 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessDefinitionParser.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/ProcessDefinitionParser.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; @@ -15,6 +15,7 @@ import java.util.List; import java.util.Locale; import java.util.Objects; import java.util.Set; +import com.jetlumen.ordo.api.util.Jsons; /** Parses a structural JSON process graph into a {@link ProcessDefinition}. */ public final class ProcessDefinitionParser { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingPredicate.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/RoutingPredicate.java similarity index 98% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingPredicate.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/RoutingPredicate.java index 8d974ab..463e7c3 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingPredicate.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/RoutingPredicate.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; @@ -11,6 +11,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Objects; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.util.Texts; /** Closed-set boolean tree evaluated against {@link ProcessContext} variables. */ public sealed interface RoutingPredicate permits RoutingPredicate.Compare, RoutingPredicate.In, diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingWhen.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/RoutingWhen.java similarity index 95% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingWhen.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/RoutingWhen.java index 9b12aca..02a928e 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingWhen.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/RoutingWhen.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; @@ -9,6 +9,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.Map; import java.util.Objects; +import com.jetlumen.ordo.api.spi.RoutingCondition; +import com.jetlumen.ordo.api.util.Jsons; +import com.jetlumen.ordo.api.util.Texts; /** * Outgoing-edge condition: either a built-in {@link RoutingPredicate} or a host diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/StepDue.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepDue.java similarity index 95% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/StepDue.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepDue.java index 65e2c40..4c207d6 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/StepDue.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepDue.java @@ -1,7 +1,8 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; import java.time.Duration; import java.util.Objects; +import com.jetlumen.ordo.api.util.Texts; /** Relative SLA on an approval step. */ public record StepDue(Duration after, DueThen then, String to, String action) { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/StepKind.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepKind.java similarity index 57% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/StepKind.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepKind.java index ae14b7d..ae9b7af 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/StepKind.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepKind.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; public enum StepKind { APPROVAL, ACTION, PARALLEL diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/StepTransition.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepTransition.java similarity index 96% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/StepTransition.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepTransition.java index 974df18..7870f0a 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/StepTransition.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/definition/StepTransition.java @@ -1,4 +1,6 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.definition; + +import com.jetlumen.ordo.api.util.Texts; /** * An outgoing edge from an approval step. When {@link #toStepId()} is {@code null}, matching this diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/query/InstanceQuery.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/query/InstanceQuery.java index 5754681..0f8ecf0 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/query/InstanceQuery.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/query/InstanceQuery.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.api.query; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import java.time.Instant; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/query/TaskQuery.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/query/TaskQuery.java index c76b520..9859c6f 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/query/TaskQuery.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/query/TaskQuery.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.api.query; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.runtime.TaskStatus; import java.time.Instant; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ActionExecutionRepository.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ActionExecutionRepository.java index ca92498..37f3692 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ActionExecutionRepository.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ActionExecutionRepository.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.api.repository; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ActionExecutionStatus; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ActionExecutionStatus; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ApprovalTaskRepository.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ApprovalTaskRepository.java index 01fffba..4657cab 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ApprovalTaskRepository.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ApprovalTaskRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.api.repository; -import com.jetlumen.ordo.api.ApprovalTask; +import com.jetlumen.ordo.api.runtime.ApprovalTask; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.query.TaskQuery; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/InstanceTokenRepository.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/InstanceTokenRepository.java index 6b4f9a8..14bd8d9 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/InstanceTokenRepository.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/InstanceTokenRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.api.repository; -import com.jetlumen.ordo.api.InstanceToken; +import com.jetlumen.ordo.api.runtime.InstanceToken; import java.util.List; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessDefinitionRepository.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessDefinitionRepository.java index 16a3eb9..b2275fe 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessDefinitionRepository.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessDefinitionRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.api.repository; -import com.jetlumen.ordo.api.ProcessDefinition; +import com.jetlumen.ordo.api.definition.ProcessDefinition; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessHistoryRepository.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessHistoryRepository.java index a59ff08..780e2b0 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessHistoryRepository.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessHistoryRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.api.repository; -import com.jetlumen.ordo.api.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessEvent; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessInstanceRepository.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessInstanceRepository.java index f7d8625..11da1b3 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessInstanceRepository.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/repository/ProcessInstanceRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.api.repository; -import com.jetlumen.ordo.api.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessInstance; import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ActionExecution.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ActionExecution.java similarity index 90% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ActionExecution.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ActionExecution.java index 5a2e22d..4c59cde 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ActionExecution.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ActionExecution.java @@ -1,7 +1,8 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; import java.time.Instant; import java.util.Objects; +import com.jetlumen.ordo.api.util.Texts; /** Persisted record of an ACTION step invocation. */ public record ActionExecution(String id, String instanceId, String stepId, String actionKey, diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ActionExecutionStatus.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ActionExecutionStatus.java similarity index 77% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ActionExecutionStatus.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ActionExecutionStatus.java index 08bfc00..1a62090 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ActionExecutionStatus.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ActionExecutionStatus.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; /** Lifecycle of a persisted ACTION-step execution. */ public enum ActionExecutionStatus { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalTask.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ApprovalTask.java similarity index 87% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalTask.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ApprovalTask.java index 712cf45..740d155 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ApprovalTask.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ApprovalTask.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; import java.time.Instant; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/InstanceToken.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/InstanceToken.java similarity index 83% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/InstanceToken.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/InstanceToken.java index 24cf035..406a708 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/InstanceToken.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/InstanceToken.java @@ -1,6 +1,8 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; import java.util.Objects; +import com.jetlumen.ordo.api.definition.StepKind; +import com.jetlumen.ordo.api.util.Texts; /** Runtime token for one branch of a {@link StepKind#PARALLEL} block. */ public record InstanceToken(String id, String instanceId, String parallelStepId, String branchId, String currentStepId, diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessContext.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessContext.java similarity index 93% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessContext.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessContext.java index 789dd47..b01b119 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessContext.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessContext.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; import java.util.Map; import java.util.Objects; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessEvent.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessEvent.java similarity index 90% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessEvent.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessEvent.java index f90abe0..12f28bb 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessEvent.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessEvent.java @@ -1,7 +1,8 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; import java.time.Instant; import java.util.Objects; +import com.jetlumen.ordo.api.util.Texts; /** Immutable audit record of something that happened to a process instance. */ public record ProcessEvent(String id, String instanceId, String taskId, String stepId, ProcessEventType type, diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessEventType.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessEventType.java similarity index 91% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessEventType.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessEventType.java index 548bc99..4980d9c 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessEventType.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessEventType.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; /** Kinds of append-only process history events. */ public enum ProcessEventType { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessInstance.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessInstance.java similarity index 86% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessInstance.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessInstance.java index 9cb8e14..3e68d05 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessInstance.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessInstance.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; import java.time.Instant; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessRuntime.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessRuntime.java similarity index 93% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessRuntime.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessRuntime.java index a2ba582..947787a 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessRuntime.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessRuntime.java @@ -1,6 +1,7 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; import java.util.Objects; +import com.jetlumen.ordo.api.util.Texts; /** * Read-only engine metadata plus business {@link ProcessContext} for host SPIs. diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessStatus.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessStatus.java similarity index 68% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessStatus.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessStatus.java index 66e212a..f7a8c18 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ProcessStatus.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/ProcessStatus.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; public enum ProcessStatus { RUNNING, APPROVED, REJECTED, WITHDRAWN, CANCELLED diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/TaskAction.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TaskAction.java similarity index 83% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/TaskAction.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TaskAction.java index 79f71ed..18e02e9 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/TaskAction.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TaskAction.java @@ -1,7 +1,8 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; import java.time.Instant; import java.util.Objects; +import com.jetlumen.ordo.api.util.Texts; /** Immutable audit record created when an approval task is completed. */ public record TaskAction(String actor, String comment, Instant operatedAt) { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/TaskStatus.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TaskStatus.java similarity index 81% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/TaskStatus.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TaskStatus.java index 2afb8bb..9f1037e 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/TaskStatus.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TaskStatus.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; public enum TaskStatus { PENDING, APPROVED, REJECTED, diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/TokenStatus.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TokenStatus.java similarity index 70% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/TokenStatus.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TokenStatus.java index 6de246d..642ec9d 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/TokenStatus.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/runtime/TokenStatus.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.runtime; /** Status of a parallel-branch token. */ public enum TokenStatus { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/ActionHandler.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/ActionHandler.java similarity index 85% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/ActionHandler.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/spi/ActionHandler.java index edd2dde..741e598 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/ActionHandler.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/ActionHandler.java @@ -1,4 +1,6 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.spi; + +import com.jetlumen.ordo.api.runtime.ProcessRuntime; /** * Executes a named action step against the running instance. Hosts supply a diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/AssigneeResolver.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/AssigneeResolver.java similarity index 79% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/AssigneeResolver.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/spi/AssigneeResolver.java index debbb6b..edbec84 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/AssigneeResolver.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/AssigneeResolver.java @@ -1,4 +1,7 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.spi; + +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; /** * Resolves the actual assignee for a single candidate of an approval step when its task is diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/NamedAction.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/NamedAction.java similarity index 87% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/NamedAction.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/spi/NamedAction.java index a37db41..fcab942 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/NamedAction.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/NamedAction.java @@ -1,6 +1,7 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.spi; import java.util.List; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; /** * A single ACTION implementation keyed by {@link #key()}, matching {@code action} on the step diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/NamedCondition.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/NamedCondition.java similarity index 87% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/NamedCondition.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/spi/NamedCondition.java index 7aefa6b..58d0bad 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/NamedCondition.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/NamedCondition.java @@ -1,7 +1,8 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.spi; import java.util.List; import java.util.Map; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; /** * A single routing condition keyed by {@link #key()}, matching {@code when.ref}. Spring collects diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoCatalog.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/OrdoCatalog.java similarity index 95% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoCatalog.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/spi/OrdoCatalog.java index 933cfa5..5f3b998 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoCatalog.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/OrdoCatalog.java @@ -1,9 +1,10 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.spi; import java.util.List; import java.util.Locale; import java.util.Objects; import java.util.Set; +import com.jetlumen.ordo.api.util.Texts; /** Host-registered keys for designers and REST dropdowns; not used by the engine at runtime. */ public interface OrdoCatalog { diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoEventListener.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/OrdoEventListener.java similarity index 76% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoEventListener.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/spi/OrdoEventListener.java index 6dd1f13..162d38d 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/OrdoEventListener.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/OrdoEventListener.java @@ -1,4 +1,6 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.spi; + +import com.jetlumen.ordo.api.runtime.ProcessEvent; /** * Host hook invoked after a process mutation has been committed. Implementations must not throw diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingCondition.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/RoutingCondition.java similarity index 87% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingCondition.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/spi/RoutingCondition.java index 24a041c..0cdf931 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/RoutingCondition.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/spi/RoutingCondition.java @@ -1,6 +1,7 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.spi; import java.util.Map; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; /** * Evaluates a named routing condition ({@code when.ref}) against the running instance. diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/Jsons.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/util/Jsons.java similarity index 91% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/Jsons.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/util/Jsons.java index 1d1462f..8f75058 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/Jsons.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/util/Jsons.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.util; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/ordo-api/src/main/java/com/jetlumen/ordo/api/Texts.java b/ordo-api/src/main/java/com/jetlumen/ordo/api/util/Texts.java similarity index 92% rename from ordo-api/src/main/java/com/jetlumen/ordo/api/Texts.java rename to ordo-api/src/main/java/com/jetlumen/ordo/api/util/Texts.java index fa69011..8d108df 100644 --- a/ordo-api/src/main/java/com/jetlumen/ordo/api/Texts.java +++ b/ordo-api/src/main/java/com/jetlumen/ordo/api/util/Texts.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.api; +package com.jetlumen.ordo.api.util; /** Shared blank-string checks used by domain records and the engine. */ public final class Texts { diff --git a/ordo-api/src/test/java/com/jetlumen/ordo/api/ProcessDefinitionParserTest.java b/ordo-api/src/test/java/com/jetlumen/ordo/api/ProcessDefinitionParserTest.java index d97d097..7c81d24 100644 --- a/ordo-api/src/test/java/com/jetlumen/ordo/api/ProcessDefinitionParserTest.java +++ b/ordo-api/src/test/java/com/jetlumen/ordo/api/ProcessDefinitionParserTest.java @@ -8,6 +8,13 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.definition.ProcessDefinitionParser; +import com.jetlumen.ordo.api.definition.RoutingPredicate; +import com.jetlumen.ordo.api.definition.StepDue; +import com.jetlumen.ordo.api.definition.StepKind; +import com.jetlumen.ordo.api.definition.StepTransition; class ProcessDefinitionParserTest { diff --git a/ordo-api/src/test/java/com/jetlumen/ordo/api/ProcessDefinitionTest.java b/ordo-api/src/test/java/com/jetlumen/ordo/api/ProcessDefinitionTest.java index 8b5e7eb..b3c0d42 100644 --- a/ordo-api/src/test/java/com/jetlumen/ordo/api/ProcessDefinitionTest.java +++ b/ordo-api/src/test/java/com/jetlumen/ordo/api/ProcessDefinitionTest.java @@ -7,6 +7,14 @@ import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import com.jetlumen.ordo.api.definition.ApprovalPolicy; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.definition.ParallelBranch; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.definition.RoutingWhen; +import com.jetlumen.ordo.api.definition.StepDue; +import com.jetlumen.ordo.api.definition.StepKind; +import com.jetlumen.ordo.api.definition.StepTransition; class ProcessDefinitionTest { diff --git a/ordo-api/src/test/java/com/jetlumen/ordo/api/RoutingWhenTest.java b/ordo-api/src/test/java/com/jetlumen/ordo/api/RoutingWhenTest.java index a70b0a8..4fb85f0 100644 --- a/ordo-api/src/test/java/com/jetlumen/ordo/api/RoutingWhenTest.java +++ b/ordo-api/src/test/java/com/jetlumen/ordo/api/RoutingWhenTest.java @@ -5,6 +5,7 @@ import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.junit.jupiter.api.Assertions.assertThrows; +import com.jetlumen.ordo.api.definition.RoutingWhen; class RoutingWhenTest { diff --git a/ordo-api/src/test/java/com/jetlumen/ordo/api/query/QueryTypesTest.java b/ordo-api/src/test/java/com/jetlumen/ordo/api/query/QueryTypesTest.java index b0e44ab..709617c 100644 --- a/ordo-api/src/test/java/com/jetlumen/ordo/api/query/QueryTypesTest.java +++ b/ordo-api/src/test/java/com/jetlumen/ordo/api/query/QueryTypesTest.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.api.query; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.runtime.TaskStatus; import org.junit.jupiter.api.Test; import java.time.Instant; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/DefaultOrdoEngine.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/DefaultOrdoEngine.java index 71f26f8..b793936 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/DefaultOrdoEngine.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/DefaultOrdoEngine.java @@ -1,28 +1,28 @@ package com.jetlumen.ordo.core; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ActionExecutionStatus; -import com.jetlumen.ordo.api.ActionHandler; -import com.jetlumen.ordo.api.ApprovalPolicy; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.AssigneeResolver; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ActionExecutionStatus; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.definition.ApprovalPolicy; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.spi.AssigneeResolver; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.OrdoEventListener; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessEvent; -import com.jetlumen.ordo.api.ProcessRuntime; -import com.jetlumen.ordo.api.ProcessEventType; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; -import com.jetlumen.ordo.api.RoutingCondition; -import com.jetlumen.ordo.api.RoutingWhen; -import com.jetlumen.ordo.api.StepDue; -import com.jetlumen.ordo.api.StepKind; -import com.jetlumen.ordo.api.StepTransition; -import com.jetlumen.ordo.api.TaskAction; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.spi.OrdoEventListener; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; +import com.jetlumen.ordo.api.runtime.ProcessEventType; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; +import com.jetlumen.ordo.api.spi.RoutingCondition; +import com.jetlumen.ordo.api.definition.RoutingWhen; +import com.jetlumen.ordo.api.definition.StepDue; +import com.jetlumen.ordo.api.definition.StepKind; +import com.jetlumen.ordo.api.definition.StepTransition; +import com.jetlumen.ordo.api.runtime.TaskAction; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.api.TransactionExecutor; import com.jetlumen.ordo.api.exception.DefinitionNotFoundException; import com.jetlumen.ordo.api.exception.InstanceAlreadyCompletedException; @@ -36,10 +36,10 @@ import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.query.TaskQuery; -import com.jetlumen.ordo.api.InstanceToken; -import com.jetlumen.ordo.api.ParallelBranch; -import com.jetlumen.ordo.api.ParallelMembership; -import com.jetlumen.ordo.api.TokenStatus; +import com.jetlumen.ordo.api.runtime.InstanceToken; +import com.jetlumen.ordo.api.definition.ParallelBranch; +import com.jetlumen.ordo.api.definition.ParallelMembership; +import com.jetlumen.ordo.api.runtime.TokenStatus; import com.jetlumen.ordo.api.repository.ActionExecutionRepository; import com.jetlumen.ordo.api.repository.ApprovalTaskRepository; import com.jetlumen.ordo.api.repository.InstanceTokenRepository; @@ -59,7 +59,9 @@ import java.util.Optional; import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; -import static com.jetlumen.ordo.api.Texts.requireText; +import static com.jetlumen.ordo.api.util.Texts.requireText; + +import com.jetlumen.ordo.core.routing.RoutingPredicateEvaluator; /** * Repository-backed implementation of the approval runtime with explicit step transitions. diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/InMemoryOrdoEngine.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/InMemoryOrdoEngine.java index bfea406..d1dd773 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/InMemoryOrdoEngine.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/InMemoryOrdoEngine.java @@ -1,16 +1,16 @@ package com.jetlumen.ordo.core; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ActionHandler; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.AssigneeResolver; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.spi.AssigneeResolver; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.OrdoEventListener; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessEvent; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.RoutingCondition; +import com.jetlumen.ordo.api.spi.OrdoEventListener; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.spi.RoutingCondition; import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryActionExecutionRepository.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryActionExecutionRepository.java index 1f93b8b..8e749fe 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryActionExecutionRepository.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryActionExecutionRepository.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ActionExecutionStatus; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ActionExecutionStatus; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.repository.ActionExecutionRepository; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryApprovalTaskRepository.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryApprovalTaskRepository.java index 88155cb..0c2e08b 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryApprovalTaskRepository.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryApprovalTaskRepository.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.query.TaskQuery; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryInstanceTokenRepository.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryInstanceTokenRepository.java index 1994292..4314a6b 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryInstanceTokenRepository.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryInstanceTokenRepository.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.InstanceToken; -import com.jetlumen.ordo.api.TokenStatus; +import com.jetlumen.ordo.api.runtime.InstanceToken; +import com.jetlumen.ordo.api.runtime.TokenStatus; import com.jetlumen.ordo.api.repository.InstanceTokenRepository; import java.util.ArrayList; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessDefinitionRepository.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessDefinitionRepository.java index 0c87571..d161aad 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessDefinitionRepository.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessDefinitionRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.ProcessDefinition; +import com.jetlumen.ordo.api.definition.ProcessDefinition; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.repository.ProcessDefinitionRepository; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessHistoryRepository.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessHistoryRepository.java index 619fc69..0736391 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessHistoryRepository.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessHistoryRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessEvent; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.repository.ProcessHistoryRepository; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessInstanceRepository.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessInstanceRepository.java index 608e677..4f570d5 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessInstanceRepository.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/repository/InMemoryProcessInstanceRepository.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/RoutingPredicateEvaluator.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/routing/RoutingPredicateEvaluator.java similarity index 86% rename from ordo-core/src/main/java/com/jetlumen/ordo/core/RoutingPredicateEvaluator.java rename to ordo-core/src/main/java/com/jetlumen/ordo/core/routing/RoutingPredicateEvaluator.java index 1bebf59..ff272fd 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/RoutingPredicateEvaluator.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/routing/RoutingPredicateEvaluator.java @@ -1,13 +1,13 @@ -package com.jetlumen.ordo.core; +package com.jetlumen.ordo.core.routing; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.RoutingPredicate; -import com.jetlumen.ordo.api.RoutingPredicate.And; -import com.jetlumen.ordo.api.RoutingPredicate.Compare; -import com.jetlumen.ordo.api.RoutingPredicate.In; -import com.jetlumen.ordo.api.RoutingPredicate.Not; -import com.jetlumen.ordo.api.RoutingPredicate.Op; -import com.jetlumen.ordo.api.RoutingPredicate.Or; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.RoutingPredicate; +import com.jetlumen.ordo.api.definition.RoutingPredicate.And; +import com.jetlumen.ordo.api.definition.RoutingPredicate.Compare; +import com.jetlumen.ordo.api.definition.RoutingPredicate.In; +import com.jetlumen.ordo.api.definition.RoutingPredicate.Not; +import com.jetlumen.ordo.api.definition.RoutingPredicate.Op; +import com.jetlumen.ordo.api.definition.RoutingPredicate.Or; import java.util.Map; import java.util.Objects; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/DispatchingActionHandler.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/DispatchingActionHandler.java index 169db5a..a1f8b75 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/DispatchingActionHandler.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/DispatchingActionHandler.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.core.spi; -import com.jetlumen.ordo.api.ActionHandler; -import com.jetlumen.ordo.api.NamedAction; -import com.jetlumen.ordo.api.ProcessRuntime; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.spi.NamedAction; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; import java.util.List; import java.util.Map; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/DispatchingRoutingCondition.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/DispatchingRoutingCondition.java index eab993a..f82e6e4 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/DispatchingRoutingCondition.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/DispatchingRoutingCondition.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.core.spi; -import com.jetlumen.ordo.api.NamedCondition; -import com.jetlumen.ordo.api.ProcessRuntime; -import com.jetlumen.ordo.api.RoutingCondition; +import com.jetlumen.ordo.api.spi.NamedCondition; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; +import com.jetlumen.ordo.api.spi.RoutingCondition; import java.util.List; import java.util.Map; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/NamedHandlers.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/NamedHandlers.java index 51bd161..3070f32 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/NamedHandlers.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/NamedHandlers.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.core.spi; -import com.jetlumen.ordo.api.Texts; +import com.jetlumen.ordo.api.util.Texts; import java.util.LinkedHashMap; import java.util.List; diff --git a/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/RegistryOrdoCatalog.java b/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/RegistryOrdoCatalog.java index e0f3335..16129a1 100644 --- a/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/RegistryOrdoCatalog.java +++ b/ordo-core/src/main/java/com/jetlumen/ordo/core/spi/RegistryOrdoCatalog.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.core.spi; -import com.jetlumen.ordo.api.NamedAction; -import com.jetlumen.ordo.api.NamedCondition; -import com.jetlumen.ordo.api.OrdoCatalog; +import com.jetlumen.ordo.api.spi.NamedAction; +import com.jetlumen.ordo.api.spi.NamedCondition; +import com.jetlumen.ordo.api.spi.OrdoCatalog; import java.util.List; import java.util.Objects; diff --git a/ordo-core/src/test/java/com/jetlumen/ordo/core/InMemoryOrdoEngineTest.java b/ordo-core/src/test/java/com/jetlumen/ordo/core/InMemoryOrdoEngineTest.java index 2057607..e1ed9df 100644 --- a/ordo-core/src/test/java/com/jetlumen/ordo/core/InMemoryOrdoEngineTest.java +++ b/ordo-core/src/test/java/com/jetlumen/ordo/core/InMemoryOrdoEngineTest.java @@ -1,25 +1,25 @@ package com.jetlumen.ordo.core; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ActionExecutionStatus; -import com.jetlumen.ordo.api.AssigneeResolver; -import com.jetlumen.ordo.api.ApprovalPolicy; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.ParallelBranch; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessEvent; -import com.jetlumen.ordo.api.ProcessEventType; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessRuntime; -import com.jetlumen.ordo.api.ProcessStatus; -import com.jetlumen.ordo.api.RoutingCondition; -import com.jetlumen.ordo.api.RoutingPredicate; -import com.jetlumen.ordo.api.StepDue; -import com.jetlumen.ordo.api.StepKind; -import com.jetlumen.ordo.api.StepTransition; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ActionExecutionStatus; +import com.jetlumen.ordo.api.spi.AssigneeResolver; +import com.jetlumen.ordo.api.definition.ApprovalPolicy; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.definition.ParallelBranch; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessEventType; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; +import com.jetlumen.ordo.api.runtime.ProcessStatus; +import com.jetlumen.ordo.api.spi.RoutingCondition; +import com.jetlumen.ordo.api.definition.RoutingPredicate; +import com.jetlumen.ordo.api.definition.StepDue; +import com.jetlumen.ordo.api.definition.StepKind; +import com.jetlumen.ordo.api.definition.StepTransition; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.api.exception.DefinitionNotFoundException; import com.jetlumen.ordo.api.exception.InstanceAlreadyCompletedException; import com.jetlumen.ordo.api.exception.InstanceNotFoundException; diff --git a/ordo-core/src/test/java/com/jetlumen/ordo/core/RoutingPredicateEvaluatorTest.java b/ordo-core/src/test/java/com/jetlumen/ordo/core/RoutingPredicateEvaluatorTest.java index 96197f4..1c67614 100644 --- a/ordo-core/src/test/java/com/jetlumen/ordo/core/RoutingPredicateEvaluatorTest.java +++ b/ordo-core/src/test/java/com/jetlumen/ordo/core/RoutingPredicateEvaluatorTest.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.core; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.RoutingPredicate; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.RoutingPredicate; import org.junit.jupiter.api.Test; import java.util.List; @@ -9,6 +9,7 @@ import java.util.Map; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import com.jetlumen.ordo.core.routing.RoutingPredicateEvaluator; class RoutingPredicateEvaluatorTest { diff --git a/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryApprovalTaskRepositoryTest.java b/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryApprovalTaskRepositoryTest.java index 2efa47d..ab23310 100644 --- a/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryApprovalTaskRepositoryTest.java +++ b/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryApprovalTaskRepositoryTest.java @@ -1,10 +1,10 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.query.TaskQuery; diff --git a/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryProcessDefinitionRepositoryTest.java b/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryProcessDefinitionRepositoryTest.java index dab433e..a09f899 100644 --- a/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryProcessDefinitionRepositoryTest.java +++ b/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryProcessDefinitionRepositoryTest.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ProcessDefinition; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.definition.ProcessDefinition; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import org.junit.jupiter.api.Test; diff --git a/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryProcessInstanceRepositoryTest.java b/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryProcessInstanceRepositoryTest.java index ae91c30..d403374 100644 --- a/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryProcessInstanceRepositoryTest.java +++ b/ordo-core/src/test/java/com/jetlumen/ordo/core/repository/InMemoryProcessInstanceRepositoryTest.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.core.repository; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; diff --git a/ordo-core/src/test/java/com/jetlumen/ordo/core/spi/DispatchingHandlersTest.java b/ordo-core/src/test/java/com/jetlumen/ordo/core/spi/DispatchingHandlersTest.java index 2b3c931..814c55b 100644 --- a/ordo-core/src/test/java/com/jetlumen/ordo/core/spi/DispatchingHandlersTest.java +++ b/ordo-core/src/test/java/com/jetlumen/ordo/core/spi/DispatchingHandlersTest.java @@ -1,9 +1,9 @@ package com.jetlumen.ordo.core.spi; -import com.jetlumen.ordo.api.NamedAction; -import com.jetlumen.ordo.api.NamedCondition; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessRuntime; +import com.jetlumen.ordo.api.spi.NamedAction; +import com.jetlumen.ordo.api.spi.NamedCondition; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/ordo-example/src/main/java/com/jetlumen/ordo/example/LeaveRequestExample.java b/ordo-example/src/main/java/com/jetlumen/ordo/example/LeaveRequestExample.java index faaa1a5..b0f058c 100644 --- a/ordo-example/src/main/java/com/jetlumen/ordo/example/LeaveRequestExample.java +++ b/ordo-example/src/main/java/com/jetlumen/ordo/example/LeaveRequestExample.java @@ -1,9 +1,9 @@ package com.jetlumen.ordo.example; -import com.jetlumen.ordo.api.ApprovalStep; +import com.jetlumen.ordo.api.definition.ApprovalStep; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; import com.jetlumen.ordo.core.InMemoryOrdoEngine; import java.util.List; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoDefinitionLoader.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/OrdoDefinitionLoader.java similarity index 93% rename from ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoDefinitionLoader.java rename to ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/OrdoDefinitionLoader.java index aefbc30..c41c8e3 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoDefinitionLoader.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/OrdoDefinitionLoader.java @@ -1,8 +1,8 @@ -package com.jetlumen.ordo.spring.jdbc; +package com.jetlumen.ordo.spring; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessDefinitionParser; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.definition.ProcessDefinitionParser; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.core.io.Resource; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoDuePoller.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/OrdoDuePoller.java similarity index 98% rename from ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoDuePoller.java rename to ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/OrdoDuePoller.java index 2e700e3..6ece463 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoDuePoller.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/OrdoDuePoller.java @@ -1,4 +1,4 @@ -package com.jetlumen.ordo.spring.jdbc; +package com.jetlumen.ordo.spring; import com.jetlumen.ordo.api.OrdoEngine; import org.springframework.context.SmartLifecycle; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoJdbcAutoConfiguration.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoJdbcAutoConfiguration.java index e1a39db..15be542 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoJdbcAutoConfiguration.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/jdbc/OrdoJdbcAutoConfiguration.java @@ -1,12 +1,12 @@ package com.jetlumen.ordo.spring.jdbc; -import com.jetlumen.ordo.api.ActionHandler; -import com.jetlumen.ordo.api.AssigneeResolver; -import com.jetlumen.ordo.api.NamedAction; -import com.jetlumen.ordo.api.NamedCondition; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.spi.AssigneeResolver; +import com.jetlumen.ordo.api.spi.NamedAction; +import com.jetlumen.ordo.api.spi.NamedCondition; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.OrdoEventListener; -import com.jetlumen.ordo.api.RoutingCondition; +import com.jetlumen.ordo.api.spi.OrdoEventListener; +import com.jetlumen.ordo.api.spi.RoutingCondition; import com.jetlumen.ordo.api.TransactionExecutor; import com.jetlumen.ordo.api.repository.ActionExecutionRepository; import com.jetlumen.ordo.api.repository.ApprovalTaskRepository; @@ -17,6 +17,8 @@ import com.jetlumen.ordo.api.repository.ProcessInstanceRepository; import com.jetlumen.ordo.core.DefaultOrdoEngine; import com.jetlumen.ordo.core.spi.DispatchingActionHandler; import com.jetlumen.ordo.core.spi.DispatchingRoutingCondition; +import com.jetlumen.ordo.spring.OrdoDefinitionLoader; +import com.jetlumen.ordo.spring.OrdoDuePoller; import com.jetlumen.ordo.spring.OrdoProperties; import com.jetlumen.ordo.storage.jdbc.JdbcActionExecutionRepository; import com.jetlumen.ordo.storage.jdbc.JdbcApprovalTaskRepository; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/DefinitionJson.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/DefinitionJson.java index b4d2108..9c95f9e 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/DefinitionJson.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/DefinitionJson.java @@ -2,9 +2,9 @@ package com.jetlumen.ordo.spring.rest; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.jetlumen.ordo.api.Jsons; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessDefinitionParser; +import com.jetlumen.ordo.api.util.Jsons; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.definition.ProcessDefinitionParser; import java.util.Map; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoCatalogController.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoCatalogController.java index 415b568..945e3f3 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoCatalogController.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoCatalogController.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.spring.rest; -import com.jetlumen.ordo.api.OrdoCatalog; +import com.jetlumen.ordo.api.spi.OrdoCatalog; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoDefinitionController.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoDefinitionController.java index ee843df..d227e50 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoDefinitionController.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoDefinitionController.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.spring.rest; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessDefinitionParser; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.definition.ProcessDefinitionParser; import com.jetlumen.ordo.api.query.PageRequest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoInstanceController.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoInstanceController.java index 2c196c2..f96960e 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoInstanceController.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoInstanceController.java @@ -1,12 +1,12 @@ package com.jetlumen.ordo.spring.rest; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ApprovalTask; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ApprovalTask; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessEvent; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.PageRequest; import org.springframework.http.ResponseEntity; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoRestAutoConfiguration.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoRestAutoConfiguration.java index 53310ba..92b7ad8 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoRestAutoConfiguration.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoRestAutoConfiguration.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.spring.rest; -import com.jetlumen.ordo.api.NamedAction; -import com.jetlumen.ordo.api.NamedCondition; -import com.jetlumen.ordo.api.OrdoCatalog; +import com.jetlumen.ordo.api.spi.NamedAction; +import com.jetlumen.ordo.api.spi.NamedCondition; +import com.jetlumen.ordo.api.spi.OrdoCatalog; import com.jetlumen.ordo.api.OrdoEngine; import com.jetlumen.ordo.core.spi.RegistryOrdoCatalog; import com.jetlumen.ordo.spring.OrdoProperties; diff --git a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoTaskController.java b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoTaskController.java index e5274fe..e5b0de2 100644 --- a/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoTaskController.java +++ b/ordo-spring-boot-autoconfigure/src/main/java/com/jetlumen/ordo/spring/rest/OrdoTaskController.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.spring.rest; -import com.jetlumen.ordo.api.ApprovalTask; +import com.jetlumen.ordo.api.runtime.ApprovalTask; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.query.TaskQuery; import org.springframework.http.ResponseEntity; diff --git a/ordo-spring-boot-autoconfigure/src/test/java/com/jetlumen/ordo/spring/jdbc/OrdoJdbcAutoConfigurationTest.java b/ordo-spring-boot-autoconfigure/src/test/java/com/jetlumen/ordo/spring/jdbc/OrdoJdbcAutoConfigurationTest.java index be12662..06c9f03 100644 --- a/ordo-spring-boot-autoconfigure/src/test/java/com/jetlumen/ordo/spring/jdbc/OrdoJdbcAutoConfigurationTest.java +++ b/ordo-spring-boot-autoconfigure/src/test/java/com/jetlumen/ordo/spring/jdbc/OrdoJdbcAutoConfigurationTest.java @@ -1,20 +1,20 @@ package com.jetlumen.ordo.spring.jdbc; -import com.jetlumen.ordo.api.ActionHandler; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.AssigneeResolver; -import com.jetlumen.ordo.api.NamedAction; -import com.jetlumen.ordo.api.NamedCondition; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.spi.AssigneeResolver; +import com.jetlumen.ordo.api.spi.NamedAction; +import com.jetlumen.ordo.api.spi.NamedCondition; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.OrdoEventListener; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessEvent; -import com.jetlumen.ordo.api.ProcessEventType; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessRuntime; -import com.jetlumen.ordo.api.RoutingCondition; -import com.jetlumen.ordo.api.StepTransition; +import com.jetlumen.ordo.api.spi.OrdoEventListener; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessEventType; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; +import com.jetlumen.ordo.api.spi.RoutingCondition; +import com.jetlumen.ordo.api.definition.StepTransition; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.repository.ProcessDefinitionRepository; import com.jetlumen.ordo.core.spi.DispatchingActionHandler; @@ -34,6 +34,7 @@ import java.util.UUID; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.jetlumen.ordo.spring.OrdoDefinitionLoader; class OrdoJdbcAutoConfigurationTest { diff --git a/ordo-spring-boot-autoconfigure/src/test/java/com/jetlumen/ordo/spring/rest/OrdoRestAutoConfigurationTest.java b/ordo-spring-boot-autoconfigure/src/test/java/com/jetlumen/ordo/spring/rest/OrdoRestAutoConfigurationTest.java index 21b0e94..61c8ebd 100644 --- a/ordo-spring-boot-autoconfigure/src/test/java/com/jetlumen/ordo/spring/rest/OrdoRestAutoConfigurationTest.java +++ b/ordo-spring-boot-autoconfigure/src/test/java/com/jetlumen/ordo/spring/rest/OrdoRestAutoConfigurationTest.java @@ -1,10 +1,10 @@ package com.jetlumen.ordo.spring.rest; -import com.jetlumen.ordo.api.NamedAction; -import com.jetlumen.ordo.api.NamedCondition; -import com.jetlumen.ordo.api.OrdoCatalog; +import com.jetlumen.ordo.api.spi.NamedAction; +import com.jetlumen.ordo.api.spi.NamedCondition; +import com.jetlumen.ordo.api.spi.OrdoCatalog; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.ProcessRuntime; +import com.jetlumen.ordo.api.runtime.ProcessRuntime; import com.jetlumen.ordo.spring.jdbc.OrdoFlywayAutoConfiguration; import com.jetlumen.ordo.spring.jdbc.OrdoJdbcAutoConfiguration; import org.junit.jupiter.api.Test; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcActionExecutionRepository.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcActionExecutionRepository.java index 4f930cf..ea4a599 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcActionExecutionRepository.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcActionExecutionRepository.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ActionExecutionStatus; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ActionExecutionStatus; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.repository.ActionExecutionRepository; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcApprovalTaskRepository.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcApprovalTaskRepository.java index fad4529..a3e4dfc 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcApprovalTaskRepository.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcApprovalTaskRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ApprovalTask; +import com.jetlumen.ordo.api.runtime.ApprovalTask; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.query.TaskQuery; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcInstanceTokenRepository.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcInstanceTokenRepository.java index 3a9a3d6..c76a9ea 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcInstanceTokenRepository.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcInstanceTokenRepository.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.InstanceToken; -import com.jetlumen.ordo.api.TokenStatus; +import com.jetlumen.ordo.api.runtime.InstanceToken; +import com.jetlumen.ordo.api.runtime.TokenStatus; import com.jetlumen.ordo.api.repository.InstanceTokenRepository; import com.jetlumen.ordo.storage.jdbc.dialect.SqlDialect; import com.jetlumen.ordo.storage.jdbc.dialect.SqlDialects; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessDefinitionRepository.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessDefinitionRepository.java index fad4410..9ab661d 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessDefinitionRepository.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessDefinitionRepository.java @@ -1,10 +1,10 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ParallelBranch; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.StepKind; -import com.jetlumen.ordo.api.StepTransition; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.definition.ParallelBranch; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.definition.StepKind; +import com.jetlumen.ordo.api.definition.StepTransition; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.repository.ProcessDefinitionRepository; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessHistoryRepository.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessHistoryRepository.java index fc3b305..909ff02 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessHistoryRepository.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessHistoryRepository.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessEvent; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.repository.ProcessHistoryRepository; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessInstanceRepository.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessInstanceRepository.java index 356f18f..6ff8db6 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessInstanceRepository.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessInstanceRepository.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ActionExecutionMapper.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ActionExecutionMapper.java index f657306..554cb16 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ActionExecutionMapper.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ActionExecutionMapper.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.storage.jdbc.mapper; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ActionExecutionStatus; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ActionExecutionStatus; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ApprovalStepMapper.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ApprovalStepMapper.java index b74f56f..072550f 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ApprovalStepMapper.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ApprovalStepMapper.java @@ -1,18 +1,19 @@ package com.jetlumen.ordo.storage.jdbc.mapper; -import com.jetlumen.ordo.api.ApprovalPolicy; -import com.jetlumen.ordo.api.DueThen; -import com.jetlumen.ordo.api.StepDue; -import com.jetlumen.ordo.api.StepKind; +import com.jetlumen.ordo.api.definition.ApprovalPolicy; +import com.jetlumen.ordo.api.definition.DueThen; +import com.jetlumen.ordo.api.definition.StepDue; +import com.jetlumen.ordo.api.definition.StepKind; import java.sql.ResultSet; import java.sql.SQLException; import java.time.Duration; +import com.jetlumen.ordo.api.definition.ApprovalStep; /** * Maps rows of {@code ordo_approval_step}. A step's candidate list lives in the separate * {@code ordo_step_candidate} table, so this only reads the scalar step columns; the repository - * assembles the full {@link com.jetlumen.ordo.api.ApprovalStep} once candidates are loaded. + * assembles the full {@link com.jetlumen.ordo.api.definition.ApprovalStep} once candidates are loaded. */ public final class ApprovalStepMapper { private ApprovalStepMapper() { diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ApprovalTaskMapper.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ApprovalTaskMapper.java index 865e0f6..43df5af 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ApprovalTaskMapper.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ApprovalTaskMapper.java @@ -1,8 +1,8 @@ package com.jetlumen.ordo.storage.jdbc.mapper; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.TaskAction; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.runtime.TaskAction; +import com.jetlumen.ordo.api.runtime.TaskStatus; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessContextCodec.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessContextCodec.java index c6f0665..1c8fa0e 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessContextCodec.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessContextCodec.java @@ -2,8 +2,8 @@ package com.jetlumen.ordo.storage.jdbc.mapper; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; -import com.jetlumen.ordo.api.Jsons; -import com.jetlumen.ordo.api.ProcessContext; +import com.jetlumen.ordo.api.util.Jsons; +import com.jetlumen.ordo.api.runtime.ProcessContext; import java.util.Map; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessEventMapper.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessEventMapper.java index 985f1d7..e8c26de 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessEventMapper.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessEventMapper.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.storage.jdbc.mapper; -import com.jetlumen.ordo.api.ProcessEvent; -import com.jetlumen.ordo.api.ProcessEventType; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessEventType; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessInstanceMapper.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessInstanceMapper.java index 9457bc8..0ca12fd 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessInstanceMapper.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/ProcessInstanceMapper.java @@ -1,7 +1,7 @@ package com.jetlumen.ordo.storage.jdbc.mapper; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import java.sql.PreparedStatement; import java.sql.ResultSet; diff --git a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/StepTransitionMapper.java b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/StepTransitionMapper.java index 5214105..76cd0d0 100644 --- a/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/StepTransitionMapper.java +++ b/ordo-storage-jdbc/src/main/java/com/jetlumen/ordo/storage/jdbc/mapper/StepTransitionMapper.java @@ -1,6 +1,6 @@ package com.jetlumen.ordo.storage.jdbc.mapper; -import com.jetlumen.ordo.api.RoutingWhen; +import com.jetlumen.ordo.api.definition.RoutingWhen; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcActionExecutionRepositoryTest.java b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcActionExecutionRepositoryTest.java index d02dded..0949355 100644 --- a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcActionExecutionRepositoryTest.java +++ b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcActionExecutionRepositoryTest.java @@ -1,12 +1,12 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ActionExecution; -import com.jetlumen.ordo.api.ActionExecutionStatus; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.runtime.ActionExecution; +import com.jetlumen.ordo.api.runtime.ActionExecutionStatus; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import org.junit.jupiter.api.BeforeEach; diff --git a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcApprovalTaskRepositoryTest.java b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcApprovalTaskRepositoryTest.java index 3f5f504..9f5afd7 100644 --- a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcApprovalTaskRepositoryTest.java +++ b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcApprovalTaskRepositoryTest.java @@ -1,13 +1,13 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; -import com.jetlumen.ordo.api.TaskAction; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; +import com.jetlumen.ordo.api.runtime.TaskAction; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import com.jetlumen.ordo.api.query.TaskQuery; diff --git a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcMysqlIntegrationTest.java b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcMysqlIntegrationTest.java index 6877721..7926f30 100644 --- a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcMysqlIntegrationTest.java +++ b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcMysqlIntegrationTest.java @@ -1,19 +1,19 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ActionHandler; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.AssigneeResolver; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.spi.AssigneeResolver; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.ParallelBranch; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; -import com.jetlumen.ordo.api.RoutingCondition; -import com.jetlumen.ordo.api.StepTransition; -import com.jetlumen.ordo.api.TaskAction; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.definition.ParallelBranch; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; +import com.jetlumen.ordo.api.spi.RoutingCondition; +import com.jetlumen.ordo.api.definition.StepTransition; +import com.jetlumen.ordo.api.runtime.TaskAction; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.core.DefaultOrdoEngine; import com.jetlumen.ordo.storage.jdbc.dialect.SqlDialect; import com.jetlumen.ordo.storage.jdbc.dialect.SqlDialects; diff --git a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcOrdoEngineIntegrationTest.java b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcOrdoEngineIntegrationTest.java index 6467944..f7ca6ba 100644 --- a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcOrdoEngineIntegrationTest.java +++ b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcOrdoEngineIntegrationTest.java @@ -1,25 +1,25 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ActionExecutionStatus; -import com.jetlumen.ordo.api.ActionHandler; -import com.jetlumen.ordo.api.ApprovalPolicy; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.AssigneeResolver; +import com.jetlumen.ordo.api.runtime.ActionExecutionStatus; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.definition.ApprovalPolicy; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.spi.AssigneeResolver; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.ParallelBranch; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessEvent; -import com.jetlumen.ordo.api.ProcessEventType; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.definition.ParallelBranch; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessEventType; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import com.jetlumen.ordo.api.query.PageRequest; -import com.jetlumen.ordo.api.RoutingCondition; -import com.jetlumen.ordo.api.StepKind; -import com.jetlumen.ordo.api.StepDue; -import com.jetlumen.ordo.api.StepTransition; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.spi.RoutingCondition; +import com.jetlumen.ordo.api.definition.StepKind; +import com.jetlumen.ordo.api.definition.StepDue; +import com.jetlumen.ordo.api.definition.StepTransition; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.api.exception.InstanceAlreadyCompletedException; import com.jetlumen.ordo.api.exception.UnauthorizedInstanceOperationException; import com.jetlumen.ordo.api.exception.NoRouteFoundException; diff --git a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcPostgresIntegrationTest.java b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcPostgresIntegrationTest.java index f720a6f..2c76c4c 100644 --- a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcPostgresIntegrationTest.java +++ b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcPostgresIntegrationTest.java @@ -1,19 +1,19 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ActionHandler; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ApprovalTask; -import com.jetlumen.ordo.api.AssigneeResolver; +import com.jetlumen.ordo.api.spi.ActionHandler; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ApprovalTask; +import com.jetlumen.ordo.api.spi.AssigneeResolver; import com.jetlumen.ordo.api.OrdoEngine; -import com.jetlumen.ordo.api.ParallelBranch; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; -import com.jetlumen.ordo.api.RoutingCondition; -import com.jetlumen.ordo.api.StepTransition; -import com.jetlumen.ordo.api.TaskAction; -import com.jetlumen.ordo.api.TaskStatus; +import com.jetlumen.ordo.api.definition.ParallelBranch; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; +import com.jetlumen.ordo.api.spi.RoutingCondition; +import com.jetlumen.ordo.api.definition.StepTransition; +import com.jetlumen.ordo.api.runtime.TaskAction; +import com.jetlumen.ordo.api.runtime.TaskStatus; import com.jetlumen.ordo.core.DefaultOrdoEngine; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assumptions; diff --git a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessDefinitionRepositoryTest.java b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessDefinitionRepositoryTest.java index c49f765..f394f6d 100644 --- a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessDefinitionRepositoryTest.java +++ b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessDefinitionRepositoryTest.java @@ -1,13 +1,13 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ApprovalPolicy; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ParallelBranch; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.StepDue; -import com.jetlumen.ordo.api.StepKind; -import com.jetlumen.ordo.api.RoutingPredicate; -import com.jetlumen.ordo.api.StepTransition; +import com.jetlumen.ordo.api.definition.ApprovalPolicy; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.definition.ParallelBranch; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.definition.StepDue; +import com.jetlumen.ordo.api.definition.StepKind; +import com.jetlumen.ordo.api.definition.RoutingPredicate; +import com.jetlumen.ordo.api.definition.StepTransition; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import org.junit.jupiter.api.BeforeEach; diff --git a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessHistoryRepositoryTest.java b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessHistoryRepositoryTest.java index ba520bb..186c552 100644 --- a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessHistoryRepositoryTest.java +++ b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessHistoryRepositoryTest.java @@ -1,12 +1,12 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessEvent; -import com.jetlumen.ordo.api.ProcessEventType; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessEvent; +import com.jetlumen.ordo.api.runtime.ProcessEventType; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest; import org.junit.jupiter.api.BeforeEach; diff --git a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessInstanceRepositoryTest.java b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessInstanceRepositoryTest.java index 0a52432..2803789 100644 --- a/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessInstanceRepositoryTest.java +++ b/ordo-storage-jdbc/src/test/java/com/jetlumen/ordo/storage/jdbc/JdbcProcessInstanceRepositoryTest.java @@ -1,10 +1,10 @@ package com.jetlumen.ordo.storage.jdbc; -import com.jetlumen.ordo.api.ApprovalStep; -import com.jetlumen.ordo.api.ProcessContext; -import com.jetlumen.ordo.api.ProcessDefinition; -import com.jetlumen.ordo.api.ProcessInstance; -import com.jetlumen.ordo.api.ProcessStatus; +import com.jetlumen.ordo.api.definition.ApprovalStep; +import com.jetlumen.ordo.api.runtime.ProcessContext; +import com.jetlumen.ordo.api.definition.ProcessDefinition; +import com.jetlumen.ordo.api.runtime.ProcessInstance; +import com.jetlumen.ordo.api.runtime.ProcessStatus; import com.jetlumen.ordo.api.query.InstanceQuery; import com.jetlumen.ordo.api.query.Page; import com.jetlumen.ordo.api.query.PageRequest;