From 9caa154ca265471c724f3de85ec60361c75cb7f5 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti Date: Fri, 30 Oct 2026 11:57:07 +0100 Subject: [PATCH] Make LifeCycleEvents constants switchable again Signed-off-by: Francisco Javier Tirado Sarti --- .../sdk/impl/LifecycleEvents.java | 33 +++++++------ .../sdk/impl/lifecycle/EventType.java | 48 +++++++++++++------ .../impl/lifecycle/LifeCycleEventType.java | 13 +++-- .../ce/AbstractLifeCyclePublisher.java | 28 +++++------ 4 files changed, 74 insertions(+), 48 deletions(-) diff --git a/impl/core/src/main/java/org/openworkflow/sdk/impl/LifecycleEvents.java b/impl/core/src/main/java/org/openworkflow/sdk/impl/LifecycleEvents.java index b7fd18685..cd6a66eda 100644 --- a/impl/core/src/main/java/org/openworkflow/sdk/impl/LifecycleEvents.java +++ b/impl/core/src/main/java/org/openworkflow/sdk/impl/LifecycleEvents.java @@ -27,50 +27,53 @@ public final class LifecycleEvents { private LifecycleEvents() {} - private static final String SPEC_PREFIX = LifeCycleEventType.V8.prefix(); + private static final String SPEC_PREFIX = LifeCycleEventType.Constants.V8_PREFIX; /** Notifies about the start of a task. */ - public static final String TASK_STARTED = SPEC_PREFIX + EventType.TASK_STARTED.type(); + public static final String TASK_STARTED = SPEC_PREFIX + EventType.Constants.TASK_STARTED; /** Notifies about the completion of a task's execution. */ - public static final String TASK_COMPLETED = SPEC_PREFIX + EventType.TASK_COMPLETED.type(); + public static final String TASK_COMPLETED = SPEC_PREFIX + EventType.Constants.TASK_COMPLETED; /** Notifies about suspending a task's execution. */ - public static final String TASK_SUSPENDED = SPEC_PREFIX + EventType.TASK_SUSPENDED.type(); + public static final String TASK_SUSPENDED = SPEC_PREFIX + EventType.Constants.TASK_SUSPENDED; /** Notifies about resuming a task's execution. */ - public static final String TASK_RESUMED = SPEC_PREFIX + EventType.TASK_RESUMED.type(); + public static final String TASK_RESUMED = SPEC_PREFIX + EventType.Constants.TASK_RESUMED; /** Notifies about a task being faulted. */ - public static final String TASK_FAULTED = SPEC_PREFIX + EventType.TASK_FAULTED.type(); + public static final String TASK_FAULTED = SPEC_PREFIX + EventType.Constants.TASK_FAULTED; /** Notifies about the cancellation of a task's execution. */ - public static final String TASK_CANCELLED = SPEC_PREFIX + EventType.TASK_CANCELLED.type(); + public static final String TASK_CANCELLED = SPEC_PREFIX + EventType.Constants.TASK_CANCELLED; /** Notifies about retrying a task's execution. */ - public static final String TASK_RETRIED = SPEC_PREFIX + EventType.TASK_RETRIED.type(); + public static final String TASK_RETRIED = SPEC_PREFIX + EventType.Constants.TASK_RETRIED; /** Notifies about the start of a workflow. */ - public static final String WORKFLOW_STARTED = SPEC_PREFIX + EventType.WORKFLOW_STARTED.type(); + public static final String WORKFLOW_STARTED = SPEC_PREFIX + EventType.Constants.WORKFLOW_STARTED; /** Notifies about the completion of a workflow execution. */ - public static final String WORKFLOW_COMPLETED = SPEC_PREFIX + EventType.WORKFLOW_COMPLETED.type(); + public static final String WORKFLOW_COMPLETED = + SPEC_PREFIX + EventType.Constants.WORKFLOW_COMPLETED; /** Notifies about suspending a workflow execution. */ - public static final String WORKFLOW_SUSPENDED = SPEC_PREFIX + EventType.WORKFLOW_SUSPENDED.type(); + public static final String WORKFLOW_SUSPENDED = + SPEC_PREFIX + EventType.Constants.WORKFLOW_SUSPENDED; /** Notifies about resuming a workflow execution. */ - public static final String WORKFLOW_RESUMED = SPEC_PREFIX + EventType.WORKFLOW_RESUMED.type(); + public static final String WORKFLOW_RESUMED = SPEC_PREFIX + EventType.Constants.WORKFLOW_RESUMED; /** Notifies about a workflow being faulted. */ - public static final String WORKFLOW_FAULTED = SPEC_PREFIX + EventType.WORKFLOW_FAULTED.type(); + public static final String WORKFLOW_FAULTED = SPEC_PREFIX + EventType.Constants.WORKFLOW_FAULTED; /** Notifies about the cancellation of a workflow execution. */ - public static final String WORKFLOW_CANCELLED = SPEC_PREFIX + EventType.WORKFLOW_CANCELLED.type(); + public static final String WORKFLOW_CANCELLED = + SPEC_PREFIX + EventType.Constants.WORKFLOW_CANCELLED; /** Notifies about the change of a workflow's status phase. */ public static final String WORKFLOW_STATUS_CHANGED = - SPEC_PREFIX + EventType.WORKFLOW_STATUS_CHANGED.type(); + SPEC_PREFIX + EventType.Constants.WORKFLOW_STATUS_CHANGED; /** * CloudEvent extension attribute carried by every lifecycle event, holding the {@link diff --git a/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/EventType.java b/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/EventType.java index 0ef4ec470..5f2c6dc8d 100644 --- a/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/EventType.java +++ b/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/EventType.java @@ -16,20 +16,38 @@ package org.openworkflow.sdk.impl.lifecycle; public enum EventType { - TASK_STARTED("task.started.v1"), - TASK_COMPLETED("task.completed.v1"), - TASK_SUSPENDED("task.suspended.v1"), - TASK_RESUMED("task.resumed.v1"), - TASK_FAULTED("task.faulted.v1"), - TASK_CANCELLED("task.cancelled.v1"), - TASK_RETRIED("task.retried.v1"), - WORKFLOW_STARTED("workflow.started.v1"), - WORKFLOW_COMPLETED("workflow.completed.v1"), - WORKFLOW_SUSPENDED("workflow.suspended.v1"), - WORKFLOW_RESUMED("workflow.resumed.v1"), - WORKFLOW_FAULTED("workflow.faulted.v1"), - WORKFLOW_CANCELLED("workflow.cancelled.v1"), - WORKFLOW_STATUS_CHANGED("workflow.status-changed.v1"); + TASK_STARTED(Constants.TASK_STARTED), + TASK_COMPLETED(Constants.TASK_COMPLETED), + TASK_SUSPENDED(Constants.TASK_SUSPENDED), + TASK_RESUMED(Constants.TASK_RESUMED), + TASK_FAULTED(Constants.TASK_FAULTED), + TASK_CANCELLED(Constants.TASK_CANCELLED), + TASK_RETRIED(Constants.TASK_RETRIED), + WORKFLOW_STARTED(Constants.WORKFLOW_STARTED), + WORKFLOW_COMPLETED(Constants.WORKFLOW_COMPLETED), + WORKFLOW_SUSPENDED(Constants.WORKFLOW_SUSPENDED), + WORKFLOW_RESUMED(Constants.WORKFLOW_RESUMED), + WORKFLOW_FAULTED(Constants.WORKFLOW_FAULTED), + WORKFLOW_CANCELLED(Constants.WORKFLOW_CANCELLED), + WORKFLOW_STATUS_CHANGED(Constants.WORKFLOW_STATUS_CHANGED); + + public static final class Constants { + + public static final String TASK_STARTED = "task.started.v1"; + public static final String TASK_COMPLETED = "task.completed.v1"; + public static final String TASK_SUSPENDED = "task.suspended.v1"; + public static final String TASK_RESUMED = "task.resumed.v1"; + public static final String TASK_FAULTED = "task.faulted.v1"; + public static final String TASK_CANCELLED = "task.cancelled.v1"; + public static final String TASK_RETRIED = "task.retried.v1"; + public static final String WORKFLOW_STARTED = "workflow.started.v1"; + public static final String WORKFLOW_COMPLETED = "workflow.completed.v1"; + public static final String WORKFLOW_SUSPENDED = "workflow.suspended.v1"; + public static final String WORKFLOW_RESUMED = "workflow.resumed.v1"; + public static final String WORKFLOW_FAULTED = "workflow.faulted.v1"; + public static final String WORKFLOW_CANCELLED = "workflow.cancelled.v1"; + public static final String WORKFLOW_STATUS_CHANGED = "workflow.status-changed.v1"; + } private final String lifecycleId; @@ -39,7 +57,7 @@ public String type() { @Override public String toString() { - return LifeCycleEventType.V8.fullEventType(this.lifecycleId); + return LifeCycleEventType.V8.prefix() + this.lifecycleId; } EventType(String lifecycleId) { diff --git a/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/LifeCycleEventType.java b/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/LifeCycleEventType.java index 2ed3f843e..77014d63f 100644 --- a/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/LifeCycleEventType.java +++ b/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/LifeCycleEventType.java @@ -16,17 +16,22 @@ package org.openworkflow.sdk.impl.lifecycle; public enum LifeCycleEventType { - V8("org.open-workflow-specification."), - V7("io.serverlessworkflow."); + V8(Constants.V8_PREFIX), + V7(Constants.V7_PREFIX); private String prefix; + public static final class Constants { + public static final String V8_PREFIX = "org.open-workflow-specification."; + public static final String V7_PREFIX = "io.serverlessworkflow."; + } + public String prefix() { return prefix; } - public String fullEventType(String eventType) { - return prefix + eventType; + public String fullEventType(EventType eventType) { + return prefix + eventType.type(); } private LifeCycleEventType(String prefix) { diff --git a/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/ce/AbstractLifeCyclePublisher.java b/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/ce/AbstractLifeCyclePublisher.java index 02a87a060..5835f8af7 100644 --- a/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/ce/AbstractLifeCyclePublisher.java +++ b/impl/core/src/main/java/org/openworkflow/sdk/impl/lifecycle/ce/AbstractLifeCyclePublisher.java @@ -65,7 +65,7 @@ public void onTaskStarted(TaskStartedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.TASK_STARTED.type())))); + .withType(type.fullEventType(EventType.TASK_STARTED)))); } @Override @@ -77,7 +77,7 @@ public void onTaskRetried(TaskRetriedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.TASK_RETRIED.type())))); + .withType(type.fullEventType(EventType.TASK_RETRIED)))); } @Override @@ -89,7 +89,7 @@ public void onTaskCompleted(TaskCompletedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.TASK_COMPLETED.type())))); + .withType(type.fullEventType(EventType.TASK_COMPLETED)))); } @Override @@ -101,7 +101,7 @@ public void onTaskSuspended(TaskSuspendedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.TASK_SUSPENDED.type())))); + .withType(type.fullEventType(EventType.TASK_SUSPENDED)))); } @Override @@ -113,7 +113,7 @@ public void onTaskResumed(TaskResumedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.TASK_RESUMED.type())))); + .withType(type.fullEventType(EventType.TASK_RESUMED)))); } @Override @@ -125,7 +125,7 @@ public void onTaskCancelled(TaskCancelledEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.TASK_CANCELLED.type())))); + .withType(type.fullEventType(EventType.TASK_CANCELLED)))); } @Override @@ -137,7 +137,7 @@ public void onTaskFailed(TaskFailedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.TASK_FAULTED.type())))); + .withType(type.fullEventType(EventType.TASK_FAULTED)))); } @Override @@ -149,7 +149,7 @@ public void onWorkflowStarted(WorkflowStartedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.WORKFLOW_STARTED.type())))); + .withType(type.fullEventType(EventType.WORKFLOW_STARTED)))); } @Override @@ -161,7 +161,7 @@ public void onWorkflowSuspended(WorkflowSuspendedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.WORKFLOW_SUSPENDED.type())))); + .withType(type.fullEventType(EventType.WORKFLOW_SUSPENDED)))); } @Override @@ -173,7 +173,7 @@ public void onWorkflowCancelled(WorkflowCancelledEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.WORKFLOW_CANCELLED.type())))); + .withType(type.fullEventType(EventType.WORKFLOW_CANCELLED)))); } @Override @@ -185,7 +185,7 @@ public void onWorkflowResumed(WorkflowResumedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.WORKFLOW_RESUMED.type())))); + .withType(type.fullEventType(EventType.WORKFLOW_RESUMED)))); } @Override @@ -197,7 +197,7 @@ public void onWorkflowCompleted(WorkflowCompletedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.WORKFLOW_COMPLETED.type())))); + .withType(type.fullEventType(EventType.WORKFLOW_COMPLETED)))); } @Override @@ -209,7 +209,7 @@ public void onWorkflowFailed(WorkflowFailedEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.WORKFLOW_FAULTED.type())))); + .withType(type.fullEventType(EventType.WORKFLOW_FAULTED)))); } @Override @@ -222,7 +222,7 @@ public void onWorkflowStatusChanged(WorkflowStatusEvent event) { factory.build( builder(event) .withData(cloudEventData(factory.build(event), this::convert)) - .withType(type.fullEventType(EventType.WORKFLOW_STATUS_CHANGED.type())))); + .withType(type.fullEventType(EventType.WORKFLOW_STATUS_CHANGED)))); } }