The Unified and Autonomous Development Platform
Fix project mysterious updating issue
Robin Shende33b64c6b46
diff --git a/core/src/main/java/io/onedev/server/cache/CacheManager.java b/core/src/main/java/io/onedev/server/cache/CacheManager.javaindex 540994a2e3..f77f85d39d 100644--- a/core/src/main/java/io/onedev/server/cache/CacheManager.java+++ b/core/src/main/java/io/onedev/server/cache/CacheManager.java@@ -1,72 +1,72 @@-package io.onedev.server.cache;--import java.util.Collection;-import java.util.Map;--import javax.annotation.Nullable;--import io.onedev.server.util.facade.ConfigurationFacade;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.util.facade.UserFacade;--public interface CacheManager {-- Map<Long, ProjectFacade> getProjects();-- Map<Long, UserFacade> getUsers();-- Map<Long, GroupFacade> getGroups();-- Map<Long, UserAuthorizationFacade> getUserAuthorizations();-- Map<Long, GroupAuthorizationFacade> getGroupAuthorizations();-- Map<Long, MembershipFacade> getMemberships();-- Map<Long, ConfigurationFacade> getConfigurations();-- @Nullable- ProjectFacade getProject(Long id);-- @Nullable- UserFacade getUser(Long id);-- @Nullable- GroupFacade getGroup(Long id);-- @Nullable- MembershipFacade getMembership(Long id);-- @Nullable- Long getUserIdByName(String name);-- @Nullable- Long getUserIdByEmail(String email);-- @Nullable- UserAuthorizationFacade getUserAuthorization(Long id);-- @Nullable- GroupAuthorizationFacade getGroupAuthorization(Long id);-- @Nullable- Long getGroupIdByName(String name);-- Map<String, Long> getProjectIds();-- @Nullable- Long getProjectIdByName(String name);-- Collection<Long> getIssueNumbers(Long projectId);-- Collection<Long> getBuildIdsByProject(Long projectId);-- Collection<Long> getBuildIdsByConfiguration(Long configurationId);-- Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes);--}+package io.onedev.server.cache;++import java.util.Collection;+import java.util.Map;++import javax.annotation.Nullable;++import io.onedev.server.util.facade.ConfigurationFacade;+import io.onedev.server.util.facade.GroupAuthorizationFacade;+import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.facade.MembershipFacade;+import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.util.facade.UserAuthorizationFacade;+import io.onedev.server.util.facade.UserFacade;++public interface CacheManager {++ Map<Long, ProjectFacade> getProjects();++ Map<Long, UserFacade> getUsers();++ Map<Long, GroupFacade> getGroups();++ Map<Long, UserAuthorizationFacade> getUserAuthorizations();++ Map<Long, GroupAuthorizationFacade> getGroupAuthorizations();++ Map<Long, MembershipFacade> getMemberships();++ Map<Long, ConfigurationFacade> getConfigurations();++ @Nullable+ ProjectFacade getProject(Long id);++ @Nullable+ UserFacade getUser(Long id);++ @Nullable+ GroupFacade getGroup(Long id);++ @Nullable+ MembershipFacade getMembership(Long id);++ @Nullable+ Long getUserIdByName(String name);++ @Nullable+ Long getUserIdByEmail(String email);++ @Nullable+ UserAuthorizationFacade getUserAuthorization(Long id);++ @Nullable+ GroupAuthorizationFacade getGroupAuthorization(Long id);++ @Nullable+ Long getGroupIdByName(String name);++ Map<String, Long> getProjectIds();++ @Nullable+ Long getProjectIdByName(String name);++ Collection<Long> getIssueNumbers(Long projectId);++ Collection<Long> getBuildIdsByProject(Long projectId);++ Collection<Long> getBuildIdsByConfiguration(Long configurationId);++ Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes);++}diff --git a/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.javaindex c329b3cca2..b4ecb09853 100644--- a/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java+++ b/core/src/main/java/io/onedev/server/cache/DefaultCacheManager.java@@ -1,690 +1,690 @@-package io.onedev.server.cache;--import java.util.Collection;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.concurrent.locks.ReadWriteLock;-import java.util.concurrent.locks.ReentrantReadWriteLock;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.query.Query;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.collect.BiMap;-import com.google.common.collect.HashBiMap;--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.model.Build;-import io.onedev.server.model.Configuration;-import io.onedev.server.model.Group;-import io.onedev.server.model.GroupAuthorization;-import io.onedev.server.model.Issue;-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;-import io.onedev.server.util.facade.BuildFacade;-import io.onedev.server.util.facade.ConfigurationFacade;-import io.onedev.server.util.facade.EntityFacade;-import io.onedev.server.util.facade.GroupAuthorizationFacade;-import io.onedev.server.util.facade.GroupFacade;-import io.onedev.server.util.facade.IssueFacade;-import io.onedev.server.util.facade.MembershipFacade;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserAuthorizationFacade;-import io.onedev.server.util.facade.UserFacade;--@Singleton-public class DefaultCacheManager implements CacheManager {-- private final Logger logger = LoggerFactory.getLogger(DefaultCacheManager.class);-- private final Dao dao;-- private final TransactionManager transactionManager;-- private final Map<Long, UserFacade> users = new HashMap<>();-- private final BiMap<String, Long> userIdsByName = HashBiMap.create();-- private final BiMap<String, Long> userIdsByEmail = HashBiMap.create();-- private final ReadWriteLock usersLock = new ReentrantReadWriteLock();-- private final Map<Long, ProjectFacade> projects = new HashMap<>();-- private final BiMap<String, Long> projectIdsByName = HashBiMap.create();-- private final ReadWriteLock projectsLock = new ReentrantReadWriteLock();-- private final Map<Long, GroupFacade> groups = new HashMap<>();-- private final BiMap<String, Long> groupIdsByName = HashBiMap.create();-- private final ReadWriteLock groupsLock = new ReentrantReadWriteLock();-- private final Map<Long, MembershipFacade> memberships = new HashMap<>();-- private final ReadWriteLock membershipsLock = new ReentrantReadWriteLock();-- private final Map<Long, ConfigurationFacade> configurations = new HashMap<>();-- private final ReadWriteLock configurationsLock = new ReentrantReadWriteLock();-- private final Map<Long, BuildFacade> builds= new HashMap<>();-- private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();-- private final Map<Long, IssueFacade> issues = new HashMap<>();-- private final ReadWriteLock issuesLock = new ReentrantReadWriteLock();-- private final Map<Long, GroupAuthorizationFacade> groupAuthorizations = new HashMap<>();-- private final ReadWriteLock groupAuthorizationsLock = new ReentrantReadWriteLock();-- private final Map<Long, UserAuthorizationFacade> userAuthorizations = new HashMap<>();-- private final ReadWriteLock userAuthorizationsLock = new ReentrantReadWriteLock();-- @Inject- public DefaultCacheManager(Dao dao, TransactionManager transactionManager) {- this.dao = dao;- this.transactionManager = transactionManager;- }-- @SuppressWarnings("unchecked")- @Sessional- @Listen- public void on(SystemStarted event) {- logger.info("Caching meta data...");- for (Project project: dao.query(Project.class)) {- projects.put(project.getId(), project.getFacade());- projectIdsByName.inverse().put(project.getId(), project.getName());- }- for (User user: dao.query(User.class)) {- users.put(user.getId(), user.getFacade());- userIdsByName.inverse().put(user.getId(), user.getName());- if (user.getEmail() != null)- userIdsByEmail.inverse().put(user.getId(), user.getEmail());- }- for (Group group: dao.query(Group.class)) {- groups.put(group.getId(), group.getFacade());- groupIdsByName.inverse().put(group.getId(), group.getName());- }-- for (Membership membership: dao.query(Membership.class))- memberships.put(membership.getId(), membership.getFacade());-- for (Configuration configuration: dao.query(Configuration.class))- configurations.put(configuration.getId(), configuration.getFacade());-- 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.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]));- }-- for (GroupAuthorization groupAuthorization: dao.query(GroupAuthorization.class))- groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization.getFacade());- for (UserAuthorization userAuthorization: dao.query(UserAuthorization.class))- userAuthorizations.put(userAuthorization.getId(), userAuthorization.getFacade());- }-- @Transactional- @Listen- public void on(EntityPersisted event) {- EntityFacade facade;-- if (event.getEntity() instanceof Project) {- facade = ((Project) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof User) {- facade = ((User) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Group) {- facade = ((Group) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Membership) {- facade = ((Membership) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Build) {- facade = ((Build)event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Issue) {- facade = ((Issue)event.getEntity()).getFacade();- } else if (event.getEntity() instanceof Configuration) {- facade = ((Configuration)event.getEntity()).getFacade();- } else if (event.getEntity() instanceof UserAuthorization) {- facade = ((UserAuthorization) event.getEntity()).getFacade();- } else if (event.getEntity() instanceof GroupAuthorization) {- facade = ((GroupAuthorization) event.getEntity()).getFacade();- } else {- facade = null;- }-- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- if (facade instanceof ProjectFacade) {- ProjectFacade project = (ProjectFacade) facade;- projectsLock.writeLock().lock();- try {- projects.put(project.getId(), project);- projectIdsByName.inverse().put(project.getId(), project.getName());- } finally {- projectsLock.writeLock().unlock();- }- } else if (facade instanceof UserFacade) {- UserFacade user = (UserFacade) facade;- usersLock.writeLock().lock();- try {- users.put(user.getId(), user);- userIdsByName.inverse().put(user.getId(), user.getName());- if (user.getEmail() != null)- userIdsByEmail.inverse().put(user.getId(), user.getEmail());- } finally {- usersLock.writeLock().unlock();- }- } else if (facade instanceof GroupFacade) {- GroupFacade group = (GroupFacade) facade;- groupsLock.writeLock().lock();- try {- groups.put(group.getId(), group);- groupIdsByName.inverse().put(group.getId(), group.getName());- } finally {- groupsLock.writeLock().unlock();- }- } else if (facade instanceof ConfigurationFacade) {- ConfigurationFacade configuration = (ConfigurationFacade) facade;- configurationsLock.writeLock().lock();- try {- configurations.put(configuration.getId(), configuration);- } finally {- configurationsLock.writeLock().unlock();- }- } else if (facade instanceof IssueFacade) {- IssueFacade issue = (IssueFacade) facade;- issuesLock.writeLock().lock();- try {- issues.put(issue.getId(), issue);- } finally {- issuesLock.writeLock().unlock();- }- } else if (facade instanceof BuildFacade) {- BuildFacade build = (BuildFacade) facade;- buildsLock.writeLock().lock();- try {- builds.put(build.getId(), build);- } finally {- buildsLock.writeLock().unlock();- }- } else if (facade instanceof MembershipFacade) {- MembershipFacade membership = (MembershipFacade) facade;- membershipsLock.writeLock().lock();- try {- memberships.put(membership.getId(), membership);- } finally {- membershipsLock.writeLock().unlock();- }- } else if (facade instanceof UserAuthorizationFacade) {- UserAuthorizationFacade userAuthorization = (UserAuthorizationFacade) facade;- userAuthorizationsLock.writeLock().lock();- try {- userAuthorizations.put(userAuthorization.getId(), userAuthorization);- } finally {- userAuthorizationsLock.writeLock().unlock();- }- } else if (facade instanceof GroupAuthorizationFacade) {- GroupAuthorizationFacade groupAuthorization = (GroupAuthorizationFacade) facade;- groupAuthorizationsLock.writeLock().lock();- try {- groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization);- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- }- }-- });-- }-- @Transactional- @Listen- public void on(EntityRemoved event) {- Long id = event.getEntity().getId();- Class<?> clazz = event.getEntity().getClass();-- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- if (Project.class.isAssignableFrom(clazz)) {- projectsLock.writeLock().lock();- try {- projects.remove(id);- projectIdsByName.inverse().remove(id);- } finally {- projectsLock.writeLock().unlock();- }- userAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getProjectId().equals(id))- it.remove();- }- } finally {- userAuthorizationsLock.writeLock().unlock();- }- groupAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getProjectId().equals(id))- it.remove();- }- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- configurationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, ConfigurationFacade>> it = configurations.entrySet().iterator(); it.hasNext();) {- ConfigurationFacade configuration = it.next().getValue();- if (configuration.getProjectId().equals(id)) {- it.remove();- buildsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, BuildFacade>> it2 = builds.entrySet().iterator(); it2.hasNext();) {- if (it2.next().getValue().getConfigurationId().equals(configuration.getId()))- it2.remove();- }- } finally {- buildsLock.writeLock().unlock();- }- }- }- } finally {- configurationsLock.writeLock().unlock();- }- issuesLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, IssueFacade>> it = issues.entrySet().iterator(); it.hasNext();) {- IssueFacade issue = it.next().getValue();- if (issue.getProjectId().equals(id))- it.remove();- }- } finally {- issuesLock.writeLock().unlock();- }- } else if (User.class.isAssignableFrom(clazz)) {- usersLock.writeLock().lock();- try {- users.remove(id);- userIdsByName.inverse().remove(id);- userIdsByEmail.inverse().remove(id);- } finally {- usersLock.writeLock().unlock();- }- userAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getUserId().equals(id))- it.remove();- }- } finally {- userAuthorizationsLock.writeLock().unlock();- }- membershipsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getUserId().equals(id))- it.remove();- }- } finally {- membershipsLock.writeLock().unlock();- }- } else if (Group.class.isAssignableFrom(clazz)) {- groupsLock.writeLock().lock();- try {- groups.remove(id);- groupIdsByName.inverse().remove(id);- } finally {- groupsLock.writeLock().unlock();- }- groupAuthorizationsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getGroupId().equals(id))- it.remove();- }- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- membershipsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getGroupId().equals(id))- it.remove();- }- } finally {- membershipsLock.writeLock().unlock();- }- } else if (Configuration.class.isAssignableFrom(clazz)) {- configurationsLock.writeLock().lock();- try {- configurations.remove(id);- } finally {- configurationsLock.writeLock().unlock();- }- buildsLock.writeLock().lock();- try {- for (Iterator<Map.Entry<Long, BuildFacade>> it = builds.entrySet().iterator(); it.hasNext();) {- if (it.next().getValue().getConfigurationId().equals(id))- it.remove();- }- } finally {- buildsLock.writeLock().unlock();- }- } else if (Build.class.isAssignableFrom(clazz)) {- buildsLock.writeLock().lock();- try {- builds.remove(id);- } finally {- buildsLock.writeLock().unlock();- }- } else if (Issue.class.isAssignableFrom(clazz)) {- issuesLock.writeLock().lock();- try {- issues.remove(id);- } finally {- issuesLock.writeLock().unlock();- }- } else if (Membership.class.isAssignableFrom(clazz)) {- membershipsLock.writeLock().lock();- try {- memberships.remove(id);- } finally {- membershipsLock.writeLock().unlock();- }- } else if (UserAuthorization.class.isAssignableFrom(clazz)) {- userAuthorizationsLock.writeLock().lock();- try {- userAuthorizations.remove(id);- } finally {- userAuthorizationsLock.writeLock().unlock();- }- } else if (GroupAuthorization.class.isAssignableFrom(clazz)) {- groupAuthorizationsLock.writeLock().lock();- try {- groupAuthorizations.remove(id);- } finally {- groupAuthorizationsLock.writeLock().unlock();- }- }- }- });- }-- @Override- public Map<Long, ProjectFacade> getProjects() {- projectsLock.readLock().lock();- try {- return new HashMap<>(projects);- } finally {- projectsLock.readLock().unlock();- }- }-- @Override- public Map<Long, UserFacade> getUsers() {- usersLock.readLock().lock();- try {- return new HashMap<>(users);- } finally {- usersLock.readLock().unlock();- }- }-- public Map<Long, GroupFacade> getGroups() {- groupsLock.readLock().lock();- try {- return new HashMap<>(groups);- } finally {- groupsLock.readLock().unlock();- }- }-- @Override- public Map<Long, MembershipFacade> getMemberships() {- membershipsLock.readLock().lock();- try {- return new HashMap<>(memberships);- } finally {- membershipsLock.readLock().unlock();- }- }-- @Override- public ProjectFacade getProject(Long id) {- projectsLock.readLock().lock();- try {- return projects.get(id);- } finally {- projectsLock.readLock().unlock();- }- }-- @Override- public UserFacade getUser(Long id) {- usersLock.readLock().lock();- try {- return users.get(id);- } finally {- usersLock.readLock().unlock();- }- }-- @Override- public Long getUserIdByName(String name) {- usersLock.readLock().lock();- try {- return userIdsByName.get(name);- } finally {- usersLock.readLock().unlock();- }- }-- @Override- public Long getUserIdByEmail(String email) {- usersLock.readLock().lock();- try {- return userIdsByEmail.get(email);- } finally {- usersLock.readLock().unlock();- }- }-- @Override- public Long getProjectIdByName(String name) {- projectsLock.readLock().lock();- try {- return projectIdsByName.get(name);- } finally {- projectsLock.readLock().unlock();- }- }-- @Override- public Map<String, Long> getProjectIds() {- projectsLock.readLock().lock();- try {- return new HashMap<>(projectIdsByName);- } finally {- projectsLock.readLock().unlock();- }- }-- @Override- public Long getGroupIdByName(String name) {- groupsLock.readLock().lock();- try {- return groupIdsByName.get(name);- } finally {- groupsLock.readLock().unlock();- }- }-- @Override- public GroupFacade getGroup(Long id) {- groupsLock.readLock().lock();- try {- return groups.get(id);- } finally {- groupsLock.readLock().unlock();- }- }-- @Override- public MembershipFacade getMembership(Long id) {- membershipsLock.readLock().lock();- try {- return memberships.get(id);- } finally {- membershipsLock.readLock().unlock();- }- }-- @Override- public Collection<Long> getIssueNumbers(Long projectId) {- issuesLock.readLock().lock();- try {- Collection<Long> issueNumbers = new HashSet<>();- for (IssueFacade issue: issues.values()) {- if (projectId.equals(issue.getProjectId()))- issueNumbers.add(issue.getNumber());- }- return issueNumbers;- } finally {- issuesLock.readLock().unlock();- }- }-- @Override- public Collection<Long> getBuildIdsByProject(Long projectId) {- buildsLock.readLock().lock();- configurationsLock.readLock().lock();- try {- Collection<Long> buildIds = new HashSet<>();- for (BuildFacade build: builds.values()) {- ConfigurationFacade configuration = configurations.get(build.getConfigurationId());- if (configuration != null && configuration.getProjectId().equals(projectId))- buildIds.add(build.getId());- }- return buildIds;- } finally {- configurationsLock.readLock().unlock();- buildsLock.readLock().unlock();- }- }-- @Override- public Collection<Long> getBuildIdsByConfiguration(Long configurationId) {- buildsLock.readLock().lock();- try {- Collection<Long> buildIds = new HashSet<>();- for (BuildFacade build: builds.values()) {- if (build.getConfigurationId().equals(configurationId))- buildIds.add(build.getId());- }- return buildIds;- } finally {- buildsLock.readLock().unlock();- }- }-- @Override- public Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes) {- buildsLock.readLock().lock();- configurationsLock.readLock().lock();- try {- Collection<Long> buildIds = new HashSet<>();- for (BuildFacade build: builds.values()) {- ConfigurationFacade configuration = configurations.get(build.getConfigurationId());- if (configuration != null && configuration.getProjectId().equals(projectId)- && commitHashes.contains(build.getCommitHash())) {- buildIds.add(build.getId());- }- }- return buildIds;- } finally {- configurationsLock.readLock().unlock();- buildsLock.readLock().unlock();- }- }-- @Override- public Map<Long, ConfigurationFacade> getConfigurations() {- configurationsLock.readLock().lock();- try {- return new HashMap<>(configurations);- } finally {- configurationsLock.readLock().unlock();- }- }-- @Override- public Map<Long, UserAuthorizationFacade> getUserAuthorizations() {- userAuthorizationsLock.readLock().lock();- try {- return new HashMap<>(userAuthorizations);- } finally {- userAuthorizationsLock.readLock().unlock();- }- }-- @Override- public Map<Long, GroupAuthorizationFacade> getGroupAuthorizations() {- groupAuthorizationsLock.readLock().lock();- try {- return new HashMap<>(groupAuthorizations);- } finally {- groupAuthorizationsLock.readLock().unlock();- }- }-- @Override- public UserAuthorizationFacade getUserAuthorization(Long id) {- userAuthorizationsLock.readLock().lock();- try {- return userAuthorizations.get(id);- } finally {- userAuthorizationsLock.readLock().unlock();- }- }-- @Override- public GroupAuthorizationFacade getGroupAuthorization(Long id) {- groupAuthorizationsLock.readLock().lock();- try {- return groupAuthorizations.get(id);- } finally {- groupAuthorizationsLock.readLock().unlock();- }- }--}+package io.onedev.server.cache;++import java.util.Collection;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.concurrent.locks.ReentrantReadWriteLock;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.query.Query;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.collect.BiMap;+import com.google.common.collect.HashBiMap;++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.model.Build;+import io.onedev.server.model.Configuration;+import io.onedev.server.model.Group;+import io.onedev.server.model.GroupAuthorization;+import io.onedev.server.model.Issue;+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;+import io.onedev.server.util.facade.BuildFacade;+import io.onedev.server.util.facade.ConfigurationFacade;+import io.onedev.server.util.facade.EntityFacade;+import io.onedev.server.util.facade.GroupAuthorizationFacade;+import io.onedev.server.util.facade.GroupFacade;+import io.onedev.server.util.facade.IssueFacade;+import io.onedev.server.util.facade.MembershipFacade;+import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.util.facade.UserAuthorizationFacade;+import io.onedev.server.util.facade.UserFacade;++@Singleton+public class DefaultCacheManager implements CacheManager {++ private final Logger logger = LoggerFactory.getLogger(DefaultCacheManager.class);++ private final Dao dao;++ private final TransactionManager transactionManager;++ private final Map<Long, UserFacade> users = new HashMap<>();++ private final BiMap<String, Long> userIdsByName = HashBiMap.create();++ private final BiMap<String, Long> userIdsByEmail = HashBiMap.create();++ private final ReadWriteLock usersLock = new ReentrantReadWriteLock();++ private final Map<Long, ProjectFacade> projects = new HashMap<>();++ private final BiMap<String, Long> projectIdsByName = HashBiMap.create();++ private final ReadWriteLock projectsLock = new ReentrantReadWriteLock();++ private final Map<Long, GroupFacade> groups = new HashMap<>();++ private final BiMap<String, Long> groupIdsByName = HashBiMap.create();++ private final ReadWriteLock groupsLock = new ReentrantReadWriteLock();++ private final Map<Long, MembershipFacade> memberships = new HashMap<>();++ private final ReadWriteLock membershipsLock = new ReentrantReadWriteLock();++ private final Map<Long, ConfigurationFacade> configurations = new HashMap<>();++ private final ReadWriteLock configurationsLock = new ReentrantReadWriteLock();++ private final Map<Long, BuildFacade> builds= new HashMap<>();++ private final ReadWriteLock buildsLock = new ReentrantReadWriteLock();++ private final Map<Long, IssueFacade> issues = new HashMap<>();++ private final ReadWriteLock issuesLock = new ReentrantReadWriteLock();++ private final Map<Long, GroupAuthorizationFacade> groupAuthorizations = new HashMap<>();++ private final ReadWriteLock groupAuthorizationsLock = new ReentrantReadWriteLock();++ private final Map<Long, UserAuthorizationFacade> userAuthorizations = new HashMap<>();++ private final ReadWriteLock userAuthorizationsLock = new ReentrantReadWriteLock();++ @Inject+ public DefaultCacheManager(Dao dao, TransactionManager transactionManager) {+ this.dao = dao;+ this.transactionManager = transactionManager;+ }++ @SuppressWarnings("unchecked")+ @Sessional+ @Listen+ public void on(SystemStarted event) {+ logger.info("Caching meta data...");+ for (Project project: dao.query(Project.class)) {+ projects.put(project.getId(), project.getFacade());+ projectIdsByName.inverse().put(project.getId(), project.getName());+ }+ for (User user: dao.query(User.class)) {+ users.put(user.getId(), user.getFacade());+ userIdsByName.inverse().put(user.getId(), user.getName());+ if (user.getEmail() != null)+ userIdsByEmail.inverse().put(user.getId(), user.getEmail());+ }+ for (Group group: dao.query(Group.class)) {+ groups.put(group.getId(), group.getFacade());+ groupIdsByName.inverse().put(group.getId(), group.getName());+ }++ for (Membership membership: dao.query(Membership.class))+ memberships.put(membership.getId(), membership.getFacade());++ for (Configuration configuration: dao.query(Configuration.class))+ configurations.put(configuration.getId(), configuration.getFacade());++ 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.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]));+ }++ for (GroupAuthorization groupAuthorization: dao.query(GroupAuthorization.class))+ groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization.getFacade());+ for (UserAuthorization userAuthorization: dao.query(UserAuthorization.class))+ userAuthorizations.put(userAuthorization.getId(), userAuthorization.getFacade());+ }++ @Transactional+ @Listen+ public void on(EntityPersisted event) {+ EntityFacade facade;++ if (event.getEntity() instanceof Project) {+ facade = ((Project) event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof User) {+ facade = ((User) event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof Group) {+ facade = ((Group) event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof Membership) {+ facade = ((Membership) event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof Build) {+ facade = ((Build)event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof Issue) {+ facade = ((Issue)event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof Configuration) {+ facade = ((Configuration)event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof UserAuthorization) {+ facade = ((UserAuthorization) event.getEntity()).getFacade();+ } else if (event.getEntity() instanceof GroupAuthorization) {+ facade = ((GroupAuthorization) event.getEntity()).getFacade();+ } else {+ facade = null;+ }++ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ if (facade instanceof ProjectFacade) {+ ProjectFacade project = (ProjectFacade) facade;+ projectsLock.writeLock().lock();+ try {+ projects.put(project.getId(), project);+ projectIdsByName.inverse().put(project.getId(), project.getName());+ } finally {+ projectsLock.writeLock().unlock();+ }+ } else if (facade instanceof UserFacade) {+ UserFacade user = (UserFacade) facade;+ usersLock.writeLock().lock();+ try {+ users.put(user.getId(), user);+ userIdsByName.inverse().put(user.getId(), user.getName());+ if (user.getEmail() != null)+ userIdsByEmail.inverse().put(user.getId(), user.getEmail());+ } finally {+ usersLock.writeLock().unlock();+ }+ } else if (facade instanceof GroupFacade) {+ GroupFacade group = (GroupFacade) facade;+ groupsLock.writeLock().lock();+ try {+ groups.put(group.getId(), group);+ groupIdsByName.inverse().put(group.getId(), group.getName());+ } finally {+ groupsLock.writeLock().unlock();+ }+ } else if (facade instanceof ConfigurationFacade) {+ ConfigurationFacade configuration = (ConfigurationFacade) facade;+ configurationsLock.writeLock().lock();+ try {+ configurations.put(configuration.getId(), configuration);+ } finally {+ configurationsLock.writeLock().unlock();+ }+ } else if (facade instanceof IssueFacade) {+ IssueFacade issue = (IssueFacade) facade;+ issuesLock.writeLock().lock();+ try {+ issues.put(issue.getId(), issue);+ } finally {+ issuesLock.writeLock().unlock();+ }+ } else if (facade instanceof BuildFacade) {+ BuildFacade build = (BuildFacade) facade;+ buildsLock.writeLock().lock();+ try {+ builds.put(build.getId(), build);+ } finally {+ buildsLock.writeLock().unlock();+ }+ } else if (facade instanceof MembershipFacade) {+ MembershipFacade membership = (MembershipFacade) facade;+ membershipsLock.writeLock().lock();+ try {+ memberships.put(membership.getId(), membership);+ } finally {+ membershipsLock.writeLock().unlock();+ }+ } else if (facade instanceof UserAuthorizationFacade) {+ UserAuthorizationFacade userAuthorization = (UserAuthorizationFacade) facade;+ userAuthorizationsLock.writeLock().lock();+ try {+ userAuthorizations.put(userAuthorization.getId(), userAuthorization);+ } finally {+ userAuthorizationsLock.writeLock().unlock();+ }+ } else if (facade instanceof GroupAuthorizationFacade) {+ GroupAuthorizationFacade groupAuthorization = (GroupAuthorizationFacade) facade;+ groupAuthorizationsLock.writeLock().lock();+ try {+ groupAuthorizations.put(groupAuthorization.getId(), groupAuthorization);+ } finally {+ groupAuthorizationsLock.writeLock().unlock();+ }+ }+ }++ });++ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ Long id = event.getEntity().getId();+ Class<?> clazz = event.getEntity().getClass();++ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ if (Project.class.isAssignableFrom(clazz)) {+ projectsLock.writeLock().lock();+ try {+ projects.remove(id);+ projectIdsByName.inverse().remove(id);+ } finally {+ projectsLock.writeLock().unlock();+ }+ userAuthorizationsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {+ if (it.next().getValue().getProjectId().equals(id))+ it.remove();+ }+ } finally {+ userAuthorizationsLock.writeLock().unlock();+ }+ groupAuthorizationsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {+ if (it.next().getValue().getProjectId().equals(id))+ it.remove();+ }+ } finally {+ groupAuthorizationsLock.writeLock().unlock();+ }+ configurationsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, ConfigurationFacade>> it = configurations.entrySet().iterator(); it.hasNext();) {+ ConfigurationFacade configuration = it.next().getValue();+ if (configuration.getProjectId().equals(id)) {+ it.remove();+ buildsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, BuildFacade>> it2 = builds.entrySet().iterator(); it2.hasNext();) {+ if (it2.next().getValue().getConfigurationId().equals(configuration.getId()))+ it2.remove();+ }+ } finally {+ buildsLock.writeLock().unlock();+ }+ }+ }+ } finally {+ configurationsLock.writeLock().unlock();+ }+ issuesLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, IssueFacade>> it = issues.entrySet().iterator(); it.hasNext();) {+ IssueFacade issue = it.next().getValue();+ if (issue.getProjectId().equals(id))+ it.remove();+ }+ } finally {+ issuesLock.writeLock().unlock();+ }+ } else if (User.class.isAssignableFrom(clazz)) {+ usersLock.writeLock().lock();+ try {+ users.remove(id);+ userIdsByName.inverse().remove(id);+ userIdsByEmail.inverse().remove(id);+ } finally {+ usersLock.writeLock().unlock();+ }+ userAuthorizationsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, UserAuthorizationFacade>> it = userAuthorizations.entrySet().iterator(); it.hasNext();) {+ if (it.next().getValue().getUserId().equals(id))+ it.remove();+ }+ } finally {+ userAuthorizationsLock.writeLock().unlock();+ }+ membershipsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {+ if (it.next().getValue().getUserId().equals(id))+ it.remove();+ }+ } finally {+ membershipsLock.writeLock().unlock();+ }+ } else if (Group.class.isAssignableFrom(clazz)) {+ groupsLock.writeLock().lock();+ try {+ groups.remove(id);+ groupIdsByName.inverse().remove(id);+ } finally {+ groupsLock.writeLock().unlock();+ }+ groupAuthorizationsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, GroupAuthorizationFacade>> it = groupAuthorizations.entrySet().iterator(); it.hasNext();) {+ if (it.next().getValue().getGroupId().equals(id))+ it.remove();+ }+ } finally {+ groupAuthorizationsLock.writeLock().unlock();+ }+ membershipsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, MembershipFacade>> it = memberships.entrySet().iterator(); it.hasNext();) {+ if (it.next().getValue().getGroupId().equals(id))+ it.remove();+ }+ } finally {+ membershipsLock.writeLock().unlock();+ }+ } else if (Configuration.class.isAssignableFrom(clazz)) {+ configurationsLock.writeLock().lock();+ try {+ configurations.remove(id);+ } finally {+ configurationsLock.writeLock().unlock();+ }+ buildsLock.writeLock().lock();+ try {+ for (Iterator<Map.Entry<Long, BuildFacade>> it = builds.entrySet().iterator(); it.hasNext();) {+ if (it.next().getValue().getConfigurationId().equals(id))+ it.remove();+ }+ } finally {+ buildsLock.writeLock().unlock();+ }+ } else if (Build.class.isAssignableFrom(clazz)) {+ buildsLock.writeLock().lock();+ try {+ builds.remove(id);+ } finally {+ buildsLock.writeLock().unlock();+ }+ } else if (Issue.class.isAssignableFrom(clazz)) {+ issuesLock.writeLock().lock();+ try {+ issues.remove(id);+ } finally {+ issuesLock.writeLock().unlock();+ }+ } else if (Membership.class.isAssignableFrom(clazz)) {+ membershipsLock.writeLock().lock();+ try {+ memberships.remove(id);+ } finally {+ membershipsLock.writeLock().unlock();+ }+ } else if (UserAuthorization.class.isAssignableFrom(clazz)) {+ userAuthorizationsLock.writeLock().lock();+ try {+ userAuthorizations.remove(id);+ } finally {+ userAuthorizationsLock.writeLock().unlock();+ }+ } else if (GroupAuthorization.class.isAssignableFrom(clazz)) {+ groupAuthorizationsLock.writeLock().lock();+ try {+ groupAuthorizations.remove(id);+ } finally {+ groupAuthorizationsLock.writeLock().unlock();+ }+ }+ }+ });+ }++ @Override+ public Map<Long, ProjectFacade> getProjects() {+ projectsLock.readLock().lock();+ try {+ return new HashMap<>(projects);+ } finally {+ projectsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, UserFacade> getUsers() {+ usersLock.readLock().lock();+ try {+ return new HashMap<>(users);+ } finally {+ usersLock.readLock().unlock();+ }+ }++ public Map<Long, GroupFacade> getGroups() {+ groupsLock.readLock().lock();+ try {+ return new HashMap<>(groups);+ } finally {+ groupsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, MembershipFacade> getMemberships() {+ membershipsLock.readLock().lock();+ try {+ return new HashMap<>(memberships);+ } finally {+ membershipsLock.readLock().unlock();+ }+ }++ @Override+ public ProjectFacade getProject(Long id) {+ projectsLock.readLock().lock();+ try {+ return projects.get(id);+ } finally {+ projectsLock.readLock().unlock();+ }+ }++ @Override+ public UserFacade getUser(Long id) {+ usersLock.readLock().lock();+ try {+ return users.get(id);+ } finally {+ usersLock.readLock().unlock();+ }+ }++ @Override+ public Long getUserIdByName(String name) {+ usersLock.readLock().lock();+ try {+ return userIdsByName.get(name);+ } finally {+ usersLock.readLock().unlock();+ }+ }++ @Override+ public Long getUserIdByEmail(String email) {+ usersLock.readLock().lock();+ try {+ return userIdsByEmail.get(email);+ } finally {+ usersLock.readLock().unlock();+ }+ }++ @Override+ public Long getProjectIdByName(String name) {+ projectsLock.readLock().lock();+ try {+ return projectIdsByName.get(name);+ } finally {+ projectsLock.readLock().unlock();+ }+ }++ @Override+ public Map<String, Long> getProjectIds() {+ projectsLock.readLock().lock();+ try {+ return new HashMap<>(projectIdsByName);+ } finally {+ projectsLock.readLock().unlock();+ }+ }++ @Override+ public Long getGroupIdByName(String name) {+ groupsLock.readLock().lock();+ try {+ return groupIdsByName.get(name);+ } finally {+ groupsLock.readLock().unlock();+ }+ }++ @Override+ public GroupFacade getGroup(Long id) {+ groupsLock.readLock().lock();+ try {+ return groups.get(id);+ } finally {+ groupsLock.readLock().unlock();+ }+ }++ @Override+ public MembershipFacade getMembership(Long id) {+ membershipsLock.readLock().lock();+ try {+ return memberships.get(id);+ } finally {+ membershipsLock.readLock().unlock();+ }+ }++ @Override+ public Collection<Long> getIssueNumbers(Long projectId) {+ issuesLock.readLock().lock();+ try {+ Collection<Long> issueNumbers = new HashSet<>();+ for (IssueFacade issue: issues.values()) {+ if (projectId.equals(issue.getProjectId()))+ issueNumbers.add(issue.getNumber());+ }+ return issueNumbers;+ } finally {+ issuesLock.readLock().unlock();+ }+ }++ @Override+ public Collection<Long> getBuildIdsByProject(Long projectId) {+ buildsLock.readLock().lock();+ configurationsLock.readLock().lock();+ try {+ Collection<Long> buildIds = new HashSet<>();+ for (BuildFacade build: builds.values()) {+ ConfigurationFacade configuration = configurations.get(build.getConfigurationId());+ if (configuration != null && configuration.getProjectId().equals(projectId))+ buildIds.add(build.getId());+ }+ return buildIds;+ } finally {+ configurationsLock.readLock().unlock();+ buildsLock.readLock().unlock();+ }+ }++ @Override+ public Collection<Long> getBuildIdsByConfiguration(Long configurationId) {+ buildsLock.readLock().lock();+ try {+ Collection<Long> buildIds = new HashSet<>();+ for (BuildFacade build: builds.values()) {+ if (build.getConfigurationId().equals(configurationId))+ buildIds.add(build.getId());+ }+ return buildIds;+ } finally {+ buildsLock.readLock().unlock();+ }+ }++ @Override+ public Collection<Long> filterBuildIds(Long projectId, Collection<String> commitHashes) {+ buildsLock.readLock().lock();+ configurationsLock.readLock().lock();+ try {+ Collection<Long> buildIds = new HashSet<>();+ for (BuildFacade build: builds.values()) {+ ConfigurationFacade configuration = configurations.get(build.getConfigurationId());+ if (configuration != null && configuration.getProjectId().equals(projectId)+ && commitHashes.contains(build.getCommitHash())) {+ buildIds.add(build.getId());+ }+ }+ return buildIds;+ } finally {+ configurationsLock.readLock().unlock();+ buildsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, ConfigurationFacade> getConfigurations() {+ configurationsLock.readLock().lock();+ try {+ return new HashMap<>(configurations);+ } finally {+ configurationsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, UserAuthorizationFacade> getUserAuthorizations() {+ userAuthorizationsLock.readLock().lock();+ try {+ return new HashMap<>(userAuthorizations);+ } finally {+ userAuthorizationsLock.readLock().unlock();+ }+ }++ @Override+ public Map<Long, GroupAuthorizationFacade> getGroupAuthorizations() {+ groupAuthorizationsLock.readLock().lock();+ try {+ return new HashMap<>(groupAuthorizations);+ } finally {+ groupAuthorizationsLock.readLock().unlock();+ }+ }++ @Override+ public UserAuthorizationFacade getUserAuthorization(Long id) {+ userAuthorizationsLock.readLock().lock();+ try {+ return userAuthorizations.get(id);+ } finally {+ userAuthorizationsLock.readLock().unlock();+ }+ }++ @Override+ public GroupAuthorizationFacade getGroupAuthorization(Long id) {+ groupAuthorizationsLock.readLock().lock();+ try {+ return groupAuthorizations.get(id);+ } finally {+ groupAuthorizationsLock.readLock().unlock();+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.javaindex dde51353b6..b12943e552 100644--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java@@ -57,7 +57,7 @@ import io.onedev.server.util.MatrixRunner;@Singletonpublic class DefaultJobScheduler implements JobScheduler, Runnable {- private static final int CHECK_INTERVAL = 5;+ private static final int CHECK_INTERVAL = 1000; // check internal in milli-secondsprivate static final Logger logger = LoggerFactory.getLogger(DefaultJobScheduler.class);@@ -146,8 +146,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {private List<Build2> submit(Project project, @Nullable User user, String commitHash, String jobName,Map<String, String> paramMap, List<String> dependencyChain) {+ System.out.println("1");List<Build2> builds = buildManager.query(project, commitHash, jobName, paramMap);if (builds.isEmpty()) {+ System.out.println("2");Build2 build = new Build2();build.setProject(project);build.setCommitHash(commitHash);@@ -212,6 +214,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {buildManager.create(build);listenerRegistry.post(new BuildSubmitted(build));+ System.out.println("3");}return builds;}@@ -361,7 +364,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {public synchronized void run() {while (true) {try {- wait(CHECK_INTERVAL * 1000L);+ wait(CHECK_INTERVAL);} catch (InterruptedException e) {}try {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.javaindex 365d082169..0e0c367b49 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuild2Manager.java@@ -1,112 +1,114 @@-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 List<Build2> query(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.where(restrictions.toArray(new Predicate[0]))).list();- }-- @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);- }--}+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));+ criteria.setCacheable(true);+ return find(criteria);+ }++ @Sessional+ @Override+ public List<Build2> query(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.where(restrictions.toArray(new Predicate[0]))).list();+ }++ @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)));+ criteria.setCacheable(true);+ 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/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.javaindex 79088584a7..e811a23d4d 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupManager.java@@ -1,102 +1,102 @@-package io.onedev.server.entitymanager.impl;--import java.util.Iterator;--import javax.inject.Inject;-import javax.inject.Singleton;--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;-import io.onedev.server.model.support.TagProtection;-import io.onedev.server.model.support.authenticator.Authenticator;-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;--@Singleton-public class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {-- private final ProjectManager projectManager;-- private final SettingManager settingManager;-- private final IssueFieldEntityManager issueFieldEntityManager;-- private final CacheManager cacheManager;-- @Inject- public DefaultGroupManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,- IssueFieldEntityManager issueFieldEntityManager, CacheManager cacheManager) {- super(dao);- this.projectManager = projectManager;- this.settingManager = settingManager;- this.issueFieldEntityManager = issueFieldEntityManager;- this.cacheManager = cacheManager;- }-- @Transactional- @Override- public void save(Group group, String oldName) {- if (oldName != null && !oldName.equals(group.getName())) {- for (Project project: projectManager.query()) {- for (BranchProtection protection: project.getBranchProtections())- protection.onRenameGroup(oldName, group.getName());- for (TagProtection protection: project.getTagProtections())- protection.onRenameGroup(oldName, group.getName());- project.getIssueSetting().onRenameGroup(oldName, group.getName());- }-- Authenticator authenticator = settingManager.getAuthenticator();- if (authenticator != null) {- authenticator.onRenameGroup(oldName, group.getName());- settingManager.saveAuthenticator(authenticator);- }-- issueFieldEntityManager.onRenameGroup(oldName, group.getName());- settingManager.getIssueSetting().onRenameGroup(oldName, group.getName());- }- dao.persist(group);- }-- @Transactional- @Override- public void delete(Group group) {- for (Project project: projectManager.query()) {- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {- if (it.next().onDeleteGroup(group.getName()))- it.remove();- }- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {- if (it.next().onDeleteGroup(group.getName()))- it.remove();- }- project.getIssueSetting().onDeleteGroup(group.getName());- }- Authenticator authenticator = settingManager.getAuthenticator();- if (authenticator != null) {- authenticator.onDeleteGroup(group.getName());- settingManager.saveAuthenticator(authenticator);- }- settingManager.getIssueSetting().onDeleteGroup(group.getName());-- dao.remove(group);- }-- @Sessional- @Override- public Group find(String name) {- Long id = cacheManager.getGroupIdByName(name);- if (id != null)- return load(id);- else- return null;- }--}+package io.onedev.server.entitymanager.impl;++import java.util.Iterator;++import javax.inject.Inject;+import javax.inject.Singleton;++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;+import io.onedev.server.model.support.TagProtection;+import io.onedev.server.model.support.authenticator.Authenticator;+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;++@Singleton+public class DefaultGroupManager extends AbstractEntityManager<Group> implements GroupManager {++ private final ProjectManager projectManager;++ private final SettingManager settingManager;++ private final IssueFieldEntityManager issueFieldEntityManager;++ private final CacheManager cacheManager;++ @Inject+ public DefaultGroupManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,+ IssueFieldEntityManager issueFieldEntityManager, CacheManager cacheManager) {+ super(dao);+ this.projectManager = projectManager;+ this.settingManager = settingManager;+ this.issueFieldEntityManager = issueFieldEntityManager;+ this.cacheManager = cacheManager;+ }++ @Transactional+ @Override+ public void save(Group group, String oldName) {+ if (oldName != null && !oldName.equals(group.getName())) {+ for (Project project: projectManager.query()) {+ for (BranchProtection protection: project.getBranchProtections())+ protection.onRenameGroup(oldName, group.getName());+ for (TagProtection protection: project.getTagProtections())+ protection.onRenameGroup(oldName, group.getName());+ project.getIssueSetting().onRenameGroup(oldName, group.getName());+ }++ Authenticator authenticator = settingManager.getAuthenticator();+ if (authenticator != null) {+ authenticator.onRenameGroup(oldName, group.getName());+ settingManager.saveAuthenticator(authenticator);+ }++ issueFieldEntityManager.onRenameGroup(oldName, group.getName());+ settingManager.getIssueSetting().onRenameGroup(oldName, group.getName());+ }+ dao.persist(group);+ }++ @Transactional+ @Override+ public void delete(Group group) {+ for (Project project: projectManager.query()) {+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {+ if (it.next().onDeleteGroup(group.getName()))+ it.remove();+ }+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {+ if (it.next().onDeleteGroup(group.getName()))+ it.remove();+ }+ project.getIssueSetting().onDeleteGroup(group.getName());+ }+ Authenticator authenticator = settingManager.getAuthenticator();+ if (authenticator != null) {+ authenticator.onDeleteGroup(group.getName());+ settingManager.saveAuthenticator(authenticator);+ }+ settingManager.getIssueSetting().onDeleteGroup(group.getName());++ dao.remove(group);+ }++ @Sessional+ @Override+ public Group find(String name) {+ Long id = cacheManager.getGroupIdByName(name);+ if (id != null)+ return load(id);+ else+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.javaindex b1f47ed2bf..59145b45d1 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java@@ -1,491 +1,492 @@-package io.onedev.server.entitymanager.impl;--import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.annotation.Nullable;-import 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.apache.commons.lang3.StringUtils;-import org.hibernate.Session;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;--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.model.Issue;-import io.onedev.server.model.IssueFieldEntity;-import io.onedev.server.model.IssueQuerySetting;-import io.onedev.server.model.Milestone;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.NamedIssueQuery;-import io.onedev.server.model.support.issue.StateSpec;-import io.onedev.server.model.support.setting.GlobalIssueSetting;-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;-import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.QueryBuildContext;-import io.onedev.server.search.entity.issue.AndCriteria;-import io.onedev.server.search.entity.issue.IssueCriteria;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.IssueQueryBuildContext;-import io.onedev.server.search.entity.issue.MilestoneCriteria;-import io.onedev.server.util.IssueConstants;-import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;--@Singleton-public class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {-- private final IssueFieldEntityManager issueFieldEntityManager;-- private final ListenerRegistry listenerRegistry;-- private final IssueQuerySettingManager issueQuerySettingManager;-- private final SettingManager settingManager;-- private final ProjectManager projectManager;-- @Inject- public DefaultIssueManager(Dao dao, IssueFieldEntityManager issueFieldEntityManager,- IssueQuerySettingManager issueQuerySettingManager, SettingManager settingManager,- ListenerRegistry listenerRegistry, ProjectManager projectManager) {- super(dao);- this.issueFieldEntityManager = issueFieldEntityManager;- this.issueQuerySettingManager = issueQuerySettingManager;- this.listenerRegistry = listenerRegistry;- this.settingManager = settingManager;- this.projectManager = projectManager;- }-- @Sessional- @Override- public Issue find(Project project, long number) {- EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.eq("number", number));- return find(criteria);- }-- @Transactional- @Override- public void open(Issue issue) {- Preconditions.checkArgument(issue.isNew());- Query<?> query = getSession().createQuery("select max(number) from Issue where project=:project");- query.setParameter("project", issue.getProject());- issue.setNumber(getNextNumber(issue.getProject(), query));- save(issue);-- issueFieldEntityManager.saveFields(issue);-- listenerRegistry.post(new IssueOpened(issue));- }-- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Project project, QueryBuildContext<Issue> context, User user) {- List<Predicate> predicates = new ArrayList<>();- predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));- if (criteria != null)- predicates.add(criteria.getPredicate(project, context, user));- return predicates.toArray(new Predicate[0]);- }-- private CriteriaQuery<Issue> buildCriteriaQuery(Session session, Project project, EntityQuery<Issue> issueQuery, User user) {- CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<Issue> query = builder.createQuery(Issue.class);- Root<Issue> root = query.from(Issue.class);-- QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);- query.where(getPredicates(issueQuery.getCriteria(), project, context, user));-- List<javax.persistence.criteria.Order> orders = new ArrayList<>();- for (EntitySort sort: issueQuery.getSorts()) {- if (IssueConstants.ORDER_FIELDS.containsKey(sort.getField())) {- if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));- else- orders.add(builder.desc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));- } else {- 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(IssueFieldEntity.FIELD_ATTR_ORDINAL)));- else- orders.add(builder.desc(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL)));- }- }-- if (orders.isEmpty())- orders.add(builder.desc(root.get("number")));- query.orderBy(orders);-- return query;- }-- private GlobalIssueSetting getGlobalIssueSetting() {- return settingManager.getIssueSetting();- }-- @Sessional- @Override- public List<Issue> query(Project project, User user, io.onedev.server.search.entity.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {- CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery, user);- Query<Issue> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- List<Issue> issues = query.getResultList();- if (!issues.isEmpty())- issueFieldEntityManager.populateFields(issues);-- return issues;- }-- @Transactional- @Listen- public void on(IssueEvent event) {- if (!(event instanceof IssueDeleted) && !(event instanceof IssueCommitted))- event.getIssue().setUpdateDate(event.getDate());- }-- @Sessional- @Override- public int count(Project project, User user, IssueCriteria issueCriteria) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);- Root<Issue> root = criteriaQuery.from(Issue.class);-- QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);- criteriaQuery.where(getPredicates(issueCriteria, project, context, user));-- criteriaQuery.select(builder.count(root));- return getSession().createQuery(criteriaQuery).uniqueResult().intValue();- }-- @Override- public int count(Milestone milestone, User user, @Nullable StateSpec.Category category) {- if (category != null) {- IssueCriteria criteria = getGlobalIssueSetting().getCategoryCriteria(category);- if (criteria != null) {- List<IssueCriteria> criterias = new ArrayList<>();- criterias.add(new MilestoneCriteria(milestone.getName()));- criterias.add(criteria);- return count(milestone.getProject(), user, new AndCriteria(criterias));- } else {- return 0;- }- } else {- IssueCriteria criteria = new MilestoneCriteria(milestone.getName());- return count(milestone.getProject(), user, criteria);- }- }-- @SuppressWarnings("unchecked")- @Sessional- @Override- public Collection<String> getUndefinedStates() {- Query<String> query = getSession().createQuery("select distinct state from Issue");-- Set<String> undefinedStates = new HashSet<>(query.getResultList());- for (Iterator<String> it = undefinedStates.iterator(); it.hasNext();) {- if (getGlobalIssueSetting().getStateSpec(it.next()) != null)- it.remove();- }-- for (Project project: projectManager.query()) {- undefinedStates.addAll(project.getIssueSetting().getUndefinedStates(project));- }-- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {- try {- undefinedStates.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedStates());- } catch (Exception e) {- }- }- }-- return undefinedStates;- }-- @Transactional- @Override- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {- for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {- Query<?> query = getSession().createQuery("update Issue set state=:newState where state=:oldState");- query.setParameter("oldState", entry.getKey());- query.setParameter("newState", entry.getValue().getNewState());- query.executeUpdate();- }-- for (Project project: projectManager.query()) {- project.getIssueSetting().fixUndefinedStates(resolutions);- }-- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {- try {- IssueQuery query = IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false);- for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())- query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());- namedQuery.setQuery(query.toString());- } catch (Exception e) {- }- }- issueQuerySettingManager.save(setting);- }-- }-- @Sessional- @Override- public List<Issue> query(Project project, String term, int count) {- List<Issue> issues = new ArrayList<>();-- Long number = null;- String numberStr = term;- if (numberStr != null) {- numberStr = numberStr.trim();- if (numberStr.startsWith("#"))- numberStr = numberStr.substring(1);- if (StringUtils.isNumeric(numberStr))- number = Long.valueOf(numberStr);- }-- if (number != null) {- Issue issue = find(project, number);- if (issue != null)- issues.add(issue);- EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- criteria.add(Restrictions.and(- Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%"),- Restrictions.ilike("numberStr", term + "%")),- Restrictions.ne("number", number)- ));- criteria.addOrder(Order.desc("number"));- issues.addAll(query(criteria, 0, count-issues.size()));- } else {- EntityCriteria<Issue> criteria = newCriteria();- criteria.add(Restrictions.eq("project", project));- if (StringUtils.isNotBlank(term)) {- criteria.add(Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%"),- Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%")));- }- criteria.addOrder(Order.desc("number"));- issues.addAll(query(criteria, 0, count));- }- return issues;- }-- @SuppressWarnings("unchecked")- @Sessional- @Override- public Collection<String> getUndefinedFields() {- 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);- if (field == null)- undefinedFields.add(fieldName);- }- for (Project project: projectManager.query()) {- undefinedFields.addAll(project.getIssueSetting().getUndefinedFields(project));- }- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {- try {- undefinedFields.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedFields());- } catch (Exception e) {- }- }- }- return undefinedFields;- }-- @Transactional- @Override- public void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- Query<?> query;- if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- 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 IssueFieldEntity where name=:fieldName");- query.setParameter("fieldName", entry.getKey());- }- query.executeUpdate();- }-- for (Project project: projectManager.query()) {- project.getIssueSetting().fixUndefinedFields(resolutions);- }-- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);- boolean remove = false;- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- UndefinedFieldResolution resolution = entry.getValue();- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- query.onRenameField(entry.getKey(), resolution.getNewField());- } else if (query.onDeleteField(entry.getKey())) {- remove = true;- break;- }- }- if (remove)- it.remove();- else- namedQuery.setQuery(query.toString());- } catch (Exception e) {- }- }- }-- }-- @SuppressWarnings({ "unchecked", "rawtypes" })- @Sessional- @Override- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {- 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()) {- String fieldName = (String) row[0];- String fieldValue = (String) row[1];- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(fieldName));- if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(fieldValue)) {- undefinedFieldValues.add(new UndefinedFieldValue(fieldName, fieldValue));- }- }-- for (Project project: projectManager.query())- undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues());-- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {- try {- undefinedFieldValues.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedFieldValues());- } catch (Exception e) {- }- }- }-- return undefinedFieldValues;- }-- @SuppressWarnings("rawtypes")- @Transactional- @Override- public 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 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 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());- query.executeUpdate();- }- }-- for (Project project: projectManager.query()) {- project.getIssueSetting().fixUndefinedFieldValues(valueSetEdits);- }-- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);- if (query.fixUndefinedFieldValues(valueSetEdits))- it.remove();- else- namedQuery.setQuery(query.toString());- } catch (Exception e) {- }- }- issueQuerySettingManager.save(setting);- }- }-- @SuppressWarnings({"unchecked", "rawtypes"})- @Transactional- @Override- public void fixFieldValueOrders() {- 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()) {- String name = (String) row[0];- String value = (String) row[1];- long ordinal = (long) row[2];- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(name));- if (specifiedChoices != null) {- long newOrdinal = specifiedChoices.getChoiceValues().indexOf(value);- if (ordinal != newOrdinal) {- 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);- query.executeUpdate();- }- }- }- }-- @Override- public void delete(User user, Issue issue) {- super.delete(issue);- listenerRegistry.post(new IssueDeleted(user, issue));- }--}+package io.onedev.server.entitymanager.impl;++import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import java.util.Set;++import javax.annotation.Nullable;+import 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.apache.commons.lang3.StringUtils;+import org.hibernate.Session;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;++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.model.Issue;+import io.onedev.server.model.IssueFieldEntity;+import io.onedev.server.model.IssueQuerySetting;+import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.model.support.issue.NamedIssueQuery;+import io.onedev.server.model.support.issue.StateSpec;+import io.onedev.server.model.support.setting.GlobalIssueSetting;+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;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.search.entity.EntitySort;+import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.QueryBuildContext;+import io.onedev.server.search.entity.issue.AndCriteria;+import io.onedev.server.search.entity.issue.IssueCriteria;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryBuildContext;+import io.onedev.server.search.entity.issue.MilestoneCriteria;+import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;++@Singleton+public class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {++ private final IssueFieldEntityManager issueFieldEntityManager;++ private final ListenerRegistry listenerRegistry;++ private final IssueQuerySettingManager issueQuerySettingManager;++ private final SettingManager settingManager;++ private final ProjectManager projectManager;++ @Inject+ public DefaultIssueManager(Dao dao, IssueFieldEntityManager issueFieldEntityManager,+ IssueQuerySettingManager issueQuerySettingManager, SettingManager settingManager,+ ListenerRegistry listenerRegistry, ProjectManager projectManager) {+ super(dao);+ this.issueFieldEntityManager = issueFieldEntityManager;+ this.issueQuerySettingManager = issueQuerySettingManager;+ this.listenerRegistry = listenerRegistry;+ this.settingManager = settingManager;+ this.projectManager = projectManager;+ }++ @Sessional+ @Override+ public Issue find(Project project, long number) {+ EntityCriteria<Issue> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ criteria.add(Restrictions.eq("number", number));+ criteria.setCacheable(true);+ return find(criteria);+ }++ @Transactional+ @Override+ public void open(Issue issue) {+ Preconditions.checkArgument(issue.isNew());+ Query<?> query = getSession().createQuery("select max(number) from Issue where project=:project");+ query.setParameter("project", issue.getProject());+ issue.setNumber(getNextNumber(issue.getProject(), query));+ save(issue);++ issueFieldEntityManager.saveFields(issue);++ listenerRegistry.post(new IssueOpened(issue));+ }++ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Project project, QueryBuildContext<Issue> context, User user) {+ List<Predicate> predicates = new ArrayList<>();+ predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));+ if (criteria != null)+ predicates.add(criteria.getPredicate(project, context, user));+ return predicates.toArray(new Predicate[0]);+ }++ private CriteriaQuery<Issue> buildCriteriaQuery(Session session, Project project, EntityQuery<Issue> issueQuery, User user) {+ CriteriaBuilder builder = session.getCriteriaBuilder();+ CriteriaQuery<Issue> query = builder.createQuery(Issue.class);+ Root<Issue> root = query.from(Issue.class);++ QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);+ query.where(getPredicates(issueQuery.getCriteria(), project, context, user));++ List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ for (EntitySort sort: issueQuery.getSorts()) {+ if (IssueConstants.ORDER_FIELDS.containsKey(sort.getField())) {+ if (sort.getDirection() == Direction.ASCENDING)+ orders.add(builder.asc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));+ else+ orders.add(builder.desc(IssueQuery.getPath(root, IssueConstants.ORDER_FIELDS.get(sort.getField()))));+ } else {+ 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(IssueFieldEntity.FIELD_ATTR_ORDINAL)));+ else+ orders.add(builder.desc(join.get(IssueFieldEntity.FIELD_ATTR_ORDINAL)));+ }+ }++ if (orders.isEmpty())+ orders.add(builder.desc(root.get("number")));+ query.orderBy(orders);++ return query;+ }++ private GlobalIssueSetting getGlobalIssueSetting() {+ return settingManager.getIssueSetting();+ }++ @Sessional+ @Override+ public List<Issue> query(Project project, User user, io.onedev.server.search.entity.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {+ CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery, user);+ Query<Issue> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(firstResult);+ query.setMaxResults(maxResults);+ List<Issue> issues = query.getResultList();+ if (!issues.isEmpty())+ issueFieldEntityManager.populateFields(issues);++ return issues;+ }++ @Transactional+ @Listen+ public void on(IssueEvent event) {+ if (!(event instanceof IssueDeleted) && !(event instanceof IssueCommitted))+ event.getIssue().setUpdateDate(event.getDate());+ }++ @Sessional+ @Override+ public int count(Project project, User user, IssueCriteria issueCriteria) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);+ Root<Issue> root = criteriaQuery.from(Issue.class);++ QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);+ criteriaQuery.where(getPredicates(issueCriteria, project, context, user));++ criteriaQuery.select(builder.count(root));+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();+ }++ @Override+ public int count(Milestone milestone, User user, @Nullable StateSpec.Category category) {+ if (category != null) {+ IssueCriteria criteria = getGlobalIssueSetting().getCategoryCriteria(category);+ if (criteria != null) {+ List<IssueCriteria> criterias = new ArrayList<>();+ criterias.add(new MilestoneCriteria(milestone.getName()));+ criterias.add(criteria);+ return count(milestone.getProject(), user, new AndCriteria(criterias));+ } else {+ return 0;+ }+ } else {+ IssueCriteria criteria = new MilestoneCriteria(milestone.getName());+ return count(milestone.getProject(), user, criteria);+ }+ }++ @SuppressWarnings("unchecked")+ @Sessional+ @Override+ public Collection<String> getUndefinedStates() {+ Query<String> query = getSession().createQuery("select distinct state from Issue");++ Set<String> undefinedStates = new HashSet<>(query.getResultList());+ for (Iterator<String> it = undefinedStates.iterator(); it.hasNext();) {+ if (getGlobalIssueSetting().getStateSpec(it.next()) != null)+ it.remove();+ }++ for (Project project: projectManager.query()) {+ undefinedStates.addAll(project.getIssueSetting().getUndefinedStates(project));+ }++ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {+ try {+ undefinedStates.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedStates());+ } catch (Exception e) {+ }+ }+ }++ return undefinedStates;+ }++ @Transactional+ @Override+ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {+ Query<?> query = getSession().createQuery("update Issue set state=:newState where state=:oldState");+ query.setParameter("oldState", entry.getKey());+ query.setParameter("newState", entry.getValue().getNewState());+ query.executeUpdate();+ }++ for (Project project: projectManager.query()) {+ project.getIssueSetting().fixUndefinedStates(resolutions);+ }++ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {+ try {+ IssueQuery query = IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false);+ for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())+ query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());+ namedQuery.setQuery(query.toString());+ } catch (Exception e) {+ }+ }+ issueQuerySettingManager.save(setting);+ }++ }++ @Sessional+ @Override+ public List<Issue> query(Project project, String term, int count) {+ List<Issue> issues = new ArrayList<>();++ Long number = null;+ String numberStr = term;+ if (numberStr != null) {+ numberStr = numberStr.trim();+ if (numberStr.startsWith("#"))+ numberStr = numberStr.substring(1);+ if (StringUtils.isNumeric(numberStr))+ number = Long.valueOf(numberStr);+ }++ if (number != null) {+ Issue issue = find(project, number);+ if (issue != null)+ issues.add(issue);+ EntityCriteria<Issue> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ criteria.add(Restrictions.and(+ Restrictions.or(+ Restrictions.ilike("title", "%" + term + "%"),+ Restrictions.ilike("noSpaceTitle", "%" + term + "%"),+ Restrictions.ilike("numberStr", term + "%")),+ Restrictions.ne("number", number)+ ));+ criteria.addOrder(Order.desc("number"));+ issues.addAll(query(criteria, 0, count-issues.size()));+ } else {+ EntityCriteria<Issue> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", project));+ if (StringUtils.isNotBlank(term)) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("title", "%" + term + "%"),+ Restrictions.ilike("noSpaceTitle", "%" + term + "%"),+ Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%")));+ }+ criteria.addOrder(Order.desc("number"));+ issues.addAll(query(criteria, 0, count));+ }+ return issues;+ }++ @SuppressWarnings("unchecked")+ @Sessional+ @Override+ public Collection<String> getUndefinedFields() {+ 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);+ if (field == null)+ undefinedFields.add(fieldName);+ }+ for (Project project: projectManager.query()) {+ undefinedFields.addAll(project.getIssueSetting().getUndefinedFields(project));+ }+ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {+ try {+ undefinedFields.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedFields());+ } catch (Exception e) {+ }+ }+ }+ return undefinedFields;+ }++ @Transactional+ @Override+ public void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ Query<?> query;+ if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {+ 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 IssueFieldEntity where name=:fieldName");+ query.setParameter("fieldName", entry.getKey());+ }+ query.executeUpdate();+ }++ for (Project project: projectManager.query()) {+ project.getIssueSetting().fixUndefinedFields(resolutions);+ }++ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {+ for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();+ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);+ boolean remove = false;+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ UndefinedFieldResolution resolution = entry.getValue();+ if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {+ query.onRenameField(entry.getKey(), resolution.getNewField());+ } else if (query.onDeleteField(entry.getKey())) {+ remove = true;+ break;+ }+ }+ if (remove)+ it.remove();+ else+ namedQuery.setQuery(query.toString());+ } catch (Exception e) {+ }+ }+ }++ }++ @SuppressWarnings({ "unchecked", "rawtypes" })+ @Sessional+ @Override+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {+ 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()) {+ String fieldName = (String) row[0];+ String fieldValue = (String) row[1];+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(fieldName));+ if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(fieldValue)) {+ undefinedFieldValues.add(new UndefinedFieldValue(fieldName, fieldValue));+ }+ }++ for (Project project: projectManager.query())+ undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues());++ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {+ try {+ undefinedFieldValues.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedFieldValues());+ } catch (Exception e) {+ }+ }+ }++ return undefinedFieldValues;+ }++ @SuppressWarnings("rawtypes")+ @Transactional+ @Override+ public 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 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 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());+ query.executeUpdate();+ }+ }++ for (Project project: projectManager.query()) {+ project.getIssueSetting().fixUndefinedFieldValues(valueSetEdits);+ }++ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {+ for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();+ try {+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);+ if (query.fixUndefinedFieldValues(valueSetEdits))+ it.remove();+ else+ namedQuery.setQuery(query.toString());+ } catch (Exception e) {+ }+ }+ issueQuerySettingManager.save(setting);+ }+ }++ @SuppressWarnings({"unchecked", "rawtypes"})+ @Transactional+ @Override+ public void fixFieldValueOrders() {+ 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()) {+ String name = (String) row[0];+ String value = (String) row[1];+ long ordinal = (long) row[2];+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(name));+ if (specifiedChoices != null) {+ long newOrdinal = specifiedChoices.getChoiceValues().indexOf(value);+ if (ordinal != newOrdinal) {+ 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);+ query.executeUpdate();+ }+ }+ }+ }++ @Override+ public void delete(User user, Issue issue) {+ super.delete(issue);+ listenerRegistry.post(new IssueDeleted(user, issue));+ }++}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 1adbb22720..49abe4b237 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -1,1103 +1,1103 @@-package io.onedev.server.entitymanager.impl;--import static io.onedev.server.model.PullRequest.CriterionHelper.ofOpen;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofSource;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofSourceProject;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofSubmitter;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.Date;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Iterator;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import org.apache.commons.lang3.StringUtils;-import org.apache.shiro.authz.Permission;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;-import org.apache.wicket.request.cycle.RequestCycle;-import org.eclipse.jgit.lib.CommitBuilder;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectInserter;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.lib.RefUpdate;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;-import org.hibernate.Session;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;-import org.joda.time.DateTime;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.base.Preconditions;--import io.onedev.commons.launcher.loader.Listen;-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;-import io.onedev.server.event.pullrequest.PullRequestBuildEvent;-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;-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.event.pullrequest.PullRequestMergePreviewCalculated;-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.model.Build;-import io.onedev.server.model.Configuration;-import io.onedev.server.model.Group;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.model.User;-import io.onedev.server.model.support.BranchProtection;-import io.onedev.server.model.support.FileProtection;-import io.onedev.server.model.support.ProjectAndBranch;-import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;-import 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.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;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.QueryBuildContext;-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-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.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;--@Singleton-public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {-- private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);-- private static final int MAX_CONTRIBUTION_FILES = 100;-- private static final int UI_PREVIEW_PRIORITY = 10;-- private static final int BACKEND_PREVIEW_PRIORITY = 50;-- private final PullRequestUpdateManager pullRequestUpdateManager;-- private final UserManager userManager;-- private final SessionManager sessionManager;-- private final ListenerRegistry listenerRegistry;-- private final PullRequestReviewManager pullRequestReviewManager;-- private final PullRequestBuildManager pullRequestBuildManager;-- private final BatchWorkManager batchWorkManager;-- private final PullRequestChangeManager pullRequestChangeManager;-- private final ConfigurationManager configurationManager;-- private final BuildManager buildManager;-- private final TransactionManager transactionManager;-- @Inject- public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,- PullRequestReviewManager pullRequestReviewManager, UserManager userManager,- MarkdownManager markdownManager, BatchWorkManager batchWorkManager,- ListenerRegistry listenerRegistry, SessionManager sessionManager,- PullRequestChangeManager pullRequestChangeManager, BuildManager buildManager,- 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.sessionManager = sessionManager;- this.listenerRegistry = listenerRegistry;- this.pullRequestChangeManager = pullRequestChangeManager;- this.configurationManager = configurationManager;- this.pullRequestBuildManager = pullRequestBuildManager;- }-- @Transactional- @Override- public void delete(PullRequest request) {- deleteRefs(request);- dao.remove(request);- }-- @Sessional- @Override- public void deleteRefs(PullRequest request) {- for (PullRequestUpdate update : request.getUpdates())- update.deleteRefs();-- request.deleteRefs();- }-- @Transactional- @Override- public void restoreSourceBranch(PullRequest request, String note) {- Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);- if (request.getSource().getObjectName(false) == null) {- RevCommit latestCommit = request.getHeadCommit();- try {- request.getSourceProject().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();- } catch (Exception e) {- throw ExceptionUtils.unchecked(e);- }- request.getSourceProject().cacheObjectId(request.getSourceBranch(), latestCommit.copy());-- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setData(new PullRequestSourceBranchRestoreData(note));- change.setRequest(request);- change.setUser(userManager.getCurrent());- pullRequestChangeManager.save(change);- }- }-- @Transactional- @Override- public void deleteSourceBranch(PullRequest request, String note) {- Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);-- if (request.getSource().getObjectName(false) != null) {- request.getSource().delete();-- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setData(new PullRequestSourceBranchDeleteData(note));- change.setRequest(request);- change.setUser(userManager.getCurrent());- pullRequestChangeManager.save(change);- }- }-- @Transactional- @Override- public void reopen(PullRequest request, String note) {- User user = userManager.getCurrent();- request.setCloseInfo(null);-- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setData(new PullRequestReopenData(note));- change.setRequest(request);- change.setUser(user);- pullRequestChangeManager.save(change);- checkAsync(request);- }-- @Transactional- @Override- public void discard(PullRequest request, String note) {- User user = userManager.getCurrent();- Date date = new Date();-- CloseInfo closeInfo = new CloseInfo();- closeInfo.setDate(date);- closeInfo.setUser(user);- closeInfo.setStatus(CloseInfo.Status.DISCARDED);- request.setCloseInfo(closeInfo);-- PullRequestChange change = new PullRequestChange();- change.setDate(date);- change.setData(new PullRequestDiscardData(note));- change.setRequest(request);- change.setUser(user);- pullRequestChangeManager.save(change);- }-- private void merge(PullRequest request) {- MergePreview preview = Preconditions.checkNotNull(request.getMergePreview());- String merged = Preconditions.checkNotNull(preview.getMerged());-- ObjectId mergedId = ObjectId.fromString(merged);- RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedId);-- PersonIdent committer = new PersonIdent(OneDev.NAME, "");-- Project targetProject = request.getTargetProject();- MergeStrategy strategy = request.getMergeStrategy();- if ((strategy == CREATE_MERGE_COMMIT || strategy == CREATE_MERGE_COMMIT_IF_NECESSARY || strategy == SQUASH_SOURCE_BRANCH_COMMITS)- && !preview.getMerged().equals(preview.getRequestHead())- && !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {- try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());- ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {- CommitBuilder newCommit = new CommitBuilder();- newCommit.setAuthor(mergedCommit.getAuthorIdent());- newCommit.setCommitter(committer);- newCommit.setMessage(request.getCommitMessage());- newCommit.setTreeId(mergedCommit.getTree());- newCommit.setParentIds(mergedCommit.getParents());- mergedId = inserter.insert(newCommit);- merged = mergedId.name();- inserter.flush();- } catch (Exception e) {- throw ExceptionUtils.unchecked(e);- }- preview = new MergePreview(preview.getTargetHead(), preview.getRequestHead(),- preview.getMergeStrategy(), merged);- request.setLastMergePreview(preview);- RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), request.getMergeRef());- refUpdate.setNewObjectId(mergedId);- GitUtils.updateRef(refUpdate);- }-- closeAsMerged(request, false);-- String targetRef = request.getTargetRef();- ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHead());- RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), targetRef);- refUpdate.setRefLogIdent(committer);- refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);- refUpdate.setExpectedOldObjectId(targetHeadId);- refUpdate.setNewObjectId(mergedId);- GitUtils.updateRef(refUpdate);-- request.getTargetProject().cacheObjectId(request.getTargetRef(), mergedId);-- Long requestId = request.getId();- Subject subject = SecurityUtils.getSubject();- ObjectId newTargetHeadId = mergedId;- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- 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();- }- }-- });- }- });- }-- @Transactional- @Override- public void open(PullRequest request) {- Preconditions.checkArgument(request.isNew());- Query<?> query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");- query.setParameter("project", request.getTargetProject());- request.setNumber(getNextNumber(request.getTargetProject(), query));-- dao.persist(request);-- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getBaseRef());- refUpdate.setNewObjectId(ObjectId.fromString(request.getBaseCommitHash()));- GitUtils.updateRef(refUpdate);-- refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getHeadRef());- refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));- GitUtils.updateRef(refUpdate);-- for (PullRequestUpdate update: request.getUpdates())- pullRequestUpdateManager.save(update, false);-- pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.saveBuilds(request);-- checkAsync(request);-- listenerRegistry.post(new PullRequestOpened(request));- }-- private void closeAsMerged(PullRequest request, boolean dueToMerged) {- Date date = new DateTime().plusMillis(1).toDate();-- if (dueToMerged)- request.setLastMergePreview(null);-- CloseInfo closeInfo = new CloseInfo();- closeInfo.setDate(date);- closeInfo.setStatus(CloseInfo.Status.MERGED);- request.setCloseInfo(closeInfo);-- String reason = null;- if (dueToMerged)- reason = "closed pull request as source branch is merged into target branch";-- PullRequestChange change = new PullRequestChange();- change.setDate(date);- change.setData(new PullRequestMergeData(reason));- change.setRequest(request);- pullRequestChangeManager.save(change);- }-- private void checkUpdate(PullRequest request) {- if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {- ObjectId mergeBase = GitUtils.getMergeBase(- request.getTargetProject().getRepository(), request.getTarget().getObjectId(),- request.getSourceProject().getRepository(), request.getSource().getObjectId(),- GitUtils.branch2ref(request.getSourceBranch()));- if (mergeBase != null) {- PullRequestUpdate update = new PullRequestUpdate();- update.setRequest(request);- update.setHeadCommitHash(request.getSource().getObjectName());- update.setMergeBaseCommitHash(mergeBase.name());- request.addUpdate(update);- pullRequestUpdateManager.save(update, true);-- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),- request.getHeadRef());- refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));- GitUtils.updateRef(refUpdate);- }- }- }-- @Transactional- @Override- public void check(PullRequest request) {- if (request.isOpen() && request.isValid()) {- if (request.getSourceProject() == null) {- discard(request, "Source project no longer exists");- } else if (request.getSource().getObjectId(false) == null) {- discard(request, "Source branch no longer exists");- } else if (request.getTarget().getObjectId(false) == null) {- discard(request, "Target branch no longer exists");- } else {- checkUpdate(request);- if (request.isMergeIntoTarget()) {- closeAsMerged(request, true);- } else {- checkQuality(request);-- pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.saveBuilds(request);-- MergePreview mergePreview = request.getMergePreview();-- if (request.isAllReviewsApproved() && request.isAllBuildsSuccessful()- && mergePreview != null && mergePreview.getMerged() != null) {- merge(request);- }- }- }- }- }-- @Sessional- @Override- public MergePreview previewMerge(PullRequest request) {- if (!request.isNew() && request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE) {- MergePreview lastPreview = request.getLastMergePreview();- if (request.isOpen() && !request.isMergeIntoTarget()) {- if (lastPreview == null || !lastPreview.isUpToDate(request)) {- int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;- Long requestId = request.getId();- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- batchWorkManager.submit(getMergePreviewer(requestId), new Prioritized(priority));- }-- });- return null;- } else {- lastPreview.syncRef(request);- return lastPreview;- }- } else {- return lastPreview;- }- } else {- return null;- }- }-- private BatchWorker getMergePreviewer(Long requestId) {- return new BatchWorker("request-" + requestId + "-previewMerge", 1) {-- @Override- public void doWorks(Collection<Prioritized> works) {- sessionManager.run(new Runnable() {-- @Override- public void run() {- Preconditions.checkState(works.size() == 1);- PullRequest request = load(requestId);- Project targetProject = request.getTargetProject();- MergePreview mergePreview = request.getLastMergePreview();- if (request.isOpen() && !request.isMergeIntoTarget()) {- if (mergePreview == null || !mergePreview.isUpToDate(request)) {- mergePreview = new MergePreview(request.getTarget().getObjectName(),- request.getHeadCommitHash(), request.getMergeStrategy(), null);- logger.debug("Calculating merge preview of pull request #{} in project '{}'...",- request.getNumber(), targetProject.getName());- ObjectId merged = mergePreview.getMergeStrategy().merge(request);- if (merged != null)- mergePreview.setMerged(merged.name());- mergePreview.syncRef(request);- request.setLastMergePreview(mergePreview);- dao.persist(request);- listenerRegistry.post(new PullRequestMergePreviewCalculated(request));- } else {- mergePreview.syncRef(request);- }- }- }-- });- }-- };- }-- @Transactional- @Listen- public void on(EntityRemoved event) {- if (event.getEntity() instanceof Project) {- Project project = (Project) event.getEntity();- for (PullRequest request: project.getOutgoingRequests()) {- if (!request.getTargetProject().equals(project) && request.isOpen())- discard(request, "Source project is deleted.");- }-- Query<?> query = getSession().createQuery("update PullRequest set sourceProject=null where "- + "sourceProject=:project");- query.setParameter("project", project);- query.executeUpdate();- }- }-- @Transactional- @Listen- public void on(RefUpdated event) {- String branch = GitUtils.ref2branch(event.getRefName());- if (branch != null) {- ProjectAndBranch projectAndBranch = new ProjectAndBranch(event.getProject(), branch);- Criterion criterion = Restrictions.and(- ofOpen(),- Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));- for (PullRequest request: query(EntityCriteria.of(PullRequest.class).add(criterion))) {- check(request);- }- }- }-- @Sessional- @Override- public PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- Criterion merged = Restrictions.and(- Restrictions.eq("closeInfo.status", CloseInfo.Status.MERGED),- Restrictions.eq("lastMergePreview.requestHead", source.getObjectName()));-- criteria.add(ofTarget(target)).add(ofSource(source)).add(Restrictions.or(ofOpen(), merged));-- return find(criteria);- }-- @Sessional- @Override- public PullRequest findLatest(Project targetProject, User submitter) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(ofOpen());- criteria.add(Restrictions.or(ofSourceProject(targetProject), ofTargetProject(targetProject)));- criteria.add(ofSubmitter(submitter));- criteria.addOrder(Order.desc("id"));- return find(criteria);- }-- @Sessional- @Override- public Collection<PullRequest> queryOpenTo(ProjectAndBranch target) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(ofTarget(target));- criteria.add(ofOpen());- return query(criteria);- }-- @Sessional- @Override- public Collection<PullRequest> queryOpen(ProjectAndBranch sourceOrTarget) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(ofOpen());- criteria.add(Restrictions.or(ofSource(sourceOrTarget), ofTarget(sourceOrTarget)));- return query(criteria);- }-- @Sessional- @Override- public int countOpen(Project targetProject) {- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(PullRequest.CriterionHelper.ofOpen());- criteria.add(PullRequest.CriterionHelper.ofTargetProject(targetProject));- return count(criteria);- }-- @Transactional- @Listen- public void on(PullRequestChangeEvent event) {- PullRequestChangeData data = event.getChange().getData();- if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData- || data instanceof PullRequestReviewerRemoveData || data instanceof PullRequestReviewerAddData- || data instanceof PullRequestMergeStrategyChangeData) {- checkAsync(event.getRequest());- }- }-- @Transactional- @Listen- public void on(PullRequestEvent event) {- if (!(event instanceof PullRequestDeleted) && !(event instanceof PullRequestMergePreviewCalculated)- && !(event instanceof PullRequestBuildEvent))- event.getRequest().setUpdateDate(event.getDate());- }-- @Transactional- @Listen- public void on(PullRequestCodeCommentEvent event) {- event.getRequest().setLastCodeCommentActivityDate(event.getDate());- }-- @Listen- @Transactional- public void on(BuildEvent event) {- Build build = event.getBuild();- for (PullRequest request: queryOpenByCommit(build.getCommitHash())) {- listenerRegistry.post(new PullRequestBuildEvent(request, build));- if (build.getStatus() != Build.Status.RUNNING)- checkAsync(request);- }- }-- @Listen- public void on(PullRequestMergePreviewCalculated event) {- checkAsync(event.getRequest());- }-- private Runnable newCheckStatusRunnable(Long requestId, Subject subject) {- return new Runnable() {-- @Override- public void run() {- try {- ThreadContext.bind(subject);- check(load(requestId));- } catch (Exception e) {- logger.error("Error checking pull request status", e);- } finally {- ThreadContext.unbindSubject();- }- }-- };- }-- @Sessional- protected void checkAsync(PullRequest request) {- Long requestId = request.getId();- Subject subject = SecurityUtils.getSubject();- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- dao.getSessionManager().runAsync(newCheckStatusRunnable(requestId, subject));- }-- });- }-- @Transactional- @Override- public void checkQuality(PullRequest request) {- BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());- if (branchProtection != null) {- checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());-- if (branchProtection.getConfigurations() != null)- checkBuilds(request, branchProtection.getConfigurations(), branchProtection.isBuildMerges());-- Set<FileProtection> checkedFileProtections = new HashSet<>();- for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {- if (checkedFileProtections.containsAll(branchProtection.getFileProtections()))- break;- PullRequestUpdate update = request.getSortedUpdates().get(i);- for (String file: update.getChangedFiles()) {- FileProtection fileProtection = branchProtection.getFileProtection(file);- if (fileProtection != null- && !checkedFileProtections.contains(fileProtection)) {- checkedFileProtections.add(fileProtection);- checkReviews(ReviewRequirement.fromString(fileProtection.getReviewRequirement()), update);- }- }- }-- ProjectFacade project = request.getTargetProject().getFacade();- Permission writeCode = new ProjectPermission(project, ProjectPrivilege.CODE_WRITE);- if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {- Collection<User> writers = new ArrayList<>();- for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.CODE_WRITE))- writers.add(userManager.load(facade.getId()));- checkReviews(writers, 1, request.getLatestUpdate());- }- }- }-- private void checkBuilds(PullRequest request, List<String> configurationNames, boolean buildMerges) {- String commit;- if (buildMerges) {- MergePreview preview = request.getMergePreview();- if (preview != null && preview.getMerged() != null)- commit = preview.getMerged();- else- commit = null;- } else {- commit = request.getHeadCommitHash();- }-- Map<Configuration, Build> builds = new HashMap<>();- if (commit != null) {- for (Build build: buildManager.query(request.getTargetProject(), commit))- builds.put(build.getConfiguration(), build);- }- Collection<Configuration> configurations = new HashSet<>();- for (String configurationName: configurationNames) {- Configuration configuration = configurationManager.find(request.getTargetProject(), configurationName);- if (configuration != null) {- configurations.add(configuration);- PullRequestBuild pullRequestBuild = request.getBuild(configuration);- if (pullRequestBuild == null) {- pullRequestBuild = new PullRequestBuild();- pullRequestBuild.setConfiguration(configuration);- pullRequestBuild.setRequest(request);- request.getBuilds().add(pullRequestBuild);- }- pullRequestBuild.setBuild(builds.get(configuration));- } else {- String errorMessage = String.format("Unable to find configuration (project: %s, name: %s)",- request.getTargetProject().getName(), configurationName);- throw new OneException(errorMessage);- }- }-- for (Iterator<PullRequestBuild> it = request.getBuilds().iterator(); it.hasNext();) {- if (!configurations.contains(it.next().getConfiguration()))- it.remove();- }- }-- private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update) {- PullRequest request = update.getRequest();-- for (User user: reviewRequirement.getUsers()) {- if (!user.equals(request.getSubmitter())) {- PullRequestReview review = request.getReview(user);- if (review == null) {- review = new PullRequestReview();- review.setRequest(request);- review.setUser(user);- request.getReviews().add(review);- } else if (review.getExcludeDate() != null) {- review.setExcludeDate(null);- } else if (review.getUpdate() == null || review.getUpdate().getId()<update.getId()) {- review.setResult(null);- }- }- }-- for (Map.Entry<Group, Integer> entry: reviewRequirement.getGroups().entrySet()) {- Group group = entry.getKey();- int requiredCount = entry.getValue();- checkReviews(group.getMembers(), requiredCount, update);- }- }-- private void checkReviews(Collection<User> users, int requiredCount, PullRequestUpdate update) {- PullRequest request = update.getRequest();-- if (requiredCount == 0)- requiredCount = users.size();-- int effectiveCount = 0;- Set<User> potentialReviewers = new HashSet<>();- for (User user: users) {- if (user.equals(request.getSubmitter())) {- effectiveCount++;- } else {- PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() == null) {- if (review.getResult() == null)- requiredCount--;- else if (review.getUpdate() != null && review.getUpdate().getId()>=update.getId())- effectiveCount++;- else- potentialReviewers.add(user);- } else {- potentialReviewers.add(user);- }- }- if (effectiveCount >= requiredCount)- break;- }-- int missingCount = requiredCount - effectiveCount;- Set<User> reviewers = new HashSet<>();-- List<User> candidateReviewers = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() == null)- candidateReviewers.add(user);- }-- sortByContributions(candidateReviewers, update);-- for (User user: candidateReviewers) {- reviewers.add(user);- request.getReview(user).setResult(null);- if (reviewers.size() == missingCount)- break;- }-- if (reviewers.size() < missingCount) {- candidateReviewers = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review == null)- candidateReviewers.add(user);- }- sortByContributions(candidateReviewers, update);- for (User user: candidateReviewers) {- reviewers.add(user);- PullRequestReview review = new PullRequestReview();- review.setRequest(request);- review.setUser(user);- request.getReviews().add(review);- if (reviewers.size() == missingCount)- break;- }- }-- if (reviewers.size() < missingCount) {- List<PullRequestReview> excludedReviews = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() != null)- excludedReviews.add(review);- }- excludedReviews.sort(Comparator.comparing(PullRequestReview::getExcludeDate));-- for (PullRequestReview review: excludedReviews) {- reviewers.add(review.getUser());- review.setExcludeDate(null);- if (reviewers.size() == missingCount)- break;- }- }- if (reviewers.size() < missingCount) {- String errorMessage = String.format("Impossible to provide required number of reviewers "- + "(candidates: %s, required number of reviewers: %d, pull request: #%d)",- reviewers, missingCount, update.getRequest().getNumber());- throw new OneException(errorMessage);- }- }-- private void sortByContributions(List<User> users, PullRequestUpdate update) {- if (users.size() <= 1)- return;-- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- Map<User, Long> contributions = new HashMap<>();- for (User user: users)- contributions.put(user, 0L);-- int count = 0;- for (FileChange change: update.getFileChanges()) {- String path = change.getPath();- int edits = change.getAdditions() + change.getDeletions();- if (edits < 0)- edits = 100;- else if (edits == 0)- edits = 1;- int addedContributions = addContributions(contributions, commitInfoManager, path, edits, update);- while (addedContributions == 0) {- if (path.contains("/")) {- path = StringUtils.substringBeforeLast(path, "/");- addedContributions = addContributions(contributions, commitInfoManager, path, edits, update);- } else {- addContributions(contributions, commitInfoManager, "", edits, update);- break;- }- }- if (++count >= MAX_CONTRIBUTION_FILES)- break;- }-- Collections.sort(users, new Comparator<User>() {-- @Override- public int compare(User o1, User o2) {- if (contributions.get(o1) < contributions.get(o2))- return 1;- else- return -1;- }-- });- }-- private int addContributions(Map<User, Long> contributions, CommitInfoManager commitInfoManager,- String path, int edits, PullRequestUpdate update) {- int addedContributions = 0;- for (Map.Entry<User, Long> entry: contributions.entrySet()) {- User user = entry.getKey();- int pathEdits = commitInfoManager.getEdits(- update.getRequest().getTargetProject().getFacade(), user.getFacade(), path);- entry.setValue(entry.getValue() + edits*pathEdits);- addedContributions += pathEdits;- }- return addedContributions;- }-- @Transactional- @Override- public Collection<PullRequest> queryOpenByCommit(String commitHash) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(PullRequest.CriterionHelper.ofOpen());- Criterion verifyCommitCriterion = Restrictions.or(- Restrictions.eq("headCommitHash", commitHash),- Restrictions.eq("lastMergePreview.merged", commitHash));- criteria.add(verifyCommitCriterion);- return query(criteria);- }-- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,- Project targetProject, User user, QueryBuildContext<PullRequest> context) {- List<Predicate> predicates = new ArrayList<>();- predicates.add(context.getBuilder().equal(context.getRoot().get("targetProject"), targetProject));- if (criteria != null)- predicates.add(criteria.getPredicate(targetProject, context, user));- return predicates.toArray(new Predicate[0]);- }-- private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, Project targetProject, User user,- EntityQuery<PullRequest> requestQuery) {- CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);- Root<PullRequest> root = query.from(PullRequest.class);- query.select(root).distinct(true);-- QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);- query.where(getPredicates(requestQuery.getCriteria(), targetProject, user, context));-- List<javax.persistence.criteria.Order> orders = new ArrayList<>();- for (EntitySort sort: requestQuery.getSorts()) {- if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));- else- orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));- }-- if (orders.isEmpty())- orders.add(builder.desc(root.get("number")));- query.orderBy(orders);-- return query;- }-- @Sessional- @Override- public List<PullRequest> query(Project targetProject, User user, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {- CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, user, requestQuery);- Query<PullRequest> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- return query.getResultList();- }-- @Sessional- @Override- public int count(Project targetProject, User user, io.onedev.server.search.entity.EntityCriteria<PullRequest> requestCriteria) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);- Root<PullRequest> root = criteriaQuery.from(PullRequest.class);-- QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);- criteriaQuery.where(getPredicates(requestCriteria, targetProject, user, context));-- criteriaQuery.select(builder.countDistinct(root));- return getSession().createQuery(criteriaQuery).uniqueResult().intValue();- }-- @Sessional- @Override- public PullRequest findOpen(ProjectAndBranch target, ProjectAndBranch source) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(ofTarget(target)).add(ofSource(source)).add(ofOpen());- return find(criteria);- }-- @Transactional- @Override- public PullRequest open(ProjectAndBranch source, ProjectAndBranch target, MergeStrategy mergeStrategy,- User submitter, String title) {- ObjectId baseCommitId = GitUtils.getMergeBase(- target.getProject().getRepository(), target.getObjectId(),- source.getProject().getRepository(), source.getObjectId(),- GitUtils.branch2ref(source.getBranch()));- if (baseCommitId != null) {- PullRequest request = new PullRequest();- request.setTarget(target);- request.setSource(source);- request.setSubmitter(submitter);- request.setTitle(title);- request.setBaseCommitHash(baseCommitId.name());- request.setHeadCommitHash(source.getObjectName());- PullRequestUpdate update = new PullRequestUpdate();- request.addUpdate(update);- update.setRequest(request);- update.setHeadCommitHash(request.getHeadCommitHash());- update.setMergeBaseCommitHash(request.getBaseCommitHash());- request.setMergeStrategy(mergeStrategy);- open(request);-- return request;- } else {- throw new OneException("No merge base found");- }- }-- @Sessional- @Override- public PullRequest find(Project targetProject, long number) {- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetProject", targetProject));- criteria.add(Restrictions.eq("number", number));- return find(criteria);- }-- @Sessional- @Override- public List<PullRequest> query(Project targetProject, String term, int count) {- List<PullRequest> requests = new ArrayList<>();-- Long number = null;- String numberStr = term;- if (numberStr != null) {- numberStr = numberStr.trim();- if (numberStr.startsWith("#"))- numberStr = numberStr.substring(1);- if (StringUtils.isNumeric(numberStr))- number = Long.valueOf(numberStr);- }-- if (number != null) {- PullRequest request = find(targetProject, number);- if (request != null)- requests.add(request);- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetProject", targetProject));- criteria.add(Restrictions.and(- Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%"),- Restrictions.ilike("numberStr", term + "%")),- Restrictions.ne("number", number)- ));- criteria.addOrder(Order.desc("number"));- requests.addAll(query(criteria, 0, count-requests.size()));- } else {- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetProject", targetProject));- if (StringUtils.isNotBlank(term)) {- criteria.add(Restrictions.or(- Restrictions.ilike("title", "%" + term + "%"),- Restrictions.ilike("noSpaceTitle", "%" + term + "%"),- Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%")));- }- criteria.addOrder(Order.desc("number"));- requests.addAll(query(criteria, 0, count));- }- return requests;- }-- @Transactional- @Override- public void delete(User user, PullRequest request) {- delete(request);- listenerRegistry.post(new PullRequestDeleted(user, request));- }--}+package io.onedev.server.entitymanager.impl;++import static io.onedev.server.model.PullRequest.CriterionHelper.ofOpen;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofSource;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofSourceProject;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofSubmitter;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import java.util.Set;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;++import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authz.Permission;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;+import org.apache.wicket.request.cycle.RequestCycle;+import org.eclipse.jgit.lib.CommitBuilder;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.ObjectInserter;+import org.eclipse.jgit.lib.PersonIdent;+import org.eclipse.jgit.lib.RefUpdate;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevWalk;+import org.hibernate.Session;+import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;+import org.joda.time.DateTime;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Preconditions;++import io.onedev.commons.launcher.loader.Listen;+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;+import io.onedev.server.event.pullrequest.PullRequestBuildEvent;+import io.onedev.server.event.pullrequest.PullRequestChangeEvent;+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.event.pullrequest.PullRequestMergePreviewCalculated;+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.model.Build;+import io.onedev.server.model.Configuration;+import io.onedev.server.model.Group;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.PullRequestChange;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.User;+import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.model.support.FileProtection;+import io.onedev.server.model.support.ProjectAndBranch;+import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.support.pullrequest.MergePreview;+import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;+import 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.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;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.search.entity.EntitySort;+import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.QueryBuildContext;+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+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.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;++@Singleton+public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {++ private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);++ private static final int MAX_CONTRIBUTION_FILES = 100;++ private static final int UI_PREVIEW_PRIORITY = 10;++ private static final int BACKEND_PREVIEW_PRIORITY = 50;++ private final PullRequestUpdateManager pullRequestUpdateManager;++ private final UserManager userManager;++ private final SessionManager sessionManager;++ private final ListenerRegistry listenerRegistry;++ private final PullRequestReviewManager pullRequestReviewManager;++ private final PullRequestBuildManager pullRequestBuildManager;++ private final BatchWorkManager batchWorkManager;++ private final PullRequestChangeManager pullRequestChangeManager;++ private final ConfigurationManager configurationManager;++ private final BuildManager buildManager;++ private final TransactionManager transactionManager;++ @Inject+ public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,+ PullRequestReviewManager pullRequestReviewManager, UserManager userManager,+ MarkdownManager markdownManager, BatchWorkManager batchWorkManager,+ ListenerRegistry listenerRegistry, SessionManager sessionManager,+ PullRequestChangeManager pullRequestChangeManager, BuildManager buildManager,+ 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.sessionManager = sessionManager;+ this.listenerRegistry = listenerRegistry;+ this.pullRequestChangeManager = pullRequestChangeManager;+ this.configurationManager = configurationManager;+ this.pullRequestBuildManager = pullRequestBuildManager;+ }++ @Transactional+ @Override+ public void delete(PullRequest request) {+ deleteRefs(request);+ dao.remove(request);+ }++ @Sessional+ @Override+ public void deleteRefs(PullRequest request) {+ for (PullRequestUpdate update : request.getUpdates())+ update.deleteRefs();++ request.deleteRefs();+ }++ @Transactional+ @Override+ public void restoreSourceBranch(PullRequest request, String note) {+ Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);+ if (request.getSource().getObjectName(false) == null) {+ RevCommit latestCommit = request.getHeadCommit();+ try {+ request.getSourceProject().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }+ request.getSourceProject().cacheObjectId(request.getSourceBranch(), latestCommit.copy());++ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setData(new PullRequestSourceBranchRestoreData(note));+ change.setRequest(request);+ change.setUser(userManager.getCurrent());+ pullRequestChangeManager.save(change);+ }+ }++ @Transactional+ @Override+ public void deleteSourceBranch(PullRequest request, String note) {+ Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);++ if (request.getSource().getObjectName(false) != null) {+ request.getSource().delete();++ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setData(new PullRequestSourceBranchDeleteData(note));+ change.setRequest(request);+ change.setUser(userManager.getCurrent());+ pullRequestChangeManager.save(change);+ }+ }++ @Transactional+ @Override+ public void reopen(PullRequest request, String note) {+ User user = userManager.getCurrent();+ request.setCloseInfo(null);++ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setData(new PullRequestReopenData(note));+ change.setRequest(request);+ change.setUser(user);+ pullRequestChangeManager.save(change);+ checkAsync(request);+ }++ @Transactional+ @Override+ public void discard(PullRequest request, String note) {+ User user = userManager.getCurrent();+ Date date = new Date();++ CloseInfo closeInfo = new CloseInfo();+ closeInfo.setDate(date);+ closeInfo.setUser(user);+ closeInfo.setStatus(CloseInfo.Status.DISCARDED);+ request.setCloseInfo(closeInfo);++ PullRequestChange change = new PullRequestChange();+ change.setDate(date);+ change.setData(new PullRequestDiscardData(note));+ change.setRequest(request);+ change.setUser(user);+ pullRequestChangeManager.save(change);+ }++ private void merge(PullRequest request) {+ MergePreview preview = Preconditions.checkNotNull(request.getMergePreview());+ String merged = Preconditions.checkNotNull(preview.getMerged());++ ObjectId mergedId = ObjectId.fromString(merged);+ RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedId);++ PersonIdent committer = new PersonIdent(OneDev.NAME, "");++ Project targetProject = request.getTargetProject();+ MergeStrategy strategy = request.getMergeStrategy();+ if ((strategy == CREATE_MERGE_COMMIT || strategy == CREATE_MERGE_COMMIT_IF_NECESSARY || strategy == SQUASH_SOURCE_BRANCH_COMMITS)+ && !preview.getMerged().equals(preview.getRequestHead())+ && !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {+ try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());+ ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {+ CommitBuilder newCommit = new CommitBuilder();+ newCommit.setAuthor(mergedCommit.getAuthorIdent());+ newCommit.setCommitter(committer);+ newCommit.setMessage(request.getCommitMessage());+ newCommit.setTreeId(mergedCommit.getTree());+ newCommit.setParentIds(mergedCommit.getParents());+ mergedId = inserter.insert(newCommit);+ merged = mergedId.name();+ inserter.flush();+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }+ preview = new MergePreview(preview.getTargetHead(), preview.getRequestHead(),+ preview.getMergeStrategy(), merged);+ request.setLastMergePreview(preview);+ RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), request.getMergeRef());+ refUpdate.setNewObjectId(mergedId);+ GitUtils.updateRef(refUpdate);+ }++ closeAsMerged(request, false);++ String targetRef = request.getTargetRef();+ ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHead());+ RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), targetRef);+ refUpdate.setRefLogIdent(committer);+ refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);+ refUpdate.setExpectedOldObjectId(targetHeadId);+ refUpdate.setNewObjectId(mergedId);+ GitUtils.updateRef(refUpdate);++ request.getTargetProject().cacheObjectId(request.getTargetRef(), mergedId);++ Long requestId = request.getId();+ Subject subject = SecurityUtils.getSubject();+ ObjectId newTargetHeadId = mergedId;+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ 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();+ }+ }++ });+ }+ });+ }++ @Transactional+ @Override+ public void open(PullRequest request) {+ Preconditions.checkArgument(request.isNew());+ Query<?> query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");+ query.setParameter("project", request.getTargetProject());+ request.setNumber(getNextNumber(request.getTargetProject(), query));++ dao.persist(request);++ RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getBaseRef());+ refUpdate.setNewObjectId(ObjectId.fromString(request.getBaseCommitHash()));+ GitUtils.updateRef(refUpdate);++ refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getHeadRef());+ refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));+ GitUtils.updateRef(refUpdate);++ for (PullRequestUpdate update: request.getUpdates())+ pullRequestUpdateManager.save(update, false);++ pullRequestReviewManager.saveReviews(request);+ pullRequestBuildManager.saveBuilds(request);++ checkAsync(request);++ listenerRegistry.post(new PullRequestOpened(request));+ }++ private void closeAsMerged(PullRequest request, boolean dueToMerged) {+ Date date = new DateTime().plusMillis(1).toDate();++ if (dueToMerged)+ request.setLastMergePreview(null);++ CloseInfo closeInfo = new CloseInfo();+ closeInfo.setDate(date);+ closeInfo.setStatus(CloseInfo.Status.MERGED);+ request.setCloseInfo(closeInfo);++ String reason = null;+ if (dueToMerged)+ reason = "closed pull request as source branch is merged into target branch";++ PullRequestChange change = new PullRequestChange();+ change.setDate(date);+ change.setData(new PullRequestMergeData(reason));+ change.setRequest(request);+ pullRequestChangeManager.save(change);+ }++ private void checkUpdate(PullRequest request) {+ if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {+ ObjectId mergeBase = GitUtils.getMergeBase(+ request.getTargetProject().getRepository(), request.getTarget().getObjectId(),+ request.getSourceProject().getRepository(), request.getSource().getObjectId(),+ GitUtils.branch2ref(request.getSourceBranch()));+ if (mergeBase != null) {+ PullRequestUpdate update = new PullRequestUpdate();+ update.setRequest(request);+ update.setHeadCommitHash(request.getSource().getObjectName());+ update.setMergeBaseCommitHash(mergeBase.name());+ request.addUpdate(update);+ pullRequestUpdateManager.save(update, true);++ RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),+ request.getHeadRef());+ refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));+ GitUtils.updateRef(refUpdate);+ }+ }+ }++ @Transactional+ @Override+ public void check(PullRequest request) {+ if (request.isOpen() && request.isValid()) {+ if (request.getSourceProject() == null) {+ discard(request, "Source project no longer exists");+ } else if (request.getSource().getObjectId(false) == null) {+ discard(request, "Source branch no longer exists");+ } else if (request.getTarget().getObjectId(false) == null) {+ discard(request, "Target branch no longer exists");+ } else {+ checkUpdate(request);+ if (request.isMergeIntoTarget()) {+ closeAsMerged(request, true);+ } else {+ checkQuality(request);++ pullRequestReviewManager.saveReviews(request);+ pullRequestBuildManager.saveBuilds(request);++ MergePreview mergePreview = request.getMergePreview();++ if (request.isAllReviewsApproved() && request.isAllBuildsSuccessful()+ && mergePreview != null && mergePreview.getMerged() != null) {+ merge(request);+ }+ }+ }+ }+ }++ @Sessional+ @Override+ public MergePreview previewMerge(PullRequest request) {+ if (!request.isNew() && request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE) {+ MergePreview lastPreview = request.getLastMergePreview();+ if (request.isOpen() && !request.isMergeIntoTarget()) {+ if (lastPreview == null || !lastPreview.isUpToDate(request)) {+ int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;+ Long requestId = request.getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ batchWorkManager.submit(getMergePreviewer(requestId), new Prioritized(priority));+ }++ });+ return null;+ } else {+ lastPreview.syncRef(request);+ return lastPreview;+ }+ } else {+ return lastPreview;+ }+ } else {+ return null;+ }+ }++ private BatchWorker getMergePreviewer(Long requestId) {+ return new BatchWorker("request-" + requestId + "-previewMerge", 1) {++ @Override+ public void doWorks(Collection<Prioritized> works) {+ sessionManager.run(new Runnable() {++ @Override+ public void run() {+ Preconditions.checkState(works.size() == 1);+ PullRequest request = load(requestId);+ Project targetProject = request.getTargetProject();+ MergePreview mergePreview = request.getLastMergePreview();+ if (request.isOpen() && !request.isMergeIntoTarget()) {+ if (mergePreview == null || !mergePreview.isUpToDate(request)) {+ mergePreview = new MergePreview(request.getTarget().getObjectName(),+ request.getHeadCommitHash(), request.getMergeStrategy(), null);+ logger.debug("Calculating merge preview of pull request #{} in project '{}'...",+ request.getNumber(), targetProject.getName());+ ObjectId merged = mergePreview.getMergeStrategy().merge(request);+ if (merged != null)+ mergePreview.setMerged(merged.name());+ mergePreview.syncRef(request);+ request.setLastMergePreview(mergePreview);+ dao.persist(request);+ listenerRegistry.post(new PullRequestMergePreviewCalculated(request));+ } else {+ mergePreview.syncRef(request);+ }+ }+ }++ });+ }++ };+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Project project = (Project) event.getEntity();+ for (PullRequest request: project.getOutgoingRequests()) {+ if (!request.getTargetProject().equals(project) && request.isOpen())+ discard(request, "Source project is deleted.");+ }++ Query<?> query = getSession().createQuery("update PullRequest set sourceProject=null where "+ + "sourceProject=:project");+ query.setParameter("project", project);+ query.executeUpdate();+ }+ }++ @Transactional+ @Listen+ public void on(RefUpdated event) {+ String branch = GitUtils.ref2branch(event.getRefName());+ if (branch != null && !event.getOldCommitId().equals(ObjectId.zeroId())) {+ ProjectAndBranch projectAndBranch = new ProjectAndBranch(event.getProject(), branch);+ Criterion criterion = Restrictions.and(+ ofOpen(),+ Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));+ for (PullRequest request: query(EntityCriteria.of(PullRequest.class).add(criterion))) {+ check(request);+ }+ }+ }++ @Sessional+ @Override+ public PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ Criterion merged = Restrictions.and(+ Restrictions.eq("closeInfo.status", CloseInfo.Status.MERGED),+ Restrictions.eq("lastMergePreview.requestHead", source.getObjectName()));++ criteria.add(ofTarget(target)).add(ofSource(source)).add(Restrictions.or(ofOpen(), merged));++ return find(criteria);+ }++ @Sessional+ @Override+ public PullRequest findLatest(Project targetProject, User submitter) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(ofOpen());+ criteria.add(Restrictions.or(ofSourceProject(targetProject), ofTargetProject(targetProject)));+ criteria.add(ofSubmitter(submitter));+ criteria.addOrder(Order.desc("id"));+ return find(criteria);+ }++ @Sessional+ @Override+ public Collection<PullRequest> queryOpenTo(ProjectAndBranch target) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(ofTarget(target));+ criteria.add(ofOpen());+ return query(criteria);+ }++ @Sessional+ @Override+ public Collection<PullRequest> queryOpen(ProjectAndBranch sourceOrTarget) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(ofOpen());+ criteria.add(Restrictions.or(ofSource(sourceOrTarget), ofTarget(sourceOrTarget)));+ return query(criteria);+ }++ @Sessional+ @Override+ public int countOpen(Project targetProject) {+ EntityCriteria<PullRequest> criteria = newCriteria();+ criteria.add(PullRequest.CriterionHelper.ofOpen());+ criteria.add(PullRequest.CriterionHelper.ofTargetProject(targetProject));+ return count(criteria);+ }++ @Transactional+ @Listen+ public void on(PullRequestChangeEvent event) {+ PullRequestChangeData data = event.getChange().getData();+ if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData+ || data instanceof PullRequestReviewerRemoveData || data instanceof PullRequestReviewerAddData+ || data instanceof PullRequestMergeStrategyChangeData) {+ checkAsync(event.getRequest());+ }+ }++ @Transactional+ @Listen+ public void on(PullRequestEvent event) {+ if (!(event instanceof PullRequestDeleted) && !(event instanceof PullRequestMergePreviewCalculated)+ && !(event instanceof PullRequestBuildEvent))+ event.getRequest().setUpdateDate(event.getDate());+ }++ @Transactional+ @Listen+ public void on(PullRequestCodeCommentEvent event) {+ event.getRequest().setLastCodeCommentActivityDate(event.getDate());+ }++ @Listen+ @Transactional+ public void on(BuildEvent event) {+ Build build = event.getBuild();+ for (PullRequest request: queryOpenByCommit(build.getCommitHash())) {+ listenerRegistry.post(new PullRequestBuildEvent(request, build));+ if (build.getStatus() != Build.Status.RUNNING)+ checkAsync(request);+ }+ }++ @Listen+ public void on(PullRequestMergePreviewCalculated event) {+ checkAsync(event.getRequest());+ }++ private Runnable newCheckStatusRunnable(Long requestId, Subject subject) {+ return new Runnable() {++ @Override+ public void run() {+ try {+ ThreadContext.bind(subject);+ check(load(requestId));+ } catch (Exception e) {+ logger.error("Error checking pull request status", e);+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ };+ }++ @Sessional+ protected void checkAsync(PullRequest request) {+ Long requestId = request.getId();+ Subject subject = SecurityUtils.getSubject();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ dao.getSessionManager().runAsync(newCheckStatusRunnable(requestId, subject));+ }++ });+ }++ @Transactional+ @Override+ public void checkQuality(PullRequest request) {+ BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());+ if (branchProtection != null) {+ checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());++ if (branchProtection.getConfigurations() != null)+ checkBuilds(request, branchProtection.getConfigurations(), branchProtection.isBuildMerges());++ Set<FileProtection> checkedFileProtections = new HashSet<>();+ for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {+ if (checkedFileProtections.containsAll(branchProtection.getFileProtections()))+ break;+ PullRequestUpdate update = request.getSortedUpdates().get(i);+ for (String file: update.getChangedFiles()) {+ FileProtection fileProtection = branchProtection.getFileProtection(file);+ if (fileProtection != null+ && !checkedFileProtections.contains(fileProtection)) {+ checkedFileProtections.add(fileProtection);+ checkReviews(ReviewRequirement.fromString(fileProtection.getReviewRequirement()), update);+ }+ }+ }++ ProjectFacade project = request.getTargetProject().getFacade();+ Permission writeCode = new ProjectPermission(project, ProjectPrivilege.CODE_WRITE);+ if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {+ Collection<User> writers = new ArrayList<>();+ for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.CODE_WRITE))+ writers.add(userManager.load(facade.getId()));+ checkReviews(writers, 1, request.getLatestUpdate());+ }+ }+ }++ private void checkBuilds(PullRequest request, List<String> configurationNames, boolean buildMerges) {+ String commit;+ if (buildMerges) {+ MergePreview preview = request.getMergePreview();+ if (preview != null && preview.getMerged() != null)+ commit = preview.getMerged();+ else+ commit = null;+ } else {+ commit = request.getHeadCommitHash();+ }++ Map<Configuration, Build> builds = new HashMap<>();+ if (commit != null) {+ for (Build build: buildManager.query(request.getTargetProject(), commit))+ builds.put(build.getConfiguration(), build);+ }+ Collection<Configuration> configurations = new HashSet<>();+ for (String configurationName: configurationNames) {+ Configuration configuration = configurationManager.find(request.getTargetProject(), configurationName);+ if (configuration != null) {+ configurations.add(configuration);+ PullRequestBuild pullRequestBuild = request.getBuild(configuration);+ if (pullRequestBuild == null) {+ pullRequestBuild = new PullRequestBuild();+ pullRequestBuild.setConfiguration(configuration);+ pullRequestBuild.setRequest(request);+ request.getBuilds().add(pullRequestBuild);+ }+ pullRequestBuild.setBuild(builds.get(configuration));+ } else {+ String errorMessage = String.format("Unable to find configuration (project: %s, name: %s)",+ request.getTargetProject().getName(), configurationName);+ throw new OneException(errorMessage);+ }+ }++ for (Iterator<PullRequestBuild> it = request.getBuilds().iterator(); it.hasNext();) {+ if (!configurations.contains(it.next().getConfiguration()))+ it.remove();+ }+ }++ private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update) {+ PullRequest request = update.getRequest();++ for (User user: reviewRequirement.getUsers()) {+ if (!user.equals(request.getSubmitter())) {+ PullRequestReview review = request.getReview(user);+ if (review == null) {+ review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(user);+ request.getReviews().add(review);+ } else if (review.getExcludeDate() != null) {+ review.setExcludeDate(null);+ } else if (review.getUpdate() == null || review.getUpdate().getId()<update.getId()) {+ review.setResult(null);+ }+ }+ }++ for (Map.Entry<Group, Integer> entry: reviewRequirement.getGroups().entrySet()) {+ Group group = entry.getKey();+ int requiredCount = entry.getValue();+ checkReviews(group.getMembers(), requiredCount, update);+ }+ }++ private void checkReviews(Collection<User> users, int requiredCount, PullRequestUpdate update) {+ PullRequest request = update.getRequest();++ if (requiredCount == 0)+ requiredCount = users.size();++ int effectiveCount = 0;+ Set<User> potentialReviewers = new HashSet<>();+ for (User user: users) {+ if (user.equals(request.getSubmitter())) {+ effectiveCount++;+ } else {+ PullRequestReview review = request.getReview(user);+ if (review != null && review.getExcludeDate() == null) {+ if (review.getResult() == null)+ requiredCount--;+ else if (review.getUpdate() != null && review.getUpdate().getId()>=update.getId())+ effectiveCount++;+ else+ potentialReviewers.add(user);+ } else {+ potentialReviewers.add(user);+ }+ }+ if (effectiveCount >= requiredCount)+ break;+ }++ int missingCount = requiredCount - effectiveCount;+ Set<User> reviewers = new HashSet<>();++ List<User> candidateReviewers = new ArrayList<>();+ for (User user: potentialReviewers) {+ PullRequestReview review = request.getReview(user);+ if (review != null && review.getExcludeDate() == null)+ candidateReviewers.add(user);+ }++ sortByContributions(candidateReviewers, update);++ for (User user: candidateReviewers) {+ reviewers.add(user);+ request.getReview(user).setResult(null);+ if (reviewers.size() == missingCount)+ break;+ }++ if (reviewers.size() < missingCount) {+ candidateReviewers = new ArrayList<>();+ for (User user: potentialReviewers) {+ PullRequestReview review = request.getReview(user);+ if (review == null)+ candidateReviewers.add(user);+ }+ sortByContributions(candidateReviewers, update);+ for (User user: candidateReviewers) {+ reviewers.add(user);+ PullRequestReview review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(user);+ request.getReviews().add(review);+ if (reviewers.size() == missingCount)+ break;+ }+ }++ if (reviewers.size() < missingCount) {+ List<PullRequestReview> excludedReviews = new ArrayList<>();+ for (User user: potentialReviewers) {+ PullRequestReview review = request.getReview(user);+ if (review != null && review.getExcludeDate() != null)+ excludedReviews.add(review);+ }+ excludedReviews.sort(Comparator.comparing(PullRequestReview::getExcludeDate));++ for (PullRequestReview review: excludedReviews) {+ reviewers.add(review.getUser());+ review.setExcludeDate(null);+ if (reviewers.size() == missingCount)+ break;+ }+ }+ if (reviewers.size() < missingCount) {+ String errorMessage = String.format("Impossible to provide required number of reviewers "+ + "(candidates: %s, required number of reviewers: %d, pull request: #%d)",+ reviewers, missingCount, update.getRequest().getNumber());+ throw new OneException(errorMessage);+ }+ }++ private void sortByContributions(List<User> users, PullRequestUpdate update) {+ if (users.size() <= 1)+ return;++ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ Map<User, Long> contributions = new HashMap<>();+ for (User user: users)+ contributions.put(user, 0L);++ int count = 0;+ for (FileChange change: update.getFileChanges()) {+ String path = change.getPath();+ int edits = change.getAdditions() + change.getDeletions();+ if (edits < 0)+ edits = 100;+ else if (edits == 0)+ edits = 1;+ int addedContributions = addContributions(contributions, commitInfoManager, path, edits, update);+ while (addedContributions == 0) {+ if (path.contains("/")) {+ path = StringUtils.substringBeforeLast(path, "/");+ addedContributions = addContributions(contributions, commitInfoManager, path, edits, update);+ } else {+ addContributions(contributions, commitInfoManager, "", edits, update);+ break;+ }+ }+ if (++count >= MAX_CONTRIBUTION_FILES)+ break;+ }++ Collections.sort(users, new Comparator<User>() {++ @Override+ public int compare(User o1, User o2) {+ if (contributions.get(o1) < contributions.get(o2))+ return 1;+ else+ return -1;+ }++ });+ }++ private int addContributions(Map<User, Long> contributions, CommitInfoManager commitInfoManager,+ String path, int edits, PullRequestUpdate update) {+ int addedContributions = 0;+ for (Map.Entry<User, Long> entry: contributions.entrySet()) {+ User user = entry.getKey();+ int pathEdits = commitInfoManager.getEdits(+ update.getRequest().getTargetProject().getFacade(), user.getFacade(), path);+ entry.setValue(entry.getValue() + edits*pathEdits);+ addedContributions += pathEdits;+ }+ return addedContributions;+ }++ @Transactional+ @Override+ public Collection<PullRequest> queryOpenByCommit(String commitHash) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(PullRequest.CriterionHelper.ofOpen());+ Criterion verifyCommitCriterion = Restrictions.or(+ Restrictions.eq("headCommitHash", commitHash),+ Restrictions.eq("lastMergePreview.merged", commitHash));+ criteria.add(verifyCommitCriterion);+ return query(criteria);+ }++ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,+ Project targetProject, User user, QueryBuildContext<PullRequest> context) {+ List<Predicate> predicates = new ArrayList<>();+ predicates.add(context.getBuilder().equal(context.getRoot().get("targetProject"), targetProject));+ if (criteria != null)+ predicates.add(criteria.getPredicate(targetProject, context, user));+ return predicates.toArray(new Predicate[0]);+ }++ private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, Project targetProject, User user,+ EntityQuery<PullRequest> requestQuery) {+ CriteriaBuilder builder = session.getCriteriaBuilder();+ CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);+ Root<PullRequest> root = query.from(PullRequest.class);+ query.select(root).distinct(true);++ QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);+ query.where(getPredicates(requestQuery.getCriteria(), targetProject, user, context));++ List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ for (EntitySort sort: requestQuery.getSorts()) {+ if (sort.getDirection() == Direction.ASCENDING)+ orders.add(builder.asc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));+ else+ orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));+ }++ if (orders.isEmpty())+ orders.add(builder.desc(root.get("number")));+ query.orderBy(orders);++ return query;+ }++ @Sessional+ @Override+ public List<PullRequest> query(Project targetProject, User user, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {+ CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, user, requestQuery);+ Query<PullRequest> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(firstResult);+ query.setMaxResults(maxResults);+ return query.getResultList();+ }++ @Sessional+ @Override+ public int count(Project targetProject, User user, io.onedev.server.search.entity.EntityCriteria<PullRequest> requestCriteria) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);+ Root<PullRequest> root = criteriaQuery.from(PullRequest.class);++ QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);+ criteriaQuery.where(getPredicates(requestCriteria, targetProject, user, context));++ criteriaQuery.select(builder.countDistinct(root));+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();+ }++ @Sessional+ @Override+ public PullRequest findOpen(ProjectAndBranch target, ProjectAndBranch source) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(ofTarget(target)).add(ofSource(source)).add(ofOpen());+ return find(criteria);+ }++ @Transactional+ @Override+ public PullRequest open(ProjectAndBranch source, ProjectAndBranch target, MergeStrategy mergeStrategy,+ User submitter, String title) {+ ObjectId baseCommitId = GitUtils.getMergeBase(+ target.getProject().getRepository(), target.getObjectId(),+ source.getProject().getRepository(), source.getObjectId(),+ GitUtils.branch2ref(source.getBranch()));+ if (baseCommitId != null) {+ PullRequest request = new PullRequest();+ request.setTarget(target);+ request.setSource(source);+ request.setSubmitter(submitter);+ request.setTitle(title);+ request.setBaseCommitHash(baseCommitId.name());+ request.setHeadCommitHash(source.getObjectName());+ PullRequestUpdate update = new PullRequestUpdate();+ request.addUpdate(update);+ update.setRequest(request);+ update.setHeadCommitHash(request.getHeadCommitHash());+ update.setMergeBaseCommitHash(request.getBaseCommitHash());+ request.setMergeStrategy(mergeStrategy);+ open(request);++ return request;+ } else {+ throw new OneException("No merge base found");+ }+ }++ @Sessional+ @Override+ public PullRequest find(Project targetProject, long number) {+ EntityCriteria<PullRequest> criteria = newCriteria();+ criteria.add(Restrictions.eq("targetProject", targetProject));+ criteria.add(Restrictions.eq("number", number));+ return find(criteria);+ }++ @Sessional+ @Override+ public List<PullRequest> query(Project targetProject, String term, int count) {+ List<PullRequest> requests = new ArrayList<>();++ Long number = null;+ String numberStr = term;+ if (numberStr != null) {+ numberStr = numberStr.trim();+ if (numberStr.startsWith("#"))+ numberStr = numberStr.substring(1);+ if (StringUtils.isNumeric(numberStr))+ number = Long.valueOf(numberStr);+ }++ if (number != null) {+ PullRequest request = find(targetProject, number);+ if (request != null)+ requests.add(request);+ EntityCriteria<PullRequest> criteria = newCriteria();+ criteria.add(Restrictions.eq("targetProject", targetProject));+ criteria.add(Restrictions.and(+ Restrictions.or(+ Restrictions.ilike("title", "%" + term + "%"),+ Restrictions.ilike("noSpaceTitle", "%" + term + "%"),+ Restrictions.ilike("numberStr", term + "%")),+ Restrictions.ne("number", number)+ ));+ criteria.addOrder(Order.desc("number"));+ requests.addAll(query(criteria, 0, count-requests.size()));+ } else {+ EntityCriteria<PullRequest> criteria = newCriteria();+ criteria.add(Restrictions.eq("targetProject", targetProject));+ if (StringUtils.isNotBlank(term)) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("title", "%" + term + "%"),+ Restrictions.ilike("noSpaceTitle", "%" + term + "%"),+ Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%")));+ }+ criteria.addOrder(Order.desc("number"));+ requests.addAll(query(criteria, 0, count));+ }+ return requests;+ }++ @Transactional+ @Override+ public void delete(User user, PullRequest request) {+ delete(request);+ listenerRegistry.post(new PullRequestDeleted(user, request));+ }++}diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.javaindex 0d89fce977..b0a630206b 100644--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java@@ -1,213 +1,213 @@-package io.onedev.server.entitymanager.impl;--import java.util.Iterator;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.apache.shiro.authc.credential.PasswordService;-import org.eclipse.jgit.lib.PersonIdent;-import org.hibernate.ReplicationMode;-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.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.BranchProtection;-import io.onedev.server.model.support.TagProtection;-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;--@Singleton-public class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {-- private final PasswordService passwordService;-- private final ProjectManager projectManager;-- private final SettingManager settingManager;-- private final IssueFieldEntityManager issueFieldEntityManager;-- private final CacheManager cacheManager;-- private final ListenerRegistry listenerRegistry;-- @Inject- public DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,- IssueFieldEntityManager issueFieldEntityManager, CacheManager cacheManager,- PasswordService passwordService, ListenerRegistry listenerRegistry) {- super(dao);-- this.passwordService = passwordService;- this.projectManager = projectManager;- this.settingManager = settingManager;- this.issueFieldEntityManager = issueFieldEntityManager;- this.cacheManager = cacheManager;- this.listenerRegistry = listenerRegistry;- }-- @Transactional- @Override- public void save(User user, String oldName) {- if (user.isRoot()) {- getSession().replicate(user, ReplicationMode.OVERWRITE);- listenerRegistry.post(new EntityPersisted(user, false));- } else {- dao.persist(user);- }-- if (oldName != null && !oldName.equals(user.getName())) {- for (Project project: projectManager.query()) {- for (BranchProtection protection: project.getBranchProtections())- protection.onRenameUser(project, oldName, user.getName());- for (TagProtection protection: project.getTagProtections())- protection.onRenameUser(oldName, user.getName());- project.getIssueSetting().onRenameUser(oldName, user.getName());- }-- issueFieldEntityManager.onRenameUser(oldName, user.getName());- settingManager.getIssueSetting().onRenameUser(oldName, user.getName());- }- }-- @Override- public void save(User user) {- save(user, null);- }-- @Sessional- @Override- public User getRoot() {- return load(User.ROOT_ID);- }-- @Transactional- @Override- public void delete(User user) {- Query<?> query = getSession().createQuery("update PullRequest set submitter=null, submitterName=:submitterName "- + "where submitter=:submitter");- query.setParameter("submitter", user);- query.setParameter("submitterName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update PullRequest set closeInfo.user=null, "- + "closeInfo.userName=:userName where closeInfo.user=:user");- query.setParameter("user", user);- query.setParameter("userName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update PullRequestChange set user=null, userName=:userName where user=:user");- query.setParameter("user", user);- query.setParameter("userName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update PullRequestComment set user=null, userName=:userName where user=:user");- query.setParameter("user", user);- query.setParameter("userName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update CodeComment set user=null, userName=:userName where user=:user");- query.setParameter("user", user);- query.setParameter("userName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update CodeCommentReply set user=null, userName=:userName where user=:user");- query.setParameter("user", user);- query.setParameter("userName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update Issue set submitter=null, submitterName=:submitterName "- + "where submitter=:submitter");- query.setParameter("submitter", user);- query.setParameter("submitterName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update IssueComment set user=null, userName=:userName where user=:user");- query.setParameter("user", user);- query.setParameter("userName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update IssueChange set user=null, userName=:userName where user=:user");- query.setParameter("user", user);- query.setParameter("userName", user.getDisplayName());- query.executeUpdate();-- dao.remove(user);-- for (Project project: projectManager.query()) {- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {- if (it.next().onDeleteUser(project, user.getName()))- it.remove();- }- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {- if (it.next().onDeleteUser(user.getName()))- it.remove();- }- project.getIssueSetting().onDeleteUser(user.getName());- }-- settingManager.getIssueSetting().onDeleteUser(user.getName());- }-- @Sessional- @Override- public User findByName(String userName) {- Long id = cacheManager.getUserIdByName(userName);- if (id != null)- return load(id);- else- return null;- }-- @Sessional- @Override- public User findByEmail(String email) {- Long id = cacheManager.getUserIdByEmail(email);- if (id != null)- return load(id);- else- return null;- }-- @Sessional- @Override- public User find(PersonIdent person) {- return findByEmail(person.getEmailAddress());- }-- @Override- public User getCurrent() {- Long userId = User.getCurrentId();- if (userId != 0L) {- User user = get(userId);- if (user != null)- return user;- }- return null;- }-- @Listen- public void on(SystemStarted event) {- for (User user: query()) {- // Fix a critical issue that password of self-registered users are not hashed- if (StringUtils.isNotBlank(user.getPassword()) && !user.getPassword().startsWith("$2a$10")- && !user.getPassword().startsWith("@hash^prefix@")) {- user.setPassword(passwordService.encryptPassword(user.getPassword()));- save(user);- }- }- }-+package io.onedev.server.entitymanager.impl;++import java.util.Iterator;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.apache.shiro.authc.credential.PasswordService;+import org.eclipse.jgit.lib.PersonIdent;+import org.hibernate.ReplicationMode;+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.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.model.support.TagProtection;+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;++@Singleton+public class DefaultUserManager extends AbstractEntityManager<User> implements UserManager {++ private final PasswordService passwordService;++ private final ProjectManager projectManager;++ private final SettingManager settingManager;++ private final IssueFieldEntityManager issueFieldEntityManager;++ private final CacheManager cacheManager;++ private final ListenerRegistry listenerRegistry;++ @Inject+ public DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,+ IssueFieldEntityManager issueFieldEntityManager, CacheManager cacheManager,+ PasswordService passwordService, ListenerRegistry listenerRegistry) {+ super(dao);++ this.passwordService = passwordService;+ this.projectManager = projectManager;+ this.settingManager = settingManager;+ this.issueFieldEntityManager = issueFieldEntityManager;+ this.cacheManager = cacheManager;+ this.listenerRegistry = listenerRegistry;+ }++ @Transactional+ @Override+ public void save(User user, String oldName) {+ if (user.isRoot()) {+ getSession().replicate(user, ReplicationMode.OVERWRITE);+ listenerRegistry.post(new EntityPersisted(user, false));+ } else {+ dao.persist(user);+ }++ if (oldName != null && !oldName.equals(user.getName())) {+ for (Project project: projectManager.query()) {+ for (BranchProtection protection: project.getBranchProtections())+ protection.onRenameUser(project, oldName, user.getName());+ for (TagProtection protection: project.getTagProtections())+ protection.onRenameUser(oldName, user.getName());+ project.getIssueSetting().onRenameUser(oldName, user.getName());+ }++ issueFieldEntityManager.onRenameUser(oldName, user.getName());+ settingManager.getIssueSetting().onRenameUser(oldName, user.getName());+ }+ }++ @Override+ public void save(User user) {+ save(user, null);+ }++ @Sessional+ @Override+ public User getRoot() {+ return load(User.ROOT_ID);+ }++ @Transactional+ @Override+ public void delete(User user) {+ Query<?> query = getSession().createQuery("update PullRequest set submitter=null, submitterName=:submitterName "+ + "where submitter=:submitter");+ query.setParameter("submitter", user);+ query.setParameter("submitterName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update PullRequest set closeInfo.user=null, "+ + "closeInfo.userName=:userName where closeInfo.user=:user");+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update PullRequestChange set user=null, userName=:userName where user=:user");+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update PullRequestComment set user=null, userName=:userName where user=:user");+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update CodeComment set user=null, userName=:userName where user=:user");+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update CodeCommentReply set user=null, userName=:userName where user=:user");+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update Issue set submitter=null, submitterName=:submitterName "+ + "where submitter=:submitter");+ query.setParameter("submitter", user);+ query.setParameter("submitterName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update IssueComment set user=null, userName=:userName where user=:user");+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());+ query.executeUpdate();++ query = getSession().createQuery("update IssueChange set user=null, userName=:userName where user=:user");+ query.setParameter("user", user);+ query.setParameter("userName", user.getDisplayName());+ query.executeUpdate();++ dao.remove(user);++ for (Project project: projectManager.query()) {+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {+ if (it.next().onDeleteUser(project, user.getName()))+ it.remove();+ }+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {+ if (it.next().onDeleteUser(user.getName()))+ it.remove();+ }+ project.getIssueSetting().onDeleteUser(user.getName());+ }++ settingManager.getIssueSetting().onDeleteUser(user.getName());+ }++ @Sessional+ @Override+ public User findByName(String userName) {+ Long id = cacheManager.getUserIdByName(userName);+ if (id != null)+ return load(id);+ else+ return null;+ }++ @Sessional+ @Override+ public User findByEmail(String email) {+ Long id = cacheManager.getUserIdByEmail(email);+ if (id != null)+ return load(id);+ else+ return null;+ }++ @Sessional+ @Override+ public User find(PersonIdent person) {+ return findByEmail(person.getEmailAddress());+ }++ @Override+ public User getCurrent() {+ Long userId = User.getCurrentId();+ if (userId != 0L) {+ User user = get(userId);+ if (user != null)+ return user;+ }+ return null;+ }++ @Listen+ public void on(SystemStarted event) {+ for (User user: query()) {+ // Fix a critical issue that password of self-registered users are not hashed+ if (StringUtils.isNotBlank(user.getPassword()) && !user.getPassword().startsWith("$2a$10")+ && !user.getPassword().startsWith("@hash^prefix@")) {+ user.setPassword(passwordService.encryptPassword(user.getPassword()));+ save(user);+ }+ }+ }+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.javaindex b4947f9413..be0c6b4ec5 100644--- a/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java+++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java@@ -1,923 +1,964 @@-package io.onedev.server.migration;--import java.io.File;-import java.io.IOException;-import java.nio.charset.StandardCharsets;-import java.util.HashMap;-import java.util.HashSet;-import java.util.Map;-import java.util.Set;-import java.util.Stack;--import javax.inject.Singleton;--import org.dom4j.Element;--import com.google.common.base.Charsets;--import io.onedev.commons.utils.FileUtils;-import io.onedev.commons.utils.StringUtils;--@Singleton-@SuppressWarnings("unused")-public class DatabaseMigrator {-- private void migrate1(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("CodeComments.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element branchRefElement = element.element("branchRef");- if (branchRefElement != null)- branchRefElement.detach();- }- dom.writeToFile(file, false);- }- }- }-- private void migrate2(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Depots.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element gateKeeperElement = element.element("gateKeeper");- gateKeeperElement.detach();- element.addElement("gateKeepers");- }- dom.writeToFile(file, false);- }- }- }-- private void migrate3(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- String name = element.getName();- name = StringUtils.replace(name, "com.pmease.commons", "com.gitplex.commons");- name = StringUtils.replace(name, "com.pmease.gitplex", "com.gitplex.server");- element.setName(name);- }- if (file.getName().startsWith("Configs.xml")) {- for (Element element: dom.getRootElement().elements()) {- Element settingElement = element.element("setting");- if (settingElement != null) {- String clazz = settingElement.attributeValue("class");- settingElement.addAttribute("class", StringUtils.replace(clazz, "com.pmease.gitplex", "com.gitplex.server"));- Element gitConfigElement = settingElement.element("gitConfig");- if (gitConfigElement != null) {- clazz = gitConfigElement.attributeValue("class");- gitConfigElement.addAttribute("class", StringUtils.replace(clazz, "com.pmease.gitplex", "com.gitplex.server"));- }- }- }- }- dom.writeToFile(file, false);- }- }-- private void migrate4(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Accounts.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element avatarUploadDateElement = element.element("avatarUploadDate");- if (avatarUploadDateElement != null)- avatarUploadDateElement.detach();- }- dom.writeToFile(file, false);- }- }- }-- private void migrate5(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Configs.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- if (element.elementTextTrim("key").equals("MAIL")) {- Element settingElement = element.element("setting");- if (settingElement != null)- settingElement.addElement("enableSSL").setText("false");- }- }- dom.writeToFile(file, false);- }- }- }-- private void migrate6(File dataDir, Stack<Integer> versions) {- }-- private void migrate7(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- try {- String content = FileUtils.readFileToString(file, Charsets.UTF_8);- content = StringUtils.replace(content,- "com.gitplex.commons.hibernate.migration.VersionTable",- "com.gitplex.server.model.ModelVersion");- content = StringUtils.replace(content,- "com.gitplex.server.core.entity.support.IntegrationPolicy",- "com.gitplex.server.model.support.IntegrationPolicy");- content = StringUtils.replace(content,- "com.gitplex.server.core.entity.PullRequest_-IntegrationStrategy",- "com.gitplex.server.model.PullRequest_-IntegrationStrategy");- content = StringUtils.replace(content,- "com.gitplex.server.core.entity.", "com.gitplex.server.model.");- content = StringUtils.replace(content,- "com.gitplex.server.core.setting.SpecifiedGit", "com.gitplex.server.git.config.SpecifiedGit");- content = StringUtils.replace(content,- "com.gitplex.server.core.setting.SystemGit", "com.gitplex.server.git.config.SystemGit");- content = StringUtils.replace(content,- "com.gitplex.server.core.setting.", "com.gitplex.server.model.support.setting.");- content = StringUtils.replace(content,- "com.gitplex.server.core.gatekeeper.", "com.gitplex.server.gatekeeper.");- FileUtils.writeStringToFile(file, content, Charsets.UTF_8);-- if (file.getName().equals("VersionTables.xml")) {- FileUtils.moveFile(file, new File(file.getParentFile(), "ModelVersions.xml"));- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }-- private void migrateIntegrationStrategy8(Element integrationStrategyElement) {- if (integrationStrategyElement != null) {- integrationStrategyElement.setName("mergeStrategy");- switch (integrationStrategyElement.getText()) {- case "MERGE_ALWAYS":- integrationStrategyElement.setText("ALWAYS_MERGE");- break;- case "MERGE_WITH_SQUASH":- integrationStrategyElement.setText("SQUASH_MERGE");- break;- case "REBASE_SOURCE_ONTO_TARGET":- integrationStrategyElement.setText("REBASE_MERGE");- break;- case "REBASE_TARGET_ONTO_SOURCE":- integrationStrategyElement.setText("MERGE_IF_NECESSARY");- break;- }- }- }-- private void migrate8(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Configs.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- if (element.elementTextTrim("key").equals("SYSTEM")) {- Element settingElement = element.element("setting");- settingElement.addElement("curlConfig")- .addAttribute("class", "com.gitplex.server.git.config.SystemCurl");- }- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("Accounts.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- element.element("reviewEffort").detach();- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("Depots.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- element.element("gateKeepers").detach();- element.element("integrationPolicies").detach();- element.addElement("branchProtections");- element.addElement("tagProtections");- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("PullRequests.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element assigneeElement = element.element("assignee");- if (assigneeElement != null)- assigneeElement.detach();- migrateIntegrationStrategy8(element.element("integrationStrategy"));- Element lastIntegrationPreviewElement = element.element("lastIntegrationPreview");- if (lastIntegrationPreviewElement != null) {- lastIntegrationPreviewElement.setName("lastMergePreview");- Element integratedElement = lastIntegrationPreviewElement.element("integrated");- if (integratedElement != null)- integratedElement.setName("merged");- migrateIntegrationStrategy8(lastIntegrationPreviewElement.element("integrationStrategy"));- }- Element closeInfoElement = element.element("closeInfo");- if (closeInfoElement != null) {- Element closeStatusElement = closeInfoElement.element("closeStatus");- if (closeStatusElement.getText().equals("INTEGRATED"))- closeStatusElement.setText("MERGED");- }- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("PullRequestReviews.xml")- || file.getName().startsWith("PullRequestReviewInvitations.xml")- || file.getName().startsWith("PullRequestStatusChanges.xml")- || file.getName().startsWith("PullRequestTasks.xml")- || file.getName().startsWith("PullRequestVerifications.xml")- || file.getName().startsWith("CodeComments.xml")- || file.getName().startsWith("CodeCommentRelations.xml")- || file.getName().startsWith("CodeCommentReplys.xml")- || file.getName().startsWith("CodeCommentStatusChanges.xml")) {- FileUtils.deleteFile(file);- } else if (file.getName().startsWith("PullRequestUpdates.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element mergeCommitHashElement = element.element("mergeCommitHash");- mergeCommitHashElement.setName("mergeBaseCommitHash");- }- dom.writeToFile(file, false);- }- }- }-- private void migrate9(File dataDir, Stack<Integer> versions) {- try {- Map<String, String> accountIdToName = new HashMap<>();- Set<String> userIds = new HashSet<>();- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Accounts.xml")) {- File renamedFile = new File(dataDir, file.getName().replace("Accounts.xml", "Users.xml"));- FileUtils.moveFile(file, renamedFile);- String content = FileUtils.readFileToString(renamedFile, Charsets.UTF_8);- content = StringUtils.replace(content, "com.gitplex.server.model.Account",- "com.gitplex.server.model.User");- VersionedDocument dom = VersionedDocument.fromXML(content);- for (Element element: dom.getRootElement().elements()) {- accountIdToName.put(element.elementText("id"), element.elementText("name"));- if (element.elementTextTrim("organization").equals("true")) {- element.detach();- } else {- userIds.add(element.elementText("id"));- element.element("organization").detach();- element.element("defaultPrivilege").detach();- element.element("noSpaceName").detach();- if (element.element("noSpaceFullName") != null)- element.element("noSpaceFullName").detach();- }- }- dom.writeToFile(renamedFile, false);- }- }-- long lastUserAuthorizationId = 0;- VersionedDocument userAuthorizationsDom = new VersionedDocument();- Element userAuthorizationListElement = userAuthorizationsDom.addElement("list");-- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Depots.xml")) {- File renamedFile = new File(dataDir, file.getName().replace("Depots.xml", "Projects.xml"));- FileUtils.moveFile(file, renamedFile);- String content = FileUtils.readFileToString(renamedFile, Charsets.UTF_8);- content = StringUtils.replace(content, "com.gitplex.server.model.Depot",- "com.gitplex.server.model.Project");- VersionedDocument dom = VersionedDocument.fromXML(content);- for (Element element: dom.getRootElement().elements()) {- String accountId = element.elementText("account");- element.element("account").detach();- String depotName = element.elementText("name");- element.element("name").setText(accountIdToName.get(accountId) + "." + depotName);- if (element.element("defaultPrivilege") != null )- element.element("defaultPrivilege").detach();-- String adminId;- if (userIds.contains(accountId)) {- adminId = accountId;- } else {- adminId = "1";- }- Element userAuthorizationElement =- userAuthorizationListElement.addElement("com.gitplex.server.model.UserAuthorization");- userAuthorizationElement.addAttribute("revision", "0.0");- userAuthorizationElement.addElement("id").setText(String.valueOf(++lastUserAuthorizationId));- userAuthorizationElement.addElement("user").setText(adminId);- userAuthorizationElement.addElement("project").setText(element.elementText("id"));- userAuthorizationElement.addElement("privilege").setText("ADMIN");- }-- dom.writeToFile(renamedFile, false);- } else if (file.getName().startsWith("BranchWatchs.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- if (!userIds.contains(element.elementText("user"))) {- element.detach();- } else {- element.element("depot").setName("project");- }- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("Teams.xml")- || file.getName().startsWith("TeamMemberships.xml")- || file.getName().startsWith("TeamAuthorizations.xml")- || file.getName().startsWith("OrganizationMemberships.xml")- || file.getName().startsWith("UserAuthorizations.xml")- || file.getName().startsWith("PullRequest")- || file.getName().startsWith("Review")- || file.getName().startsWith("ReviewInvitation")) {- FileUtils.deleteFile(file);- } else if (file.getName().startsWith("Configs.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- if (element.elementText("key").equals("SYSTEM")) {- String storagePath = element.element("setting").elementText("storagePath");- File storageDir = new File(storagePath);- File repositoriesDir = new File(storageDir, "repositories");- if (repositoriesDir.exists()) {- File projectsDir = new File(storageDir, "projects");- FileUtils.moveDirectory(repositoriesDir, projectsDir);- for (File projectDir: projectsDir.listFiles()) {- File infoDir = new File(projectDir, "info");- if (infoDir.exists())- FileUtils.deleteDir(infoDir);- }- }- } else if (element.elementText("key").equals("SECURITY")) {- element.element("setting").addElement("enableAnonymousAccess").setText("false");- }- }- dom.writeToFile(file, false);- }- }- userAuthorizationsDom.writeToFile(new File(dataDir, "UserAuthorizations.xml"), false);- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- private void migrate10(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("CodeComments.xml") || file.getName().startsWith("CodeCommentReplys.xml")- || file.getName().startsWith("CodeCommentStatusChanges.xml")) {- FileUtils.deleteFile(file);- } else if (file.getName().startsWith("Projects.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- for (Element branchProtectionElement: element.element("branchProtections").elements()) {- Element exprElement = branchProtectionElement.element("reviewAppointmentExpr");- if (exprElement != null)- exprElement.setName("reviewRequirementSpec");- for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {- exprElement = fileProtectionElement.element("reviewAppointmentExpr");- if (exprElement != null)- exprElement.setName("reviewRequirementSpec");- }- }- }- dom.writeToFile(file, false);- }- }- VersionedDocument dom = VersionedDocument.fromFile(new File(dataDir, "Configs.xml"));- for (Element element: dom.getRootElement().elements()) {- if (element.elementText("key").equals("SYSTEM")) {- String storagePath = element.element("setting").elementText("storagePath");- File codeCommentsFromWeiFeng = new File(storagePath, "CodeComments.xml");- if (codeCommentsFromWeiFeng.exists()) {- dom = VersionedDocument.fromFile(codeCommentsFromWeiFeng);- for (Element commentElement: dom.getRootElement().elements()) {- commentElement.setName("com.gitplex.server.model.CodeComment");- commentElement.element("depot").setName("project");- commentElement.element("resolved").detach();- commentElement.element("commentPos").setName("markPos");- }- dom.writeToFile(new File(dataDir, "CodeComments.xml"), false);- }- }- }- }-- private void migrate11(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Configs.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- long maxId = 0;- for (Element element: dom.getRootElement().elements()) {- Long id = Long.parseLong(element.elementTextTrim("id"));- if (maxId < id)- maxId = id;- }- Element licenseConfigElement = dom.getRootElement().addElement("com.gitplex.server.model.Config");- licenseConfigElement.addElement("id").setText(String.valueOf(maxId+1));- licenseConfigElement.addElement("key").setText("LICENSE");- dom.writeToFile(file, false);- }- }- }-- private void migrate12(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Projects.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element projectElement: dom.getRootElement().elements()) {- for (Element branchProtectionElement: projectElement.element("branchProtections").elements()) {- branchProtectionElement.addElement("enabled").setText("true");- }- for (Element tagProtectionElement: projectElement.element("tagProtections").elements()) {- tagProtectionElement.addElement("enabled").setText("true");- }- }- dom.writeToFile(file, false);- }- }- }-- private void migrate13(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- try {- String content = FileUtils.readFileToString(file, Charsets.UTF_8);- content = StringUtils.replace(content, "gitplex", "turbodev");- content = StringUtils.replace(content, "GitPlex", "TurboDev");- FileUtils.writeFile(file, content, Charsets.UTF_8.name());- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }-- private void migrate14(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Projects.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element projectElement: dom.getRootElement().elements()) {- for (Element branchProtectionElement: projectElement.element("branchProtections").elements()) {- Element submitterElement = branchProtectionElement.addElement("submitter");- submitterElement.addAttribute("class", "com.turbodev.server.model.support.submitter.Anyone");- branchProtectionElement.addElement("noCreation").setText("true");- }- for (Element tagProtectionElement: projectElement.element("tagProtections").elements()) {- tagProtectionElement.detach();- }- }- dom.writeToFile(file, false);- }- }- }-- private void migrate15(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- try {- String content = FileUtils.readFileToString(file, Charsets.UTF_8);- content = StringUtils.replace(content, "com.turbodev", "io.onedev");- content = StringUtils.replace(content, "com/turbodev", "io/onedev");- content = StringUtils.replace(content, "turbodev.com", "onedev.io");- content = StringUtils.replace(content, "turbodev", "onedev");- content = StringUtils.replace(content, "TurboDev", "OneDev");- FileUtils.writeFile(file, content, Charsets.UTF_8.name());- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }-- private void migrateMergeStrategy16(Element mergeStrategyElement) {- if (mergeStrategyElement != null) {- mergeStrategyElement.setName("mergeStrategy");- switch (mergeStrategyElement.getText()) {- case "ALWAYS_MERGE":- mergeStrategyElement.setText("CREATE_MERGE_COMMIT");- break;- case "MERGE_IF_NECESSARY":- mergeStrategyElement.setText("CREATE_MERGE_COMMIT_IF_NECESSARY");- break;- case "SQUASH_MERGE":- mergeStrategyElement.setText("SQUASH_SOURCE_BRANCH_COMMITS");- break;- case "REBASE_MERGE":- mergeStrategyElement.setText("REBASE_SOURCE_BRANCH_COMMITS");- break;- }- }- }-- /*- * Migrate from 1.0 to 2.0- */- private void migrate16(File dataDir, Stack<Integer> versions) {- Map<String, Integer> codeCommentReplyCounts = new HashMap<>();- Map<String, String> userNames = new HashMap<>();- Map<String, Set<String>> requestCodeComments = new HashMap<>();- Map<String, Integer> requestCommentCounts = new HashMap<>();- Set<String> openRequests = new HashSet<>();- Map<String, String> reviewRequirements = new HashMap<>();-- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Users.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element fullNameElement = element.element("fullName");- if (fullNameElement != null)- userNames.put(element.elementTextTrim("id"), fullNameElement.getText());- else- userNames.put(element.elementTextTrim("id"), element.elementText("name"));- }- } else if (file.getName().startsWith("CodeCommentReplys.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- String commentId = element.elementTextTrim("comment");- Integer replyCount = codeCommentReplyCounts.get(commentId);- if (replyCount == null)- replyCount = 0;- replyCount++;- codeCommentReplyCounts.put(commentId, replyCount);- }- } else if (file.getName().startsWith("CodeCommentRelations.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- String commentId = element.elementTextTrim("comment");- String requestId = element.elementTextTrim("request");- Set<String> codeComments = requestCodeComments.get(requestId);- if (codeComments == null) {- codeComments = new HashSet<>();- requestCodeComments.put(requestId, codeComments);- }- codeComments.add(commentId);- }- } else if (file.getName().startsWith("PullRequestComments.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- String commentId = element.elementTextTrim("request");- Integer commentCount = requestCommentCounts.get(commentId);- if (commentCount == null)- commentCount = 0;- commentCount++;- requestCommentCounts.put(commentId, commentCount);- }- } else if (file.getName().startsWith("PullRequests.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- if (element.element("closeInfo") == null) {- openRequests.add(element.elementTextTrim("id"));- }- }- } else if (file.getName().startsWith("Projects.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- String projectId = element.elementTextTrim("id");- StringBuilder builder = new StringBuilder();- for (Element branchProtectionElement: element.element("branchProtections").elements()) {- Element reviewRequirementSpecElement = branchProtectionElement.element("reviewRequirementSpec");- if (reviewRequirementSpecElement != null)- builder.append(reviewRequirementSpecElement.getText()).append(";");-- for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {- reviewRequirementSpecElement = fileProtectionElement.element("reviewRequirementSpec");- builder.append(reviewRequirementSpecElement.getText()).append(";");- }- }- reviewRequirements.put(projectId, builder.toString());- }- }- }-- for (Map.Entry<String, Set<String>> entry: requestCodeComments.entrySet()) {- Integer commentCount = requestCommentCounts.get(entry.getKey());- if (commentCount == null)- commentCount = 0;- for (String commentId: entry.getValue()) {- commentCount++;- Integer replyCount = codeCommentReplyCounts.get(commentId);- if (replyCount != null)- commentCount += replyCount;- }- requestCommentCounts.put(entry.getKey(), commentCount);- }-- VersionedDocument requestReviewsDOM = new VersionedDocument();- Element requestReviewListElement = requestReviewsDOM.addElement("list");-- VersionedDocument configurationsDOM = new VersionedDocument();- Element configurationListElement = configurationsDOM.addElement("list");- Map<String, Map<String, Long>> projectConfigurations = new HashMap<>();- long configurationCount = 0;-- int reviewCount = 0;-- VersionedDocument requestBuildsDOM = new VersionedDocument();- Element requestBuildListElement = requestBuildsDOM.addElement("list");- int requestBuildCount = 0;-- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("BranchWatches.xml")- || file.getName().startsWith("PullRequestReferences.xml")- || file.getName().startsWith("PullRequestStatusChanges.xml")- || file.getName().startsWith("PullRequestTasks.xml")- || file.getName().startsWith("ReviewInvitations.xml")- || file.getName().startsWith("Reviews.xml")) {- FileUtils.deleteFile(file);- } else if (file.getName().startsWith("UserAuthorizations.xml") || file.getName().startsWith("GroupAuthorizations.xml")) {- try {- String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8.name());- content = StringUtils.replace(content, "ADMIN", "ADMINISTRATION");- content = StringUtils.replace(content, "WRITE", "CODE_WRITE");- content = StringUtils.replace(content, "READ", "CODE_READ");- FileUtils.writeFile(file, content, StandardCharsets.UTF_8.name());- } catch (IOException e) {- throw new RuntimeException(e);- }- } else if (file.getName().startsWith("CodeComments.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Integer replyCount = codeCommentReplyCounts.get(element.elementTextTrim("id"));- if (replyCount == null)- replyCount = 0;- element.addElement("replyCount").setText(String.valueOf(replyCount));-- Element dateElement = element.element("date");- dateElement.setName("createDate");- Element updateDateElement = element.addElement("updateDate");- updateDateElement.addAttribute("class", "sql-timestamp");- Element lastEventElement = element.element("lastEvent");- if (lastEventElement != null) {- updateDateElement.setText(lastEventElement.elementText("date"));- lastEventElement.detach();- } else {- updateDateElement.setText(dateElement.getText());- }- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("PullRequests.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- migrateMergeStrategy16(element.element("mergeStrategy"));- Element lastMergePreviewElement = element.element("lastMergePreview");- if (lastMergePreviewElement != null) {- migrateMergeStrategy16(lastMergePreviewElement.element("mergeStrategy"));- }-- Integer commentCount = requestCommentCounts.get(element.elementTextTrim("id"));- if (commentCount == null)- commentCount = 0;- element.addElement("commentCount").setText(String.valueOf(commentCount));-- Element lastCodeCommentEventDateElement = element.element("lastCodeCommentEventDate");- if (lastCodeCommentEventDateElement != null)- lastCodeCommentEventDateElement.setName("lastCodeCommentActivityDate");-- Element closeInfoElement = element.element("closeInfo");- if (closeInfoElement != null) {- Element closedByElement = closeInfoElement.element("closedBy");- if (closedByElement != null)- closedByElement.setName("user");- Element closedByNameElement = closeInfoElement.element("closedByName");- if (closedByNameElement != null)- closedByNameElement.setName("userName");- closeInfoElement.element("closeDate").setName("date");- closeInfoElement.element("closeStatus").setName("status");- }- Element submitDateElement = element.element("submitDate");- Element updateDateElement = element.addElement("updateDate");- updateDateElement.addAttribute("class", "sql-timestamp");- Element lastEventElement = element.element("lastEvent");- if (lastEventElement != null) {- updateDateElement.setText(lastEventElement.elementText("date"));- lastEventElement.detach();- } else {- updateDateElement.setText(submitDateElement.getText());- }- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("Configs.xml")) {- String content;- try {- content = FileUtils.readFileToString(file, Charsets.UTF_8);- } catch (IOException e) {- throw new RuntimeException(e);- }- content = StringUtils.replace(content, "io.onedev.server.security.authenticator.",- "io.onedev.server.model.support.authenticator.");- VersionedDocument dom = VersionedDocument.fromXML(content);- for (Element element: dom.getRootElement().elements()) {- element.setName("io.onedev.server.model.Setting");- Element settingElement = element.element("setting");- if (settingElement != null) {- settingElement.setName("value");- if (element.elementTextTrim("key").equals("AUTHENTICATOR")) {- Element authenticatorElement = settingElement.elementIterator().next();- settingElement.addAttribute("class", authenticatorElement.getName());- for (Element fieldElement: authenticatorElement.elements()) {- if (!fieldElement.getName().equals("defaultGroupNames")) {- fieldElement.detach();- settingElement.add(fieldElement);- }- }- authenticatorElement.detach();- settingElement.addElement("canCreateProjects").setText("true");- }- }- }- FileUtils.deleteFile(file);- dom.writeToFile(new File(file.getParentFile(), file.getName().replace("Config", "Setting")), false);- } else if (file.getName().startsWith("PullRequestWatchs.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element reasonElement = element.element("reason");- if (reasonElement != null)- reasonElement.detach();- Element ignoreElement = element.element("ignore");- ignoreElement.setName("watching");- ignoreElement.setText(String.valueOf(!Boolean.parseBoolean(ignoreElement.getTextTrim())));- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("PullRequestUpdates.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- element.element("uuid").detach();- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("Projects.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- String project = element.elementTextTrim("id");- Element publicReadElement = element.element("publicRead");- if (publicReadElement.getTextTrim().equals("true"))- element.addElement("defaultPrivilege").setText("CODE_READ");- publicReadElement.detach();-- for (Element branchProtectionElement: element.element("branchProtections").elements()) {- branchProtectionElement.element("verifyMerges").setName("buildMerges");- Element verificationsElement = branchProtectionElement.element("verifications");- verificationsElement.setName("configurations");- for (Element verificationElement: verificationsElement.elements()) {- String verification = verificationElement.getText();- Map<String, Long> configurations = projectConfigurations.get(project);- if (configurations == null) {- configurations = new HashMap<>();- projectConfigurations.put(project, configurations);- }- Long configurationId = configurations.get(verification);- if (configurationId == null) {- configurationId = ++configurationCount;- configurations.put(verification, configurationId);- Element configurationElement = configurationListElement.addElement("io.onedev.server.model.Configuration");- configurationElement.addAttribute("revision", "0.0");- configurationElement.addElement("id").setText(String.valueOf(configurationId));- configurationElement.addElement("project").setText(project);- configurationElement.addElement("name").setText(verification);- configurationElement.addElement("buildCleanupRule").addAttribute("class", "io.onedev.server.model.support.configuration.DoNotCleanup");- }- for (String request: openRequests) {- Element requestBuildElement = requestBuildListElement.addElement("io.onedev.server.model.PullRequestBuild");- requestBuildElement.addAttribute("revision", "0.0");- requestBuildElement.addElement("id").setText(String.valueOf(++requestBuildCount));- requestBuildElement.addElement("request").setText(request);- requestBuildElement.addElement("configuration").setText(String.valueOf(configurationId));- }- }- Element submitterElement = branchProtectionElement.element("submitter");- String submitterClass = submitterElement.attributeValue("class");- submitterClass = submitterClass.replace("io.onedev.server.model.support.submitter.",- "io.onedev.server.model.support.usermatcher.");- submitterElement.attribute("class").setValue(submitterClass);-- Element reviewRequirementSpecElement = branchProtectionElement.element("reviewRequirementSpec");- if (reviewRequirementSpecElement != null) {- reviewRequirementSpecElement.setName("reviewRequirement");- }-- for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {- reviewRequirementSpecElement = fileProtectionElement.element("reviewRequirementSpec");- reviewRequirementSpecElement.setName("reviewRequirement");- }- }- for (Element tagProtectionElement: element.element("tagProtections").elements()) {- Element submitterElement = tagProtectionElement.element("submitter");- String submitterClass = submitterElement.attributeValue("class");- submitterClass = submitterClass.replace("io.onedev.server.model.support.submitter.",- "io.onedev.server.model.support.usermatcher.");- submitterElement.attribute("class").setValue(submitterClass);- }- }- dom.writeToFile(file, false);- }- }-- requestReviewsDOM.writeToFile(new File(dataDir, "PullRequestReviews.xml"), false);- configurationsDOM.writeToFile(new File(dataDir, "Configurations.xml"), false);- requestBuildsDOM.writeToFile(new File(dataDir, "PullRequestBuilds.xml"), false);- }-- private void migrate17(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Issue")) {- FileUtils.deleteFile(file);- } else if (file.getName().startsWith("Projects.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element issueWorkflowElement = element.element("issueWorkflow");- if (issueWorkflowElement != null)- issueWorkflowElement.detach();- Element savedIssueQueriesElement = element.element("savedIssueQueries");- if (savedIssueQueriesElement != null)- savedIssueQueriesElement.detach();- Element issueListFieldsElement = element.element("issueListFields");- if (issueListFieldsElement != null)- issueListFieldsElement.detach();- Element issueBoardsElement = element.element("issueBoards");- if (issueBoardsElement != null)- issueBoardsElement.detach();- }- dom.writeToFile(file, false);- }- }- }-- private void migrate18(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Settings.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- if (element.elementTextTrim("key").equals("LICENSE"))- element.detach();- }- dom.writeToFile(file, false);- }- }- }-- private void migrate19(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Projects.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- Element commitMessageTransformsElement = element.addElement("commitMessageTransforms");- Element commitMessageTransformSettingElement = element.element("commitMessageTransformSetting");- if (commitMessageTransformSettingElement != null) {- commitMessageTransformSettingElement.detach();- commitMessageTransformSettingElement.setName("io.onedev.server.model.support.CommitMessageTransform");- commitMessageTransformsElement.add(commitMessageTransformSettingElement);- }- }- dom.writeToFile(file, false);- }- }- }-- private void migrate20(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Settings.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- if (element.elementTextTrim("key").equals("ISSUE")) {- Element valueElement = element.element("value");- if (valueElement != null) {- for (Element fieldElement: valueElement.element("fieldSpecs").elements()) {- fieldElement.addElement("canBeChangedBy").addAttribute("class", "io.onedev.server.model.support.usermatcher.Anyone");- }- }- }- }- dom.writeToFile(file, false);- }- }- }-- private void migrate21(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("Projects.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- for (Element branchProtectionElement: element.element("branchProtections").elements()) {- branchProtectionElement.element("branch").setName("branches");- for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {- fileProtectionElement.element("path").setName("paths");- }- }- for (Element tagProtectionElement: element.element("tagProtections").elements()) {- tagProtectionElement.element("tag").setName("tags");- }- }- dom.writeToFile(file, false);- } else if (file.getName().startsWith("Settings.xml")) {- VersionedDocument dom = VersionedDocument.fromFile(file);- for (Element element: dom.getRootElement().elements()) {- if (element.elementTextTrim("key").equals("LICENSE")) {- element.element("value").addAttribute("class", "io.onedev.commons.utils.license.LicenseDetail");- }- }- dom.writeToFile(file, false);- }- }- }-- private void migrate22(File dataDir, Stack<Integer> versions) {- for (File file: dataDir.listFiles()) {- if (file.getName().startsWith("IssueFieldUnarys.xml")) {- File renamedFile = new File(dataDir, file.getName().replace("IssueFieldUnarys", "IssueFieldEntitys"));- try {- FileUtils.moveFile(file, renamedFile);- } catch (IOException e) {- throw new RuntimeException(e);- }- VersionedDocument dom = VersionedDocument.fromFile(renamedFile);- for (Element element: dom.getRootElement().elements()) {- element.setName("io.onedev.server.model.IssueFieldEntity");- }- dom.writeToFile(renamedFile, false);- }- }- }--}+package io.onedev.server.migration;++import java.io.File;+import java.io.IOException;+import java.nio.charset.StandardCharsets;+import java.util.HashMap;+import java.util.HashSet;+import java.util.Map;+import java.util.Set;+import java.util.Stack;++import javax.inject.Singleton;++import org.dom4j.Element;++import com.google.common.base.Charsets;++import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.StringUtils;++@Singleton+@SuppressWarnings("unused")+public class DatabaseMigrator {++ private void migrate1(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("CodeComments.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element branchRefElement = element.element("branchRef");+ if (branchRefElement != null)+ branchRefElement.detach();+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate2(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Depots.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element gateKeeperElement = element.element("gateKeeper");+ gateKeeperElement.detach();+ element.addElement("gateKeepers");+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate3(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String name = element.getName();+ name = StringUtils.replace(name, "com.pmease.commons", "com.gitplex.commons");+ name = StringUtils.replace(name, "com.pmease.gitplex", "com.gitplex.server");+ element.setName(name);+ }+ if (file.getName().startsWith("Configs.xml")) {+ for (Element element: dom.getRootElement().elements()) {+ Element settingElement = element.element("setting");+ if (settingElement != null) {+ String clazz = settingElement.attributeValue("class");+ settingElement.addAttribute("class", StringUtils.replace(clazz, "com.pmease.gitplex", "com.gitplex.server"));+ Element gitConfigElement = settingElement.element("gitConfig");+ if (gitConfigElement != null) {+ clazz = gitConfigElement.attributeValue("class");+ gitConfigElement.addAttribute("class", StringUtils.replace(clazz, "com.pmease.gitplex", "com.gitplex.server"));+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }++ private void migrate4(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Accounts.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element avatarUploadDateElement = element.element("avatarUploadDate");+ if (avatarUploadDateElement != null)+ avatarUploadDateElement.detach();+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate5(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Configs.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("MAIL")) {+ Element settingElement = element.element("setting");+ if (settingElement != null)+ settingElement.addElement("enableSSL").setText("false");+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate6(File dataDir, Stack<Integer> versions) {+ }++ private void migrate7(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ try {+ String content = FileUtils.readFileToString(file, Charsets.UTF_8);+ content = StringUtils.replace(content,+ "com.gitplex.commons.hibernate.migration.VersionTable",+ "com.gitplex.server.model.ModelVersion");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.entity.support.IntegrationPolicy",+ "com.gitplex.server.model.support.IntegrationPolicy");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.entity.PullRequest_-IntegrationStrategy",+ "com.gitplex.server.model.PullRequest_-IntegrationStrategy");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.entity.", "com.gitplex.server.model.");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.setting.SpecifiedGit", "com.gitplex.server.git.config.SpecifiedGit");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.setting.SystemGit", "com.gitplex.server.git.config.SystemGit");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.setting.", "com.gitplex.server.model.support.setting.");+ content = StringUtils.replace(content,+ "com.gitplex.server.core.gatekeeper.", "com.gitplex.server.gatekeeper.");+ FileUtils.writeStringToFile(file, content, Charsets.UTF_8);++ if (file.getName().equals("VersionTables.xml")) {+ FileUtils.moveFile(file, new File(file.getParentFile(), "ModelVersions.xml"));+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ private void migrateIntegrationStrategy8(Element integrationStrategyElement) {+ if (integrationStrategyElement != null) {+ integrationStrategyElement.setName("mergeStrategy");+ switch (integrationStrategyElement.getText()) {+ case "MERGE_ALWAYS":+ integrationStrategyElement.setText("ALWAYS_MERGE");+ break;+ case "MERGE_WITH_SQUASH":+ integrationStrategyElement.setText("SQUASH_MERGE");+ break;+ case "REBASE_SOURCE_ONTO_TARGET":+ integrationStrategyElement.setText("REBASE_MERGE");+ break;+ case "REBASE_TARGET_ONTO_SOURCE":+ integrationStrategyElement.setText("MERGE_IF_NECESSARY");+ break;+ }+ }+ }++ private void migrate8(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Configs.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("SYSTEM")) {+ Element settingElement = element.element("setting");+ settingElement.addElement("curlConfig")+ .addAttribute("class", "com.gitplex.server.git.config.SystemCurl");+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Accounts.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.element("reviewEffort").detach();+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Depots.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.element("gateKeepers").detach();+ element.element("integrationPolicies").detach();+ element.addElement("branchProtections");+ element.addElement("tagProtections");+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element assigneeElement = element.element("assignee");+ if (assigneeElement != null)+ assigneeElement.detach();+ migrateIntegrationStrategy8(element.element("integrationStrategy"));+ Element lastIntegrationPreviewElement = element.element("lastIntegrationPreview");+ if (lastIntegrationPreviewElement != null) {+ lastIntegrationPreviewElement.setName("lastMergePreview");+ Element integratedElement = lastIntegrationPreviewElement.element("integrated");+ if (integratedElement != null)+ integratedElement.setName("merged");+ migrateIntegrationStrategy8(lastIntegrationPreviewElement.element("integrationStrategy"));+ }+ Element closeInfoElement = element.element("closeInfo");+ if (closeInfoElement != null) {+ Element closeStatusElement = closeInfoElement.element("closeStatus");+ if (closeStatusElement.getText().equals("INTEGRATED"))+ closeStatusElement.setText("MERGED");+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequestReviews.xml")+ || file.getName().startsWith("PullRequestReviewInvitations.xml")+ || file.getName().startsWith("PullRequestStatusChanges.xml")+ || file.getName().startsWith("PullRequestTasks.xml")+ || file.getName().startsWith("PullRequestVerifications.xml")+ || file.getName().startsWith("CodeComments.xml")+ || file.getName().startsWith("CodeCommentRelations.xml")+ || file.getName().startsWith("CodeCommentReplys.xml")+ || file.getName().startsWith("CodeCommentStatusChanges.xml")) {+ FileUtils.deleteFile(file);+ } else if (file.getName().startsWith("PullRequestUpdates.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element mergeCommitHashElement = element.element("mergeCommitHash");+ mergeCommitHashElement.setName("mergeBaseCommitHash");+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate9(File dataDir, Stack<Integer> versions) {+ try {+ Map<String, String> accountIdToName = new HashMap<>();+ Set<String> userIds = new HashSet<>();+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Accounts.xml")) {+ File renamedFile = new File(dataDir, file.getName().replace("Accounts.xml", "Users.xml"));+ FileUtils.moveFile(file, renamedFile);+ String content = FileUtils.readFileToString(renamedFile, Charsets.UTF_8);+ content = StringUtils.replace(content, "com.gitplex.server.model.Account",+ "com.gitplex.server.model.User");+ VersionedDocument dom = VersionedDocument.fromXML(content);+ for (Element element: dom.getRootElement().elements()) {+ accountIdToName.put(element.elementText("id"), element.elementText("name"));+ if (element.elementTextTrim("organization").equals("true")) {+ element.detach();+ } else {+ userIds.add(element.elementText("id"));+ element.element("organization").detach();+ element.element("defaultPrivilege").detach();+ element.element("noSpaceName").detach();+ if (element.element("noSpaceFullName") != null)+ element.element("noSpaceFullName").detach();+ }+ }+ dom.writeToFile(renamedFile, false);+ }+ }++ long lastUserAuthorizationId = 0;+ VersionedDocument userAuthorizationsDom = new VersionedDocument();+ Element userAuthorizationListElement = userAuthorizationsDom.addElement("list");++ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Depots.xml")) {+ File renamedFile = new File(dataDir, file.getName().replace("Depots.xml", "Projects.xml"));+ FileUtils.moveFile(file, renamedFile);+ String content = FileUtils.readFileToString(renamedFile, Charsets.UTF_8);+ content = StringUtils.replace(content, "com.gitplex.server.model.Depot",+ "com.gitplex.server.model.Project");+ VersionedDocument dom = VersionedDocument.fromXML(content);+ for (Element element: dom.getRootElement().elements()) {+ String accountId = element.elementText("account");+ element.element("account").detach();+ String depotName = element.elementText("name");+ element.element("name").setText(accountIdToName.get(accountId) + "." + depotName);+ if (element.element("defaultPrivilege") != null )+ element.element("defaultPrivilege").detach();++ String adminId;+ if (userIds.contains(accountId)) {+ adminId = accountId;+ } else {+ adminId = "1";+ }+ Element userAuthorizationElement =+ userAuthorizationListElement.addElement("com.gitplex.server.model.UserAuthorization");+ userAuthorizationElement.addAttribute("revision", "0.0");+ userAuthorizationElement.addElement("id").setText(String.valueOf(++lastUserAuthorizationId));+ userAuthorizationElement.addElement("user").setText(adminId);+ userAuthorizationElement.addElement("project").setText(element.elementText("id"));+ userAuthorizationElement.addElement("privilege").setText("ADMIN");+ }++ dom.writeToFile(renamedFile, false);+ } else if (file.getName().startsWith("BranchWatchs.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (!userIds.contains(element.elementText("user"))) {+ element.detach();+ } else {+ element.element("depot").setName("project");+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Teams.xml")+ || file.getName().startsWith("TeamMemberships.xml")+ || file.getName().startsWith("TeamAuthorizations.xml")+ || file.getName().startsWith("OrganizationMemberships.xml")+ || file.getName().startsWith("UserAuthorizations.xml")+ || file.getName().startsWith("PullRequest")+ || file.getName().startsWith("Review")+ || file.getName().startsWith("ReviewInvitation")) {+ FileUtils.deleteFile(file);+ } else if (file.getName().startsWith("Configs.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementText("key").equals("SYSTEM")) {+ String storagePath = element.element("setting").elementText("storagePath");+ File storageDir = new File(storagePath);+ File repositoriesDir = new File(storageDir, "repositories");+ if (repositoriesDir.exists()) {+ File projectsDir = new File(storageDir, "projects");+ FileUtils.moveDirectory(repositoriesDir, projectsDir);+ for (File projectDir: projectsDir.listFiles()) {+ File infoDir = new File(projectDir, "info");+ if (infoDir.exists())+ FileUtils.deleteDir(infoDir);+ }+ }+ } else if (element.elementText("key").equals("SECURITY")) {+ element.element("setting").addElement("enableAnonymousAccess").setText("false");+ }+ }+ dom.writeToFile(file, false);+ }+ }+ userAuthorizationsDom.writeToFile(new File(dataDir, "UserAuthorizations.xml"), false);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ private void migrate10(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("CodeComments.xml") || file.getName().startsWith("CodeCommentReplys.xml")+ || file.getName().startsWith("CodeCommentStatusChanges.xml")) {+ FileUtils.deleteFile(file);+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ for (Element branchProtectionElement: element.element("branchProtections").elements()) {+ Element exprElement = branchProtectionElement.element("reviewAppointmentExpr");+ if (exprElement != null)+ exprElement.setName("reviewRequirementSpec");+ for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {+ exprElement = fileProtectionElement.element("reviewAppointmentExpr");+ if (exprElement != null)+ exprElement.setName("reviewRequirementSpec");+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ VersionedDocument dom = VersionedDocument.fromFile(new File(dataDir, "Configs.xml"));+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementText("key").equals("SYSTEM")) {+ String storagePath = element.element("setting").elementText("storagePath");+ File codeCommentsFromWeiFeng = new File(storagePath, "CodeComments.xml");+ if (codeCommentsFromWeiFeng.exists()) {+ dom = VersionedDocument.fromFile(codeCommentsFromWeiFeng);+ for (Element commentElement: dom.getRootElement().elements()) {+ commentElement.setName("com.gitplex.server.model.CodeComment");+ commentElement.element("depot").setName("project");+ commentElement.element("resolved").detach();+ commentElement.element("commentPos").setName("markPos");+ }+ dom.writeToFile(new File(dataDir, "CodeComments.xml"), false);+ }+ }+ }+ }++ private void migrate11(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Configs.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ long maxId = 0;+ for (Element element: dom.getRootElement().elements()) {+ Long id = Long.parseLong(element.elementTextTrim("id"));+ if (maxId < id)+ maxId = id;+ }+ Element licenseConfigElement = dom.getRootElement().addElement("com.gitplex.server.model.Config");+ licenseConfigElement.addElement("id").setText(String.valueOf(maxId+1));+ licenseConfigElement.addElement("key").setText("LICENSE");+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate12(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element projectElement: dom.getRootElement().elements()) {+ for (Element branchProtectionElement: projectElement.element("branchProtections").elements()) {+ branchProtectionElement.addElement("enabled").setText("true");+ }+ for (Element tagProtectionElement: projectElement.element("tagProtections").elements()) {+ tagProtectionElement.addElement("enabled").setText("true");+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate13(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ try {+ String content = FileUtils.readFileToString(file, Charsets.UTF_8);+ content = StringUtils.replace(content, "gitplex", "turbodev");+ content = StringUtils.replace(content, "GitPlex", "TurboDev");+ FileUtils.writeFile(file, content, Charsets.UTF_8.name());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ private void migrate14(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element projectElement: dom.getRootElement().elements()) {+ for (Element branchProtectionElement: projectElement.element("branchProtections").elements()) {+ Element submitterElement = branchProtectionElement.addElement("submitter");+ submitterElement.addAttribute("class", "com.turbodev.server.model.support.submitter.Anyone");+ branchProtectionElement.addElement("noCreation").setText("true");+ }+ for (Element tagProtectionElement: projectElement.element("tagProtections").elements()) {+ tagProtectionElement.detach();+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate15(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ try {+ String content = FileUtils.readFileToString(file, Charsets.UTF_8);+ content = StringUtils.replace(content, "com.turbodev", "io.onedev");+ content = StringUtils.replace(content, "com/turbodev", "io/onedev");+ content = StringUtils.replace(content, "turbodev.com", "onedev.io");+ content = StringUtils.replace(content, "turbodev", "onedev");+ content = StringUtils.replace(content, "TurboDev", "OneDev");+ FileUtils.writeFile(file, content, Charsets.UTF_8.name());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ private void migrateMergeStrategy16(Element mergeStrategyElement) {+ if (mergeStrategyElement != null) {+ mergeStrategyElement.setName("mergeStrategy");+ switch (mergeStrategyElement.getText()) {+ case "ALWAYS_MERGE":+ mergeStrategyElement.setText("CREATE_MERGE_COMMIT");+ break;+ case "MERGE_IF_NECESSARY":+ mergeStrategyElement.setText("CREATE_MERGE_COMMIT_IF_NECESSARY");+ break;+ case "SQUASH_MERGE":+ mergeStrategyElement.setText("SQUASH_SOURCE_BRANCH_COMMITS");+ break;+ case "REBASE_MERGE":+ mergeStrategyElement.setText("REBASE_SOURCE_BRANCH_COMMITS");+ break;+ }+ }+ }++ /*+ * Migrate from 1.0 to 2.0+ */+ private void migrate16(File dataDir, Stack<Integer> versions) {+ Map<String, Integer> codeCommentReplyCounts = new HashMap<>();+ Map<String, String> userNames = new HashMap<>();+ Map<String, Set<String>> requestCodeComments = new HashMap<>();+ Map<String, Integer> requestCommentCounts = new HashMap<>();+ Set<String> openRequests = new HashSet<>();+ Map<String, String> reviewRequirements = new HashMap<>();++ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Users.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element fullNameElement = element.element("fullName");+ if (fullNameElement != null)+ userNames.put(element.elementTextTrim("id"), fullNameElement.getText());+ else+ userNames.put(element.elementTextTrim("id"), element.elementText("name"));+ }+ } else if (file.getName().startsWith("CodeCommentReplys.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String commentId = element.elementTextTrim("comment");+ Integer replyCount = codeCommentReplyCounts.get(commentId);+ if (replyCount == null)+ replyCount = 0;+ replyCount++;+ codeCommentReplyCounts.put(commentId, replyCount);+ }+ } else if (file.getName().startsWith("CodeCommentRelations.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String commentId = element.elementTextTrim("comment");+ String requestId = element.elementTextTrim("request");+ Set<String> codeComments = requestCodeComments.get(requestId);+ if (codeComments == null) {+ codeComments = new HashSet<>();+ requestCodeComments.put(requestId, codeComments);+ }+ codeComments.add(commentId);+ }+ } else if (file.getName().startsWith("PullRequestComments.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String commentId = element.elementTextTrim("request");+ Integer commentCount = requestCommentCounts.get(commentId);+ if (commentCount == null)+ commentCount = 0;+ commentCount++;+ requestCommentCounts.put(commentId, commentCount);+ }+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.element("closeInfo") == null) {+ openRequests.add(element.elementTextTrim("id"));+ }+ }+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String projectId = element.elementTextTrim("id");+ StringBuilder builder = new StringBuilder();+ for (Element branchProtectionElement: element.element("branchProtections").elements()) {+ Element reviewRequirementSpecElement = branchProtectionElement.element("reviewRequirementSpec");+ if (reviewRequirementSpecElement != null)+ builder.append(reviewRequirementSpecElement.getText()).append(";");++ for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {+ reviewRequirementSpecElement = fileProtectionElement.element("reviewRequirementSpec");+ builder.append(reviewRequirementSpecElement.getText()).append(";");+ }+ }+ reviewRequirements.put(projectId, builder.toString());+ }+ }+ }++ for (Map.Entry<String, Set<String>> entry: requestCodeComments.entrySet()) {+ Integer commentCount = requestCommentCounts.get(entry.getKey());+ if (commentCount == null)+ commentCount = 0;+ for (String commentId: entry.getValue()) {+ commentCount++;+ Integer replyCount = codeCommentReplyCounts.get(commentId);+ if (replyCount != null)+ commentCount += replyCount;+ }+ requestCommentCounts.put(entry.getKey(), commentCount);+ }++ VersionedDocument requestReviewsDOM = new VersionedDocument();+ Element requestReviewListElement = requestReviewsDOM.addElement("list");++ VersionedDocument configurationsDOM = new VersionedDocument();+ Element configurationListElement = configurationsDOM.addElement("list");+ Map<String, Map<String, Long>> projectConfigurations = new HashMap<>();+ long configurationCount = 0;++ int reviewCount = 0;++ VersionedDocument requestBuildsDOM = new VersionedDocument();+ Element requestBuildListElement = requestBuildsDOM.addElement("list");+ int requestBuildCount = 0;++ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("BranchWatches.xml")+ || file.getName().startsWith("PullRequestReferences.xml")+ || file.getName().startsWith("PullRequestStatusChanges.xml")+ || file.getName().startsWith("PullRequestTasks.xml")+ || file.getName().startsWith("ReviewInvitations.xml")+ || file.getName().startsWith("Reviews.xml")) {+ FileUtils.deleteFile(file);+ } else if (file.getName().startsWith("UserAuthorizations.xml") || file.getName().startsWith("GroupAuthorizations.xml")) {+ try {+ String content = FileUtils.readFileToString(file, StandardCharsets.UTF_8.name());+ content = StringUtils.replace(content, "ADMIN", "ADMINISTRATION");+ content = StringUtils.replace(content, "WRITE", "CODE_WRITE");+ content = StringUtils.replace(content, "READ", "CODE_READ");+ FileUtils.writeFile(file, content, StandardCharsets.UTF_8.name());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else if (file.getName().startsWith("CodeComments.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Integer replyCount = codeCommentReplyCounts.get(element.elementTextTrim("id"));+ if (replyCount == null)+ replyCount = 0;+ element.addElement("replyCount").setText(String.valueOf(replyCount));++ Element dateElement = element.element("date");+ dateElement.setName("createDate");+ Element updateDateElement = element.addElement("updateDate");+ updateDateElement.addAttribute("class", "sql-timestamp");+ Element lastEventElement = element.element("lastEvent");+ if (lastEventElement != null) {+ updateDateElement.setText(lastEventElement.elementText("date"));+ lastEventElement.detach();+ } else {+ updateDateElement.setText(dateElement.getText());+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequests.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ migrateMergeStrategy16(element.element("mergeStrategy"));+ Element lastMergePreviewElement = element.element("lastMergePreview");+ if (lastMergePreviewElement != null) {+ migrateMergeStrategy16(lastMergePreviewElement.element("mergeStrategy"));+ }++ Integer commentCount = requestCommentCounts.get(element.elementTextTrim("id"));+ if (commentCount == null)+ commentCount = 0;+ element.addElement("commentCount").setText(String.valueOf(commentCount));++ Element lastCodeCommentEventDateElement = element.element("lastCodeCommentEventDate");+ if (lastCodeCommentEventDateElement != null)+ lastCodeCommentEventDateElement.setName("lastCodeCommentActivityDate");++ Element closeInfoElement = element.element("closeInfo");+ if (closeInfoElement != null) {+ Element closedByElement = closeInfoElement.element("closedBy");+ if (closedByElement != null)+ closedByElement.setName("user");+ Element closedByNameElement = closeInfoElement.element("closedByName");+ if (closedByNameElement != null)+ closedByNameElement.setName("userName");+ closeInfoElement.element("closeDate").setName("date");+ closeInfoElement.element("closeStatus").setName("status");+ }+ Element submitDateElement = element.element("submitDate");+ Element updateDateElement = element.addElement("updateDate");+ updateDateElement.addAttribute("class", "sql-timestamp");+ Element lastEventElement = element.element("lastEvent");+ if (lastEventElement != null) {+ updateDateElement.setText(lastEventElement.elementText("date"));+ lastEventElement.detach();+ } else {+ updateDateElement.setText(submitDateElement.getText());+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Configs.xml")) {+ String content;+ try {+ content = FileUtils.readFileToString(file, Charsets.UTF_8);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ content = StringUtils.replace(content, "io.onedev.server.security.authenticator.",+ "io.onedev.server.model.support.authenticator.");+ VersionedDocument dom = VersionedDocument.fromXML(content);+ for (Element element: dom.getRootElement().elements()) {+ element.setName("io.onedev.server.model.Setting");+ Element settingElement = element.element("setting");+ if (settingElement != null) {+ settingElement.setName("value");+ if (element.elementTextTrim("key").equals("AUTHENTICATOR")) {+ Element authenticatorElement = settingElement.elementIterator().next();+ settingElement.addAttribute("class", authenticatorElement.getName());+ for (Element fieldElement: authenticatorElement.elements()) {+ if (!fieldElement.getName().equals("defaultGroupNames")) {+ fieldElement.detach();+ settingElement.add(fieldElement);+ }+ }+ authenticatorElement.detach();+ settingElement.addElement("canCreateProjects").setText("true");+ }+ }+ }+ FileUtils.deleteFile(file);+ dom.writeToFile(new File(file.getParentFile(), file.getName().replace("Config", "Setting")), false);+ } else if (file.getName().startsWith("PullRequestWatchs.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element reasonElement = element.element("reason");+ if (reasonElement != null)+ reasonElement.detach();+ Element ignoreElement = element.element("ignore");+ ignoreElement.setName("watching");+ ignoreElement.setText(String.valueOf(!Boolean.parseBoolean(ignoreElement.getTextTrim())));+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("PullRequestUpdates.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.element("uuid").detach();+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ String project = element.elementTextTrim("id");+ Element publicReadElement = element.element("publicRead");+ if (publicReadElement.getTextTrim().equals("true"))+ element.addElement("defaultPrivilege").setText("CODE_READ");+ publicReadElement.detach();++ for (Element branchProtectionElement: element.element("branchProtections").elements()) {+ branchProtectionElement.element("verifyMerges").setName("buildMerges");+ Element verificationsElement = branchProtectionElement.element("verifications");+ verificationsElement.setName("configurations");+ for (Element verificationElement: verificationsElement.elements()) {+ String verification = verificationElement.getText();+ Map<String, Long> configurations = projectConfigurations.get(project);+ if (configurations == null) {+ configurations = new HashMap<>();+ projectConfigurations.put(project, configurations);+ }+ Long configurationId = configurations.get(verification);+ if (configurationId == null) {+ configurationId = ++configurationCount;+ configurations.put(verification, configurationId);+ Element configurationElement = configurationListElement.addElement("io.onedev.server.model.Configuration");+ configurationElement.addAttribute("revision", "0.0");+ configurationElement.addElement("id").setText(String.valueOf(configurationId));+ configurationElement.addElement("project").setText(project);+ configurationElement.addElement("name").setText(verification);+ configurationElement.addElement("buildCleanupRule").addAttribute("class", "io.onedev.server.model.support.configuration.DoNotCleanup");+ }+ for (String request: openRequests) {+ Element requestBuildElement = requestBuildListElement.addElement("io.onedev.server.model.PullRequestBuild");+ requestBuildElement.addAttribute("revision", "0.0");+ requestBuildElement.addElement("id").setText(String.valueOf(++requestBuildCount));+ requestBuildElement.addElement("request").setText(request);+ requestBuildElement.addElement("configuration").setText(String.valueOf(configurationId));+ }+ }+ Element submitterElement = branchProtectionElement.element("submitter");+ String submitterClass = submitterElement.attributeValue("class");+ submitterClass = submitterClass.replace("io.onedev.server.model.support.submitter.",+ "io.onedev.server.model.support.usermatcher.");+ submitterElement.attribute("class").setValue(submitterClass);++ Element reviewRequirementSpecElement = branchProtectionElement.element("reviewRequirementSpec");+ if (reviewRequirementSpecElement != null) {+ reviewRequirementSpecElement.setName("reviewRequirement");+ }++ for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {+ reviewRequirementSpecElement = fileProtectionElement.element("reviewRequirementSpec");+ reviewRequirementSpecElement.setName("reviewRequirement");+ }+ }+ for (Element tagProtectionElement: element.element("tagProtections").elements()) {+ Element submitterElement = tagProtectionElement.element("submitter");+ String submitterClass = submitterElement.attributeValue("class");+ submitterClass = submitterClass.replace("io.onedev.server.model.support.submitter.",+ "io.onedev.server.model.support.usermatcher.");+ submitterElement.attribute("class").setValue(submitterClass);+ }+ }+ dom.writeToFile(file, false);+ }+ }++ requestReviewsDOM.writeToFile(new File(dataDir, "PullRequestReviews.xml"), false);+ configurationsDOM.writeToFile(new File(dataDir, "Configurations.xml"), false);+ requestBuildsDOM.writeToFile(new File(dataDir, "PullRequestBuilds.xml"), false);+ }++ private void migrate17(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Issue")) {+ FileUtils.deleteFile(file);+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element issueWorkflowElement = element.element("issueWorkflow");+ if (issueWorkflowElement != null)+ issueWorkflowElement.detach();+ Element savedIssueQueriesElement = element.element("savedIssueQueries");+ if (savedIssueQueriesElement != null)+ savedIssueQueriesElement.detach();+ Element issueListFieldsElement = element.element("issueListFields");+ if (issueListFieldsElement != null)+ issueListFieldsElement.detach();+ Element issueBoardsElement = element.element("issueBoards");+ if (issueBoardsElement != null)+ issueBoardsElement.detach();+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate18(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("LICENSE"))+ element.detach();+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate19(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element commitMessageTransformsElement = element.addElement("commitMessageTransforms");+ Element commitMessageTransformSettingElement = element.element("commitMessageTransformSetting");+ if (commitMessageTransformSettingElement != null) {+ commitMessageTransformSettingElement.detach();+ commitMessageTransformSettingElement.setName("io.onedev.server.model.support.CommitMessageTransform");+ commitMessageTransformsElement.add(commitMessageTransformSettingElement);+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate20(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("ISSUE")) {+ Element valueElement = element.element("value");+ if (valueElement != null) {+ for (Element fieldElement: valueElement.element("fieldSpecs").elements()) {+ fieldElement.addElement("canBeChangedBy").addAttribute("class", "io.onedev.server.model.support.usermatcher.Anyone");+ }+ }+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate21(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ for (Element branchProtectionElement: element.element("branchProtections").elements()) {+ branchProtectionElement.element("branch").setName("branches");+ for (Element fileProtectionElement: branchProtectionElement.element("fileProtections").elements()) {+ fileProtectionElement.element("path").setName("paths");+ }+ }+ for (Element tagProtectionElement: element.element("tagProtections").elements()) {+ tagProtectionElement.element("tag").setName("tags");+ }+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Settings.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ if (element.elementTextTrim("key").equals("LICENSE")) {+ element.element("value").addAttribute("class", "io.onedev.commons.utils.license.LicenseDetail");+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }++ private void migrate22(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("IssueFieldUnarys.xml")) {+ File renamedFile = new File(dataDir, file.getName().replace("IssueFieldUnarys", "IssueFieldEntitys"));+ try {+ FileUtils.moveFile(file, renamedFile);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ VersionedDocument dom = VersionedDocument.fromFile(renamedFile);+ for (Element element: dom.getRootElement().elements()) {+ element.setName("io.onedev.server.model.IssueFieldEntity");+ }+ dom.writeToFile(renamedFile, false);+ }+ }+ }++ private void migrate23(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Build2s.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ Element runInstanceIdElement = element.element("runInstanceId");+ if (runInstanceIdElement != null)+ runInstanceIdElement.detach();+ Element errorMessageElement = element.element("errorMessage");+ if (errorMessageElement != null)+ errorMessageElement.setName("statusMessage");+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Projects.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.element("uuid").detach();+ if (element.element("issueSetting") == null)+ element.addElement("issueSetting");+ if (element.element("savedCommitQueries") == null)+ element.addElement("savedCommitQueries");+ if (element.element("savedPullRequestQueries") == null)+ element.addElement("savedPullRequestQueries");+ if (element.element("savedCodeCommentQueries") == null)+ element.addElement("savedCodeCommentQueries");+ if (element.element("savedBuildQueries") == null)+ element.addElement("savedBuildQueries");+ if (element.element("webHooks") == null)+ element.addElement("webHooks");+ }+ dom.writeToFile(file, false);+ } else if (file.getName().startsWith("Users.xml")) {+ VersionedDocument dom = VersionedDocument.fromFile(file);+ for (Element element: dom.getRootElement().elements()) {+ element.element("uuid").detach();+ }+ dom.writeToFile(file, false);+ }+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/model/Build2.java b/core/src/main/java/io/onedev/server/model/Build2.javaindex caad431beb..363ea02efa 100644--- a/core/src/main/java/io/onedev/server/model/Build2.java+++ b/core/src/main/java/io/onedev/server/model/Build2.java@@ -19,6 +19,8 @@ import javax.persistence.Table;import javax.persistence.UniqueConstraint;import org.apache.commons.lang3.StringUtils;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;import com.fasterxml.jackson.annotation.JsonView;@@ -32,6 +34,7 @@ import io.onedev.server.util.jackson.DefaultView;@Index(columnList="runningDate"), @Index(columnList="finishDate")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)public class Build2 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 c235165ed0..2f481fbe18 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -1,1338 +1,1387 @@-package io.onedev.server.model;--import java.io.File;-import java.io.IOException;-import java.io.InputStream;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.Date;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;-import java.util.UUID;-import java.util.concurrent.ConcurrentHashMap;-import java.util.concurrent.locks.ReadWriteLock;-import java.util.stream.Collectors;--import javax.annotation.Nullable;-import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.Lob;-import javax.persistence.ManyToOne;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.Version;-import javax.validation.Valid;--import org.apache.commons.lang3.SerializationUtils;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;-import org.eclipse.jgit.api.CreateBranchCommand;-import org.eclipse.jgit.api.Git;-import org.eclipse.jgit.api.TagCommand;-import org.eclipse.jgit.api.errors.GitAPIException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectLoader;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.lib.Ref;-import org.eclipse.jgit.lib.RefUpdate;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren;-import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevTree;-import org.eclipse.jgit.revwalk.RevWalk;-import org.eclipse.jgit.treewalk.TreeWalk;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.annotations.DynamicUpdate;-import org.hibernate.validator.constraints.NotEmpty;--import com.fasterxml.jackson.annotation.JsonView;-import com.google.common.base.Optional;-import com.google.common.base.Preconditions;--import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.commons.utils.FileUtils;-import io.onedev.commons.utils.LockUtils;-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;-import io.onedev.server.git.BlobIdent;-import io.onedev.server.git.BlobIdentFilter;-import io.onedev.server.git.GitUtils;-import io.onedev.server.git.RefInfo;-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.model.support.BranchProtection;-import io.onedev.server.model.support.CommitMessageTransform;-import io.onedev.server.model.support.NamedBuildQuery;-import io.onedev.server.model.support.NamedCodeCommentQuery;-import io.onedev.server.model.support.NamedCommitQuery;-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.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;-import io.onedev.server.util.validation.annotation.ProjectName;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Markdown;-import io.onedev.server.web.editable.annotation.NameOfEmptyValue;--@Entity-@Table(indexes={@Index(columnList="o_forkedFrom_id")})-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-@DynamicUpdate-@Editable-public class Project extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;-- public static final int MAX_UPLOAD_SIZE = 10; // In mega bytes-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=true)- private Project forkedFrom;-- @Column(nullable=false, unique=true)- private String name;-- @Lob- @Column(length=65535)- private String description;-- private DefaultPrivilege defaultPrivilege;-- @Lob- @Column(length=65535, name="COMMIT_MSG_TRANSFORM")- @JsonView(DefaultView.class)- private ArrayList<CommitMessageTransform> commitMessageTransforms = new ArrayList<>();-- @Column(nullable=false)- private String uuid = UUID.randomUUID().toString();-- /*- * Optimistic lock is necessary to ensure database integrity when update- * branch and tag protection settings upon project renaming/deletion- */- @Version- private long version;-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<Configuration> configurations = new ArrayList<>();-- @Lob- @Column(nullable=false, length=65535)- @JsonView(DefaultView.class)- private ArrayList<BranchProtection> branchProtections = new ArrayList<>();-- @Lob- @Column(nullable=false, length=65535)- @JsonView(DefaultView.class)- private ArrayList<TagProtection> tagProtections = new ArrayList<>();-- @Column(nullable=false)- private Date createdAt = new Date();-- @OneToMany(mappedBy="targetProject", cascade=CascadeType.REMOVE)- private Collection<PullRequest> incomingRequests = new ArrayList<>();-- @OneToMany(mappedBy="sourceProject")- private Collection<PullRequest> outgoingRequests = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<Issue> issues = new ArrayList<>();-- @OneToMany(mappedBy="forkedFrom")- private Collection<Project> forks = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<UserAuthorization> userAuthorizations = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<CodeComment> codeComments = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<CommitQuerySetting> commitQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<PullRequestQuerySetting> pullRequestQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<CodeCommentQuerySetting> codeCommentQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<BuildQuerySetting> buildQuerySettings = new ArrayList<>();-- @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<Milestone> milestones = new ArrayList<>();-- private transient List<Milestone> sortedMilestones;-- @Lob- @Column(length=65535)- @JsonView(DefaultView.class)- private IssueSetting issueSetting;-- @Lob- @Column(length=65535)- @JsonView(DefaultView.class)- private ArrayList<NamedCommitQuery> savedCommitQueries;-- @Lob- @Column(length=65535)- @JsonView(DefaultView.class)- private ArrayList<NamedPullRequestQuery> savedPullRequestQueries;-- @Lob- @Column(length=65535)- @JsonView(DefaultView.class)- private ArrayList<NamedCodeCommentQuery> savedCodeCommentQueries;-- @Lob- @Column(length=65535)- @JsonView(DefaultView.class)- private ArrayList<NamedBuildQuery> savedBuildQueries;-- @Lob- @Column(length=65535)- @JsonView(DefaultView.class)- private ArrayList<WebHook> webHooks;-- private transient Repository repository;-- private transient Map<BlobIdent, Blob> blobCache;-- 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;-- private transient Optional<String> defaultBranchOptional;-- private transient Optional<RevCommit> lastCommitOptional;-- private transient Optional<IssueQuerySetting> issueQuerySettingOfCurrentUserHolder;-- private transient Optional<PullRequestQuerySetting> pullRequestQuerySettingOfCurrentUserHolder;-- private transient Optional<CodeCommentQuerySetting> codeCommentQuerySettingOfCurrentUserHolder;-- private transient Optional<BuildQuerySetting> buildQuerySettingOfCurrentUserHolder;-- private transient Optional<CommitQuerySetting> commitQuerySettingOfCurrentUserHolder;-- @Editable(order=100)- @ProjectName- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable(order=200)- @Markdown- public String getDescription() {- return description;- }-- public void setDescription(String description) {- this.description = description;- }-- @Editable(order=300, description="Optionally specify default privilege for users not "- + "joining any teams of the project")- @NameOfEmptyValue("No default privilege")- @Nullable- public DefaultPrivilege getDefaultPrivilege() {- return defaultPrivilege;- }-- public void setDefaultPrivilege(DefaultPrivilege defaultPrivilege) {- this.defaultPrivilege = defaultPrivilege;- }-- @Editable- @Nullable- @Valid- public ArrayList<CommitMessageTransform> getCommitMessageTransforms() {- return commitMessageTransforms;- }-- public void setCommitMessageTransforms(ArrayList<CommitMessageTransform> commitMessageTransforms) {- this.commitMessageTransforms = commitMessageTransforms;- }-- public String getUUID() {- return uuid;- }-- public void setUUID(String uuid) {- this.uuid = uuid;- }-- public ArrayList<BranchProtection> getBranchProtections() {- return branchProtections;- }-- public void setBranchProtections(ArrayList<BranchProtection> branchProtections) {- this.branchProtections = branchProtections;- }-- public ArrayList<TagProtection> getTagProtections() {- return tagProtections;- }-- public void setTagProtections(ArrayList<TagProtection> tagProtections) {- this.tagProtections = tagProtections;- }-- public Date getCreatedAt() {- return createdAt;- }-- public void setCreatedAt(Date createdAt) {- this.createdAt = createdAt;- }-- public Collection<PullRequest> getIncomingRequests() {- return incomingRequests;- }-- public void setIncomingRequests(Collection<PullRequest> incomingRequests) {- this.incomingRequests = incomingRequests;- }-- public Collection<PullRequest> getOutgoingRequests() {- return outgoingRequests;- }-- public void setOutgoingRequests(Collection<PullRequest> outgoingRequests) {- this.outgoingRequests = outgoingRequests;- }-- public Collection<GroupAuthorization> getGroupAuthorizations() {- return groupAuthorizations;- }-- public void setGroupAuthorizations(Collection<GroupAuthorization> groupAuthorizations) {- this.groupAuthorizations = groupAuthorizations;- }-- public Collection<UserAuthorization> getUserAuthorizations() {- return userAuthorizations;- }-- public void setAuthorizedUsers(Collection<UserAuthorization> userAuthorizations) {- this.userAuthorizations = userAuthorizations;- }-- public Project getForkedFrom() {- return forkedFrom;- }-- public void setForkedFrom(Project forkedFrom) {- this.forkedFrom = forkedFrom;- }-- public Collection<Project> getForks() {- return forks;- }-- public void setForks(Collection<Project> forks) {- this.forks = forks;- }-- public List<RefInfo> getBranches() {- return getRefInfos(Constants.R_HEADS);- }-- public List<RefInfo> getTags() {- return getRefInfos(Constants.R_TAGS);- }-- public Collection<Configuration> getConfigurations() {- return configurations;- }-- public void setConfigurations(Collection<Configuration> configurations) {- this.configurations = configurations;- }-- public List<RefInfo> getRefInfos(String prefix) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- List<Ref> refs = new ArrayList<Ref>(getRepository().getRefDatabase().getRefsByPrefix(prefix));- List<RefInfo> refInfos = refs.stream()- .map(ref->new RefInfo(revWalk, ref))- .filter(refInfo->refInfo.getPeeledObj() instanceof RevCommit)- .collect(Collectors.toList());- Collections.sort(refInfos);- Collections.reverse(refInfos);- return refInfos;- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public Git git() {- return Git.wrap(getRepository());- }-- public File getGitDir() {- return OneDev.getInstance(StorageManager.class).getProjectGitDir(getId());- }-- /**- * Find fork root of this project.- *- * @return- * fork root of this project- */- public Project getForkRoot() {- if (forkedFrom != null)- return forkedFrom.getForkRoot();- else- return this;- }-- /**- * Get all descendant projects forking from current project.- *- * @return- * all descendant projects forking from current project- */- public List<Project> getForkDescendants() {- List<Project> descendants = new ArrayList<>();- if (getDefaultBranch() != null)- descendants.add(this);- for (Project fork: getForks()) {- descendants.addAll(fork.getForkDescendants());- }-- return descendants;- }-- public Repository getRepository() {- if (repository == null) {- repository = OneDev.getInstance(ProjectManager.class).getRepository(this);- }- return repository;- }-- public String getUrl() {- return OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl() + "/projects/" + getName();- }-- @Nullable- public String getDefaultBranch() {- if (defaultBranchOptional == null) {- try {- Ref headRef = getRepository().findRef("HEAD");- if (headRef != null- && headRef.isSymbolic()- && headRef.getTarget().getName().startsWith(Constants.R_HEADS)- && headRef.getObjectId() != null) {- defaultBranchOptional = Optional.of(Repository.shortenRefName(headRef.getTarget().getName()));- } else {- defaultBranchOptional = Optional.absent();- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }- return defaultBranchOptional.orNull();- }-- public void setDefaultBranch(String defaultBranchName) {- RefUpdate refUpdate = GitUtils.getRefUpdate(getRepository(), "HEAD");- GitUtils.linkRef(refUpdate, GitUtils.branch2ref(defaultBranchName));- defaultBranchOptional = null;- }-- private Map<BlobIdent, Blob> getBlobCache() {- if (blobCache == null) {- synchronized(this) {- if (blobCache == null)- blobCache = new ConcurrentHashMap<>();- }- }- return blobCache;- }-- /**- * Read blob content and cache result in repository in case the same blob- * content is requested again.- *- * We made this method thread-safe as we are using ForkJoinPool to calculate- * diffs of multiple blob changes concurrently, and this method will be- * accessed concurrently in that special case.- *- * @param blobIdent- * ident of the blob- * @return- * blob of specified blob ident- * @throws- * ObjectNotFoundException if blob of specified ident can not be found in repository- *- */- public Blob getBlob(BlobIdent blobIdent) {- Preconditions.checkArgument(blobIdent.revision!=null && blobIdent.path!=null && blobIdent.mode!=null,- "Revision, path and mode of ident param should be specified");-- Blob blob = getBlobCache().get(blobIdent);- if (blob == null) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- ObjectId revId = getObjectId(blobIdent.revision);- RevTree revTree = revWalk.parseCommit(revId).getTree();- TreeWalk treeWalk = TreeWalk.forPath(getRepository(), blobIdent.path, revTree);- if (treeWalk != null) {- ObjectId blobId = treeWalk.getObjectId(0);- if (blobIdent.isGitLink()) {- String url = getSubmodules(blobIdent.revision).get(blobIdent.path);- if (url == null)- throw new ObjectNotFoundException("Unable to find submodule '" + blobIdent.path + "' in .gitmodules");- String hash = blobId.name();- blob = new Blob(blobIdent, blobId, new Submodule(url, hash).toString().getBytes());- } else if (blobIdent.isTree()) {- throw new NotFileException("Path '" + blobIdent.path + "' is a tree");- } else {- blob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());- }- getBlobCache().put(blobIdent, blob);- } else {- throw new ObjectNotFoundException("Unable to find blob path '" + blobIdent.path + "' in revision '" + blobIdent.revision + "'");- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }- return blob;- }-- public InputStream getInputStream(BlobIdent ident) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- ObjectId commitId = getObjectId(ident.revision);- RevTree revTree = revWalk.parseCommit(commitId).getTree();- TreeWalk treeWalk = TreeWalk.forPath(getRepository(), ident.path, revTree);- if (treeWalk != null) {- ObjectLoader objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));- return objectLoader.openStream();- } else {- throw new ObjectNotFoundException("Unable to find blob path '" + ident.path + "' in revision '" + ident.revision + "'");- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- /**- * Get cached object id of specified revision.- *- * @param revision- * revision to resolve object id for- * @param mustExist- * true to have the method throwing exception instead- * of returning null if the revision does not exist- * @return- * object id of specified revision, or <tt>null</tt> if revision- * does not exist and mustExist is specified as false- */- @Nullable- public ObjectId getObjectId(String revision, boolean mustExist) {- if (objectIdCache == null)- objectIdCache = new HashMap<>();-- Optional<ObjectId> optional = objectIdCache.get(revision);- if (optional == null) {- optional = Optional.fromNullable(GitUtils.resolve(getRepository(), revision));- objectIdCache.put(revision, optional);- }- if (mustExist && !optional.isPresent())- throw new ObjectNotFoundException("Unable to find object '" + revision + "'");- return optional.orNull();- }-- public ObjectId getObjectId(String revision) {- return getObjectId(revision, true);- }-- public void cacheObjectId(String revision, @Nullable ObjectId objectId) {- if (objectIdCache == null)- objectIdCache = new HashMap<>();-- objectIdCache.put(revision, Optional.fromNullable(objectId));- }-- /**- * Get CI spec of specified commit- * @param commitId- * commit id to get CI spec for- * @return- * CI spec of specified commit, or <tt>null</tt> if no CI spec is defined and- * auto-detection also can not provide an appropriate CI spec- * @throws- * Exception when CI spec is defined but not valid- */- @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)- path = "";-- final File cacheDir = new File(- OneDev.getInstance(StorageManager.class).getProjectInfoDir(getId()),- "last_commits/" + path + "/onedev_last_commits");-- final ReadWriteLock lock;- try {- lock = LockUtils.getReadWriteLock(cacheDir.getCanonicalPath());- } catch (IOException e) {- throw new RuntimeException(e);- }-- final Set<ObjectId> commitIds = new HashSet<>();-- lock.readLock().lock();- try {- if (cacheDir.exists()) {- for (String each: cacheDir.list())- commitIds.add(ObjectId.fromString(each));- }- } finally {- lock.readLock().unlock();- }-- org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache cache;- if (!commitIds.isEmpty()) {- cache = new org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache() {-- @SuppressWarnings("unchecked")- @Override- public Map<String, Value> getLastCommitsOfChildren(ObjectId commitId) {- if (commitIds.contains(commitId)) {- lock.readLock().lock();- try {- byte[] bytes = FileUtils.readFileToByteArray(new File(cacheDir, commitId.name()));- return (Map<String, Value>) SerializationUtils.deserialize(bytes);- } catch (IOException e) {- throw new RuntimeException(e);- } finally {- lock.readLock().unlock();- }- } else {- return null;- }- }-- };- } else {- cache = null;- }-- final AnyObjectId commitId = getObjectId(revision);-- long time = System.currentTimeMillis();- LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(getRepository(), commitId, path, cache);- long elapsed = System.currentTimeMillis()-time;- if (elapsed > LAST_COMMITS_CACHE_THRESHOLD) {- lock.writeLock().lock();- try {- if (!cacheDir.exists())- FileUtils.createDir(cacheDir);- FileUtils.writeByteArrayToFile(- new File(cacheDir, commitId.name()),- SerializationUtils.serialize(lastCommits));- } catch (IOException e) {- throw new RuntimeException(e);- } finally {- lock.writeLock().unlock();- }- }- return lastCommits;- }-- @Nullable- public Ref getRef(String revision) {- if (refCache == null)- refCache = new HashMap<>();- Optional<Ref> optional = refCache.get(revision);- if (optional == null) {- try {- optional = Optional.fromNullable(getRepository().findRef(revision));- } catch (IOException e) {- throw new RuntimeException(e);- }- refCache.put(revision, optional);- }- return optional.orNull();- }-- @Nullable- public Ref getBranchRef(String revision) {- Ref ref = getRef(revision);- if (ref != null && ref.getName().startsWith(Constants.R_HEADS))- return ref;- else- return null;- }-- @Nullable- public Ref getTagRef(String revision) {- Ref ref = getRef(revision);- if (ref != null && ref.getName().startsWith(Constants.R_TAGS))- return ref;- else- return null;- }-- @Nullable- public RevCommit getRevCommit(String revision, boolean mustExist) {- ObjectId revId = getObjectId(revision, mustExist);- if (revId != null) {- return getRevCommit(revId, mustExist);- } else {- return null;- }- }-- public RevCommit getRevCommit(String revision) {- return getRevCommit(revision, true);- }-- @Nullable- public RevCommit getRevCommit(ObjectId revId, boolean mustExist) {- if (commitCache == null)- commitCache = new HashMap<>();- RevCommit commit;- Optional<RevCommit> optional = commitCache.get(revId);- if (optional == null) {- try (RevWalk revWalk = new RevWalk(getRepository())) {- optional = Optional.fromNullable(GitUtils.parseCommit(revWalk, revId));- }- commitCache.put(revId, optional);- }- commit = optional.orNull();-- if (mustExist && commit == null)- throw new ObjectNotFoundException("Unable to find commit associated with object id: " + revId);- else- return commit;- }-- public RevCommit getRevCommit(ObjectId revId) {- return getRevCommit(revId, true);- }-- public List<Ref> getRefs(String prefix) {- try {- return getRepository().getRefDatabase().getRefsByPrefix(prefix);- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public Map<String, String> getSubmodules(String revision) {- Map<String, String> submodules = new HashMap<>();-- Blob blob = getBlob(new BlobIdent(revision, ".gitmodules", FileMode.REGULAR_FILE.getBits()));- String content = new String(blob.getBytes());-- String path = null;- String url = null;-- for (String line: StringUtils.splitAndTrim(content, "\r\n")) {- if (line.startsWith("[") && line.endsWith("]")) {- if (path != null && url != null)- submodules.put(path, url);-- path = url = null;- } else if (line.startsWith("path")) {- path = StringUtils.substringAfter(line, "=").trim();- } else if (line.startsWith("url")) {- url = StringUtils.substringAfter(line, "=").trim();- }- }- if (path != null && url != null)- submodules.put(path, url);-- return submodules;- }-- public void deleteBranch(String branch) {- String refName = GitUtils.branch2ref(branch);- ObjectId commitId = getObjectId(refName);- try {- git().branchDelete().setForce(true).setBranchNames(branch).call();- } catch (Exception e) {- throw ExceptionUtils.unchecked(e);- }-- Subject subject = SecurityUtils.getSubject();- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {-- @Override- public void run() {- ThreadContext.bind(subject);- try {- Project project = OneDev.getInstance(ProjectManager.class).load(getId());- OneDev.getInstance(ListenerRegistry.class).post(- new RefUpdated(project, refName, commitId, ObjectId.zeroId()));- } finally {- ThreadContext.unbindSubject();- }- }-- });- }-- public void createBranch(String branchName, String branchRevision) {- try {- CreateBranchCommand command = git().branchCreate();- command.setName(branchName);- RevCommit commit = getRevCommit(branchRevision);- command.setStartPoint(getRevCommit(branchRevision));- command.call();- cacheObjectId(GitUtils.branch2ref(branchName), commit);- } catch (GitAPIException e) {- throw new RuntimeException(e);- }- }-- public void tag(String tagName, String tagRevision, PersonIdent taggerIdent, @Nullable String tagMessage) {- try {- TagCommand tag = git().tag();- tag.setName(tagName);- if (tagMessage != null)- tag.setMessage(tagMessage);- tag.setTagger(taggerIdent);- tag.setObjectId(getRevCommit(tagRevision));- tag.call();- cacheObjectId(GitUtils.tag2ref(tagName), tag.getObjectId());- } catch (GitAPIException e) {- throw new RuntimeException(e);- }- }-- public void deleteTag(String tag) {- String refName = GitUtils.tag2ref(tag);- ObjectId commitId = getRevCommit(refName).getId();- try {- git().tagDelete().setTags(tag).call();- } catch (GitAPIException e) {- throw new RuntimeException(e);- }- Subject subject = SecurityUtils.getSubject();- OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {-- @Override- public void run() {- ThreadContext.bind(subject);- try {- Project project = OneDev.getInstance(ProjectManager.class).load(getId());- OneDev.getInstance(ListenerRegistry.class).post(- new RefUpdated(project, refName, commitId, ObjectId.zeroId()));- } finally {- ThreadContext.unbindSubject();- }- }-- });- }-- public Collection<CodeComment> getCodeComments() {- return codeComments;- }-- public void setCodeComments(Collection<CodeComment> codeComments) {- this.codeComments = codeComments;- }-- public IssueSetting getIssueSetting() {- if (issueSetting == null)- issueSetting = new IssueSetting();- return issueSetting;- }-- public void setIssueSetting(IssueSetting issueSetting) {- this.issueSetting = issueSetting;- }-- public ArrayList<NamedCommitQuery> getSavedCommitQueries() {- if (savedCommitQueries == null) {- savedCommitQueries = new ArrayList<>();- savedCommitQueries.add(new NamedCommitQuery("All", "all"));- savedCommitQueries.add(new NamedCommitQuery("Default branch", "default-branch"));- savedCommitQueries.add(new NamedCommitQuery("Authored by me", "authored-by-me"));- savedCommitQueries.add(new NamedCommitQuery("Committed by me", "committed-by-me"));- savedCommitQueries.add(new NamedCommitQuery("Committed recently", "after(last week)"));- }- return savedCommitQueries;- }-- public void setSavedCommitQueries(ArrayList<NamedCommitQuery> savedCommitQueries) {- this.savedCommitQueries = savedCommitQueries;- }-- public ArrayList<NamedPullRequestQuery> getSavedPullRequestQueries() {- if (savedPullRequestQueries == null) {- savedPullRequestQueries = new ArrayList<>();- savedPullRequestQueries.add(new NamedPullRequestQuery("Open", "open"));- savedPullRequestQueries.add(new NamedPullRequestQuery("To be reviewed by me", "to be reviewed by me"));- savedPullRequestQueries.add(new NamedPullRequestQuery("To be changed by me", "submitted by me and someone requested for changes"));- savedPullRequestQueries.add(new NamedPullRequestQuery("Request for changes by me", "requested for changes by me"));- savedPullRequestQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));- savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));- savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));- savedPullRequestQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));- savedPullRequestQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));- savedPullRequestQueries.add(new NamedPullRequestQuery("All", "all"));- }- return savedPullRequestQueries;- }-- public void setSavedPullRequestQueries(ArrayList<NamedPullRequestQuery> savedPullRequestQueries) {- this.savedPullRequestQueries = savedPullRequestQueries;- }-- @Nullable- public NamedCommitQuery getSavedCommitQuery(String name) {- for (NamedCommitQuery namedQuery: getSavedCommitQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- @Nullable- public NamedPullRequestQuery getSavedPullRequestQuery(String name) {- for (NamedPullRequestQuery namedQuery: getSavedPullRequestQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- @Nullable- public NamedCodeCommentQuery getSavedCodeCommentQuery(String name) {- for (NamedCodeCommentQuery namedQuery: getSavedCodeCommentQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- @Nullable- public NamedBuildQuery getSavedBuildQuery(String name) {- for (NamedBuildQuery namedQuery: getSavedBuildQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- public ArrayList<NamedCodeCommentQuery> getSavedCodeCommentQueries() {- if (savedCodeCommentQueries == null) {- savedCodeCommentQueries = new ArrayList<>();- savedCodeCommentQueries.add(new NamedCodeCommentQuery("All", "all"));- savedCodeCommentQueries.add(new NamedCodeCommentQuery("Created by me", "created by me"));- savedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is after \"last week\""));- savedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is after \"last week\""));- }- return savedCodeCommentQueries;- }-- public void setSavedCodeCommentQueries(ArrayList<NamedCodeCommentQuery> savedCodeCommentQueries) {- this.savedCodeCommentQueries = savedCodeCommentQueries;- }-- public ArrayList<NamedBuildQuery> getSavedBuildQueries() {- if (savedBuildQueries == null) {- savedBuildQueries = new ArrayList<>();- savedBuildQueries.add(new NamedBuildQuery("All", "all"));- savedBuildQueries.add(new NamedBuildQuery("Successful", "successful"));- savedBuildQueries.add(new NamedBuildQuery("Failed", "failed"));- savedBuildQueries.add(new NamedBuildQuery("In error", "in error"));- savedBuildQueries.add(new NamedBuildQuery("Running", "running"));- savedBuildQueries.add(new NamedBuildQuery("Build recently", "\"Build Date\" is after \"last week\""));- }- return savedBuildQueries;- }-- public void setSavedBuildQueries(ArrayList<NamedBuildQuery> savedBuildQueries) {- this.savedBuildQueries = savedBuildQueries;- }-- public Collection<IssueQuerySetting> getIssueQuerySettings() {- return issueQuerySettings;- }-- public void setIssueQuerySettings(Collection<IssueQuerySetting> issueQuerySettings) {- this.issueQuerySettings = issueQuerySettings;- }-- public Collection<CommitQuerySetting> getCommitQuerySettings() {- return commitQuerySettings;- }-- public void setCommitQuerySettings(Collection<CommitQuerySetting> commitQuerySettings) {- this.commitQuerySettings = commitQuerySettings;- }-- public Collection<PullRequestQuerySetting> getPullRequestQuerySettings() {- return pullRequestQuerySettings;- }-- public void setPullRequestQuerySettings(Collection<PullRequestQuerySetting> pullRequestQuerySettings) {- this.pullRequestQuerySettings = pullRequestQuerySettings;- }-- public Collection<CodeCommentQuerySetting> getCodeCommentQuerySettings() {- return codeCommentQuerySettings;- }-- public void setCodeCommentQuerySettings(Collection<CodeCommentQuerySetting> codeCommentQuerySettings) {- this.codeCommentQuerySettings = codeCommentQuerySettings;- }-- public Collection<BuildQuerySetting> getBuildQuerySettings() {- return buildQuerySettings;- }-- public void setBuildQuerySettings(Collection<BuildQuerySetting> buildQuerySettings) {- this.buildQuerySettings = buildQuerySettings;- }-- public long getVersion() {- return version;- }-- public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter) {- return getChildren(blobIdent, blobIdentFilter, getObjectId(blobIdent.revision));- }-- public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter, ObjectId commitId) {- Repository repository = getRepository();- try (RevWalk revWalk = new RevWalk(repository)) {- RevTree revTree = revWalk.parseCommit(commitId).getTree();-- TreeWalk treeWalk;- if (blobIdent.path != null) {- treeWalk = TreeWalk.forPath(repository, blobIdent.path, revTree);- treeWalk.enterSubtree();- } else {- treeWalk = new TreeWalk(repository);- treeWalk.addTree(revTree);- }-- List<BlobIdent> children = new ArrayList<>();- while (treeWalk.next()) {- BlobIdent child = new BlobIdent(blobIdent.revision, treeWalk.getPathString(), treeWalk.getRawMode(0));- if (blobIdentFilter.filter(child))- children.add(child);- }- Collections.sort(children);- return children;- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public int getMode(String revision, @Nullable String path) {- if (path != null) {- RevCommit commit = getRevCommit(revision);- try {- TreeWalk treeWalk = TreeWalk.forPath(getRepository(), path, commit.getTree());- if (treeWalk != null) {- return treeWalk.getRawMode(0);- } else {- throw new ObjectNotFoundException("Unable to find blob path '" + path- + "' in revision '" + revision + "'");- }- } catch (IOException e) {- throw new RuntimeException(e);- }- } else {- return FileMode.TREE.getBits();- }- }-- public Collection<Milestone> getMilestones() {- return milestones;- }-- public void setMilestones(Collection<Milestone> milestones) {- this.milestones = milestones;- }-- public List<Milestone> getSortedMilestones() {- if (sortedMilestones == null) {- sortedMilestones = new ArrayList<>(getMilestones());- Collections.sort(sortedMilestones, new Comparator<Milestone>() {-- @Override- public int compare(Milestone o1, Milestone o2) {- return o1.getDueDate().compareTo(o2.getDueDate());- }-- });- }- return sortedMilestones;- }-- public ArrayList<WebHook> getWebHooks() {- if (webHooks == null)- webHooks = new ArrayList<>();- return webHooks;- }-- public void setWebHooks(ArrayList<WebHook> webHooks) {- this.webHooks = webHooks;- }-- @Nullable- public TagProtection getTagProtection(String tagName, User user) {- for (TagProtection protection: tagProtections) {- if (protection.isEnabled()- && protection.getSubmitter().matches(this, user)- && PatternSet.fromString(protection.getTags()).matches(new ChildAwareMatcher(), tagName)) {- return protection;- }- }- return null;- }-- @Nullable- public BranchProtection getBranchProtection(String branchName, @Nullable User user) {- for (BranchProtection protection: branchProtections) {- if (protection.isEnabled()- && protection.getSubmitter().matches(this, user)- && PatternSet.fromString(protection.getBranches()).matches(new ChildAwareMatcher(), branchName)) {- return protection;- }- }- return null;- }-- public ProjectFacade getFacade() {- return new ProjectFacade(this);- }-- public RevCommit getLastCommit() {- if (lastCommitOptional == null) {- RevCommit lastCommit = null;- try {- for (Ref ref: getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS)) {- RevCommit commit = getRevCommit(ref.getObjectId(), false);- if (commit != null) {- if (lastCommit != null) {- if (commit.getCommitTime() > lastCommit.getCommitTime())- lastCommit = commit;- } else {- lastCommit = commit;- }- }- }- } catch (IOException e) {- throw new RuntimeException(e);- }- lastCommitOptional = Optional.fromNullable(lastCommit);- }- return lastCommitOptional.orNull();- }-- @Override- public String toString() {- return getName();- }-- public List<User> getAuthors(String filePath, ObjectId commitId, @Nullable Range range) {- BlameCommand cmd = new BlameCommand(getGitDir());- cmd.commitHash(commitId.name());- cmd.file(filePath);- cmd.range(range);-- List<User> authors = new ArrayList<>();- UserManager userManager = OneDev.getInstance(UserManager.class);- for (BlameBlock block: cmd.call()) {- User author = userManager.find(block.getCommit().getAuthor());- if (author != null && !authors.contains(author))- authors.add(author);- }-- return authors;- }-- public IssueQuerySetting getIssueQuerySettingOfCurrentUser() {- if (issueQuerySettingOfCurrentUserHolder == null) {- User user = SecurityUtils.getUser();- if (user != null) {- IssueQuerySetting setting = OneDev.getInstance(IssueQuerySettingManager.class).find(this, user);- if (setting == null) {- setting = new IssueQuerySetting();- setting.setProject(this);- setting.setUser(user);- }- issueQuerySettingOfCurrentUserHolder = Optional.of(setting);- } else {- issueQuerySettingOfCurrentUserHolder = Optional.absent();- }- }- return issueQuerySettingOfCurrentUserHolder.orNull();- }-- public CommitQuerySetting getCommitQuerySettingOfCurrentUser() {- if (commitQuerySettingOfCurrentUserHolder == null) {- User user = SecurityUtils.getUser();- if (user != null) {- CommitQuerySetting setting = OneDev.getInstance(CommitQuerySettingManager.class).find(this, user);- if (setting == null) {- setting = new CommitQuerySetting();- setting.setProject(this);- setting.setUser(user);- }- commitQuerySettingOfCurrentUserHolder = Optional.of(setting);- } else {- commitQuerySettingOfCurrentUserHolder = Optional.absent();- }- }- return commitQuerySettingOfCurrentUserHolder.orNull();- }-- @Nullable- public PullRequestQuerySetting getPullRequestQuerySettingOfCurrentUser() {- if (pullRequestQuerySettingOfCurrentUserHolder == null) {- User user = SecurityUtils.getUser();- if (user != null) {- PullRequestQuerySetting setting = OneDev.getInstance(PullRequestQuerySettingManager.class).find(this, user);- if (setting == null) {- setting = new PullRequestQuerySetting();- setting.setProject(this);- setting.setUser(user);- }- pullRequestQuerySettingOfCurrentUserHolder = Optional.of(setting);- } else {- pullRequestQuerySettingOfCurrentUserHolder = Optional.absent();- }- }- return pullRequestQuerySettingOfCurrentUserHolder.orNull();- }-- @Nullable- public CodeCommentQuerySetting getCodeCommentQuerySettingOfCurrentUser() {- if (codeCommentQuerySettingOfCurrentUserHolder == null) {- User user = SecurityUtils.getUser();- if (user != null) {- CodeCommentQuerySetting setting = OneDev.getInstance(CodeCommentQuerySettingManager.class).find(this, user);- if (setting == null) {- setting = new CodeCommentQuerySetting();- setting.setProject(this);- setting.setUser(user);- }- codeCommentQuerySettingOfCurrentUserHolder = Optional.of(setting);- } else {- codeCommentQuerySettingOfCurrentUserHolder = Optional.absent();- }- }- return codeCommentQuerySettingOfCurrentUserHolder.orNull();- }-- @Nullable- public BuildQuerySetting getBuildQuerySettingOfCurrentUser() {- if (buildQuerySettingOfCurrentUserHolder == null) {- User user = SecurityUtils.getUser();- if (user != null) {- BuildQuerySetting setting = OneDev.getInstance(BuildQuerySettingManager.class).find(this, user);- if (setting == null) {- setting = new BuildQuerySetting();- setting.setProject(this);- setting.setUser(user);- }- buildQuerySettingOfCurrentUserHolder = Optional.of(setting);- } else {- buildQuerySettingOfCurrentUserHolder = Optional.absent();- }- }- return buildQuerySettingOfCurrentUserHolder.orNull();- }-- @Nullable- public Milestone getMilestone(@Nullable String milestoneName) {- for (Milestone milestone: milestones) {- if (milestone.getName().equals(milestoneName))- return milestone;- }- return null;- }--}+package io.onedev.server.model;++import java.io.File;+import java.io.IOException;+import java.io.InputStream;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import java.util.Set;+import java.util.concurrent.ConcurrentHashMap;+import java.util.concurrent.locks.ReadWriteLock;+import java.util.stream.Collectors;++import javax.annotation.Nullable;+import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.Version;+import javax.validation.Valid;++import org.apache.commons.lang3.SerializationUtils;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;+import org.eclipse.jgit.api.CreateBranchCommand;+import org.eclipse.jgit.api.Git;+import org.eclipse.jgit.api.TagCommand;+import org.eclipse.jgit.api.errors.GitAPIException;+import org.eclipse.jgit.lib.AnyObjectId;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.ObjectLoader;+import org.eclipse.jgit.lib.PersonIdent;+import org.eclipse.jgit.lib.Ref;+import org.eclipse.jgit.lib.RefUpdate;+import org.eclipse.jgit.lib.Repository;+import org.eclipse.jgit.revwalk.LastCommitsOfChildren;+import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevTree;+import org.eclipse.jgit.revwalk.RevWalk;+import org.eclipse.jgit.treewalk.TreeWalk;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.annotations.DynamicUpdate;+import org.hibernate.validator.constraints.NotEmpty;++import com.fasterxml.jackson.annotation.JsonView;+import com.google.common.base.Optional;+import com.google.common.base.Preconditions;++import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.LockUtils;+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;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.git.BlobIdentFilter;+import io.onedev.server.git.GitUtils;+import io.onedev.server.git.RefInfo;+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.model.support.BranchProtection;+import io.onedev.server.model.support.CommitMessageTransform;+import io.onedev.server.model.support.NamedBuildQuery;+import io.onedev.server.model.support.NamedCodeCommentQuery;+import io.onedev.server.model.support.NamedCommitQuery;+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.SessionManager;+import io.onedev.server.persistence.TransactionManager;+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;+import io.onedev.server.util.validation.annotation.ProjectName;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Markdown;+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;++@Entity+@Table(indexes={@Index(columnList="o_forkedFrom_id"), @Index(columnList="name")})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@DynamicUpdate+@Editable+public class Project extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ private static final int LAST_COMMITS_CACHE_THRESHOLD = 1000;++ public static final int MAX_UPLOAD_SIZE = 10; // In mega bytes++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=true)+ private Project forkedFrom;++ @Column(nullable=false, unique=true)+ private String name;++ @Lob+ @Column(length=65535)+ private String description;++ private DefaultPrivilege defaultPrivilege;++ @Lob+ @Column(length=65535, name="COMMIT_MSG_TRANSFORM")+ @JsonView(DefaultView.class)+ private ArrayList<CommitMessageTransform> commitMessageTransforms = new ArrayList<>();++ /*+ * Optimistic lock is necessary to ensure database integrity when update+ * branch and tag protection settings upon project renaming/deletion+ */+ @Version+ private long version;++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<Configuration> configurations = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ @JsonView(DefaultView.class)+ private ArrayList<BranchProtection> branchProtections = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ @JsonView(DefaultView.class)+ private ArrayList<TagProtection> tagProtections = new ArrayList<>();++ @Column(nullable=false)+ private Date createdAt = new Date();++ @OneToMany(mappedBy="targetProject", cascade=CascadeType.REMOVE)+ private Collection<PullRequest> incomingRequests = new ArrayList<>();++ @OneToMany(mappedBy="sourceProject")+ private Collection<PullRequest> outgoingRequests = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<Issue> issues = new ArrayList<>();++ @OneToMany(mappedBy="forkedFrom")+ private Collection<Project> forks = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<UserAuthorization> userAuthorizations = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<CodeComment> codeComments = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<CommitQuerySetting> commitQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<PullRequestQuerySetting> pullRequestQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<CodeCommentQuerySetting> codeCommentQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<BuildQuerySetting> buildQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<Milestone> milestones = new ArrayList<>();++ @Lob+ @Column(length=65535)+ @JsonView(DefaultView.class)+ private IssueSetting issueSetting = new IssueSetting();++ @Lob+ @Column(length=65535)+ @JsonView(DefaultView.class)+ private ArrayList<NamedCommitQuery> savedCommitQueries = new ArrayList<>();+ {+ savedCommitQueries.add(new NamedCommitQuery("All", "all"));+ savedCommitQueries.add(new NamedCommitQuery("Default branch", "default-branch"));+ savedCommitQueries.add(new NamedCommitQuery("Authored by me", "authored-by-me"));+ savedCommitQueries.add(new NamedCommitQuery("Committed by me", "committed-by-me"));+ savedCommitQueries.add(new NamedCommitQuery("Committed recently", "after(last week)"));+ }++ @Lob+ @Column(length=65535)+ @JsonView(DefaultView.class)+ private ArrayList<NamedPullRequestQuery> savedPullRequestQueries = new ArrayList<>();+ {+ savedPullRequestQueries.add(new NamedPullRequestQuery("Open", "open"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("To be reviewed by me", "to be reviewed by me"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("To be changed by me", "submitted by me and someone requested for changes"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Request for changes by me", "requested for changes by me"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("All", "all"));+ }++ @Lob+ @Column(length=65535)+ @JsonView(DefaultView.class)+ private ArrayList<NamedCodeCommentQuery> savedCodeCommentQueries = new ArrayList<>();+ {+ savedCodeCommentQueries.add(new NamedCodeCommentQuery("All", "all"));+ savedCodeCommentQueries.add(new NamedCodeCommentQuery("Created by me", "created by me"));+ savedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is after \"last week\""));+ savedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is after \"last week\""));+ }++ @Lob+ @Column(length=65535)+ @JsonView(DefaultView.class)+ private ArrayList<NamedBuildQuery> savedBuildQueries = new ArrayList<>();+ {+ savedBuildQueries.add(new NamedBuildQuery("All", "all"));+ savedBuildQueries.add(new NamedBuildQuery("Successful", "successful"));+ savedBuildQueries.add(new NamedBuildQuery("Failed", "failed"));+ savedBuildQueries.add(new NamedBuildQuery("In error", "in error"));+ savedBuildQueries.add(new NamedBuildQuery("Running", "running"));+ savedBuildQueries.add(new NamedBuildQuery("Build recently", "\"Build Date\" is after \"last week\""));+ }++ @Lob+ @Column(length=65535)+ @JsonView(DefaultView.class)+ private ArrayList<WebHook> webHooks = new ArrayList<>();++ private transient Repository repository;++ private transient Map<BlobIdent, Blob> blobCache;++ 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;++ private transient Optional<String> defaultBranchOptional;++ private transient Optional<RevCommit> lastCommitOptional;++ private transient Optional<IssueQuerySetting> issueQuerySettingOfCurrentUserHolder;++ private transient Optional<PullRequestQuerySetting> pullRequestQuerySettingOfCurrentUserHolder;++ private transient Optional<CodeCommentQuerySetting> codeCommentQuerySettingOfCurrentUserHolder;++ private transient Optional<BuildQuerySetting> buildQuerySettingOfCurrentUserHolder;++ private transient Optional<CommitQuerySetting> commitQuerySettingOfCurrentUserHolder;++ private transient List<Milestone> sortedMilestones;++ @Editable(order=100)+ @ProjectName+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200)+ @Markdown+ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ @Editable(order=300, description="Optionally specify default privilege for users not "+ + "joining any teams of the project")+ @NameOfEmptyValue("No default privilege")+ @Nullable+ public DefaultPrivilege getDefaultPrivilege() {+ return defaultPrivilege;+ }++ public void setDefaultPrivilege(DefaultPrivilege defaultPrivilege) {+ this.defaultPrivilege = defaultPrivilege;+ }++ @Editable+ @Nullable+ @Valid+ public ArrayList<CommitMessageTransform> getCommitMessageTransforms() {+ return commitMessageTransforms;+ }++ public void setCommitMessageTransforms(ArrayList<CommitMessageTransform> commitMessageTransforms) {+ this.commitMessageTransforms = commitMessageTransforms;+ }++ public ArrayList<BranchProtection> getBranchProtections() {+ return branchProtections;+ }++ public void setBranchProtections(ArrayList<BranchProtection> branchProtections) {+ this.branchProtections = branchProtections;+ }++ public ArrayList<TagProtection> getTagProtections() {+ return tagProtections;+ }++ public void setTagProtections(ArrayList<TagProtection> tagProtections) {+ this.tagProtections = tagProtections;+ }++ public Date getCreatedAt() {+ return createdAt;+ }++ public void setCreatedAt(Date createdAt) {+ this.createdAt = createdAt;+ }++ public Collection<PullRequest> getIncomingRequests() {+ return incomingRequests;+ }++ public void setIncomingRequests(Collection<PullRequest> incomingRequests) {+ this.incomingRequests = incomingRequests;+ }++ public Collection<PullRequest> getOutgoingRequests() {+ return outgoingRequests;+ }++ public void setOutgoingRequests(Collection<PullRequest> outgoingRequests) {+ this.outgoingRequests = outgoingRequests;+ }++ public Collection<GroupAuthorization> getGroupAuthorizations() {+ return groupAuthorizations;+ }++ public void setGroupAuthorizations(Collection<GroupAuthorization> groupAuthorizations) {+ this.groupAuthorizations = groupAuthorizations;+ }++ public Collection<UserAuthorization> getUserAuthorizations() {+ return userAuthorizations;+ }++ public void setAuthorizedUsers(Collection<UserAuthorization> userAuthorizations) {+ this.userAuthorizations = userAuthorizations;+ }++ public Project getForkedFrom() {+ return forkedFrom;+ }++ public void setForkedFrom(Project forkedFrom) {+ this.forkedFrom = forkedFrom;+ }++ public Collection<Project> getForks() {+ return forks;+ }++ public void setForks(Collection<Project> forks) {+ this.forks = forks;+ }++ public List<RefInfo> getBranches() {+ return getRefInfos(Constants.R_HEADS);+ }++ public List<RefInfo> getTags() {+ return getRefInfos(Constants.R_TAGS);+ }++ public Collection<Configuration> getConfigurations() {+ return configurations;+ }++ public void setConfigurations(Collection<Configuration> configurations) {+ this.configurations = configurations;+ }++ public List<RefInfo> getRefInfos(String prefix) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ List<Ref> refs = new ArrayList<Ref>(getRepository().getRefDatabase().getRefsByPrefix(prefix));+ List<RefInfo> refInfos = refs.stream()+ .map(ref->new RefInfo(revWalk, ref))+ .filter(refInfo->refInfo.getPeeledObj() instanceof RevCommit)+ .collect(Collectors.toList());+ Collections.sort(refInfos);+ Collections.reverse(refInfos);+ return refInfos;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public Git git() {+ return Git.wrap(getRepository());+ }++ public File getGitDir() {+ return OneDev.getInstance(StorageManager.class).getProjectGitDir(getId());+ }++ /**+ * Find fork root of this project.+ *+ * @return+ * fork root of this project+ */+ public Project getForkRoot() {+ if (forkedFrom != null)+ return forkedFrom.getForkRoot();+ else+ return this;+ }++ /**+ * Get all descendant projects forking from current project.+ *+ * @return+ * all descendant projects forking from current project+ */+ public List<Project> getForkDescendants() {+ List<Project> descendants = new ArrayList<>();+ if (getDefaultBranch() != null)+ descendants.add(this);+ for (Project fork: getForks()) {+ descendants.addAll(fork.getForkDescendants());+ }++ return descendants;+ }++ public Repository getRepository() {+ if (repository == null) {+ repository = OneDev.getInstance(ProjectManager.class).getRepository(this);+ }+ return repository;+ }++ public String getUrl() {+ return OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl() + "/projects/" + getName();+ }++ @Nullable+ public String getDefaultBranch() {+ if (defaultBranchOptional == null) {+ try {+ Ref headRef = getRepository().findRef("HEAD");+ if (headRef != null+ && headRef.isSymbolic()+ && headRef.getTarget().getName().startsWith(Constants.R_HEADS)+ && headRef.getObjectId() != null) {+ defaultBranchOptional = Optional.of(Repository.shortenRefName(headRef.getTarget().getName()));+ } else {+ defaultBranchOptional = Optional.absent();+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ return defaultBranchOptional.orNull();+ }++ public void setDefaultBranch(String defaultBranchName) {+ RefUpdate refUpdate = GitUtils.getRefUpdate(getRepository(), "HEAD");+ GitUtils.linkRef(refUpdate, GitUtils.branch2ref(defaultBranchName));+ defaultBranchOptional = null;+ }++ private Map<BlobIdent, Blob> getBlobCache() {+ if (blobCache == null) {+ synchronized(this) {+ if (blobCache == null)+ blobCache = new ConcurrentHashMap<>();+ }+ }+ return blobCache;+ }++ /**+ * Read blob content and cache result in repository in case the same blob+ * content is requested again.+ *+ * We made this method thread-safe as we are using ForkJoinPool to calculate+ * diffs of multiple blob changes concurrently, and this method will be+ * accessed concurrently in that special case.+ *+ * @param blobIdent+ * ident of the blob+ * @return+ * blob of specified blob ident+ * @throws+ * ObjectNotFoundException if blob of specified ident can not be found in repository+ *+ */+ public Blob getBlob(BlobIdent blobIdent) {+ Preconditions.checkArgument(blobIdent.revision!=null && blobIdent.path!=null && blobIdent.mode!=null,+ "Revision, path and mode of ident param should be specified");++ Blob blob = getBlobCache().get(blobIdent);+ if (blob == null) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ ObjectId revId = getObjectId(blobIdent.revision);+ RevTree revTree = revWalk.parseCommit(revId).getTree();+ TreeWalk treeWalk = TreeWalk.forPath(getRepository(), blobIdent.path, revTree);+ if (treeWalk != null) {+ ObjectId blobId = treeWalk.getObjectId(0);+ if (blobIdent.isGitLink()) {+ String url = getSubmodules(blobIdent.revision).get(blobIdent.path);+ if (url == null)+ throw new ObjectNotFoundException("Unable to find submodule '" + blobIdent.path + "' in .gitmodules");+ String hash = blobId.name();+ blob = new Blob(blobIdent, blobId, new Submodule(url, hash).toString().getBytes());+ } else if (blobIdent.isTree()) {+ throw new NotFileException("Path '" + blobIdent.path + "' is a tree");+ } else {+ blob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());+ }+ getBlobCache().put(blobIdent, blob);+ } else {+ throw new ObjectNotFoundException("Unable to find blob path '" + blobIdent.path + "' in revision '" + blobIdent.revision + "'");+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ return blob;+ }++ public InputStream getInputStream(BlobIdent ident) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ ObjectId commitId = getObjectId(ident.revision);+ RevTree revTree = revWalk.parseCommit(commitId).getTree();+ TreeWalk treeWalk = TreeWalk.forPath(getRepository(), ident.path, revTree);+ if (treeWalk != null) {+ ObjectLoader objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));+ return objectLoader.openStream();+ } else {+ throw new ObjectNotFoundException("Unable to find blob path '" + ident.path + "' in revision '" + ident.revision + "'");+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ /**+ * Get cached object id of specified revision.+ *+ * @param revision+ * revision to resolve object id for+ * @param mustExist+ * true to have the method throwing exception instead+ * of returning null if the revision does not exist+ * @return+ * object id of specified revision, or <tt>null</tt> if revision+ * does not exist and mustExist is specified as false+ */+ @Nullable+ public ObjectId getObjectId(String revision, boolean mustExist) {+ if (objectIdCache == null)+ objectIdCache = new HashMap<>();++ Optional<ObjectId> optional = objectIdCache.get(revision);+ if (optional == null) {+ optional = Optional.fromNullable(GitUtils.resolve(getRepository(), revision));+ objectIdCache.put(revision, optional);+ }+ if (mustExist && !optional.isPresent())+ throw new ObjectNotFoundException("Unable to find object '" + revision + "'");+ return optional.orNull();+ }++ public ObjectId getObjectId(String revision) {+ return getObjectId(revision, true);+ }++ public void cacheObjectId(String revision, @Nullable ObjectId objectId) {+ if (objectIdCache == null)+ objectIdCache = new HashMap<>();++ objectIdCache.put(revision, Optional.fromNullable(objectId));+ }++ /**+ * Get CI spec of specified commit+ * @param commitId+ * commit id to get CI spec for+ * @return+ * CI spec of specified commit, or <tt>null</tt> if no CI spec is defined and+ * auto-detection also can not provide an appropriate CI spec+ * @throws+ * Exception when CI spec is defined but not valid+ */+ @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)+ path = "";++ final File cacheDir = new File(+ OneDev.getInstance(StorageManager.class).getProjectInfoDir(getId()),+ "last_commits/" + path + "/onedev_last_commits");++ final ReadWriteLock lock;+ try {+ lock = LockUtils.getReadWriteLock(cacheDir.getCanonicalPath());+ } catch (IOException e) {+ throw new RuntimeException(e);+ }++ final Set<ObjectId> commitIds = new HashSet<>();++ lock.readLock().lock();+ try {+ if (cacheDir.exists()) {+ for (String each: cacheDir.list())+ commitIds.add(ObjectId.fromString(each));+ }+ } finally {+ lock.readLock().unlock();+ }++ org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache cache;+ if (!commitIds.isEmpty()) {+ cache = new org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache() {++ @SuppressWarnings("unchecked")+ @Override+ public Map<String, Value> getLastCommitsOfChildren(ObjectId commitId) {+ if (commitIds.contains(commitId)) {+ lock.readLock().lock();+ try {+ byte[] bytes = FileUtils.readFileToByteArray(new File(cacheDir, commitId.name()));+ return (Map<String, Value>) SerializationUtils.deserialize(bytes);+ } catch (IOException e) {+ throw new RuntimeException(e);+ } finally {+ lock.readLock().unlock();+ }+ } else {+ return null;+ }+ }++ };+ } else {+ cache = null;+ }++ final AnyObjectId commitId = getObjectId(revision);++ long time = System.currentTimeMillis();+ LastCommitsOfChildren lastCommits = new LastCommitsOfChildren(getRepository(), commitId, path, cache);+ long elapsed = System.currentTimeMillis()-time;+ if (elapsed > LAST_COMMITS_CACHE_THRESHOLD) {+ lock.writeLock().lock();+ try {+ if (!cacheDir.exists())+ FileUtils.createDir(cacheDir);+ FileUtils.writeByteArrayToFile(+ new File(cacheDir, commitId.name()),+ SerializationUtils.serialize(lastCommits));+ } catch (IOException e) {+ throw new RuntimeException(e);+ } finally {+ lock.writeLock().unlock();+ }+ }+ return lastCommits;+ }++ @Nullable+ public Ref getRef(String revision) {+ if (refCache == null)+ refCache = new HashMap<>();+ Optional<Ref> optional = refCache.get(revision);+ if (optional == null) {+ try {+ optional = Optional.fromNullable(getRepository().findRef(revision));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ refCache.put(revision, optional);+ }+ return optional.orNull();+ }++ @Nullable+ public Ref getBranchRef(String revision) {+ Ref ref = getRef(revision);+ if (ref != null && ref.getName().startsWith(Constants.R_HEADS))+ return ref;+ else+ return null;+ }++ @Nullable+ public Ref getTagRef(String revision) {+ Ref ref = getRef(revision);+ if (ref != null && ref.getName().startsWith(Constants.R_TAGS))+ return ref;+ else+ return null;+ }++ @Nullable+ public RevCommit getRevCommit(String revision, boolean mustExist) {+ ObjectId revId = getObjectId(revision, mustExist);+ if (revId != null) {+ return getRevCommit(revId, mustExist);+ } else {+ return null;+ }+ }++ public RevCommit getRevCommit(String revision) {+ return getRevCommit(revision, true);+ }++ @Nullable+ public RevCommit getRevCommit(ObjectId revId, boolean mustExist) {+ if (commitCache == null)+ commitCache = new HashMap<>();+ RevCommit commit;+ Optional<RevCommit> optional = commitCache.get(revId);+ if (optional == null) {+ try (RevWalk revWalk = new RevWalk(getRepository())) {+ optional = Optional.fromNullable(GitUtils.parseCommit(revWalk, revId));+ }+ commitCache.put(revId, optional);+ }+ commit = optional.orNull();++ if (mustExist && commit == null)+ throw new ObjectNotFoundException("Unable to find commit associated with object id: " + revId);+ else+ return commit;+ }++ public RevCommit getRevCommit(ObjectId revId) {+ return getRevCommit(revId, true);+ }++ public List<Ref> getRefs(String prefix) {+ try {+ return getRepository().getRefDatabase().getRefsByPrefix(prefix);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public Map<String, String> getSubmodules(String revision) {+ Map<String, String> submodules = new HashMap<>();++ Blob blob = getBlob(new BlobIdent(revision, ".gitmodules", FileMode.REGULAR_FILE.getBits()));+ String content = new String(blob.getBytes());++ String path = null;+ String url = null;++ for (String line: StringUtils.splitAndTrim(content, "\r\n")) {+ if (line.startsWith("[") && line.endsWith("]")) {+ if (path != null && url != null)+ submodules.put(path, url);++ path = url = null;+ } else if (line.startsWith("path")) {+ path = StringUtils.substringAfter(line, "=").trim();+ } else if (line.startsWith("url")) {+ url = StringUtils.substringAfter(line, "=").trim();+ }+ }+ if (path != null && url != null)+ submodules.put(path, url);++ return submodules;+ }++ public void deleteBranch(String branch) {+ String refName = GitUtils.branch2ref(branch);+ ObjectId commitId = getObjectId(refName);+ try {+ git().branchDelete().setForce(true).setBranchNames(branch).call();+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }++ Subject subject = SecurityUtils.getSubject();+ OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {++ @Override+ public void run() {+ OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ Project project = OneDev.getInstance(ProjectManager.class).load(getId());+ OneDev.getInstance(ListenerRegistry.class).post(+ new RefUpdated(project, refName, commitId, ObjectId.zeroId()));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }++ });+ }++ public void createBranch(String branchName, String branchRevision) {+ try {+ CreateBranchCommand command = git().branchCreate();+ command.setName(branchName);+ RevCommit commit = getRevCommit(branchRevision);+ command.setStartPoint(getRevCommit(branchRevision));+ command.call();+ String refName = GitUtils.branch2ref(branchName);+ cacheObjectId(refName, commit);++ Subject subject = SecurityUtils.getSubject();+ ObjectId commitId = commit.copy();+ OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {++ @Override+ public void run() {+ OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ Project project = OneDev.getInstance(ProjectManager.class).load(getId());+ OneDev.getInstance(ListenerRegistry.class).post(+ new RefUpdated(project, refName, ObjectId.zeroId(), commitId));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }++ });+ } catch (GitAPIException e) {+ throw new RuntimeException(e);+ }+ }++ public void createTag(String tagName, String tagRevision, PersonIdent taggerIdent, @Nullable String tagMessage) {+ try {+ TagCommand tag = git().tag();+ tag.setName(tagName);+ if (tagMessage != null)+ tag.setMessage(tagMessage);+ tag.setTagger(taggerIdent);+ tag.setObjectId(getRevCommit(tagRevision));+ tag.call();++ String refName = GitUtils.tag2ref(tagName);+ cacheObjectId(refName, tag.getObjectId());++ Subject subject = SecurityUtils.getSubject();+ ObjectId commitId = tag.getObjectId().copy();+ OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {++ @Override+ public void run() {+ OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ Project project = OneDev.getInstance(ProjectManager.class).load(getId());+ OneDev.getInstance(ListenerRegistry.class).post(+ new RefUpdated(project, refName, ObjectId.zeroId(), commitId));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }++ });+ } catch (GitAPIException e) {+ throw new RuntimeException(e);+ }+ }++ public void deleteTag(String tag) {+ String refName = GitUtils.tag2ref(tag);+ ObjectId commitId = getRevCommit(refName).getId();+ try {+ git().tagDelete().setTags(tag).call();+ } catch (GitAPIException e) {+ throw new RuntimeException(e);+ }++ Subject subject = SecurityUtils.getSubject();+ OneDev.getInstance(TransactionManager.class).runAfterCommit(new Runnable() {++ @Override+ public void run() {+ OneDev.getInstance(SessionManager.class).runAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ Project project = OneDev.getInstance(ProjectManager.class).load(getId());+ OneDev.getInstance(ListenerRegistry.class).post(+ new RefUpdated(project, refName, commitId, ObjectId.zeroId()));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }++ });+ }++ public Collection<CodeComment> getCodeComments() {+ return codeComments;+ }++ public void setCodeComments(Collection<CodeComment> codeComments) {+ this.codeComments = codeComments;+ }++ public IssueSetting getIssueSetting() {+ return issueSetting;+ }++ public void setIssueSetting(IssueSetting issueSetting) {+ this.issueSetting = issueSetting;+ }++ public ArrayList<NamedCommitQuery> getSavedCommitQueries() {+ return savedCommitQueries;+ }++ public void setSavedCommitQueries(ArrayList<NamedCommitQuery> savedCommitQueries) {+ this.savedCommitQueries = savedCommitQueries;+ }++ public ArrayList<NamedPullRequestQuery> getSavedPullRequestQueries() {+ return savedPullRequestQueries;+ }++ public void setSavedPullRequestQueries(ArrayList<NamedPullRequestQuery> savedPullRequestQueries) {+ this.savedPullRequestQueries = savedPullRequestQueries;+ }++ @Nullable+ public NamedCommitQuery getSavedCommitQuery(String name) {+ for (NamedCommitQuery namedQuery: getSavedCommitQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++ @Nullable+ public NamedPullRequestQuery getSavedPullRequestQuery(String name) {+ for (NamedPullRequestQuery namedQuery: getSavedPullRequestQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++ @Nullable+ public NamedCodeCommentQuery getSavedCodeCommentQuery(String name) {+ for (NamedCodeCommentQuery namedQuery: getSavedCodeCommentQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++ @Nullable+ public NamedBuildQuery getSavedBuildQuery(String name) {+ for (NamedBuildQuery namedQuery: getSavedBuildQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++ public ArrayList<NamedCodeCommentQuery> getSavedCodeCommentQueries() {+ return savedCodeCommentQueries;+ }++ public void setSavedCodeCommentQueries(ArrayList<NamedCodeCommentQuery> savedCodeCommentQueries) {+ this.savedCodeCommentQueries = savedCodeCommentQueries;+ }++ public ArrayList<NamedBuildQuery> getSavedBuildQueries() {+ return savedBuildQueries;+ }++ public void setSavedBuildQueries(ArrayList<NamedBuildQuery> savedBuildQueries) {+ this.savedBuildQueries = savedBuildQueries;+ }++ public Collection<IssueQuerySetting> getIssueQuerySettings() {+ return issueQuerySettings;+ }++ public void setIssueQuerySettings(Collection<IssueQuerySetting> issueQuerySettings) {+ this.issueQuerySettings = issueQuerySettings;+ }++ public Collection<CommitQuerySetting> getCommitQuerySettings() {+ return commitQuerySettings;+ }++ public void setCommitQuerySettings(Collection<CommitQuerySetting> commitQuerySettings) {+ this.commitQuerySettings = commitQuerySettings;+ }++ public Collection<PullRequestQuerySetting> getPullRequestQuerySettings() {+ return pullRequestQuerySettings;+ }++ public void setPullRequestQuerySettings(Collection<PullRequestQuerySetting> pullRequestQuerySettings) {+ this.pullRequestQuerySettings = pullRequestQuerySettings;+ }++ public Collection<CodeCommentQuerySetting> getCodeCommentQuerySettings() {+ return codeCommentQuerySettings;+ }++ public void setCodeCommentQuerySettings(Collection<CodeCommentQuerySetting> codeCommentQuerySettings) {+ this.codeCommentQuerySettings = codeCommentQuerySettings;+ }++ public Collection<BuildQuerySetting> getBuildQuerySettings() {+ return buildQuerySettings;+ }++ public void setBuildQuerySettings(Collection<BuildQuerySetting> buildQuerySettings) {+ this.buildQuerySettings = buildQuerySettings;+ }++ public long getVersion() {+ return version;+ }++ public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter) {+ return getChildren(blobIdent, blobIdentFilter, getObjectId(blobIdent.revision));+ }++ public List<BlobIdent> getChildren(BlobIdent blobIdent, BlobIdentFilter blobIdentFilter, ObjectId commitId) {+ Repository repository = getRepository();+ try (RevWalk revWalk = new RevWalk(repository)) {+ RevTree revTree = revWalk.parseCommit(commitId).getTree();++ TreeWalk treeWalk;+ if (blobIdent.path != null) {+ treeWalk = TreeWalk.forPath(repository, blobIdent.path, revTree);+ treeWalk.enterSubtree();+ } else {+ treeWalk = new TreeWalk(repository);+ treeWalk.addTree(revTree);+ }++ List<BlobIdent> children = new ArrayList<>();+ while (treeWalk.next()) {+ BlobIdent child = new BlobIdent(blobIdent.revision, treeWalk.getPathString(), treeWalk.getRawMode(0));+ if (blobIdentFilter.filter(child))+ children.add(child);+ }+ Collections.sort(children);+ return children;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public int getMode(String revision, @Nullable String path) {+ if (path != null) {+ RevCommit commit = getRevCommit(revision);+ try {+ TreeWalk treeWalk = TreeWalk.forPath(getRepository(), path, commit.getTree());+ if (treeWalk != null) {+ return treeWalk.getRawMode(0);+ } else {+ throw new ObjectNotFoundException("Unable to find blob path '" + path+ + "' in revision '" + revision + "'");+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ } else {+ return FileMode.TREE.getBits();+ }+ }++ public Collection<Milestone> getMilestones() {+ return milestones;+ }++ public void setMilestones(Collection<Milestone> milestones) {+ this.milestones = milestones;+ }++ public List<Milestone> getSortedMilestones() {+ if (sortedMilestones == null) {+ sortedMilestones = new ArrayList<>(getMilestones());+ Collections.sort(sortedMilestones, new Comparator<Milestone>() {++ @Override+ public int compare(Milestone o1, Milestone o2) {+ return o1.getDueDate().compareTo(o2.getDueDate());+ }++ });+ }+ return sortedMilestones;+ }++ public ArrayList<WebHook> getWebHooks() {+ return webHooks;+ }++ public void setWebHooks(ArrayList<WebHook> webHooks) {+ this.webHooks = webHooks;+ }++ @Nullable+ public TagProtection getTagProtection(String tagName, User user) {+ for (TagProtection protection: tagProtections) {+ if (protection.isEnabled()+ && protection.getSubmitter().matches(this, user)+ && PatternSet.fromString(protection.getTags()).matches(new ChildAwareMatcher(), tagName)) {+ return protection;+ }+ }+ return null;+ }++ @Nullable+ public BranchProtection getBranchProtection(String branchName, @Nullable User user) {+ for (BranchProtection protection: branchProtections) {+ if (protection.isEnabled()+ && protection.getSubmitter().matches(this, user)+ && PatternSet.fromString(protection.getBranches()).matches(new ChildAwareMatcher(), branchName)) {+ return protection;+ }+ }+ return null;+ }++ public ProjectFacade getFacade() {+ return new ProjectFacade(this);+ }++ public RevCommit getLastCommit() {+ if (lastCommitOptional == null) {+ RevCommit lastCommit = null;+ try {+ for (Ref ref: getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS)) {+ RevCommit commit = getRevCommit(ref.getObjectId(), false);+ if (commit != null) {+ if (lastCommit != null) {+ if (commit.getCommitTime() > lastCommit.getCommitTime())+ lastCommit = commit;+ } else {+ lastCommit = commit;+ }+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ lastCommitOptional = Optional.fromNullable(lastCommit);+ }+ return lastCommitOptional.orNull();+ }++ @Override+ public String toString() {+ return getName();+ }++ public List<User> getAuthors(String filePath, ObjectId commitId, @Nullable Range range) {+ BlameCommand cmd = new BlameCommand(getGitDir());+ cmd.commitHash(commitId.name());+ cmd.file(filePath);+ cmd.range(range);++ List<User> authors = new ArrayList<>();+ UserManager userManager = OneDev.getInstance(UserManager.class);+ for (BlameBlock block: cmd.call()) {+ User author = userManager.find(block.getCommit().getAuthor());+ if (author != null && !authors.contains(author))+ authors.add(author);+ }++ return authors;+ }++ public IssueQuerySetting getIssueQuerySettingOfCurrentUser() {+ if (issueQuerySettingOfCurrentUserHolder == null) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ IssueQuerySetting setting = OneDev.getInstance(IssueQuerySettingManager.class).find(this, user);+ if (setting == null) {+ setting = new IssueQuerySetting();+ setting.setProject(this);+ setting.setUser(user);+ }+ issueQuerySettingOfCurrentUserHolder = Optional.of(setting);+ } else {+ issueQuerySettingOfCurrentUserHolder = Optional.absent();+ }+ }+ return issueQuerySettingOfCurrentUserHolder.orNull();+ }++ public CommitQuerySetting getCommitQuerySettingOfCurrentUser() {+ if (commitQuerySettingOfCurrentUserHolder == null) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ CommitQuerySetting setting = OneDev.getInstance(CommitQuerySettingManager.class).find(this, user);+ if (setting == null) {+ setting = new CommitQuerySetting();+ setting.setProject(this);+ setting.setUser(user);+ }+ commitQuerySettingOfCurrentUserHolder = Optional.of(setting);+ } else {+ commitQuerySettingOfCurrentUserHolder = Optional.absent();+ }+ }+ return commitQuerySettingOfCurrentUserHolder.orNull();+ }++ @Nullable+ public PullRequestQuerySetting getPullRequestQuerySettingOfCurrentUser() {+ if (pullRequestQuerySettingOfCurrentUserHolder == null) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ PullRequestQuerySetting setting = OneDev.getInstance(PullRequestQuerySettingManager.class).find(this, user);+ if (setting == null) {+ setting = new PullRequestQuerySetting();+ setting.setProject(this);+ setting.setUser(user);+ }+ pullRequestQuerySettingOfCurrentUserHolder = Optional.of(setting);+ } else {+ pullRequestQuerySettingOfCurrentUserHolder = Optional.absent();+ }+ }+ return pullRequestQuerySettingOfCurrentUserHolder.orNull();+ }++ @Nullable+ public CodeCommentQuerySetting getCodeCommentQuerySettingOfCurrentUser() {+ if (codeCommentQuerySettingOfCurrentUserHolder == null) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ CodeCommentQuerySetting setting = OneDev.getInstance(CodeCommentQuerySettingManager.class).find(this, user);+ if (setting == null) {+ setting = new CodeCommentQuerySetting();+ setting.setProject(this);+ setting.setUser(user);+ }+ codeCommentQuerySettingOfCurrentUserHolder = Optional.of(setting);+ } else {+ codeCommentQuerySettingOfCurrentUserHolder = Optional.absent();+ }+ }+ return codeCommentQuerySettingOfCurrentUserHolder.orNull();+ }++ @Nullable+ public BuildQuerySetting getBuildQuerySettingOfCurrentUser() {+ if (buildQuerySettingOfCurrentUserHolder == null) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ BuildQuerySetting setting = OneDev.getInstance(BuildQuerySettingManager.class).find(this, user);+ if (setting == null) {+ setting = new BuildQuerySetting();+ setting.setProject(this);+ setting.setUser(user);+ }+ buildQuerySettingOfCurrentUserHolder = Optional.of(setting);+ } else {+ buildQuerySettingOfCurrentUserHolder = Optional.absent();+ }+ }+ return buildQuerySettingOfCurrentUserHolder.orNull();+ }++ @Nullable+ public Milestone getMilestone(@Nullable String milestoneName) {+ for (Milestone milestone: milestones) {+ if (milestone.getName().equals(milestoneName))+ return milestone;+ }+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex 8c44a8e762..d215a47813 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -1,229 +1,217 @@-package io.onedev.server.model;--import java.util.ArrayList;-import java.util.Collection;-import java.util.UUID;--import javax.persistence.CascadeType;-import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.Index;-import javax.persistence.OneToMany;-import javax.persistence.Table;-import javax.persistence.Version;--import org.apache.shiro.SecurityUtils;-import org.apache.shiro.authc.AuthenticationInfo;-import org.apache.shiro.subject.PrincipalCollection;-import org.apache.shiro.subject.SimplePrincipalCollection;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.web.mgt.WebSecurityManager;-import org.eclipse.jgit.lib.PersonIdent;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;-import org.hibernate.validator.constraints.Email;-import org.hibernate.validator.constraints.NotEmpty;--import com.fasterxml.jackson.annotation.JsonView;-import com.google.common.base.MoreObjects;-import com.google.common.base.Preconditions;--import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.jackson.DefaultView;-import io.onedev.server.util.validation.annotation.UserName;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Password;--@Entity-@Table(indexes={@Index(columnList="email"), @Index(columnList="fullName")})-@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)-@Editable-public class User extends AbstractEntity implements AuthenticationInfo {-- private static final long serialVersionUID = 1L;-- public static final Long ROOT_ID = 1L;-- @Column(unique=true, nullable=false)- private String name;-- @Column(length=1024, nullable=false)- @JsonView(DefaultView.class)- private String password;-- private String fullName;-- @Column(unique=true, nullable=false)- private String email;-- @Column(nullable=false)- private String uuid = UUID.randomUUID().toString();-- /*- * Optimistic lock is necessary to ensure database integrity when update- * branch and tag protection settings upon user renaming/deletion- */- @Version- private long version;-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<Membership> memberships = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<UserAuthorization> authorizations = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestReview> reviews = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestWatch> requestWatches = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<IssueWatch> issueWatches = new ArrayList<>();-- @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();-- @Override- public PrincipalCollection getPrincipals() {- return new SimplePrincipalCollection(getId(), "");- }-- @Override- public Object getCredentials() {- return password;- }-- public Subject asSubject() {- return asSubject(getId());- }-- public static Long getCurrentId() {- Object principal = SecurityUtils.getSubject().getPrincipal();- Preconditions.checkNotNull(principal);- return (Long) principal;- }-- public static PrincipalCollection asPrincipal(Long userId) {- return new SimplePrincipalCollection(userId, "");- }-- public static Subject asSubject(Long userId) {- WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);- return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();- }-- @Editable(name="Login Name", order=100)- @UserName- @NotEmpty- public String getName() {- return name;- }-- public void setName(String name) {- this.name = name;- }-- @Editable(order=150)- @Password(confirmative=true, autoComplete="new-password")- @NotEmpty- public String getPassword() {- return password;- }-- /**- * Set password of this user.- *- * @param password- * password to set- */- public void setPassword(String password) {- this.password = password;- }-- @Editable(order=200)- public String getFullName() {- return fullName;- }-- public void setFullName(String fullName) {- this.fullName = fullName;- }-- @Editable(order=300)- @NotEmpty- public String getEmail() {- return email;- }-- public void setEmail(String email) {- this.email = email;- }-- public Collection<Membership> getMemberships() {- return memberships;- }-- public void setGroups(Collection<Membership> memberships) {- this.memberships = memberships;- }-- @Override- public String toString() {- return MoreObjects.toStringHelper(this)- .add("name", getName())- .toString();- }-- public PersonIdent asPerson() {- return new PersonIdent(getName(), getEmail());- }-- public String getDisplayName() {- if (getFullName() != null)- return getFullName();- else- return getName();- }-- public boolean isRoot() {- return ROOT_ID.equals(getId());- }-- public long getVersion() {- return version;- }-- public Collection<IssueQuerySetting> getIssueQuerySettings() {- return issueQuerySettings;- }-- public void setIssueQuerySettings(Collection<IssueQuerySetting> issueQuerySettings) {- this.issueQuerySettings = issueQuerySettings;- }-- public String getUUID() {- return uuid;- }-- public void setUUID(String uuid) {- this.uuid = uuid;- }-- @Override- public int compareTo(AbstractEntity entity) {- User user = (User) entity;- if (getDisplayName().equals(user.getDisplayName())) {- return getId().compareTo(entity.getId());- } else {- return getDisplayName().compareTo(user.getDisplayName());- }- }-- public UserFacade getFacade() {- return new UserFacade(this);- }--}+package io.onedev.server.model;++import java.util.ArrayList;+import java.util.Collection;++import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.persistence.Version;++import org.apache.shiro.SecurityUtils;+import org.apache.shiro.authc.AuthenticationInfo;+import org.apache.shiro.subject.PrincipalCollection;+import org.apache.shiro.subject.SimplePrincipalCollection;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.web.mgt.WebSecurityManager;+import org.eclipse.jgit.lib.PersonIdent;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import org.hibernate.validator.constraints.Email;+import org.hibernate.validator.constraints.NotEmpty;++import com.fasterxml.jackson.annotation.JsonView;+import com.google.common.base.MoreObjects;+import com.google.common.base.Preconditions;++import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.jackson.DefaultView;+import io.onedev.server.util.validation.annotation.UserName;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Password;++@Entity+@Table(indexes={@Index(columnList="email"), @Index(columnList="fullName")})+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)+@Editable+public class User extends AbstractEntity implements AuthenticationInfo {++ private static final long serialVersionUID = 1L;++ public static final Long ROOT_ID = 1L;++ @Column(unique=true, nullable=false)+ private String name;++ @Column(length=1024, nullable=false)+ @JsonView(DefaultView.class)+ private String password;++ private String fullName;++ @Column(unique=true, nullable=false)+ private String email;++ /*+ * Optimistic lock is necessary to ensure database integrity when update+ * branch and tag protection settings upon user renaming/deletion+ */+ @Version+ private long version;++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<Membership> memberships = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<UserAuthorization> authorizations = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestReview> reviews = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestWatch> requestWatches = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<IssueWatch> issueWatches = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();++ @Override+ public PrincipalCollection getPrincipals() {+ return new SimplePrincipalCollection(getId(), "");+ }++ @Override+ public Object getCredentials() {+ return password;+ }++ public Subject asSubject() {+ return asSubject(getId());+ }++ public static Long getCurrentId() {+ Object principal = SecurityUtils.getSubject().getPrincipal();+ Preconditions.checkNotNull(principal);+ return (Long) principal;+ }++ public static PrincipalCollection asPrincipal(Long userId) {+ return new SimplePrincipalCollection(userId, "");+ }++ public static Subject asSubject(Long userId) {+ WebSecurityManager securityManager = AppLoader.getInstance(WebSecurityManager.class);+ return new Subject.Builder(securityManager).principals(asPrincipal(userId)).buildSubject();+ }++ @Editable(name="Login Name", order=100)+ @UserName+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=150)+ @Password(confirmative=true, autoComplete="new-password")+ @NotEmpty+ public String getPassword() {+ return password;+ }++ /**+ * Set password of this user.+ *+ * @param password+ * password to set+ */+ public void setPassword(String password) {+ this.password = password;+ }++ @Editable(order=200)+ public String getFullName() {+ return fullName;+ }++ public void setFullName(String fullName) {+ this.fullName = fullName;+ }++ @Editable(order=300)+ @NotEmpty+ public String getEmail() {+ return email;+ }++ public void setEmail(String email) {+ this.email = email;+ }++ public Collection<Membership> getMemberships() {+ return memberships;+ }++ public void setGroups(Collection<Membership> memberships) {+ this.memberships = memberships;+ }++ @Override+ public String toString() {+ return MoreObjects.toStringHelper(this)+ .add("name", getName())+ .toString();+ }++ public PersonIdent asPerson() {+ return new PersonIdent(getName(), getEmail());+ }++ public String getDisplayName() {+ if (getFullName() != null)+ return getFullName();+ else+ return getName();+ }++ public boolean isRoot() {+ return ROOT_ID.equals(getId());+ }++ public long getVersion() {+ return version;+ }++ public Collection<IssueQuerySetting> getIssueQuerySettings() {+ return issueQuerySettings;+ }++ public void setIssueQuerySettings(Collection<IssueQuerySetting> issueQuerySettings) {+ this.issueQuerySettings = issueQuerySettings;+ }++ @Override+ public int compareTo(AbstractEntity entity) {+ User user = (User) entity;+ if (getDisplayName().equals(user.getDisplayName())) {+ return getId().compareTo(entity.getId());+ } else {+ return getDisplayName().compareTo(user.getDisplayName());+ }+ }++ public UserFacade getFacade() {+ return new UserFacade(this);+ }++}diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.javaindex 47c4da0f33..c22d06e8c5 100644--- a/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java+++ b/core/src/main/java/io/onedev/server/persistence/DefaultTransactionManager.java@@ -1,140 +1,164 @@-/**- * 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.persistence.FlushModeType;-import javax.transaction.Status;-import javax.transaction.Synchronization;--import org.hibernate.Session;-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 {- Session session = sessionManager.getSession();- FlushModeType prevFlushModeType = session.getFlushMode();- Transaction tx = session.beginTransaction();- try {- session.setFlushMode(FlushModeType.AUTO);- T result = callable.call();- tx.commit();- return result;- } catch (Throwable t) {- tx.rollback();- throw ExceptionUtils.unchecked(t);- } finally {- session.setFlushMode(prevFlushModeType);- }- }- }-- });- }-- @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();- }--}+/**+ * 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.persistence.FlushModeType;+import javax.transaction.Status;+import javax.transaction.Synchronization;++import org.hibernate.Session;+import org.hibernate.Transaction;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++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 static final Logger logger = LoggerFactory.getLogger(DefaultTransactionManager.class);++ 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 {+ Session session = sessionManager.getSession();+ FlushModeType prevFlushModeType = session.getFlushMode();+ Transaction tx = session.beginTransaction();+ try {+ session.setFlushMode(FlushModeType.AUTO);+ T result = callable.call();+ tx.commit();+ return result;+ } catch (Throwable t) {+ tx.rollback();+ throw ExceptionUtils.unchecked(t);+ } finally {+ session.setFlushMode(prevFlushModeType);+ }+ }+ }++ });+ }++ @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() {+ try {+ DefaultTransactionManager.this.run(runnable);+ } catch (Exception e) {+ logger.error("Error running", e);+ }+ }++ });+ }++ @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) {+ try {+ runnable.run();+ } catch (Exception e) {+ logger.error("Error running", e);+ }+ }+ }++ });+ } else {+ runnable.run();+ }+ }++ @Transactional+ public void runAsyncAfterCommit(Runnable runnable) {+ runAfterCommit(new Runnable() {++ @Override+ public void run() {+ executorService.execute(new Runnable() {++ @Override+ public void run() {+ try {+ runnable.run();+ } catch (Exception e) {+ logger.error("Error running", e);+ }+ }++ });+ }++ });+ }++ @Override+ public Transaction getTransaction() {+ return sessionManager.getSession().getTransaction();+ }++}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 0dff2bdeeb..aa5fed278a 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@@ -1,110 +1,110 @@-package io.onedev.server.persistence.dao;--import java.io.ObjectStreamException;-import java.io.Serializable;-import java.util.List;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.hibernate.Criteria;-import org.hibernate.criterion.Projections;--import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.commons.launcher.loader.ManagedSerializedForm;-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.SessionManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.annotation.Transactional;--@Singleton-@SuppressWarnings("unchecked")-public class DefaultDao implements Dao, Serializable {-- private final SessionManager sessionManager;-- private final ListenerRegistry listenerRegistry;-- @Inject- public DefaultDao(SessionManager sessionManager, ListenerRegistry listenerRegistry) {- this.sessionManager = sessionManager;- this.listenerRegistry = listenerRegistry;- }-- @Sessional- @Override- public <T extends AbstractEntity> T get(Class<T> entityClass, Long entityId) {- return (T) sessionManager.getSession().get(ClassUtils.unproxy(entityClass), entityId);- }-- @Sessional- @Override- public <T extends AbstractEntity> T load(Class<T> entityClass, Long entityId) {- return (T) sessionManager.getSession().load(ClassUtils.unproxy(entityClass), entityId);- }-- @Transactional- @Override- public void persist(AbstractEntity entity) {- boolean isNew = entity.isNew();- sessionManager.getSession().saveOrUpdate(entity);- listenerRegistry.post(new EntityPersisted(entity, isNew));- }-- @Transactional- @Override- public void remove(AbstractEntity entity) {- sessionManager.getSession().delete(entity);- listenerRegistry.post(new EntityRemoved(entity));- }-- @Sessional- @Override- public <T extends AbstractEntity> List<T> query(EntityCriteria<T> entityCriteria, int firstResult, int maxResults) {- Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());- criteria.setFirstResult(firstResult);- criteria.setMaxResults(maxResults);- return criteria.list();- }-- @Sessional- @Override- public <T extends AbstractEntity> List<T> query(EntityCriteria<T> entityCriteria) {- return query(entityCriteria, 0, Integer.MAX_VALUE);- }-- @Transactional- @Override- public <T extends AbstractEntity> T find(EntityCriteria<T> entityCriteria) {- Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());- criteria.setFirstResult(0);- criteria.setMaxResults(1);- return (T) criteria.uniqueResult();- }-- @Override- public <T extends AbstractEntity> int count(EntityCriteria<T> entityCriteria) {- Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());- criteria.setProjection(Projections.rowCount());- return ((Long) criteria.uniqueResult()).intValue();- }-- public Object writeReplace() throws ObjectStreamException {- return new ManagedSerializedForm(Dao.class);- }-- @Transactional- @Override- public <T extends AbstractEntity> List<T> query(Class<T> entityClass) {- return query(EntityCriteria.of(entityClass), 0, Integer.MAX_VALUE);- }-- @Override- public SessionManager getSessionManager() {- return sessionManager;- }--}+package io.onedev.server.persistence.dao;++import java.io.ObjectStreamException;+import java.io.Serializable;+import java.util.List;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.Criteria;+import org.hibernate.criterion.Projections;++import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.launcher.loader.ManagedSerializedForm;+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.SessionManager;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;++@Singleton+@SuppressWarnings("unchecked")+public class DefaultDao implements Dao, Serializable {++ private final SessionManager sessionManager;++ private final ListenerRegistry listenerRegistry;++ @Inject+ public DefaultDao(SessionManager sessionManager, ListenerRegistry listenerRegistry) {+ this.sessionManager = sessionManager;+ this.listenerRegistry = listenerRegistry;+ }++ @Sessional+ @Override+ public <T extends AbstractEntity> T get(Class<T> entityClass, Long entityId) {+ return (T) sessionManager.getSession().get(ClassUtils.unproxy(entityClass), entityId);+ }++ @Sessional+ @Override+ public <T extends AbstractEntity> T load(Class<T> entityClass, Long entityId) {+ return (T) sessionManager.getSession().load(ClassUtils.unproxy(entityClass), entityId);+ }++ @Transactional+ @Override+ public void persist(AbstractEntity entity) {+ boolean isNew = entity.isNew();+ sessionManager.getSession().saveOrUpdate(entity);+ listenerRegistry.post(new EntityPersisted(entity, isNew));+ }++ @Transactional+ @Override+ public void remove(AbstractEntity entity) {+ sessionManager.getSession().delete(entity);+ listenerRegistry.post(new EntityRemoved(entity));+ }++ @Sessional+ @Override+ public <T extends AbstractEntity> List<T> query(EntityCriteria<T> entityCriteria, int firstResult, int maxResults) {+ Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());+ criteria.setFirstResult(firstResult);+ criteria.setMaxResults(maxResults);+ return criteria.list();+ }++ @Sessional+ @Override+ public <T extends AbstractEntity> List<T> query(EntityCriteria<T> entityCriteria) {+ return query(entityCriteria, 0, Integer.MAX_VALUE);+ }++ @Transactional+ @Override+ public <T extends AbstractEntity> T find(EntityCriteria<T> entityCriteria) {+ Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());+ criteria.setFirstResult(0);+ criteria.setMaxResults(1);+ return (T) criteria.uniqueResult();+ }++ @Override+ public <T extends AbstractEntity> int count(EntityCriteria<T> entityCriteria) {+ Criteria criteria = entityCriteria.getExecutableCriteria(sessionManager.getSession());+ criteria.setProjection(Projections.rowCount());+ return ((Long) criteria.uniqueResult()).intValue();+ }++ public Object writeReplace() throws ObjectStreamException {+ return new ManagedSerializedForm(Dao.class);+ }++ @Transactional+ @Override+ public <T extends AbstractEntity> List<T> query(Class<T> entityClass) {+ return query(EntityCriteria.of(entityClass), 0, Integer.MAX_VALUE);+ }++ @Override+ public SessionManager getSessionManager() {+ return sessionManager;+ }++}diff --git a/core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java b/core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.javaindex 07d78c755c..cec58c3c92 100644--- a/core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java+++ b/core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java@@ -1,152 +1,165 @@-package io.onedev.server.persistence.dao;--import java.io.Serializable;--import org.apache.commons.lang3.SerializationUtils;-import org.hibernate.Criteria;-import org.hibernate.FetchMode;-import org.hibernate.HibernateException;-import org.hibernate.LockMode;-import org.hibernate.Session;-import org.hibernate.criterion.CriteriaSpecification;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Projection;-import org.hibernate.engine.spi.SessionImplementor;-import org.hibernate.internal.CriteriaImpl;-import org.hibernate.sql.JoinType;-import org.hibernate.transform.ResultTransformer;--import io.onedev.server.model.AbstractEntity;--@SuppressWarnings("serial")-public class EntityCriteria<T extends AbstractEntity> implements CriteriaSpecification, Serializable {-- private final CriteriaImpl impl;-- private final Criteria criteria;-- protected EntityCriteria(String entityName) {- impl = new CriteriaImpl(entityName, null);- criteria = impl;- }-- protected EntityCriteria(String entityName, String alias) {- impl = new CriteriaImpl(entityName, alias, null);- criteria = impl;- }-- protected EntityCriteria(CriteriaImpl impl, Criteria criteria) {- this.impl = impl;- this.criteria = criteria;- }-- /**- * Get an executable instance of <literal>Criteria</literal>,- * to actually run the query.- */- public Criteria getExecutableCriteria(Session session) {- CriteriaImpl clone = (CriteriaImpl) SerializationUtils.clone(impl);- clone.setSession( ( SessionImplementor ) session );- return clone;- }-- public static <T extends AbstractEntity> EntityCriteria<T> of(Class<T> clazz) {- return new EntityCriteria<T>(clazz.getName());- }-- public static <T extends AbstractEntity> EntityCriteria<T> of(Class<T> clazz, String alias) {- return new EntityCriteria<T>(clazz.getName(), alias );- }-- public EntityCriteria<T> add(Criterion criterion) {- criteria.add(criterion);- return this;- }-- public EntityCriteria<T> addOrder(Order order) {- criteria.addOrder(order);- return this;- }-- public EntityCriteria<T> createAlias(String associationPath, String alias)- throws HibernateException {- criteria.createAlias(associationPath, alias);- return this;- }-- public Criteria createCriteria(String associationPath, String alias)- throws HibernateException {- return criteria.createCriteria(associationPath, alias);- }-- public Criteria createCriteria(String associationPath)- throws HibernateException {- return criteria.createCriteria(associationPath);- }-- public String getAlias() {- return criteria.getAlias();- }-- public EntityCriteria<T> setFetchMode(String associationPath, FetchMode mode)- throws HibernateException {- criteria.setFetchMode(associationPath, mode);- return this;- }-- public EntityCriteria<T> setProjection(Projection projection) {- criteria.setProjection(projection);- return this;- }-- public EntityCriteria<T> setResultTransformer(ResultTransformer resultTransformer) {- criteria.setResultTransformer(resultTransformer);- return this;- }-- public String toString() {- return "DetachableCriteria(" + criteria.toString() + ')';- }-- CriteriaImpl getCriteriaImpl() {- return impl;- }-- public EntityCriteria<T> createAlias(String associationPath, String alias, JoinType joinType) throws HibernateException {- criteria.createAlias(associationPath, alias, joinType);- return this;- }-- public EntityCriteria<T> createAlias(String associationPath, String alias, JoinType joinType, Criterion withClause) throws HibernateException {- criteria.createAlias(associationPath, alias, joinType, withClause);- return this;- }-- public EntityCriteria<T> createCriteria(String associationPath, JoinType joinType) throws HibernateException {- return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, joinType));- }-- public EntityCriteria<T> createCriteria(String associationPath, String alias, JoinType joinType) throws HibernateException {- return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, alias, joinType));- }-- public EntityCriteria<T> createCriteria(String associationPath, String alias, JoinType joinType, Criterion withClause) throws HibernateException {- return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, alias, joinType, withClause));- }-- public EntityCriteria<T> setComment(String comment) {- criteria.setComment(comment);- return this;- }-- public EntityCriteria<T> setLockMode(LockMode lockMode) {- criteria.setLockMode(lockMode);- return this;- }-- public EntityCriteria<T> setLockMode(String alias, LockMode lockMode) {- criteria.setLockMode(alias, lockMode);- return this;- }-}+package io.onedev.server.persistence.dao;++import java.io.Serializable;++import org.apache.commons.lang3.SerializationUtils;+import org.hibernate.CacheMode;+import org.hibernate.Criteria;+import org.hibernate.FetchMode;+import org.hibernate.HibernateException;+import org.hibernate.LockMode;+import org.hibernate.Session;+import org.hibernate.criterion.CriteriaSpecification;+import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Projection;+import org.hibernate.engine.spi.SessionImplementor;+import org.hibernate.internal.CriteriaImpl;+import org.hibernate.sql.JoinType;+import org.hibernate.transform.ResultTransformer;++import io.onedev.server.model.AbstractEntity;++@SuppressWarnings("serial")+public class EntityCriteria<T extends AbstractEntity> implements CriteriaSpecification, Serializable {++ private final CriteriaImpl impl;++ private final Criteria criteria;++ protected EntityCriteria(String entityName) {+ impl = new CriteriaImpl(entityName, null);+ criteria = impl;+ }++ protected EntityCriteria(String entityName, String alias) {+ impl = new CriteriaImpl(entityName, alias, null);+ criteria = impl;+ }++ protected EntityCriteria(CriteriaImpl impl, Criteria criteria) {+ this.impl = impl;+ this.criteria = criteria;+ }++ /**+ * Get an executable instance of <literal>Criteria</literal>,+ * to actually run the query.+ */+ public Criteria getExecutableCriteria(Session session) {+ CriteriaImpl clone = (CriteriaImpl) SerializationUtils.clone(impl);+ clone.setSession( ( SessionImplementor ) session );+ return clone;+ }++ public static <T extends AbstractEntity> EntityCriteria<T> of(Class<T> clazz) {+ return new EntityCriteria<T>(clazz.getName());+ }++ public static <T extends AbstractEntity> EntityCriteria<T> of(Class<T> clazz, String alias) {+ return new EntityCriteria<T>(clazz.getName(), alias );+ }++ public EntityCriteria<T> add(Criterion criterion) {+ criteria.add(criterion);+ return this;+ }++ public EntityCriteria<T> addOrder(Order order) {+ criteria.addOrder(order);+ return this;+ }++ public void setCacheable(boolean cacheable) {+ criteria.setCacheable(cacheable);+ }++ public void setCacheMode(CacheMode cacheMode) {+ criteria.setCacheMode(cacheMode);+ }++ public void setCacheRegion(String cacheRegion) {+ criteria.setCacheRegion(cacheRegion);+ }++ public EntityCriteria<T> createAlias(String associationPath, String alias)+ throws HibernateException {+ criteria.createAlias(associationPath, alias);+ return this;+ }++ public Criteria createCriteria(String associationPath, String alias)+ throws HibernateException {+ return criteria.createCriteria(associationPath, alias);+ }++ public Criteria createCriteria(String associationPath)+ throws HibernateException {+ return criteria.createCriteria(associationPath);+ }++ public String getAlias() {+ return criteria.getAlias();+ }++ public EntityCriteria<T> setFetchMode(String associationPath, FetchMode mode)+ throws HibernateException {+ criteria.setFetchMode(associationPath, mode);+ return this;+ }++ public EntityCriteria<T> setProjection(Projection projection) {+ criteria.setProjection(projection);+ return this;+ }++ public EntityCriteria<T> setResultTransformer(ResultTransformer resultTransformer) {+ criteria.setResultTransformer(resultTransformer);+ return this;+ }++ public String toString() {+ return "DetachableCriteria(" + criteria.toString() + ')';+ }++ CriteriaImpl getCriteriaImpl() {+ return impl;+ }++ public EntityCriteria<T> createAlias(String associationPath, String alias, JoinType joinType) throws HibernateException {+ criteria.createAlias(associationPath, alias, joinType);+ return this;+ }++ public EntityCriteria<T> createAlias(String associationPath, String alias, JoinType joinType, Criterion withClause) throws HibernateException {+ criteria.createAlias(associationPath, alias, joinType, withClause);+ return this;+ }++ public EntityCriteria<T> createCriteria(String associationPath, JoinType joinType) throws HibernateException {+ return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, joinType));+ }++ public EntityCriteria<T> createCriteria(String associationPath, String alias, JoinType joinType) throws HibernateException {+ return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, alias, joinType));+ }++ public EntityCriteria<T> createCriteria(String associationPath, String alias, JoinType joinType, Criterion withClause) throws HibernateException {+ return new EntityCriteria<T>(impl, criteria.createCriteria(associationPath, alias, joinType, withClause));+ }++ public EntityCriteria<T> setComment(String comment) {+ criteria.setComment(comment);+ return this;+ }++ public EntityCriteria<T> setLockMode(LockMode lockMode) {+ criteria.setLockMode(lockMode);+ return this;+ }++ public EntityCriteria<T> setLockMode(String alias, LockMode lockMode) {+ criteria.setLockMode(alias, lockMode);+ return this;+ }+}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 b60ec88a51..17ae9ea5f1 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@@ -1,64 +1,57 @@-package io.onedev.server.util.facade;--import java.util.Date;--import io.onedev.server.OneDev;-import io.onedev.server.cache.UserInfoManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.security.permission.DefaultPrivilege;--public class ProjectFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final String name;-- private final DefaultPrivilege defaultPrivilege;-- private final String uuid;-- public ProjectFacade(Project project) {- super(project.getId());- name = project.getName();- defaultPrivilege = project.getDefaultPrivilege();- uuid = project.getUUID();- }-- public String getName() {- return name;- }-- public DefaultPrivilege getDefaultPrivilege() {- return defaultPrivilege;- }-- public String getUUID() {- return uuid;- }-- public static int compareLastVisit(ProjectFacade project1, ProjectFacade project2) {- User user = SecurityUtils.getUser();- if (user != null) {- UserInfoManager userInfoManager = OneDev.getInstance(UserInfoManager.class);- UserFacade userFacade = user.getFacade();- Date date1 = userInfoManager.getVisitDate(userFacade, project1);- Date date2 = userInfoManager.getVisitDate(userFacade, project2);- if (date1 != null) {- if (date2 != null)- return date2.compareTo(date1);- else- return -1;- } else {- if (date2 != null)- return 1;- else- return project1.compareTo(project2);- }- } else {- return project1.compareTo(project2);- }- }--}+package io.onedev.server.util.facade;++import java.util.Date;++import io.onedev.server.OneDev;+import io.onedev.server.cache.UserInfoManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.DefaultPrivilege;++public class ProjectFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final String name;++ private final DefaultPrivilege defaultPrivilege;++ public ProjectFacade(Project project) {+ super(project.getId());+ name = project.getName();+ defaultPrivilege = project.getDefaultPrivilege();+ }++ public String getName() {+ return name;+ }++ public DefaultPrivilege getDefaultPrivilege() {+ return defaultPrivilege;+ }++ public static int compareLastVisit(ProjectFacade project1, ProjectFacade project2) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ UserInfoManager userInfoManager = OneDev.getInstance(UserInfoManager.class);+ UserFacade userFacade = user.getFacade();+ Date date1 = userInfoManager.getVisitDate(userFacade, project1);+ Date date2 = userInfoManager.getVisitDate(userFacade, project2);+ if (date1 != null) {+ if (date2 != null)+ return date2.compareTo(date1);+ else+ return -1;+ } else {+ if (date2 != null)+ return 1;+ else+ return project1.compareTo(project2);+ }+ } else {+ return project1.compareTo(project2);+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/util/facade/UserFacade.java b/core/src/main/java/io/onedev/server/util/facade/UserFacade.javaindex a37fb6b75a..4c30410a8f 100644--- a/core/src/main/java/io/onedev/server/util/facade/UserFacade.java+++ b/core/src/main/java/io/onedev/server/util/facade/UserFacade.java@@ -1,71 +1,64 @@-package io.onedev.server.util.facade;--import javax.annotation.Nullable;--import io.onedev.commons.utils.matchscore.MatchScoreUtils;-import io.onedev.server.model.User;--public class UserFacade extends EntityFacade {-- private static final long serialVersionUID = 1L;-- private final String name;-- private final String fullName;-- private final String email;-- private final String uuid;-- public UserFacade(User user) {- super(user.getId());-- name = user.getName();- fullName = user.getFullName();- email = user.getEmail();- uuid = user.getUUID();- }-- public String getName() {- return name;- }-- public String getFullName() {- return fullName;- }-- public String getEmail() {- return email;- }-- public String getUUID() {- return uuid;- }-- public boolean isRoot() {- return getId().equals(User.ROOT_ID);- }-- public String getDisplayName() {- if (getFullName() != null)- return getFullName();- else- return getName();- }-- @Override- public String toString() {- return getDisplayName();- }-- public double getMatchScore(@Nullable String queryTerm) {- double scoreOfName = MatchScoreUtils.getMatchScore(name, queryTerm);- double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);- return Math.max(scoreOfName, scoreOfFullName);- }-- public static UserFacade of(@Nullable User user) {- return user!=null?new UserFacade(user):null;- }--}+package io.onedev.server.util.facade;++import javax.annotation.Nullable;++import io.onedev.commons.utils.matchscore.MatchScoreUtils;+import io.onedev.server.model.User;++public class UserFacade extends EntityFacade {++ private static final long serialVersionUID = 1L;++ private final String name;++ private final String fullName;++ private final String email;++ public UserFacade(User user) {+ super(user.getId());++ name = user.getName();+ fullName = user.getFullName();+ email = user.getEmail();+ }++ public String getName() {+ return name;+ }++ public String getFullName() {+ return fullName;+ }++ public String getEmail() {+ return email;+ }++ public boolean isRoot() {+ return getId().equals(User.ROOT_ID);+ }++ public String getDisplayName() {+ if (getFullName() != null)+ return getFullName();+ else+ return getName();+ }++ @Override+ public String toString() {+ return getDisplayName();+ }++ public double getMatchScore(@Nullable String queryTerm) {+ double scoreOfName = MatchScoreUtils.getMatchScore(name, queryTerm);+ double scoreOfFullName = MatchScoreUtils.getMatchScore(fullName, queryTerm);+ return Math.max(scoreOfName, scoreOfFullName);+ }++ public static UserFacade of(@Nullable User user) {+ return user!=null?new UserFacade(user):null;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java b/core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.javaindex 28a5593e85..a18e42e59b 100644--- a/core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java@@ -1,159 +1,159 @@-package io.onedev.server.web.component.createtag;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextArea;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.Repository;--import com.google.common.base.Preconditions;--import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.server.git.GitUtils;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.TagProtection;-import io.onedev.server.security.SecurityUtils;--@SuppressWarnings("serial")-public abstract class CreateTagPanel extends Panel {-- private final IModel<Project> projectModel;-- private final String revision;-- private String tagName;-- private String tagMessage;-- public CreateTagPanel(String id, IModel<Project> projectModel, @Nullable String tagName, String revision) {- super(id);- this.projectModel = projectModel;- this.tagName = tagName;- this.revision = revision;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);- form.add(new NotificationPanel("feedback", form));-- Component nameInput;- if (tagName == null) {- form.add(nameInput = new TextField<String>("name", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return tagName;- }-- @Override- public void setObject(String object) {- tagName = object;- }-- }));- nameInput.setOutputMarkupId(true);- } else {- form.add(nameInput = new WebMarkupContainer("name").setVisible(false));- }-- form.add(new TextArea<String>("message", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return tagMessage;- }-- @Override- public void setObject(String object) {- tagMessage = object;- }-- }));- form.add(new AjaxButton("create") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- if (tagName == null) {- form.error("Tag name is required.");- target.focusComponent(nameInput);- target.add(form);- } else if (!Repository.isValidRefName(Constants.R_TAGS + tagName)) {- form.error("Tag name is not valid.");- target.focusComponent(nameInput);- target.add(form);- } else if (projectModel.getObject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {- form.error("Tag '" + tagName + "' already exists, please choose a different name.");- target.focusComponent(nameInput);- target.add(form);- } else {- Project project = projectModel.getObject();- User user = Preconditions.checkNotNull(SecurityUtils.getUser());-- TagProtection protection = project.getTagProtection(tagName, user);- if (protection != null && protection.isNoCreation()) {- form.error("Unable to create protected tag");- target.focusComponent(nameInput);- target.add(form);- } else {- project.tag(tagName, revision, user.asPerson(), tagMessage);- onCreate(target, tagName);- }- }- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- form.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- add(form);- }-- protected abstract void onCreate(AjaxRequestTarget target, String tag);-- protected abstract void onCancel(AjaxRequestTarget target);-- @Override- protected void onDetach() {- projectModel.detach();-- super.onDetach();- }--}+package io.onedev.server.web.component.createtag;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextArea;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.Repository;++import com.google.common.base.Preconditions;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.model.support.TagProtection;+import io.onedev.server.security.SecurityUtils;++@SuppressWarnings("serial")+public abstract class CreateTagPanel extends Panel {++ private final IModel<Project> projectModel;++ private final String revision;++ private String tagName;++ private String tagMessage;++ public CreateTagPanel(String id, IModel<Project> projectModel, @Nullable String tagName, String revision) {+ super(id);+ this.projectModel = projectModel;+ this.tagName = tagName;+ this.revision = revision;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);+ form.add(new NotificationPanel("feedback", form));++ Component nameInput;+ if (tagName == null) {+ form.add(nameInput = new TextField<String>("name", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return tagName;+ }++ @Override+ public void setObject(String object) {+ tagName = object;+ }++ }));+ nameInput.setOutputMarkupId(true);+ } else {+ form.add(nameInput = new WebMarkupContainer("name").setVisible(false));+ }++ form.add(new TextArea<String>("message", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return tagMessage;+ }++ @Override+ public void setObject(String object) {+ tagMessage = object;+ }++ }));+ form.add(new AjaxButton("create") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (tagName == null) {+ form.error("Tag name is required.");+ target.focusComponent(nameInput);+ target.add(form);+ } else if (!Repository.isValidRefName(Constants.R_TAGS + tagName)) {+ form.error("Tag name is not valid.");+ target.focusComponent(nameInput);+ target.add(form);+ } else if (projectModel.getObject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {+ form.error("Tag '" + tagName + "' already exists, please choose a different name.");+ target.focusComponent(nameInput);+ target.add(form);+ } else {+ Project project = projectModel.getObject();+ User user = Preconditions.checkNotNull(SecurityUtils.getUser());++ TagProtection protection = project.getTagProtection(tagName, user);+ if (protection != null && protection.isNoCreation()) {+ form.error("Unable to create protected tag");+ target.focusComponent(nameInput);+ target.add(form);+ } else {+ project.createTag(tagName, revision, user.asPerson(), tagMessage);+ onCreate(target, tagName);+ }+ }+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ add(form);+ }++ protected abstract void onCreate(AjaxRequestTarget target, String tag);++ protected abstract void onCancel(AjaxRequestTarget target);++ @Override+ protected void onDetach() {+ projectModel.detach();++ super.onDetach();+ }++}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 72f39b5d7c..5ce439c7bc 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@@ -1,421 +1,421 @@-package io.onedev.server.web.page.project.tags;--import java.util.Iterator;-import java.util.List;--import javax.annotation.Nullable;--import org.apache.wicket.Component;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.markup.ComponentTag;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextArea;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.AbstractLink;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.PageableListView;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.RevCommit;-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.model.Build;-import io.onedev.server.model.Project;-import io.onedev.server.model.support.TagProtection;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.userident.UserIdent;-import io.onedev.server.web.behavior.OnTypingDoneBehavior;-import io.onedev.server.web.component.build.status.BuildsStatusPanel;-import io.onedev.server.web.component.contributorpanel.ContributorPanel;-import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;-import io.onedev.server.web.component.link.ArchiveMenuLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.modal.ModalLink;-import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.revisionpicker.RevisionPicker;-import io.onedev.server.web.component.user.ident.UserIdentPanel;-import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;--@SuppressWarnings("serial")-public class ProjectTagsPage extends ProjectPage {-- private static final String PARAM_CURRENT_PAGE = "currentPage";-- private static final String PARAM_QUERY = "query";-- private WebMarkupContainer tagsContainer;-- private PageableListView<RefInfo> tagsView;-- private final PagingHistorySupport pagingHistorySupport;-- private String query;-- private final IModel<List<RefInfo>> tagsModel = new LoadableDetachableModel<List<RefInfo>>() {-- @Override- protected List<RefInfo> load() {- List<RefInfo> refs = getProject().getTags();- if (query != null) {- for (Iterator<RefInfo> it = refs.iterator(); it.hasNext();) {- String tag = GitUtils.ref2tag(it.next().getRef().getName());- if (!tag.toLowerCase().contains(query.trim().toLowerCase()))- it.remove();- }- }- return refs;- }-- };-- public ProjectTagsPage(PageParameters params) {- super(params);-- query = params.get(PARAM_QUERY).toString();-- pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getProject());- params.add(PARAM_CURRENT_PAGE, currentPage+1);- if (query != null)- params.add(PARAM_QUERY, query);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- }-- @Override- protected void onInitialize() {- super.onInitialize();-- TextField<String> searchField;- add(searchField = new TextField<String>("searchTags", Model.of(query)));- searchField.add(new OnTypingDoneBehavior(200) {-- @Override- protected void onTypingDone(AjaxRequestTarget target) {- query = searchField.getInput();- if (StringUtils.isBlank(query))- query = null;- target.add(tagsContainer);- newPagingNavigation(target);- }-- });-- add(new ModalLink("createTag") {-- private String tagName;-- private String tagMessage;-- private String tagRevision = getProject().getDefaultBranch();-- @Override- protected void onConfigure() {- super.onConfigure();-- setVisible(SecurityUtils.canCreateTag(getProject(), Constants.R_TAGS));- }-- private RevisionPicker newRevisionPicker() {- return new RevisionPicker("revision", projectModel, tagRevision) {-- @Override- protected void onSelect(AjaxRequestTarget target, String revision) {- tagRevision = revision;- RevisionPicker revisionPicker = newRevisionPicker();- getParent().replace(revisionPicker);- target.add(revisionPicker);- }-- };- }-- @Override- protected Component newContent(String id, ModalPanel modal) {- Fragment fragment = new Fragment(id, "createTagFrag", ProjectTagsPage.this);- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);- form.add(new NotificationPanel("feedback", form));- tagName = null;- final TextField<String> nameInput;- form.add(nameInput = new TextField<String>("name", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return tagName;- }-- @Override- public void setObject(String object) {- tagName = object;- }-- }));- nameInput.setOutputMarkupId(true);-- tagMessage = null;- form.add(new TextArea<String>("message", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return tagMessage;- }-- @Override- public void setObject(String object) {- tagMessage = object;- }-- }));- form.add(newRevisionPicker());- form.add(new AjaxButton("create") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- if (tagName == null) {- form.error("Tag name is required.");- target.focusComponent(nameInput);- target.add(form);- } else if (!Repository.isValidRefName(Constants.R_HEADS + tagName)) {- form.error("Invalid tag name.");- target.focusComponent(nameInput);- target.add(form);- } else if (getProject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {- form.error("Tag '" + tagName + "' already exists, please choose a different name.");- target.focusComponent(nameInput);- target.add(form);- } else {- Project project = getProject();- TagProtection protection = project.getTagProtection(tagName, getLoginUser());- if (protection != null && protection.isNoCreation()) {- form.error("Unable to create protected tag");- target.focusComponent(nameInput);- target.add(form);- } else {- getProject().tag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);- modal.close();- target.add(tagsContainer);- newPagingNavigation(target);- }- }- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {- modal.close();- }-- });- fragment.add(form);- return fragment;- }-- });-- add(tagsContainer = new WebMarkupContainer("tagsContainer") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!tagsModel.getObject().isEmpty());- }-- });- tagsContainer.setOutputMarkupPlaceholderTag(true);-- tagsContainer.add(tagsView = new PageableListView<RefInfo>("tags", tagsModel,- io.onedev.server.web.WebConstants.PAGE_SIZE) {-- @Override- protected void populateItem(ListItem<RefInfo> item) {- RefInfo ref = item.getModelObject();- String tagName = GitUtils.ref2tag(ref.getRef().getName());-- BlobIdent blobIdent = new BlobIdent(tagName, null, FileMode.TREE.getBits());- ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);- AbstractLink link = new ViewStateAwarePageLink<Void>("tagLink",- ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state));- link.add(new Label("name", tagName));- item.add(link);-- String tagCommitHash = ref.getPeeledObj().name();- item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {-- @Override- protected List<Build> load() {- return OneDev.getInstance(BuildManager.class).query(getProject(), tagCommitHash);- }-- }));-- if (ref.getObj() instanceof RevTag) {- RevTag revTag = (RevTag) ref.getObj();- Fragment fragment = new Fragment("annotated", "annotatedFrag", ProjectTagsPage.this);- if (revTag.getTaggerIdent() != null) {- fragment.add(new UserIdentPanel("author", UserIdent.of(revTag.getTaggerIdent()), Mode.NAME));- } else {- fragment.add(new WebMarkupContainer("author").setVisible(false));- }- Label message = new Label("message", revTag.getFullMessage());- message.setOutputMarkupId(true);- fragment.add(message);- String toggleScript = String.format("$('#%s').toggle();", message.getMarkupId());- WebMarkupContainer messageToggle = new WebMarkupContainer("messageToggle");- messageToggle.add(AttributeAppender.append("onclick", toggleScript));- messageToggle.setVisible(StringUtils.isNotBlank(revTag.getFullMessage()));- fragment.add(messageToggle);- item.add(fragment);- } else {- item.add(new WebMarkupContainer("annotated").setVisible(false));- }-- RevCommit commit = (RevCommit) ref.getPeeledObj();- PageParameters params = CommitDetailPage.paramsOf(getProject(), commit.name());-- link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);- link.add(new Label("message", commit.getShortMessage()));- item.add(link);-- item.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent(), true));-- item.add(new ArchiveMenuLink("download", projectModel) {-- @Override- protected String getRevision() {- return tagName;- }-- });-- item.add(new AjaxLink<Void>("delete") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete tag " + tagName + "?"));- }-- @Override- protected void disableLink(ComponentTag tag) {- super.disableLink(tag);- tag.append("class", "disabled", " ");- tag.put("title", "Deletion not allowed due to branch protection rule");- }-- @Override- public void onClick(AjaxRequestTarget target) {- getProject().deleteTag(tagName);- target.add(tagsContainer);- newPagingNavigation(target);- }-- @Override- protected void onConfigure() {- super.onConfigure();-- Project project = getProject();- if (SecurityUtils.canWriteCode(project.getFacade())) {- TagProtection protection = project.getTagProtection(tagName, getLoginUser());- setEnabled(protection == null || !protection.isNoDeletion());- } else {- setVisible(false);- }- }-- });- }-- });-- tagsView.setCurrentPage(pagingHistorySupport.getCurrentPage());-- newPagingNavigation(null);- }-- private void newPagingNavigation(@Nullable AjaxRequestTarget target) {- Component pagingNavigator = new HistoryAwarePagingNavigator("tagsPageNav", tagsView, pagingHistorySupport);- pagingNavigator.setVisible(tagsView.getPageCount() > 1);- pagingNavigator.setOutputMarkupPlaceholderTag(true);-- Component noTagsContainer = new WebMarkupContainer("noTags");- noTagsContainer.setVisible(tagsModel.getObject().isEmpty());- noTagsContainer.setOutputMarkupPlaceholderTag(true);-- if (target != null) {- replace(pagingNavigator);- replace(noTagsContainer);- target.add(pagingNavigator);- target.add(noTagsContainer);- } else {- add(pagingNavigator);- add(noTagsContainer);- }- }-- @Override- protected String getRobotsMeta() {- return "noindex,nofollow";- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new ProjectTagsResourceReference()));- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());- }--}+package io.onedev.server.web.page.project.tags;++import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextArea;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.AbstractLink;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.PageableListView;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.Repository;+import org.eclipse.jgit.revwalk.RevCommit;+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.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.TagProtection;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.userident.UserIdent;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.component.build.status.BuildsStatusPanel;+import io.onedev.server.web.component.contributorpanel.ContributorPanel;+import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;+import io.onedev.server.web.component.link.ArchiveMenuLink;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.revisionpicker.RevisionPicker;+import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;++@SuppressWarnings("serial")+public class ProjectTagsPage extends ProjectPage {++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private static final String PARAM_QUERY = "query";++ private WebMarkupContainer tagsContainer;++ private PageableListView<RefInfo> tagsView;++ private final PagingHistorySupport pagingHistorySupport;++ private String query;++ private final IModel<List<RefInfo>> tagsModel = new LoadableDetachableModel<List<RefInfo>>() {++ @Override+ protected List<RefInfo> load() {+ List<RefInfo> refs = getProject().getTags();+ if (query != null) {+ for (Iterator<RefInfo> it = refs.iterator(); it.hasNext();) {+ String tag = GitUtils.ref2tag(it.next().getRef().getName());+ if (!tag.toLowerCase().contains(query.trim().toLowerCase()))+ it.remove();+ }+ }+ return refs;+ }++ };++ public ProjectTagsPage(PageParameters params) {+ super(params);++ query = params.get(PARAM_QUERY).toString();++ pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getProject());+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ if (query != null)+ params.add(PARAM_QUERY, query);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };++ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ TextField<String> searchField;+ add(searchField = new TextField<String>("searchTags", Model.of(query)));+ searchField.add(new OnTypingDoneBehavior(200) {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ query = searchField.getInput();+ if (StringUtils.isBlank(query))+ query = null;+ target.add(tagsContainer);+ newPagingNavigation(target);+ }++ });++ add(new ModalLink("createTag") {++ private String tagName;++ private String tagMessage;++ private String tagRevision = getProject().getDefaultBranch();++ @Override+ protected void onConfigure() {+ super.onConfigure();++ setVisible(SecurityUtils.canCreateTag(getProject(), Constants.R_TAGS));+ }++ private RevisionPicker newRevisionPicker() {+ return new RevisionPicker("revision", projectModel, tagRevision) {++ @Override+ protected void onSelect(AjaxRequestTarget target, String revision) {+ tagRevision = revision;+ RevisionPicker revisionPicker = newRevisionPicker();+ getParent().replace(revisionPicker);+ target.add(revisionPicker);+ }++ };+ }++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ Fragment fragment = new Fragment(id, "createTagFrag", ProjectTagsPage.this);+ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);+ form.add(new NotificationPanel("feedback", form));+ tagName = null;+ final TextField<String> nameInput;+ form.add(nameInput = new TextField<String>("name", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return tagName;+ }++ @Override+ public void setObject(String object) {+ tagName = object;+ }++ }));+ nameInput.setOutputMarkupId(true);++ tagMessage = null;+ form.add(new TextArea<String>("message", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return tagMessage;+ }++ @Override+ public void setObject(String object) {+ tagMessage = object;+ }++ }));+ form.add(newRevisionPicker());+ form.add(new AjaxButton("create") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (tagName == null) {+ form.error("Tag name is required.");+ target.focusComponent(nameInput);+ target.add(form);+ } else if (!Repository.isValidRefName(Constants.R_HEADS + tagName)) {+ form.error("Invalid tag name.");+ target.focusComponent(nameInput);+ target.add(form);+ } else if (getProject().getObjectId(GitUtils.tag2ref(tagName), false) != null) {+ form.error("Tag '" + tagName + "' already exists, please choose a different name.");+ target.focusComponent(nameInput);+ target.add(form);+ } else {+ Project project = getProject();+ TagProtection protection = project.getTagProtection(tagName, getLoginUser());+ if (protection != null && protection.isNoCreation()) {+ form.error("Unable to create protected tag");+ target.focusComponent(nameInput);+ target.add(form);+ } else {+ getProject().createTag(tagName, tagRevision, getLoginUser().asPerson(), tagMessage);+ modal.close();+ target.add(tagsContainer);+ newPagingNavigation(target);+ }+ }+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });+ fragment.add(form);+ return fragment;+ }++ });++ add(tagsContainer = new WebMarkupContainer("tagsContainer") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!tagsModel.getObject().isEmpty());+ }++ });+ tagsContainer.setOutputMarkupPlaceholderTag(true);++ tagsContainer.add(tagsView = new PageableListView<RefInfo>("tags", tagsModel,+ io.onedev.server.web.WebConstants.PAGE_SIZE) {++ @Override+ protected void populateItem(ListItem<RefInfo> item) {+ RefInfo ref = item.getModelObject();+ String tagName = GitUtils.ref2tag(ref.getRef().getName());++ BlobIdent blobIdent = new BlobIdent(tagName, null, FileMode.TREE.getBits());+ ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);+ AbstractLink link = new ViewStateAwarePageLink<Void>("tagLink",+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject(), state));+ link.add(new Label("name", tagName));+ item.add(link);++ String tagCommitHash = ref.getPeeledObj().name();+ item.add(new BuildsStatusPanel("buildStatus", new LoadableDetachableModel<List<Build>>() {++ @Override+ protected List<Build> load() {+ return OneDev.getInstance(BuildManager.class).query(getProject(), tagCommitHash);+ }++ }));++ if (ref.getObj() instanceof RevTag) {+ RevTag revTag = (RevTag) ref.getObj();+ Fragment fragment = new Fragment("annotated", "annotatedFrag", ProjectTagsPage.this);+ if (revTag.getTaggerIdent() != null) {+ fragment.add(new UserIdentPanel("author", UserIdent.of(revTag.getTaggerIdent()), Mode.NAME));+ } else {+ fragment.add(new WebMarkupContainer("author").setVisible(false));+ }+ Label message = new Label("message", revTag.getFullMessage());+ message.setOutputMarkupId(true);+ fragment.add(message);+ String toggleScript = String.format("$('#%s').toggle();", message.getMarkupId());+ WebMarkupContainer messageToggle = new WebMarkupContainer("messageToggle");+ messageToggle.add(AttributeAppender.append("onclick", toggleScript));+ messageToggle.setVisible(StringUtils.isNotBlank(revTag.getFullMessage()));+ fragment.add(messageToggle);+ item.add(fragment);+ } else {+ item.add(new WebMarkupContainer("annotated").setVisible(false));+ }++ RevCommit commit = (RevCommit) ref.getPeeledObj();+ PageParameters params = CommitDetailPage.paramsOf(getProject(), commit.name());++ link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);+ link.add(new Label("message", commit.getShortMessage()));+ item.add(link);++ item.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent(), true));++ item.add(new ArchiveMenuLink("download", projectModel) {++ @Override+ protected String getRevision() {+ return tagName;+ }++ });++ item.add(new AjaxLink<Void>("delete") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete tag " + tagName + "?"));+ }++ @Override+ protected void disableLink(ComponentTag tag) {+ super.disableLink(tag);+ tag.append("class", "disabled", " ");+ tag.put("title", "Deletion not allowed due to branch protection rule");+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getProject().deleteTag(tagName);+ target.add(tagsContainer);+ newPagingNavigation(target);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();++ Project project = getProject();+ if (SecurityUtils.canWriteCode(project.getFacade())) {+ TagProtection protection = project.getTagProtection(tagName, getLoginUser());+ setEnabled(protection == null || !protection.isNoDeletion());+ } else {+ setVisible(false);+ }+ }++ });+ }++ });++ tagsView.setCurrentPage(pagingHistorySupport.getCurrentPage());++ newPagingNavigation(null);+ }++ private void newPagingNavigation(@Nullable AjaxRequestTarget target) {+ Component pagingNavigator = new HistoryAwarePagingNavigator("tagsPageNav", tagsView, pagingHistorySupport);+ pagingNavigator.setVisible(tagsView.getPageCount() > 1);+ pagingNavigator.setOutputMarkupPlaceholderTag(true);++ Component noTagsContainer = new WebMarkupContainer("noTags");+ noTagsContainer.setVisible(tagsModel.getObject().isEmpty());+ noTagsContainer.setOutputMarkupPlaceholderTag(true);++ if (target != null) {+ replace(pagingNavigator);+ replace(noTagsContainer);+ target.add(pagingNavigator);+ target.add(noTagsContainer);+ } else {+ add(pagingNavigator);+ add(noTagsContainer);+ }+ }++ @Override+ protected String getRobotsMeta() {+ return "noindex,nofollow";+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new ProjectTagsResourceReference()));+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }++}