Skip to content

The Unified and Autonomous Development Platform

Fix issue #1101 - `<projectname>/~branches` fails to render when only `main` branch exists not master

Robin Shen4da7844167cf
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 0c98ff24cf..61a721d028 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -98,150 +98,150 @@ import java.util.concurrent.Future;
import java.util.stream.Collectors;
@Singleton
-public class DefaultProjectManager extends BaseEntityManager<Project>
+public class DefaultProjectManager extends BaseEntityManager<Project>
implements ProjectManager, Serializable {
private static final Logger logger = LoggerFactory.getLogger(DefaultProjectManager.class);
-
- private final CommitInfoManager commitInfoManager;
-
- private final BuildManager buildManager;
-
- private final AvatarManager avatarManager;
-
- private final SettingManager settingManager;
-
- private final SessionManager sessionManager;
-
- private final TransactionManager transactionManager;
-
- private final IssueManager issueManager;
-
- private final LinkSpecManager linkSpecManager;
-
- private final JobManager jobManager;
-
- private final ProjectUpdateManager updateManager;
-
- private final ListenerRegistry listenerRegistry;
-
- private final RoleManager roleManager;
-
- private final StorageManager storageManager;
-
- private final UserAuthorizationManager userAuthorizationManager;
-
- private final ClusterManager clusterManager;
-
- private final GitService gitService;
-
- private final Collection<String> reservedNames = Sets.newHashSet("robots.txt", "sitemap.xml", "sitemap.txt",
+
+ private final CommitInfoManager commitInfoManager;
+
+ private final BuildManager buildManager;
+
+ private final AvatarManager avatarManager;
+
+ private final SettingManager settingManager;
+
+ private final SessionManager sessionManager;
+
+ private final TransactionManager transactionManager;
+
+ private final IssueManager issueManager;
+
+ private final LinkSpecManager linkSpecManager;
+
+ private final JobManager jobManager;
+
+ private final ProjectUpdateManager updateManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final RoleManager roleManager;
+
+ private final StorageManager storageManager;
+
+ private final UserAuthorizationManager userAuthorizationManager;
+
+ private final ClusterManager clusterManager;
+
+ private final GitService gitService;
+
+ private final Collection<String> reservedNames = Sets.newHashSet("robots.txt", "sitemap.xml", "sitemap.txt",
"favicon.ico", "favicon.png", "logo.png", "wicket", "projects");
-
+
private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
private volatile IMap<Long, ProjectServer> storageServers;
-
+
private volatile ProjectCache cache;
-
- @Inject
- public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,
- BuildManager buildManager, AvatarManager avatarManager,
- SettingManager settingManager, TransactionManager transactionManager,
- SessionManager sessionManager, ListenerRegistry listenerRegistry,
- UserAuthorizationManager userAuthorizationManager, RoleManager roleManager,
- JobManager jobManager, IssueManager issueManager, LinkSpecManager linkSpecManager,
- StorageManager storageManager, ClusterManager clusterManager, GitService gitService,
- ProjectUpdateManager updateManager, Set<ProjectNameReservation> nameReservations) {
- super(dao);
-
- this.commitInfoManager = commitInfoManager;
- this.buildManager = buildManager;
- this.avatarManager = avatarManager;
- this.settingManager = settingManager;
- this.transactionManager = transactionManager;
- this.sessionManager = sessionManager;
- this.listenerRegistry = listenerRegistry;
- this.userAuthorizationManager = userAuthorizationManager;
- this.roleManager = roleManager;
- this.jobManager = jobManager;
- this.issueManager = issueManager;
- this.linkSpecManager = linkSpecManager;
- this.storageManager = storageManager;
- this.clusterManager = clusterManager;
- this.gitService = gitService;
- this.updateManager = updateManager;
-
- for (ProjectNameReservation reservation: nameReservations)
- reservedNames.addAll(reservation.getReserved());
- }
-
+
+ @Inject
+ public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,
+ BuildManager buildManager, AvatarManager avatarManager,
+ SettingManager settingManager, TransactionManager transactionManager,
+ SessionManager sessionManager, ListenerRegistry listenerRegistry,
+ UserAuthorizationManager userAuthorizationManager, RoleManager roleManager,
+ JobManager jobManager, IssueManager issueManager, LinkSpecManager linkSpecManager,
+ StorageManager storageManager, ClusterManager clusterManager, GitService gitService,
+ ProjectUpdateManager updateManager, Set<ProjectNameReservation> nameReservations) {
+ super(dao);
+
+ this.commitInfoManager = commitInfoManager;
+ this.buildManager = buildManager;
+ this.avatarManager = avatarManager;
+ this.settingManager = settingManager;
+ this.transactionManager = transactionManager;
+ this.sessionManager = sessionManager;
+ this.listenerRegistry = listenerRegistry;
+ this.userAuthorizationManager = userAuthorizationManager;
+ this.roleManager = roleManager;
+ this.jobManager = jobManager;
+ this.issueManager = issueManager;
+ this.linkSpecManager = linkSpecManager;
+ this.storageManager = storageManager;
+ this.clusterManager = clusterManager;
+ this.gitService = gitService;
+ this.updateManager = updateManager;
+
+ for (ProjectNameReservation reservation : nameReservations)
+ reservedNames.addAll(reservation.getReserved());
+ }
+
public Object writeReplace() throws ObjectStreamException {
return new ManagedSerializedForm(ProjectManager.class);
}
- @Override
- public Repository getRepository(Long projectId) {
- Repository repository = repositoryCache.get(projectId);
- if (repository == null) {
- synchronized (repositoryCache) {
- repository = repositoryCache.get(projectId);
- if (repository == null) {
- try {
+ @Override
+ public Repository getRepository(Long projectId) {
+ Repository repository = repositoryCache.get(projectId);
+ if (repository == null) {
+ synchronized (repositoryCache) {
+ repository = repositoryCache.get(projectId);
+ if (repository == null) {
+ try {
repository = new FileRepository(storageManager.getProjectGitDir(projectId));
} catch (IOException e) {
throw new RuntimeException(e);
}
- repositoryCache.put(projectId, repository);
- }
- }
- }
- return repository;
- }
-
- @Transactional
- @Override
- public void save(Project project) {
- String oldPath = project.getPath();
+ repositoryCache.put(projectId, repository);
+ }
+ }
+ }
+ return repository;
+ }
+
+ @Transactional
+ @Override
+ public void save(Project project) {
+ String oldPath = project.getPath();
String newPath = project.calcPath();
if (!newPath.equals(oldPath)) {
project.setPath(newPath);
- for (Project descendant: project.getDescendants()) {
+ for (Project descendant : project.getDescendants()) {
descendant.setPath(descendant.calcPath());
dao.persist(descendant);
}
}
- dao.persist(project);
- if (oldPath != null && !oldPath.equals(project.getPath())) {
- Collection<Milestone> milestones = new ArrayList<>();
- for (Milestone milestone: issueManager.queryUsedMilestones(project)) {
- if (!project.isSelfOrAncestorOf(milestone.getProject())
- && !milestone.getProject().isSelfOrAncestorOf(project)) {
- milestones.add(milestone);
- }
- }
- issueManager.clearSchedules(project, milestones);
- settingManager.onMoveProject(oldPath, project.getPath());
-
- for (LinkSpec link: linkSpecManager.query()) {
- for (IssueQueryUpdater updater: link.getQueryUpdaters())
- updater.onMoveProject(oldPath, project.getPath());
- }
-
- transactionManager.runAfterCommit(new Runnable() {
+ dao.persist(project);
+ if (oldPath != null && !oldPath.equals(project.getPath())) {
+ Collection<Milestone> milestones = new ArrayList<>();
+ for (Milestone milestone : issueManager.queryUsedMilestones(project)) {
+ if (!project.isSelfOrAncestorOf(milestone.getProject())
+ && !milestone.getProject().isSelfOrAncestorOf(project)) {
+ milestones.add(milestone);
+ }
+ }
+ issueManager.clearSchedules(project, milestones);
+ settingManager.onMoveProject(oldPath, project.getPath());
+
+ for (LinkSpec link : linkSpecManager.query()) {
+ for (IssueQueryUpdater updater : link.getQueryUpdaters())
+ updater.onMoveProject(oldPath, project.getPath());
+ }
+
+ transactionManager.runAfterCommit(new Runnable() {
@Override
public void run() {
- scheduleTree(project);
+ scheduleTree(project);
}
-
- });
- }
- }
-
- private void scheduleTree(Project project) {
- Long projectId = project.getId();
- submitToProjectServer(projectId, new ClusterTask<Void>() {
+
+ });
+ }
+ }
+
+ private void scheduleTree(Project project) {
+ Long projectId = project.getId();
+ submitToProjectServer(projectId, new ClusterTask<Void>() {
private static final long serialVersionUID = 1L;
@@ -251,56 +251,57 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Override
public void run() {
- jobManager.schedule(load(projectId));
+ jobManager.schedule(load(projectId));
}
-
+
});
return null;
}
-
- });
- for (Project child: project.getChildren())
- scheduleTree(child);
- }
-
- @Transactional
- @Override
- public void create(Project project) {
- Project parent = project.getParent();
- if (parent != null && parent.isNew())
- create(parent);
- project.setPath(project.calcPath());
-
+
+ });
+ for (Project child : project.getChildren())
+ scheduleTree(child);
+ }
+
+ @Transactional
+ @Override
+ public void create(Project project) {
+ Project parent = project.getParent();
+ if (parent != null && parent.isNew())
+ create(parent);
+ project.setPath(project.calcPath());
+
ProjectDynamics update = new ProjectDynamics();
project.setDynamics(update);
updateManager.save(update);
- dao.persist(project);
-
- var gitDir = storageManager.getProjectDir(project.getId());
- FileUtils.cleanDir(gitDir);
- checkGitDir(project.getId());
+ dao.persist(project);
+ var projectDir = storageManager.getProjectDir(project.getId());
+ FileUtils.cleanDir(projectDir);
+ checkGitDir(project.getId());
+
+ var gitDir = storageManager.getProjectGitDir(project.getId());
HookUtils.checkHooks(gitDir);
checkGitConfig(project.getId(), project.getGitPackConfig());
-
- UserAuthorization authorization = new UserAuthorization();
- authorization.setProject(project);
- authorization.setUser(SecurityUtils.getUser());
- authorization.setRole(roleManager.getOwner());
- userAuthorizationManager.save(authorization);
-
- updateStorageServer(project);
- listenerRegistry.post(new ProjectCreated(project));
- }
-
- @Transactional
- @Listen
- public void on(EntityRemoved event) {
- if (event.getEntity() instanceof Project) {
- Project project = (Project) event.getEntity();
- Long projectId = project.getId();
-
- transactionManager.runAfterCommit(new ClusterRunnable() {
+
+ UserAuthorization authorization = new UserAuthorization();
+ authorization.setProject(project);
+ authorization.setUser(SecurityUtils.getUser());
+ authorization.setRole(roleManager.getOwner());
+ userAuthorizationManager.save(authorization);
+
+ updateStorageServer(project);
+ listenerRegistry.post(new ProjectCreated(project));
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof Project) {
+ Project project = (Project) event.getEntity();
+ Long projectId = project.getId();
+
+ transactionManager.runAfterCommit(new ClusterRunnable() {
private static final long serialVersionUID = 1L;
@@ -310,7 +311,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
ProjectServer server = storageServers.remove(projectId);
if (server != null) {
clusterManager.submitToServer(server.getPrimary(), new ClusterTask<Void>() {
-
+
private static final long serialVersionUID = 1L;
@Override
@@ -318,108 +319,108 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
jobManager.unschedule(projectId);
return null;
}
-
+
});
}
}
-
- });
- }
- }
-
- @Transactional
- @Listen
- public void on(EntityPersisted event) {
- if (event.getEntity() instanceof Project) {
- ProjectFacade facade = ((Project)event.getEntity()).getFacade();
- transactionManager.runAfterCommit(new Runnable() {
+
+ });
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof Project) {
+ ProjectFacade facade = ((Project) event.getEntity()).getFacade();
+ transactionManager.runAfterCommit(new Runnable() {
@Override
public void run() {
cache.put(facade.getId(), facade);
}
-
- });
- }
- }
-
- @Transactional
- @Override
- public void delete(Project project) {
- for (Project child: project.getChildren())
- delete(child);
-
- Usage usage = new Usage();
- usage.add(settingManager.onDeleteProject(project.getPath()));
-
- for (LinkSpec link: linkSpecManager.query()) {
- for (IssueQueryUpdater updater: link.getQueryUpdaters())
+
+ });
+ }
+ }
+
+ @Transactional
+ @Override
+ public void delete(Project project) {
+ for (Project child : project.getChildren())
+ delete(child);
+
+ Usage usage = new Usage();
+ usage.add(settingManager.onDeleteProject(project.getPath()));
+
+ for (LinkSpec link : linkSpecManager.query()) {
+ for (IssueQueryUpdater updater : link.getQueryUpdaters())
usage.add(updater.onDeleteProject(project.getPath()).prefix("issue setting").prefix("administration"));
}
-
- usage.checkInUse("Project '" + project.getPath() + "'");
-
- for (Project fork: project.getForks()) {
- Collection<Project> descendants = fork.getForkChildren();
- descendants.add(fork);
- for (Project descendant: descendants) {
- Query<?> query = getSession().createQuery(String.format("update Issue set %s=:fork where %s=:descendant",
- Issue.PROP_NUMBER_SCOPE, Issue.PROP_PROJECT));
- query.setParameter("fork", fork);
- query.setParameter("descendant", descendant);
- query.executeUpdate();
-
- query = getSession().createQuery(String.format("update Build set %s=:fork where %s=:descendant",
- Build.PROP_NUMBER_SCOPE, Build.PROP_PROJECT));
- query.setParameter("fork", fork);
- query.setParameter("descendant", descendant);
- query.executeUpdate();
-
- query = getSession().createQuery(String.format("update PullRequest set %s=:fork where %s=:descendant",
- PullRequest.PROP_NUMBER_SCOPE, PullRequest.PROP_TARGET_PROJECT));
- query.setParameter("fork", fork);
- query.setParameter("descendant", descendant);
- query.executeUpdate();
- }
- }
-
- Query<?> query = getSession().createQuery(String.format("update Project set %s=null where %s=:forkedFrom",
- Project.PROP_FORKED_FROM, Project.PROP_FORKED_FROM));
- query.setParameter("forkedFrom", project);
- query.executeUpdate();
-
- query = getSession().createQuery(String.format("update PullRequest set %s=null where %s=:sourceProject",
- PullRequest.PROP_SOURCE_PROJECT, PullRequest.PROP_SOURCE_PROJECT));
- query.setParameter("sourceProject", project);
- query.executeUpdate();
-
- for (Build build: project.getBuilds())
- buildManager.delete(build);
-
- dao.remove(project);
+
+ usage.checkInUse("Project '" + project.getPath() + "'");
+
+ for (Project fork : project.getForks()) {
+ Collection<Project> descendants = fork.getForkChildren();
+ descendants.add(fork);
+ for (Project descendant : descendants) {
+ Query<?> query = getSession().createQuery(String.format("update Issue set %s=:fork where %s=:descendant",
+ Issue.PROP_NUMBER_SCOPE, Issue.PROP_PROJECT));
+ query.setParameter("fork", fork);
+ query.setParameter("descendant", descendant);
+ query.executeUpdate();
+
+ query = getSession().createQuery(String.format("update Build set %s=:fork where %s=:descendant",
+ Build.PROP_NUMBER_SCOPE, Build.PROP_PROJECT));
+ query.setParameter("fork", fork);
+ query.setParameter("descendant", descendant);
+ query.executeUpdate();
+
+ query = getSession().createQuery(String.format("update PullRequest set %s=:fork where %s=:descendant",
+ PullRequest.PROP_NUMBER_SCOPE, PullRequest.PROP_TARGET_PROJECT));
+ query.setParameter("fork", fork);
+ query.setParameter("descendant", descendant);
+ query.executeUpdate();
+ }
+ }
+
+ Query<?> query = getSession().createQuery(String.format("update Project set %s=null where %s=:forkedFrom",
+ Project.PROP_FORKED_FROM, Project.PROP_FORKED_FROM));
+ query.setParameter("forkedFrom", project);
+ query.executeUpdate();
+
+ query = getSession().createQuery(String.format("update PullRequest set %s=null where %s=:sourceProject",
+ PullRequest.PROP_SOURCE_PROJECT, PullRequest.PROP_SOURCE_PROJECT));
+ query.setParameter("sourceProject", project);
+ query.executeUpdate();
+
+ for (Build build : project.getBuilds())
+ buildManager.delete(build);
+
+ dao.remove(project);
updateManager.delete(project.getDynamics());
-
- synchronized (repositoryCache) {
+
+ synchronized (repositoryCache) {
Repository repository = repositoryCache.remove(project.getId());
- if (repository != null)
+ if (repository != null)
repository.close();
}
- }
-
- @Override
- public Project findByPath(String path) {
+ }
+
+ @Override
+ public Project findByPath(String path) {
ProjectFacade project = cache.find(path);
if (project != null)
return load(project.getId());
else
return null;
- }
-
- @Sessional
- @Override
- public Project findByServiceDeskName(String serviceDeskName) {
+ }
+
+ @Sessional
+ @Override
+ public Project findByServiceDeskName(String serviceDeskName) {
Long projectId = null;
- for (ProjectFacade facade: cache.values()) {
+ for (ProjectFacade facade : cache.values()) {
if (serviceDeskName.equals(facade.getServiceDeskName())) {
projectId = facade.getId();
break;
@@ -429,58 +430,58 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
return load(projectId);
else
return null;
- }
-
- @Sessional
- @Override
- public Project setup(String path) {
- List<String> names = Splitter.on("/").omitEmptyStrings().trimResults().splitToList(path);
- Project project = null;
- for (String name: names) {
- Project child;
- if (project == null || !project.isNew()) {
- // Query database directly instead of calling findByName to fix issue
- // #923 - Multi level projects after import and 1dev upgrade are mingled
- EntityCriteria<Project> criteria = EntityCriteria.of(Project.class);
- if (project != null)
- criteria.add(Restrictions.eq(Project.PROP_PARENT, project));
- else
- criteria.add(Restrictions.isNull(Project.PROP_PARENT));
- criteria.add(Restrictions.eq(Project.PROP_NAME, name));
- child = find(criteria);
- if (child == null) {
- if (project == null && !SecurityUtils.canCreateRootProjects())
- throw new UnauthorizedException("Not authorized to create root project");
- if (project != null && !SecurityUtils.canCreateChildren(project))
- throw new UnauthorizedException("Not authorized to create project under '" + project.getPath() + "'");
- child = new Project();
- child.setName(name);
- child.setParent(project);
- }
- } else {
- child = new Project();
- child.setName(name);
- child.setParent(project);
- }
- project = child;
- }
-
- Project parent = project.getParent();
- while (parent != null && parent.isNew()) {
- parent.setCodeManagement(false);
- parent.setIssueManagement(false);
- parent = parent.getParent();
- }
- project.setPath(path);
- return project;
- }
-
- @Sessional
- @Override
- public Project find(Project parent, String name) {
+ }
+
+ @Sessional
+ @Override
+ public Project setup(String path) {
+ List<String> names = Splitter.on("/").omitEmptyStrings().trimResults().splitToList(path);
+ Project project = null;
+ for (String name : names) {
+ Project child;
+ if (project == null || !project.isNew()) {
+ // Query database directly instead of calling findByName to fix issue
+ // #923 - Multi level projects after import and 1dev upgrade are mingled
+ EntityCriteria<Project> criteria = EntityCriteria.of(Project.class);
+ if (project != null)
+ criteria.add(Restrictions.eq(Project.PROP_PARENT, project));
+ else
+ criteria.add(Restrictions.isNull(Project.PROP_PARENT));
+ criteria.add(Restrictions.eq(Project.PROP_NAME, name));
+ child = find(criteria);
+ if (child == null) {
+ if (project == null && !SecurityUtils.canCreateRootProjects())
+ throw new UnauthorizedException("Not authorized to create root project");
+ if (project != null && !SecurityUtils.canCreateChildren(project))
+ throw new UnauthorizedException("Not authorized to create project under '" + project.getPath() + "'");
+ child = new Project();
+ child.setName(name);
+ child.setParent(project);
+ }
+ } else {
+ child = new Project();
+ child.setName(name);
+ child.setParent(project);
+ }
+ project = child;
+ }
+
+ Project parent = project.getParent();
+ while (parent != null && parent.isNew()) {
+ parent.setCodeManagement(false);
+ parent.setIssueManagement(false);
+ parent = parent.getParent();
+ }
+ project.setPath(path);
+ return project;
+ }
+
+ @Sessional
+ @Override
+ public Project find(Project parent, String name) {
Long projectId = null;
- for (ProjectFacade facade: cache.values()) {
- if (facade.getName().equalsIgnoreCase(name)
+ for (ProjectFacade facade : cache.values()) {
+ if (facade.getName().equalsIgnoreCase(name)
&& Objects.equals(Project.idOf(parent), facade.getParentId())) {
projectId = facade.getId();
break;
@@ -490,169 +491,169 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
return load(projectId);
else
return null;
- }
-
- @Transactional
+ }
+
+ @Transactional
@Override
- public void fork(Project from, Project to) {
+ public void fork(Project from, Project to) {
to.getDynamics().setLastCommitDate(from.getDynamics().getLastCommitDate());
- Long fromId = from.getId();
- String fromPath = from.getPath();
- Long toId = to.getId();
-
+ Long fromId = from.getId();
+ String fromPath = from.getPath();
+ Long toId = to.getId();
+
GitPackConfig gitPackConfig = to.getGitPackConfig();
- runOnProjectServer(toId, new ClusterTask<Void>() {
+ runOnProjectServer(toId, new ClusterTask<Void>() {
private static final long serialVersionUID = 1L;
@Override
public Void call() throws Exception {
- File toGitDir = storageManager.getProjectGitDir(toId);
- FileUtils.cleanDir(toGitDir);
-
- UUID fromStorageServerUUID = getStorageServerUUID(fromId, true);
- if (fromStorageServerUUID.equals(clusterManager.getLocalServerUUID())) {
- File fromGitDir = storageManager.getProjectGitDir(fromId);
- new CloneCommand(toGitDir, fromGitDir.getAbsolutePath()).noLfs(true).mirror(true).run();
- storageManager.initLfsDir(toId);
- new LfsFetchAllCommand(toGitDir).run();
- } else {
- CommandUtils.callWithClusterCredential(new GitTask<Void>() {
+ File toGitDir = storageManager.getProjectGitDir(toId);
+ FileUtils.cleanDir(toGitDir);
+
+ UUID fromStorageServerUUID = getStorageServerUUID(fromId, true);
+ if (fromStorageServerUUID.equals(clusterManager.getLocalServerUUID())) {
+ File fromGitDir = storageManager.getProjectGitDir(fromId);
+ new CloneCommand(toGitDir, fromGitDir.getAbsolutePath()).noLfs(true).mirror(true).run();
+ storageManager.initLfsDir(toId);
+ new LfsFetchAllCommand(toGitDir).run();
+ } else {
+ CommandUtils.callWithClusterCredential(new GitTask<Void>() {
@Override
public Void call(Commandline git) {
String remoteUrl = clusterManager.getServerUrl(fromStorageServerUUID) + "/" + fromPath;
- new CloneCommand(toGitDir, remoteUrl) {
+ new CloneCommand(toGitDir, remoteUrl) {
@Override
protected Commandline newGit() {
return git;
}
-
- }.noLfs(true).mirror(true).run();
+
+ }.noLfs(true).mirror(true).run();
return null;
}
-
- });
-
- storageManager.initLfsDir(toId);
-
- CommandUtils.callWithClusterCredential(new GitTask<Void>() {
+
+ });
+
+ storageManager.initLfsDir(toId);
+
+ CommandUtils.callWithClusterCredential(new GitTask<Void>() {
@Override
public Void call(Commandline git) {
- new LfsFetchAllCommand(toGitDir) {
-
+ new LfsFetchAllCommand(toGitDir) {
+
@Override
protected Commandline newGit() {
return git;
}
-
- }.run();
+
+ }.run();
return null;
}
-
- });
-
- }
+
+ });
+
+ }
HookUtils.checkHooks(toGitDir);
checkGitConfig(toId, gitPackConfig);
- commitInfoManager.cloneInfo(fromId, toId);
- avatarManager.copyProjectAvatar(fromId, toId);
+ commitInfoManager.cloneInfo(fromId, toId);
+ avatarManager.copyProjectAvatar(fromId, toId);
return null;
}
-
- });
+
+ });
}
-
- private void updateStorageServer(Project project) {
- ProjectServer storageServer = new ProjectServer(
- clusterManager.getLocalServerUUID(), Lists.newArrayList());
- storageServers.put(project.getId(), storageServer);
- }
-
- @Transactional
- @Override
- public void clone(Project project, String repositoryUrl) {
- Long projectId = project.getId();
- runOnProjectServer(projectId, new ClusterTask<Void>() {
+
+ private void updateStorageServer(Project project) {
+ ProjectServer storageServer = new ProjectServer(
+ clusterManager.getLocalServerUUID(), Lists.newArrayList());
+ storageServers.put(project.getId(), storageServer);
+ }
+
+ @Transactional
+ @Override
+ public void clone(Project project, String repositoryUrl) {
+ Long projectId = project.getId();
+ runOnProjectServer(projectId, new ClusterTask<Void>() {
private static final long serialVersionUID = 1L;
@Override
public Void call() throws Exception {
- File gitDir = storageManager.getProjectGitDir(projectId);
- FileUtils.cleanDir(gitDir);
- new CloneCommand(gitDir, repositoryUrl).mirror(true).noLfs(true).run();
- storageManager.initLfsDir(projectId);
- new LfsFetchAllCommand(gitDir).run();
+ File gitDir = storageManager.getProjectGitDir(projectId);
+ FileUtils.cleanDir(gitDir);
+ new CloneCommand(gitDir, repositoryUrl).mirror(true).noLfs(true).run();
+ storageManager.initLfsDir(projectId);
+ new LfsFetchAllCommand(gitDir).run();
return null;
}
-
- });
-
- List<ImmutableTriple<String, ObjectId, ObjectId>> refUpdatedEventData = new ArrayList<>();
-
- for (RefFacade ref: project.getBranchRefs()) {
- refUpdatedEventData.add(new ImmutableTriple<>(ref.getName(),
- ObjectId.zeroId(), ref.getObjectId()));
- }
- for (RefFacade ref: project.getTagRefs()) {
- refUpdatedEventData.add(new ImmutableTriple<>(ref.getName(),
- ObjectId.zeroId(), ref.getPeeledObj().getId().copy()));
- }
-
- sessionManager.runAsyncAfterCommit(new Runnable() {
+
+ });
+
+ List<ImmutableTriple<String, ObjectId, ObjectId>> refUpdatedEventData = new ArrayList<>();
+
+ for (RefFacade ref : project.getBranchRefs()) {
+ refUpdatedEventData.add(new ImmutableTriple<>(ref.getName(),
+ ObjectId.zeroId(), ref.getObjectId()));
+ }
+ for (RefFacade ref : project.getTagRefs()) {
+ refUpdatedEventData.add(new ImmutableTriple<>(ref.getName(),
+ ObjectId.zeroId(), ref.getPeeledObj().getId().copy()));
+ }
+
+ sessionManager.runAsyncAfterCommit(new Runnable() {
@Override
public void run() {
- try {
- Project project = load(projectId);
-
- for (ImmutableTriple<String, ObjectId, ObjectId> each: refUpdatedEventData) {
- String refName = each.getLeft();
- ObjectId oldObjectId = each.getMiddle();
- ObjectId newObjectId = each.getRight();
- if (!newObjectId.equals(ObjectId.zeroId()))
- project.cacheObjectId(refName, newObjectId);
- else
- project.cacheObjectId(refName, null);
-
- listenerRegistry.post(new RefUpdated(project, refName, oldObjectId, newObjectId));
- }
- } catch (Exception e) {
- logger.error("Error posting ref updated event", e);
+ try {
+ Project project = load(projectId);
+
+ for (ImmutableTriple<String, ObjectId, ObjectId> each : refUpdatedEventData) {
+ String refName = each.getLeft();
+ ObjectId oldObjectId = each.getMiddle();
+ ObjectId newObjectId = each.getRight();
+ if (!newObjectId.equals(ObjectId.zeroId()))
+ project.cacheObjectId(refName, newObjectId);
+ else
+ project.cacheObjectId(refName, null);
+
+ listenerRegistry.post(new RefUpdated(project, refName, oldObjectId, newObjectId));
+ }
+ } catch (Exception e) {
+ logger.error("Error posting ref updated event", e);
}
}
-
- });
-
- }
-
+
+ });
+
+ }
+
private void checkGitDir(Long projectId) {
File gitDir = storageManager.getProjectGitDir(projectId);
if (gitDir.listFiles().length == 0) {
- logger.info("Initializing git repository in '" + gitDir + "'...");
- try (Git git = Git.init().setDirectory(gitDir).setBare(true).call()) {
+ logger.info("Initializing git repository in '" + gitDir + "'...");
+ try (Git git = Git.init().setDirectory(gitDir).setBare(true).call()) {
} catch (Exception e) {
throw ExceptionUtils.unchecked(e);
}
- storageManager.initLfsDir(projectId);
+ storageManager.initLfsDir(projectId);
} else if (!GitUtils.isValid(gitDir)) {
- logger.warn("Directory '" + gitDir + "' is not a valid git repository, reinitializing...");
- FileUtils.cleanDir(gitDir);
- storageManager.initLfsDir(projectId);
- try (Git git = Git.init().setDirectory(gitDir).setBare(true).call()) {
+ logger.warn("Directory '" + gitDir + "' is not a valid git repository, reinitializing...");
+ FileUtils.cleanDir(gitDir);
+ storageManager.initLfsDir(projectId);
+ try (Git git = Git.init().setDirectory(gitDir).setBare(true).call()) {
} catch (Exception e) {
throw ExceptionUtils.unchecked(e);
}
- storageManager.initLfsDir(projectId);
- }
+ storageManager.initLfsDir(projectId);
+ }
}
-
- private boolean updateStoredConfig(StoredConfig storedConfig, String section,
+
+ private boolean updateStoredConfig(StoredConfig storedConfig, String section,
String name, @Nullable String value) {
if (value != null) {
if (!value.equals(storedConfig.getString(section, "null", name))) {
@@ -708,11 +709,11 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
throw new RuntimeException(e);
}
}
-
+
@Listen
public void on(SystemStopping event) {
- synchronized(repositoryCache) {
- for (Repository repository: repositoryCache.values()) {
+ synchronized (repositoryCache) {
+ for (Repository repository : repositoryCache.values()) {
repository.close();
}
}
@@ -722,32 +723,32 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Listen(1)
public void on(SystemStarted event) {
HazelcastInstance hazelcastInstance = clusterManager.getHazelcastInstance();
- cache = new ProjectCache(hazelcastInstance.getReplicatedMap("projectCache"));
+ cache = new ProjectCache(hazelcastInstance.getReplicatedMap("projectCache"));
Map<Long, Project> projects = new HashMap<>();
- for (Project project: query()) {
+ for (Project project : query()) {
String path = project.getPath();
if (!path.equals(project.calcPath()))
project.setPath(path);
cache.put(project.getId(), project.getFacade());
projects.put(project.getId(), project);
}
-
+
Map<Long, ProjectDynamics> updates = new HashMap<>();
- for (ProjectDynamics update: updateManager.query())
+ for (ProjectDynamics update : updateManager.query())
updates.put(update.getId(), update);
logger.info("Checking projects...");
-
+
storageServers = hazelcastInstance.getMap("projectStorageServers");
-
+
UUID localServerUUID = clusterManager.getLocalServerUUID();
- for (var file: storageManager.getProjectsDir().listFiles()) {
+ for (var file : storageManager.getProjectsDir().listFiles()) {
var projectId = Long.valueOf(file.getName());
var project = projects.get(projectId);
if (project != null) {
checkGitDir(projectId);
-
+
if (project.isCodeManagement()) {
ProjectDynamics update = updates.get(project.getDynamics().getId());
if (update.getLastCommitDate() == null) {
@@ -761,15 +762,15 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
storageServers.put(projectId, new ProjectServer(localServerUUID, Lists.newArrayList()));
}
}
-
+
hazelcastInstance.getCluster().addMembershipListener(new MembershipListener() {
-
+
@Override
public void memberRemoved(MembershipEvent membershipEvent) {
if (clusterManager.isLeaderServer()) {
UUID serverUUID = membershipEvent.getMember().getUuid();
Set<Long> projectsToRemove = new HashSet<>();
- for (Map.Entry<Long, ProjectServer> entry: storageServers.entrySet()) {
+ for (Map.Entry<Long, ProjectServer> entry : storageServers.entrySet()) {
ProjectServer server = entry.getValue();
if (server.getBackups().contains(serverUUID)) {
List<UUID> backups = new ArrayList<>(server.getBackups());
@@ -784,23 +785,23 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
}
}
}
-
- for (Long projectId: projectsToRemove)
+
+ for (Long projectId : projectsToRemove)
storageServers.remove(projectId);
}
}
-
+
@Override
public void memberAdded(MembershipEvent membershipEvent) {
}
-
+
});
}
-
+
@Transactional
@Override
public void onDeleteBranch(Project project, String branchName) {
- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext(); ) {
BranchProtection protection = it.next();
PatternSet patternSet = PatternSet.parse(protection.getBranches());
patternSet.getIncludes().remove(branchName);
@@ -810,18 +811,18 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
it.remove();
}
}
-
+
@Transactional
@Override
public void deleteBranch(Project project, String branchName) {
onDeleteBranch(project, branchName);
- gitService.deleteBranch(project, branchName);
+ gitService.deleteBranch(project, branchName);
}
@Transactional
@Override
public void onDeleteTag(Project project, String tagName) {
- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext(); ) {
TagProtection protection = it.next();
PatternSet patternSet = PatternSet.parse(protection.getTags());
patternSet.getIncludes().remove(tagName);
@@ -831,14 +832,14 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
it.remove();
}
}
-
+
@Transactional
@Override
public void deleteTag(Project project, String tagName) {
- onDeleteTag(project, tagName);
- gitService.deleteTag(project, tagName);
+ onDeleteTag(project, tagName);
+ gitService.deleteTag(project, tagName);
}
-
+
@Override
public List<Project> query() {
return query(true);
@@ -848,78 +849,78 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
public int count() {
return count(true);
}
-
+
private void addSubTreeIds(Collection<Long> projectIds, Project project) {
projectIds.add(project.getId());
- for (Project descendant: project.getDescendants())
+ for (Project descendant : project.getDescendants())
projectIds.add(descendant.getId());
}
-
+
@Override
public Collection<Project> getPermittedProjects(Permission permission) {
ProjectCache cacheClone = cache.clone();
-
+
Collection<Long> permittedProjectIds;
User user = SecurityUtils.getUser();
- if (user != null) {
- if (user.isRoot() || user.isSystem()) {
- return cacheClone.getProjects();
- } else {
- permittedProjectIds = new HashSet<>();
- for (Group group: user.getGroups()) {
- if (group.isAdministrator())
- return cacheClone.getProjects();
- for (GroupAuthorization authorization: group.getAuthorizations()) {
- if (authorization.getRole().implies(permission))
- addSubTreeIds(permittedProjectIds, authorization.getProject());
- }
- }
- Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();
- if (defaultLoginGroup != null) {
- if (defaultLoginGroup.isAdministrator())
- return cacheClone.getProjects();
- for (GroupAuthorization authorization: defaultLoginGroup.getAuthorizations()) {
- if (authorization.getRole().implies(permission))
- addSubTreeIds(permittedProjectIds, authorization.getProject());
- }
- }
-
- for (UserAuthorization authorization: user.getProjectAuthorizations()) {
- if (authorization.getRole().implies(permission))
- addSubTreeIds(permittedProjectIds, authorization.getProject());
- }
- addIdsPermittedByDefaultRole(cacheClone, permittedProjectIds, permission);
- }
- } else {
- permittedProjectIds = new HashSet<>();
- if (settingManager.getSecuritySetting().isEnableAnonymousAccess())
- addIdsPermittedByDefaultRole(cacheClone, permittedProjectIds, permission);
- }
-
- return permittedProjectIds.stream().map(it->load(it)).collect(Collectors.toSet());
- }
-
- private void addIdsPermittedByDefaultRole(ProjectCache cache, Collection<Long> projectIds,
- Permission permission) {
- for (ProjectFacade project: cache.values()) {
+ if (user != null) {
+ if (user.isRoot() || user.isSystem()) {
+ return cacheClone.getProjects();
+ } else {
+ permittedProjectIds = new HashSet<>();
+ for (Group group : user.getGroups()) {
+ if (group.isAdministrator())
+ return cacheClone.getProjects();
+ for (GroupAuthorization authorization : group.getAuthorizations()) {
+ if (authorization.getRole().implies(permission))
+ addSubTreeIds(permittedProjectIds, authorization.getProject());
+ }
+ }
+ Group defaultLoginGroup = settingManager.getSecuritySetting().getDefaultLoginGroup();
+ if (defaultLoginGroup != null) {
+ if (defaultLoginGroup.isAdministrator())
+ return cacheClone.getProjects();
+ for (GroupAuthorization authorization : defaultLoginGroup.getAuthorizations()) {
+ if (authorization.getRole().implies(permission))
+ addSubTreeIds(permittedProjectIds, authorization.getProject());
+ }
+ }
+
+ for (UserAuthorization authorization : user.getProjectAuthorizations()) {
+ if (authorization.getRole().implies(permission))
+ addSubTreeIds(permittedProjectIds, authorization.getProject());
+ }
+ addIdsPermittedByDefaultRole(cacheClone, permittedProjectIds, permission);
+ }
+ } else {
+ permittedProjectIds = new HashSet<>();
+ if (settingManager.getSecuritySetting().isEnableAnonymousAccess())
+ addIdsPermittedByDefaultRole(cacheClone, permittedProjectIds, permission);
+ }
+
+ return permittedProjectIds.stream().map(it -> load(it)).collect(Collectors.toSet());
+ }
+
+ private void addIdsPermittedByDefaultRole(ProjectCache cache, Collection<Long> projectIds,
+ Permission permission) {
+ for (ProjectFacade project : cache.values()) {
if (project.getDefaultRoleId() != null) {
Role defaultRole = roleManager.load(project.getDefaultRoleId());
- if (defaultRole.implies(permission))
+ if (defaultRole.implies(permission))
projectIds.addAll(cache.getSubtreeIds(project.getId()));
}
}
}
-
+
private CriteriaQuery<Project> buildCriteriaQuery(Session session, EntityQuery<Project> projectQuery) {
CriteriaBuilder builder = session.getCriteriaBuilder();
CriteriaQuery<Project> query = builder.createQuery(Project.class);
Root<Project> root = query.from(Project.class);
query.select(root);
-
+
query.where(getPredicates(projectQuery.getCriteria(), query, root, builder));
List<javax.persistence.criteria.Order> orders = new ArrayList<>();
- for (EntitySort sort: projectQuery.getSorts()) {
+ for (EntitySort sort : projectQuery.getSorts()) {
if (sort.getDirection() == Direction.ASCENDING)
orders.add(builder.asc(ProjectQuery.getPath(root, Project.ORDER_FIELDS.get(sort.getField()))));
else
@@ -929,27 +930,27 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
if (orders.isEmpty())
orders.add(builder.asc(ProjectQuery.getPath(root, Project.PROP_PATH)));
query.orderBy(orders);
-
+
return query;
}
-
- private Predicate[] getPredicates(@Nullable Criteria<Project> criteria, CriteriaQuery<?> query,
- From<Project, Project> from, CriteriaBuilder builder) {
+
+ private Predicate[] getPredicates(@Nullable Criteria<Project> criteria, CriteriaQuery<?> query,
+ From<Project, Project> from, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
if (!SecurityUtils.isAdministrator()) {
Collection<Project> projects = getPermittedProjects(new AccessProject());
if (!projects.isEmpty()) {
- predicates.add(Criteria.forManyValues(builder, from.get(Project.PROP_ID),
- projects.stream().map(it->it.getId()).collect(Collectors.toSet()), getIds()));
+ predicates.add(Criteria.forManyValues(builder, from.get(Project.PROP_ID),
+ projects.stream().map(it -> it.getId()).collect(Collectors.toSet()), getIds()));
} else {
predicates.add(builder.disjunction());
}
}
- if (criteria != null)
+ if (criteria != null)
predicates.add(criteria.getPredicate(query, from, builder));
return predicates.toArray(new Predicate[0]);
}
-
+
@Sessional
@Override
public List<Project> query(EntityQuery<Project> query, int firstResult, int maxResults) {
@@ -977,22 +978,22 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
public Collection<Long> getSubtreeIds(Long projectId) {
return cache.getSubtreeIds(projectId);
}
-
+
@Override
public Collection<Long> getIds() {
return new HashSet<>(cache.keySet());
}
-
+
@Override
public Predicate getPathMatchPredicate(CriteriaBuilder builder, Path<Project> path, String pathPattern) {
- return Criteria.forManyValues(builder, path.get(Project.PROP_ID),
- cache.getMatchingIds(pathPattern), cache.keySet());
+ return Criteria.forManyValues(builder, path.get(Project.PROP_ID),
+ cache.getMatchingIds(pathPattern), cache.keySet());
}
-
+
@Transactional
@Override
public void move(Collection<Project> projects, Project parent) {
- for (Project project: projects) {
+ for (Project project : projects) {
project.setParent(parent);
save(project);
}
@@ -1002,19 +1003,19 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
@Override
public void delete(Collection<Project> projects) {
Collection<Project> independents = new HashSet<>(projects);
- for (Iterator<Project> it = independents.iterator(); it.hasNext();) {
+ for (Iterator<Project> it = independents.iterator(); it.hasNext(); ) {
Project independent = it.next();
- for (Project each: independents) {
+ for (Project each : independents) {
if (!each.equals(independent) && each.isSelfOrAncestorOf(independent)) {
it.remove();
break;
}
}
}
- for (Project independent: independents)
+ for (Project independent : independents)
delete(independent);
}
-
+
@Override
public List<ProjectFacade> getChildren(Long projectId) {
return cache.getChildren(projectId);
@@ -1037,18 +1038,18 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
}
return null;
}
-
+
@Override
public UUID getStorageServerUUID(Long projectId, boolean mustExist) {
ProjectServer server = storageServers.get(projectId);
- if (server != null)
+ if (server != null)
return server.getPrimary();
- else if (mustExist)
+ else if (mustExist)
throw new ExplicitException("Storage not found for project id: " + projectId);
else
return null;
}
-
+
@Override
public Map<Long, ProjectServer> getStorageServers() {
return storageServers;
@@ -1073,12 +1074,12 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
public ProjectFacade findFacadeById(Long id) {
return cache.get(id);
}
-
+
@Override
public File getLfsObjectsDir(Long projectId) {
return new File(storageManager.getProjectGitDir(projectId), "lfs/objects");
}
-
+
@Override
public Collection<String> getReservedNames() {
return reservedNames;
@@ -1105,7 +1106,7 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
});
}
-
+
});
}