Skip to content

Commit 45d6da0

Browse files
jminijmini
committed
Merge remote-tracking branch 'origin/main' into 6.x
2 parents f988d28 + b60c045 commit 45d6da0

File tree

4 files changed

+181
-101
lines changed

4 files changed

+181
-101
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,6 +1333,9 @@ public Project updateProject(Project project) throws GitLabApiException {
13331333
Visibility visibility = (project.getVisibility() != null ? project.getVisibility() :
13341334
project.getPublic() == Boolean.TRUE ? Visibility.PUBLIC : null);
13351335
formData.withParam("visibility", visibility);
1336+
formData.withParam("issue_branch_template", project.getIssueBranchTemplate());
1337+
formData.withParam("merge_commit_template", project.getMergeCommitTemplate());
1338+
formData.withParam("squash_commit_template", project.getSquashCommitTemplate());
13361339

13371340
if (project.getTagList() != null && !project.getTagList().isEmpty()) {
13381341
formData.withParam("tag_list", String.join(",", project.getTagList()));

‎src/main/java/org/gitlab4j/api/models/Namespace.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public class Namespace implements Serializable {
1212
private String path;
1313
private String kind;
1414
private String fullPath;
15+
private Long parentId;
1516
private String avatarUrl;
1617
private String webUrl;
1718

@@ -55,6 +56,14 @@ public void setFullPath(String fullPath) {
5556
this.fullPath = fullPath;
5657
}
5758

59+
public Long getParentId() {
60+
return parentId;
61+
}
62+
63+
public void setParentId(Long parentId) {
64+
this.parentId = parentId;
65+
}
66+
5867
public Namespace withId(Long id) {
5968
this.id = id;
6069
return this;

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
package org.gitlab4j.api.models;
33

44
import com.fasterxml.jackson.annotation.JsonCreator;
5+
import com.fasterxml.jackson.annotation.JsonIgnore;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
57
import com.fasterxml.jackson.annotation.JsonValue;
68
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
79
import org.gitlab4j.api.Constants.AutoDevopsDeployStrategy;
@@ -15,6 +17,7 @@
1517
import java.io.Serializable;
1618
import java.util.Date;
1719
import java.util.List;
20+
import java.util.Map;
1821

1922
public class Project implements Serializable {
2023
private static final long serialVersionUID = 1L;
@@ -113,6 +116,11 @@ public String toString() {
113116
private Boolean emailsDisabled;
114117
private String suggestionCommitMessage;
115118
private SquashOption squashOption;
119+
private String mergeCommitTemplate;
120+
private String squashCommitTemplate;
121+
private String issueBranchTemplate;
122+
@JsonProperty("_links")
123+
private Map<String, String> links;
116124

117125
@JsonSerialize(using = JacksonJson.DateOnlySerializer.class)
118126
private Date markedForDeletionOn;
@@ -917,4 +925,45 @@ public Project withSquashOption(SquashOption squashOption) {
917925
this.squashOption = squashOption;
918926
return this;
919927
}
928+
929+
public String getMergeCommitTemplate() {
930+
return mergeCommitTemplate;
931+
}
932+
933+
public void setMergeCommitTemplate(String mergeCommitTemplate) {
934+
this.mergeCommitTemplate = mergeCommitTemplate;
935+
}
936+
937+
public String getSquashCommitTemplate() {
938+
return squashCommitTemplate;
939+
}
940+
941+
public void setSquashCommitTemplate(String squashCommitTemplate) {
942+
this.squashCommitTemplate = squashCommitTemplate;
943+
}
944+
945+
public String getIssueBranchTemplate() {
946+
return issueBranchTemplate;
947+
}
948+
949+
public void setIssueBranchTemplate(String issueBranchTemplate) {
950+
this.issueBranchTemplate = issueBranchTemplate;
951+
}
952+
953+
public Map<String, String> getLinks() {
954+
return links;
955+
}
956+
957+
public void setLinks(Map<String, String> links) {
958+
this.links = links;
959+
}
960+
961+
@JsonIgnore
962+
public String getLinkByName(String name) {
963+
if (links == null || links.isEmpty()) {
964+
return (null);
965+
}
966+
967+
return (links.get(name));
968+
}
920969
}

‎src/test/resources/org/gitlab4j/api/project.json

Lines changed: 120 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,128 @@
11
{
2-
"id": 3,
3-
"default_branch": "master",
4-
"public": false,
5-
"visibility": "private",
6-
"ssh_url_to_repo": "[email protected]:diaspora/diaspora-project-site.git",
7-
"http_url_to_repo": "http://example.com/diaspora/diaspora-project-site.git",
8-
"web_url": "http://example.com/diaspora/diaspora-project-site",
9-
"readme_url": "http://example.com/diaspora/diaspora-project-site/blob/master/README.md",
10-
"tag_list": [
11-
"example",
12-
"disapora project"
13-
],
14-
"owner": {
15-
"id": 3,
16-
"name": "Diaspora",
17-
"created_at": "2013-09-30T13:46:02Z"
2+
"id" : 3,
3+
"description" : "Some description",
4+
"name" : "Diaspora Project Site",
5+
"name_with_namespace" : "Diaspora / Diaspora Project Site",
6+
"path" : "diaspora-project-site",
7+
"path_with_namespace" : "diaspora/diaspora-project-site",
8+
"created_at" : "2013-09-30T13:46:02Z",
9+
"default_branch" : "master",
10+
"tag_list" : [ "example", "disapora project" ],
11+
"topics" : [ ],
12+
"ssh_url_to_repo" : "[email protected]:diaspora/diaspora-project-site.git",
13+
"http_url_to_repo" : "http://example.com/diaspora/diaspora-project-site.git",
14+
"web_url" : "http://example.com/diaspora/diaspora-project-site",
15+
"readme_url" : "http://example.com/diaspora/diaspora-project-site/blob/master/README.md",
16+
"forks_count" : 0,
17+
"avatar_url" : "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
18+
"star_count" : 0,
19+
"last_activity_at" : "2013-09-30T13:46:02Z",
20+
"namespace" : {
21+
"id" : 3,
22+
"name" : "Diaspora",
23+
"path" : "diaspora",
24+
"kind" : "group",
25+
"full_path" : "diaspora",
26+
"parent_id" : 4,
27+
"avatar_url" : "http://localhost:3000/uploads/group/avatar/3/foo.jpg",
28+
"web_url" : "http://localhost:3000/groups/diaspora"
1829
},
19-
"name": "Diaspora Project Site",
20-
"name_with_namespace": "Diaspora / Diaspora Project Site",
21-
"path": "diaspora-project-site",
22-
"path_with_namespace": "diaspora/diaspora-project-site",
23-
"issues_enabled": true,
24-
"open_issues_count": 1,
25-
"merge_requests_enabled": true,
26-
"jobs_enabled": true,
27-
"wiki_enabled": true,
28-
"snippets_enabled": false,
29-
"can_create_merge_request_in": true,
30-
"resolve_outdated_diff_discussions": false,
31-
"container_registry_enabled": false,
32-
"created_at": "2013-09-30T13:46:02Z",
33-
"last_activity_at": "2013-09-30T13:46:02Z",
34-
"creator_id": 3,
35-
"namespace": {
36-
"id": 3,
37-
"name": "Diaspora",
38-
"path": "diaspora",
39-
"kind": "group",
40-
"full_path": "diaspora",
41-
"avatar_url": "http://localhost:3000/uploads/group/avatar/3/foo.jpg",
42-
"web_url": "http://localhost:3000/groups/diaspora"
30+
"_links" : {
31+
"self" : "https://example.com/api/v4/projects/3",
32+
"issues" : "https://example.com/api/v4/projects/3/issues",
33+
"merge_requests" : "https://example.com/api/v4/projects/3/merge_requests",
34+
"repo_branches" : "https://example.com/api/v4/projects/3/repository/branches",
35+
"labels" : "https://example.com/api/v4/projects/3/labels",
36+
"events" : "https://example.com/api/v4/projects/3/events",
37+
"members" : "https://example.com/api/v4/projects/3/members",
38+
"cluster_agents" : "https://example.com/api/v4/projects/3/cluster_agents"
4339
},
44-
"import_status": "none",
45-
"permissions": {
46-
"project_access": {
47-
"access_level": 10,
48-
"notification_level": 3
49-
},
50-
"group_access": {
51-
"access_level": 50,
52-
"notification_level": 3
40+
"packages_enabled" : true,
41+
"empty_repo" : false,
42+
"archived" : false,
43+
"visibility" : "private",
44+
"owner" : {
45+
"id" : 3,
46+
"username" : "user1234",
47+
"name" : "Diaspora",
48+
"state" : "active",
49+
"avatar_url" : "https://secure.gravatar.com/avatar/9b7126c28ab977c4c4a351df3a1d1d24?s=80&d=identicon",
50+
"web_url" : "https://example.com/user1234",
51+
"created_at" : "2013-09-30T13:46:02Z"
52+
},
53+
"resolve_outdated_diff_discussions" : false,
54+
"issues_enabled" : true,
55+
"merge_requests_enabled" : true,
56+
"wiki_enabled" : true,
57+
"jobs_enabled" : true,
58+
"snippets_enabled" : false,
59+
"container_registry_enabled" : false,
60+
"can_create_merge_request_in" : true,
61+
"emails_disabled" : false,
62+
"shared_runners_enabled" : true,
63+
"lfs_enabled" : true,
64+
"creator_id" : 3,
65+
"open_issues_count" : 1,
66+
"ci_default_git_depth" : 50,
67+
"ci_forward_deployment_enabled" : true,
68+
"build_git_strategy" : "fetch",
69+
"runners_token" : "b8bc4a7a29eb76ea83cf79e4908c2b",
70+
"auto_devops_enabled" : true,
71+
"auto_devops_deploy_strategy" : "continuous",
72+
"ci_config_path" : "",
73+
"public_jobs" : true,
74+
"shared_with_groups" : [ {
75+
"group_id" : 4,
76+
"group_name" : "Twitter",
77+
"group_full_path" : "twitter",
78+
"group_access_level" : 30,
79+
"expires_at" : "2023-11-19"
80+
}, {
81+
"group_id" : 3,
82+
"group_name" : "Gitlab Org",
83+
"group_full_path" : "gitlab-org",
84+
"group_access_level" : 10,
85+
"expires_at" : "2023-11-19"
86+
} ],
87+
"only_allow_merge_if_pipeline_succeeds" : false,
88+
"allow_merge_on_skipped_pipeline" : true,
89+
"request_access_enabled" : false,
90+
"only_allow_merge_if_all_discussions_are_resolved" : false,
91+
"remove_source_branch_after_merge" : false,
92+
"printing_merge_request_link_enabled" : true,
93+
"merge_method" : "merge",
94+
"squash_option" : "default_off",
95+
"suggestion_commit_message": "Apply suggestions",
96+
"merge_commit_template": "Merge branch '%{source_branch}' into '%{target_branch}'",
97+
"squash_commit_template": "Commit %{title}",
98+
"issue_branch_template" : "issue-%{id}",
99+
"autoclose_referenced_issues" : true,
100+
"permissions" : {
101+
"project_access" : {
102+
"access_level" : 10,
103+
"notification_level" : 3
53104
}
54105
},
55-
"archived": false,
56-
"avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
57-
"license_url": "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
58-
"license": {
59-
"key": "lgpl-3.0",
60-
"name": "GNU Lesser General Public License v3.0",
61-
"nickname": "GNU LGPLv3",
62-
"html_url": "http://choosealicense.com/licenses/lgpl-3.0/",
63-
"source_url": "http://www.gnu.org/licenses/lgpl-3.0.txt"
106+
"public" : false,
107+
"license_url" : "http://example.com/diaspora/diaspora-client/blob/master/LICENSE",
108+
"license" : {
109+
"key" : "lgpl-3.0",
110+
"name" : "GNU Lesser General Public License v3.0",
111+
"nickname" : "GNU LGPLv3",
112+
"html_url" : "http://choosealicense.com/licenses/lgpl-3.0/",
113+
"source_url" : "http://www.gnu.org/licenses/lgpl-3.0.txt"
64114
},
65-
"shared_runners_enabled": true,
66-
"forks_count": 0,
67-
"star_count": 0,
68-
"runners_token": "b8bc4a7a29eb76ea83cf79e4908c2b",
69-
"ci_default_git_depth": 50,
70-
"public_jobs": true,
71-
"shared_with_groups": [
72-
{
73-
"group_id": 4,
74-
"group_name": "Twitter",
75-
"group_full_path": "twitter",
76-
"group_access_level": 30,
77-
"expires_at": "2023-11-19"
78-
},
79-
{
80-
"group_id": 3,
81-
"group_name": "Gitlab Org",
82-
"group_full_path": "gitlab-org",
83-
"group_access_level": 10,
84-
"expires_at": "2023-11-19"
85-
}
86-
],
87-
"repository_storage": "default",
88-
"only_allow_merge_if_pipeline_succeeds": false,
89-
"only_allow_merge_if_all_discussions_are_resolved": false,
90-
"remove_source_branch_after_merge": false,
91-
"request_access_enabled": false,
92-
"merge_method": "merge",
93-
"auto_devops_enabled": true,
94-
"auto_devops_deploy_strategy": "continuous",
95-
"approvals_before_merge": 0,
96-
"packages_enabled": true,
97-
"autoclose_referenced_issues": true,
98-
"marked_for_deletion_on": "2020-04-03",
99-
"statistics": {
100-
"commit_count": 37,
101-
"storage_size": 1038090,
102-
"repository_size": 1038090,
103-
"wiki_size": 0,
104-
"lfs_objects_size": 0,
105-
"job_artifacts_size": 0,
106-
"packages_size": 0
115+
"repository_storage" : "default",
116+
"approvals_before_merge" : 0,
117+
"marked_for_deletion_on" : "2020-04-03",
118+
"statistics" : {
119+
"commit_count" : 37,
120+
"storage_size" : 1038090,
121+
"repository_size" : 1038090,
122+
"wiki_size" : 0,
123+
"lfs_objects_size" : 0,
124+
"job_artifacts_size" : 0,
125+
"packages_size" : 0
107126
},
108-
"custom_attributes": []
127+
"custom_attributes" : [ ]
109128
}

0 commit comments

Comments
 (0)