up

Author: benbroadaway

runtime/v2/model/src/main/java/com/walmartlabs/concord/runtime/v2/model/DefaultExclusiveMode.java

@@ -20,13 +20,16 @@
  * =====
  */
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.immutables.value.Value;
 
+import java.io.Serial;
 import java.io.Serializable;
 
-@JsonDeserialize(as = DefaultExclusiveMode.class)
+@JsonDeserialize(as = ImmutableDefaultExclusiveMode.class)
 public interface ExclusiveMode extends Serializable {
 
     @Value.Parameter
@@ -56,4 +59,20 @@ enum Mode {
         wait
     }
 
+    static ExclusiveMode of(String group, Mode mode) {
+        return ImmutableDefaultExclusiveMode.of(group, mode);
+    }
+
+    @Value.Immutable
+    @Value.Style(jdkOnly = true)
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @JsonSerialize(as = ImmutableDefaultExclusiveMode.class)
+    @JsonDeserialize(as = ImmutableDefaultExclusiveMode.class)
+    interface DefaultExclusiveMode extends ExclusiveMode {
+
+        @Serial
+        long serialVersionUID = 1L;
+
+    }
+
 }

runtime/v2/model/src/main/java/com/walmartlabs/concord/runtime/v2/model/ExclusiveMode.java

@@ -351,7 +351,7 @@ public void test008() throws Exception {
         assertEquals(Collections.singletonMap("k", "v"), cfg.arguments());
         assertEquals(Collections.singletonMap("k", "v1"), cfg.requirements());
         assertEquals(Duration.parse("PT1H"), cfg.processTimeout());
-        assertEquals(DefaultExclusiveMode.of("X", ExclusiveMode.Mode.cancel), cfg.exclusive());
+        assertEquals(ExclusiveMode.of("X", ExclusiveMode.Mode.cancel), cfg.exclusive());
         assertEquals(EventConfiguration.builder()
                 .recordTaskInVars(true)
                 .inVarsBlacklist(Collections.singletonList("pass"))

runtime/v2/model/src/test/java/com/walmartlabs/concord/project/runtime/v2/parser/YamlOkParserTest.java

@@ -22,7 +22,6 @@
 
 import com.walmartlabs.concord.common.DateTimeUtils;
 import com.walmartlabs.concord.repository.Snapshot;
-import com.walmartlabs.concord.runtime.v2.model.DefaultExclusiveMode;
 import com.walmartlabs.concord.runtime.v2.model.ExclusiveMode;
 import com.walmartlabs.concord.sdk.Constants;
 import com.walmartlabs.concord.sdk.MapUtils;
@@ -45,7 +44,7 @@ public static ExclusiveMode getExclusive(Payload p) {
             throw new ProcessException(p.getProcessKey(), "Invalid exclusive mode: exclusive group not specified or empty");
         }
         ExclusiveMode.Mode mode = MapUtils.getEnum(exclusive, "mode", ExclusiveMode.Mode.class, ExclusiveMode.Mode.cancel);
-        return DefaultExclusiveMode.of(group, mode);
+        return ExclusiveMode.of(group, mode);
     }
 
     @SuppressWarnings("unchecked")