enable write gerrit status back

Author: gy2006

core/src/main/java/com/flowci/core/git/client/GerritAPIClient.java

@@ -15,7 +15,10 @@
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.util.UriComponentsBuilder;
 
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -25,8 +28,6 @@
 @Log4j2
 public class GerritAPIClient implements GitAPIClient {
 
-    private final static String SetReviewAPI = "%s/repos/a/changes/%s/revisions/%s/review";
-
     private final HttpClient httpClient;
 
     private final ObjectMapper objectMapper;
@@ -57,7 +58,16 @@ public void writeCommitStatus(GitCommitStatus commit, GitConfig config) {
 
         try {
             var gitConfig = (GitConfigWithHost) config;
-            var url = String.format(SetReviewAPI, gitConfig.getHost(), changeId.get(), commit.getId());
+
+            var url = UriComponentsBuilder.fromHttpUrl(gitConfig.getHost())
+                    .path("/a/changes/")
+                    .path(changeId.get())
+                    .path("/revisions/")
+                    .path(commit.getId())
+                    .path("/review")
+                    .build()
+                    .toUriString();
+
             var request = getRequestBuilder(url, (AuthSecret) secret)
                     .POST(HttpRequest.BodyPublishers.ofString(objectMapper.writeValueAsString(getBodyObj(commit))))
                     .build();
@@ -78,7 +88,8 @@ public void writeCommitStatus(GitCommitStatus commit, GitConfig config) {
     private HttpRequest.Builder getRequestBuilder(String url, AuthSecret secret) {
         var str = secret.getUsername() + ":" + secret.getPassword();
         return HttpRequest.newBuilder(URI.create(url))
-                .setHeader("Authorization", "Basic " + StringHelper.toBase64(str));
+                .setHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+                .setHeader(HttpHeaders.AUTHORIZATION, "Basic " + StringHelper.toBase64(str));
     }
 
     private SetReviewBody getBodyObj(GitCommitStatus c) {

core/src/main/java/com/flowci/core/git/controller/GitConfigController.java

@@ -3,7 +3,7 @@
 import com.flowci.core.auth.annotation.Action;
 import com.flowci.core.common.domain.GitSource;
 import com.flowci.core.git.domain.GitConfig;
-import com.flowci.core.git.service.GitService;
+import com.flowci.core.git.service.GitConfigService;
 import com.flowci.exception.ArgumentException;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,18 +17,18 @@
 public class GitConfigController {
 
     @Autowired
-    private GitService gitService;
+    private GitConfigService gitConfigService;
 
     @Action(GitActions.LIST)
     @GetMapping
     public List<GitConfig> list() {
-        return gitService.list();
+        return gitConfigService.list();
     }
 
     @Action(GitActions.GET)
     @GetMapping("/{source}")
     public GitConfig get(@PathVariable String source) {
-        return gitService.get(GitSource.valueOf(source.toUpperCase()));
+        return gitConfigService.get(GitSource.valueOf(source.toUpperCase()));
     }
 
     @Action(GitActions.SAVE)
@@ -38,12 +38,12 @@ public GitConfig save(@RequestBody Request.SaveOptions options) {
             throw new ArgumentException("Host address is required for Gerrit");
         }
 
-        return gitService.save(options.toGitConfig());
+        return gitConfigService.save(options.toGitConfig());
     }
 
     @Action(GitActions.DELETE)
     @DeleteMapping("/{source}")
     public void delete(@PathVariable String source) {
-        gitService.delete(GitSource.valueOf(source.toUpperCase()));
+        gitConfigService.delete(GitSource.valueOf(source.toUpperCase()));
     }
 }

core/src/main/java/com/flowci/core/git/service/GitService.java renamed to core/src/main/java/com/flowci/core/git/service/GitConfigService.java

@@ -5,7 +5,7 @@
 
 import java.util.List;
 
-public interface GitService {
+public interface GitConfigService {
 
     List<GitConfig> list();
 

core/src/main/java/com/flowci/core/git/service/GitServiceImpl.java renamed to core/src/main/java/com/flowci/core/git/service/GitConfigServiceImpl.java

@@ -31,8 +31,8 @@
 import java.util.*;
 
 @Log4j2
-@Service("gitService")
-public class GitServiceImpl implements GitService {
+@Service("gitConfigService")
+public class GitConfigServiceImpl implements GitConfigService {
 
     @Autowired
     private HttpClient httpClient;
@@ -95,6 +95,7 @@ public void onJobFinishEvent(JobFinishedEvent event) {
 
             var commit = new GitCommitStatus();
             commit.setId(JobContextHelper.getCommitId(job));
+            commit.setMessage(JobContextHelper.getGitMessage(job));
             commit.setUrl(JobContextHelper.getGitUrl(job));
             commit.setTargetUrl(JobContextHelper.getJobUrl(job));
             commit.setStatus(JobContextHelper.getStatus(job).name().toLowerCase());
@@ -121,7 +122,7 @@ private abstract class OperationHandler {
         abstract void writeCommit(GitCommitStatus commit, GitConfig config);
 
         Secret fetch(String name, Class<?> expected) {
-            var event = eventManager.publish(new GetSecretEvent(GitServiceImpl.this, name));
+            var event = eventManager.publish(new GetSecretEvent(this, name));
             Secret secret = event.getFetched();
 
             if (!expected.isInstance(secret)) {

core/src/main/java/com/flowci/core/job/util/JobContextHelper.java

@@ -3,6 +3,9 @@
 import com.flowci.core.common.domain.Variables;
 import com.flowci.core.flow.domain.Flow;
 import com.flowci.core.job.domain.Job;
+import com.flowci.util.StringHelper;
+
+import static com.flowci.core.job.domain.Job.Trigger.PUSH;
 
 public abstract class JobContextHelper {
 
@@ -78,4 +81,19 @@ public static String getCommitId(Job job) {
     public static String getGitSource(Job job) {
         return job.getContext().get(Variables.Git.SOURCE);
     }
+
+    public static String getGitMessage(Job job) {
+        String variable = Variables.Git.PUSH_MESSAGE;
+
+        switch (job.getTrigger()) {
+            case PR_MERGED:
+            case PR_OPENED:
+                variable = Variables.Git.PR_MESSAGE;
+                break;
+            case PATCHSET:
+                variable = Variables.Git.PATCHSET_MESSAGE;
+        }
+
+        return job.getContext().get(variable, StringHelper.EMPTY);
+    }
 }

core/src/test/java/com/flowci/core/test/git/CommitHelperTest.java

@@ -3,7 +3,7 @@
 import com.flowci.core.git.domain.GitCommit;
 import com.flowci.core.git.util.CommitHelper;
 import org.junit.Test;
-import org.junit.Assert;;
+import org.junit.Assert;
 
 public class CommitHelperTest {