The Unified and Autonomous Development Platform
Draft version of job scheduler. Manager package refactoring
Robin Shenc6c70b099229
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 857846866a..fc0530f523 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -70,6 +70,20 @@ import io.onedev.commons.launcher.loader.AbstractPluginModule;import io.onedev.commons.utils.ClassUtils;import io.onedev.commons.utils.schedule.DefaultTaskScheduler;import io.onedev.commons.utils.schedule.TaskScheduler;+import io.onedev.server.cache.BuildInfoManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.cache.CodeCommentRelationInfoManager;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.cache.DefaultBuildInfoManager;+import io.onedev.server.cache.DefaultCacheManager;+import io.onedev.server.cache.DefaultCodeCommentRelationInfoManager;+import io.onedev.server.cache.DefaultCommitInfoManager;+import io.onedev.server.cache.DefaultUserInfoManager;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.ci.DefaultJobScheduler;+import io.onedev.server.ci.JobScheduler;+import io.onedev.server.ci.detect.CISpecDetector;+import io.onedev.server.ci.jobexecutor.JobExecutorProvider;import io.onedev.server.command.ApplyDBConstraintsCommand;import io.onedev.server.command.BackupDBCommand;import io.onedev.server.command.CheckDataVersionCommand;@@ -79,110 +93,96 @@ import io.onedev.server.command.DBDialectCommand;import io.onedev.server.command.ResetAdminPasswordCommand;import io.onedev.server.command.RestoreDBCommand;import io.onedev.server.command.UpgradeCommand;+import io.onedev.server.data.DataManager;+import io.onedev.server.data.DefaultDataManager;+import io.onedev.server.entitymanager.Build2Manager;+import io.onedev.server.entitymanager.BuildDependenceManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.entitymanager.BuildQuerySettingManager;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;+import io.onedev.server.entitymanager.CodeCommentRelationManager;+import io.onedev.server.entitymanager.CodeCommentReplyManager;+import io.onedev.server.entitymanager.CommitQuerySettingManager;+import io.onedev.server.entitymanager.ConfigurationManager;+import io.onedev.server.entitymanager.GroupAuthorizationManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueCommentManager;+import io.onedev.server.entitymanager.IssueFieldEntityManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IssueQuerySettingManager;+import io.onedev.server.entitymanager.IssueVoteManager;+import io.onedev.server.entitymanager.IssueWatchManager;+import io.onedev.server.entitymanager.MembershipManager;+import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestBuildManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestCommentManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestQuerySettingManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;+import io.onedev.server.entitymanager.PullRequestUpdateManager;+import io.onedev.server.entitymanager.PullRequestWatchManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UrlManager;+import io.onedev.server.entitymanager.UserAuthorizationManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.entitymanager.impl.DefaultBuild2Manager;+import io.onedev.server.entitymanager.impl.DefaultBuildDependenceManager;+import io.onedev.server.entitymanager.impl.DefaultBuildManager;+import io.onedev.server.entitymanager.impl.DefaultBuildParamManager;+import io.onedev.server.entitymanager.impl.DefaultBuildQuerySettingManager;+import io.onedev.server.entitymanager.impl.DefaultCodeCommentManager;+import io.onedev.server.entitymanager.impl.DefaultCodeCommentQuerySettingManager;+import io.onedev.server.entitymanager.impl.DefaultCodeCommentRelationManager;+import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;+import io.onedev.server.entitymanager.impl.DefaultCommitQuerySettingManager;+import io.onedev.server.entitymanager.impl.DefaultConfigurationManager;+import io.onedev.server.entitymanager.impl.DefaultGroupAuthorizationManager;+import io.onedev.server.entitymanager.impl.DefaultGroupManager;+import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;+import io.onedev.server.entitymanager.impl.DefaultIssueCommentManager;+import io.onedev.server.entitymanager.impl.DefaultIssueFieldEntityManager;+import io.onedev.server.entitymanager.impl.DefaultIssueManager;+import io.onedev.server.entitymanager.impl.DefaultIssueQuerySettingManager;+import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;+import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;+import io.onedev.server.entitymanager.impl.DefaultMembershipManager;+import io.onedev.server.entitymanager.impl.DefaultMilestoneManager;+import io.onedev.server.entitymanager.impl.DefaultProjectManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestBuildManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestChangeManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestQuerySettingManager;+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.DefaultSettingManager;+import io.onedev.server.entitymanager.impl.DefaultUserAuthorizationManager;+import io.onedev.server.entitymanager.impl.DefaultUserManager;import io.onedev.server.exception.OneException;import io.onedev.server.git.GitFilter;import io.onedev.server.git.GitPostReceiveCallback;import io.onedev.server.git.GitPreReceiveCallback;import io.onedev.server.git.config.GitConfig;-import io.onedev.server.manager.AttachmentManager;-import io.onedev.server.manager.BatchWorkManager;-import io.onedev.server.manager.BuildInfoManager;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.BuildQuerySettingManager;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.CodeCommentQuerySettingManager;-import io.onedev.server.manager.CodeCommentRelationInfoManager;-import io.onedev.server.manager.CodeCommentRelationManager;-import io.onedev.server.manager.CodeCommentReplyManager;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.CommitQuerySettingManager;-import io.onedev.server.manager.ConfigurationManager;-import io.onedev.server.manager.DataManager;-import io.onedev.server.manager.GroupAuthorizationManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueCommentManager;-import io.onedev.server.manager.IssueFieldUnaryManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.IssueQuerySettingManager;-import io.onedev.server.manager.IssueVoteManager;-import io.onedev.server.manager.IssueWatchManager;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.MembershipManager;-import io.onedev.server.manager.MilestoneManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.PullRequestBuildManager;-import io.onedev.server.manager.PullRequestChangeManager;-import io.onedev.server.manager.PullRequestCommentManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestQuerySettingManager;-import io.onedev.server.manager.PullRequestReviewManager;-import io.onedev.server.manager.PullRequestUpdateManager;-import io.onedev.server.manager.PullRequestWatchManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.StorageManager;-import io.onedev.server.manager.UrlManager;-import io.onedev.server.manager.UserAuthorizationManager;-import io.onedev.server.manager.UserInfoManager;-import io.onedev.server.manager.UserManager;-import io.onedev.server.manager.WorkExecutor;-import io.onedev.server.manager.impl.DefaultAttachmentManager;-import io.onedev.server.manager.impl.DefaultBatchWorkManager;-import io.onedev.server.manager.impl.DefaultBuildInfoManager;-import io.onedev.server.manager.impl.DefaultBuildManager;-import io.onedev.server.manager.impl.DefaultBuildQuerySettingManager;-import io.onedev.server.manager.impl.DefaultCacheManager;-import io.onedev.server.manager.impl.DefaultCodeCommentManager;-import io.onedev.server.manager.impl.DefaultCodeCommentNotificationManager;-import io.onedev.server.manager.impl.DefaultCodeCommentQuerySettingManager;-import io.onedev.server.manager.impl.DefaultCodeCommentRelationInfoManager;-import io.onedev.server.manager.impl.DefaultCodeCommentRelationManager;-import io.onedev.server.manager.impl.DefaultCodeCommentReplyManager;-import io.onedev.server.manager.impl.DefaultCommitInfoManager;-import io.onedev.server.manager.impl.DefaultCommitNotificationManager;-import io.onedev.server.manager.impl.DefaultCommitQuerySettingManager;-import io.onedev.server.manager.impl.DefaultConfigurationManager;-import io.onedev.server.manager.impl.DefaultDataManager;-import io.onedev.server.manager.impl.DefaultEntityReferenceManager;-import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager;-import io.onedev.server.manager.impl.DefaultGroupManager;-import io.onedev.server.manager.impl.DefaultIssueChangeManager;-import io.onedev.server.manager.impl.DefaultIssueCommentManager;-import io.onedev.server.manager.impl.DefaultIssueFieldUnaryManager;-import io.onedev.server.manager.impl.DefaultIssueManager;-import io.onedev.server.manager.impl.DefaultIssueNotificationManager;-import io.onedev.server.manager.impl.DefaultIssueQuerySettingManager;-import io.onedev.server.manager.impl.DefaultIssueVoteManager;-import io.onedev.server.manager.impl.DefaultIssueWatchManager;-import io.onedev.server.manager.impl.DefaultMailManager;-import io.onedev.server.manager.impl.DefaultMarkdownManager;-import io.onedev.server.manager.impl.DefaultMembershipManager;-import io.onedev.server.manager.impl.DefaultMilestoneManager;-import io.onedev.server.manager.impl.DefaultProjectManager;-import io.onedev.server.manager.impl.DefaultPullRequestBuildManager;-import io.onedev.server.manager.impl.DefaultPullRequestChangeManager;-import io.onedev.server.manager.impl.DefaultPullRequestCommentManager;-import io.onedev.server.manager.impl.DefaultPullRequestManager;-import io.onedev.server.manager.impl.DefaultPullRequestNotificationManager;-import io.onedev.server.manager.impl.DefaultPullRequestQuerySettingManager;-import io.onedev.server.manager.impl.DefaultPullRequestReviewManager;-import io.onedev.server.manager.impl.DefaultPullRequestUpdateManager;-import io.onedev.server.manager.impl.DefaultPullRequestWatchManager;-import io.onedev.server.manager.impl.DefaultSettingManager;-import io.onedev.server.manager.impl.DefaultStorageManager;-import io.onedev.server.manager.impl.DefaultUserAuthorizationManager;-import io.onedev.server.manager.impl.DefaultUserInfoManager;-import io.onedev.server.manager.impl.DefaultUserManager;-import io.onedev.server.manager.impl.DefaultWebHookManager;-import io.onedev.server.manager.impl.DefaultWorkExecutor;import io.onedev.server.migration.JpaConverter;import io.onedev.server.migration.PersistentBagConverter;import io.onedev.server.model.support.authenticator.Authenticator;+import io.onedev.server.notification.CommitNotificationManager;+import io.onedev.server.notification.CodeCommentNotificationManager;+import io.onedev.server.notification.DefaultMailManager;+import io.onedev.server.notification.WebHookManager;+import io.onedev.server.notification.IssueNotificationManager;+import io.onedev.server.notification.MailManager;+import io.onedev.server.notification.PullRequestNotificationManager;import io.onedev.server.persistence.DefaultIdManager;import io.onedev.server.persistence.DefaultPersistManager;-import io.onedev.server.persistence.DefaultUnitOfWork;+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;@@ -192,7 +192,8 @@ import io.onedev.server.persistence.SessionFactoryProvider;import io.onedev.server.persistence.SessionInterceptor;import io.onedev.server.persistence.SessionProvider;import io.onedev.server.persistence.TransactionInterceptor;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.Dao;@@ -212,16 +213,27 @@ import io.onedev.server.security.OneFilterChainResolver;import io.onedev.server.security.OnePasswordService;import io.onedev.server.security.OneRememberMeManager;import io.onedev.server.security.OneWebSecurityManager;+import io.onedev.server.storage.AttachmentManager;+import io.onedev.server.storage.DefaultAttachmentManager;+import io.onedev.server.storage.DefaultStorageManager;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.jackson.ObjectMapperConfigurator;import io.onedev.server.util.jackson.ObjectMapperProvider;import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;import io.onedev.server.util.jetty.DefaultJettyRunner;import io.onedev.server.util.jetty.JettyRunner;+import io.onedev.server.util.markdown.EntityReferenceManager;+import io.onedev.server.util.markdown.DefaultMarkdownManager;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.markdown.MarkdownProcessor;import io.onedev.server.util.validation.DefaultEntityValidator;import io.onedev.server.util.validation.EntityValidator;import io.onedev.server.util.validation.ValidatorProvider;+import io.onedev.server.util.work.BatchWorkManager;+import io.onedev.server.util.work.DefaultBatchWorkManager;+import io.onedev.server.util.work.DefaultWorkExecutor;+import io.onedev.server.util.work.WorkExecutor;import io.onedev.server.web.DefaultUrlManager;import io.onedev.server.web.DefaultWicketFilter;import io.onedev.server.web.DefaultWicketServlet;@@ -306,11 +318,15 @@ public class CoreModule extends AbstractPluginModule {bind(UserManager.class).to(DefaultUserManager.class);bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);bind(BuildManager.class).to(DefaultBuildManager.class);+ bind(Build2Manager.class).to(DefaultBuild2Manager.class);+ bind(BuildDependenceManager.class).to(DefaultBuildDependenceManager.class);+ bind(JobScheduler.class).to(DefaultJobScheduler.class);bind(PullRequestBuildManager.class).to(DefaultPullRequestBuildManager.class);bind(ConfigurationManager.class).to(DefaultConfigurationManager.class);bind(MailManager.class).to(DefaultMailManager.class);bind(IssueManager.class).to(DefaultIssueManager.class);- bind(IssueFieldUnaryManager.class).to(DefaultIssueFieldUnaryManager.class);+ bind(IssueFieldEntityManager.class).to(DefaultIssueFieldEntityManager.class);+ bind(BuildParamManager.class).to(DefaultBuildParamManager.class);bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);bind(UserInfoManager.class).to(DefaultUserInfoManager.class);@@ -326,11 +342,11 @@ public class CoreModule extends AbstractPluginModule {bind(BuildInfoManager.class).to(DefaultBuildInfoManager.class);bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);bind(WorkExecutor.class).to(DefaultWorkExecutor.class);- bind(DefaultPullRequestNotificationManager.class);- bind(DefaultCommitNotificationManager.class);- bind(DefaultIssueNotificationManager.class);- bind(DefaultEntityReferenceManager.class);- bind(DefaultCodeCommentNotificationManager.class);+ bind(PullRequestNotificationManager.class);+ bind(CommitNotificationManager.class);+ bind(IssueNotificationManager.class);+ bind(EntityReferenceManager.class);+ bind(CodeCommentNotificationManager.class);bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);bind(IssueWatchManager.class).to(DefaultIssueWatchManager.class);bind(IssueChangeManager.class).to(DefaultIssueChangeManager.class);@@ -347,12 +363,12 @@ public class CoreModule extends AbstractPluginModule {bind(CodeCommentQuerySettingManager.class).to(DefaultCodeCommentQuerySettingManager.class);bind(CommitQuerySettingManager.class).to(DefaultCommitQuerySettingManager.class);bind(BuildQuerySettingManager.class).to(DefaultBuildQuerySettingManager.class);- bind(DefaultWebHookManager.class);+ bind(WebHookManager.class);contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);- contribute(PersistListener.class, DefaultPullRequestNotificationManager.class);+ contribute(PersistListener.class, PullRequestNotificationManager.class);bind(Realm.class).to(OneAuthorizingRealm.class);bind(RememberMeManager.class).to(OneRememberMeManager.class);@@ -374,6 +390,9 @@ public class CoreModule extends AbstractPluginModule {});contributeFromPackage(Authenticator.class, Authenticator.class);+ contributeFromPackage(CISpecDetector.class, CISpecDetector.class);+ contributeFromPackage(JobExecutorProvider.class, JobExecutorProvider.class);+bind(IndexManager.class).to(DefaultIndexManager.class);bind(SearchManager.class).to(DefaultSearchManager.class);@@ -499,7 +518,8 @@ public class CoreModule extends AbstractPluginModule {bind(Interceptor.class).to(HibernateInterceptor.class);bind(PhysicalNamingStrategy.class).toInstance(new PrefixedNamingStrategy("o_"));- bind(UnitOfWork.class).to(DefaultUnitOfWork.class);+ bind(SessionManager.class).to(DefaultSessionManager.class);+ bind(TransactionManager.class).to(DefaultTransactionManager.class);bind(IdManager.class).to(DefaultIdManager.class);bind(Dao.class).to(DefaultDao.class);diff --git a/core/src/main/java/io/onedev/server/GitConfigProvider.java b/core/src/main/java/io/onedev/server/GitConfigProvider.javaindex d8bbd5a9fa..afc64df0e2 100644--- a/core/src/main/java/io/onedev/server/GitConfigProvider.java+++ b/core/src/main/java/io/onedev/server/GitConfigProvider.java@@ -4,8 +4,8 @@ import javax.inject.Inject;import javax.inject.Provider;import javax.inject.Singleton;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.config.GitConfig;-import io.onedev.server.manager.SettingManager;@Singletonpublic class GitConfigProvider implements Provider<GitConfig> {diff --git a/core/src/main/java/io/onedev/server/OneDev.java b/core/src/main/java/io/onedev/server/OneDev.javaindex 141859f498..224e8ec6bb 100644--- a/core/src/main/java/io/onedev/server/OneDev.java+++ b/core/src/main/java/io/onedev/server/OneDev.java@@ -23,15 +23,15 @@ import io.onedev.commons.launcher.loader.ManagedSerializedForm;import io.onedev.commons.utils.init.InitStage;import io.onedev.commons.utils.init.ManualConfig;import io.onedev.commons.utils.schedule.TaskScheduler;+import io.onedev.server.data.DataManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStarting;import io.onedev.server.event.system.SystemStopped;import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.manager.DataManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.persistence.PersistManager;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.util.jetty.JettyRunner;import io.onedev.server.util.serverconfig.ServerConfig;@@ -47,7 +47,7 @@ public class OneDev extends AbstractPlugin implements Serializable {private final PersistManager persistManager;- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;private final SettingManager configManager;@@ -67,12 +67,12 @@ public class OneDev extends AbstractPlugin implements Serializable {@Injectpublic OneDev(JettyRunner jettyRunner, PersistManager persistManager, TaskScheduler taskScheduler,- UnitOfWork unitOfWork, ServerConfig serverConfig, DataManager dataManager, SettingManager configManager,+ SessionManager sessionManager, ServerConfig serverConfig, DataManager dataManager, SettingManager configManager,UserManager userManager, ListenerRegistry listenerRegistry, WebSocketManager webSocketManager) {this.jettyRunner = jettyRunner;this.persistManager = persistManager;this.taskScheduler = taskScheduler;- this.unitOfWork = unitOfWork;+ this.sessionManager = sessionManager;this.configManager = configManager;this.dataManager = dataManager;this.serverConfig = serverConfig;@@ -101,12 +101,12 @@ public class OneDev extends AbstractPlugin implements Serializable {initStage.waitForFinish();}- unitOfWork.begin();+ sessionManager.openSession();try {ThreadContext.bind(userManager.getRoot().asSubject());listenerRegistry.post(new SystemStarting());} finally {- unitOfWork.end();+ sessionManager.closeSession();}webSocketManager.start();@@ -176,12 +176,12 @@ public class OneDev extends AbstractPlugin implements Serializable {public void stop() {webSocketManager.stop();- unitOfWork.begin();+ sessionManager.openSession();try {listenerRegistry.post(new SystemStopped());ThreadContext.unbindSubject();} finally {- unitOfWork.end();+ sessionManager.closeSession();}persistManager.stop();diff --git a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java b/core/src/main/java/io/onedev/server/cache/AbstractEnvironmentManager.javasimilarity index 99%rename from core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.javarename to core/src/main/java/io/onedev/server/cache/AbstractEnvironmentManager.javaindex 45db8e60b8..9d87acb4ea 100644--- a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java+++ b/core/src/main/java/io/onedev/server/cache/AbstractEnvironmentManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.cache;import java.io.File;import java.io.IOException;diff --git a/core/src/main/java/io/onedev/server/manager/BuildInfoManager.java b/core/src/main/java/io/onedev/server/cache/BuildInfoManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/BuildInfoManager.javarename to core/src/main/java/io/onedev/server/cache/BuildInfoManager.javaindex 18e46e721c..663e553011 100644--- a/core/src/main/java/io/onedev/server/manager/BuildInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/BuildInfoManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.cache;import java.util.Collection;diff --git a/core/src/main/java/io/onedev/server/manager/CacheManager.java b/core/src/main/java/io/onedev/server/cache/CacheManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/CacheManager.javarename to core/src/main/java/io/onedev/server/cache/CacheManager.javaindex 0263b5b0ca..540994a2e3 100644--- a/core/src/main/java/io/onedev/server/manager/CacheManager.java+++ b/core/src/main/java/io/onedev/server/cache/CacheManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.cache;import java.util.Collection;import java.util.Map;diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/cache/CodeCommentRelationInfoManager.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.javarename to core/src/main/java/io/onedev/server/cache/CodeCommentRelationInfoManager.javaindex 0225932c40..99583721ae 100644--- a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/CodeCommentRelationInfoManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.cache;import java.util.Collection;diff --git a/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java b/core/src/main/java/io/onedev/server/cache/CommitInfoManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/CommitInfoManager.javarename to core/src/main/java/io/onedev/server/cache/CommitInfoManager.javaindex a4bf39ba6b..e6efc214a0 100644--- a/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/CommitInfoManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.cache;import java.util.Collection;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java b/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.javarename to core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.javaindex b6ac2443c7..8fcdaf5c2b 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/DefaultBuildInfoManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.cache;import java.io.File;import java.util.Collection;@@ -16,22 +16,21 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.concurrent.Prioritized;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.BatchWorkManager;-import io.onedev.server.manager.BuildInfoManager;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.StorageManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;+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;-import io.onedev.server.util.BatchWorker;+import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.work.BatchWorkManager;+import io.onedev.server.util.work.BatchWorker;import jetbrains.exodus.ByteIterable;import jetbrains.exodus.env.Environment;import jetbrains.exodus.env.Store;@@ -68,19 +67,20 @@ public class DefaultBuildInfoManager extends AbstractEnvironmentManager implemenprivate final BuildManager buildManager;- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;- private final Dao dao;+ private final TransactionManager transactionManager;@Inject- public DefaultBuildInfoManager(Dao dao, ProjectManager projectManager, StorageManager storageManager,- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, BuildManager buildManager) {+ public DefaultBuildInfoManager(ProjectManager projectManager, StorageManager storageManager,+ BatchWorkManager batchWorkManager, SessionManager sessionManager, BuildManager buildManager,+ TransactionManager transactionManager) {this.projectManager = projectManager;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;- this.unitOfWork = unitOfWork;+ this.sessionManager = sessionManager;this.buildManager = buildManager;- this.dao = dao;+ this.transactionManager = transactionManager;}private BatchWorker getBatchWorker(Long projectId) {@@ -91,7 +91,7 @@ public class DefaultBuildInfoManager extends AbstractEnvironmentManager implemenboolean hasMore;do {// do the work batch by batch to avoid consuming too much memory- hasMore = unitOfWork.call(new Callable<Boolean>() {+ hasMore = sessionManager.call(new Callable<Boolean>() {@Overridepublic Boolean call() throws Exception {@@ -193,7 +193,7 @@ public class DefaultBuildInfoManager extends AbstractEnvironmentManager implemenpublic void on(EntityPersisted event) {if (event.isNew() && event.getEntity() instanceof Build) {Long projectId = ((Build) event.getEntity()).getConfiguration().getProject().getId();- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.javarename to core/src/main/java/io/onedev/server/cache/DefaultCacheManager.javaindex 5c1bfc66fc..c329b3cca2 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java+++ b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.cache;import java.util.Collection;import java.util.HashMap;@@ -23,7 +23,6 @@ import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.manager.CacheManager;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;import io.onedev.server.model.Group;@@ -33,6 +32,7 @@ import io.onedev.server.model.Membership;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;+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;@@ -54,6 +54,8 @@ public class DefaultCacheManager implements CacheManager {private final Dao dao;+ private final TransactionManager transactionManager;+private final Map<Long, UserFacade> users = new HashMap<>();private final BiMap<String, Long> userIdsByName = HashBiMap.create();@@ -99,8 +101,9 @@ public class DefaultCacheManager implements CacheManager {private final ReadWriteLock userAuthorizationsLock = new ReentrantReadWriteLock();@Inject- public DefaultCacheManager(Dao dao) {+ public DefaultCacheManager(Dao dao, TransactionManager transactionManager) {this.dao = dao;+ this.transactionManager = transactionManager;}@SuppressWarnings("unchecked")@@ -129,13 +132,13 @@ public class DefaultCacheManager implements CacheManager {for (Configuration configuration: dao.query(Configuration.class))configurations.put(configuration.getId(), configuration.getFacade());- Query<?> query = dao.getSession().createQuery("select id, configuration.id, commitHash from Build");+ Query<?> query = dao.getSessionManager().getSession().createQuery("select id, configuration.id, commitHash from Build");for (Object[] fields: (List<Object[]>)query.list()) {Long buildId = (Long) fields[0];builds.put(buildId, new BuildFacade(buildId, (Long)fields[1], (String)fields[2]));}- query = dao.getSession().createQuery("select id, project.id, number from Issue");+ query = dao.getSessionManager().getSession().createQuery("select id, project.id, number from Issue");for (Object[] fields: (List<Object[]>)query.list()) {Long issueId = (Long) fields[0];issues.put(issueId, new IssueFacade(issueId, (Long)fields[1], (Long)fields[2]));@@ -174,7 +177,7 @@ public class DefaultCacheManager implements CacheManager {facade = null;}- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {@@ -268,7 +271,7 @@ public class DefaultCacheManager implements CacheManager {Long id = event.getEntity().getId();Class<?> clazz = event.getEntity().getClass();- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/cache/DefaultCodeCommentRelationInfoManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.javarename to core/src/main/java/io/onedev/server/cache/DefaultCodeCommentRelationInfoManager.javaindex 18a4eefd5b..d7c33d38fc 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/DefaultCodeCommentRelationInfoManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.cache;import java.io.File;import java.io.Serializable;@@ -21,28 +21,27 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.concurrent.Prioritized;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.CodeCommentRelationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestUpdateManager;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.manager.BatchWorkManager;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.CodeCommentRelationInfoManager;-import io.onedev.server.manager.CodeCommentRelationManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestUpdateManager;-import io.onedev.server.manager.StorageManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeComment.ComparingInfo;import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;+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;-import io.onedev.server.util.BatchWorker;+import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.work.BatchWorkManager;+import io.onedev.server.util.work.BatchWorker;import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;import jetbrains.exodus.env.Environment;@@ -87,26 +86,26 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMaprivate final CodeCommentRelationManager codeCommentRelationManager;- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;private final CodeCommentManager codeCommentManager;- private final Dao dao;+ private final TransactionManager transactionManager;@Inject- public DefaultCodeCommentRelationInfoManager(Dao dao, ProjectManager projectManager, StorageManager storageManager,- PullRequestUpdateManager pullRequestUpdateManager, CodeCommentManager codeCommentManager,- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, PullRequestManager pullRequestManager,- CodeCommentRelationManager codeCommentRelationManager) {+ public DefaultCodeCommentRelationInfoManager(TransactionManager transactionManager, ProjectManager projectManager,+ StorageManager storageManager, PullRequestUpdateManager pullRequestUpdateManager,+ CodeCommentManager codeCommentManager, BatchWorkManager batchWorkManager, SessionManager sessionManager,+ PullRequestManager pullRequestManager, CodeCommentRelationManager codeCommentRelationManager) {this.projectManager = projectManager;this.storageManager = storageManager;this.pullRequestUpdateManager = pullRequestUpdateManager;this.codeCommentManager = codeCommentManager;this.batchWorkManager = batchWorkManager;- this.unitOfWork = unitOfWork;+ this.sessionManager = sessionManager;this.pullRequestManager = pullRequestManager;this.codeCommentRelationManager = codeCommentRelationManager;- this.dao = dao;+ this.transactionManager = transactionManager;}private BatchWorker getBatchWorker(Long projectId) {@@ -117,7 +116,7 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMaboolean hasMore;do {// do the work batch by batch to avoid consuming too much memory- hasMore = unitOfWork.call(new Callable<Boolean>() {+ hasMore = sessionManager.call(new Callable<Boolean>() {@Overridepublic Boolean call() throws Exception {@@ -301,7 +300,7 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMaif (event.isNew()) {if (event.getEntity() instanceof PullRequestUpdate) {Long projectId = ((PullRequestUpdate) event.getEntity()).getRequest().getTargetProject().getId();- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {@@ -311,7 +310,7 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa});} else if (event.getEntity() instanceof CodeComment) {Long projectId = ((CodeComment)event.getEntity()).getProject().getId();- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.javarename to core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.javaindex 68828f5a1b..f007c96048 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.cache;import java.io.File;import java.io.IOException;@@ -46,6 +46,8 @@ import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.PathUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.concurrent.Prioritized;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.issue.IssueCommitted;@@ -59,20 +61,17 @@ import io.onedev.server.git.command.GitCommit;import io.onedev.server.git.command.LogCommand;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.git.command.RevListCommand.Order;-import io.onedev.server.manager.BatchWorkManager;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.StorageManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.util.BatchWorker;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.Day;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.work.BatchWorkManager;+import io.onedev.server.util.work.BatchWorker;import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;import jetbrains.exodus.backup.BackupStrategy;@@ -279,7 +278,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeprivate final ProjectManager projectManager;- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;private final ExecutorService executorService;@@ -295,12 +294,12 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Injectpublic DefaultCommitInfoManager(ProjectManager projectManager, StorageManager storageManager,- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, ExecutorService executorService,+ BatchWorkManager batchWorkManager, SessionManager sessionManager, ExecutorService executorService,ListenerRegistry listenerRegistry, IssueManager issueManager) {this.projectManager = projectManager;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;- this.unitOfWork = unitOfWork;+ this.sessionManager = sessionManager;this.executorService = executorService;this.listenerRegistry = listenerRegistry;this.issueManager = issueManager;@@ -982,7 +981,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Overridepublic void doWorks(Collection<Prioritized> works) {- unitOfWork.run(new Runnable() {+ sessionManager.run(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.javarename to core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.javaindex 53fc937a64..c8e1f63846 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/DefaultUserInfoManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.cache;import java.io.File;import java.util.Date;@@ -19,14 +19,13 @@ import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;import io.onedev.server.event.pullrequest.PullRequestDeleted;import io.onedev.server.event.pullrequest.PullRequestEvent;-import io.onedev.server.manager.StorageManager;-import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.CodeComment;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.persistence.annotation.Transactional;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;import jetbrains.exodus.env.Environment;diff --git a/core/src/main/java/io/onedev/server/manager/UserInfoManager.java b/core/src/main/java/io/onedev/server/cache/UserInfoManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/UserInfoManager.javarename to core/src/main/java/io/onedev/server/cache/UserInfoManager.javaindex c7bd50eeb7..d192b4d504 100644--- a/core/src/main/java/io/onedev/server/manager/UserInfoManager.java+++ b/core/src/main/java/io/onedev/server/cache/UserInfoManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.cache;import java.util.Date;diff --git a/core/src/main/java/io/onedev/server/ci/CISpec.java b/core/src/main/java/io/onedev/server/ci/CISpec.javaindex 00fda3d069..2ef8c336b9 100644--- a/core/src/main/java/io/onedev/server/ci/CISpec.java+++ b/core/src/main/java/io/onedev/server/ci/CISpec.java@@ -3,8 +3,10 @@ package io.onedev.server.ci;import java.io.Serializable;import java.util.ArrayList;import java.util.HashMap;+import java.util.HashSet;import java.util.List;import java.util.Map;+import java.util.Set;import javax.annotation.Nullable;import javax.validation.ConstraintValidatorContext;@@ -27,6 +29,8 @@ public class CISpec implements Serializable, Validatable {public static final String BLOB_PATH = "onedev-ci.xml";private List<Job> jobs = new ArrayList<>();++ private transient Map<String, Job> jobMap;@Editablepublic List<Job> getJobs() {@@ -36,28 +40,34 @@ public class CISpec implements Serializable, Validatable {public void setJobs(List<Job> jobs) {this.jobs = jobs;}++ public Map<String, Job> getJobMap() {+ if (jobMap == null) {+ jobMap = new HashMap<>();+ for (Job job: jobs)+ jobMap.put(job.getName(), job);+ }+ return jobMap;+ }@Overridepublic boolean isValid(ConstraintValidatorContext context) {- Map<String, Job> jobMap = new HashMap<>();-boolean valid = true;-++ Set<String> jobNames = new HashSet<>();for (Job job: jobs) {- if (jobMap.containsKey(job.getName())) {+ if (!jobNames.add(job.getName())) {context.buildConstraintViolationWithTemplate("Duplicate names found: " + job.getName()).addPropertyNode("jobs").addConstraintViolation();valid = false;- } else {- jobMap.put(job.getName(), job);}}for (int i=0; i<jobs.size(); i++) {Job job = jobs.get(i);for (Dependency dependency: job.getDependencies()) {- if (!jobMap.containsKey(dependency.getJob())) {- context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJob())+ if (!jobMap.containsKey(dependency.getJobName())) {+ context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJobName()).addPropertyNode("jobs").addPropertyNode("dependencies").inIterable().atIndex(i).addConstraintViolation();@@ -70,7 +80,7 @@ public class CISpec implements Serializable, Validatable {Job job = jobs.get(i);for (Dependency dependency: job.getDependencies()) {List<String> dependencyChain = Lists.newArrayList(job.getName());- if (hasCircularDependencies(jobMap, dependencyChain, dependency.getJob())) {+ if (hasCircularDependencies(jobMap, dependencyChain, dependency.getJobName())) {context.buildConstraintViolationWithTemplate("Circular dependencies found: " + dependencyChain).addPropertyNode("jobs").addPropertyNode("dependencies").inIterable().atIndex(i)@@ -97,7 +107,7 @@ public class CISpec implements Serializable, Validatable {Job job = jobMap.get(jobName);if (job != null) {for (Dependency dependency: job.getDependencies()) {- if (hasCircularDependencies(jobMap, new ArrayList<>(dependencyChain), dependency.getJob()))+ if (hasCircularDependencies(jobMap, new ArrayList<>(dependencyChain), dependency.getJobName()))return true;}}diff --git a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.javanew file mode 100644index 0000000000..b2db766148--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java@@ -0,0 +1,372 @@+package io.onedev.server.ci;++import java.util.ArrayList;+import java.util.Comparator;+import java.util.Date;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;+import java.util.concurrent.Callable;+import java.util.concurrent.ExecutorService;++import javax.annotation.Nullable;+import javax.inject.Inject;+import javax.inject.Singleton;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.utils.LockUtils;+import io.onedev.server.OneDev;+import io.onedev.server.ci.jobexecutor.JobExecutor;+import io.onedev.server.ci.jobexecutor.JobExecutorProvider;+import io.onedev.server.ci.jobparam.JobParam;+import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.entitymanager.Build2Manager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.event.CommitAware;+import io.onedev.server.event.ProjectEvent;+import io.onedev.server.event.build2.BuildFinished;+import io.onedev.server.event.build2.BuildPending;+import io.onedev.server.event.build2.BuildRunning;+import io.onedev.server.event.build2.BuildSubmitted;+import io.onedev.server.event.system.SystemStarted;+import io.onedev.server.event.system.SystemStopping;+import io.onedev.server.exception.OneException;+import io.onedev.server.model.Build2;+import io.onedev.server.model.Build2.Status;+import io.onedev.server.model.BuildDependence;+import io.onedev.server.model.BuildParam;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.util.MatrixRunner;++@Singleton+public class DefaultJobScheduler implements JobScheduler, Runnable {++ private static final int CHECK_INTERVAL = 10;++ private final Build2Manager buildManager;++ private final UserManager userManager;++ private final ListenerRegistry listenerRegistry;++ private final TransactionManager transactionManager;++ private final ExecutorService executorService;++ private volatile Thread thread;++ private volatile boolean stopping;++ @Inject+ public DefaultJobScheduler(Build2Manager buildManager, UserManager userManager,+ ListenerRegistry listenerRegistry, TransactionManager transactionManager,+ ExecutorService executorService) {+ this.buildManager = buildManager;+ this.userManager = userManager;+ this.listenerRegistry = listenerRegistry;+ this.transactionManager = transactionManager;+ this.executorService = executorService;+ }++ @Sessional+ @Override+ public void submit(Project project, String commitHash, String jobName, Map<String, String> paramMap) {+ String commitLock = "job-schedule: " + project.getId() + "-" + commitHash;+ executorService.execute(new Runnable() {++ @Override+ public void run() {+ LockUtils.call(commitLock, new Callable<Void>() {++ @Override+ public Void call() {+ transactionManager.run(new Runnable() {++ @Override+ public void run() {+ submit(project, commitHash, jobName, paramMap, new ArrayList<>());+ }++ });+ return null;+ }++ });+ }++ });+ }++ private Map<String, List<String>> getParamMatrix(List<JobParam> params) {+ Map<String, List<String>> paramMatrix = new LinkedHashMap<>();+ for (JobParam param: params)+ paramMatrix.put(param.getName(), param.getValueProvider().getValues());+ return paramMatrix;+ }++ private void submit(Project project, String commitHash, String jobName,+ Map<String, String> paramMap, List<String> dependencyChain) {+ Build2 build = buildManager.find(project, commitHash, jobName, paramMap);+ if (build == null) {+ build = new Build2();+ build.setProject(project);+ build.setCommitHash(commitHash);+ build.setJobName(jobName);+ build.setSubmitDate(new Date());+ build.setStatus(Status.WAITING);+ build.setUser(userManager.getCurrent());++ for (Map.Entry<String, String> entry: paramMap.entrySet()) {+ BuildParam param = new BuildParam();+ param.setBuild(build);+ param.setName(entry.getKey());+ param.setValue(entry.getValue());+ build.getParams().add(param);+ }++ if (dependencyChain.contains(jobName)) {+ dependencyChain.add(jobName);+ markBuildError(build, "Circular job dependencies found: " + dependencyChain);+ return;+ }++ dependencyChain.add(jobName);++ CISpec ciSpec = project.getCISpec(ObjectId.fromString(commitHash));+ if (ciSpec == null) {+ markBuildError(build, "No CI spec");+ return;+ }++ Job job = ciSpec.getJobMap().get(jobName);+ if (job == null) {+ markBuildError(build, "Job not found");+ return;+ }++ for (Dependency dependency: job.getDependencies()) {+ new MatrixRunner(getParamMatrix(dependency.getParams())).run(new MatrixRunner.Runnable() {++ @Override+ public void run(Map<String, String> params) {+ submit(project, commitHash, dependency.getJobName(), params, new ArrayList<>(dependencyChain));+ }++ });+ }++ buildManager.create(build);+ listenerRegistry.post(new BuildSubmitted(build));+ }+ }++ private void run(Build2 build) {+ JobExecutor jobExecutor = getJobExecutor(build);+ if (jobExecutor != null) {+ String runInstanceId = jobExecutor.run(build);+ if (runInstanceId != null) {+ build.setRunInstanceId(runInstanceId);+ build.setStatus(Status.RUNNING);+ build.setRunningDate(new Date());+ buildManager.save(build);+ listenerRegistry.post(new BuildRunning(build));+ }+ } else {+ markBuildError(build, "No applicable job executor");+ }+ }++ private void markBuildError(Build2 build, String errorMessage) {+ build.setErrorMessage(errorMessage);+ build.setStatus(Status.FAILED);+ if (build.getPendingDate() == null)+ build.setPendingDate(new Date());+ if (build.getRunningDate() == null)+ build.setRunningDate(new Date());+ if (build.getFinishDate() == null)+ build.setFinishDate(new Date());+ buildManager.save(build);+ listenerRegistry.post(new BuildFinished(build));+ }++ @Nullable+ private JobExecutor getJobExecutor(Build2 build) {+ List<JobExecutorProvider> providers = new ArrayList<>(OneDev.getExtensions(JobExecutorProvider.class));+ providers.sort(Comparator.comparing(JobExecutorProvider::getPriority));++ for (JobExecutorProvider provider: providers) {+ JobExecutor jobExecutor = provider.getExecutor(build);+ if (jobExecutor != null)+ return jobExecutor;+ }++ return null;+ }++ @Sessional+ @Listen+ public void on(ProjectEvent event) {+ if (event instanceof CommitAware) {+ ObjectId commitId = ((CommitAware) event).getCommitId();+ CISpec ciSpec = event.getProject().getCISpec(commitId);+ if (ciSpec != null) {+ for (Job job: ciSpec.getJobs()) {+ JobTrigger trigger = job.getMatchedTrigger(event);+ if (trigger != null) {+ new MatrixRunner(getParamMatrix(trigger.getParams())).run(new MatrixRunner.Runnable() {++ @Override+ public void run(Map<String, String> params) {+ submit(event.getProject(), commitId.name(), job.getName(), params);+ }++ });+ }+ }+ }+ }+ }++ @Transactional+ @Override+ public void resubmit(Build2 build) {+ for (BuildDependence dependence: build.getDependents())+ resubmit(dependence.getDependent());++ if (build.getStatus() == Status.FAILED || build.getStatus() == Status.SUCCESSFUL) {+ build.setStatus(Status.WAITING);+ build.setErrorMessage(null);+ build.setFinishDate(null);+ build.setPendingDate(null);+ build.setRunInstanceId(null);+ build.setRunningDate(null);+ build.setSubmitDate(new Date());+ build.setUser(userManager.getCurrent());+ buildManager.save(build);+ listenerRegistry.post(new BuildSubmitted(build));+ } else {+ throw new OneException("Build #" + build.getNumber() + " not finished yet");+ }+ }++ @Transactional+ @Override+ public void cancel(Build2 build) {+ if (build.getStatus() == Status.WAITING || build.getStatus() == Status.PENDING) {+ markBuildError(build, "Build is cancelled");+ } else if (build.getStatus() == Status.RUNNING) {+ JobExecutor jobExecutor = getJobExecutor(build);+ if (jobExecutor != null) {+ if (jobExecutor.isRunning(build))+ jobExecutor.stop(build);+ else+ markBuildError(build, "Aborted for unknown reason");+ } else {+ markBuildError(build, "No applicable job executor");+ }+ }+ }++ @Listen+ public void on(SystemStarted event) {+ thread = new Thread(this);+ thread.start();+ }++ @Listen+ public void on(SystemStopping event) {+ stopping = true;+ synchronized (this) {+ notify();+ }+ while (thread != null ) {+ try {+ Thread.sleep(100);+ } catch (InterruptedException e) {+ }+ }+ }++ @Override+ public synchronized void run() {+ while (!stopping) {+ try {+ wait(CHECK_INTERVAL * 1000L);+ } catch (InterruptedException e) {+ }+ transactionManager.run(new Runnable() {++ @Override+ public void run() {+ for (Build2 build: buildManager.queryUnfinished()) {+ if (build.getStatus() == Status.PENDING) {+ DefaultJobScheduler.this.run(build);+ } else if (build.getStatus() == Status.RUNNING) {+ CISpec ciSpec = build.getProject().getCISpec(ObjectId.fromString(build.getCommitHash()));+ if (ciSpec != null) {+ Job job = ciSpec.getJobMap().get(build.getJobName());+ if (job != null) {+ if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L) {+ JobExecutor jobExecutor = getJobExecutor(build);+ if (jobExecutor != null) {+ if (jobExecutor.isRunning(build))+ jobExecutor.stop(build);+ else+ markBuildError(build, "Aborted for unknown reason");+ } else {+ markBuildError(build, "No applicable job executor");+ }+ }+ } else {+ markBuildError(build, "Job not found");+ }+ } else {+ markBuildError(build, "No CI spec");+ }+ } else if (build.getStatus() == Status.WAITING) {+ boolean hasFailed = false;+ boolean hasUnfinished = false;++ for (BuildDependence dependence: build.getDependencies()) {+ Build2 dependency = dependence.getDependency();++ switch (dependency.getStatus()) {+ case FAILED:+ hasFailed = true;+ break;+ case RUNNING:+ case PENDING:+ case WAITING:+ hasUnfinished = true;+ break;+ default:+ }+ }++ if (hasFailed) {+ build.setStatus(Status.FAILED);+ build.setPendingDate(new Date());+ build.setRunningDate(new Date());+ build.setFinishDate(new Date());+ listenerRegistry.post(new BuildFinished(build));+ } else if (!hasUnfinished) {+ build.setStatus(Status.PENDING);+ build.setPendingDate(new Date());+ listenerRegistry.post(new BuildPending(build));+ }+ }+ }+ }++ });+ }+ thread = null;+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.javaindex a2f185fc6a..770b265523 100644--- a/core/src/main/java/io/onedev/server/ci/Dependency.java+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java@@ -18,7 +18,7 @@ public class Dependency implements Serializable {private static final long serialVersionUID = 1L;- private String job;+ private String jobName;private List<JobParam> params = new ArrayList<>();@@ -27,12 +27,12 @@ public class Dependency implements Serializable {@Editable(order=100)@ChoiceProvider("getJobChoices")@NotEmpty- public String getJob() {- return job;+ public String getJobName() {+ return jobName;}- public void setJob(String job) {- this.job = job;+ public void setJobName(String jobName) {+ this.jobName = jobName;}@Editable(order=200, description="Specify parameters of the dependency job. Dependency is satisfied only when "diff --git a/core/src/main/java/io/onedev/server/ci/Job.java b/core/src/main/java/io/onedev/server/ci/Job.javaindex fd96371e32..7fa00d65d0 100644--- a/core/src/main/java/io/onedev/server/ci/Job.java+++ b/core/src/main/java/io/onedev/server/ci/Job.java@@ -7,9 +7,11 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.ci.jobtrigger.JobTrigger;+import io.onedev.server.event.ProjectEvent;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Horizontal;+import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.PathPatterns;@Editable@@ -20,15 +22,19 @@ public class Job implements Serializable {private String name;- private List<Dependency> dependencies = new ArrayList<>();-- private List<InputSpec> params = new ArrayList<>();+ private String image;- private List<Step> steps = new ArrayList<>();+ private String command;- private List<JobTrigger> triggers = new ArrayList<>();+ private boolean cloneSource = true;private String publishArtifacts;++ private List<Dependency> dependencies = new ArrayList<>();++ private List<InputSpec> promptParams = new ArrayList<>();++ private List<JobTrigger> triggers = new ArrayList<>();private long timeout = 3600;@@ -42,25 +48,46 @@ public class Job implements Serializable {this.name = name;}- @Editable(order=200, name="Prompt Parameters", description="Specify parameters to prompt when the job "- + "is triggered manually")- public List<InputSpec> getParams() {- return params;+ @Editable(order=110, name="Docker Image", description="Specify the docker image to run the command")+ @NotEmpty+ public String getImage() {+ return image;}- public void setParams(List<InputSpec> params) {- this.params = params;+ public void setImage(String image) {+ this.image = image;}- @Editable(order=300)- public List<Step> getSteps() {- return steps;+ @Editable(order=120)+ @Multiline+ @NotEmpty+ public String getCommand() {+ return command;}- public void setSteps(List<Step> steps) {- this.steps = steps;+ public void setCommand(String command) {+ this.command = command;}++ @Editable(order=130, description="Whether or not to clone the source code")+ public boolean isCloneSource() {+ return cloneSource;+ }++ public void setCloneSource(boolean cloneSource) {+ this.cloneSource = cloneSource;+ }+ @Editable(order=300, description="Specify parameters to prompt when the job "+ + "is triggered manually")+ public List<InputSpec> getPromptParams() {+ return promptParams;+ }++ public void setPromptParams(List<InputSpec> promptParams) {+ this.promptParams = promptParams;+ }+@Editable(name="Dependency Jobs", order=400, description="Job dependencies determines the order and "+ "concurrency when run different jobs")public List<Dependency> getDependencies() {@@ -91,7 +118,7 @@ public class Job implements Serializable {this.publishArtifacts = publishArtifacts;}- @Editable(order=600, description="Specify timeout in seconds")+ @Editable(order=700, description="Specify timeout in seconds")public long getTimeout() {return timeout;}@@ -100,4 +127,12 @@ public class Job implements Serializable {this.timeout = timeout;}+ public JobTrigger getMatchedTrigger(ProjectEvent event) {+ for (JobTrigger trigger: getTriggers()) {+ if (trigger.matches(event, this))+ return trigger;+ }+ return null;+ }+}diff --git a/core/src/main/java/io/onedev/server/ci/JobScheduler.java b/core/src/main/java/io/onedev/server/ci/JobScheduler.javanew file mode 100644index 0000000000..76621a88f7--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/JobScheduler.java@@ -0,0 +1,16 @@+package io.onedev.server.ci;++import java.util.Map;++import io.onedev.server.model.Build2;+import io.onedev.server.model.Project;++public interface JobScheduler {++ void submit(Project project, String commitHash, String jobName, Map<String, String> params);++ void resubmit(Build2 build);++ void cancel(Build2 build);++}diff --git a/core/src/main/java/io/onedev/server/ci/Step.java b/core/src/main/java/io/onedev/server/ci/Step.javadeleted file mode 100644index b48e7fec85..0000000000--- a/core/src/main/java/io/onedev/server/ci/Step.java+++ /dev/null@@ -1,23 +0,0 @@-package io.onedev.server.ci;--import java.io.Serializable;--import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class Step implements Serializable {-- private static final long serialVersionUID = 1L;-- private String command;-- @Editable- public String getCommand() {- return command;- }-- public void setCommand(String command) {- this.command = command;- }--}diff --git a/core/src/main/java/io/onedev/server/ci/detect/CISpecDetector.java b/core/src/main/java/io/onedev/server/ci/detect/CISpecDetector.javanew file mode 100644index 0000000000..8374e36e81--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/detect/CISpecDetector.java@@ -0,0 +1,21 @@+package io.onedev.server.ci.detect;++import javax.annotation.Nullable;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.server.ci.CISpec;+import io.onedev.server.model.Project;++@ExtensionPoint+public interface CISpecDetector {++ int DEFAULT_PRIORITY = 100;++ @Nullable+ CISpec detect(Project project, ObjectId commitId);++ int getPriority();++}diff --git a/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutor.javanew file mode 100644index 0000000000..37482d0681--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutor.java@@ -0,0 +1,16 @@+package io.onedev.server.ci.jobexecutor;++import javax.annotation.Nullable;++import io.onedev.server.model.Build2;++public interface JobExecutor {++ @Nullable+ String run(Build2 build);++ boolean isRunning(Build2 build);++ void stop(Build2 build);++}diff --git a/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutorProvider.java b/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutorProvider.javanew file mode 100644index 0000000000..a251896151--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutorProvider.java@@ -0,0 +1,18 @@+package io.onedev.server.ci.jobexecutor;++import javax.annotation.Nullable;++import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.server.model.Build2;++@ExtensionPoint+public interface JobExecutorProvider {++ int DEFAULT_PRIORITY = 100;++ @Nullable+ JobExecutor getExecutor(Build2 build);++ int getPriority();++}diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.javaindex 2cec930469..9b96b36b65 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/BranchPushedTrigger.java@@ -7,7 +7,6 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.utils.PathUtils;-import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Job;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.RefUpdated;@@ -75,7 +74,7 @@ public class BranchPushedTrigger extends JobTrigger {}@Override- protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {+ public boolean matches(ProjectEvent event, Job job) {if (event instanceof RefUpdated) {RefUpdated refUpdated = (RefUpdated) event;String pushedBranch = GitUtils.ref2branch(refUpdated.getRefName());diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.javaindex ccaabbb054..e7ba79105b 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/DependencyBuiltTrigger.java@@ -1,32 +1,34 @@package io.onedev.server.ci.jobtrigger;-import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Dependency;import io.onedev.server.ci.Job;import io.onedev.server.ci.jobparam.JobParam;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.build2.BuildFinished;import io.onedev.server.model.Build2;+import io.onedev.server.model.Build2.Status;import io.onedev.server.web.editable.annotation.Editable;-@Editable(order=500, name="When dependency jobs finished running")+@Editable(order=500, name="When dependency jobs finished successfully")public class DependencyBuiltTrigger extends JobTrigger {private static final long serialVersionUID = 1L;@Override- protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {+ public boolean matches(ProjectEvent event, Job job) {if (event instanceof BuildFinished) {BuildFinished buildFinished = (BuildFinished) event;Build2 build = buildFinished.getBuild();- for (Dependency dependency: job.getDependencies()) {- if (dependency.getJob().equals(build.getJob())) {- for (JobParam param: dependency.getParams()) {- String paramValue = build.getParamMap().get(param.getName());- if (!param.getValueProvider().getValues().contains(paramValue))- return false;+ if (build.getStatus() == Status.SUCCESSFUL) {+ for (Dependency dependency: job.getDependencies()) {+ if (dependency.getJobName().equals(build.getJobName())) {+ for (JobParam param: dependency.getParams()) {+ String paramValue = build.getParamMap().get(param.getName());+ if (!param.getValueProvider().getValues().contains(paramValue))+ return false;+ }+ return true;}- return true;}}}diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.javaindex 7ddc3d5a35..83f139aa04 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/JobTrigger.java@@ -4,7 +4,6 @@ import java.io.Serializable;import java.util.ArrayList;import java.util.List;-import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Job;import io.onedev.server.ci.jobparam.JobParam;import io.onedev.server.event.ProjectEvent;@@ -26,7 +25,7 @@ public abstract class JobTrigger implements Serializable {this.params = params;}- protected abstract boolean matches(ProjectEvent event, CISpec ciSpec, Job job);+ public abstract boolean matches(ProjectEvent event, Job job);public abstract String getDescription();diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.javaindex 7419591b20..7fd39885cd 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/PullRequestTrigger.java@@ -1,11 +1,9 @@package io.onedev.server.ci.jobtrigger;import io.onedev.commons.utils.PathUtils;-import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Job;import io.onedev.server.event.ProjectEvent;-import io.onedev.server.event.pullrequest.PullRequestOpened;-import io.onedev.server.event.pullrequest.PullRequestUpdated;+import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.web.editable.annotation.BranchPatterns;import io.onedev.server.web.editable.annotation.Editable;@@ -28,21 +26,14 @@ public class PullRequestTrigger extends JobTrigger {}@Override- protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {- if (event instanceof PullRequestOpened) {- PullRequestOpened pullRequestOpened = (PullRequestOpened) event;+ public boolean matches(ProjectEvent event, Job job) {+ if (event instanceof PullRequestMergePreviewCalculated) {+ PullRequestMergePreviewCalculated pullRequestMergePreviewCalculated = (PullRequestMergePreviewCalculated) event;if (getTargetBranches() == null- || PathUtils.matchChildAware(getTargetBranches(), pullRequestOpened.getRequest().getTargetBranch())) {+ || PathUtils.matchChildAware(getTargetBranches(), pullRequestMergePreviewCalculated.getRequest().getTargetBranch())) {return true;}}- if (event instanceof PullRequestUpdated) {- PullRequestUpdated pullRequestUpdated = (PullRequestUpdated) event;- if (getTargetBranches() == null- || PathUtils.matchChildAware(getTargetBranches(), pullRequestUpdated.getRequest().getTargetBranch())) {- return true;- }- }return false;}diff --git a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.javaindex 6c7c1d5c69..cb144533aa 100644--- a/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java+++ b/core/src/main/java/io/onedev/server/ci/jobtrigger/TagCreatedTrigger.java@@ -3,7 +3,6 @@ package io.onedev.server.ci.jobtrigger;import org.eclipse.jgit.lib.ObjectId;import io.onedev.commons.utils.PathUtils;-import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Job;import io.onedev.server.event.ProjectEvent;import io.onedev.server.event.RefUpdated;@@ -30,7 +29,7 @@ public class TagCreatedTrigger extends JobTrigger {}@Override- protected boolean matches(ProjectEvent event, CISpec ciSpec, Job job) {+ public boolean matches(ProjectEvent event, Job job) {if (event instanceof RefUpdated) {RefUpdated refUpdated = (RefUpdated) event;String pushedTag = GitUtils.ref2tag(refUpdated.getRefName());diff --git a/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java b/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.javaindex 76cc48ba4c..ab31e366f8 100644--- a/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java+++ b/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java@@ -11,7 +11,7 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.DefaultPersistManager;import io.onedev.server.persistence.HibernateProperties;diff --git a/core/src/main/java/io/onedev/server/manager/DataManager.java b/core/src/main/java/io/onedev/server/data/DataManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/DataManager.javarename to core/src/main/java/io/onedev/server/data/DataManager.javaindex 5e21a26c79..260768d4d8 100644--- a/core/src/main/java/io/onedev/server/manager/DataManager.java+++ b/core/src/main/java/io/onedev/server/data/DataManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.data;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java b/core/src/main/java/io/onedev/server/data/DefaultDataManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.javarename to core/src/main/java/io/onedev/server/data/DefaultDataManager.javaindex 1e8da861e8..14e7f350ef 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java+++ b/core/src/main/java/io/onedev/server/data/DefaultDataManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.data;import java.io.File;import java.io.ObjectStreamException;@@ -32,11 +32,9 @@ import io.onedev.commons.utils.init.Skippable;import io.onedev.commons.utils.schedule.SchedulableTask;import io.onedev.commons.utils.schedule.TaskScheduler;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.system.SystemStarting;-import io.onedev.server.manager.DataManager;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;@@ -45,6 +43,7 @@ import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.model.support.setting.MailSetting;import io.onedev.server.model.support.setting.SecuritySetting;import io.onedev.server.model.support.setting.SystemSetting;+import io.onedev.server.notification.MailManager;import io.onedev.server.persistence.IdManager;import io.onedev.server.persistence.PersistManager;import io.onedev.server.persistence.annotation.Sessional;diff --git a/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.java b/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.javanew file mode 100644index 0000000000..b200ade780--- /dev/null+++ b/core/src/main/java/io/onedev/server/entitymanager/Build2Manager.java@@ -0,0 +1,27 @@+package io.onedev.server.entitymanager;++import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import io.onedev.server.model.Build2;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.dao.EntityManager;++public interface Build2Manager extends EntityManager<Build2> {++ @Nullable+ Build2 find(Project project, long number);++ @Nullable+ Build2 find(Project project, String commitHash, String jobName, Map<String, String> params);++ void create(Build2 build);++ @Nullable+ Build2 find(String runInstanceId);++ List<Build2> queryUnfinished();++}diff --git a/core/src/main/java/io/onedev/server/entitymanager/BuildDependenceManager.java b/core/src/main/java/io/onedev/server/entitymanager/BuildDependenceManager.javanew file mode 100644index 0000000000..ac48c138df--- /dev/null+++ b/core/src/main/java/io/onedev/server/entitymanager/BuildDependenceManager.java@@ -0,0 +1,8 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.BuildDependence;+import io.onedev.server.persistence.dao.EntityManager;++public interface BuildDependenceManager extends EntityManager<BuildDependence> {++}diff --git a/core/src/main/java/io/onedev/server/manager/BuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/BuildManager.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/manager/BuildManager.javarename to core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex b374df758c..2b9dada348 100644--- a/core/src/main/java/io/onedev/server/manager/BuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java b/core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.javanew file mode 100644index 0000000000..c195566e72--- /dev/null+++ b/core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java@@ -0,0 +1,7 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.BuildParam;+import io.onedev.server.persistence.dao.EntityManager;++public interface BuildParamManager extends EntityManager<BuildParam> {+}diff --git a/core/src/main/java/io/onedev/server/manager/BuildQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/BuildQuerySettingManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/BuildQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/BuildQuerySettingManager.javaindex a7e5067a27..936accca47 100644--- a/core/src/main/java/io/onedev/server/manager/BuildQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/BuildQuerySettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.BuildQuerySetting;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java b/core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/CodeCommentManager.javarename to core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.javaindex 0d3bc18e5b..0852b6c852 100644--- a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.Collection;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/CodeCommentQuerySettingManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/CodeCommentQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/CodeCommentQuerySettingManager.javaindex d558b74c17..8eca109303 100644--- a/core/src/main/java/io/onedev/server/manager/CodeCommentQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/CodeCommentQuerySettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.CodeCommentQuerySetting;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationManager.java b/core/src/main/java/io/onedev/server/entitymanager/CodeCommentRelationManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/CodeCommentRelationManager.javarename to core/src/main/java/io/onedev/server/entitymanager/CodeCommentRelationManager.javaindex cca741a972..20dc58f4f8 100644--- a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/CodeCommentRelationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentRelation;diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentReplyManager.java b/core/src/main/java/io/onedev/server/entitymanager/CodeCommentReplyManager.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/manager/CodeCommentReplyManager.javarename to core/src/main/java/io/onedev/server/entitymanager/CodeCommentReplyManager.javaindex 5aef8f4ff2..d94817ebb1 100644--- a/core/src/main/java/io/onedev/server/manager/CodeCommentReplyManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/CodeCommentReplyManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/manager/CommitQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/CommitQuerySettingManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/CommitQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/CommitQuerySettingManager.javaindex 93ea56b0a7..f112f9a71a 100644--- a/core/src/main/java/io/onedev/server/manager/CommitQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/CommitQuerySettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.CommitQuerySetting;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/manager/ConfigurationManager.java b/core/src/main/java/io/onedev/server/entitymanager/ConfigurationManager.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/manager/ConfigurationManager.javarename to core/src/main/java/io/onedev/server/entitymanager/ConfigurationManager.javaindex ffa6d55974..00fc813cdf 100644--- a/core/src/main/java/io/onedev/server/manager/ConfigurationManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/ConfigurationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java b/core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.javarename to core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.javaindex b31b0de6dd..15de904440 100644--- a/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/GroupAuthorizationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.Collection;diff --git a/core/src/main/java/io/onedev/server/manager/GroupManager.java b/core/src/main/java/io/onedev/server/entitymanager/GroupManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/GroupManager.javarename to core/src/main/java/io/onedev/server/entitymanager/GroupManager.javaindex 71c8169aee..b2d7975482 100644--- a/core/src/main/java/io/onedev/server/manager/GroupManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/GroupManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java b/core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/manager/IssueChangeManager.javarename to core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.javaindex cce69779b0..5a19b25c09 100644--- a/core/src/main/java/io/onedev/server/manager/IssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.Iterator;import java.util.Map;diff --git a/core/src/main/java/io/onedev/server/manager/IssueCommentManager.java b/core/src/main/java/io/onedev/server/entitymanager/IssueCommentManager.javasimilarity index 81%rename from core/src/main/java/io/onedev/server/manager/IssueCommentManager.javarename to core/src/main/java/io/onedev/server/entitymanager/IssueCommentManager.javaindex 3deddda3fc..8017a3af94 100644--- a/core/src/main/java/io/onedev/server/manager/IssueCommentManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/IssueCommentManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.IssueComment;import io.onedev.server.persistence.dao.EntityManager;diff --git a/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/entitymanager/IssueFieldEntityManager.javasimilarity index 64%rename from core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.javarename to core/src/main/java/io/onedev/server/entitymanager/IssueFieldEntityManager.javaindex 9bb68d4e9d..88f3f5db46 100644--- a/core/src/main/java/io/onedev/server/manager/IssueFieldUnaryManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/IssueFieldEntityManager.java@@ -1,12 +1,12 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.List;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.persistence.dao.EntityManager;-public interface IssueFieldUnaryManager extends EntityManager<IssueFieldUnary> {+public interface IssueFieldEntityManager extends EntityManager<IssueFieldEntity> {void saveFields(Issue issue);diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/entitymanager/IssueManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/IssueManager.javarename to core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex ce31b5a1a2..cdebb8a849 100644--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.Collection;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/manager/IssueQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/IssueQuerySettingManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/IssueQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/IssueQuerySettingManager.javaindex 21498dacb4..9f9f87835e 100644--- a/core/src/main/java/io/onedev/server/manager/IssueQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/IssueQuerySettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/IssueVoteManager.java b/core/src/main/java/io/onedev/server/entitymanager/IssueVoteManager.javasimilarity index 80%rename from core/src/main/java/io/onedev/server/manager/IssueVoteManager.javarename to core/src/main/java/io/onedev/server/entitymanager/IssueVoteManager.javaindex f3197150ab..c2a0f76b4f 100644--- a/core/src/main/java/io/onedev/server/manager/IssueVoteManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/IssueVoteManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.IssueVote;import io.onedev.server.persistence.dao.EntityManager;diff --git a/core/src/main/java/io/onedev/server/manager/IssueWatchManager.java b/core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/IssueWatchManager.javarename to core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.javaindex 185957a54d..7d1304fb3a 100644--- a/core/src/main/java/io/onedev/server/manager/IssueWatchManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/MembershipManager.java b/core/src/main/java/io/onedev/server/entitymanager/MembershipManager.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/manager/MembershipManager.javarename to core/src/main/java/io/onedev/server/entitymanager/MembershipManager.javaindex 8d64143192..253995944f 100644--- a/core/src/main/java/io/onedev/server/manager/MembershipManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/MembershipManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.Collection;diff --git a/core/src/main/java/io/onedev/server/manager/MilestoneManager.java b/core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/manager/MilestoneManager.javarename to core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.javaindex 9df5f8185e..1f3aaeae7b 100644--- a/core/src/main/java/io/onedev/server/manager/MilestoneManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/MilestoneManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/ProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/ProjectManager.javarename to core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex 977130d2d5..f2bf842588 100644--- a/core/src/main/java/io/onedev/server/manager/ProjectManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.Collection;import java.util.Map;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/manager/PullRequestBuildManager.javarename to core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.javaindex 12a7c5f120..aeb6ebf374 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestBuildManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestChangeManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/manager/PullRequestChangeManager.javarename to core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.javaindex 0d9d04b7e0..5672d39eb2 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestChangeManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestCommentManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/manager/PullRequestCommentManager.javarename to core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.javaindex 8890ab736c..ef8ba89397 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestCommentManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestCommentManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.PullRequestComment;import io.onedev.server.persistence.dao.EntityManager;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/PullRequestManager.javarename to core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex 3357cfab1b..3676e98492 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.Collection;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestQuerySettingManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/PullRequestQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/PullRequestQuerySettingManager.javaindex 7dc1b4ca3e..9241b61f62 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestQuerySettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestQuerySetting;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestReviewManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/PullRequestReviewManager.javarename to core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.javaindex 90c65c32ff..6e84f9d363 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestReviewManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestReviewManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.javarename to core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.javaindex e7f62329a4..b6a77ea2b7 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestUpdateManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestWatchManager.java b/core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/manager/PullRequestWatchManager.javarename to core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.javaindex 8d2105754e..5fd7aa725e 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestWatchManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/SettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/SettingManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/SettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/SettingManager.javaindex 0da5c94006..3da5bc2fdb 100644--- a/core/src/main/java/io/onedev/server/manager/SettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/UrlManager.java b/core/src/main/java/io/onedev/server/entitymanager/UrlManager.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/manager/UrlManager.javarename to core/src/main/java/io/onedev/server/entitymanager/UrlManager.javaindex ce3ef83e71..c95d8c43d7 100644--- a/core/src/main/java/io/onedev/server/manager/UrlManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/UrlManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.java b/core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.javarename to core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.javaindex c1c4fa14a6..51aad047d2 100644--- a/core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/UserAuthorizationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import java.util.Collection;diff --git a/core/src/main/java/io/onedev/server/manager/UserManager.java b/core/src/main/java/io/onedev/server/entitymanager/UserManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/UserManager.javarename to core/src/main/java/io/onedev/server/entitymanager/UserManager.javaindex 4065b33282..fddebbb5ed 100644--- a/core/src/main/java/io/onedev/server/manager/UserManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/UserManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.entitymanager;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.javanew file mode 100644index 0000000000..dde0b86599--- /dev/null+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java@@ -0,0 +1,112 @@+package io.onedev.server.entitymanager.impl;++import java.util.ArrayList;+import java.util.List;+import java.util.Map;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;++import com.google.common.base.Preconditions;++import io.onedev.server.entitymanager.Build2Manager;+import io.onedev.server.entitymanager.BuildDependenceManager;+import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.model.Build2;+import io.onedev.server.model.Build2.Status;+import io.onedev.server.model.BuildDependence;+import io.onedev.server.model.BuildParam;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;++@Singleton+public class DefaultBuild2Manager extends AbstractEntityManager<Build2> implements Build2Manager {++ private final BuildParamManager buildParamManager;++ private final BuildDependenceManager buildDependenceManager;++ @Inject+ public DefaultBuild2Manager(Dao dao, BuildParamManager buildParamManager, BuildDependenceManager buildDependenceManager) {+ super(dao);+ this.buildParamManager = buildParamManager;+ this.buildDependenceManager = buildDependenceManager;+ }++ @Sessional+ @Override+ public Build2 find(Project project, long number) {+ EntityCriteria<Build2> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ criteria.add(Restrictions.eq("number", number));+ return find(criteria);+ }++ @Sessional+ @Override+ public Build2 find(Project project, String commitHash, String jobName, Map<String, String> params) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Build2> query = builder.createQuery(Build2.class);+ Root<Build2> root = query.from(Build2.class);++ List<Predicate> restrictions = new ArrayList<>();+ restrictions.add(builder.equal(root.get("project"), project));+ restrictions.add(builder.equal(root.get("commitHash"), commitHash));+ restrictions.add(builder.equal(root.get("jobName"), jobName));++ for (Map.Entry<String, String> entry: params.entrySet()) {+ Join<?, ?> join = root.join("params", JoinType.INNER);+ restrictions.add(builder.equal(join.get("name"), entry.getKey()));+ restrictions.add(builder.equal(join.get("value"), entry.getValue()));+ }+ return getSession().createQuery(query.distinct(true).where(restrictions.toArray(new Predicate[0]))).uniqueResult();+ }++ @Sessional+ @Override+ public Build2 find(String runInstanceId) {+ EntityCriteria<Build2> criteria = newCriteria();+ criteria.add(Restrictions.eq("runInstanceId", runInstanceId));+ return find(criteria);+ }++ @Sessional+ @Override+ public List<Build2> queryUnfinished() {+ EntityCriteria<Build2> criteria = newCriteria();+ criteria.add(Restrictions.or(+ Restrictions.eq("status", Status.PENDING),+ Restrictions.eq("status", Status.RUNNING),+ Restrictions.eq("status", Status.WAITING)));+ return query(criteria);+ }++ @Transactional+ @Override+ public void create(Build2 build) {+ Preconditions.checkArgument(build.isNew());+ Query<?> query = getSession().createQuery("select max(number) from Build2 where project=:project");+ query.setParameter("project", build.getProject());+ build.setNumber(getNextNumber(build.getProject(), query));+ save(build);++ for (BuildParam param: build.getParams())+ buildParamManager.save(param);+ for (BuildDependence dependence: build.getDependencies())+ buildDependenceManager.save(dependence);+ }++}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.javanew file mode 100644index 0000000000..b1f33fd3c1--- /dev/null+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildDependenceManager.java@@ -0,0 +1,19 @@+package io.onedev.server.entitymanager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.BuildDependenceManager;+import io.onedev.server.model.BuildDependence;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultBuildDependenceManager extends AbstractEntityManager<BuildDependence> implements BuildDependenceManager {++ @Inject+ public DefaultBuildDependenceManager(Dao dao) {+ super(dao);+ }++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 7fee958743..f9f87facf8 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.ArrayList;import java.util.List;@@ -26,13 +26,13 @@ import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.schedule.SchedulableTask;import io.onedev.commons.utils.schedule.TaskScheduler;import io.onedev.server.OneDev;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ConfigurationManager;import io.onedev.server.event.build.BuildFinished;import io.onedev.server.event.build.BuildStarted;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.ConfigurationManager;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.javanew file mode 100644index 0000000000..66f434e62c--- /dev/null+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java@@ -0,0 +1,19 @@+package io.onedev.server.entitymanager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.BuildParamManager;+import io.onedev.server.model.BuildParam;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultBuildParamManager extends AbstractEntityManager<BuildParam> implements BuildParamManager {++ @Inject+ public DefaultBuildParamManager(Dao dao) {+ super(dao);+ }++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultBuildQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.javaindex cc734a2b81..d502bfefc0 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.BuildQuerySettingManager;+import io.onedev.server.entitymanager.BuildQuerySettingManager;import io.onedev.server.model.BuildQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex db2f8a5f9d..6a5f2ff2fc 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.io.IOException;import java.util.ArrayList;@@ -38,14 +38,14 @@ import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.event.codecomment.CodeCommentCreated;import io.onedev.server.event.codecomment.CodeCommentDeleted;import io.onedev.server.event.codecomment.CodeCommentEvent;import io.onedev.server.event.codecomment.CodeCommentUpdated;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.RevListCommand;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.javaindex b8049b73c7..445df47823 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.CodeCommentQuerySettingManager;+import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;import io.onedev.server.model.CodeCommentQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentRelationManager.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentRelationManager.javaindex 0b6672043a..a222a5157e 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentRelationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;@@ -7,11 +7,11 @@ import org.hibernate.criterion.Restrictions;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.CodeCommentRelationManager;import io.onedev.server.event.codecomment.CodeCommentCreated;import io.onedev.server.event.codecomment.CodeCommentReplied;import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;-import io.onedev.server.manager.CodeCommentRelationManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.javaindex 0ea82282d0..5a1ec88cc2 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentReplyManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.event.codecomment.CodeCommentReplied;-import io.onedev.server.manager.CodeCommentReplyManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentRelation;import io.onedev.server.model.CodeCommentReply;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCommitQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.javaindex 6e968c0019..acebf637ec 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.stream.Collectors;@@ -7,7 +7,7 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.CommitQuerySettingManager;+import io.onedev.server.entitymanager.CommitQuerySettingManager;import io.onedev.server.model.CommitQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultConfigurationManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultConfigurationManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultConfigurationManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultConfigurationManager.javaindex e2a8b06edc..0f981f73c9 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultConfigurationManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultConfigurationManager.java@@ -1,12 +1,12 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.ConfigurationManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ConfigurationManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Configuration;import io.onedev.server.model.Project;import io.onedev.server.model.support.BranchProtection;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.javaindex f87c093254..19860874a4 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Collection;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.server.manager.GroupAuthorizationManager;+import io.onedev.server.entitymanager.GroupAuthorizationManager;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javasimilarity index 83%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex a840b28600..79088584a7 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -1,15 +1,15 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Iterator;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.IssueFieldUnaryManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.IssueFieldEntityManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.support.BranchProtection;@@ -27,17 +27,17 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementsprivate final SettingManager settingManager;- private final IssueFieldUnaryManager issueFieldUnaryManager;+ private final IssueFieldEntityManager issueFieldEntityManager;private final CacheManager cacheManager;@Injectpublic DefaultGroupManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,- IssueFieldUnaryManager issueFieldUnaryManager, CacheManager cacheManager) {+ IssueFieldEntityManager issueFieldEntityManager, CacheManager cacheManager) {super(dao);this.projectManager = projectManager;this.settingManager = settingManager;- this.issueFieldUnaryManager = issueFieldUnaryManager;+ this.issueFieldEntityManager = issueFieldEntityManager;this.cacheManager = cacheManager;}@@ -59,7 +59,7 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implementssettingManager.saveAuthenticator(authenticator);}- issueFieldUnaryManager.onRenameGroup(oldName, group.getName());+ issueFieldEntityManager.onRenameGroup(oldName, group.getName());settingManager.getIssueSetting().onRenameGroup(oldName, group.getName());}dao.persist(group);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.javaindex f980e0793f..d82d3b023d 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Collection;import java.util.Date;@@ -18,15 +18,15 @@ import com.google.common.base.Optional;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueFieldEntityManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.event.build.BuildEvent;import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.event.pullrequest.PullRequestOpened;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueFieldUnaryManager;-import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;@@ -48,7 +48,7 @@ import io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequest;import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -60,25 +60,25 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeprivate final IssueManager issueManager;- private final IssueFieldUnaryManager issueFieldUnaryManager;+ private final IssueFieldEntityManager issueFieldEntityManager;private final ListenerRegistry listenerRegistry;- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;private final ExecutorService executorService;private final BuildManager buildManager;@Inject- public DefaultIssueChangeManager(Dao dao, IssueManager issueManager, UnitOfWork unitOfWork,- IssueFieldUnaryManager issueFieldUnaryManager, ListenerRegistry listenerRegistry,+ public DefaultIssueChangeManager(Dao dao, IssueManager issueManager, SessionManager sessionManager,+ IssueFieldEntityManager issueFieldEntityManager, ListenerRegistry listenerRegistry,ExecutorService executorService, BuildManager buildManager) {super(dao);this.issueManager = issueManager;- this.issueFieldUnaryManager = issueFieldUnaryManager;+ this.issueFieldEntityManager = issueFieldEntityManager;this.listenerRegistry = listenerRegistry;- this.unitOfWork = unitOfWork;+ this.sessionManager = sessionManager;this.executorService = executorService;this.buildManager = buildManager;}@@ -144,7 +144,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeMap<String, IssueField> prevFields = issue.getFields();issue.setFieldValues(fieldValues);if (!prevFields.equals(issue.getFields())) {- issueFieldUnaryManager.saveFields(issue);+ issueFieldEntityManager.saveFields(issue);IssueChange change = new IssueChange();change.setIssue(issue);@@ -164,7 +164,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeissue.setFieldValues(fieldValues);- issueFieldUnaryManager.saveFields(issue);+ issueFieldEntityManager.saveFields(issue);IssueChange change = new IssueChange();change.setIssue(issue);@@ -190,7 +190,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChangeissue.setMilestone(milestone.orNull());issue.setFieldValues(fieldValues);- issueFieldUnaryManager.saveFields(issue);+ issueFieldEntityManager.saveFields(issue);IssueChange change = new IssueChange();change.setIssue(issue);@@ -221,7 +221,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Overridepublic void run() {while (true) {- if (unitOfWork.call(new Callable<Boolean>() {+ if (sessionManager.call(new Callable<Boolean>() {@Overridepublic Boolean call() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.javaindex 465fe8b4b9..6f20948cfe 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueCommentManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.IssueCommentManager;import io.onedev.server.event.issue.IssueCommented;-import io.onedev.server.manager.IssueCommentManager;import io.onedev.server.model.IssueComment;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldEntityManager.javasimilarity index 62%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldEntityManager.javaindex 3e143c6c64..23e01d41e0 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueFieldEntityManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.ArrayList;import java.util.Collection;@@ -13,9 +13,9 @@ import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Expression;import javax.persistence.criteria.Root;-import io.onedev.server.manager.IssueFieldUnaryManager;+import io.onedev.server.entitymanager.IssueFieldEntityManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;@@ -23,10 +23,10 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.util.inputspec.InputSpec;@Singleton-public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFieldUnary> implements IssueFieldUnaryManager {+public class DefaultIssueFieldEntityManager extends AbstractEntityManager<IssueFieldEntity> implements IssueFieldEntityManager {@Inject- public DefaultIssueFieldUnaryManager(Dao dao) {+ public DefaultIssueFieldEntityManager(Dao dao) {super(dao);}@@ -34,31 +34,31 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFi@Overridepublic void saveFields(Issue issue) {Collection<Long> ids = new HashSet<>();- for (IssueFieldUnary unary: issue.getFieldUnaries()) {- if (unary.getId() != null)- ids.add(unary.getId());+ for (IssueFieldEntity entity: issue.getFieldEntities()) {+ if (entity.getId() != null)+ ids.add(entity.getId());}if (!ids.isEmpty()) {- Query query = getSession().createQuery("delete from IssueFieldUnary where issue = :issue and id not in (:ids)");+ Query query = getSession().createQuery("delete from IssueFieldEntity where issue = :issue and id not in (:ids)");query.setParameter("issue", issue);query.setParameter("ids", ids);query.executeUpdate();} else {- Query query = getSession().createQuery("delete from IssueFieldUnary where issue = :issue");+ Query query = getSession().createQuery("delete from IssueFieldEntity where issue = :issue");query.setParameter("issue", issue);query.executeUpdate();}- for (IssueFieldUnary unary: issue.getFieldUnaries()) {- if (unary.isNew())- save(unary);+ for (IssueFieldEntity entity: issue.getFieldEntities()) {+ if (entity.isNew())+ save(entity);}}@Transactional@Overridepublic void onRenameGroup(String oldName, String newName) {- Query query = getSession().createQuery("update IssueFieldUnary set value=:newName where type=:groupChoice and value=:oldName");+ Query query = getSession().createQuery("update IssueFieldEntity set value=:newName where type=:groupChoice and value=:oldName");query.setParameter("groupChoice", InputSpec.GROUP);query.setParameter("oldName", oldName);query.setParameter("newName", newName);@@ -68,7 +68,7 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFi@Transactional@Overridepublic void onRenameUser(String oldName, String newName) {- Query query = getSession().createQuery("update IssueFieldUnary set value=:newName where type=:userChoice and value=:oldName");+ Query query = getSession().createQuery("update IssueFieldEntity set value=:newName where type=:userChoice and value=:oldName");query.setParameter("userChoice", InputSpec.USER);query.setParameter("oldName", oldName);query.setParameter("newName", newName);@@ -79,9 +79,9 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFi@Overridepublic void populateFields(List<Issue> issues) {CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<IssueFieldUnary> query = builder.createQuery(IssueFieldUnary.class);+ CriteriaQuery<IssueFieldEntity> query = builder.createQuery(IssueFieldEntity.class);- Root<IssueFieldUnary> root = query.from(IssueFieldUnary.class);+ Root<IssueFieldEntity> root = query.from(IssueFieldEntity.class);query.select(root);root.join("issue");@@ -89,10 +89,10 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFiquery.where(issueExpr.in(issues));for (Issue issue: issues)- issue.setFieldUnaries(new ArrayList<>());+ issue.setFieldEntities(new ArrayList<>());- for (IssueFieldUnary field: getSession().createQuery(query).getResultList())- field.getIssue().getFieldUnaries().add(field);+ for (IssueFieldEntity field: getSession().createQuery(query).getResultList())+ field.getIssue().getFieldEntities().add(field);}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex 01373ec134..b1f47ed2bf 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.ArrayList;import java.util.Collection;@@ -28,17 +28,17 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.IssueFieldEntityManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IssueQuerySettingManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.issue.IssueDeleted;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.event.issue.IssueOpened;-import io.onedev.server.manager.IssueFieldUnaryManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.IssueQuerySettingManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.SettingManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;@@ -71,7 +71,7 @@ import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateRe@Singletonpublic class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {- private final IssueFieldUnaryManager issueFieldUnaryManager;+ private final IssueFieldEntityManager issueFieldEntityManager;private final ListenerRegistry listenerRegistry;@@ -82,11 +82,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsprivate final ProjectManager projectManager;@Inject- public DefaultIssueManager(Dao dao, IssueFieldUnaryManager issueFieldUnaryManager,+ public DefaultIssueManager(Dao dao, IssueFieldEntityManager issueFieldEntityManager,IssueQuerySettingManager issueQuerySettingManager, SettingManager settingManager,ListenerRegistry listenerRegistry, ProjectManager projectManager) {super(dao);- this.issueFieldUnaryManager = issueFieldUnaryManager;+ this.issueFieldEntityManager = issueFieldEntityManager;this.issueQuerySettingManager = issueQuerySettingManager;this.listenerRegistry = listenerRegistry;this.settingManager = settingManager;@@ -111,7 +111,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsissue.setNumber(getNextNumber(issue.getProject(), query));save(issue);- issueFieldUnaryManager.saveFields(issue);+ issueFieldEntityManager.saveFields(issue);listenerRegistry.post(new IssueOpened(issue));}@@ -140,12 +140,12 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementselseorders.add(builder.desc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));} else {- Join<Issue, IssueFieldUnary> join = root.join(IssueConstants.ATTR_FIELD_UNARIES, JoinType.LEFT);- join.on(builder.equal(join.get(IssueFieldUnary.FIELD_ATTR_NAME), sort.getField()));+ Join<Issue, IssueFieldEntity> join = root.join(IssueConstants.ATTR_FIELD_UNARIES, JoinType.LEFT);+ join.on(builder.equal(join.get(IssueFieldEntity.FIELD_ATTR_NAME), sort.getField()));if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL)));+ orders.add(builder.asc(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL)));else- orders.add(builder.desc(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL)));+ orders.add(builder.desc(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL)));}}@@ -169,7 +169,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsquery.setMaxResults(maxResults);List<Issue> issues = query.getResultList();if (!issues.isEmpty())- issueFieldUnaryManager.populateFields(issues);+ issueFieldEntityManager.populateFields(issues);return issues;}@@ -319,7 +319,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Overridepublic Collection<String> getUndefinedFields() {- Query<?> query = getSession().createQuery("select distinct name from IssueFieldUnary");+ Query<?> query = getSession().createQuery("select distinct name from IssueFieldEntity");Set<String> undefinedFields = new HashSet<>();for (String fieldName: (List<String>)query.getResultList()) {InputSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);@@ -346,11 +346,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsfor (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {Query<?> query;if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- query = getSession().createQuery("update IssueFieldUnary set name=:newName where name=:oldName");+ query = getSession().createQuery("update IssueFieldEntity set name=:newName where name=:oldName");query.setParameter("oldName", entry.getKey());query.setParameter("newName", entry.getValue().getNewField());} else {- query = getSession().createQuery("delete from IssueFieldUnary where name=:fieldName");+ query = getSession().createQuery("delete from IssueFieldEntity where name=:fieldName");query.setParameter("fieldName", entry.getKey());}query.executeUpdate();@@ -390,7 +390,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Overridepublic Collection<UndefinedFieldValue> getUndefinedFieldValues() {- Query query = getSession().createQuery("select distinct name, value from IssueFieldUnary where type=:choice");+ Query query = getSession().createQuery("select distinct name, value from IssueFieldEntity where type=:choice");query.setParameter("choice", InputSpec.ENUMERATION);Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();for (Object[] row: (List<Object[]>)query.getResultList()) {@@ -423,13 +423,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementspublic void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {for (String deletion: entry.getValue().getDeletions()) {- Query query = getSession().createQuery("delete from IssueFieldUnary where name=:fieldName and value=:fieldValue");+ Query query = getSession().createQuery("delete from IssueFieldEntity where name=:fieldName and value=:fieldValue");query.setParameter("fieldName", entry.getKey());query.setParameter("fieldValue", deletion);query.executeUpdate();}for (Map.Entry<String, String> renameEntry: entry.getValue().getRenames().entrySet()) {- Query query = getSession().createQuery("update IssueFieldUnary set value=:newValue where name=:fieldName and value=:oldValue");+ Query query = getSession().createQuery("update IssueFieldEntity set value=:newValue where name=:fieldName and value=:oldValue");query.setParameter("fieldName", entry.getKey());query.setParameter("oldValue", renameEntry.getKey());query.setParameter("newValue", renameEntry.getValue());@@ -461,7 +461,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Transactional@Overridepublic void fixFieldValueOrders() {- Query query = getSession().createQuery("select distinct name, value, ordinal from IssueFieldUnary where type=:choice");+ Query query = getSession().createQuery("select distinct name, value, ordinal from IssueFieldEntity where type=:choice");query.setParameter("choice", InputSpec.ENUMERATION);for (Object[] row: (List<Object[]>)query.getResultList()) {@@ -472,7 +472,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsif (specifiedChoices != null) {long newOrdinal = specifiedChoices.getChoiceValues().indexOf(value);if (ordinal != newOrdinal) {- query = getSession().createQuery("update IssueFieldUnary set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue");+ query = getSession().createQuery("update IssueFieldEntity set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue");query.setParameter("fieldName", name);query.setParameter("fieldValue", value);query.setParameter("newOrdinal", newOrdinal);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.javaindex 55e313ebb4..bb14d550fd 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.stream.Collectors;@@ -7,7 +7,7 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.IssueQuerySettingManager;+import io.onedev.server.entitymanager.IssueQuerySettingManager;import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.javaindex 810ab87e8f..e725b019ae 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueVoteManager.java@@ -1,9 +1,9 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.server.manager.IssueVoteManager;+import io.onedev.server.entitymanager.IssueVoteManager;import io.onedev.server.model.IssueVote;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueWatchManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueWatchManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.javaindex 6971c5958f..1cd284b667 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueWatchManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.IssueWatchManager;+import io.onedev.server.entitymanager.IssueWatchManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueWatch;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.javaindex d11cf1a979..39a990e869 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMembershipManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Collection;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.server.manager.MembershipManager;+import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.model.Membership;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javasimilarity index 98%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex 67ee3a38d5..fe7d0c7205 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.ArrayList;import java.util.List;@@ -14,11 +14,11 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueOpened;-import io.onedev.server.manager.MilestoneManager;-import io.onedev.server.manager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 56c50f9220..1fc4832494 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.io.File;import java.io.IOException;@@ -33,17 +33,17 @@ import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.CloneCommand;import io.onedev.server.git.command.ListChangedFilesCommand;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserAuthorizationManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -51,6 +51,7 @@ import io.onedev.server.model.UserAuthorization;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.FileProtection;import io.onedev.server.model.support.TagProtection;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;@@ -78,6 +79,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemprivate final AvatarManager avatarManager;+ private final TransactionManager transactionManager;+private final String gitReceiveHook;private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();@@ -85,7 +88,8 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem@Injectpublic DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,UserAuthorizationManager userAuthorizationManager, BuildManager buildManager,- CacheManager cacheManager, AvatarManager avatarManager) {+ CacheManager cacheManager, AvatarManager avatarManager,+ TransactionManager transactionManager) {super(dao);this.commitInfoManager = commitInfoManager;@@ -93,6 +97,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemthis.buildManager = buildManager;this.cacheManager = cacheManager;this.avatarManager = avatarManager;+ this.transactionManager = transactionManager;try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {Preconditions.checkNotNull(is);@@ -146,7 +151,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemFile gitDir = project.getGitDir();- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestBuildManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestBuildManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.javaindex 93a4f1abbd..bb3fa4aa1f 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestBuildManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestBuildManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Collection;import java.util.HashSet;@@ -7,7 +7,7 @@ import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.Query;-import io.onedev.server.manager.PullRequestBuildManager;+import io.onedev.server.entitymanager.PullRequestBuildManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestBuild;import io.onedev.server.persistence.annotation.Transactional;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.javaindex 5231189a7b..6d9379e0b6 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestChangeManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Date;@@ -9,8 +9,8 @@ import javax.inject.Singleton;import com.google.common.base.Objects;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;-import io.onedev.server.manager.PullRequestChangeManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.javaindex 244cafdb9e..05c1cbddf9 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCommentManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.event.pullrequest.PullRequestCommentCreated;-import io.onedev.server.manager.PullRequestCommentManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;import io.onedev.server.persistence.annotation.Transactional;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 58f7b7df64..1adbb22720 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import static io.onedev.server.model.PullRequest.CriterionHelper.ofOpen;import static io.onedev.server.model.PullRequest.CriterionHelper.ofSource;@@ -57,6 +57,15 @@ import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.concurrent.Prioritized;import io.onedev.server.OneDev;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ConfigurationManager;+import io.onedev.server.entitymanager.PullRequestBuildManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;+import io.onedev.server.entitymanager.PullRequestUpdateManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.build.BuildEvent;import io.onedev.server.event.entity.EntityRemoved;@@ -70,17 +79,6 @@ import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.exception.OneException;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.FileChange;-import io.onedev.server.manager.BatchWorkManager;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.ConfigurationManager;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.PullRequestBuildManager;-import io.onedev.server.manager.PullRequestChangeManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestReviewManager;-import io.onedev.server.manager.PullRequestUpdateManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;import io.onedev.server.model.Group;@@ -107,7 +105,8 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerimport io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchDeleteData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchRestoreData;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;+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.AbstractEntityManager;@@ -122,11 +121,13 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQueryBuildContext;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.BatchWorker;import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.reviewrequirement.ReviewRequirement;+import io.onedev.server.util.work.BatchWorkManager;+import io.onedev.server.util.work.BatchWorker;@Singletonpublic class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {@@ -143,7 +144,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final UserManager userManager;- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;private final ListenerRegistry listenerRegistry;@@ -159,21 +160,25 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate final BuildManager buildManager;+ private final TransactionManager transactionManager;+@Injectpublic DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,PullRequestReviewManager pullRequestReviewManager, UserManager userManager,MarkdownManager markdownManager, BatchWorkManager batchWorkManager,- ListenerRegistry listenerRegistry, UnitOfWork unitOfWork,+ ListenerRegistry listenerRegistry, SessionManager sessionManager,PullRequestChangeManager pullRequestChangeManager, BuildManager buildManager,- ConfigurationManager configurationManager, PullRequestBuildManager pullRequestBuildManager) {+ ConfigurationManager configurationManager, PullRequestBuildManager pullRequestBuildManager,+ TransactionManager transactionManager) {super(dao);this.pullRequestUpdateManager = pullRequestUpdateManager;this.pullRequestReviewManager = pullRequestReviewManager;+ this.transactionManager = transactionManager;this.buildManager = buildManager;this.userManager = userManager;this.batchWorkManager = batchWorkManager;- this.unitOfWork = unitOfWork;+ this.sessionManager = sessionManager;this.listenerRegistry = listenerRegistry;this.pullRequestChangeManager = pullRequestChangeManager;this.configurationManager = configurationManager;@@ -322,21 +327,27 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestLong requestId = request.getId();Subject subject = SecurityUtils.getSubject();ObjectId newTargetHeadId = mergedId;- dao.doUnitOfWorkAsyncAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {- ThreadContext.bind(subject);- try {- PullRequest request = load(requestId);- request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);- listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,- targetHeadId, newTargetHeadId));- } finally {- ThreadContext.unbindSubject();- }+ dao.getSessionManager().runAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ PullRequest request = load(requestId);+ request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);+ listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,+ targetHeadId, newTargetHeadId));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });}-});}@@ -453,7 +464,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (lastPreview == null || !lastPreview.isUpToDate(request)) {int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;Long requestId = request.getId();- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {@@ -479,7 +490,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Overridepublic void doWorks(Collection<Prioritized> works) {- unitOfWork.run(new Runnable() {+ sessionManager.run(new Runnable() {@Overridepublic void run() {@@ -658,7 +669,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprotected void checkAsync(PullRequest request) {Long requestId = request.getId();Subject subject = SecurityUtils.getSubject();- dao.doUnitOfWorkAsyncAfterCommit(newCheckStatusRunnable(requestId, subject));+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ dao.getSessionManager().runAsync(newCheckStatusRunnable(requestId, subject));+ }++ });}@Transactionaldiff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.javaindex fb695d725c..b633334391 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.stream.Collectors;@@ -7,7 +7,7 @@ import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.PullRequestQuerySettingManager;+import io.onedev.server.entitymanager.PullRequestQuerySettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestQuerySetting;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReviewManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReviewManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.javaindex 56c7a787c4..bfd97dd2ed 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReviewManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Collection;import java.util.Date;@@ -10,9 +10,9 @@ import javax.persistence.Query;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.PullRequestChangeManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestReviewManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;import io.onedev.server.model.PullRequestReview;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.javaindex 8f7ca0fa1f..17ecfb1449 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.List;@@ -13,11 +13,11 @@ import org.hibernate.criterion.Restrictions;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.server.entitymanager.PullRequestCommentManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestUpdateManager;import io.onedev.server.event.pullrequest.PullRequestUpdated;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.PullRequestCommentManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestUpdateManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestWatchManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestWatchManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.javaindex aadb17bb12..aec80a50f3 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestWatchManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.PullRequestWatchManager;+import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultSettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultSettingManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.javaindex 82851fce54..03ac280e2a 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultSettingManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import javax.inject.Inject;import javax.inject.Singleton;@@ -7,8 +7,8 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;-import io.onedev.server.manager.DataManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.data.DataManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.support.authenticator.Authenticator;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.javasimilarity index 86%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.javaindex f3d229f8f3..53724d99ad 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java@@ -1,11 +1,11 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Collection;import javax.inject.Inject;import javax.inject.Singleton;-import io.onedev.server.manager.UserAuthorizationManager;+import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.model.UserAuthorization;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.javarename to core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex 722c9322e1..0d89fce977 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.entitymanager.impl;import java.util.Iterator;@@ -13,13 +13,13 @@ import org.hibernate.query.Query;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.IssueFieldEntityManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.IssueFieldUnaryManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;@@ -38,7 +38,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uprivate final SettingManager settingManager;- private final IssueFieldUnaryManager issueFieldUnaryManager;+ private final IssueFieldEntityManager issueFieldEntityManager;private final CacheManager cacheManager;@@ -46,14 +46,14 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U@Injectpublic DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,- IssueFieldUnaryManager issueFieldUnaryManager, CacheManager cacheManager,+ IssueFieldEntityManager issueFieldEntityManager, CacheManager cacheManager,PasswordService passwordService, ListenerRegistry listenerRegistry) {super(dao);this.passwordService = passwordService;this.projectManager = projectManager;this.settingManager = settingManager;- this.issueFieldUnaryManager = issueFieldUnaryManager;+ this.issueFieldEntityManager = issueFieldEntityManager;this.cacheManager = cacheManager;this.listenerRegistry = listenerRegistry;}@@ -77,7 +77,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uproject.getIssueSetting().onRenameUser(oldName, user.getName());}- issueFieldUnaryManager.onRenameUser(oldName, user.getName());+ issueFieldEntityManager.onRenameUser(oldName, user.getName());settingManager.getIssueSetting().onRenameUser(oldName, user.getName());}}diff --git a/core/src/main/java/io/onedev/server/event/CommitAware.java b/core/src/main/java/io/onedev/server/event/CommitAware.javanew file mode 100644index 0000000000..9299e55b55--- /dev/null+++ b/core/src/main/java/io/onedev/server/event/CommitAware.java@@ -0,0 +1,9 @@+package io.onedev.server.event;++import org.eclipse.jgit.lib.ObjectId;++public interface CommitAware {++ ObjectId getCommitId();++}diff --git a/core/src/main/java/io/onedev/server/event/JobExecutorStatusChanged.java b/core/src/main/java/io/onedev/server/event/JobExecutorStatusChanged.javanew file mode 100644index 0000000000..9292b7d7be--- /dev/null+++ b/core/src/main/java/io/onedev/server/event/JobExecutorStatusChanged.java@@ -0,0 +1,11 @@+package io.onedev.server.event;++import java.util.Date;++public class JobExecutorStatusChanged extends Event {++ public JobExecutorStatusChanged() {+ super(null, new Date());+ }++}diff --git a/core/src/main/java/io/onedev/server/event/RefUpdated.java b/core/src/main/java/io/onedev/server/event/RefUpdated.javaindex a98892b241..040b774adb 100644--- a/core/src/main/java/io/onedev/server/event/RefUpdated.java+++ b/core/src/main/java/io/onedev/server/event/RefUpdated.java@@ -4,7 +4,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Project;-public class RefUpdated extends ProjectEvent {+public class RefUpdated extends ProjectEvent implements CommitAware {private final String refName;@@ -30,5 +30,10 @@ public class RefUpdated extends ProjectEvent {public ObjectId getNewCommitId() {return newCommitId;}++ @Override+ public ObjectId getCommitId() {+ return newCommitId;+ }}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java b/core/src/main/java/io/onedev/server/event/build2/BuildEvent.javaindex c264878bfd..f79d0ea2a6 100644--- a/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java+++ b/core/src/main/java/io/onedev/server/event/build2/BuildEvent.java@@ -2,11 +2,14 @@ package io.onedev.server.event.build2;import java.util.Date;+import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.event.CommitAware;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.Build2;import io.onedev.server.model.User;-public class BuildEvent extends ProjectEvent {+public class BuildEvent extends ProjectEvent implements CommitAware {private Build2 build;@@ -23,4 +26,9 @@ public class BuildEvent extends ProjectEvent {this.build = build;}+ @Override+ public ObjectId getCommitId() {+ return ObjectId.fromString(build.getCommitHash());+ }+}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java b/core/src/main/java/io/onedev/server/event/build2/BuildFinished.javaindex 7dbf6fb87d..cac2b4e440 100644--- a/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java+++ b/core/src/main/java/io/onedev/server/event/build2/BuildFinished.java@@ -1,14 +1,11 @@package io.onedev.server.event.build2;-import java.util.Date;-import io.onedev.server.model.Build2;-import io.onedev.server.model.User;public class BuildFinished extends BuildEvent {- public BuildFinished(User user, Date date, Build2 build) {- super(user, date, build);+ public BuildFinished(Build2 build) {+ super(null, build.getFinishDate(), build);}}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildPending.java b/core/src/main/java/io/onedev/server/event/build2/BuildPending.javanew file mode 100644index 0000000000..c013b0e2b7--- /dev/null+++ b/core/src/main/java/io/onedev/server/event/build2/BuildPending.java@@ -0,0 +1,11 @@+package io.onedev.server.event.build2;++import io.onedev.server.model.Build2;++public class BuildPending extends BuildEvent {++ public BuildPending(Build2 build) {+ super(null, build.getPendingDate(), build);+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/event/build2/BuildRunning.java b/core/src/main/java/io/onedev/server/event/build2/BuildRunning.javanew file mode 100644index 0000000000..16de17bcb8--- /dev/null+++ b/core/src/main/java/io/onedev/server/event/build2/BuildRunning.java@@ -0,0 +1,11 @@+package io.onedev.server.event.build2;++import io.onedev.server.model.Build2;++public class BuildRunning extends BuildEvent {++ public BuildRunning(Build2 build) {+ super(null, build.getRunningDate(), build);+ }++}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildStarted.java b/core/src/main/java/io/onedev/server/event/build2/BuildStarted.javadeleted file mode 100644index a781c36003..0000000000--- a/core/src/main/java/io/onedev/server/event/build2/BuildStarted.java+++ /dev/null@@ -1,14 +0,0 @@-package io.onedev.server.event.build2;--import java.util.Date;--import io.onedev.server.model.Build2;-import io.onedev.server.model.User;--public class BuildStarted extends BuildEvent {-- public BuildStarted(User user, Date date, Build2 build) {- super(user, date, build);- }--}diff --git a/core/src/main/java/io/onedev/server/event/build2/BuildSubmitted.java b/core/src/main/java/io/onedev/server/event/build2/BuildSubmitted.javanew file mode 100644index 0000000000..2ebe9c0813--- /dev/null+++ b/core/src/main/java/io/onedev/server/event/build2/BuildSubmitted.java@@ -0,0 +1,11 @@+package io.onedev.server.event.build2;++import io.onedev.server.model.Build2;++public class BuildSubmitted extends BuildEvent {++ public BuildSubmitted(Build2 build) {+ super(build.getUser(), build.getSubmitDate(), build);+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/core/src/main/java/io/onedev/server/event/issue/IssueOpened.javaindex 9ce5910869..3585781cad 100644--- a/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java+++ b/core/src/main/java/io/onedev/server/event/issue/IssueOpened.java@@ -4,9 +4,9 @@ import java.util.HashMap;import java.util.Map;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.MarkdownAware;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.javaindex 588c941c2f..71c5987a42 100644--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java@@ -2,11 +2,14 @@ package io.onedev.server.event.pullrequest;import java.util.Date;+import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.event.CommitAware;import io.onedev.server.event.ProjectEvent;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;-public abstract class PullRequestEvent extends ProjectEvent {+public abstract class PullRequestEvent extends ProjectEvent implements CommitAware {private final PullRequest request;@@ -18,5 +21,10 @@ public abstract class PullRequestEvent extends ProjectEvent {public PullRequest getRequest() {return request;}++ @Override+ public ObjectId getCommitId() {+ return request.getHeadCommit();+ }}diff --git a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.javaindex ddb5ae2cb3..990818f252 100644--- a/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java+++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java@@ -2,12 +2,20 @@ package io.onedev.server.event.pullrequest;import java.util.Date;+import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.event.CommitAware;import io.onedev.server.model.PullRequest;-public class PullRequestMergePreviewCalculated extends PullRequestEvent {+public class PullRequestMergePreviewCalculated extends PullRequestEvent implements CommitAware {public PullRequestMergePreviewCalculated(PullRequest request) {super(null, new Date(), request);}+ @Override+ public ObjectId getCommitId() {+ return ObjectId.fromString(getRequest().getMergePreview().getMerged());+ }+}diff --git a/core/src/main/java/io/onedev/server/git/GitFilter.java b/core/src/main/java/io/onedev/server/git/GitFilter.javaindex 0df8122216..dc62499035 100644--- a/core/src/main/java/io/onedev/server/git/GitFilter.java+++ b/core/src/main/java/io/onedev/server/git/GitFilter.java@@ -27,20 +27,20 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.utils.concurrent.PrioritizedRunnable;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.command.AdvertiseReceiveRefsCommand;import io.onedev.server.git.command.AdvertiseUploadRefsCommand;import io.onedev.server.git.command.ReceiveCommand;import io.onedev.server.git.command.UploadCommand;import io.onedev.server.git.exception.GitException;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.StorageManager;-import io.onedev.server.manager.WorkExecutor;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.serverconfig.ServerConfig;+import io.onedev.server.util.work.WorkExecutor;@Singletonpublic class GitFilter implements Filter {diff --git a/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.javaindex a061686967..89f92b355f 100644--- a/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java+++ b/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java@@ -20,11 +20,11 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.StringUtils;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.RefUpdated;-import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import com.google.common.base.Preconditions;@@ -40,12 +40,12 @@ public class GitPostReceiveCallback extends HttpServlet {private final ListenerRegistry listenerRegistry;- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;@Inject- public GitPostReceiveCallback(ProjectManager projectManager, UnitOfWork unitOfWork, ListenerRegistry listenerRegistry) {+ public GitPostReceiveCallback(ProjectManager projectManager, SessionManager sessionManager, ListenerRegistry listenerRegistry) {this.projectManager = projectManager;- this.unitOfWork = unitOfWork;+ this.sessionManager = sessionManager;this.listenerRegistry = listenerRegistry;}@@ -87,7 +87,7 @@ public class GitPostReceiveCallback extends HttpServlet {fields.clear();fields.addAll(StringUtils.splitAndTrim(refUpdateInfo, " "));- unitOfWork.doAsync(new Runnable() {+ sessionManager.runAsync(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.javaindex 9368970ff3..86222dda1e 100644--- a/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java+++ b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java@@ -22,8 +22,8 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Preconditions;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.javaindex 64d1301b02..a02850eee3 100644--- a/core/src/main/java/io/onedev/server/model/Build.java+++ b/core/src/main/java/io/onedev/server/model/Build.java@@ -23,7 +23,7 @@ import org.eclipse.jgit.revwalk.RevWalk;import com.google.common.base.Optional;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildInfoManager;+import io.onedev.server.cache.BuildInfoManager;import io.onedev.server.util.IssueUtils;import io.onedev.server.util.facade.BuildFacade;diff --git a/core/src/main/java/io/onedev/server/model/Build2.java b/core/src/main/java/io/onedev/server/model/Build2.javaindex a2ff2d224a..b0a870d2e1 100644--- a/core/src/main/java/io/onedev/server/model/Build2.java+++ b/core/src/main/java/io/onedev/server/model/Build2.java@@ -18,15 +18,22 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import org.eclipse.jgit.lib.ObjectId;+import com.fasterxml.jackson.annotation.JsonView;+import com.google.common.base.Preconditions;+import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.Job;import io.onedev.server.util.jackson.DefaultView;@Entity@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id"), @Index(columnList="commitHash"),- @Index(columnList="number"), @Index(columnList="job"), @Index(columnList="numberStr"),- @Index(columnList="status"), @Index(columnList="beginDate"), @Index(columnList="duration")},+ @Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="numberStr"),+ @Index(columnList="status"), @Index(columnList="submitDate"), @Index(columnList="pendingDate"),+ @Index(columnList="runningDate"), @Index(columnList="finishDate"),+ @Index(columnList="runInstanceId")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})public class Build2 extends AbstractEntity {@@ -36,7 +43,7 @@ public class Build2 extends AbstractEntity {public static final String STATUS = "status";public enum Status {- RUNNING, SUCCESSFUL, FAILED, CANCELLED, TIMEDOUT;+ WAITING, PENDING, RUNNING, SUCCESSFUL, FAILED};@ManyToOne(fetch=FetchType.LAZY)@@ -44,10 +51,10 @@ public class Build2 extends AbstractEntity {private Project project;@ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)private User user;- private String job;+ @Column(nullable=false)+ private String jobName;private long number;@@ -63,13 +70,29 @@ public class Build2 extends AbstractEntity {private Status status;@Column(nullable=false)- private Date beginDate;+ private Date submitDate;++ private Date pendingDate;++ private Date runningDate;++ private Date finishDate;++ private String runInstanceId;++ private String errorMessage;- private long duration;+ private transient Job job;@OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)private Collection<BuildParam> params = new ArrayList<>();+ @OneToMany(mappedBy="dependent", cascade=CascadeType.REMOVE)+ private Collection<BuildDependence> dependencies = new ArrayList<>();++ @OneToMany(mappedBy="dependency", cascade=CascadeType.REMOVE)+ private Collection<BuildDependence> dependents= new ArrayList<>();+private transient Map<String, String> paramMap;public Project getProject() {@@ -89,12 +112,12 @@ public class Build2 extends AbstractEntity {this.user = user;}- public String getJob() {- return job;+ public String getJobName() {+ return jobName;}- public void setJob(String job) {- this.job = job;+ public void setJobName(String jobName) {+ this.jobName = jobName;}public long getNumber() {@@ -103,6 +126,7 @@ public class Build2 extends AbstractEntity {public void setNumber(long number) {this.number = number;+ numberStr = String.valueOf(number);}public String getNumberStr() {@@ -128,21 +152,37 @@ public class Build2 extends AbstractEntity {public void setStatus(Status status) {this.status = status;}++ public Date getSubmitDate() {+ return submitDate;+ }++ public void setSubmitDate(Date submitDate) {+ this.submitDate = submitDate;+ }- public Date getBeginDate() {- return beginDate;+ public Date getPendingDate() {+ return pendingDate;}- public void setBeginDate(Date beginDate) {- this.beginDate = beginDate;+ public void setPendingDate(Date pendingDate) {+ this.pendingDate = pendingDate;}- public long getDuration() {- return duration;+ public Date getRunningDate() {+ return runningDate;}- public void setDuration(long duration) {- this.duration = duration;+ public void setRunningDate(Date runningDate) {+ this.runningDate = runningDate;+ }++ public Date getFinishDate() {+ return finishDate;+ }++ public void setFinishDate(Date finishDate) {+ this.finishDate = finishDate;}public Collection<BuildParam> getParams() {@@ -153,6 +193,38 @@ public class Build2 extends AbstractEntity {this.params = params;}+ public Collection<BuildDependence> getDependencies() {+ return dependencies;+ }++ public void setDependencies(Collection<BuildDependence> dependencies) {+ this.dependencies = dependencies;+ }++ public Collection<BuildDependence> getDependents() {+ return dependents;+ }++ public void setDependents(Collection<BuildDependence> dependents) {+ this.dependents = dependents;+ }++ public String getRunInstanceId() {+ return runInstanceId;+ }++ public void setRunInstanceId(String runInstanceId) {+ this.runInstanceId = runInstanceId;+ }++ public String getErrorMessage() {+ return errorMessage;+ }++ public void setErrorMessage(String errorMessage) {+ this.errorMessage = errorMessage;+ }+public Map<String, String> getParamMap() {if (paramMap == null) {paramMap = new HashMap<>();@@ -161,4 +233,13 @@ public class Build2 extends AbstractEntity {}return paramMap;}++ public Job getJob() {+ if (job == null) {+ CISpec ciSpec = Preconditions.checkNotNull(getProject().getCISpec(ObjectId.fromString(getCommitHash())));+ job = Preconditions.checkNotNull(ciSpec.getJobMap().get(jobName));+ }+ return job;+ }+}diff --git a/core/src/main/java/io/onedev/server/model/BuildDependence.java b/core/src/main/java/io/onedev/server/model/BuildDependence.javanew file mode 100644index 0000000000..3367e44ef7--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/BuildDependence.java@@ -0,0 +1,44 @@+package io.onedev.server.model;++import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++@Entity+@Table(+ indexes={@Index(columnList="o_dependent_id"), @Index(columnList="o_dependency_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_dependent_id", "o_dependency_id"})+})+public class BuildDependence extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Build2 dependent;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Build2 dependency;++ public Build2 getDependent() {+ return dependent;+ }++ public void setDependent(Build2 dependent) {+ this.dependent = dependent;+ }++ public Build2 getDependency() {+ return dependency;+ }++ public void setDependency(Build2 dependency) {+ this.dependency = dependency;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.javaindex 1272bc6317..d12f4ef14f 100644--- a/core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java@@ -32,10 +32,10 @@ import org.hibernate.annotations.DynamicUpdate;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;+import io.onedev.server.cache.UserInfoManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.MarkPos;import io.onedev.server.model.support.TextRange;diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 93066bedde..c82d86bd3a 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -37,9 +37,9 @@ import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.security.SecurityUtils;@@ -122,7 +122,7 @@ public class Issue extends AbstractEntity implements Referenceable {private Date updateDate = new Date();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)- private Collection<IssueFieldUnary> fieldUnaries = new ArrayList<>();+ private Collection<IssueFieldEntity> fieldEntities = new ArrayList<>();@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueComment> comments = new ArrayList<>();@@ -287,12 +287,12 @@ public class Issue extends AbstractEntity implements Referenceable {this.commentCount = commentCount;}- public Collection<IssueFieldUnary> getFieldUnaries() {- return fieldUnaries;+ public Collection<IssueFieldEntity> getFieldEntities() {+ return fieldEntities;}- public void setFieldUnaries(Collection<IssueFieldUnary> fieldUnaries) {- this.fieldUnaries = fieldUnaries;+ public void setFieldEntities(Collection<IssueFieldEntity> fieldEntities) {+ this.fieldEntities = fieldEntities;}public Date getUpdateDate() {@@ -314,30 +314,30 @@ public class Issue extends AbstractEntity implements Referenceable {}public Collection<String> getFieldNames() {- return getFieldUnaries().stream().map(it->it.getName()).collect(Collectors.toSet());+ return getFieldEntities().stream().map(it->it.getName()).collect(Collectors.toSet());}public Map<String, IssueField> getFields() {Map<String, IssueField> fields = new LinkedHashMap<>();- Map<String, List<IssueFieldUnary>> unaryMap = new HashMap<>();- for (IssueFieldUnary unary: getFieldUnaries()) {- List<IssueFieldUnary> fieldsOfName = unaryMap.get(unary.getName());+ Map<String, List<IssueFieldEntity>> entityMap = new HashMap<>();+ for (IssueFieldEntity entity: getFieldEntities()) {+ List<IssueFieldEntity> fieldsOfName = entityMap.get(entity.getName());if (fieldsOfName == null) {fieldsOfName = new ArrayList<>();- unaryMap.put(unary.getName(), fieldsOfName);+ entityMap.put(entity.getName(), fieldsOfName);}- fieldsOfName.add(unary);+ fieldsOfName.add(entity);}for (InputSpec fieldSpec: getIssueSetting().getFieldSpecs()) {String fieldName = fieldSpec.getName();- List<IssueFieldUnary> unaries = unaryMap.get(fieldName);+ List<IssueFieldEntity> unaries = entityMap.get(fieldName);if (unaries != null) {String type = unaries.iterator().next().getType();List<String> values = new ArrayList<>();- for (IssueFieldUnary unary: unaries) {- if (unary.getValue() != null)- values.add(unary.getValue());+ for (IssueFieldEntity entity: unaries) {+ if (entity.getValue() != null)+ values.add(entity.getValue());}Collections.sort(values);if (!fieldSpec.isAllowMultiple() && values.size() > 1)@@ -395,7 +395,7 @@ public class Issue extends AbstractEntity implements Referenceable {}public void removeFields(Collection<String> fieldNames) {- for (Iterator<IssueFieldUnary> it = getFieldUnaries().iterator(); it.hasNext();) {+ for (Iterator<IssueFieldEntity> it = getFieldEntities().iterator(); it.hasNext();) {if (fieldNames.contains(it.next().getName()))it.remove();}@@ -407,7 +407,7 @@ public class Issue extends AbstractEntity implements Referenceable {}public void setFieldValue(String fieldName, @Nullable Object fieldValue) {- for (Iterator<IssueFieldUnary> it = getFieldUnaries().iterator(); it.hasNext();) {+ for (Iterator<IssueFieldEntity> it = getFieldEntities().iterator(); it.hasNext();) {if (fieldName.equals(it.next().getName()))it.remove();}@@ -416,7 +416,7 @@ public class Issue extends AbstractEntity implements Referenceable {if (fieldSpec != null) {long ordinal = getFieldOrdinal(fieldName, fieldValue);- IssueFieldUnary field = new IssueFieldUnary();+ IssueFieldEntity field = new IssueFieldEntity();field.setIssue(this);field.setName(fieldName);field.setOrdinal(ordinal);@@ -426,16 +426,16 @@ public class Issue extends AbstractEntity implements Referenceable {List<String> strings = fieldSpec.convertToStrings(fieldValue);if (!strings.isEmpty()) {for (String string: strings) {- IssueFieldUnary cloned = (IssueFieldUnary) SerializationUtils.clone(field);+ IssueFieldEntity cloned = (IssueFieldEntity) SerializationUtils.clone(field);cloned.setIssue(this);cloned.setValue(string);- getFieldUnaries().add(cloned);+ getFieldEntities().add(cloned);}} else {- getFieldUnaries().add(field);+ getFieldEntities().add(field);}} else {- getFieldUnaries().add(field);+ getFieldEntities().add(field);}}}diff --git a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java b/core/src/main/java/io/onedev/server/model/IssueFieldEntity.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/model/IssueFieldUnary.javarename to core/src/main/java/io/onedev/server/model/IssueFieldEntity.javaindex cf1d649b7a..d00110da64 100644--- a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java+++ b/core/src/main/java/io/onedev/server/model/IssueFieldEntity.java@@ -15,7 +15,7 @@ import javax.persistence.Table;@Index(columnList="o_issue_id"), @Index(columnList="name"),@Index(columnList="value"), @Index(columnList="type"),@Index(columnList="ordinal")})-public class IssueFieldUnary extends AbstractEntity {+public class IssueFieldEntity extends AbstractEntity {private static final long serialVersionUID = 1L;diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 4a4a91cb22..3f532b4dfe 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -71,6 +71,16 @@ import io.onedev.commons.utils.Range;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;import io.onedev.server.OneDev;+import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.detect.CISpecDetector;+import io.onedev.server.entitymanager.BuildQuerySettingManager;+import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;+import io.onedev.server.entitymanager.CommitQuerySettingManager;+import io.onedev.server.entitymanager.IssueQuerySettingManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestQuerySettingManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.Blob;@@ -82,15 +92,6 @@ import io.onedev.server.git.Submodule;import io.onedev.server.git.command.BlameCommand;import io.onedev.server.git.exception.NotFileException;import io.onedev.server.git.exception.ObjectNotFoundException;-import io.onedev.server.manager.BuildQuerySettingManager;-import io.onedev.server.manager.CodeCommentQuerySettingManager;-import io.onedev.server.manager.CommitQuerySettingManager;-import io.onedev.server.manager.IssueQuerySettingManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.PullRequestQuerySettingManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.StorageManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.CommitMessageTransform;import io.onedev.server.model.support.NamedBuildQuery;@@ -100,9 +101,10 @@ import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.WebHook;import io.onedev.server.model.support.issue.IssueSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.DefaultPrivilege;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.patternset.PatternSet;@@ -245,6 +247,8 @@ public class Project extends AbstractEntity {private transient Map<String, Optional<ObjectId>> objectIdCache;+ private transient Map<ObjectId, Optional<CISpec>> ciSpecCache;+private transient Map<ObjectId, Optional<RevCommit>> commitCache;private transient Map<String, Optional<Ref>> refCache;@@ -606,6 +610,31 @@ public class Project extends AbstractEntity {objectIdCache.put(revision, Optional.fromNullable(objectId));}++ @Nullable+ public CISpec getCISpec(ObjectId commitId) {+ if (ciSpecCache == null)+ ciSpecCache = new HashMap<>();+ Optional<CISpec> ciSpecOpt = ciSpecCache.get(commitId);+ if (ciSpecOpt == null) {+ try {+ Blob blob = getBlob(new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE));+ ciSpecOpt = Optional.of(CISpec.parse(blob.getBytes()));+ } catch (ObjectNotFoundException e) {+ List<CISpecDetector> detectors = new ArrayList<>(OneDev.getExtensions(CISpecDetector.class));+ detectors.sort(Comparator.comparing(CISpecDetector::getPriority));+ CISpec ciSpec = null;+ for (CISpecDetector detector: detectors) {+ ciSpec = detector.detect(this, commitId);+ if (ciSpec != null)+ break;+ }+ ciSpecOpt = Optional.fromNullable(ciSpec);+ }+ ciSpecCache.put(commitId, ciSpecOpt);+ }+ return ciSpecOpt.orNull();+ }public LastCommitsOfChildren getLastCommitsOfChildren(String revision, @Nullable String path) {if (path == null)@@ -800,7 +829,7 @@ public class Project extends AbstractEntity {}Subject subject = SecurityUtils.getSubject();- OneDev.getInstance(UnitOfWork.class).doAsync(new Runnable() {+ OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {@Overridepublic void run() {@@ -854,7 +883,7 @@ public class Project extends AbstractEntity {throw new RuntimeException(e);}Subject subject = SecurityUtils.getSubject();- OneDev.getInstance(UnitOfWork.class).doAsync(new Runnable() {+ OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex 3dea46163f..bc742d060a 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -41,10 +41,10 @@ import com.fasterxml.jackson.annotation.JsonView;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.ProjectAndBranch;diff --git a/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.javaindex 8ac3033ba5..b0478e7efe 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java@@ -29,10 +29,10 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;import com.fasterxml.jackson.annotation.JsonProperty;import com.google.common.base.Preconditions;+import io.onedev.server.entitymanager.impl.DefaultCodeCommentRelationManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.FileChange;import io.onedev.server.git.command.ListFileChangesCommand;-import io.onedev.server.manager.impl.DefaultCodeCommentRelationManager;@Entity@Table(indexes={@Index(columnList="o_request_id"), @Index(columnList="date")})diff --git a/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java b/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.javaindex 25f39a2ac5..197a2d40c2 100644--- a/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java+++ b/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java@@ -12,8 +12,8 @@ import org.eclipse.jgit.lib.Ref;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;public class ProjectAndRevision implements Serializable {diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.java b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.javaindex c344bb1d21..5ac88713bb 100644--- a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.java+++ b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByCount.java@@ -9,9 +9,9 @@ import org.hibernate.Session;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildInfoManager;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.CacheManager;+import io.onedev.server.cache.BuildInfoManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;import io.onedev.server.web.editable.annotation.Editable;diff --git a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.java b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.javaindex 43ecc68c40..1bf5d27ac0 100644--- a/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.java+++ b/core/src/main/java/io/onedev/server/model/support/configuration/KeepByDays.java@@ -10,8 +10,8 @@ import org.hibernate.query.Query;import org.joda.time.DateTime;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildInfoManager;-import io.onedev.server.manager.BuildManager;+import io.onedev.server.cache.BuildInfoManager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;import io.onedev.server.web.editable.annotation.Editable;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 1dbe311276..44fabc739b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -18,7 +18,7 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.IssueConstants;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.javaindex 9c37b4bc4a..1f003a701d 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java@@ -12,7 +12,7 @@ import java.util.Set;import javax.annotation.Nullable;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex 6bb21fcf01..25303115b0 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -15,7 +15,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPrerequisite;import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsNotAnyOf;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.javaindex ace034e92d..44d43fe5ce 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java@@ -10,8 +10,8 @@ import org.apache.wicket.Component;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;import io.onedev.server.model.IssueChange;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex fb053c034a..816bec52f8 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.model.support.usermatcher.UserMatcher;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.javaindex 0eabffa1c3..e3b66646c9 100644--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java@@ -5,7 +5,7 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedUser.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedUser.javaindex 6d4a9a320b..fc47908420 100644--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedUser.java+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedUser.java@@ -5,7 +5,7 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.web.editable.annotation.Editable;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java b/core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.javarename to core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.javaindex 10c31f1c6f..b896e58d23 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentNotificationManager.java+++ b/core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.notification;import java.util.Collection;import java.util.stream.Collectors;@@ -7,20 +7,19 @@ import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.codecomment.CodeCommentCreated;import io.onedev.server.event.codecomment.CodeCommentDeleted;import io.onedev.server.event.codecomment.CodeCommentEvent;import io.onedev.server.event.codecomment.CodeCommentReplied;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.UrlManager;import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.markdown.MentionParser;@Singleton-public class DefaultCodeCommentNotificationManager {+public class CodeCommentNotificationManager {private final MailManager mailManager;@@ -29,7 +28,7 @@ public class DefaultCodeCommentNotificationManager {private final UrlManager urlManager;@Inject- public DefaultCodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager, UrlManager urlManager) {+ public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager, UrlManager urlManager) {this.mailManager = mailManager;this.markdownManager = markdownManager;this.urlManager = urlManager;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java b/core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.javarename to core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javaindex ab2e6d88a4..3d51bca57d 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitNotificationManager.java+++ b/core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.notification;import java.util.Collection;import java.util.HashMap;@@ -13,9 +13,8 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.RefUpdated;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.UrlManager;import io.onedev.server.model.CommitQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.User;@@ -24,14 +23,14 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.search.commit.CommitQueryUtils;@Singleton-public class DefaultCommitNotificationManager {+public class CommitNotificationManager {private final MailManager mailManager;private final UrlManager urlManager;@Inject- public DefaultCommitNotificationManager(MailManager mailManager, UrlManager urlManager) {+ public CommitNotificationManager(MailManager mailManager, UrlManager urlManager) {this.mailManager = mailManager;this.urlManager = urlManager;}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java b/core/src/main/java/io/onedev/server/notification/DefaultMailManager.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.javarename to core/src/main/java/io/onedev/server/notification/DefaultMailManager.javaindex f96e676eff..fcf8cd7ac8 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java+++ b/core/src/main/java/io/onedev/server/notification/DefaultMailManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.notification;import java.net.InetAddress;import java.net.UnknownHostException;@@ -14,12 +14,11 @@ import org.apache.commons.mail.HtmlEmail;import org.slf4j.Logger;import org.slf4j.LoggerFactory;-import io.onedev.server.manager.SettingManager;import io.onedev.commons.launcher.bootstrap.Bootstrap;-import io.onedev.server.manager.MailManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.MailSetting;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.dao.Dao;@Singletonpublic class DefaultMailManager implements MailManager {@@ -30,11 +29,12 @@ public class DefaultMailManager implements MailManager {private final ExecutorService executorService;- private final Dao dao;+ private final TransactionManager transactionManager;@Inject- public DefaultMailManager(Dao dao, SettingManager configManager, ExecutorService executorService) {- this.dao = dao;+ public DefaultMailManager(TransactionManager transactionManager, SettingManager configManager,+ ExecutorService executorService) {+ this.transactionManager = transactionManager;this.configManager = configManager;this.executorService = executorService;}@@ -42,7 +42,7 @@ public class DefaultMailManager implements MailManager {@Sessional@Overridepublic void sendMailAsync(Collection<String> toList, String subject, String body) {- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.javarename to core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex e8700cbe78..36b1166613 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java+++ b/core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.notification;import java.util.Collection;import java.util.Date;@@ -10,17 +10,15 @@ import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.IssueWatchManager;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueCommented;import io.onedev.server.event.issue.IssueDeleted;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.event.issue.IssueOpened;-import io.onedev.server.manager.IssueWatchManager;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.UrlManager;-import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueWatch;@@ -31,11 +29,12 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.QueryWatchBuilder;import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.markdown.MentionParser;import jersey.repackaged.com.google.common.collect.Lists;@Singleton-public class DefaultIssueNotificationManager {+public class IssueNotificationManager {private final MailManager mailManager;@@ -48,7 +47,7 @@ public class DefaultIssueNotificationManager {private final UserInfoManager userInfoManager;@Inject- public DefaultIssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,+ public IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,UrlManager urlManager, IssueWatchManager issueWatchManager, UserInfoManager userInfoManager) {this.mailManager = mailManager;this.urlManager = urlManager;diff --git a/core/src/main/java/io/onedev/server/manager/MailManager.java b/core/src/main/java/io/onedev/server/notification/MailManager.javasimilarity index 90%rename from core/src/main/java/io/onedev/server/manager/MailManager.javarename to core/src/main/java/io/onedev/server/notification/MailManager.javaindex a037f1e577..c4c5dc1ddf 100644--- a/core/src/main/java/io/onedev/server/manager/MailManager.java+++ b/core/src/main/java/io/onedev/server/notification/MailManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.notification;import java.util.Collection;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.javarename to core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex 7dec362db7..101fa692b0 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java+++ b/core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.notification;import java.io.Serializable;import java.util.Collection;@@ -16,6 +16,9 @@ import org.hibernate.type.Type;import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.PullRequestWatchManager;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;@@ -27,11 +30,6 @@ import io.onedev.server.event.pullrequest.PullRequestDeleted;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;import io.onedev.server.event.pullrequest.PullRequestUpdated;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.PullRequestWatchManager;-import io.onedev.server.manager.UrlManager;-import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;@@ -50,10 +48,11 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.QueryWatchBuilder;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.markdown.MentionParser;@Singleton-public class DefaultPullRequestNotificationManager implements PersistListener {+public class PullRequestNotificationManager implements PersistListener {private final MailManager mailManager;@@ -66,7 +65,7 @@ public class DefaultPullRequestNotificationManager implements PersistListener {private final UserInfoManager userInfoManager;@Inject- public DefaultPullRequestNotificationManager(MailManager mailManager, UrlManager urlManager,+ public PullRequestNotificationManager(MailManager mailManager, UrlManager urlManager,MarkdownManager markdownManager, PullRequestWatchManager pullRequestWatchManager,UserInfoManager userInfoManager) {this.mailManager = mailManager;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java b/core/src/main/java/io/onedev/server/notification/WebHookManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.javarename to core/src/main/java/io/onedev/server/notification/WebHookManager.javaindex 89c7500ee0..0ee18a7bfe 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultWebHookManager.java+++ b/core/src/main/java/io/onedev/server/notification/WebHookManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.notification;import java.io.IOException;import java.util.concurrent.ExecutorService;@@ -29,9 +29,9 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.util.jackson.RestView;@Singleton-public class DefaultWebHookManager {+public class WebHookManager {- private static final Logger logger = LoggerFactory.getLogger(DefaultWebHookManager.class);+ private static final Logger logger = LoggerFactory.getLogger(WebHookManager.class);private static final String SIGNATURE_HEAD = "X-OneDev-Signature";@@ -40,7 +40,7 @@ public class DefaultWebHookManager {private final ExecutorService executor;@Inject- public DefaultWebHookManager(ObjectMapper mapper, ExecutorService executor) {+ public WebHookManager(ObjectMapper mapper, ExecutorService executor) {this.mapper = mapper.copy();this.mapper.setConfig(this.mapper.getSerializationConfig().withView(RestView.class));this.executor = executor;diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultIdManager.javaindex a2c262f0c1..db5a362e90 100644--- a/core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java+++ b/core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java@@ -35,7 +35,7 @@ public class DefaultIdManager implements IdManager {CriteriaQuery<Number> query = builder.createQuery(Number.class);Root<?> root = query.from(entityClass);query.select(builder.max(root.get("id")));- Number result = dao.getSession().createQuery(query).getSingleResult();+ Number result = dao.getSessionManager().getSession().createQuery(query).getSingleResult();return result!=null?result.longValue():0;}diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.javaindex 87dc91d5d6..9eef43c54f 100644--- a/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java+++ b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java@@ -437,7 +437,7 @@ public class DefaultPersistManager implements PersistManager {@Sessional@Overridepublic void importData(Metadata metadata, File dataDir) {- Session session = dao.getSession();+ Session session = dao.getSessionManager().getSession();List<Class<?>> entityTypes = getEntityTypes(sessionFactory);Collections.reverse(entityTypes);for (Class<?> entityType: entityTypes) {diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java b/core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.javasimilarity index 72%rename from core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.javarename to core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.javaindex ceb2cf7510..6d0cb7407d 100644--- a/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java+++ b/core/src/main/java/io/onedev/server/persistence/DefaultSessionManager.java@@ -15,9 +15,9 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ObjectReference;@Singleton-public class DefaultUnitOfWork implements UnitOfWork {+public class DefaultSessionManager implements SessionManager {- private static final Logger logger = LoggerFactory.getLogger(DefaultUnitOfWork.class);+ private static final Logger logger = LoggerFactory.getLogger(DefaultSessionManager.class);private final PersistManager persistManager;@@ -49,18 +49,18 @@ public class DefaultUnitOfWork implements UnitOfWork {};@Inject- public DefaultUnitOfWork(PersistManager persistManager, ExecutorService executorService) {+ public DefaultSessionManager(PersistManager persistManager, ExecutorService executorService) {this.persistManager = persistManager;this.executorService = executorService;}@Override- public void begin() {+ public void openSession() {sessionReferenceHolder.get().open();}@Override- public void end() {+ public void closeSession() {sessionReferenceHolder.get().close();}@@ -72,13 +72,13 @@ public class DefaultUnitOfWork implements UnitOfWork {@Overridepublic <T> T call(Callable<T> callable) {if (persistManager.getSessionFactory() != null) {- begin();+ openSession();try {return callable.call();} catch (Exception e) {throw ExceptionUtils.unchecked(e);} finally {- end();+ closeSession();}} else {try {@@ -90,44 +90,34 @@ public class DefaultUnitOfWork implements UnitOfWork {}@Override- public void doAsync(final Runnable runnable) {- executorService.execute(new Runnable() {+ public void run(Runnable runnable) {+ call(new Callable<Void>() {@Override- public void run() {- if (persistManager.getSessionFactory() != null) {- begin();- try {- runnable.run();- } catch (Exception e) {- logger.error("Error executing within unit of work.", e);- } finally {- end();- }- } else {- try {- runnable.run();- } catch (Exception e) {- logger.error("Error executing within unit of work.", e);- }- }+ public Void call() throws Exception {+ runnable.run();+ return null;}});}@Override- public void run(Runnable runnable) {- if (persistManager.getSessionFactory() != null) {- begin();- try {- runnable.run();- } finally {- end();+ public void runAsync(Runnable runnable) {+ executorService.execute(new Runnable() {++ @Override+ public void run() {+ try {+ DefaultSessionManager.this.run(runnable);+ } catch (Exception e) {+ logger.error("Error running", e);+ } finally {+ closeSession();+ }}- } else {- runnable.run();- }++ });}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.javanew file mode 100644index 0000000000..ec4c993c42--- /dev/null+++ b/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java@@ -0,0 +1,134 @@+/**+ * Copyright (C) 2010 Google, Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package io.onedev.server.persistence;++import java.util.concurrent.Callable;+import java.util.concurrent.ExecutorService;++import javax.inject.Singleton;+import javax.transaction.Status;+import javax.transaction.Synchronization;++import org.hibernate.Transaction;++import com.google.inject.Inject;++import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.server.persistence.annotation.Transactional;++@Singleton+public class DefaultTransactionManager implements TransactionManager {++ private final SessionManager sessionManager;++ private final ExecutorService executorService;++ @Inject+ public DefaultTransactionManager(SessionManager sessionManager, ExecutorService executorService) {+ this.sessionManager = sessionManager;+ this.executorService = executorService;+ }++ @Override+ public <T> T call(Callable<T> callable) {+ return sessionManager.call(new Callable<T>() {++ @Override+ public T call() throws Exception {+ if (getTransaction().isActive()) {+ return callable.call();+ } else {+ Transaction tx = sessionManager.getSession().beginTransaction();+ try {+ T result = callable.call();+ sessionManager.getSession().flush();+ tx.commit();+ return result;+ } catch (Throwable t) {+ tx.rollback();+ throw ExceptionUtils.unchecked(t);+ }+ }+ }++ });+ }++ @Override+ public void run(Runnable runnable) {+ call(new Callable<Void>() {++ @Override+ public Void call() throws Exception {+ runnable.run();+ return null;+ }++ });+ }++ @Override+ public void runAsync(Runnable runnable) {+ executorService.execute(new Runnable() {++ @Override+ public void run() {+ DefaultTransactionManager.this.run(runnable);+ }++ });+ }++ @Override+ public void runAfterCommit(Runnable runnable) {+ if (getTransaction().isActive()) {+ getTransaction().registerSynchronization(new Synchronization() {++ @Override+ public void beforeCompletion() {+ }++ @Override+ public void afterCompletion(int status) {+ if (status == Status.STATUS_COMMITTED)+ runnable.run();+ }++ });+ } else {+ runnable.run();+ }+ }++ @Transactional+ public void runAsyncAfterCommit(Runnable runnable) {+ runAfterCommit(new Runnable() {++ @Override+ public void run() {+ executorService.execute(runnable);+ }++ });+ }++ @Override+ public Transaction getTransaction() {+ return sessionManager.getSession().getTransaction();+ }++}diff --git a/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java b/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.javaindex be7068cba4..fc83ea59b3 100644--- a/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java+++ b/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java@@ -1,29 +1,32 @@package io.onedev.server.persistence;+import java.util.concurrent.Callable;+import org.aopalliance.intercept.MethodInterceptor;import org.aopalliance.intercept.MethodInvocation;import com.google.inject.Inject;+import io.onedev.commons.utils.ExceptionUtils;+public class SessionInterceptor implements MethodInterceptor {@Inject- private PersistManager persistManager;-- @Inject- private UnitOfWork unitOfWork;+ private SessionManager sessionManager;public Object invoke(MethodInvocation mi) throws Throwable {- if (persistManager.getSessionFactory() != null) {- unitOfWork.begin();- try {- return mi.proceed();- } finally {- unitOfWork.end();+ return sessionManager.call(new Callable<Object>() {++ @Override+ public Object call() throws Exception {+ try {+ return mi.proceed();+ } catch (Throwable e) {+ throw ExceptionUtils.unchecked(e);+ }}- } else {- return mi.proceed();- }++ });}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/persistence/UnitOfWork.java b/core/src/main/java/io/onedev/server/persistence/SessionManager.javasimilarity index 87%rename from core/src/main/java/io/onedev/server/persistence/UnitOfWork.javarename to core/src/main/java/io/onedev/server/persistence/SessionManager.javaindex c0c80726f9..b6111913ee 100644--- a/core/src/main/java/io/onedev/server/persistence/UnitOfWork.java+++ b/core/src/main/java/io/onedev/server/persistence/SessionManager.java@@ -20,17 +20,17 @@ import java.util.concurrent.Callable;import org.hibernate.Session;-public interface UnitOfWork {+public interface SessionManager {- void begin();+ void openSession();- void end();+ void closeSession();<T> T call(Callable<T> callable);void run(Runnable runnable);- void doAsync(Runnable runnable);+ void runAsync(Runnable runnable);Session getSession();diff --git a/core/src/main/java/io/onedev/server/persistence/SessionProvider.java b/core/src/main/java/io/onedev/server/persistence/SessionProvider.javaindex b288627928..b33e4d7d26 100644--- a/core/src/main/java/io/onedev/server/persistence/SessionProvider.java+++ b/core/src/main/java/io/onedev/server/persistence/SessionProvider.java@@ -9,16 +9,16 @@ import org.hibernate.Session;@Singletonpublic class SessionProvider implements Provider<Session> {- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;@Inject- public SessionProvider(UnitOfWork unitOfWork) {- this.unitOfWork = unitOfWork;+ public SessionProvider(SessionManager sessionManager) {+ this.sessionManager = sessionManager;}@Overridepublic Session get() {- return unitOfWork.getSession();+ return sessionManager.getSession();}}diff --git a/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java b/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.javaindex be0c474a64..6437822157 100644--- a/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java+++ b/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java@@ -1,10 +1,9 @@package io.onedev.server.persistence;+import java.util.concurrent.Callable;+import org.aopalliance.intercept.MethodInterceptor;import org.aopalliance.intercept.MethodInvocation;-import org.hibernate.Session;-import org.hibernate.Transaction;-import org.hibernate.resource.transaction.spi.TransactionStatus;import com.google.inject.Inject;@@ -13,36 +12,21 @@ import io.onedev.commons.utils.ExceptionUtils;public class TransactionInterceptor implements MethodInterceptor {@Inject- private PersistManager persistManager;-- @Inject- private UnitOfWork unitOfWork;+ private TransactionManager transactionManager;public Object invoke(MethodInvocation mi) throws Throwable {- if (persistManager.getSessionFactory() != null) {- unitOfWork.begin();- try {- Session session = unitOfWork.getSession();- if (session.getTransaction().getStatus() == TransactionStatus.ACTIVE) {+ return transactionManager.call(new Callable<Object>() {++ @Override+ public Object call() throws Exception {+ try {return mi.proceed();- } else {- Transaction tx = session.beginTransaction();- try {- Object result = mi.proceed();- session.flush();- tx.commit();- return result;- } catch (Throwable t) {- tx.rollback();- throw ExceptionUtils.unchecked(t);- }+ } catch (Throwable e) {+ throw ExceptionUtils.unchecked(e);}- } finally {- unitOfWork.end();}- } else {- return mi.proceed();- }++ });}-+}diff --git a/core/src/main/java/io/onedev/server/persistence/TransactionManager.java b/core/src/main/java/io/onedev/server/persistence/TransactionManager.javanew file mode 100644index 0000000000..9c4ead1c42--- /dev/null+++ b/core/src/main/java/io/onedev/server/persistence/TransactionManager.java@@ -0,0 +1,43 @@+/**+ * Copyright (C) 2010 Google, Inc.+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * http://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package io.onedev.server.persistence;++import java.util.concurrent.Callable;++import org.hibernate.Transaction;++public interface TransactionManager {++ Transaction getTransaction();++ <T> T call(Callable<T> callable);++ void run(Runnable runnable);++ void runAsync(Runnable runnable);++ /**+ * Do some work after commit if there is an active transaction, or do the work immediately if there is no active+ * transaction. Note that the work should not involve any other database operations in current thread+ *+ * @param runnable+ */+ void runAfterCommit(Runnable runnable);++ void runAsyncAfterCommit(Runnable runnable);++}diff --git a/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java b/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.javaindex 02361e44b3..88a4b45b5a 100644--- a/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java+++ b/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java@@ -112,7 +112,7 @@ public abstract class AbstractEntityManager<T extends AbstractEntity> implements}protected Session getSession() {- return dao.getSession();+ return dao.getSessionManager().getSession();}}diff --git a/core/src/main/java/io/onedev/server/persistence/dao/Dao.java b/core/src/main/java/io/onedev/server/persistence/dao/Dao.javaindex c6a5fc9751..2f7f56e37b 100644--- a/core/src/main/java/io/onedev/server/persistence/dao/Dao.java+++ b/core/src/main/java/io/onedev/server/persistence/dao/Dao.java@@ -3,10 +3,10 @@ package io.onedev.server.persistence.dao;import java.util.List;import org.hibernate.HibernateException;-import org.hibernate.Session;import org.hibernate.criterion.DetachedCriteria;import io.onedev.server.model.AbstractEntity;+import io.onedev.server.persistence.SessionManager;public interface Dao {@@ -94,16 +94,6 @@ public interface Dao {*/<T extends AbstractEntity> int count(EntityCriteria<T> entityCriteria);- /**- * Do some work after commit if there is an active transaction, or do the work immediately if there is no active- * transaction. Note that the work should not involve any other database operations in current thread- *- * @param runnable- */- void doAfterCommit(Runnable runnable);-- void doUnitOfWorkAsyncAfterCommit(Runnable runnable);-- Session getSession();-+ SessionManager getSessionManager();+}diff --git a/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.javaindex c485befd05..0dff2bdeeb 100644--- a/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java+++ b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java@@ -6,11 +6,8 @@ import java.util.List;import javax.inject.Inject;import javax.inject.Singleton;-import javax.transaction.Status;-import javax.transaction.Synchronization;import org.hibernate.Criteria;-import org.hibernate.Session;import org.hibernate.criterion.Projections;import io.onedev.commons.launcher.loader.ListenerRegistry;@@ -19,7 +16,7 @@ import io.onedev.commons.utils.ClassUtils;import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.model.AbstractEntity;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -27,52 +24,47 @@ import io.onedev.server.persistence.annotation.Transactional;@SuppressWarnings("unchecked")public class DefaultDao implements Dao, Serializable {- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;private final ListenerRegistry listenerRegistry;@Inject- public DefaultDao(UnitOfWork unitOfWork, ListenerRegistry listenerRegistry) {- this.unitOfWork = unitOfWork;+ public DefaultDao(SessionManager sessionManager, ListenerRegistry listenerRegistry) {+ this.sessionManager = sessionManager;this.listenerRegistry = listenerRegistry;}@Sessional@Overridepublic <T extends AbstractEntity> T get(Class<T> entityClass, Long entityId) {- return (T) getSession().get(ClassUtils.unproxy(entityClass), entityId);+ return (T) sessionManager.getSession().get(ClassUtils.unproxy(entityClass), entityId);}@Sessional@Overridepublic <T extends AbstractEntity> T load(Class<T> entityClass, Long entityId) {- return (T) getSession().load(ClassUtils.unproxy(entityClass), entityId);+ return (T) sessionManager.getSession().load(ClassUtils.unproxy(entityClass), entityId);}@Transactional@Overridepublic void persist(AbstractEntity entity) {boolean isNew = entity.isNew();- getSession().saveOrUpdate(entity);+ sessionManager.getSession().saveOrUpdate(entity);listenerRegistry.post(new EntityPersisted(entity, isNew));}@Transactional@Overridepublic void remove(AbstractEntity entity) {- getSession().delete(entity);+ sessionManager.getSession().delete(entity);listenerRegistry.post(new EntityRemoved(entity));}- @Override- public Session getSession() {- return unitOfWork.getSession();- }-@Sessional@Overridepublic <T extends AbstractEntity> List<T> query(EntityCriteria<T> entityCriteria, int firstResult, int maxResults) {- Criteria criteria = entityCriteria.getExecutableCriteria(getSession());+ Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());criteria.setFirstResult(firstResult);criteria.setMaxResults(maxResults);return criteria.list();@@ -87,7 +79,7 @@ public class DefaultDao implements Dao, Serializable {@Transactional@Overridepublic <T extends AbstractEntity> T find(EntityCriteria<T> entityCriteria) {- Criteria criteria = entityCriteria.getExecutableCriteria(getSession());+ Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());criteria.setFirstResult(0);criteria.setMaxResults(1);return (T) criteria.uniqueResult();@@ -95,7 +87,7 @@ public class DefaultDao implements Dao, Serializable {@Overridepublic <T extends AbstractEntity> int count(EntityCriteria<T> entityCriteria) {- Criteria criteria = entityCriteria.getExecutableCriteria(getSession());+ Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());criteria.setProjection(Projections.rowCount());return ((Long) criteria.uniqueResult()).intValue();}@@ -111,36 +103,8 @@ public class DefaultDao implements Dao, Serializable {}@Override- public void doAfterCommit(Runnable runnable) {- if (getSession().getTransaction().isActive()) {- getSession().getTransaction().registerSynchronization(new Synchronization() {-- @Override- public void beforeCompletion() {- }-- @Override- public void afterCompletion(int status) {- if (status == Status.STATUS_COMMITTED)- runnable.run();- }-- });- } else {- runnable.run();- }- }-- @Override- public void doUnitOfWorkAsyncAfterCommit(Runnable runnable) {- doAfterCommit(new Runnable() {-- @Override- public void run() {- unitOfWork.doAsync(runnable);- }-- });- }+ public SessionManager getSessionManager() {+ return sessionManager;+ }}diff --git a/core/src/main/java/io/onedev/server/rest/BuildResource.java b/core/src/main/java/io/onedev/server/rest/BuildResource.javaindex 560583cfdc..eecf53d155 100644--- a/core/src/main/java/io/onedev/server/rest/BuildResource.java+++ b/core/src/main/java/io/onedev/server/rest/BuildResource.java@@ -18,7 +18,7 @@ import javax.ws.rs.core.UriInfo;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.BuildManager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.jersey.ValidQueryParams;diff --git a/core/src/main/java/io/onedev/server/rest/ConfigurationResource.java b/core/src/main/java/io/onedev/server/rest/ConfigurationResource.javaindex 41ea86af87..5956036493 100644--- a/core/src/main/java/io/onedev/server/rest/ConfigurationResource.java+++ b/core/src/main/java/io/onedev/server/rest/ConfigurationResource.java@@ -18,7 +18,7 @@ import javax.ws.rs.core.UriInfo;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.ConfigurationManager;+import io.onedev.server.entitymanager.ConfigurationManager;import io.onedev.server.model.Configuration;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.jersey.ValidQueryParams;diff --git a/core/src/main/java/io/onedev/server/rest/ProjectResource.java b/core/src/main/java/io/onedev/server/rest/ProjectResource.javaindex 426df9aeb3..d09193bf3a 100644--- a/core/src/main/java/io/onedev/server/rest/ProjectResource.java+++ b/core/src/main/java/io/onedev/server/rest/ProjectResource.java@@ -18,7 +18,7 @@ import javax.ws.rs.core.UriInfo;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.jersey.ValidQueryParams;diff --git a/core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/core/src/main/java/io/onedev/server/rest/PullRequestResource.javaindex ab6fd2e6b9..84609b8d18 100644--- a/core/src/main/java/io/onedev/server/rest/PullRequestResource.java+++ b/core/src/main/java/io/onedev/server/rest/PullRequestResource.java@@ -19,7 +19,7 @@ import javax.ws.rs.core.UriInfo;import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.persistence.dao.EntityCriteria;diff --git a/core/src/main/java/io/onedev/server/rest/UserResource.java b/core/src/main/java/io/onedev/server/rest/UserResource.javaindex 226aab6cc8..6c1d004e34 100644--- a/core/src/main/java/io/onedev/server/rest/UserResource.java+++ b/core/src/main/java/io/onedev/server/rest/UserResource.java@@ -19,7 +19,7 @@ import org.apache.shiro.authz.UnauthorizedException;import org.hibernate.criterion.Restrictions;import org.hibernate.validator.constraints.Email;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.rest.jersey.ValidQueryParams;diff --git a/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java b/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.javaindex 0e2f8443ab..498ea75031 100644--- a/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java+++ b/core/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java@@ -25,9 +25,9 @@ import org.eclipse.jgit.lib.ObjectId;import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.ConfigurationManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ConfigurationManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java b/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.javaindex 1e4f986fc8..3db15ddd31 100644--- a/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java+++ b/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java@@ -26,8 +26,8 @@ import org.hibernate.criterion.Restrictions;import com.google.common.base.Preconditions;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;diff --git a/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.java b/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.javaindex fe2c21e2de..97de403f13 100644--- a/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.java+++ b/core/src/main/java/io/onedev/server/rest/github/RepositoryResource.java@@ -14,7 +14,7 @@ import javax.ws.rs.core.MediaType;import javax.ws.rs.core.Response;import javax.ws.rs.core.Response.Status;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.rest.RestConstants;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/rest/github/UserResource.java b/core/src/main/java/io/onedev/server/rest/github/UserResource.javaindex 6ff6d6851e..29753128ff 100644--- a/core/src/main/java/io/onedev/server/rest/github/UserResource.java+++ b/core/src/main/java/io/onedev/server/rest/github/UserResource.java@@ -20,7 +20,7 @@ import javax.ws.rs.core.UriInfo;import com.fasterxml.jackson.core.JsonParseException;import com.fasterxml.jackson.databind.JsonMappingException;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.rest.RestConstants;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.javaindex 4d82c9f963..501749cfc9 100644--- a/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java+++ b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java@@ -75,18 +75,18 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.concurrent.Prioritized;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.BatchWorkManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.StorageManager;import io.onedev.server.model.Project;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.util.BatchWorker;+import io.onedev.server.storage.StorageManager;import io.onedev.server.util.ContentDetector;import io.onedev.server.util.IndexResult;+import io.onedev.server.util.work.BatchWorkManager;+import io.onedev.server.util.work.BatchWorker;@Singletonpublic class DefaultIndexManager implements IndexManager {@@ -103,7 +103,7 @@ public class DefaultIndexManager implements IndexManager {private final BatchWorkManager batchWorkManager;- private final UnitOfWork unitOfWork;+ private final SessionManager sessionManager;private final ProjectManager projectManager;@@ -111,11 +111,11 @@ public class DefaultIndexManager implements IndexManager {@Injectpublic DefaultIndexManager(ListenerRegistry listenerRegistry, StorageManager storageManager,- BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, ProjectManager projectManager) {+ BatchWorkManager batchWorkManager, SessionManager sessionManager, ProjectManager projectManager) {this.listenerRegistry = listenerRegistry;this.storageManager = storageManager;this.batchWorkManager = batchWorkManager;- this.unitOfWork = unitOfWork;+ this.sessionManager = sessionManager;this.projectManager = projectManager;}@@ -302,7 +302,7 @@ public class DefaultIndexManager implements IndexManager {@Overridepublic void doWorks(Collection<Prioritized> works) {- unitOfWork.run(new Runnable() {+ sessionManager.run(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.javaindex 0403131bb8..f52392e3b4 100644--- a/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java+++ b/core/src/main/java/io/onedev/server/search/code/DefaultSearchManager.java@@ -45,11 +45,11 @@ import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.manager.StorageManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.search.code.hit.QueryHit;import io.onedev.server.search.code.query.BlobQuery;+import io.onedev.server.storage.StorageManager;import jersey.repackaged.com.google.common.base.Preconditions;@Singletondiff --git a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.javaindex 882a679b58..3183dcd9b2 100644--- a/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java+++ b/core/src/main/java/io/onedev/server/search/commit/CommitQueryUtils.java@@ -25,11 +25,11 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.stringmatch.WildcardUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.exception.OneException;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.RevListCommand;-import io.onedev.server.manager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 6469c80ac4..f047dbb3ee 100644--- a/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -15,11 +15,11 @@ import com.google.common.base.Splitter;import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ConfigurationManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.exception.OneException;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.ConfigurationManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;diff --git a/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.javaindex 502cb8005c..06dda67e42 100644--- a/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/build/FixedIssueCriteria.java@@ -9,9 +9,9 @@ import javax.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.javaindex f152677a66..520858a976 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;@@ -25,7 +25,7 @@ public class BooleanFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {- Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_VALUE);return context.getBuilder().equal(attribute, String.valueOf(value));}diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex 852d14c103..8ccfe91bbe 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -11,9 +11,9 @@ import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.setting.GlobalIssueSetting;@@ -46,14 +46,14 @@ public class ChoiceFieldCriteria extends FieldCriteria {public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {From<?, ?> join = context.getJoin(getFieldName());if (allowMultiple) {- return context.getBuilder().equal(join.get(IssueFieldUnary.FIELD_ATTR_VALUE), value);+ return context.getBuilder().equal(join.get(IssueFieldEntity.FIELD_ATTR_VALUE), value);} else {if (operator == IssueQueryLexer.Is)- return context.getBuilder().equal(join.get(IssueFieldUnary.FIELD_ATTR_VALUE), value);+ return context.getBuilder().equal(join.get(IssueFieldEntity.FIELD_ATTR_VALUE), value);else if (operator == IssueQueryLexer.IsGreaterThan)- return context.getBuilder().greaterThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), ordinal);+ return context.getBuilder().greaterThan(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL), ordinal);else- return context.getBuilder().lessThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), ordinal);+ return context.getBuilder().lessThan(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL), ordinal);}}diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.javaindex 4737c8f2d0..e87ab17fc5 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;import javax.persistence.criteria.Predicate;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.javaindex 6ea19c453c..2c0cc3b186 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/DateFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;@@ -32,9 +32,9 @@ public class DateFieldCriteria extends FieldCriteria {public Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {From<?, ?> join = context.getJoin(getFieldName());if (operator == IssueQueryLexer.IsBefore)- return context.getBuilder().lessThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), value.getTime());+ return context.getBuilder().lessThan(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL), value.getTime());else- return context.getBuilder().greaterThan(join.get(IssueFieldUnary.FIELD_ATTR_ORDINAL), value.getTime());+ return context.getBuilder().greaterThan(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL), value.getTime());}@Overridediff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex f1e5dfdc77..38d0c1b919 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -5,7 +5,7 @@ import java.util.HashSet;import java.util.Set;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.IssueConstants;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex 4db0deb34b..6465beb372 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;@@ -26,7 +26,7 @@ public class FieldOperatorCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {- Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);+ Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_VALUE);if (operator == IssueQueryLexer.IsEmpty)return context.getBuilder().isNull(attribute);elsediff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.javaindex 70635c33b8..1e5355a003 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java@@ -17,7 +17,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;+import io.onedev.server.cache.CacheManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 8586816ae3..a19b60daa2 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -35,8 +35,8 @@ import org.eclipse.jgit.errors.RevisionSyntaxException;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.exception.OneException;-import io.onedev.server.manager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.javaindex 55c983c686..7cec85ffb5 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQueryBuildContext.java@@ -8,7 +8,7 @@ import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.util.IssueConstants;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;public class IssueQueryBuildContext extends QueryBuildContext<Issue> {@@ -25,7 +25,7 @@ public class IssueQueryBuildContext extends QueryBuildContext<Issue> {return getRoot().join(IssueConstants.ATTR_MILESTONE, JoinType.LEFT);default:Join<Issue, ?> join = getRoot().join(IssueConstants.ATTR_FIELD_UNARIES, JoinType.LEFT);- join.on(getBuilder().equal(join.get(IssueFieldUnary.FIELD_ATTR_NAME), joinName));+ join.on(getBuilder().equal(join.get(IssueFieldEntity.FIELD_ATTR_NAME), joinName));return join;}}diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.javaindex 5a788298c2..81e9f63c25 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java@@ -6,7 +6,7 @@ import java.util.List;import javax.persistence.criteria.Predicate;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.javaindex 0877c9d646..4d92b4b8ad 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NumberFieldCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;@@ -28,7 +28,7 @@ public class NumberFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {- Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_ORDINAL);+ Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_ORDINAL);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.javaindex ffd5bd5bce..0bef2d352a 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java@@ -3,7 +3,7 @@ package io.onedev.server.search.entity.issue;import javax.persistence.criteria.Predicate;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.javaindex 2f4dfadbb3..0bcbc58d5f 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ReferenceableFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;@@ -24,7 +24,7 @@ public class ReferenceableFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {- Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_ORDINAL);+ Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_ORDINAL);return context.getBuilder().equal(attribute, value);}diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.javaindex 3c106af128..61f2f8e0e2 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java@@ -9,7 +9,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.javaindex 3ae9b5a318..6c93893ecb 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StringFieldCriteria.java@@ -6,7 +6,7 @@ import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueFieldUnary;+import io.onedev.server.model.IssueFieldEntity;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.QueryBuildContext;@@ -31,7 +31,7 @@ public class StringFieldCriteria extends FieldCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {- Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.FIELD_ATTR_VALUE);+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldEntity.FIELD_ATTR_VALUE);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(context.getBuilder().lower(attribute), value.toLowerCase());elsediff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.javaindex 90738cf7be..d36cb6be98 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesCommitCriteria.java@@ -7,7 +7,7 @@ import javax.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentRelationInfoManager;+import io.onedev.server.cache.CodeCommentRelationInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.javaindex 991923da7d..fcf981e3c4 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/IncludesIssueCriteria.java@@ -8,8 +8,8 @@ import javax.persistence.criteria.Predicate;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentRelationInfoManager;-import io.onedev.server.manager.CommitInfoManager;+import io.onedev.server.cache.CodeCommentRelationInfoManager;+import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex d0fad5f9a8..9dd8113293 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -15,8 +15,8 @@ import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.exception.OneException;-import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;diff --git a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex 75dce0d1c2..ad228d9582 100644--- a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -24,11 +24,11 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.MembershipManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.MembershipManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;import io.onedev.server.model.Membership;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/security/OneRememberMeManager.java b/core/src/main/java/io/onedev/server/security/OneRememberMeManager.javaindex abc92179bf..4586f3cb6d 100644--- a/core/src/main/java/io/onedev/server/security/OneRememberMeManager.java+++ b/core/src/main/java/io/onedev/server/security/OneRememberMeManager.java@@ -6,7 +6,7 @@ import javax.inject.Singleton;import org.apache.shiro.subject.PrincipalCollection;import org.apache.shiro.web.mgt.CookieRememberMeManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;@Singletonpublic class OneRememberMeManager extends CookieRememberMeManager {diff --git a/core/src/main/java/io/onedev/server/security/SecurityUtils.java b/core/src/main/java/io/onedev/server/security/SecurityUtils.javaindex 40038a83d9..1c04a7b9bf 100644--- a/core/src/main/java/io/onedev/server/security/SecurityUtils.java+++ b/core/src/main/java/io/onedev/server/security/SecurityUtils.java@@ -9,9 +9,9 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Issue;diff --git a/core/src/main/java/io/onedev/server/manager/AttachmentManager.java b/core/src/main/java/io/onedev/server/storage/AttachmentManager.javasimilarity index 92%rename from core/src/main/java/io/onedev/server/manager/AttachmentManager.javarename to core/src/main/java/io/onedev/server/storage/AttachmentManager.javaindex cdae7d0f0d..afd7c97365 100644--- a/core/src/main/java/io/onedev/server/manager/AttachmentManager.java+++ b/core/src/main/java/io/onedev/server/storage/AttachmentManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.storage;import java.io.File;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.javarename to core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.javaindex 47602eacd1..8d9b00f41e 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java+++ b/core/src/main/java/io/onedev/server/storage/DefaultAttachmentManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.storage;import java.io.File;import java.io.IOException;@@ -19,11 +19,10 @@ import io.onedev.server.event.entity.EntityPersisted;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.manager.AttachmentManager;-import io.onedev.server.manager.StorageManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;+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;@@ -38,6 +37,8 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTprivate final StorageManager storageManager;+ private final TransactionManager transactionManager;+private final TaskScheduler taskScheduler;private final Dao dao;@@ -45,9 +46,11 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTprivate String taskId;@Inject- public DefaultAttachmentManager(Dao dao, StorageManager storageManager, TaskScheduler taskScheduler) {+ public DefaultAttachmentManager(Dao dao, StorageManager storageManager, TransactionManager transactionManager,+ TaskScheduler taskScheduler) {this.dao = dao;this.storageManager = storageManager;+ this.transactionManager = transactionManager;this.taskScheduler = taskScheduler;}@@ -139,7 +142,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTattachmentUUID = null;}if (projectAttachmentDir != null && attachmentUUID != null) {- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {@@ -166,7 +169,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableTdirToDelete = null;}if (dirToDelete != null) {- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java b/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.javasimilarity index 91%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.javarename to core/src/main/java/io/onedev/server/storage/DefaultStorageManager.javaindex 1cdea487a7..cdf4bc6da3 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java+++ b/core/src/main/java/io/onedev/server/storage/DefaultStorageManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.storage;import java.io.File;import java.io.IOException;@@ -11,14 +11,13 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.Listen;import io.onedev.commons.utils.FileUtils;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarting;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.StorageManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.Dao;@Singletonpublic class DefaultStorageManager implements StorageManager {@@ -31,14 +30,14 @@ public class DefaultStorageManager implements StorageManager {private static final String DELETE_MARK = "to_be_deleted_when_onedev_is_restarted";- private final Dao dao;+ private final TransactionManager transactionManager;private final SettingManager configManager;@Inject- public DefaultStorageManager(Dao dao, SettingManager configManager) {- this.dao = dao;+ public DefaultStorageManager(TransactionManager transactionManager, SettingManager configManager) {this.configManager = configManager;+ this.transactionManager = transactionManager;}@Override@@ -125,7 +124,7 @@ public class DefaultStorageManager implements StorageManager {elseuserDir = null;- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/manager/StorageManager.java b/core/src/main/java/io/onedev/server/storage/StorageManager.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/StorageManager.javarename to core/src/main/java/io/onedev/server/storage/StorageManager.javaindex cdb8888ce6..46223db41f 100644--- a/core/src/main/java/io/onedev/server/manager/StorageManager.java+++ b/core/src/main/java/io/onedev/server/storage/StorageManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.storage;import java.io.File;diff --git a/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java b/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.javaindex 258a5857eb..8a986291de 100644--- a/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java+++ b/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java@@ -19,9 +19,9 @@ import org.unbescape.html.HtmlEscape;import io.onedev.commons.utils.Transformer;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/util/IssueField.java b/core/src/main/java/io/onedev/server/util/IssueField.javaindex 686009ad6d..8261cdb590 100644--- a/core/src/main/java/io/onedev/server/util/IssueField.java+++ b/core/src/main/java/io/onedev/server/util/IssueField.java@@ -13,7 +13,7 @@ import org.slf4j.LoggerFactory;import com.thoughtworks.xstream.annotations.XStreamOmitField;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.util.inputspec.InputSpec;diff --git a/core/src/main/java/io/onedev/server/util/IssueUtils.java b/core/src/main/java/io/onedev/server/util/IssueUtils.javaindex 45df4aceff..c7bcfb8d44 100644--- a/core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -19,8 +19,8 @@ import com.google.common.base.Splitter;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.setting.GlobalIssueSetting;diff --git a/core/src/main/java/io/onedev/server/util/MatrixRunner.java b/core/src/main/java/io/onedev/server/util/MatrixRunner.javanew file mode 100644index 0000000000..927a3c0f63--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/MatrixRunner.java@@ -0,0 +1,43 @@+package io.onedev.server.util;++import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++public class MatrixRunner {++ private final Map<String, String> params;++ private final Map<String, List<String>> paramMatrix;++ public MatrixRunner(Map<String, List<String>> paramMatrix) {+ this(new LinkedHashMap<>(), paramMatrix);+ }++ private MatrixRunner(Map<String, String> params, Map<String, List<String>> paramMatrix) {+ this.params = params;+ this.paramMatrix = paramMatrix;+ }++ public void run(Runnable runnable) {+ if (!paramMatrix.isEmpty()) {+ Map.Entry<String, List<String>> entry = paramMatrix.entrySet().iterator().next();+ for (String value: entry.getValue()) {+ Map<String, String> paramsCopy = new LinkedHashMap<>(params);+ paramsCopy.put(entry.getKey(), value);+ Map<String, List<String>> matrixCopy = new LinkedHashMap<>(paramMatrix);+ matrixCopy.remove(entry.getKey());+ new MatrixRunner(paramsCopy, matrixCopy).run(runnable);+ }+ } else {+ runnable.run(params);+ }+ }++ public static interface Runnable {++ void run(Map<String, String> params);++ }++}diff --git a/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java b/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.javaindex c7dcf4264f..b60ec88a51 100644--- a/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java+++ b/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java@@ -3,7 +3,7 @@ package io.onedev.server.util.facade;import java.util.Date;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.cache.UserInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.javaindex 88b04ffa3f..c78e054ac8 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/choiceprovider/AllGroups.java@@ -6,7 +6,7 @@ import java.util.List;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;+import io.onedev.server.cache.CacheManager;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.editable.annotation.Editable;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javaindex 5ac63fea52..4bff06854c 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java@@ -7,7 +7,7 @@ import java.util.stream.Collectors;import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.GroupUsers;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.javaindex 28a7c6ecab..3bab222dcc 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/GroupUsers.java@@ -6,7 +6,7 @@ import java.util.List;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.util.facade.UserFacade;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.javaindex 19732178e6..5dd595a3d7 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java@@ -6,7 +6,7 @@ import java.util.stream.Collectors;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.javasimilarity index 95%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.javarename to core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.javaindex 98c1a04a4e..8fe74a68f0 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java+++ b/core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.util.markdown;import java.util.ArrayList;import java.util.List;@@ -27,9 +27,7 @@ import com.vladsch.flexmark.util.options.MutableDataHolder;import com.vladsch.flexmark.util.options.MutableDataSet;import io.onedev.commons.utils.HtmlUtils;-import io.onedev.server.manager.MarkdownManager;import io.onedev.server.model.Project;-import io.onedev.server.util.markdown.MarkdownProcessor;@Singletonpublic class DefaultMarkdownManager implements MarkdownManager {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java b/core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.javarename to core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.javaindex 4c9d498502..e40a3e6b8a 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultEntityReferenceManager.java+++ b/core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.util.markdown;import java.util.Date;@@ -9,6 +9,8 @@ import org.jsoup.Jsoup;import org.jsoup.nodes.Document;import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.event.codecomment.CodeCommentCreated;import io.onedev.server.event.codecomment.CodeCommentUpdated;import io.onedev.server.event.entity.EntityPersisted;@@ -16,9 +18,6 @@ import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueOpened;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;import io.onedev.server.event.pullrequest.PullRequestOpened;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.PullRequestChangeManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Issue;@@ -30,11 +29,9 @@ import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.util.markdown.IssueParser;-import io.onedev.server.util.markdown.PullRequestParser;@Singleton-public class DefaultEntityReferenceManager {+public class EntityReferenceManager {private final IssueChangeManager issueChangeManager;@@ -43,7 +40,7 @@ public class DefaultEntityReferenceManager {private final MarkdownManager markdownManager;@Inject- public DefaultEntityReferenceManager(IssueChangeManager issueChangeManager,+ public EntityReferenceManager(IssueChangeManager issueChangeManager,PullRequestChangeManager pullRequestChangeManager, MarkdownManager markdownManager) {this.issueChangeManager = issueChangeManager;this.pullRequestChangeManager = pullRequestChangeManager;diff --git a/core/src/main/java/io/onedev/server/util/markdown/IssueParser.java b/core/src/main/java/io/onedev/server/util/markdown/IssueParser.javaindex 57259f0e7b..8ab9fdcfc8 100644--- a/core/src/main/java/io/onedev/server/util/markdown/IssueParser.java+++ b/core/src/main/java/io/onedev/server/util/markdown/IssueParser.java@@ -1,7 +1,7 @@package io.onedev.server.util.markdown;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/manager/MarkdownManager.java b/core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/manager/MarkdownManager.javarename to core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.javaindex ba42bd8226..5916597e4e 100644--- a/core/src/main/java/io/onedev/server/manager/MarkdownManager.java+++ b/core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.util.markdown;import javax.annotation.Nullable;diff --git a/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java b/core/src/main/java/io/onedev/server/util/markdown/MentionParser.javaindex be8e6e7770..189fd5371f 100644--- a/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java+++ b/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java@@ -15,7 +15,7 @@ import com.google.common.collect.ImmutableSet;import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.TextNodeVisitor;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;public class MentionParser {diff --git a/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java b/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.javaindex b775b9e312..be15dbe8ed 100644--- a/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java+++ b/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java@@ -1,7 +1,7 @@package io.onedev.server.util.markdown;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java b/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.javaindex 007c1137d3..a31fa7902d 100644--- a/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java+++ b/core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java@@ -21,7 +21,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.TextNodeVisitor;import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;import io.onedev.server.util.Referenceable;diff --git a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.javaindex 4778755d68..ab77c39045 100644--- a/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java+++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java@@ -17,9 +17,9 @@ import org.antlr.v4.runtime.Recognizer;import org.antlr.v4.runtime.tree.TerminalNode;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.exception.OneException;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.Group;import io.onedev.server.model.User;import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;diff --git a/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java b/core/src/main/java/io/onedev/server/util/work/BatchWorkManager.javasimilarity index 66%rename from core/src/main/java/io/onedev/server/manager/BatchWorkManager.javarename to core/src/main/java/io/onedev/server/util/work/BatchWorkManager.javaindex 19ce934661..7af6f1a9a7 100644--- a/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java+++ b/core/src/main/java/io/onedev/server/util/work/BatchWorkManager.java@@ -1,7 +1,6 @@-package io.onedev.server.manager;+package io.onedev.server.util.work;import io.onedev.commons.utils.concurrent.Prioritized;-import io.onedev.server.util.BatchWorker;public interface BatchWorkManager {diff --git a/core/src/main/java/io/onedev/server/util/BatchWorker.java b/core/src/main/java/io/onedev/server/util/work/BatchWorker.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/util/BatchWorker.javarename to core/src/main/java/io/onedev/server/util/work/BatchWorker.javaindex 1cb68a5dcd..ab9a75f532 100644--- a/core/src/main/java/io/onedev/server/util/BatchWorker.java+++ b/core/src/main/java/io/onedev/server/util/work/BatchWorker.java@@ -1,4 +1,4 @@-package io.onedev.server.util;+package io.onedev.server.util.work;import java.util.Collection;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java b/core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.javasimilarity index 94%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.javarename to core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.javaindex d111754833..dd530ed7ff 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java+++ b/core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.util.work;import java.util.ArrayList;import java.util.Collection;@@ -20,9 +20,6 @@ import io.onedev.commons.utils.concurrent.Prioritized;import io.onedev.commons.utils.concurrent.PrioritizedRunnable;import io.onedev.server.event.system.SystemStarted;import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.manager.BatchWorkManager;-import io.onedev.server.manager.WorkExecutor;-import io.onedev.server.util.BatchWorker;@Singletonpublic class DefaultBatchWorkManager implements BatchWorkManager, Runnable {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java b/core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.javasimilarity index 96%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.javarename to core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.javaindex 081a0c5f29..3754148cc5 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java+++ b/core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java@@ -1,4 +1,4 @@-package io.onedev.server.manager.impl;+package io.onedev.server.util.work;import java.util.Collection;import java.util.List;@@ -14,7 +14,6 @@ import io.onedev.commons.utils.concurrent.PrioritizedCallable;import io.onedev.commons.utils.concurrent.PrioritizedExecutor;import io.onedev.commons.utils.concurrent.PrioritizedRunnable;import io.onedev.server.event.system.SystemStopping;-import io.onedev.server.manager.WorkExecutor;@Singletonpublic class DefaultWorkExecutor implements WorkExecutor {diff --git a/core/src/main/java/io/onedev/server/manager/WorkExecutor.java b/core/src/main/java/io/onedev/server/util/work/WorkExecutor.javasimilarity index 97%rename from core/src/main/java/io/onedev/server/manager/WorkExecutor.javarename to core/src/main/java/io/onedev/server/util/work/WorkExecutor.javaindex c9b1af5b92..3d5084120b 100644--- a/core/src/main/java/io/onedev/server/manager/WorkExecutor.java+++ b/core/src/main/java/io/onedev/server/util/work/WorkExecutor.java@@ -1,4 +1,4 @@-package io.onedev.server.manager;+package io.onedev.server.util.work;import java.util.Collection;import java.util.List;diff --git a/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java b/core/src/main/java/io/onedev/server/web/DefaultUrlManager.javaindex 02121b00db..db5da1f9fd 100644--- a/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java+++ b/core/src/main/java/io/onedev/server/web/DefaultUrlManager.java@@ -11,8 +11,8 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Splitter;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UrlManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Issue;diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex f61a24d02c..3504be8331 100644--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -31,12 +31,12 @@ import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.exception.OneException;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.SettingManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 978dfa002e..b6714ee535 100644--- a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -19,10 +19,10 @@ import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.exception.OneException;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;-import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;diff --git a/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.javaindex 8a6a623462..7fa0bcb8f1 100644--- a/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java@@ -11,7 +11,7 @@ import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildManager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.web.WebConstants;diff --git a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex a81687c5e5..46df5099a0 100644--- a/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -40,8 +40,8 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.search.entity.build.BuildQuery;diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 2dd7d38ae3..48fa68a1c2 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentManager;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 3bcff82b63..9158aa9b07 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -37,9 +37,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.CodeCommentReplyManager;-import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.javaindex 1d57de5de9..db20e27fe6 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentManager;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.util.ConfirmOnClick;diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.javaindex b607649fa8..154929538f 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/referencedfrom/ReferencedFromCodeCommentPanel.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentManager;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.web.page.project.blob.ProjectBlobPage;diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 300b2cde8a..67ca20ca60 100644--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -27,9 +27,9 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.joda.time.DateTime;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.util.Constants;diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.javaindex 820504d8d0..816f18b5c9 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java@@ -45,13 +45,13 @@ import io.onedev.commons.utils.Range;import io.onedev.commons.utils.RangeUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.BlameCommit;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.BlameCommand;-import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.javaindex 373150e947..52ef2fe9fc 100644--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java@@ -67,11 +67,11 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.stringmatch.Matcher;import io.onedev.commons.utils.stringmatch.WildcardUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobChange;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.javaindex b9a2821cc7..d0098215f4 100644--- a/core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java@@ -9,7 +9,7 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;+import io.onedev.server.cache.CacheManager;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.select2.ChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java b/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.javaindex 1aa3778952..ae78605cd9 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java@@ -6,7 +6,7 @@ import org.apache.wicket.model.IModel;import io.onedev.commons.utils.ColorUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.support.issue.StateSpec;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.javaindex d99645a89d..d927c6b705 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java@@ -32,10 +32,10 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.IssueCommentManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.IssueCommentManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueChange;import io.onedev.server.model.IssueComment;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.javaindex 439ea7335d..2b7c278bce 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/DiffAndCommentAwarePanel.java@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.model.IssueChange;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.javaindex 04ef73a180..73367cfa43 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangeActivity.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.model.IssueChange;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.util.DeleteCallback;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.javaindex 196d5b2f81..d96780d827 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedActivity.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueCommentManager;+import io.onedev.server.entitymanager.IssueCommentManager;import io.onedev.server.model.IssueComment;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.util.DeleteCallback;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.javaindex 3530a75177..c638550a64 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommentedPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueCommentManager;+import io.onedev.server.entitymanager.IssueCommentManager;import io.onedev.server.model.IssueComment;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.javaindex 30f5ecd017..ba4a459aeb 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedActivity.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.util.DeleteCallback;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.javaindex ab9ca5e9f1..1eb95da28d 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.javaindex 03ba0df16f..5c5ba09a7c 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java@@ -11,7 +11,7 @@ import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.web.WebConstants;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex a9b9d131e6..9414909f9a 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -20,7 +20,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex df37d5d5ea..f87c4e912b 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -18,11 +18,11 @@ import org.unbescape.html.HtmlEscape;import io.onedev.commons.utils.ColorUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex a9325a01be..6ec1708104 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -31,8 +31,8 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.javaindex 899ca2fc67..e5854eca0e 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java@@ -7,7 +7,7 @@ import java.util.stream.Collectors;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.ChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 4dbfc66d77..4e75379631 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -47,9 +47,9 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.setting.GlobalIssueSetting;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 2d89d51405..c5bf914759 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -31,8 +31,8 @@ import com.google.common.collect.Lists;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.TransitionSpec;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.javaindex ead8d20df9..bcc342d59b 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java@@ -27,9 +27,9 @@ import org.apache.wicket.model.Model;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentRelationInfoManager;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.cache.CodeCommentRelationInfoManager;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;import io.onedev.server.util.DateUtils;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.javaindex ea1a1909ce..0aedabcd08 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.web.component.issue.IssueStateLabel;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.javaindex 8c5e95846d..1fe2407e2c 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java@@ -37,11 +37,11 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.PropertyModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.IssueVoteManager;-import io.onedev.server.manager.IssueWatchManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.IssueVoteManager;+import io.onedev.server.entitymanager.IssueWatchManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueVote;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.javaindex b275456f03..3ab21de447 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java@@ -12,7 +12,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.inputspec.InputContext;diff --git a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.javaindex fedeb497ff..d468cf17b7 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java@@ -16,7 +16,7 @@ import org.apache.wicket.model.Model;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.model.Issue;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex a6b74ee2f2..6ecc7003fc 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -48,12 +48,12 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.markdown.emoji.EmojiOnes;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 6eaa15af7f..eee0007ab0 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -24,17 +24,17 @@ import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.ColorUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.util.DateUtils;import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.page.project.ProjectPage;diff --git a/core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.java b/core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.javaindex f34872c1a8..6e11f43f90 100644--- a/core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithOpenIssuesPanel.java@@ -11,7 +11,7 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.issues.milestones.MilestoneCloseOption;diff --git a/core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.java b/core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.javaindex c617448a51..439c124137 100644--- a/core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/milestone/closelink/ConfirmCloseWithoutOpenIssuesPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java b/core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.javaindex 55cebde542..f44e2530b3 100644--- a/core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java+++ b/core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.java b/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.javaindex 81ea5da0c6..a3d40844e8 100644--- a/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithIssuesPanel.java@@ -11,7 +11,7 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.issues.milestones.MilestoneDeleteOption;diff --git a/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.java b/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.javaindex 606d5f1c2f..b89a0740e5 100644--- a/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/ConfirmDeleteWithoutIssuesPanel.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java b/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.javaindex 8ec92e6c59..53cebe73c8 100644--- a/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java+++ b/core/src/main/java/io/onedev/server/web/component/milestone/deletelink/MilestoneDeleteLink.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Milestone;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.milestone.closelink.MilestoneCloseLinkCssResourceReference;diff --git a/core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java b/core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.javaindex 3ada9495a2..1f6fe9ac71 100644--- a/core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java+++ b/core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java@@ -3,7 +3,7 @@ package io.onedev.server.web.component.project;import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.web.component.confirmaction.ConfirmActionModal;diff --git a/core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.javaindex 3072ea2a26..3cc639825b 100644--- a/core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/project/choice/AbstractProjectChoiceProvider.java@@ -10,7 +10,7 @@ import org.json.JSONWriter;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;+import io.onedev.server.cache.CacheManager;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.component.select2.ChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 04510404c6..9af271c3e4 100644--- a/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.util.DateUtils;import io.onedev.server.util.facade.ProjectFacade;diff --git a/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.javaindex bf3cdb7527..61fbb7712f 100644--- a/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/project/privilege/source/PrivilegeSourcePanel.java@@ -15,8 +15,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Group;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.model.Membership;diff --git a/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java b/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.javaindex 0aae016c21..2eb7b4f07e 100644--- a/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java+++ b/core/src/main/java/io/onedev/server/web/component/project/selector/ProjectSelector.java@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.InputChangeBehavior;diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.javaindex fb5bad1248..68c530a592 100644--- a/core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java@@ -11,7 +11,7 @@ import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.web.WebConstants;diff --git a/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java b/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.javaindex 629425494d..141c5d1555 100644--- a/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.web.component.pullrequest.RequestStatusLabel;diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.javaindex d28754bf8d..0d666b366d 100644--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewListPanel.java@@ -25,14 +25,14 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.MarkdownManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestReviewManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.behavior.dropdown.DropdownHoverBehavior;import io.onedev.server.web.component.user.ident.UserIdentPanel;diff --git a/core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.java b/core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.javaindex e9ce7ddff3..d30c1c1b70 100644--- a/core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.java+++ b/core/src/main/java/io/onedev/server/web/component/review/ReviewerChoice.java@@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestReviewManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.javaindex e1a64c435d..7443e31356 100644--- a/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java+++ b/core/src/main/java/io/onedev/server/web/component/user/choice/AbstractUserChoiceProvider.java@@ -10,7 +10,7 @@ import org.unbescape.html.HtmlEscape;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;+import io.onedev.server.cache.CacheManager;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.select2.ChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.java b/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.javaindex de5033ad79..f6525f8afd 100644--- a/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/user/detail/UserDetailPanel.java@@ -12,7 +12,7 @@ import org.unbescape.html.HtmlEscape;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.userident.GitUserIdent;import io.onedev.server.util.userident.OrdinaryUserIdent;diff --git a/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.javaindex 98934fef7b..1c4ed4b7ce 100644--- a/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/user/passwordedit/PasswordEditPanel.java@@ -11,7 +11,7 @@ import org.apache.wicket.model.IModel;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.javaindex 575156915c..5b0908c0c1 100644--- a/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/user/profileedit/ProfileEditPanel.java@@ -11,7 +11,7 @@ import org.apache.wicket.model.IModel;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.javaindex 85f0fa78b5..2e45206008 100644--- a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildChoiceEditor.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildManager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.web.component.build.choice.BuildChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.javaindex d3f5ae3878..3ef9b11fa4 100644--- a/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java+++ b/core/src/main/java/io/onedev/server/web/editable/buildchoice/BuildEditSupport.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildManager;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.javaindex f284428584..b11a4b685d 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java@@ -15,8 +15,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.javaindex b9801b0e22..5958d53aea 100644--- a/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java@@ -13,8 +13,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.util.facade.GroupFacade;import io.onedev.server.web.component.groupchoice.GroupChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.javaindex 2908020dd4..7a6ac0d061 100644--- a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.javaindex cc4ec7b9f7..4dcb66f276 100644--- a/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestchoice/PullRequestChoiceEditor.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.web.component.pullrequest.choice.PullRequestChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex d6a71b12fa..0c81faedcb 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -15,8 +15,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.OneContext;import io.onedev.server.util.facade.UserFacade;diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex a7dbd240d3..3141161101 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -13,8 +13,8 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.ReflectionUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.OneContext;import io.onedev.server.util.facade.UserFacade;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.javaindex d5edde0999..5af18211e2 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java@@ -23,7 +23,7 @@ import com.google.common.base.Joiner;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.authenticator.Authenticated;import io.onedev.server.web.behavior.testform.TestFormBehavior;import io.onedev.server.web.behavior.testform.TestResult;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.javaindex ac16af5d05..0f46abdc4a 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java@@ -13,9 +13,9 @@ import org.apache.wicket.request.resource.AbstractResource;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.ZipUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.StorageManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.persistence.PersistManager;+import io.onedev.server.storage.StorageManager;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.javaindex 50295ca40e..93661cbcd4 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java@@ -38,9 +38,9 @@ import io.onedev.commons.utils.WordUtils;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupAuthorizationManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.GroupAuthorizationManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.GroupAuthorization;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.permission.ProjectPrivilege;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.javaindex 33f8bc2c8d..cc26bee857 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java@@ -27,7 +27,7 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.javaindex bfdbe54b95..9d0eb07772 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupMembershipsPage.java@@ -36,9 +36,9 @@ import org.hibernate.criterion.Restrictions;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.MembershipManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.MembershipManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Membership;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.javaindex 26bee32636..b0068593a7 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java@@ -14,7 +14,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.floating.AlignPlacement;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.javaindex cd035926c8..52818d6108 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/GroupProfilePage.java@@ -16,7 +16,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.javaindex 5042c520ea..ee65ae755c 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/group/NewGroupPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.manager.GroupManager;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.javaindex f5beb57d01..0d598d9847 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java@@ -29,7 +29,7 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.inputspec.InputSpec;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.javaindex 37afd1c0d7..ee6d301f9e 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.web.editable.PropertyContext;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.javaindex 17317c1b42..dc0f9c76b7 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java@@ -4,7 +4,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.web.component.issue.statetransition.StateTransitionListPanel;import io.onedev.server.web.component.issue.statetransition.UseDefaultListener;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.javaindex 62234bfffb..8d450170d1 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java@@ -17,7 +17,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ValueSetEdit;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.javaindex 3b2ebd6ee7..2a3423999f 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java@@ -9,7 +9,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex f8e6b75388..4b785e4373 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -28,7 +28,7 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.behavior.sortable.SortBehavior;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.javaindex 486ac3c5c9..c13f14b539 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java@@ -30,7 +30,7 @@ import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.behavior.sortable.SortBehavior;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.javaindex b2cb24d685..357f59e4cc 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java@@ -10,7 +10,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.javaindex aed47bc342..0a5aed4b63 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java@@ -15,10 +15,10 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;+import io.onedev.server.notification.MailManager;import io.onedev.server.web.behavior.testform.TestFormBehavior;import io.onedev.server.web.behavior.testform.TestResult;import io.onedev.server.web.editable.BeanUpdating;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java b/core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.javaindex 15228ae221..00359956a0 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.SecuritySetting;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java b/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.javaindex b1f8c5b212..71ac4bbcc5 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java@@ -4,7 +4,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.SystemSetting;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.javaindex 3ab0ddbf91..a9389a6711 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/NewUserPage.java@@ -11,7 +11,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.javaindex 576344a9b3..b5b53c8cc6 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java@@ -39,9 +39,9 @@ import io.onedev.commons.utils.WordUtils;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserAuthorizationManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserAuthorizationManager;import io.onedev.server.model.Project;import io.onedev.server.model.UserAuthorization;import io.onedev.server.security.permission.ProjectPrivilege;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.javaindex b29c1c5c61..5e6e53804b 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.java@@ -28,7 +28,7 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.javaindex 304cfd9605..bdc9cec44f 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserMembershipsPage.java@@ -36,9 +36,9 @@ import org.hibernate.criterion.Restrictions;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.MembershipManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.MembershipManager;import io.onedev.server.model.Membership;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.facade.GroupFacade;diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex 65cdedcab0..42f7a7989c 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.userident.UserIdent;diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/core/src/main/java/io/onedev/server/web/page/base/BasePage.javaindex 15ba8a0d7a..2d6d82fb45 100644--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.java+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.java@@ -42,7 +42,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.WebSocketObserver;diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.cssindex 2a64ccdbe2..80bf877556 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css@@ -104,6 +104,7 @@ form .required {font-size: 16px;color: #B94A48;}+.bean-editor ul.feedbackPanel {margin: 10px 0;}diff --git a/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java b/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.javaindex 6feea46a02..493ab26cb5 100644--- a/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java+++ b/core/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java@@ -16,7 +16,7 @@ import io.onedev.commons.utils.init.InitStage;import io.onedev.commons.utils.init.ManualConfig;import io.onedev.commons.utils.init.Skippable;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.WebSession;diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 751bc2d708..fdc5e48ae1 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -22,7 +22,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.launcher.loader.Plugin;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.UserFacade;diff --git a/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.javaindex c71a0d8495..64c2870d71 100644--- a/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java@@ -9,7 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex af836c40ea..5772df380e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -24,8 +24,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.security.permission.ProjectPrivilege;import io.onedev.server.util.facade.GroupAuthorizationFacade;diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 370565cbd4..60cb763ef7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -28,9 +28,9 @@ import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.exception.OneException;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.floating.AlignPlacement;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex 98a35f0c6b..6b67f19678 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -54,6 +54,10 @@ import io.onedev.commons.jsymbol.TokenPosition;import io.onedev.commons.jsymbol.util.NoAntiCacheImage;import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;@@ -62,16 +66,12 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.exception.NotTreeException;import io.onedev.server.git.exception.ObjectAlreadyExistsException;import io.onedev.server.git.exception.ObsoleteCommitException;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.TextRange;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.search.code.CommitIndexed;import io.onedev.server.search.code.IndexManager;import io.onedev.server.search.code.SearchManager;@@ -1026,7 +1026,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext {String refName = refUpdated.getRefName();ObjectId oldCommitId = refUpdated.getOldCommitId();ObjectId newCommitId = refUpdated.getNewCommitId();- OneDev.getInstance(UnitOfWork.class).doAsync(new Runnable() {+ OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.javaindex 16c15c2d44..67107129ee 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java@@ -44,6 +44,8 @@ import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.Provider;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobChange;@@ -54,8 +56,6 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.exception.NotTreeException;import io.onedev.server.git.exception.ObjectAlreadyExistsException;import io.onedev.server.git.exception.ObsoleteCommitException;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.javaindex 2cc03ed7d1..df2b9a32c2 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java@@ -77,11 +77,11 @@ public abstract class DependencyEditPanel extends Panel {if (dependencyIndex != -1) {Dependency oldDependency = dependencies.get(dependencyIndex);- if (!dependency.getJob().equals(oldDependency.getJob()) && getDependency(dependency.getJob()) != null) {+ if (!dependency.getJobName().equals(oldDependency.getJobName()) && getDependency(dependency.getJobName()) != null) {editor.getErrorContext(new PathElement.Named("job")).addError("Dependency to this job is already defined");}- } else if (getDependency(dependency.getJob()) != null) {+ } else if (getDependency(dependency.getJobName()) != null) {editor.getErrorContext(new PathElement.Named("job")).addError("Dependency to this job is already defined");}@@ -121,7 +121,7 @@ public abstract class DependencyEditPanel extends Panel {private Dependency getDependency(String job) {for (Dependency dependency: dependencies) {- if (job.equals(dependency.getJob()))+ if (job.equals(dependency.getJobName()))return dependency;}return null;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.javaindex d3a91b13e0..8f0653388a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java@@ -128,7 +128,7 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>}};- link.add(new Label("label", rowModel.getObject().getJob()));+ link.add(new Label("label", rowModel.getObject().getJobName()));fragment.add(link);cellItem.add(fragment);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.javaindex 2e35ab8767..298a828811 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java@@ -56,7 +56,7 @@ public class DependencyListViewPanel extends Panel {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, rowModel.getObject().getJob());+ return new Label(componentId, rowModel.getObject().getJobName());}});@@ -146,7 +146,7 @@ public class DependencyListViewPanel extends Panel {@Overrideprotected String getTitle() {- return dependencies.get(index).getJob();+ return dependencies.get(index).getJobName();}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.javaindex 50cd63314f..c68c4e8b6a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java@@ -8,9 +8,9 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.link.Link;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.git.Blob;import io.onedev.server.git.Submodule;-import io.onedev.server.manager.SettingManager;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex f4baaaf917..d7f365fbab 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -12,8 +12,8 @@ import com.google.common.base.Charsets;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.MarkdownManager;import io.onedev.server.util.ContentDetector;+import io.onedev.server.util.markdown.MarkdownManager;import io.onedev.server.web.component.markdown.MarkdownEditor;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 31925acaff..6e5fd1ae2d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -65,12 +65,12 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.git.BlameBlock;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.BlameCommand;-import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.javaindex d6209bf013..a77316907e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java@@ -25,9 +25,9 @@ import com.google.common.base.Preconditions;import io.onedev.commons.utils.FileUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.BlobIdent;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 0bbdf996ef..eb3dbb834a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -54,11 +54,11 @@ import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.javaindex 1518cdee2f..264db3309e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java@@ -13,8 +13,8 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildQuerySettingManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.BuildQuerySettingManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.BuildQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedBuildQuery;diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.javaindex 99365292ee..7f0ee5bdac 100644--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java@@ -13,8 +13,8 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentQuerySettingManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.CodeCommentQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 93104ed9eb..a04b6ead0e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -38,12 +38,12 @@ import com.google.common.base.Preconditions;import com.google.common.collect.Sets;import io.onedev.server.OneDev;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.javaindex fe9225ec72..cbb65601ed 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java@@ -23,8 +23,8 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.stringmatch.PatternApplied;import io.onedev.commons.utils.stringmatch.WildcardUtils;import io.onedev.server.OneDev;+import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.git.NameAndEmail;-import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.model.Project;import io.onedev.server.search.commit.CommitQueryParser;import io.onedev.server.util.Constants;diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex 95d536e6a7..d7a21642ba 100644--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -48,13 +48,13 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.CommitQuerySettingManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.exception.OneException;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.command.RevListCommand;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.CommitQuerySettingManager;-import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Build;import io.onedev.server.model.CommitQuerySetting;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 99e8b246e5..ed4d6a4d06 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -30,9 +30,9 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.javaindex 1935116eac..1df7bc7741 100644--- a/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/info/ForkOptionPanel.java@@ -11,7 +11,7 @@ import org.apache.wicket.model.IModel;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.javaindex 58d0803b87..7ed65e4a06 100644--- a/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/info/ProjectInfoPanel.java@@ -18,8 +18,8 @@ import org.apache.wicket.model.Model;import org.eclipse.jgit.lib.Constants;import io.onedev.server.OneDev;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.UrlManager;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.UrlManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.javaindex 35b24b7eec..e6ee13b50a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex c4e322e7f0..68fc8fa976 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -23,8 +23,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueCriteria;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 061346f6e9..71e15cedbd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -21,8 +21,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.hibernate.Hibernate;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;@@ -203,7 +203,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {Issue issue = OneDev.getInstance(IssueManager.class).load(issueId);Hibernate.initialize(issue.getProject());Hibernate.initialize(issue.getMilestone());- Hibernate.initialize(issue.getFieldUnaries());+ Hibernate.initialize(issue.getFieldEntities());Hibernate.initialize(issue.getSubmitter());send(getPage(), Broadcast.BREADTH, new IssueDragging(target, issue));}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 80e4d7e540..fa7ab08500 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -30,11 +30,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.unbescape.html.HtmlEscape;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.exception.OneException;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex f3af8efc6c..eb73ecc267 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -26,11 +26,11 @@ import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentRelationInfoManager;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.cache.CodeCommentRelationInfoManager;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.build.BuildQuery;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.javaindex 3ee6317746..a881b56262 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java@@ -16,7 +16,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import com.google.common.collect.Sets;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex f9d30b229b..47807db8be 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -37,9 +37,9 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.MilestoneManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.exception.OneException;-import io.onedev.server.manager.MilestoneManager;-import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.javaindex d2181d7c2a..58b1f9ee62 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/MilestoneEditPanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.javaindex e346b383a4..4d3243ee20 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java@@ -11,7 +11,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.javaindex bd987eb1f8..f655b93d95 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewCardPanel.java@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueCriteria;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.javaindex e4d25300de..44cbb68efd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewMilestonePanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.javaindex 61770a8145..9e605e3868 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java@@ -12,8 +12,8 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueChangeManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.IssueChangeManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex 8285e3212d..85e992f96c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -10,8 +10,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex 36b00993bb..b5879a3279 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -26,11 +26,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentRelationInfoManager;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.cache.CodeCommentRelationInfoManager;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.javaindex 39ba1f3579..aba7e1d803 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java@@ -13,8 +13,8 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueQuerySettingManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.IssueQuerySettingManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.support.QuerySetting;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.javaindex d94fc33229..3b425a2ea5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.setting.GlobalIssueSetting;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.javaindex cb7646783d..d218a72592 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneActionsPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.web.component.milestone.closelink.MilestoneCloseLink;import io.onedev.server.web.component.milestone.deletelink.MilestoneDeleteLink;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex 3c124fa051..0a63c9eb03 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -14,7 +14,7 @@ import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.javaindex 88c5f085bc..1c0f926842 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneEditPage.java@@ -9,7 +9,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.javaindex ec752ef807..c0cd88b735 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.java@@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.javaindex a664262591..efcce8b703 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/NewMilestonePage.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.MilestoneManager;+import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.javaindex da63e1001b..9aa8f306ff 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java@@ -9,7 +9,7 @@ import javax.validation.constraints.NotNull;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.ChoiceProvider;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.javaindex 6dc56ab548..6989dc697a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java@@ -11,7 +11,7 @@ import org.hibernate.validator.constraints.NotEmpty;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.EditContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.javaindex f0b4b0d397..dc6adbed5e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java@@ -7,7 +7,7 @@ import java.util.stream.Collectors;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.javaindex ea82fe5e4d..bce6362946 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.javaindex 021ddf2fe2..7b99b06288 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java@@ -23,8 +23,8 @@ import org.apache.wicket.markup.repeater.RepeatingView;import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.javaindex e983c1269d..a9fa17d753 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/InvalidRequestPage.java@@ -12,7 +12,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.ProjectPage;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 4350fc3a4d..73d35f8f23 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -38,9 +38,9 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex a83d9aeedc..6b9478457d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -65,11 +65,11 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestChangeManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestUpdateManager;-import io.onedev.server.manager.PullRequestWatchManager;-import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestUpdateManager;+import io.onedev.server.entitymanager.PullRequestWatchManager;import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.javaindex ab05d1be16..a5a161d90a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java@@ -5,10 +5,10 @@ import javax.annotation.Nullable;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestReviewManager;-import io.onedev.server.manager.UserManager;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.User;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex 6ce252e95c..287a4b826a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -33,10 +33,10 @@ import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.manager.IssueManager;-import io.onedev.server.manager.PullRequestCommentManager;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.IssueManager;+import io.onedev.server.entitymanager.PullRequestCommentManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.javaindex 74cc7b3f83..1d64099e33 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/DiffAndCommentAwarePanel.java@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.panel.Panel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestChange;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.javaindex aa5fa5dc87..8d00197f36 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangeActivity.java@@ -6,7 +6,7 @@ import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.PullRequestChange;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.javaindex 15cfcfdaef..601176dab3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedActivity.java@@ -7,7 +7,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestCommentManager;+import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.model.PullRequestComment;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.javaindex 5504f9cf39..1a1ba496c9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestCommentedPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestCommentManager;+import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestComment;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.javaindex 8d5c14d9fe..cd4fd909ce 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedActivity.java@@ -6,7 +6,7 @@ import org.apache.wicket.Component;import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.PullRequest;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivity;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.javaindex 28fb8f0936..c429141f3a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;-import io.onedev.server.manager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex c684ad9dae..2b525e738c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -18,9 +18,9 @@ import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequestUpdate;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex f0022a582d..d3dbea2325 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -33,8 +33,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.javaindex a5788bdc0c..232f30ad97 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java@@ -11,7 +11,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.cache.UserInfoManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.javaindex a0681a4057..9510b21c84 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java@@ -24,8 +24,8 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.javaindex c06c82b054..1e58fb7c20 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java@@ -42,9 +42,9 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;-import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.PullRequestQuerySettingManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestQuerySettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestQuerySetting;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javaindex cd61662722..f762def9b3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -41,9 +41,9 @@ import io.onedev.commons.utils.WordUtils;import io.onedev.commons.utils.matchscore.MatchScoreProvider;import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.UserAuthorizationManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.entitymanager.UserAuthorizationManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.model.UserAuthorization;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.javaindex 7ced743c62..45205beb72 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.javaindex 733257b90d..3d243d5ed3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java@@ -8,7 +8,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.javaindex 73d2a3858a..d1ae1f80d0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationEditPage.java@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.ConfigurationManager;+import io.onedev.server.entitymanager.ConfigurationManager;import io.onedev.server.model.Configuration;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.javaindex 3a15ce1691..90e970c148 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.java@@ -31,8 +31,8 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import io.onedev.server.OneDev;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.ConfigurationManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.ConfigurationManager;import io.onedev.server.model.Configuration;import io.onedev.server.model.Project;import io.onedev.server.model.support.configuration.DoNotCleanup;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.javaindex ed7a26a8e5..f29c715432 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/NewConfigurationPage.java@@ -5,7 +5,7 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.ConfigurationManager;+import io.onedev.server.entitymanager.ConfigurationManager;import io.onedev.server.model.Configuration;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.javaindex d4faf387f8..c973398791 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java@@ -12,7 +12,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.web.component.project.ConfirmDeleteProjectModal;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.javaindex 2414bbdc2f..2ce0301f2d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java@@ -12,7 +12,7 @@ import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.issue.IssueSetting;import io.onedev.server.model.support.setting.GlobalIssueSetting;import io.onedev.server.web.component.tabbable.PageTab;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.javaindex 0b1ffd5dec..57ba8a1635 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.web.component.stringchoice.StringMultiChoice;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.javaindex 72d61e390b..7602f9f939 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java@@ -6,7 +6,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.web.component.issue.statetransition.StateTransitionListPanel;import io.onedev.server.web.component.issue.statetransition.UseDefaultListener;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.javaindex f3be6f27dc..b9c571b78a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java@@ -13,7 +13,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.support.TagProtection;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.javaindex 160f0eb837..14477341c8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.java@@ -9,7 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.web.editable.PropertyContext;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.page.project.setting.ProjectSettingPage;diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.javaindex 7cfc1227c1..60db9a4265 100644--- a/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java@@ -19,8 +19,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;+import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.git.Contribution;-import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Day;import io.onedev.server.util.userident.UserIdent;diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.javaindex b877ceb973..94cfd4b805 100644--- a/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java@@ -12,7 +12,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;-import io.onedev.server.manager.CommitInfoManager;+import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.util.Day;@SuppressWarnings("serial")diff --git a/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.javaindex b2197263bd..50d52be96d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java+++ b/core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java@@ -14,9 +14,9 @@ import org.apache.wicket.request.resource.AbstractResource;import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;+import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.git.Contribution;import io.onedev.server.git.Contributor;-import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 5a5fe4a950..72f39b5d7c 100644--- a/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -36,10 +36,10 @@ import org.eclipse.jgit.revwalk.RevTag;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;-import io.onedev.server.manager.BuildManager;import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.model.support.TagProtection;diff --git a/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java b/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.javaindex 0f18736f86..e8b4cd2818 100644--- a/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java+++ b/core/src/main/java/io/onedev/server/web/page/security/ForgetPage.java@@ -16,10 +16,10 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;+import io.onedev.server.notification.MailManager;import io.onedev.server.web.behavior.testform.TestFormBehavior;import io.onedev.server.web.behavior.testform.TestResult;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/security/LoginPage.java b/core/src/main/java/io/onedev/server/web/page/security/LoginPage.javaindex 1a59659d1d..5f81de0ddc 100644--- a/core/src/main/java/io/onedev/server/web/page/security/LoginPage.java+++ b/core/src/main/java/io/onedev/server/web/page/security/LoginPage.java@@ -21,10 +21,10 @@ import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.manager.MailManager;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;+import io.onedev.server.notification.MailManager;import io.onedev.server.web.WebSession;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.base.BasePage;diff --git a/core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java b/core/src/main/java/io/onedev/server/web/page/security/LogoutPage.javaindex 1967d11ad9..fb9e8860fc 100644--- a/core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java+++ b/core/src/main/java/io/onedev/server/web/page/security/LogoutPage.java@@ -4,7 +4,7 @@ import org.apache.wicket.RestartResponseException;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.base.BasePage;diff --git a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.javaindex 54a10cdcb7..b05ae0692d 100644--- a/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java+++ b/core/src/main/java/io/onedev/server/web/page/security/RegisterPage.java@@ -10,8 +10,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.editable.BeanContext;diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 66db87025c..107ca0b28e 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -6,6 +6,8 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.web.page.base.BasePage;@SuppressWarnings("serial")@@ -22,6 +24,14 @@ public class TestPage extends BasePage {@Overridepublic void onClick() {+ new Thread(new Runnable() {++ @Override+ public void run() {+ System.out.println(OneDev.getInstance(SessionManager.class).getSession());+ }++ }).start();}});diff --git a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.javaindex 6301b887dd..6f29074044 100644--- a/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java+++ b/core/src/main/java/io/onedev/server/web/util/ProjectAttachmentSupport.java@@ -16,11 +16,11 @@ import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.manager.AttachmentManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.storage.AttachmentManager;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.util.resource.AttachmentResource;@@ -76,12 +76,12 @@ public class ProjectAttachmentSupport implements AttachmentSupport {}private ProjectFacade getProject() {- UnitOfWork unitOfWork = OneDev.getInstance(UnitOfWork.class);- unitOfWork.begin();+ SessionManager sessionManager = OneDev.getInstance(SessionManager.class);+ sessionManager.openSession();try {return OneDev.getInstance(ProjectManager.class).load(projectId).getFacade();} finally {- unitOfWork.end();+ sessionManager.closeSession();}}diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex 86ba3bd1e9..65de2a140f 100644--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -19,13 +19,13 @@ import io.onedev.commons.utils.Range;import io.onedev.commons.utils.stringmatch.PatternApplied;import io.onedev.commons.utils.stringmatch.WildcardUtils;import io.onedev.server.OneDev;+import io.onedev.server.cache.CacheManager;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.entitymanager.BuildManager;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;-import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.CacheManager;-import io.onedev.server.manager.CommitInfoManager;-import io.onedev.server.manager.GroupManager;-import io.onedev.server.manager.IssueManager;import io.onedev.server.model.Build;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;diff --git a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.javaindex cd63d6b6ed..e6cadbff2d 100644--- a/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java+++ b/core/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java@@ -19,8 +19,8 @@ import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.manager.SettingManager;-import io.onedev.server.manager.UserManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.util.facade.ProjectFacade;diff --git a/core/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java b/core/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.javaindex a9aa054009..8c4707030b 100644--- a/core/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java+++ b/core/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java@@ -21,7 +21,7 @@ import com.google.common.base.Charsets;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java b/core/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.javaindex d826fc0206..51aea8911a 100644--- a/core/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java+++ b/core/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java@@ -17,10 +17,10 @@ import org.apache.wicket.request.resource.AbstractResource;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;-import io.onedev.server.manager.AttachmentManager;-import io.onedev.server.manager.ProjectManager;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.storage.AttachmentManager;import io.onedev.server.util.facade.ProjectFacade;public class AttachmentResource extends AbstractResource {diff --git a/core/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java b/core/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.javaindex d529a6b72c..46c9cfc80c 100644--- a/core/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java+++ b/core/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java@@ -22,10 +22,10 @@ import com.google.common.base.Charsets;import com.google.common.base.Preconditions;import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;diff --git a/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java b/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.javaindex 9f701fd006..e24cfe9fe5 100644--- a/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java+++ b/core/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java@@ -20,8 +20,8 @@ import org.apache.wicket.protocol.ws.api.registry.PageIdKey;import org.apache.wicket.protocol.ws.api.registry.SimpleWebSocketConnectionRegistry;import org.eclipse.jetty.websocket.api.WebSocketPolicy;+import io.onedev.server.persistence.TransactionManager;import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.dao.Dao;import io.onedev.server.web.page.base.BasePage;@Singleton@@ -29,7 +29,7 @@ public class DefaultWebSocketManager implements WebSocketManager {private final Application application;- private final Dao dao;+ private final TransactionManager transactionManager;private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(1);@@ -40,9 +40,9 @@ public class DefaultWebSocketManager implements WebSocketManager {private final IWebSocketConnectionRegistry connectionRegistry = new SimpleWebSocketConnectionRegistry();@Inject- public DefaultWebSocketManager(Application application, Dao dao, WebSocketPolicy webSocketPolicy) {+ public DefaultWebSocketManager(Application application, TransactionManager transactionManager, WebSocketPolicy webSocketPolicy) {this.application = application;- this.dao = dao;+ this.transactionManager = transactionManager;this.webSocketPolicy = webSocketPolicy;}@@ -67,7 +67,7 @@ public class DefaultWebSocketManager implements WebSocketManager {@Sessional@Overridepublic void notifyObservableChange(String observable, @Nullable PageKey sourcePageKey) {- dao.doAfterCommit(new Runnable() {+ transactionManager.runAfterCommit(new Runnable() {@Overridepublic void run() {diff --git a/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java b/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.javaindex 94695e4aaa..4cfe605a66 100644--- a/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java+++ b/core/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.server.OneDev;-import io.onedev.server.persistence.UnitOfWork;+import io.onedev.server.persistence.SessionManager;/*** An {@link org.apache.wicket.protocol.ws.api.IWebSocketProcessor processor} that integrates with@@ -76,15 +76,15 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements Weprivate void run(Runnable runnable) {if (OneDev.getInstance().isReady()) {- UnitOfWork unitOfWork = AppLoader.getInstance(UnitOfWork.class);- unitOfWork.begin();+ SessionManager sessionManager = AppLoader.getInstance(SessionManager.class);+ sessionManager.openSession();try {Subject subject = (Subject) request.getHttpServletRequest().getAttribute(WebSocketFilter.SHIRO_SUBJECT);ThreadContext.bind(subject);runnable.run();} finally {ThreadContext.unbindSubject();- unitOfWork.end();+ sessionManager.closeSession();}}}diff --git a/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java b/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.javanew file mode 100644index 0000000000..6ccf567cf1--- /dev/null+++ b/core/src/test/java/io/onedev/server/util/MatrixRunnerTest.java@@ -0,0 +1,67 @@+package io.onedev.server.util;++import static org.junit.Assert.assertEquals;+import static org.junit.Assert.assertTrue;++import java.util.ArrayList;+import java.util.HashMap;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import org.junit.Test;++import com.google.common.collect.Lists;++public class MatrixRunnerTest {++ @Test+ public void test() {+ Map<String, List<String>> matrix = new LinkedHashMap<>();++ List<Map<String, String>> usedParams = new ArrayList<>();+ new MatrixRunner(matrix).run(new MatrixRunner.Runnable() {++ @Override+ public void run(Map<String, String> params) {+ usedParams.add(params);+ }++ });++ assertEquals(1, usedParams.size());+ assertTrue(usedParams.iterator().next().isEmpty());++ matrix.put("db", Lists.newArrayList("oracle", "mysql"));+ matrix.put("os", Lists.newArrayList("windows", "linux"));++ usedParams.clear();++ new MatrixRunner(matrix).run(new MatrixRunner.Runnable() {++ @Override+ public void run(Map<String, String> params) {+ usedParams.add(params);+ }++ });+ assertEquals(4, usedParams.size());+ Map<String, String> params = new HashMap<>();+ params.put("db", "oracle");+ params.put("os", "windows");+ assertEquals(params, usedParams.get(0));++ params.put("db", "oracle");+ params.put("os", "linux");+ assertEquals(params, usedParams.get(1));++ params.put("db", "mysql");+ params.put("os", "windows");+ assertEquals(params, usedParams.get(2));++ params.put("db", "mysql");+ params.put("os", "linux");+ assertEquals(params, usedParams.get(3));+ }++}