The Unified and Autonomous Development Platform
Fix some minor bugs
robin shenb438658eb7a5
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.javaindex ce3c55a265..959efcc6ae 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java@@ -8,7 +8,7 @@ import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;-@Editable(name="commented code")+@Editable(name="added code comment")public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent implements MarkdownAware {public PullRequestCodeCommentCreated(PullRequest request, CodeComment comment, boolean passive) {diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationInError.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationInError.javaindex 6b1eac810d..a2e2fa0708 100644--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationInError.java+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestVerificationInError.java@@ -3,7 +3,7 @@ package com.gitplex.server.event.pullrequest;import com.gitplex.server.model.PullRequest;import com.gitplex.server.util.editable.annotation.Editable;-@Editable(name="there are verification errors in")+@Editable(name="there are verification errors")public class PullRequestVerificationInError extends PullRequestVerificationEvent {public PullRequestVerificationInError(PullRequest request) {diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.javaindex 6aea04bd59..7101476aa6 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCacheManager.java@@ -250,7 +250,7 @@ public class DefaultCacheManager implements CacheManager {membershipsLock.writeLock().lock();try {for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getUserId().equals(event.getEntity().getId()))+ if (it.next().getValue().getGroupId().equals(event.getEntity().getId()))it.remove();}} finally {diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.javaindex 75a33a9cf3..17a8a9194b 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java@@ -129,10 +129,8 @@ public class DefaultNotificationManager implements NotificationManager {// Update pull request tasksif (event instanceof PullRequestOpened) {for (ReviewInvitation invitation: request.getReviewInvitations()) {- if (invitation.getType() != ReviewInvitation.Type.EXCLUDE) {- requestReview(invitation);+ if (invitation.getType() != ReviewInvitation.Type.EXCLUDE)notifiedUsers.add(invitation.getUser());- }}} else if (event instanceof PullRequestUpdated) {EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);@@ -411,26 +409,24 @@ public class DefaultNotificationManager implements NotificationManager {public void on(EntityPersisted event) {if (event.getEntity() instanceof ReviewInvitation) {ReviewInvitation invitation = (ReviewInvitation) event.getEntity();- if (!event.isNew()) {- PullRequest request = invitation.getRequest();- User user = invitation.getUser();- if (invitation.getType() == ReviewInvitation.Type.EXCLUDE) {- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", request)).add(Restrictions.eq("user", user)).add(Restrictions.eq("type", REVIEW));- for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {- pullRequestTaskManager.delete(task);- }- } else {- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", request))- .add(Restrictions.eq("user", user))- .add(Restrictions.eq("type", PullRequestTask.Type.REVIEW));- if (pullRequestTaskManager.find(criteria) == null)- requestReview(invitation);- watch(invitation.getRequest(), invitation.getUser(),- "You are set to watch this pull request as you are reviewer.");- }- }+ PullRequest request = invitation.getRequest();+ User user = invitation.getUser();+ if (invitation.getType() == ReviewInvitation.Type.EXCLUDE) {+ EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("request", request)).add(Restrictions.eq("user", user)).add(Restrictions.eq("type", REVIEW));+ for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {+ pullRequestTaskManager.delete(task);+ }+ } else {+ EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);+ criteria.add(Restrictions.eq("request", request))+ .add(Restrictions.eq("user", user))+ .add(Restrictions.eq("type", PullRequestTask.Type.REVIEW));+ if (pullRequestTaskManager.find(criteria) == null)+ requestReview(invitation);+ watch(invitation.getRequest(), invitation.getUser(),+ "You are set to watch this pull request as you are invited as a reviewer.");+ }}}diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.javaindex 166019fa91..2dce5d09cd 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestTaskManager.java@@ -16,5 +16,4 @@ public class DefaultPullRequestTaskManager extends AbstractEntityManager<PullReqsuper(dao);}-}\ No newline at end of filediff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.javaindex 24f2558f0e..52891a686b 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultUserManager.java@@ -9,6 +9,7 @@ import org.hibernate.Query;import org.hibernate.ReplicationMode;import com.gitplex.launcher.loader.Listen;+import com.gitplex.launcher.loader.ListenerRegistry;import com.gitplex.server.event.lifecycle.SystemStarted;import com.gitplex.server.manager.CacheManager;import com.gitplex.server.manager.UserManager;@@ -20,6 +21,7 @@ import com.gitplex.server.persistence.annotation.Sessional;import com.gitplex.server.persistence.annotation.Transactional;import com.gitplex.server.persistence.dao.AbstractEntityManager;import com.gitplex.server.persistence.dao.Dao;+import com.gitplex.server.persistence.dao.EntityPersisted;import com.gitplex.server.util.StringUtils;@Singleton@@ -29,12 +31,15 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uprivate final CacheManager cacheManager;+ private final ListenerRegistry listenerRegistry;+@Inject- public DefaultUserManager(Dao dao, CacheManager cacheManager, PasswordService passwordService) {+ public DefaultUserManager(Dao dao, CacheManager cacheManager, PasswordService passwordService, ListenerRegistry listenerRegistry) {super(dao);this.passwordService = passwordService;this.cacheManager = cacheManager;+ this.listenerRegistry = listenerRegistry;}@Transactional@@ -42,6 +47,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Upublic void save(User user, String oldName) {if (user.isRoot()) {getSession().replicate(user, ReplicationMode.OVERWRITE);+ listenerRegistry.post(new EntityPersisted(user, false));} else {dao.persist(user);}@@ -117,11 +123,6 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uquery = getSession().createQuery("update CodeCommentReply set user=null, userName=:userName where user=:user");query.setParameter("user", user);query.setParameter("userName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update CodeCommentStatusChange set user=null, userName=:userName where user=:user");- query.setParameter("user", user);- query.setParameter("userName", user.getDisplayName());query.executeUpdate();dao.remove(user);diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.javaindex 725385be6f..cdf5a2c3bf 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitManager.java@@ -124,13 +124,13 @@ public class DefaultVisitManager extends AbstractEnvironmentManager implements V@Listenpublic void on(PullRequestCommentCreated event) {- visit(event.getComment().getUser(), event.getRequest());+ visit(event.getUser(), event.getRequest());}@Listenpublic void on(PullRequestCodeCommentEvent event) {if (!event.isPassive())- visit(event.getComment().getUser(), event.getRequest());+ visit(event.getUser(), event.getRequest());}@Listendiff --git a/product/system/conf/hibernate.properties b/product/system/conf/hibernate.propertiesindex 3ecb25fcc9..0b96f5ce81 100644--- a/product/system/conf/hibernate.properties+++ b/product/system/conf/hibernate.properties@@ -88,7 +88,7 @@ hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnhibernate.hikari.transactionIsolation=TRANSACTION_READ_COMMITTEDhibernate.hikari.autoCommit=falsehibernate.hikari.maximumPoolSize=25-hibernate.hikari.leakDetectionThreshold=30000+hibernate.hikari.leakDetectionThreshold=1800000hibernate.show_sql=falsehibernate.format_sql=truediff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.javaindex c642554772..c50d6cfa40 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupPage.java@@ -47,7 +47,7 @@ public abstract class GroupPage extends LayoutPage {tabs.add(new GroupTab("Profile", "fa fa-fw fa-list-alt", GroupProfilePage.class));tabs.add(new GroupTab("Members", "fa fa-fw fa-user", GroupMembershipsPage.class));if (SecurityUtils.isAdministrator() && !getGroup().isAdministrator())- tabs.add(new GroupTab("Authorizations", "fa fa-fw fa-lock", GroupAuthorizationsPage.class));+ tabs.add(new GroupTab("Authorized Projects", "fa fa-fw fa-lock", GroupAuthorizationsPage.class));add(new Tabbable("groupTabs", tabs));}diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.javaindex 1d6a532e10..1c3e0e5348 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupProfilePage.java@@ -2,6 +2,7 @@ package com.gitplex.server.web.page.group;import java.io.Serializable;+import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;import org.apache.wicket.markup.html.form.CheckBox;@@ -86,6 +87,7 @@ public class GroupProfilePage extends GroupPage {if (!editor.hasErrors(true)) {groupManager.save(group, oldName);setResponsePage(GroupProfilePage.class, GroupProfilePage.paramsOf(group));+ Session.get().success("Profile updated");}}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.javaindex c52391a8b7..3e9733f8ca 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java@@ -290,7 +290,7 @@ public class RequestListPage extends ProjectPage {WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");if (request.getLastEvent() != null) {String description = request.getLastEvent().getType();- if (description.contains(" ")) {+ if (description.startsWith("there are")) {lastEventContainer.add(new WebMarkupContainer("user").setVisible(false));} else {User userForDisplay = User.getForDisplay(request.getLastEvent().getUser(),diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.javaindex 2199200e8c..265a7eb720 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java@@ -143,7 +143,8 @@ public class UserListPage extends LayoutPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.isAdministrator());+ User user = rowModel.getObject();+ setVisible(SecurityUtils.isAdministrator() && !user.isRoot() && !user.equals(getLoginUser()));}}.add(new ConfirmOnClick("Do you really want to delete user '" + user.getDisplayName() + "'?")));diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.javaindex 306eba3575..1c98359c0e 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserPage.java@@ -70,9 +70,9 @@ public abstract class UserPage extends LayoutPage {tabs.add(new UserTab("Change Password", "fa fa-fw fa-key", PasswordEditPage.class));tabs.add(new UserTab("Access Token", "fa fa-fw fa-key", TokenGeneratePage.class));}- tabs.add(new UserTab("Groups", "fa fa-fw fa-group", UserMembershipsPage.class));+ tabs.add(new UserTab("Belonging Groups", "fa fa-fw fa-group", UserMembershipsPage.class));if (SecurityUtils.isAdministrator())- tabs.add(new UserTab("Authorizations", "fa fa-fw fa-lock", UserAuthorizationsPage.class));+ tabs.add(new UserTab("Authorized Projects", "fa fa-fw fa-lock", UserAuthorizationsPage.class));if (SecurityUtils.canManage(getUser()))tabs.add(new UserTab("Tasks", "fa fa-fw fa-bell-o", TaskListPage.class));diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.javaindex 7558b2bd71..4ccadcb2ec 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserProfilePage.java@@ -2,6 +2,7 @@ package com.gitplex.server.web.page.user;import java.io.Serializable;+import org.apache.wicket.Session;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;@@ -77,6 +78,7 @@ public class UserProfilePage extends UserPage {}if (!editor.hasErrors(true)) {userManager.save(user, oldName);+ Session.get().success("Profile updated");setResponsePage(UserProfilePage.class, UserProfilePage.paramsOf(user));}}diff --git a/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.javaindex 999db49379..3ad08d8dd1 100644--- a/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java+++ b/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java@@ -234,19 +234,21 @@ public abstract class AbstractWebSocketProcessor implements IWebSocketProcessorIPageManager pageManager = session.getPageManager();Page page = getPage(pageManager);- WebSocketRequestHandler requestHandler = webSocketSettings.newWebSocketRequestHandler(page, connection);+ if (page != null) {+ WebSocketRequestHandler requestHandler = webSocketSettings.newWebSocketRequestHandler(page, connection);- @SuppressWarnings("rawtypes")- WebSocketPayload payload = createEventPayload(message, requestHandler);+ @SuppressWarnings("rawtypes")+ WebSocketPayload payload = createEventPayload(message, requestHandler);- if (!(message instanceof ConnectedMessage || message instanceof ClosedMessage))- {- requestCycle.scheduleRequestHandlerAfterCurrent(requestHandler);- }+ if (!(message instanceof ConnectedMessage || message instanceof ClosedMessage))+ {+ requestCycle.scheduleRequestHandlerAfterCurrent(requestHandler);+ }- IRequestHandler broadcastingHandler = new WebSocketMessageBroadcastHandler(pageId, resourceName, payload);- requestMapper.setHandler(broadcastingHandler);- requestCycle.processRequestAndDetach();+ IRequestHandler broadcastingHandler = new WebSocketMessageBroadcastHandler(pageId, resourceName, payload);+ requestMapper.setHandler(broadcastingHandler);+ requestCycle.processRequestAndDetach();+ }}}catch (Exception x)