refactor without extra interface

Author: benbroadaway

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

@@ -27,15 +27,18 @@
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import org.immutables.value.Value;
 
-import java.io.Serial;
 import java.io.Serializable;
 
+@Value.Immutable
+@Value.Style(jdkOnly = true)
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonSerialize(as = ImmutableDefaultExclusiveMode.class)
-@JsonDeserialize(as = ImmutableDefaultExclusiveMode.class)
+@JsonSerialize(as = ImmutableExclusiveMode.class)
+@JsonDeserialize(as = ImmutableExclusiveMode.class)
 public interface ExclusiveMode extends Serializable {
 
+    long serialVersionUID = 1L;
+
     @Value.Parameter
     @JsonProperty(value = "group", required = true)
     String group();
@@ -64,19 +67,6 @@ enum Mode {
     }
 
     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;
-
+        return ImmutableExclusiveMode.of(group, mode);
     }
-
 }

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

@@ -36,7 +36,7 @@
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 @JsonSerialize(as = ImmutableGithubTriggerExclusiveMode.class)
 @JsonDeserialize(as = ImmutableGithubTriggerExclusiveMode.class)
-public interface GithubTriggerExclusiveMode extends ExclusiveMode, Serializable {
+public interface GithubTriggerExclusiveMode extends Serializable {
 
     @Serial
     long serialVersionUID = 1L;

runtime/v2/model/src/main/java/com/walmartlabs/concord/runtime/v2/parser/ConfigurationGrammar.java

@@ -35,11 +35,11 @@ public final class ConfigurationGrammar {
 
     private static final Parser<Atom, ExclusiveMode> exclusive =
             betweenTokens(JsonToken.START_OBJECT, JsonToken.END_OBJECT,
-                    with(ImmutableDefaultExclusiveMode::builder,
+                    with(ImmutableExclusiveMode::builder,
                             o -> options(
                                     mandatory("group", stringNotEmptyVal.map(o::group)),
                                     optional("mode", enumVal(ExclusiveMode.Mode.class).map(o::mode))))
-                            .map(ImmutableDefaultExclusiveMode.Builder::build));
+                            .map(ImmutableExclusiveMode.Builder::build));
 
     public static final Parser<Atom, ExclusiveMode> exclusiveVal =
             orError(exclusive, YamlValueType.EXCLUSIVE_MODE);

runtime/v2/model/src/main/java/com/walmartlabs/concord/runtime/v2/schema/TriggerMixIn.java

@@ -175,6 +175,9 @@ interface GenericTriggerParams extends DefaultTriggerParams {
 
             @JsonProperty("conditions")
             Map<String, Object> conditions();
+
+            @JsonProperty("exclusive")
+            ExclusiveMode exclusive();
         }
     }
 
@@ -188,8 +191,5 @@ interface DefaultTriggerParams {
 
         @JsonProperty("arguments")
         Map<String, Object> arguments();
-
-        @JsonProperty("exclusive")
-        ExclusiveMode exclusive();
     }
 }

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

@@ -570,6 +570,26 @@ public void test019() throws Exception {
         assertTrue(p1.configuration().debug());
     }
 
+    @Test // GitHub trigger exclusive grouping
+    void test020() throws Exception {
+        ProcessDefinition pd = load("020.yml");
+
+        List<Trigger> triggers = pd.triggers();
+        assertNotNull(triggers);
+
+        assertEquals(2, triggers.size());
+
+        Trigger t = triggers.get(0);
+        assertEquals("github", t.name());
+        var exclusive = assertInstanceOf(GithubTriggerExclusiveMode.class, t.configuration().get("exclusive"));
+        assertEquals("branch", exclusive.groupByProperty());
+
+        t = triggers.get(1);
+        assertEquals("github", t.name());
+        exclusive = assertInstanceOf(GithubTriggerExclusiveMode.class, t.configuration().get("exclusive"));
+        assertEquals("event.pull_request.html_url", exclusive.groupByProperty());
+    }
+
     @Test
     public void testArgsOrder() throws Exception {
         ProcessDefinition pd = load("args-order.concord.yml");

runtime/v2/model/src/test/resources/020.yml

@@ -0,0 +1,19 @@
+
+triggers:
+  - github:
+      version: 2
+      useInitiator: true
+      entryPoint: onPush
+      conditions:
+        type: "push"
+      exclusive:
+        groupBy: branch
+
+  - github:
+      version: 2
+      useInitiator: true
+      entryPoint: onPush2
+      conditions:
+        type: push2
+      exclusive:
+        groupBy: "event.pull_request.html_url"