Merge branch 'main' into server-lite

Author: v1r3n

.github/workflows/publish.yml

@@ -42,7 +42,6 @@ jobs:
           ORG_GRADLE_PROJECT_signingKeyId: ${{ secrets.SIGNING_KEY_ID }}
           ORG_GRADLE_PROJECT_signingKey: ${{ secrets.SIGNING_KEY }}
           ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.SIGNING_PASSWORD }}
-
   publish-server:
     runs-on: ubuntu-latest
     name: Gradle Build and Publish
@@ -78,6 +77,4 @@ jobs:
           asset_name: conductor-server-lite.jar
           asset_content_type: application/java-archive
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

awss3-storage/build.gradle

@@ -17,5 +17,6 @@ dependencies {
     compileOnly 'org.springframework.boot:spring-boot-starter'
 
     implementation "com.amazonaws:aws-java-sdk-s3:${revAwsSdk}"
+    implementation "com.amazonaws:aws-java-sdk-sts:${revAwsSdk}"
     implementation "org.apache.commons:commons-lang3"
 }

common/src/main/java/com/netflix/conductor/common/run/WorkflowSummaryExtended.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright 2025 Conductor Authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.netflix.conductor.common.run;
+
+import java.util.Map;
+
+import com.netflix.conductor.annotations.protogen.ProtoField;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/** Extended version of WorkflowSummary that retains input/output as Map */
+public class WorkflowSummaryExtended extends WorkflowSummary {
+
+    @ProtoField(id = 9) // Ensure Protobuf compatibility
+    @JsonIgnore
+    private Map<String, Object> inputMap;
+
+    @ProtoField(id = 10)
+    @JsonIgnore
+    private Map<String, Object> outputMap;
+
+    public WorkflowSummaryExtended(Workflow workflow) {
+        super(workflow);
+        if (workflow.getInput() != null) {
+            this.inputMap = workflow.getInput();
+        }
+        if (workflow.getOutput() != null) {
+            this.outputMap = workflow.getOutput();
+        }
+    }
+
+    /** New method for JSON serialization */
+    @JsonProperty("input")
+    public Map<String, Object> getInputMap() {
+        return inputMap;
+    }
+
+    /** New method for JSON serialization */
+    @JsonProperty("output")
+    public Map<String, Object> getOutputMap() {
+        return outputMap;
+    }
+
+    public void setInputMap(Map<String, Object> inputMap) {
+        this.inputMap = inputMap;
+    }
+
+    public void setOutputMap(Map<String, Object> outputMap) {
+        this.outputMap = outputMap;
+    }
+}

conductor-clients/java/conductor-java-sdk/build.gradle

@@ -35,6 +35,7 @@ subprojects {
         implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${versions.jackson}"
         implementation "com.fasterxml.jackson.module:jackson-module-kotlin:${versions.jackson}"
         implementation "com.fasterxml.jackson.module:jackson-module-afterburner:${versions.jackson}"
+        implementation "org.openjdk.nashorn:nashorn-core:15.4"
 
         implementation "org.slf4j:slf4j-api:${versions.slf4j}"
         implementation "org.apache.commons:commons-lang3:${versions.commonsLang}"

conductor-clients/java/conductor-java-sdk/conductor-client/src/main/java/com/netflix/conductor/client/http/TaskClient.java

@@ -515,7 +515,7 @@ public SearchResult<Task> searchV2(Integer start, Integer size, String sort, Str
         return resp.getData();
     }
 
-    private void populateTaskPayloads(Task task) {
+    public void populateTaskPayloads(Task task) {
         if (!conductorClientConfiguration.isEnforceThresholds()) {
             return;
         }

conductor-clients/java/conductor-java-sdk/conductor-client/src/main/java/com/netflix/conductor/client/http/WorkflowClient.java

@@ -127,7 +127,7 @@ public String startWorkflow(StartWorkflowRequest startWorkflowRequest) {
         return resp.getData();
     }
 
-    private void checkAndUploadToExternalStorage(StartWorkflowRequest startWorkflowRequest) {
+    public void checkAndUploadToExternalStorage(StartWorkflowRequest startWorkflowRequest) {
         try (ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream()) {
             objectMapper.writeValue(byteArrayOutputStream, startWorkflowRequest.getInput());
             byte[] workflowInputBytes = byteArrayOutputStream.toByteArray();
@@ -565,7 +565,7 @@ public Workflow testWorkflow(WorkflowTestRequest testRequest) {
      *
      * @param workflow the workflow for which the output is to be populated.
      */
-    private void populateWorkflowOutput(Workflow workflow) {
+    public void populateWorkflowOutput(Workflow workflow) {
         if (StringUtils.isNotBlank(workflow.getExternalOutputPayloadStoragePath())) {
             eventDispatcher.publish(new WorkflowPayloadUsedEvent(workflow.getWorkflowName(),
                     workflow.getWorkflowVersion(),

conductor-clients/java/conductor-java-sdk/conductor-client/src/main/java/com/netflix/conductor/common/metadata/SchemaDef.java

@@ -14,6 +14,13 @@
 
 import java.util.Map;
 
+import lombok.*;
+
+@EqualsAndHashCode(callSuper = true)
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
 public class SchemaDef extends Auditable {
 
     public enum Type {

conductor-clients/java/conductor-java-sdk/conductor-client/src/main/java/com/netflix/conductor/common/metadata/workflow/SubWorkflowParams.java

@@ -35,7 +35,7 @@ public class SubWorkflowParams {
     private IdempotencyStrategy idempotencyStrategy;
 
     // Priority of the sub workflow, not set inherits from the parent
-    private Integer priority;
+    private Object priority;
 
     public String getIdempotencyKey() {
         return idempotencyKey;
@@ -154,11 +154,10 @@ public boolean equals(Object o) {
         return Objects.equals(getName(), that.getName()) && Objects.equals(getVersion(), that.getVersion()) && Objects.equals(getTaskToDomain(), that.getTaskToDomain()) && Objects.equals(getWorkflowDefinition(), that.getWorkflowDefinition());
     }
 
-    public Integer getPriority() {
+    public Object getPriority() {
         return priority;
     }
-
-    public void setPriority(Integer priority) {
+    public void setPriority(Object priority) {
         this.priority = priority;
     }
 }

conductor-clients/java/conductor-java-sdk/conductor-client/src/test/java/com/netflix/conductor/common/metadata/workflow/WorkflowDefDeserializationTest.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2020 Conductor Authors.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.netflix.conductor.common.metadata.workflow;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import com.netflix.conductor.common.config.ObjectMapperProvider;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+
+class WorkflowDefDeserializationTest {
+
+    private ObjectMapper objectMapper;
+
+    @BeforeEach
+    public void setup() {
+        objectMapper = new ObjectMapperProvider().getObjectMapper();
+    }
+
+    @Test
+    @DisplayName("Should correctly deserialize subworkflow priority as a dynamic expression")
+    public void testSubworkflowPriorityDeserialization() throws Exception {
+        try (InputStream inputStream = getClass().getResourceAsStream("/workflows/main_workflow.json")) {
+            if (inputStream == null) {
+                throw new IOException("Resource not found: /workflows/main_workflow.json");
+            }
+            WorkflowDef mainWorkflowDef = objectMapper.readValue(inputStream, WorkflowDef.class);
+            Assertions.assertEquals("${fetchPriority.output.priority}",
+                    mainWorkflowDef.getTasks().get(1).getSubWorkflowParam().getPriority().toString(),
+                    "Subworkflow priority should be deserialized as a dynamic expression");
+        }
+    }
+}

conductor-clients/java/conductor-java-sdk/conductor-client/src/test/resources/workflows/main_workflow.json

@@ -0,0 +1,25 @@
+{
+  "name": "main_workflow_with_priority",
+  "version": 1,
+  "tasks": [
+    {
+      "name": "fetch_priority_config",
+      "taskReferenceName": "fetchPriority",
+      "type": "SIMPLE",
+      "outputParameters": {
+        "priority": 42
+      }
+    },
+    {
+      "name": "sub_workflow_example",
+      "taskReferenceName": "subWorkflowTask",
+      "type": "SUB_WORKFLOW",
+      "subWorkflowParam": {
+        "name": "sub_workflow_example",
+        "version": 1,
+        "priority": "${fetchPriority.output.priority}"
+      }
+    }
+  ],
+  "schemaVersion": 2
+}