The Unified and Autonomous Development Platform
chore: Refactoring various restful resources
Robin Shenbe49adb47309
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex f62b40f1fe..b59b77bd8a 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -106,5 +106,5 @@ public interface BuildManager extends EntityManager<Build> {File getBuildDir(Long projectId, Long buildNumber);File getArtifactsDir(Long projectId, Long buildNumber);-+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex e0cd977aed..0d7228d4bd 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -161,7 +161,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Buiprivate volatile IMap<Long, BuildFacade> cache;- private volatile Map<Long, Collection<String>> jobNames;+ private volatile IMap<Long, Collection<String>> jobNames;private volatile String taskId;@@ -942,12 +942,12 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui});}- private void populateJobNames(Long projectId, String jobName) {- Collection<String> jobNamesOfProject = jobNames.get(projectId);- if (jobNamesOfProject == null)- jobNamesOfProject = new HashSet<>();- jobNamesOfProject.add(jobName);- jobNames.put(projectId, jobNamesOfProject);+ private void populateJobNames(Long projectId, String jobName) {+ jobNames.compute(projectId, (key, existingJobNames) -> {+ Collection<String> jobNamesOfProject = existingJobNames != null ? existingJobNames : new HashSet<>();+ jobNamesOfProject.add(jobName);+ return jobNamesOfProject;+ });}@Overridediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex 3972ec6495..3b5876396e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -14,7 +14,6 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;import com.hazelcast.core.HazelcastInstance;-import com.hazelcast.cp.IAtomicLong;import io.onedev.server.cluster.ClusterManager;import io.onedev.server.entitymanager.GroupManager;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex a45f06bdba..401a4b1065 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -149,7 +149,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Issprivate final SequenceGenerator numberGenerator;- private volatile IMap<String, Long> ids;+ private volatile IMap<String, Long> idCache;@Injectpublic DefaultIssueManager(Dao dao, IssueFieldManager fieldManager, TransactionManager transactionManager,@@ -189,7 +189,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isslogger.info("Caching issue info...");HazelcastInstance hazelcastInstance = clusterManager.getHazelcastInstance();- ids = hazelcastInstance.getMap("issueIds");+ idCache = hazelcastInstance.getMap("issueIds");var cacheInited = hazelcastInstance.getCPSubsystem().getAtomicLong("issueCacheInited");clusterManager.initWithLead(cacheInited, () -> {@@ -198,7 +198,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssLong issueId = (Long) fields[0];Long projectId = (Long)fields[1];Long issueNumber = (Long) fields[2];- ids.put(getCacheKey(projectId, issueNumber), issueId);+ idCache.put(getCacheKey(projectId, issueNumber), issueId);}return 1L;});@@ -927,7 +927,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssIssue issue = (Issue) event.getEntity();var issueKey = getCacheKey(issue);var issueId = issue.getId();- transactionManager.runAfterCommit(() -> ids.put(issueKey, issueId));+ transactionManager.runAfterCommit(() -> idCache.put(issueKey, issueId));}}@@ -936,7 +936,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Isspublic void on(EntityRemoved event) {if (event.getEntity() instanceof Issue) {var cacheKey = getCacheKey((Issue) event.getEntity());- transactionManager.runAfterCommit(() -> ids.remove(cacheKey));+ transactionManager.runAfterCommit(() -> idCache.remove(cacheKey));} else if (event.getEntity() instanceof Project) {Project project = (Project) event.getEntity();@@ -944,12 +944,12 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssnumberGenerator.removeNextSequence(project);Long projectId = project.getId();- transactionManager.runAfterCommit(() -> ids.removeAll(entry -> entry.getKey().startsWith(projectId + ":")));+ transactionManager.runAfterCommit(() -> idCache.removeAll(entry -> entry.getKey().startsWith(projectId + ":")));}}private Long getIssueId(Long projectId, Long issueNumber) {- return ids.get(getCacheKey(projectId, issueNumber));+ return idCache.get(getCacheKey(projectId, issueNumber));}@Sessionaldiff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenAuthorizationResource.javaindex d043e0e9a4..ff587c97e8 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenAuthorizationResource.java@@ -26,7 +26,7 @@ import io.onedev.server.entitymanager.AuditManager;import io.onedev.server.model.AccessTokenAuthorization;import io.onedev.server.rest.annotation.Api;-@Api(order=9500, description = "This resource manages project authorizations of access tokens. Note that " ++@Api(description = "This resource manages project authorizations of access tokens. Note that " +"project authorizations will not take effect if option <tt>hasOwnerPermissions</tt> is enabled " +"for associated access token")@Path("/access-token-authorizations")diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenResource.javaindex 90ebc5383f..845a89397e 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AccessTokenResource.java@@ -30,7 +30,6 @@ import io.onedev.server.model.AccessToken;import io.onedev.server.model.AccessTokenAuthorization;import io.onedev.server.rest.annotation.Api;-@Api(order=5030)@Path("/access-tokens")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.javaindex 0484c12209..293ffd8535 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AgentResource.java@@ -28,7 +28,6 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.search.entity.agent.AgentQuery;import io.onedev.server.security.SecurityUtils;-@Api(order=10000)@Path("/agents")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/AgentTokenResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/AgentTokenResource.javaindex 8e6f61975e..595c969774 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/AgentTokenResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/AgentTokenResource.java@@ -29,7 +29,6 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.resource.support.RestConstants;import io.onedev.server.security.SecurityUtils;-@Api(order=10100)@Path("/agent-tokens")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.javaindex 67891b5281..4e08814e37 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ArtifactResource.java@@ -34,7 +34,7 @@ import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;import static javax.ws.rs.core.Response.ok;import static io.onedev.server.util.IOUtils.copy;-@Api(order=4100, description="In most cases, artifact resource is operated with build id, which is different from build number. "+@Api(description="In most cases, artifact resource is operated with build id, which is different from build number. "+ "To get build id of a particular build number, use the <a href='/~help/api/io.onedev.server.rest.BuildResource/queryBasicInfo'>Query Basic Info</a> operation with query for "+ "instance <code>"Number" is "path/to/project#100"</code> or <code>"Number" is "PROJECTKEY-100"</code>")@Path("/artifacts")diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BaseAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BaseAuthorizationResource.javaindex bb5fc0815a..99a167ddd6 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BaseAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BaseAuthorizationResource.java@@ -22,7 +22,7 @@ import io.onedev.server.model.BaseAuthorization;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=7500, description = "This resource manages default roles of project")+@Api(description = "This resource manages default roles of project")@Path("/base-authorizations")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLabelResource.javaindex 0edb7f62da..00abf95e20 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLabelResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLabelResource.java@@ -13,7 +13,6 @@ import javax.ws.rs.*;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;-@Api(order=10500)@Path("/build-labels")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.javaindex ceaacb2f5b..9b6f598f9c 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildLogStreamResource.java@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;import static java.nio.charset.StandardCharsets.UTF_8;import static javax.ws.rs.core.MediaType.APPLICATION_OCTET_STREAM;-@Api(order=4200, description="Build log stream resource is operated with build id, which is different from build number. "+@Api(description="Build log stream resource is operated with build id, which is different from build number. "+ "To get build id of a particular build number, use the <a href='/~help/api/io.onedev.server.rest.BuildResource/queryBasicInfo'>Query Basic Info</a> operation with query for "+ "instance <code>"Number" is "path/to/project#100"</code> or <code>"Number" is "PROJECTKEY-100"</code>")@Path("/streaming/build-logs")diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.javaindex bce04e6d52..4c86d897b5 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/BuildResource.java@@ -35,7 +35,7 @@ import io.onedev.server.rest.resource.support.RestConstants;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.security.SecurityUtils;-@Api(order=4000, description="In most cases, build resource is operated with build id, which is different from build number. "+@Api(description="In most cases, build resource is operated with build id, which is different from build number. "+ "To get build id of a particular build number, use the <a href='/~help/api/io.onedev.server.rest.BuildResource/queryBasicInfo'>Query Basic Info</a> operation with query for "+ "instance <code>"Number" is "path/to/project#100"</code> or <code>"Number" is "PROJECTKEY-100"</code>")@Path("/builds")diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.javaindex 53aa6dd0ff..ab7bcdd34b 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/CodeCommentResource.java@@ -20,7 +20,6 @@ import io.onedev.server.model.CodeComment;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=4700)@Path("/code-comments")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.javaindex c570ea7160..b46e8d480f 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/EmailAddressResource.java@@ -26,7 +26,6 @@ import io.onedev.server.model.EmailAddress;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=5010)@Path("/email-addresses")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.javaindex a2651ec565..2726ead5fa 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/GroupAuthorizationResource.java@@ -22,7 +22,6 @@ import io.onedev.server.model.GroupAuthorization;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=9000)@Path("/group-authorizations")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.javaindex 341a4a9a3f..8a7d100cf3 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/GroupResource.java@@ -32,7 +32,6 @@ import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=6000)@Path("/groups")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.javaindex 3df3c6e5fc..d7c845bde9 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueCommentResource.java@@ -27,7 +27,6 @@ import io.onedev.server.model.IssueCommentRevision;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=2300)@Path("/issue-comments")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.javaindex bce35230a9..cbfd5d4964 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueLinkResource.java@@ -15,7 +15,6 @@ import javax.ws.rs.core.Response;import static io.onedev.server.security.SecurityUtils.canAccessIssue;import static io.onedev.server.security.SecurityUtils.canEditIssueLink;-@Api(order=2400)@Path("/issue-links")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.javaindex 92074ad44b..b4cad25db5 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueResource.java@@ -64,7 +64,7 @@ import io.onedev.server.util.ProjectScopedCommit;import io.onedev.server.web.page.help.ApiHelpUtils;import io.onedev.server.web.page.help.ValueInfo;-@Api(order=2000, description="In most cases, issue resource is operated with issue id, which is different from issue number. "+@Api(description="In most cases, issue resource is operated with issue id, which is different from issue number. "+ "To get issue id of a particular issue number, use the <a href='/~help/api/io.onedev.server.rest.IssueResource/queryBasicInfo'>Query Basic Info</a> operation with query for "+ "instance <code>"Number" is "path/to/project#100"</code> or <code>"Number" is "PROJECTKEY-100"</code>")@Path("/issues")diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.javaindex c4eb63b01e..f7300f825a 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueVoteResource.java@@ -15,7 +15,6 @@ import javax.ws.rs.core.Response;import static io.onedev.server.security.SecurityUtils.canModifyOrDelete;-@Api(order=2100)@Path("/issue-votes")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.javaindex 9c9749b6c1..feb16d37ef 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWatchResource.java@@ -15,7 +15,6 @@ import javax.ws.rs.core.Response;import static io.onedev.server.security.SecurityUtils.canModifyOrDelete;-@Api(order=2200)@Path("/issue-watches")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.javaindex 7111578121..2424d734a4 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IssueWorkResource.java@@ -23,7 +23,6 @@ import io.onedev.server.model.IssueWork;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=2250)@Path("/issue-works")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/IterationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/IterationResource.javaindex 81e085b141..d605a776d1 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/IterationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/IterationResource.java@@ -22,7 +22,6 @@ import io.onedev.server.model.Iteration;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=2500)@Path("/iterations")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.javaindex 1616cdd10e..fcaf8cf1c7 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/JobRunResource.java@@ -30,7 +30,6 @@ import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;import java.io.Serializable;-@Api(order=3500)@Path("/job-runs")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/LabelSpecResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/LabelSpecResource.javaindex 48974e9b20..9e8710b6d7 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/LabelSpecResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/LabelSpecResource.java@@ -28,7 +28,6 @@ import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=10200)@Path("/label-specs")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/MembershipResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/MembershipResource.javaindex 78e15d145d..6c5f531668 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/MembershipResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/MembershipResource.java@@ -22,7 +22,6 @@ import io.onedev.server.model.Membership;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=6100)@Path("/memberships")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.javaindex 0351d4ad7e..a23b245df1 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackBlobResource.java@@ -20,7 +20,7 @@ import io.onedev.server.model.PackBlob;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=4400, name="Package Blob")+@Api(name="Package Blob")@Path("/package-blobs")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackLabelResource.javaindex 8965c02aca..2c9b8faaf7 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackLabelResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackLabelResource.java@@ -13,7 +13,7 @@ import javax.ws.rs.*;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;-@Api(order=10450, name="Package Label")+@Api(name="Package Label")@Path("/package-labels")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.javaindex 47b487cee8..01d19965db 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PackResource.java@@ -32,7 +32,7 @@ import io.onedev.server.rest.resource.support.RestConstants;import io.onedev.server.search.entity.pack.PackQuery;import io.onedev.server.security.SecurityUtils;-@Api(order=4300, name="Package")+@Api(name="Package")@Path("/packages")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectLabelResource.javaindex 57ea9f813e..8b6f8ba3da 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectLabelResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectLabelResource.java@@ -20,7 +20,6 @@ import io.onedev.server.model.ProjectLabel;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=10300)@Path("/project-labels")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.javaindex 488fc36f20..24192d9888 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/ProjectResource.java@@ -72,7 +72,6 @@ import io.onedev.server.web.UrlManager;import io.onedev.server.web.page.project.setting.ContributedProjectSetting;import io.onedev.server.xodus.CommitInfoManager;-@Api(order=1000)@Path("/projects")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestAssignmentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestAssignmentResource.javaindex ae87448ed2..f2bce94fb0 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestAssignmentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestAssignmentResource.java@@ -21,7 +21,6 @@ import io.onedev.server.model.PullRequestAssignment;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=3100)@Path("/pull-request-assignments")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.javaindex 6e5edfb312..b28817f888 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestCommentResource.java@@ -24,7 +24,6 @@ import io.onedev.server.model.PullRequestCommentRevision;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=3200)@Path("/pull-request-comments")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestLabelResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestLabelResource.javaindex 18565cd71b..d817d1f93a 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestLabelResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestLabelResource.java@@ -13,7 +13,6 @@ import javax.ws.rs.*;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;-@Api(order=10400)@Path("/pull-request-labels")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.javaindex 671640fb4c..af588c4fc1 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestResource.java@@ -57,7 +57,7 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ProjectAndBranch;-@Api(order=3000, description="In most cases, pull request resource is operated with pull request id, which is different from pull request number. "+@Api(name="Pull Request", description="In most cases, pull request resource is operated with pull request id, which is different from pull request number. "+ "To get pull request id of a particular pull request number, use the <a href='/~help/api/io.onedev.server.rest.PullRequestResource/queryBasicInfo'>Query Basic Info</a> operation with query for "+ "instance <code>"Number" is "path/to/project#100"</code> or <code>"Number" is "PROJECTKEY-100"</code>")@Path("/pulls")diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestReviewResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestReviewResource.javaindex 3f42011265..741406c53b 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestReviewResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestReviewResource.java@@ -14,7 +14,6 @@ import javax.ws.rs.*;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;-@Api(order=3300)@Path("/pull-request-reviews")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.javaindex 7bffa23114..ac2b72a4e2 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/PullRequestWatchResource.java@@ -13,7 +13,6 @@ import javax.ws.rs.*;import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;-@Api(order=3400)@Path("/pull-request-watches")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.javaindex 2be5e6c4e4..ee68519b81 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/RepositoryResource.java@@ -41,7 +41,6 @@ import java.util.*;import static java.util.stream.Collectors.toList;-@Api(order=1100)@Path("/repositories")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.javaindex d49a08695f..e9f20eff2a 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/RoleResource.java@@ -31,7 +31,6 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.resource.support.RestConstants;import io.onedev.server.security.SecurityUtils;-@Api(order=7000)@Path("/roles")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/SettingResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/SettingResource.javaindex d9e196bf79..070a2a9a92 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/SettingResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/SettingResource.java@@ -43,7 +43,6 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.layout.ContributedAdministrationSetting;-@Api(order=10000)@Path("/settings")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/SshKeyResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/SshKeyResource.javaindex 629122cfda..335d10ad99 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/SshKeyResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/SshKeyResource.java@@ -25,7 +25,6 @@ import io.onedev.server.model.SshKey;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=5050)@Path("/ssh-keys")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.javaindex b655f46557..b9b288720d 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/TriggerJobResource.java@@ -24,7 +24,7 @@ import java.util.HashMap;import java.util.List;import java.util.Map;-@Api(order=3510, description="This resource provides an alternative way to run job by passing all parameters via url")+@Api(description="This resource provides an alternative way to run job by passing all parameters via url")@Path("/trigger-job")@Consumes(MediaType.WILDCARD)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.javaindex b5f64fde69..dd3804c6fe 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserAuthorizationResource.java@@ -22,7 +22,6 @@ import io.onedev.server.model.UserAuthorization;import io.onedev.server.rest.annotation.Api;import io.onedev.server.security.SecurityUtils;-@Api(order=8000)@Path("/user-authorizations")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.javaindex 818970717d..d909073ec3 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java@@ -64,7 +64,6 @@ import io.onedev.server.rest.annotation.Api;import io.onedev.server.rest.annotation.EntityCreate;import io.onedev.server.security.SecurityUtils;-@Api(order=5000)@Path("/users")@Consumes(MediaType.APPLICATION_JSON)@Produces(MediaType.APPLICATION_JSON)diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/VersionResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/VersionResource.javaindex 7c8e072828..8387d6451f 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/VersionResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/VersionResource.java@@ -11,7 +11,7 @@ import javax.ws.rs.core.MediaType;import io.onedev.server.OneDev;import io.onedev.server.rest.annotation.Api;-@Api(order=100000, description = "Version info for server and various tools")+@Api(description = "Version info for server and various tools")@Path("/version")@Produces(MediaType.APPLICATION_JSON)@Singletondiff --git a/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.javaindex b3e990bbab..3e2e74dfd7 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/BuildFacade.java@@ -1,19 +1,26 @@package io.onedev.server.util.facade;-public class BuildFacade extends ProjectBelongingFacade {+public class BuildFacade extends EntityFacade {private static final long serialVersionUID = 1L;+ private final Long projectId;+private final Long number;private final String commitHash;public BuildFacade(Long id, Long projectId, Long number, String commitHash) {- super(id, projectId);+ super(id);+ this.projectId = projectId;this.number = number;this.commitHash = commitHash;}+ public Long getProjectId() {+ return projectId;+ }+public Long getNumber() {return number;}@@ -21,5 +28,5 @@ public class BuildFacade extends ProjectBelongingFacade {public String getCommitHash() {return commitHash;}-+}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/IssueFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/IssueFacade.javaindex e42e42f56e..9fa00d00a4 100644--- a/server-core/src/main/java/io/onedev/server/util/facade/IssueFacade.java+++ b/server-core/src/main/java/io/onedev/server/util/facade/IssueFacade.java@@ -1,16 +1,23 @@package io.onedev.server.util.facade;-public class IssueFacade extends ProjectBelongingFacade {+public class IssueFacade extends EntityFacade {private static final long serialVersionUID = 1L;+ private final Long projectId;+private final Long number;public IssueFacade(Long id, Long projectId, Long number) {- super(id, projectId);+ super(id);+ this.projectId = projectId;this.number = number;}+ public Long getProjectId() {+ return projectId;+ }+public Long getNumber() {return number;}diff --git a/server-core/src/main/java/io/onedev/server/util/facade/ProjectBelongingFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/ProjectBelongingFacade.javadeleted file mode 100644index ae2c9832c9..0000000000--- a/server-core/src/main/java/io/onedev/server/util/facade/ProjectBelongingFacade.java+++ /dev/null@@ -1,18 +0,0 @@-package io.onedev.server.util.facade;--public class ProjectBelongingFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final Long projectId;-- public ProjectBelongingFacade(Long id, Long projectId) {- super(id);- this.projectId = projectId;- }-- public Long getProjectId() {- return projectId;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.javaindex 7d60152c2b..4106ea28eb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ResourceListPage.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.help;import static io.onedev.server.web.translation.Translation._T;import java.util.ArrayList;+import java.util.Comparator;import java.util.List;import javax.ws.rs.Path;@@ -16,9 +17,9 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.glassfish.jersey.server.ResourceConfig;-import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;import io.onedev.server.rest.annotation.Api;+import io.onedev.server.util.Pair;import io.onedev.server.web.component.link.ViewStateAwarePageLink;public class ResourceListPage extends ApiHelpPage {@@ -31,32 +32,39 @@ public class ResourceListPage extends ApiHelpPage {protected void onInitialize() {super.onInitialize();- add(new ListView<Class<?>>("resources", new LoadableDetachableModel<List<Class<?>>>() {+ add(new ListView<Pair<Class<?>, String>>("resources", new LoadableDetachableModel<List<Pair<Class<?>, String>>>() {@Override- protected List<Class<?>> load() {- List<Class<?>> clazzes = new ArrayList<>();+ protected List<Pair<Class<?>, String>> load() {+ List<Pair<Class<?>, String>> pairs = new ArrayList<>();ResourceConfig config = OneDev.getInstance(ResourceConfig.class);for (Class<?> clazz: config.getClasses()) {if (clazz.getAnnotation(Path.class) != null) {Api api = clazz.getAnnotation(Api.class);if (api == null || !api.internal())- clazzes.add(clazz);+ pairs.add(new Pair<>(clazz, getResourceTitle(clazz)));}- }- Collections.sort(clazzes, new ApiComparator());- return clazzes;+ }+ pairs.sort(new Comparator<>() {++ @Override+ public int compare(Pair<Class<?>, String> o1, Pair<Class<?>, String> o2) {+ return o1.getRight().compareTo(o2.getRight());+ }++ });+ return pairs;}}) {@Override- protected void populateItem(ListItem<Class<?>> item) {- Class<?> clazz = item.getModelObject();+ protected void populateItem(ListItem<Pair<Class<?>, String>> item) {+ Class<?> clazz = item.getModelObject().getLeft();Link<Void> link = new ViewStateAwarePageLink<Void>("link", ResourceDetailPage.class,ResourceDetailPage.paramsOf(clazz));- link.add(new Label("label", getResourceTitle(clazz)));+ link.add(new Label("label", item.getModelObject().getRight()));item.add(link);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex 63dccc3db6..b5934e94d0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -11,11 +11,7 @@ import java.util.List;import javax.annotation.Nullable;-import io.onedev.server.util.facade.ProjectCache;-import io.onedev.server.web.util.WicketUtils;-import jnr.ffi.annotations.Meta;import org.apache.wicket.Component;-import org.apache.wicket.MetaDataKey;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.feedback.FencedFeedbackPanel;@@ -26,7 +22,6 @@ import org.apache.wicket.util.visit.IVisitor;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.persistence.TransactionManager;@@ -36,6 +31,7 @@ import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.ChangeObserver;import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;import io.onedev.server.web.util.Cursor;+import io.onedev.server.web.util.WicketUtils;abstract class CardListPanel extends Panel {@@ -160,11 +156,7 @@ abstract class CardListPanel extends Panel {};}-- private ProjectManager getProjectManager() {- return OneDev.getInstance(ProjectManager.class);- }-+private IssueManager getIssueManager() {return OneDev.getInstance(IssueManager.class);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex e9ee7fba3c..f664248f50 100644--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -1,7 +1,5 @@package io.onedev.server.web.page.test;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.ProjectManager;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.javaindex c023a627ac..ec4990b868 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java@@ -23,6 +23,7 @@ import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.Objects;import java.util.Optional;import java.util.Set;import java.util.Stack;@@ -56,6 +57,7 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Preconditions;import com.google.common.base.Splitter;import com.google.common.collect.Sets;+import com.hazelcast.map.EntryProcessor;import com.hazelcast.map.IMap;import io.onedev.commons.loader.ManagedSerializedForm;@@ -496,13 +498,23 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager}private void updateContributedProjects(Long projectId, Set<NameAndEmail> users) {- for (var user: users) {- var contributedProjectsOfEmail = contributedProjects.get(user.getEmailAddress());- if (contributedProjectsOfEmail == null)- contributedProjectsOfEmail = new HashSet<>();- if (contributedProjectsOfEmail.add(projectId))- contributedProjects.put(user.getEmailAddress(), contributedProjectsOfEmail);- }+ Set<String> emailAddresses = users.stream()+ .map(NameAndEmail::getEmailAddress)+ .collect(toSet());++ contributedProjects.executeOnKeys(emailAddresses, new EntryProcessor<String, Set<Long>, Object>() {+ @Override+ public Object process(IMap.Entry<String, Set<Long>> entry) {+ Set<Long> contributedProjectsOfEmail = entry.getValue();+ if (contributedProjectsOfEmail == null) {+ contributedProjectsOfEmail = new HashSet<>();+ }+ if (contributedProjectsOfEmail.add(projectId)) {+ entry.setValue(contributedProjectsOfEmail);+ }+ return null;+ }+ });}private void collectContributions(Project project, ObjectId commitId) {@@ -1560,12 +1572,9 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager.collect(toSet());var cache = projectManager.cloneCache();var projectIds = new HashSet<Long>();- for (var emailAddress: emailAddresses) {- var projectIdsOfEmailAddress = contributedProjects.get(emailAddress);- if (projectIdsOfEmailAddress != null) {- projectIds.addAll(projectIdsOfEmailAddress);- }- }+ contributedProjects.getAll(emailAddresses).values().stream()+ .filter(Objects::nonNull)+ .forEach(projectIds::addAll);for (var projectId: projectIds) {var project = cache.get(projectId);if (project != null && project.isCodeManagement() && project.getForkedFromId() == null) {diff --git a/server-ee b/server-eeindex 013d8abae6..e73dc34cc8 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 013d8abae6a9337c5b3013366b0bdcadacf8b774+Subproject commit e73dc34cc8ca32b3095311a48fda582e9031e098