From 5ffae7886cc3d18676023d62552f185ea9feb66f Mon Sep 17 00:00:00 2001 From: Sudharaka Palamakumbura Date: Mon, 11 Jan 2021 18:42:10 -0800 Subject: [PATCH] feat: add correct continous integration tool name for the pull request and commit This corrects the name of the continous integration tool for the bot generated pull request and commit. Resolves https://github.com/jhipster/jhipster-online/issues/272 --- .../io/github/jhipster/online/service/CiCdService.java | 4 ++-- .../github/jhipster/online/service/enums/CiCdTool.java | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/github/jhipster/online/service/CiCdService.java b/src/main/java/io/github/jhipster/online/service/CiCdService.java index 6b24dfa1..937666bf 100644 --- a/src/main/java/io/github/jhipster/online/service/CiCdService.java +++ b/src/main/java/io/github/jhipster/online/service/CiCdService.java @@ -97,7 +97,7 @@ public void configureCiCd( this.jHipsterService.addCiCd(ciCdId, workingDir, ciCdTool); this.gitService.addAllFilesToRepository(git, workingDir); - this.gitService.commit(git, workingDir, "Configure " + ciCdTool.capitalize() + " Continuous Integration"); + this.gitService.commit(git, workingDir, "Configure " + ciCdTool.getCiCdToolName() + " Continuous Integration"); this.logsService.addLog( ciCdId, @@ -107,7 +107,7 @@ public void configureCiCd( this.logsService.addLog(ciCdId, "Application successfully pushed!"); this.logsService.addLog(ciCdId, "Creating " + (isGitHub ? "Pull" : "Merge") + " Request"); - String pullRequestTitle = "Configure Continuous Integration with " + ciCdTool.capitalize(); + String pullRequestTitle = "Configure Continuous Integration with " + ciCdTool.getCiCdToolName(); String pullRequestBody = "Continuous Integration configured by JHipster"; if (isGitHub) { diff --git a/src/main/java/io/github/jhipster/online/service/enums/CiCdTool.java b/src/main/java/io/github/jhipster/online/service/enums/CiCdTool.java index a6a8ee65..6f15285d 100644 --- a/src/main/java/io/github/jhipster/online/service/enums/CiCdTool.java +++ b/src/main/java/io/github/jhipster/online/service/enums/CiCdTool.java @@ -25,7 +25,13 @@ public String branchName(String complement) { return format("{0}-{1}-{2}", "jhipster", name().toLowerCase(), complement); } - public String capitalize() { - return StringUtils.capitalize(name().toLowerCase()); + public String getCiCdToolName() { + if (name().equals("GITLAB")) { + return "GitLab"; + } else if (name().equals("GITHUB")) { + return "GitHub"; + } else { + return StringUtils.capitalize(name().toLowerCase()); + } } }