Skip to content

Commit 76ac293

Browse files
dcendentsjetersen
dcendents
and
jetersen
authored
update gitlab4j-api, use long instead of int for id values (#188)
Co-authored-by: Daniel Beland <daniel.beland@thalesgroup.com> Co-authored-by: Joseph Petersen <josephp90@gmail.com>
1 parent d930a8d commit 76ac293

File tree

12 files changed

+60
-67
lines changed

12 files changed

+60
-67
lines changed

‎pom.xml‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<dependency>
3838
<groupId>io.jenkins.plugins</groupId>
3939
<artifactId>gitlab-api</artifactId>
40-
<version>1.0.6</version>
40+
<version>5.0.1-69.vcdc19e779072</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.jenkins-ci.plugins</groupId>
@@ -125,20 +125,6 @@
125125
<groupId>io.jenkins.configuration-as-code</groupId>
126126
<artifactId>test-harness</artifactId>
127127
<scope>test</scope>
128-
<exclusions>
129-
<exclusion>
130-
<groupId>com.fasterxml.jackson.core</groupId>
131-
<artifactId>jackson-databind</artifactId>
132-
</exclusion>
133-
<exclusion>
134-
<groupId>com.fasterxml.jackson.core</groupId>
135-
<artifactId>jackson-core</artifactId>
136-
</exclusion>
137-
<exclusion>
138-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
139-
<artifactId>jackson-jaxrs-json-provider</artifactId>
140-
</exclusion>
141-
</exclusions>
142128
</dependency>
143129
<dependency>
144130
<groupId>org.jenkins-ci.plugins</groupId>
@@ -154,7 +140,7 @@
154140
<dependency>
155141
<groupId>io.jenkins.tools.bom</groupId>
156142
<artifactId>bom-2.289.x</artifactId>
157-
<version>1246.va_b_50630c1d19</version>
143+
<version>1280.vd669827e38cd</version>
158144
<scope>import</scope>
159145
<type>pom</type>
160146
</dependency>

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabCauseUtils.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@ public static String defaultDateString(Date date) {
2929
public static String defaultIntString(Integer val) {
3030
return val == null ? "" : val.toString();
3131
}
32+
33+
public static String defaultLongString(Long val) {
34+
return val == null ? "" : val.toString();
35+
}
3236
}

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabMergeRequestCauseData.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultIntString;
1212
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultLabelString;
1313
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultListSize;
14+
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultLongString;
1415
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultVisibilityString;
1516
import static org.apache.commons.lang.StringUtils.defaultString;
1617

@@ -24,7 +25,7 @@ public GitLabMergeRequestCauseData(MergeRequestEvent mergeRequestEvent) {
2425
this.variables.put("GITLAB_USER_NAME", defaultString(mergeRequestEvent.getUser().getName()));
2526
this.variables.put("GITLAB_USER_USERNAME", defaultString(mergeRequestEvent.getUser().getUsername()));
2627
this.variables.put("GITLAB_USER_AVATAR_URL", defaultString(mergeRequestEvent.getUser().getAvatarUrl()));
27-
this.variables.put("GITLAB_PROJECT_ID", defaultIntString(mergeRequestEvent.getProject().getId()));
28+
this.variables.put("GITLAB_PROJECT_ID", defaultLongString(mergeRequestEvent.getProject().getId()));
2829
this.variables.put("GITLAB_PROJECT_NAME", defaultString(mergeRequestEvent.getProject().getName()));
2930
this.variables.put("GITLAB_PROJECT_DESCRIPTION", defaultString(mergeRequestEvent.getProject().getDescription()));
3031
this.variables.put("GITLAB_PROJECT_WEB_URL", defaultString(mergeRequestEvent.getProject().getWebUrl()));
@@ -47,20 +48,20 @@ public GitLabMergeRequestCauseData(MergeRequestEvent mergeRequestEvent) {
4748
this.variables.put("GITLAB_REPO_GIT_SSH_URL", defaultString(mergeRequestEvent.getRepository().getGit_ssh_url()));
4849
this.variables.put("GITLAB_REPO_GIT_HTTP_URL", defaultString(mergeRequestEvent.getRepository().getGit_http_url()));
4950
this.variables.put("GITLAB_REPO_VISIBILITY_LEVEL", defaultVisibilityString(mergeRequestEvent.getRepository().getVisibility_level()));
50-
this.variables.put("GITLAB_OA_ID", defaultIntString(mergeRequestEvent.getObjectAttributes().getId()));
51+
this.variables.put("GITLAB_OA_ID", defaultLongString(mergeRequestEvent.getObjectAttributes().getId()));
5152
this.variables.put("GITLAB_OA_TARGET_BRANCH", defaultString(mergeRequestEvent.getObjectAttributes().getTargetBranch()));
5253
this.variables.put("GITLAB_OA_SOURCE_BRANCH", defaultString(mergeRequestEvent.getObjectAttributes().getSourceBranch()));
53-
this.variables.put("GITLAB_OA_SOURCE_PROJECT_ID", defaultIntString(mergeRequestEvent.getObjectAttributes().getSourceProjectId()));
54-
this.variables.put("GITLAB_OA_AUTHOR_ID", defaultIntString(mergeRequestEvent.getObjectAttributes().getAuthorId()));
55-
this.variables.put("GITLAB_OA_ASSIGNEE_ID", defaultIntString(mergeRequestEvent.getObjectAttributes().getAssigneeId()));
54+
this.variables.put("GITLAB_OA_SOURCE_PROJECT_ID", defaultLongString(mergeRequestEvent.getObjectAttributes().getSourceProjectId()));
55+
this.variables.put("GITLAB_OA_AUTHOR_ID", defaultLongString(mergeRequestEvent.getObjectAttributes().getAuthorId()));
56+
this.variables.put("GITLAB_OA_ASSIGNEE_ID", defaultLongString(mergeRequestEvent.getObjectAttributes().getAssigneeId()));
5657
this.variables.put("GITLAB_OA_TITLE", defaultString(mergeRequestEvent.getObjectAttributes().getTitle()));
5758
this.variables.put("GITLAB_OA_CREATED_AT", defaultDateString(mergeRequestEvent.getObjectAttributes().getCreatedAt()));
5859
this.variables.put("GITLAB_OA_UPDATED_AT", defaultDateString(mergeRequestEvent.getObjectAttributes().getUpdatedAt()));
59-
this.variables.put("GITLAB_OA_MILESTONE_ID", defaultIntString(mergeRequestEvent.getObjectAttributes().getMilestoneId()));
60+
this.variables.put("GITLAB_OA_MILESTONE_ID", defaultLongString(mergeRequestEvent.getObjectAttributes().getMilestoneId()));
6061
this.variables.put("GITLAB_OA_STATE", defaultString(mergeRequestEvent.getObjectAttributes().getState()));
6162
this.variables.put("GITLAB_OA_MERGE_STATUS", defaultString(mergeRequestEvent.getObjectAttributes().getMergeStatus()));
62-
this.variables.put("GITLAB_OA_TARGET_PROJECT_ID", defaultIntString(mergeRequestEvent.getObjectAttributes().getTargetProjectId()));
63-
this.variables.put("GITLAB_OA_IID", defaultIntString(mergeRequestEvent.getObjectAttributes().getIid()));
63+
this.variables.put("GITLAB_OA_TARGET_PROJECT_ID", defaultLongString(mergeRequestEvent.getObjectAttributes().getTargetProjectId()));
64+
this.variables.put("GITLAB_OA_IID", defaultLongString(mergeRequestEvent.getObjectAttributes().getIid()));
6465
this.variables.put("GITLAB_OA_DESCRIPTION", defaultString(mergeRequestEvent.getObjectAttributes().getDescription()));
6566
this.variables.put("GITLAB_OA_SOURCE_NAME", defaultString(mergeRequestEvent.getObjectAttributes().getSource().getName()));
6667
this.variables.put("GITLAB_OA_SOURCE_DESCRIPTION", defaultString(mergeRequestEvent.getObjectAttributes().getSource().getDescription()));
@@ -107,20 +108,20 @@ public GitLabMergeRequestCauseData(MergeRequestEvent mergeRequestEvent) {
107108
int totalLabels = defaultListSize(mergeRequestEvent.getLabels());
108109
this.variables.put("GITLAB_LABELS_COUNT", defaultIntString(totalLabels));
109110
for(int i = 0; i < totalLabels; i++) {
110-
this.variables.put("GITLAB_LABEL_ID_" + i, defaultIntString(mergeRequestEvent.getLabels().get(i).getId()));
111+
this.variables.put("GITLAB_LABEL_ID_" + i, defaultLongString(mergeRequestEvent.getLabels().get(i).getId()));
111112
this.variables.put("GITLAB_LABEL_TITLE_" + i, defaultString(mergeRequestEvent.getLabels().get(i).getTitle()));
112113
this.variables.put("GITLAB_LABEL_COLOR_" + i, defaultString(mergeRequestEvent.getLabels().get(i).getColor()));
113-
this.variables.put("GITLAB_LABEL_PROJECT_ID_" + i, defaultIntString(mergeRequestEvent.getLabels().get(i).getProjectId()));
114+
this.variables.put("GITLAB_LABEL_PROJECT_ID_" + i, defaultLongString(mergeRequestEvent.getLabels().get(i).getProjectId()));
114115
this.variables.put("GITLAB_LABEL_CREATED_AT_" + i, defaultDateString(mergeRequestEvent.getLabels().get(i).getCreatedAt()));
115116
this.variables.put("GITLAB_LABEL_UPDATED_AT_" + i, defaultDateString(mergeRequestEvent.getLabels().get(i).getUpdatedAt()));
116117
this.variables.put("GITLAB_LABEL_TEMPLATE_" + i, defaultBooleanString(mergeRequestEvent.getLabels().get(i).getTemplate()));
117118
this.variables.put("GITLAB_LABEL_DESCRIPTION_" + i, defaultString(mergeRequestEvent.getLabels().get(i).getDescription()));
118119
this.variables.put("GITLAB_LABEL_TYPE_" + i, defaultLabelString(mergeRequestEvent.getLabels().get(i).getType()));
119-
this.variables.put("GITLAB_LABEL_GROUP_ID_" + i, defaultIntString(mergeRequestEvent.getLabels().get(i).getGroupId()));
120+
this.variables.put("GITLAB_LABEL_GROUP_ID_" + i, defaultLongString(mergeRequestEvent.getLabels().get(i).getGroupId()));
120121
}
121122
if(mergeRequestEvent.getChanges().getUpdatedById() != null) {
122-
this.variables.put("GITLAB_CHANGES_UPDATED_BY_ID_PREV", defaultIntString(mergeRequestEvent.getChanges().getUpdatedById().getPrevious()));
123-
this.variables.put("GITLAB_CHANGES_UPDATED_BY_ID_CURR", defaultIntString(mergeRequestEvent.getChanges().getUpdatedById().getCurrent()));
123+
this.variables.put("GITLAB_CHANGES_UPDATED_BY_ID_PREV", defaultLongString(mergeRequestEvent.getChanges().getUpdatedById().getPrevious()));
124+
this.variables.put("GITLAB_CHANGES_UPDATED_BY_ID_CURR", defaultLongString(mergeRequestEvent.getChanges().getUpdatedById().getCurrent()));
124125
}
125126
if(mergeRequestEvent.getChanges().getUpdatedAt() != null) {
126127
this.variables.put("GITLAB_CHANGES_UPDATED_AT_PREV", defaultDateString(mergeRequestEvent.getChanges().getUpdatedAt().getPrevious()));

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabPushCauseData.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultDateString;
1010
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultIntString;
1111
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultListSize;
12+
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultLongString;
1213
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultVisibilityString;
1314
import static org.apache.commons.lang.StringUtils.defaultString;
1415

@@ -23,11 +24,11 @@ public GitLabPushCauseData(PushEvent pushEvent) {
2324
this.variables.put("GITLAB_BEFORE", defaultString(pushEvent.getBefore()));
2425
this.variables.put("GITLAB_REF", defaultString(pushEvent.getRef()));
2526
this.variables.put("GITLAB_CHECKOUT_SHA", defaultString(pushEvent.getCheckoutSha()));
26-
this.variables.put("GITLAB_USER_ID", defaultIntString(pushEvent.getUserId()));
27+
this.variables.put("GITLAB_USER_ID", defaultLongString(pushEvent.getUserId()));
2728
this.variables.put("GITLAB_USER_NAME", defaultString(pushEvent.getUserName()));
2829
this.variables.put("GITLAB_USER_EMAIL", defaultString(pushEvent.getUserEmail()));
29-
this.variables.put("GITLAB_PROJECT_ID", defaultIntString(pushEvent.getProjectId()));
30-
this.variables.put("GITLAB_PROJECT_ID_2", defaultIntString(pushEvent.getProject().getId()));
30+
this.variables.put("GITLAB_PROJECT_ID", defaultLongString(pushEvent.getProjectId()));
31+
this.variables.put("GITLAB_PROJECT_ID_2", defaultLongString(pushEvent.getProject().getId()));
3132
this.variables.put("GITLAB_PROJECT_NAME", defaultString(pushEvent.getProject().getName()));
3233
this.variables.put("GITLAB_PROJECT_DESCRIPTION", defaultString(pushEvent.getProject().getDescription()));
3334
this.variables.put("GITLAB_PROJECT_WEB_URL", defaultString(pushEvent.getProject().getWebUrl()));
@@ -60,7 +61,7 @@ public GitLabPushCauseData(PushEvent pushEvent) {
6061
this.variables.put("GITLAB_COMMIT_AUTHOR_AVATAR_URL_" + index+1, defaultString(pushEvent.getCommits().get(index).getAuthor().getAvatarUrl()));
6162
this.variables.put("GITLAB_COMMIT_AUTHOR_CREATED_AT_" + index+1, defaultDateString(pushEvent.getCommits().get(index).getAuthor().getCreatedAt()));
6263
this.variables.put("GITLAB_COMMIT_AUTHOR_EMAIL_" + index+1, defaultString(pushEvent.getCommits().get(index).getAuthor().getEmail()));
63-
this.variables.put("GITLAB_COMMIT_AUTHOR_ID_" + index+1, defaultIntString(pushEvent.getCommits().get(index).getAuthor().getId()));
64+
this.variables.put("GITLAB_COMMIT_AUTHOR_ID_" + index+1, defaultLongString(pushEvent.getCommits().get(index).getAuthor().getId()));
6465
this.variables.put("GITLAB_COMMIT_AUTHOR_NAME_" + index+1, defaultString(pushEvent.getCommits().get(index).getAuthor().getName()));
6566
this.variables.put("GITLAB_COMMIT_AUTHOR_STATE_" + index+1, defaultString(pushEvent.getCommits().get(index).getAuthor().getState()));
6667
this.variables.put("GITLAB_COMMIT_AUTHOR_USERNAME_" + index+1, defaultString(pushEvent.getCommits().get(index).getAuthor().getUsername()));

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/Cause/GitLabTagPushCauseData.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.kohsuke.stapler.export.ExportedBean;
88

99
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultIntString;
10+
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultLongString;
1011
import static io.jenkins.plugins.gitlabbranchsource.Cause.GitLabCauseUtils.defaultVisibilityString;
1112
import static org.apache.commons.lang.StringUtils.defaultString;
1213

@@ -21,11 +22,11 @@ public GitLabTagPushCauseData(TagPushEvent tagPushEvent) {
2122
this.variables.put("GITLAB_BEFORE", defaultString(tagPushEvent.getBefore()));
2223
this.variables.put("GITLAB_REF", defaultString(tagPushEvent.getRef()));
2324
this.variables.put("GITLAB_CHECKOUT_SHA", defaultString(tagPushEvent.getCheckoutSha()));
24-
this.variables.put("GITLAB_USER_ID", defaultIntString(tagPushEvent.getUserId()));
25+
this.variables.put("GITLAB_USER_ID", defaultLongString(tagPushEvent.getUserId()));
2526
this.variables.put("GITLAB_USER_NAME", defaultString(tagPushEvent.getUserName()));
2627
this.variables.put("GITLAB_USER_EMAIL", defaultString(tagPushEvent.getUserEmail()));
27-
this.variables.put("GITLAB_PROJECT_ID", defaultIntString(tagPushEvent.getProjectId()));
28-
this.variables.put("GITLAB_PROJECT_ID_2", defaultIntString(tagPushEvent.getProject().getId()));
28+
this.variables.put("GITLAB_PROJECT_ID", defaultLongString(tagPushEvent.getProjectId()));
29+
this.variables.put("GITLAB_PROJECT_ID_2", defaultLongString(tagPushEvent.getProject().getId()));
2930
this.variables.put("GITLAB_PROJECT_NAME", defaultString(tagPushEvent.getProject().getName()));
3031
this.variables.put("GITLAB_PROJECT_DESCRIPTION", defaultString(tagPushEvent.getProject().getDescription()));
3132
this.variables.put("GITLAB_PROJECT_WEB_URL", defaultString(tagPushEvent.getProject().getWebUrl()));

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabMergeRequestCommentTrigger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public GitLabMergeRequestCommentTrigger(NoteEvent payload) {
2929
public void isMatch() {
3030
if (getPayload().getObjectAttributes().getNoteableType()
3131
.equals(NoteEvent.NoteableType.MERGE_REQUEST)) {
32-
Integer mergeRequestId = getPayload().getMergeRequest().getIid();
32+
Long mergeRequestId = getPayload().getMergeRequest().getIid();
3333
final Pattern mergeRequestJobNamePattern = Pattern
3434
.compile("^MR-" + mergeRequestId + "\\b.*$",
3535
Pattern.CASE_INSENSITIVE);

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/GitLabSCMSource.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,18 +114,18 @@ public class GitLabSCMSource extends AbstractGitSCMSource {
114114
private String sshRemote;
115115
private String httpRemote;
116116
private transient Project gitlabProject;
117-
private int projectId;
117+
private long projectId;
118118

119119
/**
120120
* The cache of {@link ObjectMetadataAction} instances for each open MR.
121121
*/
122122
@NonNull
123-
private transient /* effectively final */ Map<Integer, ObjectMetadataAction> mergeRequestMetadataCache = new ConcurrentHashMap<>();
123+
private transient /* effectively final */ Map<Long, ObjectMetadataAction> mergeRequestMetadataCache = new ConcurrentHashMap<>();
124124
/**
125125
* The cache of {@link ObjectMetadataAction} instances for each open MR.
126126
*/
127127
@NonNull
128-
private transient /* effectively final */ Map<Integer, ContributorMetadataAction> mergeRequestContributorCache = new ConcurrentHashMap<>();
128+
private transient /* effectively final */ Map<Long, ContributorMetadataAction> mergeRequestContributorCache = new ConcurrentHashMap<>();
129129

130130
@DataBoundConstructor
131131
public GitLabSCMSource(String serverName, String projectOwner, String projectPath) {
@@ -227,12 +227,12 @@ public HashMap<String, AccessLevel> getMembers() {
227227
return members;
228228
}
229229

230-
public int getProjectId() {
230+
public long getProjectId() {
231231
return projectId;
232232
}
233233

234234
@DataBoundSetter
235-
public void setProjectId(int projectId) {
235+
public void setProjectId(long projectId) {
236236
this.projectId = projectId;
237237
}
238238

@@ -263,7 +263,7 @@ protected SCMRevision retrieve(@NonNull SCMHead head, @NonNull TaskListener list
263263
MergeRequestSCMHead h = (MergeRequestSCMHead) head;
264264
listener.getLogger().format("Querying the current revision of merge request #%s...%n", h.getId());
265265
MergeRequest mr = gitLabApi.getMergeRequestApi().getMergeRequest(gitlabProject,
266-
Integer.parseInt(h.getId()));
266+
Long.parseLong(h.getId()));
267267
String targetSha = gitLabApi.getRepositoryApi().getBranch(mr.getTargetProjectId(), mr.getTargetBranch())
268268
.getCommit().getId();
269269
if (mr.getState().equals(Constants.MergeRequestState.OPENED.toString())) {
@@ -383,7 +383,7 @@ public SCMSourceCriteria.Probe create(@NonNull BranchSCMHead head,
383383
if (request.isFetchMRs() && !request.isComplete()) {
384384
int count = 0;
385385
listener.getLogger().format("%nChecking merge requests..%n");
386-
HashMap<Integer, String> forkMrSources = new HashMap<>();
386+
HashMap<Long, String> forkMrSources = new HashMap<>();
387387
for (MergeRequest mr : request.getMergeRequests()) {
388388
mergeRequestContributorCache.put(mr.getIid(),
389389
new ContributorMetadataAction(
@@ -594,7 +594,7 @@ protected List<Action> retrieveActions(@NonNull SCMHead head, SCMHeadEvent event
594594
result.add(new PrimaryInstanceMetadataAction());
595595
}
596596
} else if (head instanceof MergeRequestSCMHead) {
597-
int iid = Integer.parseInt(((MergeRequestSCMHead) head).getId());
597+
long iid = Long.parseLong(((MergeRequestSCMHead) head).getId());
598598
String mergeUrl = mergeRequestUriTemplate(serverName).set("project", splitPath(projectPath)).set("iid", iid)
599599
.expand();
600600
ObjectMetadataAction metadataAction = mergeRequestMetadataCache.get(iid);
@@ -807,7 +807,7 @@ context, StandardUsernameCredentials.class, fromUri(getServerUrlFromName(serverN
807807
return result;
808808
}
809809

810-
public int getProjectId(@QueryParameter String projectPath, @QueryParameter String serverName) {
810+
public long getProjectId(@QueryParameter String projectPath, @QueryParameter String serverName) {
811811
List<GitLabServer> gitLabServers = GitLabServers.get().getServers();
812812
if (gitLabServers.size() == 0) {
813813
return -1;

‎src/main/java/io/jenkins/plugins/gitlabbranchsource/helpers/GitLabGroup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ public class GitLabGroup extends GitLabOwner {
55
private String fullName;
66
private String description;
77

8-
public GitLabGroup(String name, String webUrl, String avatarUrl, Integer id,
8+
public GitLabGroup(String name, String webUrl, String avatarUrl, Long id,
99
String fullName, String description) {
1010
super(name, webUrl, avatarUrl, id);
1111
this.fullName = fullName;

0 commit comments

Comments
 (0)