Skip to content

Commit 09e56b7

Browse files
committed
Merge pull request #13 from oxc/modern_collections
Use un-synchronized Collections instead of Java2 Vector
2 parents cb98ef0 + def429b commit 09e56b7

4 files changed

Lines changed: 19 additions & 18 deletions

File tree

src/main/java/com/dkaedv/glghproxy/controller/OrgsController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dkaedv.glghproxy.controller;
22

33
import java.io.IOException;
4+
import java.util.Collections;
45
import java.util.List;
5-
import java.util.Vector;
66

77
import org.apache.commons.logging.Log;
88
import org.apache.commons.logging.LogFactory;
@@ -29,6 +29,6 @@ public List<Repository> getReposForOrg(
2929

3030
LOG.info("Received request: orgname=" + orgname + ", per_page=" + per_page + ", page=" + page + ", authorization=" + authorization);
3131

32-
return new Vector<Repository>();
32+
return Collections.emptyList();
3333
}
3434
}

src/main/java/com/dkaedv/glghproxy/controller/ReposController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dkaedv.glghproxy.controller;
22

33
import java.io.IOException;
4+
import java.util.Collections;
45
import java.util.List;
5-
import java.util.Vector;
66

77
import org.apache.commons.logging.Log;
88
import org.apache.commons.logging.LogFactory;
@@ -96,7 +96,7 @@ public List<Event> getEvents(
9696
@RequestHeader("Authorization") String authorization
9797
) {
9898

99-
return new Vector<Event>();
99+
return Collections.emptyList();
100100
}
101101

102102
@RequestMapping("/{namespace}/{repo}/pulls")
@@ -180,7 +180,7 @@ public List<Comment> getReviewCommentsOnPullRequest(
180180
@RequestHeader("Authorization") String authorization
181181
) throws IOException {
182182

183-
return new Vector<Comment>();
183+
return Collections.emptyList();
184184
}
185185

186186
@RequestMapping(value = "/{namespace}/{repo}/hooks", method = RequestMethod.GET)

src/main/java/com/dkaedv/glghproxy/controller/UserController.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dkaedv.glghproxy.controller;
22

33
import java.io.IOException;
4+
import java.util.Collections;
45
import java.util.List;
5-
import java.util.Vector;
66

77
import org.apache.commons.logging.Log;
88
import org.apache.commons.logging.LogFactory;
@@ -27,7 +27,7 @@ public List<Repository> getReposForCurrentUser(
2727

2828
LOG.info("Received request: per_page=" + per_page + ", page=" + page);
2929

30-
return new Vector<Repository>();
30+
return Collections.emptyList();
3131
}
3232

3333
}

src/main/java/com/dkaedv/glghproxy/converter/GitlabToGithubConverter.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.dkaedv.glghproxy.converter;
22

3+
import java.util.ArrayList;
34
import java.util.HashMap;
45
import java.util.List;
5-
import java.util.Vector;
66

77
import org.apache.commons.lang3.StringUtils;
88
import org.apache.commons.logging.Log;
@@ -49,7 +49,7 @@ public static RepositoryBranch convertBranch(GitlabBranch glbranch) {
4949
}
5050

5151
public static List<RepositoryBranch> convertBranches(List<GitlabBranch> glbranches) {
52-
List<RepositoryBranch> branches = new Vector<RepositoryBranch>();
52+
List<RepositoryBranch> branches = new ArrayList<>(glbranches.size());
5353

5454
for (GitlabBranch glbranch : glbranches) {
5555
RepositoryBranch branch = convertBranch(glbranch);
@@ -81,9 +81,10 @@ public static RepositoryCommit convertCommit(GitlabCommit glcommit, List<GitlabC
8181
repoCommit.setAuthor(user);
8282
repoCommit.setCommitter(user);
8383

84-
if (glcommit.getParentIds() != null) {
85-
List<Commit> parents = new Vector<Commit>();
86-
for (String parentSha : glcommit.getParentIds()) {
84+
List<String> parentIds = glcommit.getParentIds();
85+
if (parentIds != null) {
86+
List<Commit> parents = new ArrayList<>(parentIds.size());
87+
for (String parentSha : parentIds) {
8788
Commit parent = new Commit();
8889
parent.setSha(parentSha);
8990
parents.add(parent);
@@ -92,7 +93,7 @@ public static RepositoryCommit convertCommit(GitlabCommit glcommit, List<GitlabC
9293
}
9394

9495
if (gldiffs != null) {
95-
List<CommitFile> files = new Vector<CommitFile>();
96+
List<CommitFile> files = new ArrayList<>(gldiffs.size());
9697
for (GitlabCommitDiff diff : gldiffs) {
9798
convertCommitFile(files, diff);
9899
}
@@ -159,7 +160,7 @@ public static Repository convertRepository(GitlabProject project) {
159160
}
160161

161162
public static List<Repository> convertRepositories(List<GitlabProject> projects) {
162-
List<Repository> repos = new Vector<Repository>();
163+
List<Repository> repos = new ArrayList<>(projects.size());
163164

164165
for (GitlabProject project : projects) {
165166
repos.add(convertRepository(project));
@@ -169,7 +170,7 @@ public static List<Repository> convertRepositories(List<GitlabProject> projects)
169170
}
170171

171172
public static List<PullRequest> convertMergeRequests(List<GitlabMergeRequest> glmergerequests, String gitlabUrl, String namespace, String repo) {
172-
List<PullRequest> pulls = new Vector<PullRequest>();
173+
List<PullRequest> pulls = new ArrayList<>(glmergerequests.size());
173174

174175
for (GitlabMergeRequest glmr : glmergerequests) {
175176
pulls.add(convertMergeRequest(glmr, gitlabUrl, namespace, repo));
@@ -282,7 +283,7 @@ public static User convertUser(GitlabUser gluser) {
282283
}
283284

284285
public static List<RepositoryCommit> convertCommits(List<GitlabCommit> glcommits) {
285-
List<RepositoryCommit> commits = new Vector<RepositoryCommit>();
286+
List<RepositoryCommit> commits = new ArrayList<>(glcommits.size());
286287

287288
for (GitlabCommit glcommit : glcommits) {
288289
commits.add(convertCommit(glcommit, null, null));
@@ -292,7 +293,7 @@ public static List<RepositoryCommit> convertCommits(List<GitlabCommit> glcommits
292293
}
293294

294295
public static List<Comment> convertComments(List<GitlabNote> glnotes) {
295-
List<Comment> comments = new Vector<Comment>();
296+
List<Comment> comments = new ArrayList<>(glnotes.size());
296297

297298
for (GitlabNote glnote : glnotes) {
298299
comments.add(convertComment(glnote));
@@ -313,7 +314,7 @@ private static Comment convertComment(GitlabNote glnote) {
313314
}
314315

315316
public static List<RepositoryHook> convertHooks(List<GitlabProjectHook> glhooks) {
316-
List<RepositoryHook> hooks = new Vector<RepositoryHook>();
317+
List<RepositoryHook> hooks = new ArrayList<>(glhooks.size());
317318

318319
for (GitlabProjectHook glhook : glhooks) {
319320
hooks.add(convertHook(glhook));

0 commit comments

Comments
 (0)