Skip to content

Commit 4ab9c15

Browse files
author
t.mucs
committed
Add suggestion_commit_message to Project and ProjectApi.updateProject
1 parent 2e63cae commit 4ab9c15

File tree

3 files changed

+22
-1
lines changed

3 files changed

+22
-1
lines changed

src/main/java/org/gitlab4j/api/ProjectApi.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,8 @@ public Project createProject(Project project, String importUrl) throws GitLabApi
10221022
.withParam("initialize_with_readme", project.getInitializeWithReadme())
10231023
.withParam("packages_enabled", project.getPackagesEnabled())
10241024
.withParam("build_git_strategy", project.getBuildGitStrategy())
1025-
.withParam("build_coverage_regex", project.getBuildCoverageRegex());
1025+
.withParam("build_coverage_regex", project.getBuildCoverageRegex())
1026+
.withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
10261027

10271028
Namespace namespace = project.getNamespace();
10281029
if (namespace != null && namespace.getId() != null) {
@@ -1267,6 +1268,8 @@ public Project updateProject(Project project) throws GitLabApiException {
12671268
.withParam("build_git_strategy", project.getBuildGitStrategy())
12681269
.withParam("build_coverage_regex", project.getBuildCoverageRegex())
12691270
.withParam("merge_method", project.getMergeMethod())
1271+
.withParam("suggestion_commit_message", project.getSuggestionCommitMessage())
1272+
.withParam("remove_source_branch_after_merge", project.getRemoveSourceBranchAfterMerge());
12701273

12711274
if (isApiVersion(ApiVersion.V3)) {
12721275
formData.withParam("visibility_level", project.getVisibilityLevel());

src/main/java/org/gitlab4j/api/models/Project.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ public String toString() {
104104
private AutoDevopsDeployStrategy autoDevopsDeployStrategy;
105105
private Boolean autocloseReferencedIssues;
106106
private Boolean emailsDisabled;
107+
private String suggestionCommitMessage;
107108

108109
@JsonSerialize(using = JacksonJson.DateOnlySerializer.class)
109110
private Date markedForDeletionOn;
@@ -823,4 +824,17 @@ public Project withEmailsDisabled(Boolean emailsDisabled) {
823824
this.emailsDisabled = emailsDisabled;
824825
return this;
825826
}
827+
828+
public String getSuggestionCommitMessage() {
829+
return this.suggestionCommitMessage;
830+
}
831+
832+
public Project withSuggestionCommitMessage(String suggestionCommitMessage) {
833+
this.suggestionCommitMessage = suggestionCommitMessage;
834+
return this;
835+
}
836+
837+
public void setSuggestionCommitMessage(String suggestionCommitMessage) {
838+
this.suggestionCommitMessage = suggestionCommitMessage;
839+
}
826840
}

src/test/java/org/gitlab4j/api/TestProjectApi.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ public void testUpdate() throws GitLabApiException {
237237
.withVisibility(Visibility.PUBLIC)
238238
.withTagList(Arrays.asList("tag1", "tag2"))
239239
.withMergeMethod(Project.MergeMethod.MERGE)
240+
.withSuggestionCommitMessage("SuggestionCommitMessageOriginal")
240241

241242
Project newProject = gitLabApi.getProjectApi().createProject(project);
242243
assertNotNull(newProject);
@@ -249,6 +250,7 @@ public void testUpdate() throws GitLabApiException {
249250
assertEquals(project.getTagList(), newProject.getTagList());
250251
assertTrue(Visibility.PUBLIC == newProject.getVisibility() || Boolean.TRUE == newProject.getPublic());
251252
assertEquals(Project.MergeMethod.MERGE, newProject.getMergeMethod());
253+
assertEquals(project.getSuggestionCommitMessage(), newProject.getSuggestionCommitMessage());
252254

253255
project = new Project()
254256
.withId(newProject.getId())
@@ -260,6 +262,7 @@ public void testUpdate() throws GitLabApiException {
260262
.withSnippetsEnabled(false)
261263
.withVisibility(Visibility.PRIVATE)
262264
.withMergeMethod(Project.MergeMethod.REBASE_MERGE)
265+
.withSuggestionCommitMessage("SuggestionCommitMessageUpdated")
263266

264267
Project updatedProject = gitLabApi.getProjectApi().updateProject(project);
265268
assertNotNull(updatedProject);
@@ -271,6 +274,7 @@ public void testUpdate() throws GitLabApiException {
271274
assertEquals(project.getSnippetsEnabled(), updatedProject.getSnippetsEnabled());
272275
assertTrue(Visibility.PRIVATE == updatedProject.getVisibility() || Boolean.FALSE == updatedProject.getPublic());
273276
assertEquals(Project.MergeMethod.REBASE_MERGE, updatedProject.getMergeMethod());
277+
assertEquals(project.getSuggestionCommitMessage(), updatedProject.getSuggestionCommitMessage());
274278
}
275279

276280
@Test

0 commit comments

Comments
 (0)