create new pathset converter

Author: gy2006

.run/Application - 1.run.xml

@@ -14,7 +14,7 @@
       <env name="FLOWCI_SERVER_PORT" value="8080" />
       <env name="FLOWCI_TEMPLATES" value="https://raw.githubusercontent.com/FlowCI/templates/develop/templates.json" />
       <env name="FLOWCI_AGENT_IMAGE" value="flowci/agent:dev" />
-      <env name="FLOWCI_SERVER_URL" value="http://192.168.31.110:8080" />
+      <env name="FLOWCI_SERVER_URL" value="http://192.168.31.173:8080" />
     </envs>
     <method v="2">
       <option name="Make" enabled="true" />

core/src/main/java/com/flowci/core/common/domain/GitSource.java

@@ -27,4 +27,6 @@ public enum GitSource {
     GOGS,
 
     GITEE,
+
+    GERRIT
 }

core/src/main/java/com/flowci/core/githook/controller/GithookController.java

@@ -62,17 +62,21 @@ public class GithookController {
     @Autowired
     private TriggerConverter giteeConverter;
 
+    @Autowired
+    private TriggerConverter gerritConverter;
+
     @Autowired
     private SpringEventManager eventManager;
 
-    private final Map<GitSource, TriggerConverter> converterMap = new HashMap<>(3);
+    private final Map<GitSource, TriggerConverter> converterMap = new HashMap<>(5);
 
     @PostConstruct
     public void createMapping() {
         converterMap.put(GitSource.GITHUB, gitHubConverter);
         converterMap.put(GitSource.GITLAB, gitLabConverter);
         converterMap.put(GitSource.GOGS, gogsConverter);
         converterMap.put(GitSource.GITEE, giteeConverter);
+        converterMap.put(GitSource.GERRIT, gerritConverter);
     }
 
     /**
@@ -134,6 +138,15 @@ private GitSourceWithEvent findGitSourceByHeader(HttpServletRequest request) {
             return obj;
         }
 
+        // gerrit
+        String gerritUrl = request.getHeader(GerritConverter.Header);
+        // TODO: verify gerrit url
+        if (StringHelper.hasValue(gerritUrl)) {
+            obj.source = GitSource.GERRIT;
+            obj.event =  GerritConverter.AllEvent;
+            return obj;
+        }
+
         throw new ArgumentException("Unsupported git event");
     }
 

core/src/main/java/com/flowci/core/githook/converter/GerritConverter.java

@@ -0,0 +1,162 @@
+package com.flowci.core.githook.converter;
+
+import com.flowci.core.common.domain.GitSource;
+import com.flowci.core.githook.domain.GitPatchSetTrigger;
+import com.flowci.core.githook.domain.GitTrigger;
+import com.flowci.core.githook.domain.GitTriggerable;
+import com.flowci.core.githook.domain.GitUser;
+import com.flowci.util.StringHelper;
+import com.google.common.collect.ImmutableMap;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+
+@Log4j2
+@Component("gerritConverter")
+public class GerritConverter extends TriggerConverter {
+
+    public static final String Header = "x-origin-url";
+    public static final String AllEvent = "all";
+
+    private static final String EventPathsetCreated = "patchset-created";
+    private static final String EventRefUpdated = "ref-updated";
+    private static final String EventChangeMerged = "change-merged";
+
+    private final Map<String, Function<InputStream, GitTrigger>> mapping =
+            ImmutableMap.<String, Function<InputStream, GitTrigger>>builder()
+                    .put(AllEvent, new AllEventsConverter())
+                    .build();
+
+    @Override
+    GitSource getGitSource() {
+        return GitSource.GERRIT;
+    }
+
+    @Override
+    Map<String, Function<InputStream, GitTrigger>> getMapping() {
+        return mapping;
+    }
+
+    private class AllEventsConverter implements Function<InputStream, GitTrigger> {
+
+        @Override
+        public GitTrigger apply(InputStream inputStream) {
+            try {
+                String payload = StringHelper.toString(inputStream);
+                Event event = objectMapper.readValue(payload, Event.class);
+
+                if (Objects.equals(EventPathsetCreated, event.type)) {
+                    PatchSetCreateEvent pce = objectMapper.readValue(payload, PatchSetCreateEvent.class);
+                    return pce.toTrigger();
+                }
+
+                log.warn("Unsupported gerrit event {}", event.type);
+            } catch (IOException e) {
+                log.warn("Unable to parse gerrit payload");
+            }
+
+            return null;
+        }
+    }
+
+    /**
+     * Basic event type
+     * "type": "ref-updated",
+     * "eventCreatedOn": 1642345678
+     */
+    private static class Event {
+
+        public String type;
+    }
+
+    private static class PatchSetCreateEvent implements GitTriggerable {
+
+        public PathSet pathSet;
+
+        public Change change;
+
+        @Override
+        public GitTrigger toTrigger() {
+            GitPatchSetTrigger t = new GitPatchSetTrigger();
+            t.setSource(GitSource.GERRIT);
+            t.setEvent(GitTrigger.GitEvent.PATCHSET_UPDATE);
+
+            t.setSubject(change.subject);
+            t.setMessage(change.commitMessage);
+            t.setProject(change.project);
+            t.setBranch(change.branch);
+            t.setChangeId(change.id);
+            t.setChangeNumber(change.number);
+            t.setChangeUrl(change.url);
+
+            t.setPatchNumber(pathSet.number);
+            t.setPatchUrl(change.url + "/" + pathSet.number);
+            t.setRevision(pathSet.revision);
+            t.setRef(pathSet.ref);
+            t.setCreatedOn(pathSet.createdOn);
+            t.setAuthor(pathSet.author.toGitUser());
+            t.setSizeInsertions(pathSet.sizeInsertions);
+            t.setSizeDeletions(pathSet.sizeDeletions);
+
+            return t;
+        }
+    }
+
+    private static class PathSet {
+
+        public Integer number;
+
+        public String revision;
+
+        public String ref;
+
+        public Author uploader;
+
+        public Author author;
+
+        public String createdOn;
+
+        public Integer sizeInsertions;
+
+        public Integer sizeDeletions;
+    }
+
+    public static class Change {
+
+        public String project;
+
+        public String branch;
+
+        public String id;
+
+        public Integer number;
+
+        public String subject;
+
+        public String url;
+
+        public String commitMessage;
+    }
+
+    private static class Author {
+
+        public String name;
+
+        public String email;
+
+        public String username;
+
+        public GitUser toGitUser() {
+            var user = new GitUser();
+            user.setName(name);
+            user.setEmail(email);
+            user.setUsername(username);
+            return user;
+        }
+    }
+}

core/src/main/java/com/flowci/core/githook/converter/GiteeConverter.java

@@ -52,10 +52,10 @@ public class GiteeConverter extends TriggerConverter {
 
     private final Map<String, Function<InputStream, GitTrigger>> mapping =
             ImmutableMap.<String, Function<InputStream, GitTrigger>>builder()
-                    .put(Ping, new EventConverter<>("Ping", GiteeConverter.PingEvent.class))
+                    .put(Ping, new EventConverter<>("Ping", PingEvent.class))
                     .put(Push, new EventConverter<>("Push", PushTagEvent.class))
                     .put(Tag, new EventConverter<>("Tag", PushTagEvent.class))
-                    .put(PR, new EventConverter<>("PR", GiteeConverter.PrEvent.class))
+                    .put(PR, new EventConverter<>("PR", PrEvent.class))
                     .build();
 
     @Override

core/src/main/java/com/flowci/core/githook/converter/TriggerConverter.java

@@ -38,7 +38,7 @@
 public abstract class TriggerConverter {
 
     @Autowired
-    private ObjectMapper objectMapper;
+    protected ObjectMapper objectMapper;
 
     public Optional<GitTrigger> convert(String event, InputStream body) {
         try {

core/src/main/java/com/flowci/core/githook/domain/GitPatchSetTrigger.java

@@ -0,0 +1,58 @@
+package com.flowci.core.githook.domain;
+
+import com.flowci.util.StringHelper;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * Git trigger to handle gerrit patchset-created event
+ */
+@Getter
+@Setter
+public class GitPatchSetTrigger extends GitTrigger {
+
+    private String subject;
+
+    private String message; // commit message
+
+    private String project;
+
+    private String branch;
+
+    private String changeId;
+
+    private Integer changeNumber;
+
+    private String changeUrl;
+
+    private Integer patchNumber;
+
+    private String patchUrl;
+
+    private String revision;
+
+    private String ref;
+
+    private String createdOn;
+
+    private Integer sizeInsertions;
+
+    private Integer sizeDeletions;
+
+    private GitUser author;
+
+    @Override
+    public boolean isSkip() {
+        return StringHelper.hasValue(message) && message.contains(SkipMessage);
+    }
+
+    @Override
+    public String getId() {
+        return buildId(project, branch, changeId, String.valueOf(patchNumber));
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        return super.equals(o);
+    }
+}

core/src/main/java/com/flowci/core/githook/domain/GitPrTrigger.java

@@ -90,22 +90,6 @@ public String getId() {
         return buildId(getSource().name(), getEvent().name(), getNumber());
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        GitPrTrigger t = (GitPrTrigger) o;
-        return Objects.equals(getSource(), t.getSource())
-                && Objects.equals(getEvent(), t.getEvent())
-                && Objects.equals(getNumber(), t.getNumber());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getSource(), getEvent(), getNumber());
-    }
-
     @Getter
     @Setter
     public static class Source {

core/src/main/java/com/flowci/core/githook/domain/GitPushTrigger.java

@@ -83,22 +83,4 @@ public boolean isSkip() {
     public String getId() {
         return buildId(getSource().name(), getEvent().name(), repoId, ref, commits.get(0).getId());
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        GitPushTrigger t = (GitPushTrigger) o;
-        return Objects.equals(getSource(), t.getSource())
-                && Objects.equals(getEvent(), t.getEvent())
-                && Objects.equals(repoId, t.getRepoId())
-                && Objects.equals(ref, t.getRef())
-                && Objects.equals(commits.get(0), t.getCommits().get(0));
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getSource(), getEvent(), repoId, ref, commits.get(0).hashCode());
-    }
 }

core/src/main/java/com/flowci/core/githook/domain/GitTagTrigger.java

@@ -23,21 +23,4 @@ public boolean isSkip() {
     public String getId() {
         return buildId(getSource().name(), getEvent().name(), getRepoId(), getRef());
     }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        GitTagTrigger t = (GitTagTrigger) o;
-        return Objects.equals(getSource(), t.getSource())
-                && Objects.equals(getEvent(), t.getEvent())
-                && Objects.equals(getRepoId(), t.getRepoId())
-                && Objects.equals(getRef(), t.getRef());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(getSource(), getEvent(), getRepoId(), getRef());
-    }
 }