Skip to content

The Unified and Autonomous Development Platform

feat: Emoji reactions to issues, pull requests and comments (OD-2023)

Robin Shen12e75617bcfc
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index f7e87d428f..1bd683d898 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -1,5 +1,56 @@
package io.onedev.server;
+import static com.google.common.collect.Lists.newArrayList;
+
+import java.io.Serializable;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Singleton;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Transient;
+import javax.persistence.Version;
+import javax.validation.Configuration;
+import javax.validation.Validation;
+import javax.validation.Validator;
+import javax.validation.ValidatorFactory;
+
+import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.shiro.guice.aop.ShiroAopModule;
+import org.apache.shiro.mgt.RememberMeManager;
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.web.config.ShiroFilterConfiguration;
+import org.apache.shiro.web.filter.mgt.FilterChainResolver;
+import org.apache.shiro.web.mgt.WebSecurityManager;
+import org.apache.shiro.web.servlet.ShiroFilter;
+import org.apache.wicket.Application;
+import org.apache.wicket.protocol.http.WicketFilter;
+import org.apache.wicket.protocol.http.WicketServlet;
+import org.eclipse.jetty.server.session.SessionDataStoreFactory;
+import org.eclipse.jetty.servlet.ServletContextHandler;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.servlet.ServletContainer;
+import org.hibernate.CallbackException;
+import org.hibernate.Interceptor;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.hibernate.collection.internal.PersistentBag;
+import org.hibernate.type.Type;
+import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
+
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.inject.matcher.AbstractMatcher;
import com.google.inject.matcher.Matchers;
@@ -12,6 +63,7 @@ import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
import com.thoughtworks.xstream.core.JVM;
import com.thoughtworks.xstream.mapper.MapperWrapper;
import com.vladsch.flexmark.util.misc.Extension;
+
import io.onedev.agent.ExecutorUtils;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AbstractPlugin;
@@ -26,17 +78,185 @@ import io.onedev.server.buildspec.job.log.instruction.LogInstruction;
import io.onedev.server.cluster.ClusterResource;
import io.onedev.server.codequality.CodeProblemContribution;
import io.onedev.server.codequality.LineCoverageContribution;
-import io.onedev.server.commandhandler.*;
+import io.onedev.server.commandhandler.ApplyDatabaseConstraints;
+import io.onedev.server.commandhandler.BackupDatabase;
+import io.onedev.server.commandhandler.CheckDataVersion;
+import io.onedev.server.commandhandler.CleanDatabase;
+import io.onedev.server.commandhandler.ResetAdminPassword;
+import io.onedev.server.commandhandler.RestoreDatabase;
+import io.onedev.server.commandhandler.Upgrade;
import io.onedev.server.data.DataManager;
import io.onedev.server.data.DefaultDataManager;
-import io.onedev.server.entitymanager.*;
-import io.onedev.server.entitymanager.impl.*;
+import io.onedev.server.entitymanager.AccessTokenAuthorizationManager;
+import io.onedev.server.entitymanager.AccessTokenManager;
+import io.onedev.server.entitymanager.AgentAttributeManager;
+import io.onedev.server.entitymanager.AgentLastUsedDateManager;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.entitymanager.AgentTokenManager;
+import io.onedev.server.entitymanager.AlertManager;
+import io.onedev.server.entitymanager.BuildDependenceManager;
+import io.onedev.server.entitymanager.BuildLabelManager;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.BuildMetricManager;
+import io.onedev.server.entitymanager.BuildParamManager;
+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.entitymanager.CodeCommentMentionManager;
+import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
+import io.onedev.server.entitymanager.CodeCommentReplyManager;
+import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
+import io.onedev.server.entitymanager.DashboardGroupShareManager;
+import io.onedev.server.entitymanager.DashboardManager;
+import io.onedev.server.entitymanager.DashboardUserShareManager;
+import io.onedev.server.entitymanager.DashboardVisitManager;
+import io.onedev.server.entitymanager.EmailAddressManager;
+import io.onedev.server.entitymanager.GitLfsLockManager;
+import io.onedev.server.entitymanager.GpgKeyManager;
+import io.onedev.server.entitymanager.GroupAuthorizationManager;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.entitymanager.IssueAuthorizationManager;
+import io.onedev.server.entitymanager.IssueChangeManager;
+import io.onedev.server.entitymanager.IssueCommentManager;
+import io.onedev.server.entitymanager.IssueCommentReactionManager;
+import io.onedev.server.entitymanager.IssueFieldManager;
+import io.onedev.server.entitymanager.IssueLinkManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.IssueMentionManager;
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
+import io.onedev.server.entitymanager.IssueReactionManager;
+import io.onedev.server.entitymanager.IssueScheduleManager;
+import io.onedev.server.entitymanager.IssueStateHistoryManager;
+import io.onedev.server.entitymanager.IssueTouchManager;
+import io.onedev.server.entitymanager.IssueVoteManager;
+import io.onedev.server.entitymanager.IssueWatchManager;
+import io.onedev.server.entitymanager.IssueWorkManager;
+import io.onedev.server.entitymanager.IterationManager;
+import io.onedev.server.entitymanager.JobCacheManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.LinkAuthorizationManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.entitymanager.MembershipManager;
+import io.onedev.server.entitymanager.PackBlobAuthorizationManager;
+import io.onedev.server.entitymanager.PackBlobManager;
+import io.onedev.server.entitymanager.PackBlobReferenceManager;
+import io.onedev.server.entitymanager.PackLabelManager;
+import io.onedev.server.entitymanager.PackManager;
+import io.onedev.server.entitymanager.PackQueryPersonalizationManager;
+import io.onedev.server.entitymanager.PendingSuggestionApplyManager;
+import io.onedev.server.entitymanager.ProjectLabelManager;
+import io.onedev.server.entitymanager.ProjectLastEventDateManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestAssignmentManager;
+import io.onedev.server.entitymanager.PullRequestChangeManager;
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.entitymanager.PullRequestCommentReactionManager;
+import io.onedev.server.entitymanager.PullRequestLabelManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.PullRequestMentionManager;
+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
+import io.onedev.server.entitymanager.PullRequestReactionManager;
+import io.onedev.server.entitymanager.PullRequestReviewManager;
+import io.onedev.server.entitymanager.PullRequestUpdateManager;
+import io.onedev.server.entitymanager.PullRequestWatchManager;
+import io.onedev.server.entitymanager.ReviewedDiffManager;
+import io.onedev.server.entitymanager.RoleManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.SshKeyManager;
+import io.onedev.server.entitymanager.StopwatchManager;
+import io.onedev.server.entitymanager.UserAuthorizationManager;
+import io.onedev.server.entitymanager.UserInvitationManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entitymanager.impl.DefaultAccessTokenAuthorizationManager;
+import io.onedev.server.entitymanager.impl.DefaultAccessTokenManager;
+import io.onedev.server.entitymanager.impl.DefaultAgentAttributeManager;
+import io.onedev.server.entitymanager.impl.DefaultAgentLastUsedDateManager;
+import io.onedev.server.entitymanager.impl.DefaultAgentManager;
+import io.onedev.server.entitymanager.impl.DefaultAgentTokenManager;
+import io.onedev.server.entitymanager.impl.DefaultAlertManager;
+import io.onedev.server.entitymanager.impl.DefaultBuildDependenceManager;
+import io.onedev.server.entitymanager.impl.DefaultBuildLabelManager;
+import io.onedev.server.entitymanager.impl.DefaultBuildManager;
+import io.onedev.server.entitymanager.impl.DefaultBuildMetricManager;
+import io.onedev.server.entitymanager.impl.DefaultBuildParamManager;
+import io.onedev.server.entitymanager.impl.DefaultBuildQueryPersonalizationManager;
+import io.onedev.server.entitymanager.impl.DefaultCodeCommentManager;
+import io.onedev.server.entitymanager.impl.DefaultCodeCommentMentionManager;
+import io.onedev.server.entitymanager.impl.DefaultCodeCommentQueryPersonalizationManager;
+import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;
+import io.onedev.server.entitymanager.impl.DefaultCodeCommentStatusChangeManager;
+import io.onedev.server.entitymanager.impl.DefaultCommitQueryPersonalizationManager;
+import io.onedev.server.entitymanager.impl.DefaultDashboardGroupShareManager;
+import io.onedev.server.entitymanager.impl.DefaultDashboardManager;
+import io.onedev.server.entitymanager.impl.DefaultDashboardUserShareManager;
+import io.onedev.server.entitymanager.impl.DefaultDashboardVisitManager;
+import io.onedev.server.entitymanager.impl.DefaultEmailAddressManager;
+import io.onedev.server.entitymanager.impl.DefaultGitLfsLockManager;
+import io.onedev.server.entitymanager.impl.DefaultGpgKeyManager;
+import io.onedev.server.entitymanager.impl.DefaultGroupAuthorizationManager;
+import io.onedev.server.entitymanager.impl.DefaultGroupManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueAuthorizationManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueCommentManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueCommentReactionManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueFieldManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueLinkManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueMentionManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueQueryPersonalizationManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueReactionManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueScheduleManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueStateHistoryManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueTouchManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueWorkManager;
+import io.onedev.server.entitymanager.impl.DefaultIterationManager;
+import io.onedev.server.entitymanager.impl.DefaultJobCacheManager;
+import io.onedev.server.entitymanager.impl.DefaultLabelSpecManager;
+import io.onedev.server.entitymanager.impl.DefaultLinkAuthorizationManager;
+import io.onedev.server.entitymanager.impl.DefaultLinkSpecManager;
+import io.onedev.server.entitymanager.impl.DefaultMembershipManager;
+import io.onedev.server.entitymanager.impl.DefaultPackBlobAuthorizationManager;
+import io.onedev.server.entitymanager.impl.DefaultPackBlobManager;
+import io.onedev.server.entitymanager.impl.DefaultPackBlobReferenceManager;
+import io.onedev.server.entitymanager.impl.DefaultPackLabelManager;
+import io.onedev.server.entitymanager.impl.DefaultPackManager;
+import io.onedev.server.entitymanager.impl.DefaultPackQueryPersonalizationManager;
+import io.onedev.server.entitymanager.impl.DefaultPendingSuggestionApplyManager;
+import io.onedev.server.entitymanager.impl.DefaultProjectLabelManager;
+import io.onedev.server.entitymanager.impl.DefaultProjectLastEventDateManager;
+import io.onedev.server.entitymanager.impl.DefaultProjectManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestAssignmentManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestChangeManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentReactionManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestLabelManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestMentionManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestQueryPersonalizationManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestReactionManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestReviewManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestUpdateManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestWatchManager;
+import io.onedev.server.entitymanager.impl.DefaultReviewedDiffManager;
+import io.onedev.server.entitymanager.impl.DefaultRoleManager;
+import io.onedev.server.entitymanager.impl.DefaultSettingManager;
+import io.onedev.server.entitymanager.impl.DefaultSshKeyManager;
+import io.onedev.server.entitymanager.impl.DefaultStopwatchManager;
+import io.onedev.server.entitymanager.impl.DefaultUserAuthorizationManager;
+import io.onedev.server.entitymanager.impl.DefaultUserInvitationManager;
+import io.onedev.server.entitymanager.impl.DefaultUserManager;
import io.onedev.server.entityreference.DefaultReferenceChangeManager;
import io.onedev.server.entityreference.ReferenceChangeManager;
import io.onedev.server.event.DefaultListenerRegistry;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.exception.handler.ExceptionHandler;
-import io.onedev.server.git.*;
+import io.onedev.server.git.GitFilter;
+import io.onedev.server.git.GitLfsFilter;
+import io.onedev.server.git.GitLocationProvider;
+import io.onedev.server.git.GoGetFilter;
+import io.onedev.server.git.SshCommandCreator;
import io.onedev.server.git.hook.GitPostReceiveCallback;
import io.onedev.server.git.hook.GitPreReceiveCallback;
import io.onedev.server.git.hook.GitPreReceiveChecker;
@@ -58,13 +278,33 @@ import io.onedev.server.job.log.LogManager;
import io.onedev.server.mail.DefaultMailManager;
import io.onedev.server.mail.MailManager;
import io.onedev.server.markdown.DefaultMarkdownManager;
-import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.markdown.HtmlProcessor;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
-import io.onedev.server.notification.*;
+import io.onedev.server.notification.BuildNotificationManager;
+import io.onedev.server.notification.CodeCommentNotificationManager;
+import io.onedev.server.notification.CommitNotificationManager;
+import io.onedev.server.notification.IssueNotificationManager;
+import io.onedev.server.notification.PackNotificationManager;
+import io.onedev.server.notification.PullRequestNotificationManager;
+import io.onedev.server.notification.WebHookManager;
import io.onedev.server.pack.PackFilter;
-import io.onedev.server.persistence.*;
+import io.onedev.server.persistence.DefaultIdManager;
+import io.onedev.server.persistence.DefaultSessionFactoryManager;
+import io.onedev.server.persistence.DefaultSessionManager;
+import io.onedev.server.persistence.DefaultTransactionManager;
+import io.onedev.server.persistence.HibernateInterceptor;
+import io.onedev.server.persistence.IdManager;
+import io.onedev.server.persistence.PersistListener;
+import io.onedev.server.persistence.PrefixedNamingStrategy;
+import io.onedev.server.persistence.SessionFactoryManager;
+import io.onedev.server.persistence.SessionFactoryProvider;
+import io.onedev.server.persistence.SessionInterceptor;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.SessionProvider;
+import io.onedev.server.persistence.TransactionInterceptor;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
@@ -81,9 +321,22 @@ import io.onedev.server.search.code.DefaultCodeIndexManager;
import io.onedev.server.search.code.DefaultCodeSearchManager;
import io.onedev.server.search.entitytext.DefaultIssueTextManager;
import io.onedev.server.search.entitytext.IssueTextManager;
-import io.onedev.server.security.*;
+import io.onedev.server.security.BasicAuthenticationFilter;
+import io.onedev.server.security.BearerAuthenticationFilter;
+import io.onedev.server.security.CodePullAuthorizationSource;
+import io.onedev.server.security.DefaultFilterChainResolver;
+import io.onedev.server.security.DefaultPasswordService;
+import io.onedev.server.security.DefaultRememberMeManager;
+import io.onedev.server.security.DefaultShiroFilterConfiguration;
+import io.onedev.server.security.DefaultWebSecurityManager;
+import io.onedev.server.security.FilterChainConfigurator;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.realm.GeneralAuthorizingRealm;
-import io.onedev.server.ssh.*;
+import io.onedev.server.ssh.CommandCreator;
+import io.onedev.server.ssh.DefaultSshAuthenticator;
+import io.onedev.server.ssh.DefaultSshManager;
+import io.onedev.server.ssh.SshAuthenticator;
+import io.onedev.server.ssh.SshManager;
import io.onedev.server.taskschedule.DefaultTaskScheduler;
import io.onedev.server.taskschedule.TaskScheduler;
import io.onedev.server.updatecheck.DefaultUpdateCheckManager;
@@ -99,9 +352,20 @@ import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;
import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;
import io.onedev.server.util.oauth.DefaultOAuthTokenManager;
import io.onedev.server.util.oauth.OAuthTokenManager;
-import io.onedev.server.util.xstream.*;
+import io.onedev.server.util.xstream.CollectionConverter;
+import io.onedev.server.util.xstream.HibernateProxyConverter;
+import io.onedev.server.util.xstream.MapConverter;
+import io.onedev.server.util.xstream.ReflectionConverter;
+import io.onedev.server.util.xstream.StringConverter;
+import io.onedev.server.util.xstream.VersionedDocumentConverter;
import io.onedev.server.validation.ValidatorProvider;
-import io.onedev.server.web.*;
+import io.onedev.server.web.DefaultUrlManager;
+import io.onedev.server.web.DefaultWicketFilter;
+import io.onedev.server.web.DefaultWicketServlet;
+import io.onedev.server.web.ResourcePackScopeContribution;
+import io.onedev.server.web.UrlManager;
+import io.onedev.server.web.WebApplication;
+import io.onedev.server.web.WebApplicationConfigurator;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.avatar.DefaultAvatarManager;
import io.onedev.server.web.component.diff.DiffRenderer;
@@ -121,48 +385,24 @@ import io.onedev.server.web.page.project.setting.ProjectSettingContribution;
import io.onedev.server.web.page.test.TestPage;
import io.onedev.server.web.upload.DefaultUploadManager;
import io.onedev.server.web.upload.UploadManager;
-import io.onedev.server.web.websocket.*;
-import io.onedev.server.xodus.*;
+import io.onedev.server.web.websocket.AlertEventBroadcaster;
+import io.onedev.server.web.websocket.BuildEventBroadcaster;
+import io.onedev.server.web.websocket.CodeCommentEventBroadcaster;
+import io.onedev.server.web.websocket.CommitIndexedBroadcaster;
+import io.onedev.server.web.websocket.DefaultWebSocketManager;
+import io.onedev.server.web.websocket.IssueEventBroadcaster;
+import io.onedev.server.web.websocket.ProjectDeleteEventBroadcaster;
+import io.onedev.server.web.websocket.PullRequestEventBroadcaster;
+import io.onedev.server.web.websocket.WebSocketManager;
+import io.onedev.server.xodus.CommitInfoManager;
+import io.onedev.server.xodus.DefaultCommitInfoManager;
+import io.onedev.server.xodus.DefaultIssueInfoManager;
+import io.onedev.server.xodus.DefaultPullRequestInfoManager;
+import io.onedev.server.xodus.DefaultVisitInfoManager;
+import io.onedev.server.xodus.IssueInfoManager;
+import io.onedev.server.xodus.PullRequestInfoManager;
+import io.onedev.server.xodus.VisitInfoManager;
import nl.altindag.ssl.SSLFactory;
-import org.apache.shiro.authc.credential.PasswordService;
-import org.apache.shiro.guice.aop.ShiroAopModule;
-import org.apache.shiro.mgt.RememberMeManager;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.web.config.ShiroFilterConfiguration;
-import org.apache.shiro.web.filter.mgt.FilterChainResolver;
-import org.apache.shiro.web.mgt.WebSecurityManager;
-import org.apache.shiro.web.servlet.ShiroFilter;
-import org.apache.wicket.Application;
-import org.apache.wicket.protocol.http.WicketFilter;
-import org.apache.wicket.protocol.http.WicketServlet;
-import org.eclipse.jetty.server.session.SessionDataStoreFactory;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.servlet.ServletContainer;
-import org.hibernate.CallbackException;
-import org.hibernate.Interceptor;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-import org.hibernate.collection.internal.PersistentBag;
-import org.hibernate.type.Type;
-import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
-
-import javax.inject.Singleton;
-import javax.persistence.*;
-import javax.validation.Configuration;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
-import java.io.Serializable;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.concurrent.*;
-
-import static com.google.common.collect.Lists.newArrayList;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
@@ -299,6 +539,10 @@ public class CoreModule extends AbstractPluginModule {
bind(AccessTokenAuthorizationManager.class).to(DefaultAccessTokenAuthorizationManager.class);
bind(ReviewedDiffManager.class).to(DefaultReviewedDiffManager.class);
bind(OAuthTokenManager.class).to(DefaultOAuthTokenManager.class);
+ bind(IssueReactionManager.class).to(DefaultIssueReactionManager.class);
+ bind(IssueCommentReactionManager.class).to(DefaultIssueCommentReactionManager.class);
+ bind(PullRequestReactionManager.class).to(DefaultPullRequestReactionManager.class);
+ bind(PullRequestCommentReactionManager.class).to(DefaultPullRequestCommentReactionManager.class);
bind(WebHookManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/annotation/BranchName.java b/server-core/src/main/java/io/onedev/server/annotation/BranchName.java
index 1faea5aeee..25ddcf5fe6 100644
--- a/server-core/src/main/java/io/onedev/server/annotation/BranchName.java
+++ b/server-core/src/main/java/io/onedev/server/annotation/BranchName.java
@@ -1,15 +1,15 @@
package io.onedev.server.annotation;
-import io.onedev.server.validation.validator.BranchNameValidator;
-import io.onedev.server.validation.validator.TagNameValidator;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.validation.validator.BranchNameValidator;
+
@Target({ElementType.METHOD, ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)
@Constraint(validatedBy = BranchNameValidator.class)
diff --git a/server-core/src/main/java/io/onedev/server/attachment/AttachmentManager.java b/server-core/src/main/java/io/onedev/server/attachment/AttachmentManager.java
index e7c935a56b..26616af991 100644
--- a/server-core/src/main/java/io/onedev/server/attachment/AttachmentManager.java
+++ b/server-core/src/main/java/io/onedev/server/attachment/AttachmentManager.java
@@ -1,11 +1,10 @@
package io.onedev.server.attachment;
-import io.onedev.server.util.artifact.FileInfo;
-
import java.io.File;
import java.io.InputStream;
import java.util.List;
-import java.util.UUID;
+
+import io.onedev.server.util.artifact.FileInfo;
public interface AttachmentManager {
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index ffa5cee1d2..c35af5f438 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -7339,4 +7339,36 @@ public class DataMigrator {
}
}
+ private void migrate188(File dataDir, Stack<Integer> versions) {
+ for (File file : dataDir.listFiles()) {
+ if (file.getName().startsWith("Issues.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ element.addElement("thumbsUpCount").setText("0");
+ element.addElement("thumbsDownCount").setText("0");
+ element.addElement("smileCount").setText("0");
+ element.addElement("tadaCount").setText("0");
+ element.addElement("confusedCount").setText("0");
+ element.addElement("heartCount").setText("0");
+ element.addElement("rocketCount").setText("0");
+ element.addElement("eyesCount").setText("0");
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PullRequests.xml")) {
+ var dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ element.addElement("thumbsUpCount").setText("0");
+ element.addElement("thumbsDownCount").setText("0");
+ element.addElement("smileCount").setText("0");
+ element.addElement("tadaCount").setText("0");
+ element.addElement("confusedCount").setText("0");
+ element.addElement("heartCount").setText("0");
+ element.addElement("rocketCount").setText("0");
+ element.addElement("eyesCount").setText("0");
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueCommentReactionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueCommentReactionManager.java
new file mode 100644
index 0000000000..53409f28f7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueCommentReactionManager.java
@@ -0,0 +1,14 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.IssueCommentReaction;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface IssueCommentReactionManager extends EntityManager<IssueCommentReaction> {
+
+ void create(IssueCommentReaction reaction);
+
+ void toggleEmoji(User user, IssueComment comment, String emoji);
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueReactionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueReactionManager.java
new file mode 100644
index 0000000000..62cd924a55
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueReactionManager.java
@@ -0,0 +1,14 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.IssueReaction;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface IssueReactionManager extends EntityManager<IssueReaction> {
+
+ void create(IssueReaction reaction);
+
+ void toggleEmoji(User user, Issue issue, String emoji);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentReactionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentReactionManager.java
new file mode 100644
index 0000000000..731ea2e098
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentReactionManager.java
@@ -0,0 +1,14 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.PullRequestCommentReaction;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface PullRequestCommentReactionManager extends EntityManager<PullRequestCommentReaction> {
+
+ void create(PullRequestCommentReaction reaction);
+
+ void toggleEmoji(User user, PullRequestComment comment, String emoji);
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java
index 78ba6e32ff..fd0c6ffe83 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java
@@ -11,4 +11,5 @@ public interface PullRequestQueryPersonalizationManager extends EntityManager<Pu
void createOrUpdate(PullRequestQueryPersonalization personalization);
+ void delete(PullRequestQueryPersonalization personalization);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReactionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReactionManager.java
new file mode 100644
index 0000000000..2959552962
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestReactionManager.java
@@ -0,0 +1,14 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestReaction;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface PullRequestReactionManager extends EntityManager<PullRequestReaction> {
+
+ void create(PullRequestReaction reaction);
+
+ void toggleEmoji(User user, PullRequest request, String emoji);
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentReactionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentReactionManager.java
new file mode 100644
index 0000000000..8364db31af
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentReactionManager.java
@@ -0,0 +1,52 @@
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.entitymanager.IssueCommentReactionManager;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.IssueCommentReaction;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultIssueCommentReactionManager extends BaseEntityManager<IssueCommentReaction>
+ implements IssueCommentReactionManager {
+
+ @Inject
+ public DefaultIssueCommentReactionManager(Dao dao) {
+ super(dao);
+ }
+
+ @Transactional
+ @Override
+ public void create(IssueCommentReaction reaction) {
+ Preconditions.checkState(reaction.isNew());
+ dao.persist(reaction);
+ }
+
+ @Transactional
+ @Override
+ public void toggleEmoji(User user, IssueComment comment, String emoji) {
+ var reaction = comment.getReactions().stream()
+ .filter(r -> r.getUser().equals(user) && r.getEmoji().equals(emoji))
+ .findFirst()
+ .orElse(null);
+ if (reaction == null) {
+ reaction = new IssueCommentReaction();
+ reaction.setComment(comment);
+ reaction.setUser(user);
+ reaction.setEmoji(emoji);
+ create(reaction);
+ comment.getReactions().add(reaction);
+ } else {
+ comment.getReactions().remove(reaction);
+ dao.remove(reaction);
+ }
+ }
+
+}
\ No newline at end of file
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.java
index cce06ff478..8b7cb55970 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
@@ -1,22 +1,87 @@
package io.onedev.server.entitymanager.impl;
+import static io.onedev.server.model.Issue.PROP_OWN_ESTIMATED_TIME;
+import static io.onedev.server.model.Issue.PROP_OWN_SPENT_TIME;
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.Collectors.toSet;
+
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.base.Preconditions;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.map.IMap;
+
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.server.buildspecmodel.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.cluster.ClusterManager;
import io.onedev.server.data.migration.VersionedXmlDoc;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.IssueAuthorizationManager;
+import io.onedev.server.entitymanager.IssueFieldManager;
+import io.onedev.server.entitymanager.IssueLinkManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
+import io.onedev.server.entitymanager.IssueScheduleManager;
+import io.onedev.server.entitymanager.IssueTouchManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.RoleManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.event.Listen;
import io.onedev.server.event.ListenerRegistry;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.project.issue.*;
+import io.onedev.server.event.project.issue.IssueDeleted;
+import io.onedev.server.event.project.issue.IssueEvent;
+import io.onedev.server.event.project.issue.IssueOpened;
+import io.onedev.server.event.project.issue.IssuesCopied;
+import io.onedev.server.event.project.issue.IssuesDeleted;
+import io.onedev.server.event.project.issue.IssuesMoved;
import io.onedev.server.event.system.SystemStarting;
-import io.onedev.server.model.*;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueAuthorization;
+import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.IssueComment;
+import io.onedev.server.model.IssueField;
+import io.onedev.server.model.IssueQueryPersonalization;
+import io.onedev.server.model.IssueSchedule;
+import io.onedev.server.model.Iteration;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
@@ -47,24 +112,6 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldReso
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.query.Query;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.persistence.criteria.*;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.util.*;
-
-import static io.onedev.server.model.Issue.PROP_OWN_ESTIMATED_TIME;
-import static io.onedev.server.model.Issue.PROP_OWN_SPENT_TIME;
-import static java.util.stream.Collectors.toList;
-import static java.util.stream.Collectors.toSet;
@Singleton
public class DefaultIssueManager extends BaseEntityManager<Issue> implements IssueManager, Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueReactionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueReactionManager.java
new file mode 100644
index 0000000000..580df92d0c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueReactionManager.java
@@ -0,0 +1,78 @@
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.entitymanager.IssueReactionManager;
+import io.onedev.server.model.IssueReaction;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultIssueReactionManager extends BaseEntityManager<IssueReaction> implements IssueReactionManager {
+
+ @Inject
+ public DefaultIssueReactionManager(Dao dao) {
+ super(dao);
+ }
+
+ @Transactional
+ @Override
+ public void create(IssueReaction reaction) {
+ Preconditions.checkState(reaction.isNew());
+ dao.persist(reaction);
+ }
+
+ @Transactional
+ @Override
+ public void toggleEmoji(User user, Issue issue, String emoji) {
+ var reaction = issue.getReactions().stream()
+ .filter(r -> r.getUser().equals(user) && r.getEmoji().equals(emoji))
+ .findFirst()
+ .orElse(null);
+
+ switch (emoji) {
+ case "πŸ‘":
+ issue.setThumbsUpCount(issue.getThumbsUpCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸ‘Ž":
+ issue.setThumbsDownCount(issue.getThumbsDownCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸ˜„":
+ issue.setSmileCount(issue.getSmileCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸŽ‰":
+ issue.setTadaCount(issue.getTadaCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸ˜•":
+ issue.setConfusedCount(issue.getConfusedCount() + (reaction == null ? 1 : -1));
+ break;
+ case "❀️":
+ issue.setHeartCount(issue.getHeartCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸš€":
+ issue.setRocketCount(issue.getRocketCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸ‘€":
+ issue.setEyesCount(issue.getEyesCount() + (reaction == null ? 1 : -1));
+ break;
+ }
+
+ if (reaction != null) {
+ issue.getReactions().remove(reaction);
+ dao.remove(reaction);
+ } else {
+ reaction = new IssueReaction();
+ reaction.setUser(user);
+ reaction.setIssue(issue);
+ reaction.setEmoji(emoji);
+ create(reaction);
+ issue.getReactions().add(reaction);
+ }
+ }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentReactionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentReactionManager.java
new file mode 100644
index 0000000000..8591660cf0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentReactionManager.java
@@ -0,0 +1,52 @@
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.entitymanager.PullRequestCommentReactionManager;
+import io.onedev.server.model.PullRequestComment;
+import io.onedev.server.model.PullRequestCommentReaction;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultPullRequestCommentReactionManager extends BaseEntityManager<PullRequestCommentReaction>
+ implements PullRequestCommentReactionManager {
+
+ @Inject
+ public DefaultPullRequestCommentReactionManager(Dao dao) {
+ super(dao);
+ }
+
+ @Transactional
+ @Override
+ public void create(PullRequestCommentReaction reaction) {
+ Preconditions.checkState(reaction.isNew());
+ dao.persist(reaction);
+ }
+
+ @Transactional
+ @Override
+ public void toggleEmoji(User user, PullRequestComment comment, String emoji) {
+ var reaction = comment.getReactions().stream()
+ .filter(r -> r.getUser().equals(user) && r.getEmoji().equals(emoji))
+ .findFirst()
+ .orElse(null);
+ if (reaction == null) {
+ reaction = new PullRequestCommentReaction();
+ reaction.setUser(user);
+ reaction.setComment(comment);
+ reaction.setEmoji(emoji);
+ create(reaction);
+ comment.getReactions().add(reaction);
+ } else {
+ comment.getReactions().remove(reaction);
+ dao.remove(reaction);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReactionManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReactionManager.java
new file mode 100644
index 0000000000..a127d5d82a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReactionManager.java
@@ -0,0 +1,79 @@
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.entitymanager.PullRequestReactionManager;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestReaction;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultPullRequestReactionManager extends BaseEntityManager<PullRequestReaction>
+ implements PullRequestReactionManager {
+
+ @Inject
+ public DefaultPullRequestReactionManager(Dao dao) {
+ super(dao);
+ }
+
+ @Transactional
+ @Override
+ public void create(PullRequestReaction reaction) {
+ Preconditions.checkState(reaction.isNew());
+ dao.persist(reaction);
+ }
+
+ @Transactional
+ @Override
+ public void toggleEmoji(User user, PullRequest request, String emoji) {
+ var reaction = request.getReactions().stream()
+ .filter(r -> r.getUser().equals(user) && r.getEmoji().equals(emoji))
+ .findFirst()
+ .orElse(null);
+
+ switch (emoji) {
+ case "πŸ‘":
+ request.setThumbsUpCount(request.getThumbsUpCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸ‘Ž":
+ request.setThumbsDownCount(request.getThumbsDownCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸ˜„":
+ request.setSmileCount(request.getSmileCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸŽ‰":
+ request.setTadaCount(request.getTadaCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸ˜•":
+ request.setConfusedCount(request.getConfusedCount() + (reaction == null ? 1 : -1));
+ break;
+ case "❀️":
+ request.setHeartCount(request.getHeartCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸš€":
+ request.setRocketCount(request.getRocketCount() + (reaction == null ? 1 : -1));
+ break;
+ case "πŸ‘€":
+ request.setEyesCount(request.getEyesCount() + (reaction == null ? 1 : -1));
+ break;
+ }
+
+ if (reaction == null) {
+ reaction = new PullRequestReaction();
+ reaction.setUser(user);
+ reaction.setRequest(request);
+ reaction.setEmoji(emoji);
+ create(reaction);
+ request.getReactions().add(reaction);
+ } else {
+ request.getReactions().remove(reaction);
+ dao.remove(reaction);
+ }
+ }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index db59593382..8bd981ad00 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -115,7 +115,39 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
public static final String NAME_COMMENT_COUNT = "Comment Count";
public static final String PROP_COMMENT_COUNT = "commentCount";
+
+ public static final String NAME_THUMBS_UP_COUNT = "Reaction: Thumbs Up Count";
+
+ public static final String PROP_THUMBS_UP_COUNT = "thumbsUpCount";
+
+ public static final String NAME_THUMBS_DOWN_COUNT = "Reaction: Thumbs Down Count";
+
+ public static final String PROP_THUMBS_DOWN_COUNT = "thumbsDownCount";
+
+ public static final String NAME_SMILE_COUNT = "Reaction: Smile Count";
+
+ public static final String PROP_SMILE_COUNT = "smileCount";
+
+ public static final String NAME_TADA_COUNT = "Reaction: Tada Count";
+
+ public static final String PROP_TADA_COUNT = "tadaCount";
+ public static final String NAME_CONFUSED_COUNT = "Reaction: Confused Count";
+
+ public static final String PROP_CONFUSED_COUNT = "confusedCount";
+
+ public static final String NAME_HEART_COUNT = "Reaction: Heart Count";
+
+ public static final String PROP_HEART_COUNT = "heartCount";
+
+ public static final String NAME_ROCKET_COUNT = "Reaction: Rocket Count";
+
+ public static final String PROP_ROCKET_COUNT = "rocketCount";
+
+ public static final String NAME_EYES_COUNT = "Reaction: Eyes Count";
+
+ public static final String PROP_EYES_COUNT = "eyesCount";
+
public static final String NAME_LAST_ACTIVITY_DATE = "Last Activity Date";
public static final String PROP_LAST_ACTIVITY = "lastActivity";
@@ -156,6 +188,8 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
NAME_PROJECT, NAME_NUMBER, NAME_STATE, NAME_TITLE, NAME_SUBMITTER,
NAME_DESCRIPTION, NAME_COMMENT, NAME_SUBMIT_DATE, NAME_LAST_ACTIVITY_DATE,
NAME_VOTE_COUNT, NAME_COMMENT_COUNT, NAME_ITERATION,
+ NAME_THUMBS_UP_COUNT, NAME_THUMBS_DOWN_COUNT, NAME_SMILE_COUNT, NAME_TADA_COUNT,
+ NAME_CONFUSED_COUNT, NAME_HEART_COUNT, NAME_ROCKET_COUNT, NAME_EYES_COUNT,
NAME_ESTIMATED_TIME, NAME_SPENT_TIME, NAME_PROGRESS,
BurndownIndicators.ISSUE_COUNT, BurndownIndicators.REMAINING_TIME);
@@ -163,7 +197,9 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
NAME_PROJECT, NAME_NUMBER, NAME_STATE, NAME_TITLE, NAME_DESCRIPTION,
NAME_ESTIMATED_TIME, NAME_SPENT_TIME, NAME_PROGRESS,
NAME_COMMENT, NAME_SUBMIT_DATE, NAME_LAST_ACTIVITY_DATE, NAME_VOTE_COUNT,
- NAME_COMMENT_COUNT, NAME_ITERATION);
+ NAME_COMMENT_COUNT, NAME_ITERATION,
+ NAME_THUMBS_UP_COUNT, NAME_THUMBS_DOWN_COUNT, NAME_SMILE_COUNT, NAME_TADA_COUNT,
+ NAME_CONFUSED_COUNT, NAME_HEART_COUNT, NAME_ROCKET_COUNT, NAME_EYES_COUNT);
public static final Map<String, IssueSortField> SORT_FIELDS = new LinkedHashMap<>();
static {
@@ -178,6 +214,14 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
SORT_FIELDS.put(NAME_SPENT_TIME, new IssueSortField(PROP_TOTAL_SPENT_TIME, comparingInt(Issue::getTotalSpentTime)));
SORT_FIELDS.put(NAME_PROGRESS, new IssueSortField(PROP_PROGRESS, comparingInt(Issue::getProgress)));
SORT_FIELDS.put(NAME_BOARD_POSITION, new IssueSortField(PROP_BOARD_POSITION, comparingInt(Issue::getBoardPosition)));
+ SORT_FIELDS.put(NAME_THUMBS_UP_COUNT, new IssueSortField(PROP_THUMBS_UP_COUNT, DESCENDING, comparingInt(Issue::getThumbsUpCount)));
+ SORT_FIELDS.put(NAME_THUMBS_DOWN_COUNT, new IssueSortField(PROP_THUMBS_DOWN_COUNT, DESCENDING, comparingInt(Issue::getThumbsDownCount)));
+ SORT_FIELDS.put(NAME_SMILE_COUNT, new IssueSortField(PROP_SMILE_COUNT, DESCENDING, comparingInt(Issue::getSmileCount)));
+ SORT_FIELDS.put(NAME_TADA_COUNT, new IssueSortField(PROP_TADA_COUNT, DESCENDING, comparingInt(Issue::getTadaCount)));
+ SORT_FIELDS.put(NAME_CONFUSED_COUNT, new IssueSortField(PROP_CONFUSED_COUNT, DESCENDING, comparingInt(Issue::getConfusedCount)));
+ SORT_FIELDS.put(NAME_HEART_COUNT, new IssueSortField(PROP_HEART_COUNT, DESCENDING, comparingInt(Issue::getHeartCount)));
+ SORT_FIELDS.put(NAME_ROCKET_COUNT, new IssueSortField(PROP_ROCKET_COUNT, DESCENDING, comparingInt(Issue::getRocketCount)));
+ SORT_FIELDS.put(NAME_EYES_COUNT, new IssueSortField(PROP_EYES_COUNT, DESCENDING, comparingInt(Issue::getEyesCount)));
}
private static ThreadLocal<Stack<Issue>> stack = ThreadLocal.withInitial(() -> new Stack<>());
@@ -222,6 +266,22 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
private int voteCount;
private int commentCount;
+
+ private int thumbsUpCount;
+
+ private int thumbsDownCount;
+
+ private int smileCount;
+
+ private int tadaCount;
+
+ private int confusedCount;
+
+ private int heartCount;
+
+ private int rocketCount;
+
+ private int eyesCount;
private int totalEstimatedTime;
@@ -294,6 +354,9 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
@OneToMany(mappedBy=IssueLink.PROP_SOURCE, cascade=CascadeType.REMOVE)
private Collection<IssueLink> targetLinks = new ArrayList<>();
+
+ @OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
+ private Collection<IssueReaction> reactions = new ArrayList<>();
private transient List<ProjectScopedCommit> headFixCommits;
@@ -468,6 +531,13 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
public void setComments(Collection<IssueComment> comments) {
this.comments = comments;
}
+ public Collection<IssueReaction> getReactions() {
+ return reactions;
+ }
+
+ public void setReactions(Collection<IssueReaction> reactions) {
+ this.reactions = reactions;
+ }
public Collection<IssueChange> getChanges() {
return changes;
@@ -564,6 +634,70 @@ public class Issue extends ProjectBelonging implements AttachmentStorageSupport
this.commentCount = commentCount;
}
+ public int getThumbsUpCount() {
+ return thumbsUpCount;
+ }
+
+ public void setThumbsUpCount(int thumbsUpCount) {
+ this.thumbsUpCount = thumbsUpCount;
+ }
+
+ public int getThumbsDownCount() {
+ return thumbsDownCount;
+ }
+
+ public void setThumbsDownCount(int thumbsDownCount) {
+ this.thumbsDownCount = thumbsDownCount;
+ }
+
+ public int getSmileCount() {
+ return smileCount;
+ }
+
+ public void setSmileCount(int smileCount) {
+ this.smileCount = smileCount;
+ }
+
+ public int getTadaCount() {
+ return tadaCount;
+ }
+
+ public void setTadaCount(int tadaCount) {
+ this.tadaCount = tadaCount;
+ }
+
+ public int getConfusedCount() {
+ return confusedCount;
+ }
+
+ public void setConfusedCount(int confusedCount) {
+ this.confusedCount = confusedCount;
+ }
+
+ public int getHeartCount() {
+ return heartCount;
+ }
+
+ public void setHeartCount(int heartCount) {
+ this.heartCount = heartCount;
+ }
+
+ public int getRocketCount() {
+ return rocketCount;
+ }
+
+ public void setRocketCount(int rocketCount) {
+ this.rocketCount = rocketCount;
+ }
+
+ public int getEyesCount() {
+ return eyesCount;
+ }
+
+ public void setEyesCount(int eyesCount) {
+ this.eyesCount = eyesCount;
+ }
+
public int getTotalEstimatedTime() {
return totalEstimatedTime;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueComment.java b/server-core/src/main/java/io/onedev/server/model/IssueComment.java
index 52acd9178a..407153ac4e 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueComment.java
@@ -1,11 +1,21 @@
package io.onedev.server.model;
-import io.onedev.server.model.support.EntityComment;
-import io.onedev.server.rest.annotation.Immutable;
+import java.util.ArrayList;
+import java.util.Collection;
import javax.annotation.Nullable;
import javax.mail.internet.InternetAddress;
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import io.onedev.server.model.support.EntityComment;
+import io.onedev.server.rest.annotation.Immutable;
@Entity
@Table(indexes={
@@ -21,6 +31,9 @@ public class IssueComment extends EntityComment {
@Immutable
private Issue issue;
+ @OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)
+ private Collection<IssueCommentReaction> reactions = new ArrayList<>();
+
@Lob
private InternetAddress onBehalfOf;
@@ -45,5 +58,13 @@ public class IssueComment extends EntityComment {
public AbstractEntity getEntity() {
return getIssue();
}
+
+ public Collection<IssueCommentReaction> getReactions() {
+ return reactions;
+ }
+
+ public void setReactions(Collection<IssueCommentReaction> reactions) {
+ this.reactions = reactions;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueCommentReaction.java b/server-core/src/main/java/io/onedev/server/model/IssueCommentReaction.java
new file mode 100644
index 0000000000..af6c977483
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/IssueCommentReaction.java
@@ -0,0 +1,40 @@
+package io.onedev.server.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import io.onedev.server.model.support.EntityReaction;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_comment_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_comment_id", "o_user_id", "emoji"})}
+)
+public class IssueCommentReaction extends EntityReaction {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_COMMENT = "comment";
+
+ @ManyToOne
+ @JoinColumn(nullable=false)
+ private IssueComment comment;
+
+ public IssueComment getComment() {
+ return comment;
+ }
+
+ public void setComment(IssueComment comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ protected AbstractEntity getEntity() {
+ return comment;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueReaction.java b/server-core/src/main/java/io/onedev/server/model/IssueReaction.java
new file mode 100644
index 0000000000..bbd80cc084
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/IssueReaction.java
@@ -0,0 +1,35 @@
+package io.onedev.server.model;
+
+import javax.persistence.*;
+
+import io.onedev.server.model.support.EntityReaction;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_issue_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_issue_id", "o_user_id", "emoji"})}
+)
+public class IssueReaction extends EntityReaction {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_ISSUE = "issue";
+
+ @ManyToOne
+ @JoinColumn(nullable=false)
+ private Issue issue;
+
+ public Issue getIssue() {
+ return issue;
+ }
+
+ public void setIssue(Issue issue) {
+ this.issue = issue;
+ }
+
+ @Override
+ protected AbstractEntity getEntity() {
+ return issue;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 39f7764083..c7e7d1a325 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -105,6 +105,38 @@ public class PullRequest extends ProjectBelonging
public static final String PROP_COMMENT_COUNT = "commentCount";
+ public static final String NAME_THUMBS_UP_COUNT = "Reaction: Thumbs Up Count";
+
+ public static final String PROP_THUMBS_UP_COUNT = "thumbsUpCount";
+
+ public static final String NAME_THUMBS_DOWN_COUNT = "Reaction: Thumbs Down Count";
+
+ public static final String PROP_THUMBS_DOWN_COUNT = "thumbsDownCount";
+
+ public static final String NAME_SMILE_COUNT = "Reaction: Smile Count";
+
+ public static final String PROP_SMILE_COUNT = "smileCount";
+
+ public static final String NAME_TADA_COUNT = "Reaction: Tada Count";
+
+ public static final String PROP_TADA_COUNT = "tadaCount";
+
+ public static final String NAME_CONFUSED_COUNT = "Reaction: Confused Count";
+
+ public static final String PROP_CONFUSED_COUNT = "confusedCount";
+
+ public static final String NAME_HEART_COUNT = "Reaction: Heart Count";
+
+ public static final String PROP_HEART_COUNT = "heartCount";
+
+ public static final String NAME_ROCKET_COUNT = "Reaction: Rocket Count";
+
+ public static final String PROP_ROCKET_COUNT = "rocketCount";
+
+ public static final String NAME_EYES_COUNT = "Reaction: Eyes Count";
+
+ public static final String PROP_EYES_COUNT = "eyesCount";
+
public static final String PROP_SUBMITTER = "submitter";
public static final String NAME_SUBMIT_DATE = "Submit Date";
@@ -157,7 +189,9 @@ public class PullRequest extends ProjectBelonging
NAME_NUMBER, NAME_STATUS, NAME_TITLE, NAME_TARGET_PROJECT, NAME_TARGET_BRANCH,
NAME_SOURCE_PROJECT, NAME_SOURCE_BRANCH, NAME_LABEL, NAME_DESCRIPTION,
NAME_COMMENT, NAME_SUBMIT_DATE, NAME_LAST_ACTIVITY_DATE, NAME_CLOSE_DATE,
- NAME_MERGE_STRATEGY, NAME_COMMENT_COUNT);
+ NAME_MERGE_STRATEGY, NAME_COMMENT_COUNT, NAME_THUMBS_UP_COUNT, NAME_THUMBS_DOWN_COUNT,
+ NAME_SMILE_COUNT, NAME_TADA_COUNT, NAME_CONFUSED_COUNT, NAME_HEART_COUNT,
+ NAME_ROCKET_COUNT, NAME_EYES_COUNT);
public static final Map<String, SortField<PullRequest>> SORT_FIELDS = new LinkedHashMap<>();
static {
@@ -171,6 +205,14 @@ public class PullRequest extends ProjectBelonging
SORT_FIELDS.put(NAME_SOURCE_PROJECT, new SortField<>(PROP_SOURCE_PROJECT));
SORT_FIELDS.put(NAME_SOURCE_BRANCH, new SortField<>(PROP_SOURCE_BRANCH));
SORT_FIELDS.put(NAME_COMMENT_COUNT, new SortField<>(PROP_COMMENT_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_THUMBS_UP_COUNT, new SortField<>(PROP_THUMBS_UP_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_THUMBS_DOWN_COUNT, new SortField<>(PROP_THUMBS_DOWN_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_SMILE_COUNT, new SortField<>(PROP_SMILE_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_TADA_COUNT, new SortField<>(PROP_TADA_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_CONFUSED_COUNT, new SortField<>(PROP_CONFUSED_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_HEART_COUNT, new SortField<>(PROP_HEART_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_ROCKET_COUNT, new SortField<>(PROP_ROCKET_COUNT, DESCENDING));
+ SORT_FIELDS.put(NAME_EYES_COUNT, new SortField<>(PROP_EYES_COUNT, DESCENDING));
}
private static ThreadLocal<Stack<PullRequest>> stack = withInitial(Stack::new);
@@ -309,6 +351,9 @@ public class PullRequest extends ProjectBelonging
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
private Collection<PendingSuggestionApply> pendingSuggestionApplies = new ArrayList<>();
+ @OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
+ private Collection<PullRequestReaction> reactions = new ArrayList<>();
+
private transient Boolean mergedIntoTarget;
private transient Boolean sourceOutdated;
@@ -329,6 +374,15 @@ public class PullRequest extends ProjectBelonging
private transient Optional<CommitMessageError> commitMessageErrorOpt;
+ private int thumbsUpCount;
+ private int thumbsDownCount;
+ private int smileCount;
+ private int tadaCount;
+ private int confusedCount;
+ private int heartCount;
+ private int rocketCount;
+ private int eyesCount;
+
public String getTitle() {
return title;
}
@@ -493,6 +547,13 @@ public class PullRequest extends ProjectBelonging
this.changes = changes;
}
+ public Collection<PullRequestReaction> getReactions() {
+ return reactions;
+ }
+
+ public void setReactions(Collection<PullRequestReaction> reactions) {
+ this.reactions = reactions;
+ }
public Collection<PullRequestMention> getMentions() {
return mentions;
}
@@ -1167,4 +1228,68 @@ public class PullRequest extends ProjectBelonging
return Emojis.getInstance().apply(getTitle()) + " (" + getReference().toString(currentProject)+ ")";
}
+ public int getThumbsUpCount() {
+ return thumbsUpCount;
+ }
+
+ public void setThumbsUpCount(int thumbsUpCount) {
+ this.thumbsUpCount = thumbsUpCount;
+ }
+
+ public int getThumbsDownCount() {
+ return thumbsDownCount;
+ }
+
+ public void setThumbsDownCount(int thumbsDownCount) {
+ this.thumbsDownCount = thumbsDownCount;
+ }
+
+ public int getSmileCount() {
+ return smileCount;
+ }
+
+ public void setSmileCount(int smileCount) {
+ this.smileCount = smileCount;
+ }
+
+ public int getTadaCount() {
+ return tadaCount;
+ }
+
+ public void setTadaCount(int tadaCount) {
+ this.tadaCount = tadaCount;
+ }
+
+ public int getConfusedCount() {
+ return confusedCount;
+ }
+
+ public void setConfusedCount(int confusedCount) {
+ this.confusedCount = confusedCount;
+ }
+
+ public int getHeartCount() {
+ return heartCount;
+ }
+
+ public void setHeartCount(int heartCount) {
+ this.heartCount = heartCount;
+ }
+
+ public int getRocketCount() {
+ return rocketCount;
+ }
+
+ public void setRocketCount(int rocketCount) {
+ this.rocketCount = rocketCount;
+ }
+
+ public int getEyesCount() {
+ return eyesCount;
+ }
+
+ public void setEyesCount(int eyesCount) {
+ this.eyesCount = eyesCount;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java
index 8ccbaeba51..99a64f47f6 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestComment.java
@@ -1,10 +1,20 @@
package io.onedev.server.model;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
import io.onedev.server.model.support.EntityComment;
import io.onedev.server.rest.annotation.Immutable;
-import javax.persistence.*;
-
@Entity
@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")})
public class PullRequestComment extends EntityComment {
@@ -18,6 +28,9 @@ public class PullRequestComment extends EntityComment {
@Immutable
private PullRequest request;
+ @OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)
+ private Collection<PullRequestCommentReaction> reactions = new ArrayList<>();
+
public PullRequest getRequest() {
return request;
}
@@ -35,4 +48,12 @@ public class PullRequestComment extends EntityComment {
return getRequest();
}
+ public Collection<PullRequestCommentReaction> getReactions() {
+ return reactions;
+ }
+
+ public void setReactions(Collection<PullRequestCommentReaction> reactions) {
+ this.reactions = reactions;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestCommentReaction.java b/server-core/src/main/java/io/onedev/server/model/PullRequestCommentReaction.java
new file mode 100644
index 0000000000..8d47b55de5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestCommentReaction.java
@@ -0,0 +1,35 @@
+package io.onedev.server.model;
+
+import javax.persistence.*;
+
+import io.onedev.server.model.support.EntityReaction;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_comment_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_comment_id", "o_user_id", "emoji"})}
+)
+public class PullRequestCommentReaction extends EntityReaction {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_COMMENT = "comment";
+
+ @ManyToOne
+ @JoinColumn(nullable=false)
+ private PullRequestComment comment;
+
+ public PullRequestComment getComment() {
+ return comment;
+ }
+
+ public void setComment(PullRequestComment comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ protected AbstractEntity getEntity() {
+ return comment;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReaction.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReaction.java
new file mode 100644
index 0000000000..3053481968
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReaction.java
@@ -0,0 +1,35 @@
+package io.onedev.server.model;
+
+import javax.persistence.*;
+
+import io.onedev.server.model.support.EntityReaction;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_request_id"), @Index(columnList="o_user_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_request_id", "o_user_id", "emoji"})}
+)
+public class PullRequestReaction extends EntityReaction {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_REQUEST = "request";
+
+ @ManyToOne
+ @JoinColumn(nullable=false)
+ private PullRequest request;
+
+ public PullRequest getRequest() {
+ return request;
+ }
+
+ public void setRequest(PullRequest request) {
+ this.request = request;
+ }
+
+ @Override
+ protected AbstractEntity getEntity() {
+ return request;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/EntityReaction.java b/server-core/src/main/java/io/onedev/server/model/support/EntityReaction.java
new file mode 100644
index 0000000000..9668cca7fb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/EntityReaction.java
@@ -0,0 +1,40 @@
+package io.onedev.server.model.support;
+
+import javax.persistence.*;
+
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.User;
+
+@MappedSuperclass
+public abstract class EntityReaction extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_USER = "user";
+
+ @Column(nullable = false)
+ private String emoji;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private User user;
+
+ public String getEmoji() {
+ return emoji;
+ }
+
+ public void setEmoji(String emoji) {
+ this.emoji = emoji;
+ }
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ protected abstract AbstractEntity getEntity();
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java
new file mode 100644
index 0000000000..b2686b99e3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ConfusedCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.criteria.Criteria;
+
+public class ConfusedCountCriteria extends Criteria<Issue> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public ConfusedCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_CONFUSED_COUNT);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (operator == IssueQueryLexer.Is)
+ return issue.getConfusedCount() == value;
+ else if (operator == IssueQueryLexer.IsNot)
+ return issue.getConfusedCount() != value;
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getConfusedCount() > value;
+ else
+ return issue.getConfusedCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Issue.NAME_CONFUSED_COUNT) + " "
+ + IssueQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java
new file mode 100644
index 0000000000..d4b3826c73
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/EyesCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.criteria.Criteria;
+
+public class EyesCountCriteria extends Criteria<Issue> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public EyesCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_EYES_COUNT);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (operator == IssueQueryLexer.Is)
+ return issue.getEyesCount() == value;
+ else if (operator == IssueQueryLexer.IsNot)
+ return issue.getEyesCount() != value;
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getEyesCount() > value;
+ else
+ return issue.getEyesCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Issue.NAME_EYES_COUNT) + " "
+ + IssueQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java
new file mode 100644
index 0000000000..5424efa399
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HeartCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.criteria.Criteria;
+
+public class HeartCountCriteria extends Criteria<Issue> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public HeartCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_HEART_COUNT);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (operator == IssueQueryLexer.Is)
+ return issue.getHeartCount() == value;
+ else if (operator == IssueQueryLexer.IsNot)
+ return issue.getHeartCount() != value;
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getHeartCount() > value;
+ else
+ return issue.getHeartCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Issue.NAME_HEART_COUNT) + " "
+ + IssueQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 6cfd1963a9..8b15f5c55c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -1,5 +1,71 @@
package io.onedev.server.search.entity.issue;
+import static io.onedev.server.model.Issue.NAME_COMMENT;
+import static io.onedev.server.model.Issue.NAME_COMMENT_COUNT;
+import static io.onedev.server.model.Issue.NAME_DESCRIPTION;
+import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;
+import static io.onedev.server.model.Issue.NAME_LAST_ACTIVITY_DATE;
+import static io.onedev.server.model.Issue.NAME_PROGRESS;
+import static io.onedev.server.model.Issue.NAME_PROJECT;
+import static io.onedev.server.model.Issue.NAME_SPENT_TIME;
+import static io.onedev.server.model.Issue.NAME_STATE;
+import static io.onedev.server.model.Issue.NAME_SUBMIT_DATE;
+import static io.onedev.server.model.Issue.NAME_TITLE;
+import static io.onedev.server.model.Issue.NAME_VOTE_COUNT;
+import static io.onedev.server.model.Issue.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.CommentedByMe;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.Confidential;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.Contains;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.CurrentIssue;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.FixedInCurrentBuild;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.FixedInCurrentCommit;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.FixedInCurrentPullRequest;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.Is;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsAfter;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsBefore;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsEmpty;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsGreaterThan;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsLessThan;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsMe;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsNot;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsNotEmpty;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsNotMe;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsPrevious;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsSince;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.IsUntil;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.MentionedMe;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.SubmittedByMe;
+import static io.onedev.server.search.entity.issue.IssueQueryParser.WatchedByMe;
+import static io.onedev.server.model.Issue.NAME_THUMBS_UP_COUNT;
+import static io.onedev.server.model.Issue.NAME_THUMBS_DOWN_COUNT;
+import static io.onedev.server.model.Issue.NAME_SMILE_COUNT;
+import static io.onedev.server.model.Issue.NAME_TADA_COUNT;
+import static io.onedev.server.model.Issue.NAME_CONFUSED_COUNT;
+import static io.onedev.server.model.Issue.NAME_HEART_COUNT;
+import static io.onedev.server.model.Issue.NAME_ROCKET_COUNT;
+import static io.onedev.server.model.Issue.NAME_EYES_COUNT;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
@@ -8,11 +74,38 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueSchedule;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.issue.field.spec.*;
+import io.onedev.server.model.support.issue.field.spec.BooleanField;
+import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;
+import io.onedev.server.model.support.issue.field.spec.CommitField;
+import io.onedev.server.model.support.issue.field.spec.DateField;
+import io.onedev.server.model.support.issue.field.spec.DateTimeField;
+import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;
+import io.onedev.server.model.support.issue.field.spec.IntegerField;
+import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;
+import io.onedev.server.model.support.issue.field.spec.IterationChoiceField;
+import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;
+import io.onedev.server.model.support.issue.field.spec.TextField;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.issue.IssueQueryParser.AndCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.CriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.FieldOperatorCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.FixedBetweenCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.FuzzyCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.LinkMatchCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.NotCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.OrCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.OrderContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.QueryContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.ReferenceCriteriaContext;
+import io.onedev.server.search.entity.issue.IssueQueryParser.RevisionCriteriaContext;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
@@ -24,15 +117,6 @@ import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValu
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;
import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
import io.onedev.server.web.util.WicketUtils;
-import org.antlr.v4.runtime.*;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-import static io.onedev.server.model.Issue.*;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
-import static io.onedev.server.search.entity.issue.IssueQueryParser.*;
public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue> {
@@ -267,6 +351,22 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
criterias.add(new VoteCountCriteria(getIntValue(value), operator));
} else if (fieldName.equals(NAME_COMMENT_COUNT)) {
criterias.add(new CommentCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_THUMBS_UP_COUNT)) {
+ criterias.add(new ThumbsUpCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_THUMBS_DOWN_COUNT)) {
+ criterias.add(new ThumbsDownCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_SMILE_COUNT)) {
+ criterias.add(new SmileCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_TADA_COUNT)) {
+ criterias.add(new TadaCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_CONFUSED_COUNT)) {
+ criterias.add(new ConfusedCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_HEART_COUNT)) {
+ criterias.add(new HeartCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_ROCKET_COUNT)) {
+ criterias.add(new RocketCountCriteria(getIntValue(value), operator));
+ } else if (fieldName.equals(NAME_EYES_COUNT)) {
+ criterias.add(new EyesCountCriteria(getIntValue(value), operator));
} else if (fieldName.equals(Issue.NAME_NUMBER)) {
criterias.add(new ReferenceCriteria(project, value, operator));
} else if (fieldName.equals(NAME_ESTIMATED_TIME)) {
@@ -311,8 +411,29 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
case NAME_COMMENT_COUNT:
criterias.add(new CommentCountCriteria(getIntValue(value), operator));
break;
- case Issue.NAME_NUMBER:
- criterias.add(new ReferenceCriteria(project, value, operator));
+ case NAME_THUMBS_UP_COUNT:
+ criterias.add(new ThumbsUpCountCriteria(getIntValue(value), operator));
+ break;
+ case NAME_THUMBS_DOWN_COUNT:
+ criterias.add(new ThumbsDownCountCriteria(getIntValue(value), operator));
+ break;
+ case NAME_SMILE_COUNT:
+ criterias.add(new SmileCountCriteria(getIntValue(value), operator));
+ break;
+ case NAME_TADA_COUNT:
+ criterias.add(new TadaCountCriteria(getIntValue(value), operator));
+ break;
+ case NAME_CONFUSED_COUNT:
+ criterias.add(new ConfusedCountCriteria(getIntValue(value), operator));
+ break;
+ case NAME_HEART_COUNT:
+ criterias.add(new HeartCountCriteria(getIntValue(value), operator));
+ break;
+ case NAME_ROCKET_COUNT:
+ criterias.add(new RocketCountCriteria(getIntValue(value), operator));
+ break;
+ case NAME_EYES_COUNT:
+ criterias.add(new EyesCountCriteria(getIntValue(value), operator));
break;
case NAME_ESTIMATED_TIME:
int intValue = value.equals(NAME_SPENT_TIME) ? -1 : timeTrackingSetting.parseWorkingPeriod(value);
@@ -475,6 +596,14 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
&& !fieldName.equals(Issue.NAME_STATE)
&& !fieldName.equals(Issue.NAME_VOTE_COUNT)
&& !fieldName.equals(Issue.NAME_COMMENT_COUNT)
+ && !fieldName.equals(Issue.NAME_THUMBS_UP_COUNT)
+ && !fieldName.equals(Issue.NAME_THUMBS_DOWN_COUNT)
+ && !fieldName.equals(Issue.NAME_SMILE_COUNT)
+ && !fieldName.equals(Issue.NAME_TADA_COUNT)
+ && !fieldName.equals(Issue.NAME_CONFUSED_COUNT)
+ && !fieldName.equals(Issue.NAME_HEART_COUNT)
+ && !fieldName.equals(Issue.NAME_ROCKET_COUNT)
+ && !fieldName.equals(Issue.NAME_EYES_COUNT)
&& !fieldName.equals(Issue.NAME_NUMBER)
&& !fieldName.equals(IssueSchedule.NAME_ITERATION)
&& !(fieldSpec instanceof IssueChoiceField)
@@ -503,6 +632,14 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
&& !fieldName.equals(NAME_SPENT_TIME)
&& !fieldName.equals(NAME_PROGRESS)
&& !fieldName.equals(Issue.NAME_COMMENT_COUNT)
+ && !fieldName.equals(Issue.NAME_THUMBS_UP_COUNT)
+ && !fieldName.equals(Issue.NAME_THUMBS_DOWN_COUNT)
+ && !fieldName.equals(Issue.NAME_SMILE_COUNT)
+ && !fieldName.equals(Issue.NAME_TADA_COUNT)
+ && !fieldName.equals(Issue.NAME_CONFUSED_COUNT)
+ && !fieldName.equals(Issue.NAME_HEART_COUNT)
+ && !fieldName.equals(Issue.NAME_ROCKET_COUNT)
+ && !fieldName.equals(Issue.NAME_EYES_COUNT)
&& !fieldName.equals(Issue.NAME_NUMBER)
&& !(fieldSpec instanceof IntegerField)
&& !(fieldSpec instanceof ChoiceField && !fieldSpec.isAllowMultiple()))
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
new file mode 100644
index 0000000000..05175efb77
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/RocketCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.criteria.Criteria;
+
+public class RocketCountCriteria extends Criteria<Issue> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public RocketCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_ROCKET_COUNT);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (operator == IssueQueryLexer.Is)
+ return issue.getRocketCount() == value;
+ else if (operator == IssueQueryLexer.IsNot)
+ return issue.getRocketCount() != value;
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getRocketCount() > value;
+ else
+ return issue.getRocketCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Issue.NAME_ROCKET_COUNT) + " "
+ + IssueQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java
new file mode 100644
index 0000000000..787e8d63ec
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SmileCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.criteria.Criteria;
+
+public class SmileCountCriteria extends Criteria<Issue> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public SmileCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_SMILE_COUNT);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (operator == IssueQueryLexer.Is)
+ return issue.getSmileCount() == value;
+ else if (operator == IssueQueryLexer.IsNot)
+ return issue.getSmileCount() != value;
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getSmileCount() > value;
+ else
+ return issue.getSmileCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Issue.NAME_SMILE_COUNT) + " "
+ + IssueQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java
new file mode 100644
index 0000000000..57d98b716f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/TadaCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.criteria.Criteria;
+
+public class TadaCountCriteria extends Criteria<Issue> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public TadaCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_TADA_COUNT);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (operator == IssueQueryLexer.Is)
+ return issue.getTadaCount() == value;
+ else if (operator == IssueQueryLexer.IsNot)
+ return issue.getTadaCount() != value;
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getTadaCount() > value;
+ else
+ return issue.getTadaCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Issue.NAME_TADA_COUNT) + " "
+ + IssueQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java
new file mode 100644
index 0000000000..a12d84fe86
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsDownCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.criteria.Criteria;
+
+public class ThumbsDownCountCriteria extends Criteria<Issue> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public ThumbsDownCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_THUMBS_DOWN_COUNT);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (operator == IssueQueryLexer.Is)
+ return issue.getThumbsDownCount() == value;
+ else if (operator == IssueQueryLexer.IsNot)
+ return issue.getThumbsDownCount() != value;
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getThumbsDownCount() > value;
+ else
+ return issue.getThumbsDownCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Issue.NAME_THUMBS_DOWN_COUNT) + " "
+ + IssueQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java
new file mode 100644
index 0000000000..6e7f91d092
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ThumbsUpCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.issue;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.util.criteria.Criteria;
+
+public class ThumbsUpCountCriteria extends Criteria<Issue> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public ThumbsUpCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(Issue.PROP_THUMBS_UP_COUNT);
+ if (operator == IssueQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == IssueQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ if (operator == IssueQueryLexer.Is)
+ return issue.getThumbsUpCount() == value;
+ else if (operator == IssueQueryLexer.IsNot)
+ return issue.getThumbsUpCount() != value;
+ else if (operator == IssueQueryLexer.IsGreaterThan)
+ return issue.getThumbsUpCount() > value;
+ else
+ return issue.getThumbsUpCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Issue.NAME_THUMBS_UP_COUNT) + " "
+ + IssueQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
index de15fc348f..e89d647551 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentCountCriteria.java
@@ -6,7 +6,6 @@ import javax.persistence.criteria.From;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
-import com.hazelcast.internal.monitor.impl.GlobalPerIndexStats;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.criteria.Criteria;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java
new file mode 100644
index 0000000000..a6d0d0d3ca
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ConfusedCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.criteria.Criteria;
+
+public class ConfusedCountCriteria extends Criteria<PullRequest> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public ConfusedCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(PullRequest.PROP_CONFUSED_COUNT);
+ if (operator == PullRequestQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ if (operator == PullRequestQueryLexer.Is)
+ return request.getConfusedCount() == value;
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return request.getConfusedCount() != value;
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return request.getConfusedCount() > value;
+ else
+ return request.getConfusedCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(PullRequest.NAME_CONFUSED_COUNT) + " "
+ + PullRequestQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java
new file mode 100644
index 0000000000..2c8dcf8ecb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/EyesCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.criteria.Criteria;
+
+public class EyesCountCriteria extends Criteria<PullRequest> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public EyesCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(PullRequest.PROP_EYES_COUNT);
+ if (operator == PullRequestQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ if (operator == PullRequestQueryLexer.Is)
+ return request.getEyesCount() == value;
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return request.getEyesCount() != value;
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return request.getEyesCount() > value;
+ else
+ return request.getEyesCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(PullRequest.NAME_EYES_COUNT) + " "
+ + PullRequestQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java
new file mode 100644
index 0000000000..083f8d5114
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HeartCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.criteria.Criteria;
+
+public class HeartCountCriteria extends Criteria<PullRequest> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public HeartCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(PullRequest.PROP_HEART_COUNT);
+ if (operator == PullRequestQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ if (operator == PullRequestQueryLexer.Is)
+ return request.getHeartCount() == value;
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return request.getHeartCount() != value;
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return request.getHeartCount() > value;
+ else
+ return request.getHeartCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(PullRequest.NAME_HEART_COUNT) + " "
+ + PullRequestQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index 2c11b53473..767e181e1a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -281,6 +281,30 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
case PullRequest.NAME_COMMENT_COUNT:
criterias.add(new CommentCountCriteria(getIntValue(value), operator));
break;
+ case PullRequest.NAME_THUMBS_UP_COUNT:
+ criterias.add(new ThumbsUpCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_THUMBS_DOWN_COUNT:
+ criterias.add(new ThumbsDownCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_SMILE_COUNT:
+ criterias.add(new SmileCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_TADA_COUNT:
+ criterias.add(new TadaCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_CONFUSED_COUNT:
+ criterias.add(new ConfusedCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_HEART_COUNT:
+ criterias.add(new HeartCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_ROCKET_COUNT:
+ criterias.add(new RocketCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_EYES_COUNT:
+ criterias.add(new EyesCountCriteria(getIntValue(value), operator));
+ break;
default:
throw new IllegalStateException();
}
@@ -294,8 +318,30 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
case PullRequest.NAME_COMMENT_COUNT:
criterias.add(new CommentCountCriteria(getIntValue(value), operator));
break;
- default:
- throw new IllegalStateException();
+ case PullRequest.NAME_THUMBS_UP_COUNT:
+ criterias.add(new ThumbsUpCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_THUMBS_DOWN_COUNT:
+ criterias.add(new ThumbsDownCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_SMILE_COUNT:
+ criterias.add(new SmileCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_TADA_COUNT:
+ criterias.add(new TadaCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_CONFUSED_COUNT:
+ criterias.add(new ConfusedCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_HEART_COUNT:
+ criterias.add(new HeartCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_ROCKET_COUNT:
+ criterias.add(new RocketCountCriteria(getIntValue(value), operator));
+ break;
+ case PullRequest.NAME_EYES_COUNT:
+ criterias.add(new EyesCountCriteria(getIntValue(value), operator));
+ break;
}
break;
default:
@@ -386,14 +432,30 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
&& !fieldName.equals(PullRequest.NAME_SOURCE_PROJECT)
&& !fieldName.equals(PullRequest.NAME_SOURCE_BRANCH)
&& !fieldName.equals(PullRequest.NAME_LABEL)
- && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {
+ && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)
+ && !fieldName.equals(PullRequest.NAME_THUMBS_UP_COUNT)
+ && !fieldName.equals(PullRequest.NAME_THUMBS_DOWN_COUNT)
+ && !fieldName.equals(PullRequest.NAME_SMILE_COUNT)
+ && !fieldName.equals(PullRequest.NAME_TADA_COUNT)
+ && !fieldName.equals(PullRequest.NAME_CONFUSED_COUNT)
+ && !fieldName.equals(PullRequest.NAME_HEART_COUNT)
+ && !fieldName.equals(PullRequest.NAME_ROCKET_COUNT)
+ && !fieldName.equals(PullRequest.NAME_EYES_COUNT)) {
throw newOperatorException(fieldName, operator);
}
break;
case IsLessThan:
case IsGreaterThan:
if (!fieldName.equals(PullRequest.NAME_NUMBER)
- && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)) {
+ && !fieldName.equals(PullRequest.NAME_COMMENT_COUNT)
+ && !fieldName.equals(PullRequest.NAME_THUMBS_UP_COUNT)
+ && !fieldName.equals(PullRequest.NAME_THUMBS_DOWN_COUNT)
+ && !fieldName.equals(PullRequest.NAME_SMILE_COUNT)
+ && !fieldName.equals(PullRequest.NAME_TADA_COUNT)
+ && !fieldName.equals(PullRequest.NAME_CONFUSED_COUNT)
+ && !fieldName.equals(PullRequest.NAME_HEART_COUNT)
+ && !fieldName.equals(PullRequest.NAME_ROCKET_COUNT)
+ && !fieldName.equals(PullRequest.NAME_EYES_COUNT)) {
throw newOperatorException(fieldName, operator);
}
break;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
new file mode 100644
index 0000000000..1b0c5b88be
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RocketCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.criteria.Criteria;
+
+public class RocketCountCriteria extends Criteria<PullRequest> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public RocketCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(PullRequest.PROP_ROCKET_COUNT);
+ if (operator == PullRequestQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ if (operator == PullRequestQueryLexer.Is)
+ return request.getRocketCount() == value;
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return request.getRocketCount() != value;
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return request.getRocketCount() > value;
+ else
+ return request.getRocketCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(PullRequest.NAME_ROCKET_COUNT) + " "
+ + PullRequestQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java
new file mode 100644
index 0000000000..f767eac602
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SmileCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.criteria.Criteria;
+
+public class SmileCountCriteria extends Criteria<PullRequest> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public SmileCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(PullRequest.PROP_SMILE_COUNT);
+ if (operator == PullRequestQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ if (operator == PullRequestQueryLexer.Is)
+ return request.getSmileCount() == value;
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return request.getSmileCount() != value;
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return request.getSmileCount() > value;
+ else
+ return request.getSmileCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(PullRequest.NAME_SMILE_COUNT) + " "
+ + PullRequestQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java
new file mode 100644
index 0000000000..738a010993
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/TadaCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.criteria.Criteria;
+
+public class TadaCountCriteria extends Criteria<PullRequest> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public TadaCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(PullRequest.PROP_TADA_COUNT);
+ if (operator == PullRequestQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ if (operator == PullRequestQueryLexer.Is)
+ return request.getTadaCount() == value;
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return request.getTadaCount() != value;
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return request.getTadaCount() > value;
+ else
+ return request.getTadaCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(PullRequest.NAME_TADA_COUNT) + " "
+ + PullRequestQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java
new file mode 100644
index 0000000000..0b9c243f4f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsDownCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.criteria.Criteria;
+
+public class ThumbsDownCountCriteria extends Criteria<PullRequest> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public ThumbsDownCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(PullRequest.PROP_THUMBS_DOWN_COUNT);
+ if (operator == PullRequestQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ if (operator == PullRequestQueryLexer.Is)
+ return request.getThumbsDownCount() == value;
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return request.getThumbsDownCount() != value;
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return request.getThumbsDownCount() > value;
+ else
+ return request.getThumbsDownCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(PullRequest.NAME_THUMBS_DOWN_COUNT) + " "
+ + PullRequestQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java
new file mode 100644
index 0000000000..599af449c7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ThumbsUpCountCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.criteria.Criteria;
+
+public class ThumbsUpCountCriteria extends Criteria<PullRequest> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final int value;
+
+ public ThumbsUpCountCriteria(int value, int operator) {
+ this.operator = operator;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<Integer> attribute = from.get(PullRequest.PROP_THUMBS_UP_COUNT);
+ if (operator == PullRequestQueryLexer.Is)
+ return builder.equal(attribute, value);
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return builder.not(builder.equal(attribute, value));
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else
+ return builder.lessThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ if (operator == PullRequestQueryLexer.Is)
+ return request.getThumbsUpCount() == value;
+ else if (operator == PullRequestQueryLexer.IsNot)
+ return request.getThumbsUpCount() != value;
+ else if (operator == PullRequestQueryLexer.IsGreaterThan)
+ return request.getThumbsUpCount() > value;
+ else
+ return request.getThumbsUpCount() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(PullRequest.NAME_THUMBS_UP_COUNT) + " "
+ + PullRequestQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 0af5eec532..995a25a15f 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -1,7 +1,68 @@
package io.onedev.server.web.behavior;
+import static com.google.common.collect.Lists.newArrayList;
+import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;
+import static io.onedev.server.model.Issue.NAME_BOARD_POSITION;
+import static io.onedev.server.model.Issue.NAME_COMMENT;
+import static io.onedev.server.model.Issue.NAME_COMMENT_COUNT;
+import static io.onedev.server.model.Issue.NAME_CONFUSED_COUNT;
+import static io.onedev.server.model.Issue.NAME_DESCRIPTION;
+import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;
+import static io.onedev.server.model.Issue.NAME_EYES_COUNT;
+import static io.onedev.server.model.Issue.NAME_HEART_COUNT;
+import static io.onedev.server.model.Issue.NAME_LAST_ACTIVITY_DATE;
+import static io.onedev.server.model.Issue.NAME_PROGRESS;
+import static io.onedev.server.model.Issue.NAME_PROJECT;
+import static io.onedev.server.model.Issue.NAME_ROCKET_COUNT;
+import static io.onedev.server.model.Issue.NAME_SMILE_COUNT;
+import static io.onedev.server.model.Issue.NAME_SPENT_TIME;
+import static io.onedev.server.model.Issue.NAME_STATE;
+import static io.onedev.server.model.Issue.NAME_SUBMIT_DATE;
+import static io.onedev.server.model.Issue.NAME_TADA_COUNT;
+import static io.onedev.server.model.Issue.NAME_THUMBS_DOWN_COUNT;
+import static io.onedev.server.model.Issue.NAME_THUMBS_UP_COUNT;
+import static io.onedev.server.model.Issue.NAME_TITLE;
+import static io.onedev.server.model.Issue.NAME_VOTE_COUNT;
+import static io.onedev.server.model.Issue.QUERY_FIELDS;
+import static io.onedev.server.model.Issue.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntityQuery.getValue;
+import static io.onedev.server.search.entity.issue.IssueQuery.checkField;
+import static io.onedev.server.search.entity.issue.IssueQuery.getOperator;
+import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.CommentedBy;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.CommentedByMe;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.CurrentIssue;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInBuild;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentBuild;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentCommit;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInCurrentPullRequest;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInPullRequest;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.HasAny;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.Mentioned;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.MentionedMe;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.OrderBy;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedBy;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedByMe;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
+
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.codeassist.InputCompletion;
import io.onedev.commons.codeassist.InputSuggestion;
@@ -19,7 +80,18 @@ import io.onedev.server.model.IssueSchedule;
import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.issue.field.spec.*;
+import io.onedev.server.model.support.issue.field.spec.BooleanField;
+import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;
+import io.onedev.server.model.support.issue.field.spec.CommitField;
+import io.onedev.server.model.support.issue.field.spec.DateField;
+import io.onedev.server.model.support.issue.field.spec.DateTimeField;
+import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;
+import io.onedev.server.model.support.issue.field.spec.IntegerField;
+import io.onedev.server.model.support.issue.field.spec.IssueChoiceField;
+import io.onedev.server.model.support.issue.field.spec.IterationChoiceField;
+import io.onedev.server.model.support.issue.field.spec.PullRequestChoiceField;
+import io.onedev.server.model.support.issue.field.spec.TextField;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
@@ -31,21 +103,7 @@ import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.google.common.collect.Lists.newArrayList;
-import static io.onedev.server.model.Issue.*;
-import static io.onedev.server.search.entity.EntityQuery.getValue;
-import static io.onedev.server.search.entity.issue.IssueQuery.*;
-import static io.onedev.server.search.entity.issue.IssueQueryLexer.*;
-
-@SuppressWarnings("serial")
public class IssueQueryBehavior extends ANTLRAssistBehavior {
private static final String FUZZY_SUGGESTION_DESCRIPTION_PREFIX = "enclose with ~";
@@ -109,7 +167,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
Project project = getProject();
ParseExpect criteriaValueExpect;
if ("criteriaField".equals(spec.getLabel())) {
- Map<String, String> candidates = getFieldCandidates(QUERY_FIELDS);
+ var candidates = getFieldCandidates(QUERY_FIELDS.stream().filter(it -> !it.startsWith("Reaction: ")).collect(toList()));
+
if (!option.withProjectCriteria())
candidates.remove(NAME_PROJECT);
if (!option.withStateCriteria())
@@ -121,9 +180,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
candidates.remove(NAME_SPENT_TIME);
candidates.remove(NAME_PROGRESS);
}
+ candidates.putAll(getFieldCandidates(QUERY_FIELDS.stream().filter(it -> it.startsWith("Reaction: ")).collect(toList())));
return SuggestionUtils.suggest(candidates, matchWith);
} else if ("orderField".equals(spec.getLabel())) {
- Map<String, String> candidates = getFieldCandidates(SORT_FIELDS.keySet());
+ var candidates = getFieldCandidates(SORT_FIELDS.keySet().stream().filter(it -> !it.startsWith("Reaction: ")).collect(toList()));
if (option.forBoard())
candidates.remove(NAME_BOARD_POSITION);
if (getProject() != null)
@@ -140,6 +200,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
candidates.put(field.getName(), null);
}
}
+ candidates.putAll(getFieldCandidates(SORT_FIELDS.keySet().stream().filter(it -> it.startsWith("Reaction: ")).collect(toList())));
return SuggestionUtils.suggest(candidates, matchWith);
} else if ("revisionValue".equals(spec.getLabel())) {
String revisionType = terminalExpect.getState()
@@ -244,9 +305,20 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
if ("0.5".contains(matchWith.toLowerCase()))
suggestions.add(new InputSuggestion("0.5", "specify decimal number, modify as necessary", null));
return !suggestions.isEmpty() ? suggestions : null;
- } else if (fieldName.equals(NAME_TITLE) || fieldName.equals(NAME_DESCRIPTION)
- || fieldName.equals(NAME_COMMENT) || fieldName.equals(NAME_VOTE_COUNT)
- || fieldName.equals(NAME_COMMENT_COUNT) || fieldSpec instanceof IntegerField
+ } else if (fieldName.equals(NAME_TITLE)
+ || fieldName.equals(NAME_DESCRIPTION)
+ || fieldName.equals(NAME_COMMENT)
+ || fieldName.equals(NAME_VOTE_COUNT)
+ || fieldName.equals(NAME_COMMENT_COUNT)
+ || fieldName.equals(NAME_THUMBS_UP_COUNT)
+ || fieldName.equals(NAME_THUMBS_DOWN_COUNT)
+ || fieldName.equals(NAME_SMILE_COUNT)
+ || fieldName.equals(NAME_TADA_COUNT)
+ || fieldName.equals(NAME_CONFUSED_COUNT)
+ || fieldName.equals(NAME_HEART_COUNT)
+ || fieldName.equals(NAME_ROCKET_COUNT)
+ || fieldName.equals(NAME_EYES_COUNT)
+ || fieldSpec instanceof IntegerField
|| fieldSpec instanceof TextField) {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index 0d04e3ad7a..3adc97b523 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -25,13 +25,13 @@ import org.apache.wicket.model.IModel;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;
import static io.onedev.server.search.entity.EntityQuery.getValue;
import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.*;
import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.*;
-@SuppressWarnings("serial")
public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
private static final String FUZZY_SUGGESTION_DESCRIPTION_PREFIX = "enclose with ~";
@@ -75,14 +75,24 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
Project project = getProject();
ParseExpect criteriaValueExpect;
if ("criteriaField".equals(spec.getLabel())) {
- List<String> candidates = new ArrayList<>(PullRequest.QUERY_FIELDS);
+ List<String> candidates = new ArrayList<>(PullRequest.QUERY_FIELDS.stream()
+ .filter(it -> !it.startsWith("Reaction: "))
+ .collect(Collectors.toList()));
if (getProject() != null)
candidates.remove(PullRequest.NAME_TARGET_PROJECT);
+ candidates.addAll(PullRequest.QUERY_FIELDS.stream()
+ .filter(it -> it.startsWith("Reaction: "))
+ .collect(Collectors.toList()));
return SuggestionUtils.suggest(candidates, matchWith);
} else if ("orderField".equals(spec.getLabel())) {
- List<String> candidates = new ArrayList<>(PullRequest.SORT_FIELDS.keySet());
+ List<String> candidates = new ArrayList<>(PullRequest.SORT_FIELDS.keySet().stream()
+ .filter(it -> !it.startsWith("Reaction: "))
+ .collect(Collectors.toList()));
if (getProject() != null)
candidates.remove(PullRequest.NAME_TARGET_PROJECT);
+ candidates.addAll(PullRequest.SORT_FIELDS.keySet().stream()
+ .filter(it -> it.startsWith("Reaction: "))
+ .collect(Collectors.toList()));
return SuggestionUtils.suggest(candidates, matchWith);
} else if ((criteriaValueExpect = terminalExpect.findExpectByLabel("criteriaValue")) != null) {
List<Element> fieldElements = criteriaValueExpect.getState().findMatchedElementsByLabel("criteriaField", true);
@@ -139,6 +149,14 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
case PullRequest.NAME_DESCRIPTION:
case PullRequest.NAME_COMMENT_COUNT:
case PullRequest.NAME_COMMENT:
+ case PullRequest.NAME_THUMBS_UP_COUNT:
+ case PullRequest.NAME_THUMBS_DOWN_COUNT:
+ case PullRequest.NAME_SMILE_COUNT:
+ case PullRequest.NAME_TADA_COUNT:
+ case PullRequest.NAME_CONFUSED_COUNT:
+ case PullRequest.NAME_HEART_COUNT:
+ case PullRequest.NAME_ROCKET_COUNT:
+ case PullRequest.NAME_EYES_COUNT:
return null;
}
} catch (ExplicitException ignored) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
index b32387cca1..262d0d29e8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java
@@ -1,21 +1,25 @@
package io.onedev.server.web.component.comment;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Similarities;
-import io.onedev.server.util.facade.UserCache;
import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;
import io.onedev.server.web.component.markdown.MarkdownEditor;
import io.onedev.server.web.component.markdown.UserMentionSupport;
-import org.apache.wicket.model.IModel;
-
-import java.util.ArrayList;
-import java.util.List;
@SuppressWarnings("serial")
public abstract class CommentInput extends MarkdownEditor {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html
index 01f08ca7a4..3b37fa8157 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.html
@@ -3,7 +3,10 @@
<wicket:fragment wicket:id="viewFrag">
<div wicket:id="content"></div>
<i wicket:id="noContent" class="text-muted"></i>
- <div class="mt-3 d-empty-none d-flex align-items-center font-size-sm"><wicket:enclosure child="edit"><a wicket:id="edit" class="text-muted text-hover-primary mr-2">Edit</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="quote"><a wicket:id="quote" class="text-muted text-hover-primary mr-2">Quote</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure><wicket:enclosure child="delete"><a wicket:id="delete" class="text-muted text-hover-primary mr-2">Delete</a><span class="d-last-child-none dot mr-2"></span></wicket:enclosure></div>
+ <div class="mt-3 d-empty-none d-flex align-items-center font-size-sm">
+ <wicket:enclosure child="edit"><span class="d-first-child-none dot mr-2"></span><a wicket:id="edit" class="text-muted text-hover-primary mr-2">Edit</a></wicket:enclosure><wicket:enclosure child="quote"><span class="d-first-child-none dot mr-2"></span><a wicket:id="quote" class="text-muted text-hover-primary mr-2">Quote</a></wicket:enclosure><wicket:enclosure child="delete"><span class="d-first-child-none dot mr-2"></span><a wicket:id="delete" class="text-muted text-hover-primary mr-2">Delete</a></wicket:enclosure>
+ <span wicket:id="reactions"></span>
+ </div>
</wicket:fragment>
<wicket:fragment wicket:id="editFrag">
<form wicket:id="form" class="leave-confirm">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
index b48e7743bb..44665fffe2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/comment/CommentPanel.java
@@ -1,19 +1,11 @@
package io.onedev.server.web.component.comment;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.OneDev;
-import io.onedev.server.attachment.AttachmentSupport;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.facade.UserCache;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.component.markdown.ContentQuoted;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.util.DeleteCallback;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -32,9 +24,19 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.hibernate.StaleStateException;
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.attachment.AttachmentSupport;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.EntityReaction;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.component.markdown.ContentQuoted;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.markdown.MarkdownViewer;
+import io.onedev.server.web.component.reaction.ReactionListPanel;
+import io.onedev.server.web.util.DeleteCallback;
@SuppressWarnings("serial")
public abstract class CommentPanel extends Panel {
@@ -231,6 +233,20 @@ public abstract class CommentPanel extends Panel {
}
});
+
+ viewer.add(new ReactionListPanel("reactions") {
+
+ @Override
+ protected Collection<? extends EntityReaction> getReactions() {
+ return CommentPanel.this.getReactions();
+ }
+
+ @Override
+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ CommentPanel.this.onToggleEmoji(target, emoji);
+ }
+
+ });
viewer.setOutputMarkupId(true);
return viewer;
@@ -275,4 +291,8 @@ public abstract class CommentPanel extends Panel {
return null;
}
+ protected abstract Collection<? extends EntityReaction> getReactions();
+
+ protected abstract void onToggleEmoji(AjaxRequestTarget target, String emoji);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 02a4bb0258..34057045f1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -49,7 +49,6 @@ import java.util.*;
import static io.onedev.server.security.SecurityUtils.canAccessTimeTracking;
-@SuppressWarnings("serial")
public abstract class IssueActivitiesPanel extends Panel {
private static final String COOKIE_SHOW_COMMENTS = "onedev.server.issue.showComments";
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
index a1089f06a3..6074fd8f38 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java
@@ -1,33 +1,37 @@
package io.onedev.server.web.component.issue.activities.activity;
+import static io.onedev.server.security.SecurityUtils.canManageIssues;
+import static io.onedev.server.util.EmailAddressUtils.describe;
+import static org.unbescape.html.HtmlEscape.escapeHtml5;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+import org.jetbrains.annotations.Nullable;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.entitymanager.IssueCommentManager;
+import io.onedev.server.entitymanager.IssueCommentReactionManager;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.comment.CommentPanel;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.util.DeleteCallback;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-import static io.onedev.server.security.SecurityUtils.canManageIssues;
-import static io.onedev.server.util.EmailAddressUtils.describe;
-import static org.unbescape.html.HtmlEscape.escapeHtml5;
@SuppressWarnings("serial")
class IssueCommentedPanel extends GenericPanel<IssueComment> {
@@ -123,6 +127,19 @@ class IssueCommentedPanel extends GenericPanel<IssueComment> {
protected String getAutosaveKey() {
return "issue-comment:" + IssueCommentedPanel.this.getComment().getId();
}
+
+ @Override
+ protected Collection<? extends EntityReaction> getReactions() {
+ return IssueCommentedPanel.this.getComment().getReactions();
+ }
+
+ @Override
+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ var user = SecurityUtils.getUser();
+ var comment = IssueCommentedPanel.this.getComment();
+ OneDev.getInstance(IssueCommentReactionManager.class).toggleEmoji(user, comment, emoji);
+ }
+
});
setOutputMarkupId(true);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
index 645c71849a..9b235603a0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
@@ -1,31 +1,35 @@
package io.onedev.server.web.component.issue.activities.activity;
+import static io.onedev.server.security.SecurityUtils.canManageIssues;
+import static io.onedev.server.util.EmailAddressUtils.describe;
+import static org.unbescape.html.HtmlEscape.escapeHtml5;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+import org.jetbrains.annotations.Nullable;
+
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.entitymanager.IssueChangeManager;
+import io.onedev.server.entitymanager.IssueReactionManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.comment.CommentPanel;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.util.DeleteCallback;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-
-import static io.onedev.server.security.SecurityUtils.canManageIssues;
-import static io.onedev.server.util.EmailAddressUtils.describe;
-import static org.unbescape.html.HtmlEscape.escapeHtml5;
@SuppressWarnings("serial")
class IssueOpenedPanel extends GenericPanel<Issue> {
@@ -107,7 +111,20 @@ class IssueOpenedPanel extends GenericPanel<Issue> {
protected String getAutosaveKey() {
return "issue:" + getIssue().getId() + ":description";
}
-
+
+ @Override
+ protected Collection<? extends EntityReaction> getReactions() {
+ return getIssue().getReactions();
+ }
+
+ @Override
+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ OneDev.getInstance(IssueReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ getIssue(),
+ emoji);
+ }
+
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
index e799312d43..351d10bd84 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/authorizations/IssueAuthorizationsPanel.java
@@ -57,7 +57,6 @@ import io.onedev.server.web.component.user.choice.AbstractUserChoiceProvider;
import io.onedev.server.web.component.user.choice.UserChoiceResourceReference;
import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;
-@SuppressWarnings("serial")
public abstract class IssueAuthorizationsPanel extends Panel {
private String query;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
index 22b9e38400..c8370f9d6e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
@@ -19,7 +19,6 @@ import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
-@SuppressWarnings("serial")
public abstract class BoardEditPanel extends Panel {
private final List<BoardSpec> boards;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java
index eaa0593fb7..abaf326810 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java
@@ -6,7 +6,6 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import io.onedev.server.model.Issue;
import io.onedev.server.web.component.select2.SelectToActChoice;
-@SuppressWarnings("serial")
public abstract class IssueAddChoice extends SelectToActChoice<Issue> {
public IssueAddChoice(String id, IssueChoiceProvider choiceProvider) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java
index 9fa51a9f14..2596b9d157 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java
@@ -7,7 +7,6 @@ import org.apache.wicket.model.IModel;
import io.onedev.server.model.Issue;
import io.onedev.server.web.component.select2.Select2Choice;
-@SuppressWarnings("serial")
public class IssueChoice extends Select2Choice<Issue> {
public IssueChoice(String id, IModel<Issue> model, IssueChoiceProvider choiceProvider) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
index 447dffa65a..36db41b3fa 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
@@ -14,7 +14,6 @@ import org.apache.wicket.model.IModel;
import java.util.List;
-@SuppressWarnings("serial")
public class IssueCommitsPanel extends GenericPanel<Issue> {
public IssueCommitsPanel(String id, IModel<Issue> model) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
index fc2fbc23a0..d82b9cfd09 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/CreateIssuePanel.java
@@ -13,7 +13,6 @@ import org.apache.wicket.markup.html.panel.Panel;
import javax.annotation.Nullable;
-@SuppressWarnings("serial")
public abstract class CreateIssuePanel extends Panel {
public CreateIssuePanel(String id) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.html
new file mode 100644
index 0000000000..d33b2f8488
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.html
@@ -0,0 +1,19 @@
+<wicket:panel>
+ <a wicket:id="addReaction" class="btn btn-icon btn-sm link-muted btn-hover-light">
+ <wicket:svg href="smile" class="icon"/>
+ </a>
+ <wicket:container wicket:id="reactions">
+ <a wicket:id="link" class="btn btn-icon btn-sm btn-hover-light">
+ <span wicket:id="emoji"></span>
+ <span wicket:id="count" class="ml-1 text-muted text-monospace"></span>
+ </a>
+ </wicket:container>
+ <wicket:fragment wicket:id="emojiSelectFrag">
+ <div class="px-3 py-2">
+ <a wicket:id="emojis" class="mr-2 mr-last-child-0 btn btn-icon btn-xs btn-hover-light"><span wicket:id="emoji"></span></a>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="usersFrag">
+ <div wicket:id="users" class="px-3 py-2"></div>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java
new file mode 100644
index 0000000000..d516aceeb0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/reaction/ReactionListPanel.java
@@ -0,0 +1,146 @@
+package io.onedev.server.web.component.reaction;
+
+import static java.util.stream.Collectors.groupingBy;
+import static java.util.stream.Collectors.toList;
+
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.EntityReaction;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.Pair;
+import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;
+import io.onedev.server.web.component.floating.AlignPlacement;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+
+public abstract class ReactionListPanel extends Panel {
+
+ public static final Map<String, String> EMOJIS = new LinkedHashMap<String, String>() {{
+ put("thumbs_up", "πŸ‘");
+ put("thumbs_down", "πŸ‘Ž");
+ put("smile", "πŸ˜„");
+ put("tada", "πŸŽ‰");
+ put("confused", "πŸ˜•");
+ put("heart", "❀️");
+ put("rocket", "πŸš€");
+ put("eyes", "πŸ‘€");
+ }};
+
+ public ReactionListPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new DropdownLink("addReaction") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.getUser() != null);
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ var fragment = new Fragment(id, "emojiSelectFrag", ReactionListPanel.this);
+ var emojisView = new RepeatingView("emojis");
+ for (String emoji: EMOJIS.values()) {
+ var link = new AjaxLink<Void>(emojisView.newChildId()) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onToggleEmoji(target, emoji);
+ target.add(ReactionListPanel.this);
+ }
+ };
+ link.add(new Label("emoji", emoji));
+ emojisView.add(link);
+ }
+ fragment.add(emojisView);
+ return fragment;
+ }
+
+ });
+
+ add(new ListView<Pair<String, List<User>>>("reactions", new LoadableDetachableModel<List<Pair<String, List<User>>>>() {
+
+ @Override
+ protected List<Pair<String, List<User>>> load() {
+ return getReactions().stream().collect(groupingBy(EntityReaction::getEmoji)).entrySet().stream()
+ .map(entry -> new Pair<>(entry.getKey(), entry.getValue().stream().map(reaction->reaction.getUser()).collect(toList())))
+ .collect(toList());
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<Pair<String, List<User>>> item) {
+ var model = item.getModel();
+ var emoji = model.getObject().getLeft();
+ var link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onToggleEmoji(target, emoji);
+ target.add(ReactionListPanel.this);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(SecurityUtils.getUser() != null);
+ }
+
+ };
+ link.add(new Label("emoji", emoji));
+ link.add(new Label("count", model.getObject().getRight().size()));
+ link.add(new DropdownHoverBehavior(AlignPlacement.top(4)) {
+
+ @Override
+ protected Component newContent(String id) {
+ var fragment = new Fragment(id, "usersFrag", ReactionListPanel.this);
+ var users = model.getObject().getRight();
+ String label;
+ if (users.size() <= 5) {
+ label = users.stream()
+ .map(User::getDisplayName)
+ .collect(Collectors.joining(", "));
+ } else {
+ label = users.subList(0, 5).stream()
+ .map(User::getDisplayName)
+ .collect(Collectors.joining(", "))
+ + " and " + (users.size()-5) + " more";
+ }
+ fragment.add(new Label("users", label));
+
+ return fragment;
+ }
+ });
+ item.add(link);
+ }
+ });
+ setOutputMarkupId(true);
+ }
+
+ protected abstract Collection<? extends EntityReaction> getReactions();
+
+ protected abstract void onToggleEmoji(AjaxRequestTarget target, String emoji);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index 57347bf3d3..2824e4189a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -38,7 +38,6 @@ import javax.annotation.Nullable;
import java.io.Serializable;
import java.util.ArrayList;
-@SuppressWarnings("serial")
public class ProjectPullRequestsPage extends ProjectPage {
private static final String PARAM_PAGE = "page";
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java
index aa8414acaa..559f3727cd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java
@@ -7,7 +7,6 @@ import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
-@SuppressWarnings("serial")
public class UnreviewedChangesPanel extends GenericPanel<PullRequestUpdate> {
public UnreviewedChangesPanel(String id, IModel<PullRequestUpdate> model) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
index 4c3c2888d4..c5b7eda850 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java
@@ -12,7 +12,6 @@ import io.onedev.server.model.User;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
import io.onedev.server.web.util.DeleteCallback;
-@SuppressWarnings("serial")
public class PullRequestChangeActivity implements PullRequestActivity {
private final Long changeId;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
index 1cd3d5b3df..bb7a3d9580 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
@@ -14,7 +14,6 @@ import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;
-@SuppressWarnings("serial")
class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
public PullRequestChangePanel(String id, IModel<PullRequestChange> model) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
index 5f2b65b486..4e3ed86c9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java
@@ -13,7 +13,6 @@ import io.onedev.server.model.User;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;
import io.onedev.server.web.util.DeleteCallback;
-@SuppressWarnings("serial")
public class PullRequestCommentedActivity implements PullRequestActivity {
private final Long commentId;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
index 4b44d05692..e383f5c1f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java
@@ -1,14 +1,29 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.jetbrains.annotations.Nullable;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.entitymanager.PullRequestCommentReactionManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.comment.CommentPanel;
@@ -16,19 +31,7 @@ import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;
import io.onedev.server.web.util.DeleteCallback;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-@SuppressWarnings("serial")
class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
private final DeleteCallback deleteCallback;
@@ -127,6 +130,19 @@ class PullRequestCommentedPanel extends GenericPanel<PullRequestComment> {
deleteCallback.onDelete(target);
};
}
+
+ @Override
+ protected Collection<? extends EntityReaction> getReactions() {
+ return PullRequestCommentedPanel.this.getComment().getReactions();
+ }
+
+ @Override
+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ OneDev.getInstance(PullRequestCommentReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ PullRequestCommentedPanel.this.getComment(),
+ emoji);
+ }
});
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
index f2115650a5..aca5ff4005 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
@@ -1,28 +1,31 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+import org.jetbrains.annotations.Nullable;
+
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
import io.onedev.server.attachment.ProjectAttachmentSupport;
import io.onedev.server.entitymanager.PullRequestChangeManager;
+import io.onedev.server.entitymanager.PullRequestReactionManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.EntityReaction;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.component.comment.CommentPanel;
import io.onedev.server.web.component.markdown.ContentVersionSupport;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.util.DeleteCallback;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-import org.apache.wicket.model.IModel;
-import org.jetbrains.annotations.Nullable;
-import java.util.List;
-
-@SuppressWarnings("serial")
class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
public PullRequestOpenedPanel(String id, IModel<PullRequest> model) {
@@ -105,6 +108,19 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
protected DeleteCallback getDeleteCallback() {
return null;
}
+
+ @Override
+ protected Collection<? extends EntityReaction> getReactions() {
+ return getPullRequest().getReactions();
+ }
+
+ @Override
+ protected void onToggleEmoji(AjaxRequestTarget target, String emoji) {
+ OneDev.getInstance(PullRequestReactionManager.class).toggleEmoji(
+ SecurityUtils.getUser(),
+ getPullRequest(),
+ emoji);
+ }
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
index 70ef61180b..233b3953ac 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/operationdlg/OperationCommentPanel.java
@@ -15,7 +15,6 @@ import org.apache.wicket.model.PropertyModel;
import javax.annotation.Nullable;
import java.util.List;
-@SuppressWarnings("serial")
public abstract class OperationCommentPanel extends ObsoleteUpdateAwarePanel {
private String comment;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java
index fcf8730ec7..d68b6e124e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/GroupAuthorizationsPage.java
@@ -22,7 +22,6 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-@SuppressWarnings("serial")
public class GroupAuthorizationsPage extends ProjectSettingPage {
public GroupAuthorizationsPage(PageParameters params) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java
index 3f20f47885..7ec7f60ca5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/authorization/UserAuthorizationsPage.java
@@ -25,7 +25,6 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
-@SuppressWarnings("serial")
public class UserAuthorizationsPage extends ProjectSettingPage {
public UserAuthorizationsPage(PageParameters params) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
index 476e88bddb..fc31e3ed02 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/avatar/AvatarEditPage.java
@@ -17,7 +17,6 @@ import io.onedev.server.web.component.avatarupload.AvatarUploadField;
import io.onedev.server.web.component.project.ProjectAvatar;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
-@SuppressWarnings("serial")
public class AvatarEditPage extends ProjectSettingPage {
private String uploadedAvatarData;