Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
佳 邓
Gitlab4j Api
Commits
4ab9c153
Commit
4ab9c153
authored
Jun 01, 2021
by
t.mucs
Browse files
Add suggestion_commit_message to Project and ProjectApi.updateProject
parent
2e63cae6
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/main/java/org/gitlab4j/api/ProjectApi.java
View file @
4ab9c153
...
@@ -1022,7 +1022,8 @@ public class ProjectApi extends AbstractApi implements Constants {
...
@@ -1022,7 +1022,8 @@ public class ProjectApi extends AbstractApi implements Constants {
.
withParam
(
"initialize_with_readme"
,
project
.
getInitializeWithReadme
())
.
withParam
(
"initialize_with_readme"
,
project
.
getInitializeWithReadme
())
.
withParam
(
"packages_enabled"
,
project
.
getPackagesEnabled
())
.
withParam
(
"packages_enabled"
,
project
.
getPackagesEnabled
())
.
withParam
(
"build_git_strategy"
,
project
.
getBuildGitStrategy
())
.
withParam
(
"build_git_strategy"
,
project
.
getBuildGitStrategy
())
.
withParam
(
"build_coverage_regex"
,
project
.
getBuildCoverageRegex
());
.
withParam
(
"build_coverage_regex"
,
project
.
getBuildCoverageRegex
())
.
withParam
(
"suggestion_commit_message"
,
project
.
getSuggestionCommitMessage
())
Namespace
namespace
=
project
.
getNamespace
();
Namespace
namespace
=
project
.
getNamespace
();
if
(
namespace
!=
null
&&
namespace
.
getId
()
!=
null
)
{
if
(
namespace
!=
null
&&
namespace
.
getId
()
!=
null
)
{
...
@@ -1267,6 +1268,8 @@ public class ProjectApi extends AbstractApi implements Constants {
...
@@ -1267,6 +1268,8 @@ public class ProjectApi extends AbstractApi implements Constants {
.
withParam
(
"build_git_strategy"
,
project
.
getBuildGitStrategy
())
.
withParam
(
"build_git_strategy"
,
project
.
getBuildGitStrategy
())
.
withParam
(
"build_coverage_regex"
,
project
.
getBuildCoverageRegex
())
.
withParam
(
"build_coverage_regex"
,
project
.
getBuildCoverageRegex
())
.
withParam
(
"merge_method"
,
project
.
getMergeMethod
())
.
withParam
(
"merge_method"
,
project
.
getMergeMethod
())
.
withParam
(
"suggestion_commit_message"
,
project
.
getSuggestionCommitMessage
())
.
withParam
(
"remove_source_branch_after_merge"
,
project
.
getRemoveSourceBranchAfterMerge
());
if
(
isApiVersion
(
ApiVersion
.
V3
))
{
if
(
isApiVersion
(
ApiVersion
.
V3
))
{
formData
.
withParam
(
"visibility_level"
,
project
.
getVisibilityLevel
());
formData
.
withParam
(
"visibility_level"
,
project
.
getVisibilityLevel
());
...
...
src/main/java/org/gitlab4j/api/models/Project.java
View file @
4ab9c153
...
@@ -104,6 +104,7 @@ public class Project {
...
@@ -104,6 +104,7 @@ public class Project {
private
AutoDevopsDeployStrategy
autoDevopsDeployStrategy
;
private
AutoDevopsDeployStrategy
autoDevopsDeployStrategy
;
private
Boolean
autocloseReferencedIssues
;
private
Boolean
autocloseReferencedIssues
;
private
Boolean
emailsDisabled
;
private
Boolean
emailsDisabled
;
private
String
suggestionCommitMessage
;
@JsonSerialize
(
using
=
JacksonJson
.
DateOnlySerializer
.
class
)
@JsonSerialize
(
using
=
JacksonJson
.
DateOnlySerializer
.
class
)
private
Date
markedForDeletionOn
;
private
Date
markedForDeletionOn
;
...
@@ -823,4 +824,17 @@ public class Project {
...
@@ -823,4 +824,17 @@ public class Project {
this
.
emailsDisabled
=
emailsDisabled
;
this
.
emailsDisabled
=
emailsDisabled
;
return
this
;
return
this
;
}
}
public
String
getSuggestionCommitMessage
()
{
return
this
.
suggestionCommitMessage
;
}
public
Project
withSuggestionCommitMessage
(
String
suggestionCommitMessage
)
{
this
.
suggestionCommitMessage
=
suggestionCommitMessage
;
return
this
;
}
public
void
setSuggestionCommitMessage
(
String
suggestionCommitMessage
)
{
this
.
suggestionCommitMessage
=
suggestionCommitMessage
;
}
}
}
src/test/java/org/gitlab4j/api/TestProjectApi.java
View file @
4ab9c153
...
@@ -237,6 +237,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
...
@@ -237,6 +237,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
.
withVisibility
(
Visibility
.
PUBLIC
)
.
withVisibility
(
Visibility
.
PUBLIC
)
.
withTagList
(
Arrays
.
asList
(
"tag1"
,
"tag2"
))
.
withTagList
(
Arrays
.
asList
(
"tag1"
,
"tag2"
))
.
withMergeMethod
(
Project
.
MergeMethod
.
MERGE
)
.
withMergeMethod
(
Project
.
MergeMethod
.
MERGE
)
.
withSuggestionCommitMessage
(
"SuggestionCommitMessageOriginal"
)
Project
newProject
=
gitLabApi
.
getProjectApi
().
createProject
(
project
);
Project
newProject
=
gitLabApi
.
getProjectApi
().
createProject
(
project
);
assertNotNull
(
newProject
);
assertNotNull
(
newProject
);
...
@@ -249,6 +250,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
...
@@ -249,6 +250,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
assertEquals
(
project
.
getTagList
(),
newProject
.
getTagList
());
assertEquals
(
project
.
getTagList
(),
newProject
.
getTagList
());
assertTrue
(
Visibility
.
PUBLIC
==
newProject
.
getVisibility
()
||
Boolean
.
TRUE
==
newProject
.
getPublic
());
assertTrue
(
Visibility
.
PUBLIC
==
newProject
.
getVisibility
()
||
Boolean
.
TRUE
==
newProject
.
getPublic
());
assertEquals
(
Project
.
MergeMethod
.
MERGE
,
newProject
.
getMergeMethod
());
assertEquals
(
Project
.
MergeMethod
.
MERGE
,
newProject
.
getMergeMethod
());
assertEquals
(
project
.
getSuggestionCommitMessage
(),
newProject
.
getSuggestionCommitMessage
());
project
=
new
Project
()
project
=
new
Project
()
.
withId
(
newProject
.
getId
())
.
withId
(
newProject
.
getId
())
...
@@ -260,6 +262,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
...
@@ -260,6 +262,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
.
withSnippetsEnabled
(
false
)
.
withSnippetsEnabled
(
false
)
.
withVisibility
(
Visibility
.
PRIVATE
)
.
withVisibility
(
Visibility
.
PRIVATE
)
.
withMergeMethod
(
Project
.
MergeMethod
.
REBASE_MERGE
)
.
withMergeMethod
(
Project
.
MergeMethod
.
REBASE_MERGE
)
.
withSuggestionCommitMessage
(
"SuggestionCommitMessageUpdated"
)
Project
updatedProject
=
gitLabApi
.
getProjectApi
().
updateProject
(
project
);
Project
updatedProject
=
gitLabApi
.
getProjectApi
().
updateProject
(
project
);
assertNotNull
(
updatedProject
);
assertNotNull
(
updatedProject
);
...
@@ -271,6 +274,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
...
@@ -271,6 +274,7 @@ public class TestProjectApi extends AbstractIntegrationTest {
assertEquals
(
project
.
getSnippetsEnabled
(),
updatedProject
.
getSnippetsEnabled
());
assertEquals
(
project
.
getSnippetsEnabled
(),
updatedProject
.
getSnippetsEnabled
());
assertTrue
(
Visibility
.
PRIVATE
==
updatedProject
.
getVisibility
()
||
Boolean
.
FALSE
==
updatedProject
.
getPublic
());
assertTrue
(
Visibility
.
PRIVATE
==
updatedProject
.
getVisibility
()
||
Boolean
.
FALSE
==
updatedProject
.
getPublic
());
assertEquals
(
Project
.
MergeMethod
.
REBASE_MERGE
,
updatedProject
.
getMergeMethod
());
assertEquals
(
Project
.
MergeMethod
.
REBASE_MERGE
,
updatedProject
.
getMergeMethod
());
assertEquals
(
project
.
getSuggestionCommitMessage
(),
updatedProject
.
getSuggestionCommitMessage
());
}
}
@Test
@Test
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment