Skip to content

The Unified and Autonomous Development Platform

Add CI job cache support

Robin Shen2dbe96ef8a02
diff --git a/core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java b/core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java
index f007c96048..04eb61e3c3 100644
--- a/core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java
+++ b/core/src/main/java/io/onedev/server/cache/DefaultCommitInfoManager.java
@@ -1,1382 +1,1382 @@
-package io.onedev.server.cache;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.PersonIdent;
-import org.eclipse.jgit.lib.Ref;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevObject;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Splitter;
-
-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.FileUtils;
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.concurrent.Prioritized;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.event.RefUpdated;
-import io.onedev.server.event.entity.EntityRemoved;
-import io.onedev.server.event.issue.IssueCommitted;
-import io.onedev.server.event.system.SystemStarted;
-import io.onedev.server.git.Contribution;
-import io.onedev.server.git.Contributor;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.NameAndEmail;
-import io.onedev.server.git.command.FileChange;
-import io.onedev.server.git.command.GitCommit;
-import io.onedev.server.git.command.LogCommand;
-import io.onedev.server.git.command.RevListCommand;
-import io.onedev.server.git.command.RevListCommand.Order;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.persistence.SessionManager;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.Day;
-import io.onedev.server.util.IssueUtils;
-import io.onedev.server.util.facade.ProjectFacade;
-import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.work.BatchWorkManager;
-import io.onedev.server.util.work.BatchWorker;
-import jetbrains.exodus.ArrayByteIterable;
-import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.backup.BackupStrategy;
-import jetbrains.exodus.backup.BackupStrategy.FileDescriptor;
-import jetbrains.exodus.backup.VirtualFileDescriptor;
-import jetbrains.exodus.env.Environment;
-import jetbrains.exodus.env.Store;
-import jetbrains.exodus.env.Transaction;
-import jetbrains.exodus.env.TransactionalComputable;
-import jetbrains.exodus.env.TransactionalExecutable;
-
-@Singleton
-public class DefaultCommitInfoManager extends AbstractEnvironmentManager implements CommitInfoManager {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class);
-
- private static final int INFO_VERSION = 7;
-
- private static final long LOG_FILE_SIZE = 256*1024;
-
- private static final int COLLECT_BATCH_SIZE = 10000;
-
- private static final int MAX_COLLECTING_FILES = 50000;
-
- private static final int MAX_HISTORY_PATHS = 100;
-
- private static final String INFO_DIR = "commit";
-
- private static final String DEFAULT_STORE = "default";
-
- private static final String COMMITS_STORE = "commits";
-
- private static final String FIX_COMMITS_STORE = "fixCommits";
-
- private static final String EDITS_STORE = "edits";
-
- private static final String HISTORY_PATHS_STORE = "historyPaths";
-
- private static final String PATH_TO_INDEX_STORE = "pathToIndex";
-
- private static final String INDEX_TO_PATH_STORE = "indexToPath";
-
- private static final String EMAIL_TO_INDEX_STORE = "emailToIndex";
-
- private static final String INDEX_TO_USER_STORE = "indexToUser";
-
- private static final String DAILY_CONTRIBUTIONS_STORE = "dailyContributions";
-
- private static final ByteIterable NEXT_PATH_INDEX_KEY = new StringByteIterable("nextPathIndex");
-
- private static final ByteIterable NEXT_USER_INDEX_KEY = new StringByteIterable("nextUserIndex");
-
- private static final ByteIterable LAST_COMMIT_KEY = new StringByteIterable("lastCommit");
-
- private static final ByteIterable LAST_COMMIT_OF_DEFAULT_BRANCH_KEY = new StringByteIterable("lastCommitOfDefaultBranch");
-
- private static final ByteIterable LINE_STATS_KEY = new StringByteIterable("lineStats");
-
- private static final ByteIterable USERS_KEY = new StringByteIterable("users");
-
- private static final ByteIterable FILES_KEY = new StringByteIterable("files");
-
- private static final ByteIterable OVERALL_CONTRIBUTIONS_KEY = new StringByteIterable("overallContributions");
-
- private static final ByteIterable COMMIT_COUNT_KEY = new StringByteIterable("commitCount");
-
- private static final int PRIORITY = 100;
-
- private static final Map<String, String> PROGRAMMING_LANGUAGES = new HashMap<>();
-
- static {
- PROGRAMMING_LANGUAGES.put("java", "Java");
-
- PROGRAMMING_LANGUAGES.put("h", "C");
- PROGRAMMING_LANGUAGES.put("c", "C");
-
- PROGRAMMING_LANGUAGES.put("h++", "C++");
- PROGRAMMING_LANGUAGES.put("c++", "C++");
- PROGRAMMING_LANGUAGES.put("hpp", "C++");
- PROGRAMMING_LANGUAGES.put("cpp", "C++");
- PROGRAMMING_LANGUAGES.put("hxx", "C++");
- PROGRAMMING_LANGUAGES.put("cxx", "C++");
- PROGRAMMING_LANGUAGES.put("hh", "C++");
- PROGRAMMING_LANGUAGES.put("cc", "C++");
-
- PROGRAMMING_LANGUAGES.put("cob", "Cobol");
- PROGRAMMING_LANGUAGES.put("cpy", "Cobol");
-
- PROGRAMMING_LANGUAGES.put("cs", "CSharp");
-
- PROGRAMMING_LANGUAGES.put("clj", "Clojure");
- PROGRAMMING_LANGUAGES.put("cljc", "Clojure");
- PROGRAMMING_LANGUAGES.put("cljx", "Clojure");
- PROGRAMMING_LANGUAGES.put("cljs", "ClojureScript");
- PROGRAMMING_LANGUAGES.put("gss", "Closure Stylesheets");
- PROGRAMMING_LANGUAGES.put("coffee", "CoffeeScript");
-
- PROGRAMMING_LANGUAGES.put("cl", "Common Lisp");
- PROGRAMMING_LANGUAGES.put("lisp", "Common Lisp");
- PROGRAMMING_LANGUAGES.put("el", "Common Lisp");
-
- PROGRAMMING_LANGUAGES.put("css", "CSS");
- PROGRAMMING_LANGUAGES.put("d", "D");
- PROGRAMMING_LANGUAGES.put("dart", "Dart");
- PROGRAMMING_LANGUAGES.put("dtd", "DTD");
-
- PROGRAMMING_LANGUAGES.put("erl", "Erlang");
- PROGRAMMING_LANGUAGES.put("f", "Fortran");
- PROGRAMMING_LANGUAGES.put("for", "Fortran");
- PROGRAMMING_LANGUAGES.put("f77", "Fortran");
- PROGRAMMING_LANGUAGES.put("f90", "Fortran");
-
- PROGRAMMING_LANGUAGES.put("go", "Go");
- PROGRAMMING_LANGUAGES.put("groovy", "Groovy");
- PROGRAMMING_LANGUAGES.put("gradle", "Groovy");
-
- PROGRAMMING_LANGUAGES.put("hs", "Haskell");
- PROGRAMMING_LANGUAGES.put("aspx", "ASP.NET");
- PROGRAMMING_LANGUAGES.put("html", "HTML");
- PROGRAMMING_LANGUAGES.put("htm", "HTML");
- PROGRAMMING_LANGUAGES.put("jsp", "Java Server Pages");
- PROGRAMMING_LANGUAGES.put("js", "JavaScript");
-
- PROGRAMMING_LANGUAGES.put("json", "JSON");
- PROGRAMMING_LANGUAGES.put("jsx", "JSX");
-
- PROGRAMMING_LANGUAGES.put("kt", "Kotlin");
- PROGRAMMING_LANGUAGES.put("less", "LESS");
- PROGRAMMING_LANGUAGES.put("lua", "Lua");
- PROGRAMMING_LANGUAGES.put("md", "Markdown");
- PROGRAMMING_LANGUAGES.put("mkd", "Markdown");
- PROGRAMMING_LANGUAGES.put("m", "Objective-C");
- PROGRAMMING_LANGUAGES.put("mm", "Objective-C");
-
- PROGRAMMING_LANGUAGES.put("p", "Pascal");
- PROGRAMMING_LANGUAGES.put("pas", "Pascal");
- PROGRAMMING_LANGUAGES.put("pl", "Perl");
- PROGRAMMING_LANGUAGES.put("pm", "Perl");
-
- PROGRAMMING_LANGUAGES.put("php", "PHP");
- PROGRAMMING_LANGUAGES.put("php3", "PHP");
- PROGRAMMING_LANGUAGES.put("php4", "PHP");
- PROGRAMMING_LANGUAGES.put("php5", "PHP");
- PROGRAMMING_LANGUAGES.put("php7", "PHP");
- PROGRAMMING_LANGUAGES.put("phtml", "PHP");
-
- PROGRAMMING_LANGUAGES.put("sql", "SQL");
- PROGRAMMING_LANGUAGES.put("ps1", "PowerShell");
- PROGRAMMING_LANGUAGES.put("psd1", "PowerShell");
- PROGRAMMING_LANGUAGES.put("psm1", "PowerShell");
- PROGRAMMING_LANGUAGES.put("psm1", "PowerShell");
-
- PROGRAMMING_LANGUAGES.put("properties", "Properties");
- PROGRAMMING_LANGUAGES.put("ini", "INI");
- PROGRAMMING_LANGUAGES.put("in", "INI");
- PROGRAMMING_LANGUAGES.put("proto", "ProtoBuf");
-
- PROGRAMMING_LANGUAGES.put("BUILD", "Python");
- PROGRAMMING_LANGUAGES.put("py", "Python");
- PROGRAMMING_LANGUAGES.put("pyw", "Python");
- PROGRAMMING_LANGUAGES.put("bzl", "Python");
-
- PROGRAMMING_LANGUAGES.put("pp", "Puppet");
- PROGRAMMING_LANGUAGES.put("r", "R");
- PROGRAMMING_LANGUAGES.put("R", "R");
- PROGRAMMING_LANGUAGES.put("rb", "Ruby");
- PROGRAMMING_LANGUAGES.put("rs", "Rust");
-
- PROGRAMMING_LANGUAGES.put("sas", "SAS");
- PROGRAMMING_LANGUAGES.put("sass", "Sass");
- PROGRAMMING_LANGUAGES.put("scala", "Scala");
- PROGRAMMING_LANGUAGES.put("scm", "Scheme");
- PROGRAMMING_LANGUAGES.put("ss", "Scheme");
- PROGRAMMING_LANGUAGES.put("scss", "Scss");
-
- PROGRAMMING_LANGUAGES.put("sh", "Shell");
- PROGRAMMING_LANGUAGES.put("ksh", "Shell");
- PROGRAMMING_LANGUAGES.put("bash", "Shell");
-
- PROGRAMMING_LANGUAGES.put("st", "SmallTalk");
- PROGRAMMING_LANGUAGES.put("soy", "Soy");
- PROGRAMMING_LANGUAGES.put("styl", "Stylus");
- PROGRAMMING_LANGUAGES.put("swift", "Swift");
-
- PROGRAMMING_LANGUAGES.put("tex", "LaTeX");
- PROGRAMMING_LANGUAGES.put("tcl", "TCL");
- PROGRAMMING_LANGUAGES.put("ts", "TypeScript");
- PROGRAMMING_LANGUAGES.put("tsx", "TypeScript-JSX");
- PROGRAMMING_LANGUAGES.put("vb", "VB.NET");
- PROGRAMMING_LANGUAGES.put("vbs", "VBScript");
-
- PROGRAMMING_LANGUAGES.put("vue", "Vue.js Component");
- PROGRAMMING_LANGUAGES.put("xml", "XML");
- PROGRAMMING_LANGUAGES.put("xsl", "XML");
- PROGRAMMING_LANGUAGES.put("xsd", "XML");
- PROGRAMMING_LANGUAGES.put("svg", "XML");
- PROGRAMMING_LANGUAGES.put("yaml", "Yaml");
- PROGRAMMING_LANGUAGES.put("yml", "Yaml");
- }
-
- private final StorageManager storageManager;
-
- private final BatchWorkManager batchWorkManager;
-
- private final ProjectManager projectManager;
-
- private final SessionManager sessionManager;
-
- private final ExecutorService executorService;
-
- private final ListenerRegistry listenerRegistry;
-
- private final IssueManager issueManager;
-
- private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();
-
- private final Map<Long, Integer> commitCountCache = new ConcurrentHashMap<>();
-
- private final Map<Long, List<NameAndEmail>> usersCache = new ConcurrentHashMap<>();
-
- @Inject
- public DefaultCommitInfoManager(ProjectManager projectManager, StorageManager storageManager,
- BatchWorkManager batchWorkManager, SessionManager sessionManager, ExecutorService executorService,
- ListenerRegistry listenerRegistry, IssueManager issueManager) {
- this.projectManager = projectManager;
- this.storageManager = storageManager;
- this.batchWorkManager = batchWorkManager;
- this.sessionManager = sessionManager;
- this.executorService = executorService;
- this.listenerRegistry = listenerRegistry;
- this.issueManager = issueManager;
- }
-
- private boolean isCommitCollected(byte[] commitBytes) {
- /*
- * Collected commits stores an additional byte to differentiate from those not collected but with parent
- * information stored
- */
- return commitBytes != null && commitBytes.length % 20 != 0;
- }
-
- private void doCollect(Project project, ObjectId commitId, String refName) {
- Environment env = getEnv(project.getId().toString());
- Store defaultStore = getStore(env, DEFAULT_STORE);
- Store commitsStore = getStore(env, COMMITS_STORE);
- Store editsStore = getStore(env, EDITS_STORE);
- Store historyPathsStore = getStore(env, HISTORY_PATHS_STORE);
- Store pathToIndexStore = getStore(env, PATH_TO_INDEX_STORE);
- Store indexToPathStore = getStore(env, INDEX_TO_PATH_STORE);
- Store emailToIndexStore = getStore(env, EMAIL_TO_INDEX_STORE);
- Store indexToUserStore = getStore(env, INDEX_TO_USER_STORE);
- Store dailyContributionsStore = getStore(env, DAILY_CONTRIBUTIONS_STORE);
- Store fixCommitsStore = getStore(env, FIX_COMMITS_STORE);
-
- Repository repository = project.getRepository();
-
- Collection<Long> fixedIssueNumbers = new HashSet<>();
-
- env.executeInTransaction(new TransactionalExecutable() {
-
- @Override
- public void execute(Transaction txn) {
- ByteIterable commitKey = new CommitByteIterable(commitId);
- byte[] commitBytes = readBytes(commitsStore, txn, commitKey);
-
- if (!isCommitCollected(commitBytes)) {
- int commitCount = readInt(defaultStore, txn, COMMIT_COUNT_KEY, 0);
-
- try (RevWalk revWalk = new RevWalk(project.getRepository())) {
- RevCommit commit = revWalk.lookupCommit(commitId);
- revWalk.markStart(commit);
-
- byte[] lastCommitBytes = readBytes(defaultStore, txn, LAST_COMMIT_KEY);
- if (lastCommitBytes != null) {
- ObjectId lastCommitId = ObjectId.fromRaw(lastCommitBytes);
- if (repository.hasObject(lastCommitId))
- revWalk.markUninteresting(revWalk.lookupCommit(lastCommitId));
- }
-
- RevCommit nextCommit = revWalk.next();
- while (nextCommit != null) {
- ByteIterable nextCommitKey = new CommitByteIterable(nextCommit);
- byte[] nextCommitBytes = readBytes(commitsStore, txn, nextCommitKey);
-
- if (!isCommitCollected(nextCommitBytes)) {
- byte[] newNextCommitBytes;
- if (nextCommitBytes == null) {
- newNextCommitBytes = new byte[1];
- } else {
- newNextCommitBytes = new byte[1+nextCommitBytes.length];
- System.arraycopy(nextCommitBytes, 0, newNextCommitBytes, 1, nextCommitBytes.length);
- }
-
- commitsStore.put(txn, nextCommitKey, new ArrayByteIterable(newNextCommitBytes));
-
- commitCount++;
-
- for (RevCommit parentCommit: nextCommit.getParents()) {
- ByteIterable parentCommitKey = new CommitByteIterable(parentCommit);
- byte[] parentCommitBytes = readBytes(commitsStore, txn, parentCommitKey);
- byte[] newParentCommitBytes;
- if (parentCommitBytes != null) {
- newParentCommitBytes = new byte[parentCommitBytes.length+20];
- System.arraycopy(parentCommitBytes, 0, newParentCommitBytes, 0, parentCommitBytes.length);
- } else {
- newParentCommitBytes = new byte[20];
- }
- nextCommit.copyRawTo(newParentCommitBytes, newParentCommitBytes.length-20);
- commitsStore.put(txn, parentCommitKey, new ArrayByteIterable(newParentCommitBytes));
- }
-
- for (Long issueNumber: IssueUtils.parseFixedIssues(project, nextCommit.getFullMessage())) {
- ByteIterable issueKey = new LongByteIterable(issueNumber);
- Collection<ObjectId> fixCommits = readCommits(fixCommitsStore, txn, issueKey);
-
- boolean addNextCommit = true;
- for (Iterator<ObjectId> it = fixCommits.iterator(); it.hasNext();) {
- ObjectId fixCommit = it.next();
- if (GitUtils.isMergedInto(project.getRepository(), null, fixCommit, nextCommit)) {
- it.remove();
- } else if (GitUtils.isMergedInto(project.getRepository(), null, nextCommit, fixCommit)) {
- addNextCommit = false;
- break;
- }
- }
- if (addNextCommit) {
- fixCommits.add(nextCommit);
- fixedIssueNumbers.add(issueNumber);
- }
- writeCommits(fixCommitsStore, txn, issueKey, fixCommits);
- }
- }
- nextCommit = revWalk.next();
- }
- writeInt(defaultStore, txn, COMMIT_COUNT_KEY, commitCount);
- commitCountCache.remove(project.getId());
-
- defaultStore.put(txn, LAST_COMMIT_KEY, new CommitByteIterable(commitId));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
-
- });
-
- for (Long issueNumber: fixedIssueNumbers) {
- Issue issue = issueManager.find(project, issueNumber);
- if (issue != null)
- listenerRegistry.post(new IssueCommitted(issue));
- }
-
- if (GitUtils.branch2ref(project.getDefaultBranch()).equals(refName)) {
- ObjectId lastCommitId =
- env.computeInReadonlyTransaction(new TransactionalComputable<ObjectId>() {
-
- @Override
- public ObjectId compute(Transaction txn) {
- byte[] lastCommitBytes = readBytes(defaultStore, txn, LAST_COMMIT_OF_DEFAULT_BRANCH_KEY);
- if (lastCommitBytes != null)
- return ObjectId.fromRaw(lastCommitBytes);
- else
- return null;
- }
-
- });
-
- if (!commitId.equals(lastCommitId)) {
- RevListCommand revList = new RevListCommand(project.getGitDir());
- List<String> revisions = new ArrayList<>();
- revisions.add(commitId.name());
- if (lastCommitId != null && repository.hasObject(lastCommitId))
- revisions.add("^" + lastCommitId.name());
- revList.revisions(revisions).order(Order.TOPO);
-
- List<ObjectId> historyIds = new ArrayList<>();
- for (String commitHash: revList.call())
- historyIds.add(ObjectId.fromString(commitHash));
-
- revList = new RevListCommand(project.getGitDir());
- revList.order(null).firstParent(true);
-
- Set<ObjectId> firstParentIds = new HashSet<>();
- for (String commitHash: revList.call())
- firstParentIds.add(ObjectId.fromString(commitHash));
-
- /*
- * Instead of collecting information of master branch all at once, we identify some
- * intermediate commits and collect the information using these intermediate commits
- * multiple times for two reasons:
- * 1. Use less memory
- * 2. Commit Exodus transaction sooner so user can use auto-completion when search
- * commits even if collection is not done yet
- */
- List<ObjectId> intermediateIds = new ArrayList<>();
- int count = 0;
- for (ObjectId historyId: historyIds) {
- count++;
- /*
- * Only use intermediate commits that are part of first parent chain. This
- * makes sure that subsequent intermediate commits are always ancestor of
- * current intermediate commit (after reverse done below), to avoid
- * collecting some commits multiple times
- */
- if (count > COLLECT_BATCH_SIZE && firstParentIds.contains(historyId)) {
- intermediateIds.add(historyId);
- count = 0;
- }
- }
-
- Collections.reverse(intermediateIds);
- intermediateIds.add(commitId);
-
- historyIds = null;
- firstParentIds = null;
-
- for(ObjectId currentCommitId: intermediateIds) {
- env.executeInTransaction(new TransactionalExecutable() {
-
- @SuppressWarnings("unchecked")
- @Override
- public void execute(Transaction txn) {
- NextIndex nextIndex = new NextIndex();
- nextIndex.user = readInt(defaultStore, txn, NEXT_USER_INDEX_KEY, 0);
- nextIndex.path = readInt(defaultStore, txn, NEXT_PATH_INDEX_KEY, 0);
-
- Map<Long, Integer> editsCache = new HashMap<>();
-
- Set<NameAndEmail> users;
- byte[] userBytes = readBytes(defaultStore, txn, USERS_KEY);
- if (userBytes != null)
- users = (Set<NameAndEmail>) SerializationUtils.deserialize(userBytes);
- else
- users = new HashSet<>();
-
- Map<String, Long> files;
- byte[] fileBytes = readBytes(defaultStore, txn, FILES_KEY);
- if (fileBytes != null)
- files = (Map<String, Long>) SerializationUtils.deserialize(fileBytes);
- else
- files = new HashMap<>();
-
- Map<Integer, Map<String, Integer>> lineStats;
- byte[] bytesOfLineStats = readBytes(defaultStore, txn, LINE_STATS_KEY);
- if (bytesOfLineStats != null) {
- lineStats = (Map<Integer, Map<String, Integer>>) SerializationUtils.deserialize(
- bytesOfLineStats);
- } else {
- lineStats = new HashMap<>();
- }
-
- Map<Integer, Map<Integer, Contribution>> dailyContributionsCache = new HashMap<>();
- Map<Integer, Contribution> overallContributions =
- deserializeContributions(readBytes(defaultStore, txn, OVERALL_CONTRIBUTIONS_KEY));
-
- /*
- * Use a synchronous queue to achieve below purpose:
- * 1. Add commit to Xodus transactional store in the same thread opening the transaction
- * as this is required by Xodus
- * 2. Do not pile up commits to use minimal memory
- */
- SynchronousQueue<Optional<GitCommit>> queue = new SynchronousQueue<>();
- AtomicReference<Exception> logException = new AtomicReference<>(null);
-
- List<String> revisions = new ArrayList<>();
- revisions.add(currentCommitId.name());
-
- ObjectId lastCommitId;
- byte[] lastCommitBytes = readBytes(defaultStore, txn, LAST_COMMIT_OF_DEFAULT_BRANCH_KEY);
- if (lastCommitBytes != null)
- lastCommitId = ObjectId.fromRaw(lastCommitBytes);
- else
- lastCommitId = null;
- if (lastCommitId != null && repository.hasObject(lastCommitId))
- revisions.add("^" + lastCommitId.name());
-
- LogCommand log = new LogCommand(project.getGitDir()) {
-
- @Override
- protected void consume(GitCommit commit) {
- try {
- queue.put(Optional.of(commit));
- } catch (InterruptedException e) {
- }
- }
-
- }.revisions(revisions);
-
- executorService.execute(new Runnable() {
-
- @Override
- public void run() {
- try {
- log.call();
- } catch (Exception e) {
- logException.set(e);
- } finally {
- try {
- queue.put(Optional.empty());
- } catch (InterruptedException e) {
- }
- }
- }
-
- });
-
- try {
- Optional<GitCommit> logCommitOptional = queue.take();
- while (logCommitOptional.isPresent()) {
- GitCommit logCommit = logCommitOptional.get();
-
- if (logCommit.getCommitDate() != null) {
- for (String file: logCommit.getChangedFiles())
- files.put(file, logCommit.getCommitDate().getTime());
- }
-
- if (logCommit.getCommitter() != null)
- users.add(new NameAndEmail(logCommit.getCommitter()));
-
- if (logCommit.getAuthor() != null) {
- NameAndEmail nameAndEmail = new NameAndEmail(logCommit.getAuthor());
- users.add(nameAndEmail);
-
- String emailAddress = logCommit.getAuthor().getEmailAddress();
- if (StringUtils.isNotBlank(emailAddress)) {
- ByteIterable emailKey = new StringByteIterable(emailAddress);
- int userIndex = readInt(emailToIndexStore, txn, emailKey, -1);
- if (userIndex == -1) {
- userIndex = nextIndex.user++;
- writeInt(emailToIndexStore, txn, emailKey, userIndex);
- indexToUserStore.put(txn,
- new IntByteIterable(userIndex),
- new ArrayByteIterable(SerializationUtils.serialize(nameAndEmail)));
- }
-
- if (logCommit.getCommitDate() != null && logCommit.getParentHashes().size() <= 1) {
- int dayValue = new Day(logCommit.getCommitDate()).getValue();
- Map<Integer, Contribution> contributionsOnDay =
- dailyContributionsCache.get(dayValue);
- if (contributionsOnDay == null) {
- contributionsOnDay = deserializeContributions(readBytes(
- dailyContributionsStore, txn, new IntByteIterable(dayValue)));
- dailyContributionsCache.put(dayValue, contributionsOnDay);
- }
- updateContribution(contributionsOnDay, userIndex, logCommit);
- }
-
- for (FileChange change: logCommit.getFileChanges()) {
- String path = change.getPath();
- int pathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
- nextIndex, path);
- int edits = change.getAdditions() + change.getDeletions();
- if (edits < 0)
- edits = 100;
- updateEdits(editsStore, txn, editsCache, userIndex, pathIndex, edits);
- while (path.contains("/")) {
- path = StringUtils.substringBeforeLast(path, "/");
- pathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
- nextIndex, path);
- updateEdits(editsStore, txn, editsCache, userIndex, pathIndex, edits);
- }
- pathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
- nextIndex, "");
- updateEdits(editsStore, txn, editsCache, userIndex, pathIndex, edits);
- }
- }
- }
-
- if (logCommit.getCommitDate() != null && logCommit.getParentHashes().size() <= 1) {
- int dayValue = new Day(logCommit.getCommitDate()).getValue();
- updateContribution(overallContributions, dayValue, logCommit);
- }
-
- for (FileChange change: logCommit.getFileChanges()) {
- if (change.getOldPath() != null) {
- int pathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
- nextIndex, change.getPath());
- ByteIterable pathKey = new IntByteIterable(pathIndex);
- Set<Integer> historyPathIndexes = new HashSet<>();
- byte[] bytesOfHistoryPaths = readBytes(historyPathsStore, txn, pathKey);
- if (bytesOfHistoryPaths == null) {
- bytesOfHistoryPaths = new byte[0];
- int pos = 0;
- for (int i=0; i<bytesOfHistoryPaths.length/Integer.SIZE; i++) {
- historyPathIndexes.add(ByteBuffer.wrap(bytesOfHistoryPaths, pos, Integer.SIZE).getInt());
- pos += Integer.SIZE;
- }
- } else {
- historyPathIndexes = new HashSet<>();
- }
- if (historyPathIndexes.size() < MAX_HISTORY_PATHS) {
- int oldPathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
- nextIndex, change.getOldPath());
- if (!historyPathIndexes.contains(oldPathIndex)) {
- historyPathIndexes.add(oldPathIndex);
- byte[] newBytesOfHistoryPaths =
- new byte[bytesOfHistoryPaths.length+Integer.SIZE];
- System.arraycopy(bytesOfHistoryPaths, 0,
- newBytesOfHistoryPaths, 0, bytesOfHistoryPaths.length);
- ByteBuffer buffer = ByteBuffer.wrap(newBytesOfHistoryPaths,
- bytesOfHistoryPaths.length, Integer.BYTES);
- buffer.putInt(oldPathIndex);
- historyPathsStore.put(txn, pathKey,
- new ArrayByteIterable(newBytesOfHistoryPaths));
- }
- }
- }
- }
-
- if (logCommit.getCommitDate() != null && logCommit.getParentHashes().size() <= 1) {
- int day = new Day(logCommit.getCommitDate()).getValue();
-
- Map<String, Integer> lineStatsOnDay = lineStats.get(day);
- if (lineStatsOnDay == null) {
- lineStatsOnDay = new HashMap<>();
- lineStats.put(day, lineStatsOnDay);
- }
-
- Map<String, Integer> languageLines = new HashMap<>();
- for (FileChange change: logCommit.getFileChanges()) {
- int lines = change.getAdditions() - change.getDeletions();
- int lastIndexOfDot = change.getPath().lastIndexOf('.');
- if (lastIndexOfDot != -1 && lines != 0) {
- String fileExt = change.getPath().substring(lastIndexOfDot+1).toLowerCase();
- String language = PROGRAMMING_LANGUAGES.get(fileExt);
- if (language != null) {
- Integer accumulatedLines = languageLines.get(language);
- if (accumulatedLines != null)
- lines += accumulatedLines;
- languageLines.put(language, lines);
- }
- }
- }
-
- for (Map.Entry<String, Integer> entry: languageLines.entrySet()) {
- String language = entry.getKey();
- Integer lines = entry.getValue();
- Integer accumulatedLines = lineStatsOnDay.get(language);
- if (accumulatedLines != null)
- lines += accumulatedLines;
- lineStatsOnDay.put(language, lines);
- }
-
- }
-
- logCommitOptional = queue.take();
- }
- if (logException.get() != null)
- throw logException.get();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
-
- for (Map.Entry<Integer, Map<Integer, Contribution>> entry: dailyContributionsCache.entrySet()) {
- byte[] bytesOfContributionsOnDay = serializeContributions(entry.getValue());
- dailyContributionsStore.put(txn, new IntByteIterable(entry.getKey()),
- new ArrayByteIterable(bytesOfContributionsOnDay));
- }
- defaultStore.put(txn, OVERALL_CONTRIBUTIONS_KEY,
- new ArrayByteIterable(serializeContributions(overallContributions)));
-
- bytesOfLineStats = SerializationUtils.serialize((Serializable) lineStats);
- defaultStore.put(txn, LINE_STATS_KEY, new ArrayByteIterable(bytesOfLineStats));
-
- writeInt(defaultStore, txn, NEXT_USER_INDEX_KEY, nextIndex.user);
- writeInt(defaultStore, txn, NEXT_PATH_INDEX_KEY, nextIndex.path);
-
- userBytes = SerializationUtils.serialize((Serializable) users);
- defaultStore.put(txn, USERS_KEY, new ArrayByteIterable(userBytes));
- usersCache.remove(project.getId());
-
- if (files.size() > MAX_COLLECTING_FILES) {
- List<String> fileList = new ArrayList<>(files.keySet());
- fileList.sort((file1, file2)->files.get(file1).compareTo(files.get(file2)));
- for (int i=0; i<fileList.size() - MAX_COLLECTING_FILES; i++)
- files.remove(fileList.get(i));
- }
- fileBytes = SerializationUtils.serialize((Serializable) files);
- defaultStore.put(txn, FILES_KEY, new ArrayByteIterable(fileBytes));
- filesCache.remove(project.getId());
-
- for (Map.Entry<Long, Integer> entry: editsCache.entrySet())
- writeInt(editsStore, txn, new LongByteIterable(entry.getKey()), entry.getValue());
-
- defaultStore.put(txn, LAST_COMMIT_OF_DEFAULT_BRANCH_KEY, new CommitByteIterable(currentCommitId));
- }
- });
- }
- }
- }
- }
-
- private void updateContribution(Map<Integer, Contribution> contributions, int key, GitCommit commit) {
- Contribution contribution = contributions.get(key);
- if (contribution != null) {
- contribution = new Contribution(
- contribution.getCommits()+1,
- contribution.getAdditions()+commit.getAdditions(),
- contribution.getDeletions()+commit.getDeletions());
- } else {
- contribution = new Contribution(1, commit.getAdditions(), commit.getDeletions());
- }
- contributions.put(key, contribution);
- }
-
- private int getPathIndex(Store pathToIndexStore, Store indexToPathStore, Transaction txn,
- NextIndex nextIndex, String path) {
- StringByteIterable pathKey = new StringByteIterable(path);
- int pathIndex = readInt(pathToIndexStore, txn, pathKey, -1);
- if (pathIndex == -1) {
- pathIndex = nextIndex.path++;
- writeInt(pathToIndexStore, txn, pathKey, pathIndex);
- indexToPathStore.put(txn, new IntByteIterable(pathIndex), new StringByteIterable(path));
- }
- return pathIndex;
- }
-
- private void updateEdits(Store store, Transaction txn,
- Map<Long, Integer> editsCache, int userIndex, int pathIndex, int edits) {
- long editsKey = (userIndex<<32)|pathIndex;
-
- Integer editsOfPathByUser = editsCache.get(editsKey);
- if (editsOfPathByUser == null)
- editsOfPathByUser = readInt(store, txn, new LongByteIterable(editsKey), 0);
- editsOfPathByUser += edits;
- editsCache.put(editsKey, editsOfPathByUser);
- }
-
- @Override
- public List<NameAndEmail> getUsers(Project project) {
- List<NameAndEmail> users = usersCache.get(project.getId());
- if (users == null) {
- Environment env = getEnv(project.getId().toString());
- Store store = getStore(env, DEFAULT_STORE);
-
- users = env.computeInReadonlyTransaction(new TransactionalComputable<List<NameAndEmail>>() {
-
- @SuppressWarnings("unchecked")
- @Override
- public List<NameAndEmail> compute(Transaction txn) {
- byte[] bytes = readBytes(store, txn, USERS_KEY);
- if (bytes != null) {
- List<NameAndEmail> users =
- new ArrayList<>((Set<NameAndEmail>) SerializationUtils.deserialize(bytes));
- Collections.sort(users);
- return users;
- } else {
- return new ArrayList<>();
- }
- }
-
- });
- usersCache.put(project.getId(), users);
- }
- return users;
- }
-
- @Override
- public List<String> getFiles(Project project) {
- List<String> files = filesCache.get(project.getId());
- if (files == null) {
- Environment env = getEnv(project.getId().toString());
- final Store store = getStore(env, DEFAULT_STORE);
-
- files = env.computeInReadonlyTransaction(new TransactionalComputable<List<String>>() {
-
- @SuppressWarnings("unchecked")
- @Override
- public List<String> compute(Transaction txn) {
- byte[] bytes = readBytes(store, txn, FILES_KEY);
- if (bytes != null) {
- List<String> files = new ArrayList<>(
- ((Map<String, Long>)SerializationUtils.deserialize(bytes)).keySet());
- Map<String, List<String>> segmentsMap = new HashMap<>();
- Splitter splitter = Splitter.on("/");
- for (String file: files) {
- segmentsMap.put(file, splitter.splitToList(file));
- }
- files.sort(new Comparator<String>() {
-
- @Override
- public int compare(String o1, String o2) {
- return PathUtils.compare(segmentsMap.get(o1), segmentsMap.get(o2));
- }
-
- });
- return files;
- } else {
- return new ArrayList<>();
- }
- }
- });
- filesCache.put(project.getId(), files);
- }
- return files;
- }
-
- @Override
- public Map<Day, Map<String, Integer>> getLineIncrements(Project project) {
- Environment env = getEnv(project.getId().toString());
- Store store = getStore(env, DEFAULT_STORE);
-
- return env.computeInReadonlyTransaction(new TransactionalComputable<Map<Day, Map<String, Integer>>>() {
-
- @Override
- public Map<Day, Map<String, Integer>> compute(Transaction txn) {
- Map<Day, Map<String, Integer>> lineIncrements = new HashMap<>();
- byte[] bytes = readBytes(store, txn, LINE_STATS_KEY);
- if (bytes != null) {
- @SuppressWarnings("unchecked")
- Map<Integer, Map<String, Integer>> storedMap =
- (Map<Integer, Map<String, Integer>>) SerializationUtils.deserialize(bytes);
- for (Map.Entry<Integer, Map<String, Integer>> entry: storedMap.entrySet())
- lineIncrements.put(new Day(entry.getKey()), entry.getValue());
- }
- return lineIncrements;
- }
-
- });
- }
-
- @Override
- public int getEdits(ProjectFacade project, UserFacade user, String path) {
- if (user.getEmail() != null) {
- Environment env = getEnv(project.getId().toString());
- Store emailToIndexStore = getStore(env, EMAIL_TO_INDEX_STORE);
- Store pathToIndexStore = getStore(env, PATH_TO_INDEX_STORE);
- Store editsStore = getStore(env, EDITS_STORE);
- return env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {
-
- @Override
- public Integer compute(Transaction txn) {
- int userIndex = readInt(emailToIndexStore, txn, new StringByteIterable(user.getEmail()), -1);
- if (userIndex != -1) {
- int pathIndex = readInt(pathToIndexStore, txn, new StringByteIterable(path), -1);
- if (pathIndex != -1) {
- long editsKey = (userIndex<<32)|pathIndex;
- return readInt(editsStore, txn, new LongByteIterable(editsKey), 0);
- }
- }
- return 0;
- }
- });
- } else {
- return 0;
- }
- }
-
- @Override
- public Collection<ObjectId> getDescendants(Project project, Collection<ObjectId> ancestors) {
- Environment env = getEnv(project.getId().toString());
- final Store store = getStore(env, COMMITS_STORE);
-
- return env.computeInReadonlyTransaction(new TransactionalComputable<Set<ObjectId>>() {
-
- @Override
- public Set<ObjectId> compute(Transaction txn) {
- Set<ObjectId> descendants = new HashSet<>();
-
- // Use stack instead of recursion to avoid StackOverflowException
- Stack<ObjectId> stack = new Stack<>();
- descendants.addAll(ancestors);
- stack.addAll(ancestors);
- while (!stack.isEmpty()) {
- ObjectId current = stack.pop();
- byte[] valueBytes = readBytes(store, txn, new CommitByteIterable(current));
- if (valueBytes != null) {
- if (valueBytes.length % 20 == 0) {
- for (int i=0; i<valueBytes.length/20; i++) {
- ObjectId child = ObjectId.fromRaw(valueBytes, i*20);
- if (!descendants.contains(child)) {
- descendants.add(child);
- stack.push(child);
- }
- }
- } else {
- for (int i=0; i<(valueBytes.length-1)/20; i++) {
- ObjectId child = ObjectId.fromRaw(valueBytes, i*20+1);
- if (!descendants.contains(child)) {
- descendants.add(child);
- stack.push(child);
- }
- }
- }
- }
- }
-
- return descendants;
- }
-
- });
- }
-
- @Listen
- public void on(EntityRemoved event) {
- if (event.getEntity() instanceof Project) {
- Long projectId = event.getEntity().getId();
- removeEnv(projectId.toString());
- filesCache.remove(projectId);
- commitCountCache.remove(projectId);
- usersCache.remove(projectId);
- }
- }
-
- private BatchWorker getBatchWorker(Long projectId) {
- return new BatchWorker("project-" + projectId + "-collectCommitInfo") {
-
- @Override
- public void doWorks(Collection<Prioritized> works) {
- sessionManager.run(new Runnable() {
-
- @Override
- public void run() {
- Project project = projectManager.load(projectId);
- List<CollectingWork> collectingWorks = new ArrayList<>();
- for (Object work: works)
- collectingWorks.add((CollectingWork)work);
- Collections.sort(collectingWorks, new CommitTimeComparator());
-
- for (CollectingWork work: collectingWorks) {
- logger.debug("Collecting commit information up to ref '{}' in project '{}'...",
- work.getRefName(), project.getName());
- doCollect(project, work.getCommit().copy(), work.getRefName());
- }
- }
-
- });
- }
-
- };
- }
-
- private void collect(Project project) {
- List<CollectingWork> works = new ArrayList<>();
- try (RevWalk revWalk = new RevWalk(project.getRepository())) {
- Collection<Ref> refs = new ArrayList<>();
- refs.addAll(project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS));
- refs.addAll(project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_TAGS));
-
- for (Ref ref: refs) {
- RevObject revObj = revWalk.peel(revWalk.parseAny(ref.getObjectId()));
- if (revObj instanceof RevCommit)
- works.add(new CollectingWork(PRIORITY, (RevCommit) revObj, ref.getName()));
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- Collections.sort(works, new CommitTimeComparator());
-
- for (CollectingWork work: works)
- batchWorkManager.submit(getBatchWorker(project.getId()), work);
- }
-
- @Sessional
- @Listen
- public void on(SystemStarted event) {
- for (Project project: projectManager.query()) {
- checkVersion(project.getId().toString());
- collect(project);
- }
- }
-
- @Sessional
- @Listen
- public void on(RefUpdated event) {
- if (!event.getNewCommitId().equals(ObjectId.zeroId())
- && (event.getRefName().startsWith(Constants.R_HEADS)
- || event.getRefName().startsWith(Constants.R_TAGS))) {
- try (RevWalk revWalk = new RevWalk(event.getProject().getRepository())) {
- RevCommit commit = GitUtils.parseCommit(revWalk, event.getNewCommitId());
- if (commit != null) {
- CollectingWork work = new CollectingWork(PRIORITY, commit, event.getRefName());
- batchWorkManager.submit(getBatchWorker(event.getProject().getId()), work);
- }
- }
- }
- }
-
- @Sessional
- @Override
- public int getCommitCount(Project project) {
- Integer commitCount = commitCountCache.get(project.getId());
- if (commitCount == null) {
- Environment env = getEnv(project.getId().toString());
- Store store = getStore(env, DEFAULT_STORE);
-
- commitCount = env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {
-
- @Override
- public Integer compute(Transaction txn) {
- return readInt(store, txn, COMMIT_COUNT_KEY, 0);
- }
- });
- commitCountCache.put(project.getId(), commitCount);
- }
- return commitCount;
- }
-
- static class CollectingWork extends Prioritized {
-
- private final String refName;
-
- private final RevCommit commit;
-
- public CollectingWork(int priority, RevCommit commit, String refName) {
- super(priority);
- this.commit = commit;
- this.refName = refName;
- }
-
- public RevCommit getCommit() {
- return commit;
- }
-
- public String getRefName() {
- return refName;
- }
-
- }
-
- static class CommitTimeComparator implements Comparator<CollectingWork> {
-
- @Override
- public int compare(CollectingWork o1, CollectingWork o2) {
- return o1.getCommit().getCommitTime() - o2.getCommit().getCommitTime();
- }
-
- }
-
- @Sessional
- @Override
- public void cloneInfo(Project source, Project target) {
- BackupStrategy backupStrategy = getEnv(source.getId().toString()).getBackupStrategy();
- try {
- File targetDir = getEnvDir(target.getId().toString());
- backupStrategy.beforeBackup();
- try {
- for (VirtualFileDescriptor descriptor: backupStrategy.getContents()) {
- FileUtils.copyFileToDirectory(((FileDescriptor)descriptor).getFile(), targetDir);
- }
- } finally {
- backupStrategy.afterBackup();
- }
- writeVersion(target.getId().toString());
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- protected File getEnvDir(String envKey) {
- File infoDir = new File(storageManager.getProjectInfoDir(Long.valueOf(envKey)), INFO_DIR);
- if (!infoDir.exists())
- FileUtils.createDir(infoDir);
- return infoDir;
- }
-
- @Sessional
- @Override
- public Collection<String> getHistoryPaths(Project project, String path) {
- Environment env = getEnv(project.getId().toString());
- Store historyPathsStore = getStore(env, HISTORY_PATHS_STORE);
- Store pathToIndexStore = getStore(env, PATH_TO_INDEX_STORE);
- Store indexToPathStore = getStore(env, INDEX_TO_PATH_STORE);
-
- return env.computeInReadonlyTransaction(new TransactionalComputable<Collection<String>>() {
-
- private Collection<String> getPaths(Transaction txn, Set<Integer> pathIndexes) {
- Set<String> paths = new HashSet<>();
- for (int pathIndex: pathIndexes) {
- byte[] pathBytes = readBytes(indexToPathStore, txn, new IntByteIterable(pathIndex));
- if (pathBytes != null)
- paths.add(new String(pathBytes, Charsets.UTF_8));
- }
- return paths;
- }
-
- @Override
- public Collection<String> compute(Transaction txn) {
- int pathIndex = readInt(pathToIndexStore, txn, new StringByteIterable(path), -1);
- if (pathIndex != -1) {
- Set<Integer> pathIndexes = new HashSet<>();
- pathIndexes.add(pathIndex);
- while (true) {
- Set<Integer> newPathIndexes = new HashSet<>(pathIndexes);
- for (int eachPathIndex: pathIndexes) {
- byte[] bytesOfHistoryPaths =
- readBytes(historyPathsStore, txn, new IntByteIterable(eachPathIndex));
- if (bytesOfHistoryPaths != null) {
- int pos = 0;
- for (int i=0; i<bytesOfHistoryPaths.length/Integer.BYTES; i++) {
- newPathIndexes.add(ByteBuffer.wrap(bytesOfHistoryPaths, pos, Integer.BYTES).getInt());
- if (newPathIndexes.size() == MAX_HISTORY_PATHS)
- return getPaths(txn, newPathIndexes);
- pos += Integer.BYTES;
- }
- }
- }
- if (pathIndexes.equals(newPathIndexes))
- break;
- else
- pathIndexes = newPathIndexes;
- }
- return getPaths(txn, pathIndexes);
- } else {
- return new HashSet<>();
- }
- }
- });
- }
-
- @Sessional
- @Override
- public Map<Day, Contribution> getOverallContributions(Project project) {
- Environment env = getEnv(project.getId().toString());
- Store store = getStore(env, DEFAULT_STORE);
-
- return env.computeInReadonlyTransaction(new TransactionalComputable<Map<Day, Contribution>>() {
-
- @Override
- public Map<Day, Contribution> compute(Transaction txn) {
- Map<Day, Contribution> overallContributions = new HashMap<>();
- for (Map.Entry<Integer, Contribution> entry:
- deserializeContributions(readBytes(store, txn, OVERALL_CONTRIBUTIONS_KEY)).entrySet()) {
- overallContributions.put(new Day(entry.getKey()), entry.getValue());
- }
- return overallContributions;
- }
-
- });
- }
-
- @Sessional
- @Override
- public List<Contributor> getTopContributors(Project project, int top, Contribution.Type type,
- Day fromDay, Day toDay) {
- Environment env = getEnv(project.getId().toString());
- Store defaultStore = getStore(env, DEFAULT_STORE);
- Store indexToUserStore = getStore(env, INDEX_TO_USER_STORE);
- Store dailyContributionsStore = getStore(env, DAILY_CONTRIBUTIONS_STORE);
-
- return env.computeInReadonlyTransaction(new TransactionalComputable<List<Contributor>>() {
-
- @Override
- public List<Contributor> compute(Transaction txn) {
- Map<Integer, Contribution> overallContributions =
- deserializeContributions(readBytes(defaultStore, txn, OVERALL_CONTRIBUTIONS_KEY));
- Map<Integer, Contribution> totalContributions = new HashMap<>();
- for (int dayValue: overallContributions.keySet()) {
- if (dayValue >= fromDay.getValue() && dayValue <= toDay.getValue()) {
- ByteIterable dayKey = new IntByteIterable(dayValue);
- Map<Integer, Contribution> contributionsOnDay =
- deserializeContributions(readBytes(dailyContributionsStore, txn, dayKey));
- for (Map.Entry<Integer, Contribution> entry: contributionsOnDay.entrySet()) {
- Integer userIndex = entry.getKey();
- Contribution totalContribution = totalContributions.get(userIndex);
- if (totalContribution == null) {
- totalContribution = entry.getValue();
- } else {
- totalContribution = new Contribution(
- totalContribution.getCommits() + entry.getValue().getCommits(),
- totalContribution.getAdditions() + entry.getValue().getAdditions(),
- totalContribution.getDeletions() + entry.getValue().getDeletions());
- }
- totalContributions.put(userIndex, totalContribution);
- }
- }
- }
-
- List<Integer> topUserIndexes = new ArrayList<>(totalContributions.keySet());
- Collections.sort(topUserIndexes, new Comparator<Integer>() {
-
- @Override
- public int compare(Integer o1, Integer o2) {
- if (type == Contribution.Type.COMMITS)
- return totalContributions.get(o2).getCommits() - totalContributions.get(o1).getCommits();
- else if (type == Contribution.Type.ADDITIONS)
- return totalContributions.get(o2).getAdditions() - totalContributions.get(o1).getAdditions();
- else
- return totalContributions.get(o2).getDeletions() - totalContributions.get(o1).getDeletions();
- }
-
- });
-
- if (top < topUserIndexes.size())
- topUserIndexes = topUserIndexes.subList(0, top);
-
- Set<Integer> topUserIndexSet = new HashSet<>(topUserIndexes);
-
- Map<Integer, Map<Day, Integer>> userContributions = new HashMap<>();
-
- for (int dayValue: overallContributions.keySet()) {
- if (dayValue >= fromDay.getValue() && dayValue <= toDay.getValue()) {
- ByteIterable dayKey = new IntByteIterable(dayValue);
- Map<Integer, Contribution> contributionsOnDay =
- deserializeContributions(readBytes(dailyContributionsStore, txn, dayKey));
- Day day = new Day(dayValue);
- for (Map.Entry<Integer, Contribution> entry: contributionsOnDay.entrySet()) {
- Integer userIndex = entry.getKey();
- if (topUserIndexSet.contains(userIndex)) {
- Map<Day, Integer> contributionsByUser = userContributions.get(userIndex);
- if (contributionsByUser == null) {
- contributionsByUser = new HashMap<>();
- userContributions.put(userIndex, contributionsByUser);
- }
- if (type == Contribution.Type.COMMITS)
- contributionsByUser.put(day, entry.getValue().getCommits());
- else if (type == Contribution.Type.ADDITIONS)
- contributionsByUser.put(day, entry.getValue().getAdditions());
- else
- contributionsByUser.put(day, entry.getValue().getDeletions());
- }
- }
- }
- }
-
- List<Contributor> contributors = new ArrayList<>();
-
- for (int userIndex: topUserIndexes) {
- byte[] userBytes = readBytes(indexToUserStore, txn, new IntByteIterable(userIndex));
- Map<Day, Integer> contributionsByUser = userContributions.get(userIndex);
- if (userBytes != null && contributionsByUser != null) {
- PersonIdent user = ((NameAndEmail)SerializationUtils.deserialize(userBytes)).asPersonIdent();
- contributors.add(new Contributor(user, totalContributions.get(userIndex), contributionsByUser));
- }
- }
-
- return contributors;
- }
-
- });
- }
-
- private Map<Integer, Contribution> deserializeContributions(byte[] bytes) {
- if (bytes != null) {
- Map<Integer, Contribution> contributions = new HashMap<>();
- int pos = 0;
- for (int i=0; i<bytes.length/4/Integer.BYTES; i++) {
- int key = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();
- pos += Integer.BYTES;
- int commits = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();
- pos += Integer.BYTES;
- int additions = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();
- pos += Integer.BYTES;
- int deletions = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();
- pos += Integer.BYTES;
- contributions.put(key, new Contribution(commits, additions, deletions));
- }
- return contributions;
- } else {
- return new HashMap<>();
- }
- }
-
- private byte[] serializeContributions(Map<Integer, Contribution> contributions) {
- byte[] bytes = new byte[contributions.size()*Integer.BYTES*4];
- int pos = 0;
- for (Map.Entry<Integer, Contribution> entry: contributions.entrySet()) {
- byte[] keyBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getKey()).array();
- System.arraycopy(keyBytes, 0, bytes, pos, Integer.BYTES);
- pos += Integer.BYTES;
- byte[] commitsBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getValue().getCommits()).array();
- System.arraycopy(commitsBytes, 0, bytes, pos, Integer.BYTES);
- pos += Integer.BYTES;
- byte[] additionsBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getValue().getAdditions()).array();
- System.arraycopy(additionsBytes, 0, bytes, pos, Integer.BYTES);
- pos += Integer.BYTES;
- byte[] deletionsBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getValue().getDeletions()).array();
- System.arraycopy(deletionsBytes, 0, bytes, pos, Integer.BYTES);
- pos += Integer.BYTES;
- }
- return bytes;
- }
-
- @Override
- protected long getLogFileSize() {
- return LOG_FILE_SIZE;
- }
-
- @Override
- protected int getEnvVersion() {
- return INFO_VERSION;
- }
-
- private static class NextIndex {
- int user;
-
- int path;
- }
-
- @Override
- public Collection<ObjectId> getFixCommits(Project project, Long issueNumber) {
- Environment env = getEnv(project.getId().toString());
- Store store = getStore(env, FIX_COMMITS_STORE);
-
- return env.computeInTransaction(new TransactionalComputable<Collection<ObjectId>>() {
-
- @Override
- public Collection<ObjectId> compute(Transaction txn) {
- return readCommits(store, txn, new LongByteIterable(issueNumber));
- }
-
- });
-
- }
-
-}
+package io.onedev.server.cache;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.SerializationUtils;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.Ref;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Splitter;
+
+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.FileUtils;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.concurrent.Prioritized;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.issue.IssueCommitted;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.git.Contribution;
+import io.onedev.server.git.Contributor;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.NameAndEmail;
+import io.onedev.server.git.command.FileChange;
+import io.onedev.server.git.command.GitCommit;
+import io.onedev.server.git.command.LogCommand;
+import io.onedev.server.git.command.RevListCommand;
+import io.onedev.server.git.command.RevListCommand.Order;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.Day;
+import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.work.BatchWorkManager;
+import io.onedev.server.util.work.BatchWorker;
+import jetbrains.exodus.ArrayByteIterable;
+import jetbrains.exodus.ByteIterable;
+import jetbrains.exodus.backup.BackupStrategy;
+import jetbrains.exodus.backup.BackupStrategy.FileDescriptor;
+import jetbrains.exodus.backup.VirtualFileDescriptor;
+import jetbrains.exodus.env.Environment;
+import jetbrains.exodus.env.Store;
+import jetbrains.exodus.env.Transaction;
+import jetbrains.exodus.env.TransactionalComputable;
+import jetbrains.exodus.env.TransactionalExecutable;
+
+@Singleton
+public class DefaultCommitInfoManager extends AbstractEnvironmentManager implements CommitInfoManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class);
+
+ private static final int INFO_VERSION = 7;
+
+ private static final long LOG_FILE_SIZE = 256*1024;
+
+ private static final int COLLECT_BATCH_SIZE = 10000;
+
+ private static final int MAX_COLLECTING_FILES = 50000;
+
+ private static final int MAX_HISTORY_PATHS = 100;
+
+ private static final String INFO_DIR = "commit";
+
+ private static final String DEFAULT_STORE = "default";
+
+ private static final String COMMITS_STORE = "commits";
+
+ private static final String FIX_COMMITS_STORE = "fixCommits";
+
+ private static final String EDITS_STORE = "edits";
+
+ private static final String HISTORY_PATHS_STORE = "historyPaths";
+
+ private static final String PATH_TO_INDEX_STORE = "pathToIndex";
+
+ private static final String INDEX_TO_PATH_STORE = "indexToPath";
+
+ private static final String EMAIL_TO_INDEX_STORE = "emailToIndex";
+
+ private static final String INDEX_TO_USER_STORE = "indexToUser";
+
+ private static final String DAILY_CONTRIBUTIONS_STORE = "dailyContributions";
+
+ private static final ByteIterable NEXT_PATH_INDEX_KEY = new StringByteIterable("nextPathIndex");
+
+ private static final ByteIterable NEXT_USER_INDEX_KEY = new StringByteIterable("nextUserIndex");
+
+ private static final ByteIterable LAST_COMMIT_KEY = new StringByteIterable("lastCommit");
+
+ private static final ByteIterable LAST_COMMIT_OF_DEFAULT_BRANCH_KEY = new StringByteIterable("lastCommitOfDefaultBranch");
+
+ private static final ByteIterable LINE_STATS_KEY = new StringByteIterable("lineStats");
+
+ private static final ByteIterable USERS_KEY = new StringByteIterable("users");
+
+ private static final ByteIterable FILES_KEY = new StringByteIterable("files");
+
+ private static final ByteIterable OVERALL_CONTRIBUTIONS_KEY = new StringByteIterable("overallContributions");
+
+ private static final ByteIterable COMMIT_COUNT_KEY = new StringByteIterable("commitCount");
+
+ private static final int PRIORITY = 100;
+
+ private static final Map<String, String> PROGRAMMING_LANGUAGES = new HashMap<>();
+
+ static {
+ PROGRAMMING_LANGUAGES.put("java", "Java");
+
+ PROGRAMMING_LANGUAGES.put("h", "C");
+ PROGRAMMING_LANGUAGES.put("c", "C");
+
+ PROGRAMMING_LANGUAGES.put("h++", "C++");
+ PROGRAMMING_LANGUAGES.put("c++", "C++");
+ PROGRAMMING_LANGUAGES.put("hpp", "C++");
+ PROGRAMMING_LANGUAGES.put("cpp", "C++");
+ PROGRAMMING_LANGUAGES.put("hxx", "C++");
+ PROGRAMMING_LANGUAGES.put("cxx", "C++");
+ PROGRAMMING_LANGUAGES.put("hh", "C++");
+ PROGRAMMING_LANGUAGES.put("cc", "C++");
+
+ PROGRAMMING_LANGUAGES.put("cob", "Cobol");
+ PROGRAMMING_LANGUAGES.put("cpy", "Cobol");
+
+ PROGRAMMING_LANGUAGES.put("cs", "CSharp");
+
+ PROGRAMMING_LANGUAGES.put("clj", "Clojure");
+ PROGRAMMING_LANGUAGES.put("cljc", "Clojure");
+ PROGRAMMING_LANGUAGES.put("cljx", "Clojure");
+ PROGRAMMING_LANGUAGES.put("cljs", "ClojureScript");
+ PROGRAMMING_LANGUAGES.put("gss", "Closure Stylesheets");
+ PROGRAMMING_LANGUAGES.put("coffee", "CoffeeScript");
+
+ PROGRAMMING_LANGUAGES.put("cl", "Common Lisp");
+ PROGRAMMING_LANGUAGES.put("lisp", "Common Lisp");
+ PROGRAMMING_LANGUAGES.put("el", "Common Lisp");
+
+ PROGRAMMING_LANGUAGES.put("css", "CSS");
+ PROGRAMMING_LANGUAGES.put("d", "D");
+ PROGRAMMING_LANGUAGES.put("dart", "Dart");
+ PROGRAMMING_LANGUAGES.put("dtd", "DTD");
+
+ PROGRAMMING_LANGUAGES.put("erl", "Erlang");
+ PROGRAMMING_LANGUAGES.put("f", "Fortran");
+ PROGRAMMING_LANGUAGES.put("for", "Fortran");
+ PROGRAMMING_LANGUAGES.put("f77", "Fortran");
+ PROGRAMMING_LANGUAGES.put("f90", "Fortran");
+
+ PROGRAMMING_LANGUAGES.put("go", "Go");
+ PROGRAMMING_LANGUAGES.put("groovy", "Groovy");
+ PROGRAMMING_LANGUAGES.put("gradle", "Groovy");
+
+ PROGRAMMING_LANGUAGES.put("hs", "Haskell");
+ PROGRAMMING_LANGUAGES.put("aspx", "ASP.NET");
+ PROGRAMMING_LANGUAGES.put("html", "HTML");
+ PROGRAMMING_LANGUAGES.put("htm", "HTML");
+ PROGRAMMING_LANGUAGES.put("jsp", "Java Server Pages");
+ PROGRAMMING_LANGUAGES.put("js", "JavaScript");
+
+ PROGRAMMING_LANGUAGES.put("json", "JSON");
+ PROGRAMMING_LANGUAGES.put("jsx", "JSX");
+
+ PROGRAMMING_LANGUAGES.put("kt", "Kotlin");
+ PROGRAMMING_LANGUAGES.put("less", "LESS");
+ PROGRAMMING_LANGUAGES.put("lua", "Lua");
+ PROGRAMMING_LANGUAGES.put("md", "Markdown");
+ PROGRAMMING_LANGUAGES.put("mkd", "Markdown");
+ PROGRAMMING_LANGUAGES.put("m", "Objective-C");
+ PROGRAMMING_LANGUAGES.put("mm", "Objective-C");
+
+ PROGRAMMING_LANGUAGES.put("p", "Pascal");
+ PROGRAMMING_LANGUAGES.put("pas", "Pascal");
+ PROGRAMMING_LANGUAGES.put("pl", "Perl");
+ PROGRAMMING_LANGUAGES.put("pm", "Perl");
+
+ PROGRAMMING_LANGUAGES.put("php", "PHP");
+ PROGRAMMING_LANGUAGES.put("php3", "PHP");
+ PROGRAMMING_LANGUAGES.put("php4", "PHP");
+ PROGRAMMING_LANGUAGES.put("php5", "PHP");
+ PROGRAMMING_LANGUAGES.put("php7", "PHP");
+ PROGRAMMING_LANGUAGES.put("phtml", "PHP");
+
+ PROGRAMMING_LANGUAGES.put("sql", "SQL");
+ PROGRAMMING_LANGUAGES.put("ps1", "PowerShell");
+ PROGRAMMING_LANGUAGES.put("psd1", "PowerShell");
+ PROGRAMMING_LANGUAGES.put("psm1", "PowerShell");
+ PROGRAMMING_LANGUAGES.put("psm1", "PowerShell");
+
+ PROGRAMMING_LANGUAGES.put("properties", "Properties");
+ PROGRAMMING_LANGUAGES.put("ini", "INI");
+ PROGRAMMING_LANGUAGES.put("in", "INI");
+ PROGRAMMING_LANGUAGES.put("proto", "ProtoBuf");
+
+ PROGRAMMING_LANGUAGES.put("BUILD", "Python");
+ PROGRAMMING_LANGUAGES.put("py", "Python");
+ PROGRAMMING_LANGUAGES.put("pyw", "Python");
+ PROGRAMMING_LANGUAGES.put("bzl", "Python");
+
+ PROGRAMMING_LANGUAGES.put("pp", "Puppet");
+ PROGRAMMING_LANGUAGES.put("r", "R");
+ PROGRAMMING_LANGUAGES.put("R", "R");
+ PROGRAMMING_LANGUAGES.put("rb", "Ruby");
+ PROGRAMMING_LANGUAGES.put("rs", "Rust");
+
+ PROGRAMMING_LANGUAGES.put("sas", "SAS");
+ PROGRAMMING_LANGUAGES.put("sass", "Sass");
+ PROGRAMMING_LANGUAGES.put("scala", "Scala");
+ PROGRAMMING_LANGUAGES.put("scm", "Scheme");
+ PROGRAMMING_LANGUAGES.put("ss", "Scheme");
+ PROGRAMMING_LANGUAGES.put("scss", "Scss");
+
+ PROGRAMMING_LANGUAGES.put("sh", "Shell");
+ PROGRAMMING_LANGUAGES.put("ksh", "Shell");
+ PROGRAMMING_LANGUAGES.put("bash", "Shell");
+
+ PROGRAMMING_LANGUAGES.put("st", "SmallTalk");
+ PROGRAMMING_LANGUAGES.put("soy", "Soy");
+ PROGRAMMING_LANGUAGES.put("styl", "Stylus");
+ PROGRAMMING_LANGUAGES.put("swift", "Swift");
+
+ PROGRAMMING_LANGUAGES.put("tex", "LaTeX");
+ PROGRAMMING_LANGUAGES.put("tcl", "TCL");
+ PROGRAMMING_LANGUAGES.put("ts", "TypeScript");
+ PROGRAMMING_LANGUAGES.put("tsx", "TypeScript-JSX");
+ PROGRAMMING_LANGUAGES.put("vb", "VB.NET");
+ PROGRAMMING_LANGUAGES.put("vbs", "VBScript");
+
+ PROGRAMMING_LANGUAGES.put("vue", "Vue.js Component");
+ PROGRAMMING_LANGUAGES.put("xml", "XML");
+ PROGRAMMING_LANGUAGES.put("xsl", "XML");
+ PROGRAMMING_LANGUAGES.put("xsd", "XML");
+ PROGRAMMING_LANGUAGES.put("svg", "XML");
+ PROGRAMMING_LANGUAGES.put("yaml", "Yaml");
+ PROGRAMMING_LANGUAGES.put("yml", "Yaml");
+ }
+
+ private final StorageManager storageManager;
+
+ private final BatchWorkManager batchWorkManager;
+
+ private final ProjectManager projectManager;
+
+ private final SessionManager sessionManager;
+
+ private final ExecutorService executorService;
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final IssueManager issueManager;
+
+ private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();
+
+ private final Map<Long, Integer> commitCountCache = new ConcurrentHashMap<>();
+
+ private final Map<Long, List<NameAndEmail>> usersCache = new ConcurrentHashMap<>();
+
+ @Inject
+ public DefaultCommitInfoManager(ProjectManager projectManager, StorageManager storageManager,
+ BatchWorkManager batchWorkManager, SessionManager sessionManager, ExecutorService executorService,
+ ListenerRegistry listenerRegistry, IssueManager issueManager) {
+ this.projectManager = projectManager;
+ this.storageManager = storageManager;
+ this.batchWorkManager = batchWorkManager;
+ this.sessionManager = sessionManager;
+ this.executorService = executorService;
+ this.listenerRegistry = listenerRegistry;
+ this.issueManager = issueManager;
+ }
+
+ private boolean isCommitCollected(byte[] commitBytes) {
+ /*
+ * Collected commits stores an additional byte to differentiate from those not collected but with parent
+ * information stored
+ */
+ return commitBytes != null && commitBytes.length % 20 != 0;
+ }
+
+ private void doCollect(Project project, ObjectId commitId, String refName) {
+ Environment env = getEnv(project.getId().toString());
+ Store defaultStore = getStore(env, DEFAULT_STORE);
+ Store commitsStore = getStore(env, COMMITS_STORE);
+ Store editsStore = getStore(env, EDITS_STORE);
+ Store historyPathsStore = getStore(env, HISTORY_PATHS_STORE);
+ Store pathToIndexStore = getStore(env, PATH_TO_INDEX_STORE);
+ Store indexToPathStore = getStore(env, INDEX_TO_PATH_STORE);
+ Store emailToIndexStore = getStore(env, EMAIL_TO_INDEX_STORE);
+ Store indexToUserStore = getStore(env, INDEX_TO_USER_STORE);
+ Store dailyContributionsStore = getStore(env, DAILY_CONTRIBUTIONS_STORE);
+ Store fixCommitsStore = getStore(env, FIX_COMMITS_STORE);
+
+ Repository repository = project.getRepository();
+
+ Collection<Long> fixedIssueNumbers = new HashSet<>();
+
+ env.executeInTransaction(new TransactionalExecutable() {
+
+ @Override
+ public void execute(Transaction txn) {
+ ByteIterable commitKey = new CommitByteIterable(commitId);
+ byte[] commitBytes = readBytes(commitsStore, txn, commitKey);
+
+ if (!isCommitCollected(commitBytes)) {
+ int commitCount = readInt(defaultStore, txn, COMMIT_COUNT_KEY, 0);
+
+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {
+ RevCommit commit = revWalk.lookupCommit(commitId);
+ revWalk.markStart(commit);
+
+ byte[] lastCommitBytes = readBytes(defaultStore, txn, LAST_COMMIT_KEY);
+ if (lastCommitBytes != null) {
+ ObjectId lastCommitId = ObjectId.fromRaw(lastCommitBytes);
+ if (repository.hasObject(lastCommitId))
+ revWalk.markUninteresting(revWalk.lookupCommit(lastCommitId));
+ }
+
+ RevCommit nextCommit = revWalk.next();
+ while (nextCommit != null) {
+ ByteIterable nextCommitKey = new CommitByteIterable(nextCommit);
+ byte[] nextCommitBytes = readBytes(commitsStore, txn, nextCommitKey);
+
+ if (!isCommitCollected(nextCommitBytes)) {
+ byte[] newNextCommitBytes;
+ if (nextCommitBytes == null) {
+ newNextCommitBytes = new byte[1];
+ } else {
+ newNextCommitBytes = new byte[1+nextCommitBytes.length];
+ System.arraycopy(nextCommitBytes, 0, newNextCommitBytes, 1, nextCommitBytes.length);
+ }
+
+ commitsStore.put(txn, nextCommitKey, new ArrayByteIterable(newNextCommitBytes));
+
+ commitCount++;
+
+ for (RevCommit parentCommit: nextCommit.getParents()) {
+ ByteIterable parentCommitKey = new CommitByteIterable(parentCommit);
+ byte[] parentCommitBytes = readBytes(commitsStore, txn, parentCommitKey);
+ byte[] newParentCommitBytes;
+ if (parentCommitBytes != null) {
+ newParentCommitBytes = new byte[parentCommitBytes.length+20];
+ System.arraycopy(parentCommitBytes, 0, newParentCommitBytes, 0, parentCommitBytes.length);
+ } else {
+ newParentCommitBytes = new byte[20];
+ }
+ nextCommit.copyRawTo(newParentCommitBytes, newParentCommitBytes.length-20);
+ commitsStore.put(txn, parentCommitKey, new ArrayByteIterable(newParentCommitBytes));
+ }
+
+ for (Long issueNumber: IssueUtils.parseFixedIssues(project, nextCommit.getFullMessage())) {
+ ByteIterable issueKey = new LongByteIterable(issueNumber);
+ Collection<ObjectId> fixCommits = readCommits(fixCommitsStore, txn, issueKey);
+
+ boolean addNextCommit = true;
+ for (Iterator<ObjectId> it = fixCommits.iterator(); it.hasNext();) {
+ ObjectId fixCommit = it.next();
+ if (GitUtils.isMergedInto(project.getRepository(), null, fixCommit, nextCommit)) {
+ it.remove();
+ } else if (GitUtils.isMergedInto(project.getRepository(), null, nextCommit, fixCommit)) {
+ addNextCommit = false;
+ break;
+ }
+ }
+ if (addNextCommit) {
+ fixCommits.add(nextCommit);
+ fixedIssueNumbers.add(issueNumber);
+ }
+ writeCommits(fixCommitsStore, txn, issueKey, fixCommits);
+ }
+ }
+ nextCommit = revWalk.next();
+ }
+ writeInt(defaultStore, txn, COMMIT_COUNT_KEY, commitCount);
+ commitCountCache.remove(project.getId());
+
+ defaultStore.put(txn, LAST_COMMIT_KEY, new CommitByteIterable(commitId));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ });
+
+ for (Long issueNumber: fixedIssueNumbers) {
+ Issue issue = issueManager.find(project, issueNumber);
+ if (issue != null)
+ listenerRegistry.post(new IssueCommitted(issue));
+ }
+
+ if (GitUtils.branch2ref(project.getDefaultBranch()).equals(refName)) {
+ ObjectId lastCommitId =
+ env.computeInReadonlyTransaction(new TransactionalComputable<ObjectId>() {
+
+ @Override
+ public ObjectId compute(Transaction txn) {
+ byte[] lastCommitBytes = readBytes(defaultStore, txn, LAST_COMMIT_OF_DEFAULT_BRANCH_KEY);
+ if (lastCommitBytes != null)
+ return ObjectId.fromRaw(lastCommitBytes);
+ else
+ return null;
+ }
+
+ });
+
+ if (!commitId.equals(lastCommitId)) {
+ RevListCommand revList = new RevListCommand(project.getGitDir());
+ List<String> revisions = new ArrayList<>();
+ revisions.add(commitId.name());
+ if (lastCommitId != null && repository.hasObject(lastCommitId))
+ revisions.add("^" + lastCommitId.name());
+ revList.revisions(revisions).order(Order.TOPO);
+
+ List<ObjectId> historyIds = new ArrayList<>();
+ for (String commitHash: revList.call())
+ historyIds.add(ObjectId.fromString(commitHash));
+
+ revList = new RevListCommand(project.getGitDir());
+ revList.order(null).firstParent(true);
+
+ Set<ObjectId> firstParentIds = new HashSet<>();
+ for (String commitHash: revList.call())
+ firstParentIds.add(ObjectId.fromString(commitHash));
+
+ /*
+ * Instead of collecting information of master branch all at once, we identify some
+ * intermediate commits and collect the information using these intermediate commits
+ * multiple times for two reasons:
+ * 1. Use less memory
+ * 2. Commit Exodus transaction sooner so user can use auto-completion when search
+ * commits even if collection is not done yet
+ */
+ List<ObjectId> intermediateIds = new ArrayList<>();
+ int count = 0;
+ for (ObjectId historyId: historyIds) {
+ count++;
+ /*
+ * Only use intermediate commits that are part of first parent chain. This
+ * makes sure that subsequent intermediate commits are always ancestor of
+ * current intermediate commit (after reverse done below), to avoid
+ * collecting some commits multiple times
+ */
+ if (count > COLLECT_BATCH_SIZE && firstParentIds.contains(historyId)) {
+ intermediateIds.add(historyId);
+ count = 0;
+ }
+ }
+
+ Collections.reverse(intermediateIds);
+ intermediateIds.add(commitId);
+
+ historyIds = null;
+ firstParentIds = null;
+
+ for(ObjectId currentCommitId: intermediateIds) {
+ env.executeInTransaction(new TransactionalExecutable() {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void execute(Transaction txn) {
+ NextIndex nextIndex = new NextIndex();
+ nextIndex.user = readInt(defaultStore, txn, NEXT_USER_INDEX_KEY, 0);
+ nextIndex.path = readInt(defaultStore, txn, NEXT_PATH_INDEX_KEY, 0);
+
+ Map<Long, Integer> editsCache = new HashMap<>();
+
+ Set<NameAndEmail> users;
+ byte[] userBytes = readBytes(defaultStore, txn, USERS_KEY);
+ if (userBytes != null)
+ users = (Set<NameAndEmail>) SerializationUtils.deserialize(userBytes);
+ else
+ users = new HashSet<>();
+
+ Map<String, Long> files;
+ byte[] fileBytes = readBytes(defaultStore, txn, FILES_KEY);
+ if (fileBytes != null)
+ files = (Map<String, Long>) SerializationUtils.deserialize(fileBytes);
+ else
+ files = new HashMap<>();
+
+ Map<Integer, Map<String, Integer>> lineStats;
+ byte[] bytesOfLineStats = readBytes(defaultStore, txn, LINE_STATS_KEY);
+ if (bytesOfLineStats != null) {
+ lineStats = (Map<Integer, Map<String, Integer>>) SerializationUtils.deserialize(
+ bytesOfLineStats);
+ } else {
+ lineStats = new HashMap<>();
+ }
+
+ Map<Integer, Map<Integer, Contribution>> dailyContributionsCache = new HashMap<>();
+ Map<Integer, Contribution> overallContributions =
+ deserializeContributions(readBytes(defaultStore, txn, OVERALL_CONTRIBUTIONS_KEY));
+
+ /*
+ * Use a synchronous queue to achieve below purpose:
+ * 1. Add commit to Xodus transactional store in the same thread opening the transaction
+ * as this is required by Xodus
+ * 2. Do not pile up commits to use minimal memory
+ */
+ SynchronousQueue<Optional<GitCommit>> queue = new SynchronousQueue<>();
+ AtomicReference<Exception> logException = new AtomicReference<>(null);
+
+ List<String> revisions = new ArrayList<>();
+ revisions.add(currentCommitId.name());
+
+ ObjectId lastCommitId;
+ byte[] lastCommitBytes = readBytes(defaultStore, txn, LAST_COMMIT_OF_DEFAULT_BRANCH_KEY);
+ if (lastCommitBytes != null)
+ lastCommitId = ObjectId.fromRaw(lastCommitBytes);
+ else
+ lastCommitId = null;
+ if (lastCommitId != null && repository.hasObject(lastCommitId))
+ revisions.add("^" + lastCommitId.name());
+
+ LogCommand log = new LogCommand(project.getGitDir()) {
+
+ @Override
+ protected void consume(GitCommit commit) {
+ try {
+ queue.put(Optional.of(commit));
+ } catch (InterruptedException e) {
+ }
+ }
+
+ }.revisions(revisions);
+
+ executorService.execute(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ log.call();
+ } catch (Exception e) {
+ logException.set(e);
+ } finally {
+ try {
+ queue.put(Optional.empty());
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+
+ });
+
+ try {
+ Optional<GitCommit> logCommitOptional = queue.take();
+ while (logCommitOptional.isPresent()) {
+ GitCommit logCommit = logCommitOptional.get();
+
+ if (logCommit.getCommitDate() != null) {
+ for (String file: logCommit.getChangedFiles())
+ files.put(file, logCommit.getCommitDate().getTime());
+ }
+
+ if (logCommit.getCommitter() != null)
+ users.add(new NameAndEmail(logCommit.getCommitter()));
+
+ if (logCommit.getAuthor() != null) {
+ NameAndEmail nameAndEmail = new NameAndEmail(logCommit.getAuthor());
+ users.add(nameAndEmail);
+
+ String emailAddress = logCommit.getAuthor().getEmailAddress();
+ if (StringUtils.isNotBlank(emailAddress)) {
+ ByteIterable emailKey = new StringByteIterable(emailAddress);
+ int userIndex = readInt(emailToIndexStore, txn, emailKey, -1);
+ if (userIndex == -1) {
+ userIndex = nextIndex.user++;
+ writeInt(emailToIndexStore, txn, emailKey, userIndex);
+ indexToUserStore.put(txn,
+ new IntByteIterable(userIndex),
+ new ArrayByteIterable(SerializationUtils.serialize(nameAndEmail)));
+ }
+
+ if (logCommit.getCommitDate() != null && logCommit.getParentHashes().size() <= 1) {
+ int dayValue = new Day(logCommit.getCommitDate()).getValue();
+ Map<Integer, Contribution> contributionsOnDay =
+ dailyContributionsCache.get(dayValue);
+ if (contributionsOnDay == null) {
+ contributionsOnDay = deserializeContributions(readBytes(
+ dailyContributionsStore, txn, new IntByteIterable(dayValue)));
+ dailyContributionsCache.put(dayValue, contributionsOnDay);
+ }
+ updateContribution(contributionsOnDay, userIndex, logCommit);
+ }
+
+ for (FileChange change: logCommit.getFileChanges()) {
+ String path = change.getPath();
+ int pathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
+ nextIndex, path);
+ int edits = change.getAdditions() + change.getDeletions();
+ if (edits < 0)
+ edits = 100;
+ updateEdits(editsStore, txn, editsCache, userIndex, pathIndex, edits);
+ while (path.contains("/")) {
+ path = StringUtils.substringBeforeLast(path, "/");
+ pathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
+ nextIndex, path);
+ updateEdits(editsStore, txn, editsCache, userIndex, pathIndex, edits);
+ }
+ pathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
+ nextIndex, "");
+ updateEdits(editsStore, txn, editsCache, userIndex, pathIndex, edits);
+ }
+ }
+ }
+
+ if (logCommit.getCommitDate() != null && logCommit.getParentHashes().size() <= 1) {
+ int dayValue = new Day(logCommit.getCommitDate()).getValue();
+ updateContribution(overallContributions, dayValue, logCommit);
+ }
+
+ for (FileChange change: logCommit.getFileChanges()) {
+ if (change.getOldPath() != null) {
+ int pathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
+ nextIndex, change.getPath());
+ ByteIterable pathKey = new IntByteIterable(pathIndex);
+ Set<Integer> historyPathIndexes = new HashSet<>();
+ byte[] bytesOfHistoryPaths = readBytes(historyPathsStore, txn, pathKey);
+ if (bytesOfHistoryPaths == null) {
+ bytesOfHistoryPaths = new byte[0];
+ int pos = 0;
+ for (int i=0; i<bytesOfHistoryPaths.length/Integer.SIZE; i++) {
+ historyPathIndexes.add(ByteBuffer.wrap(bytesOfHistoryPaths, pos, Integer.SIZE).getInt());
+ pos += Integer.SIZE;
+ }
+ } else {
+ historyPathIndexes = new HashSet<>();
+ }
+ if (historyPathIndexes.size() < MAX_HISTORY_PATHS) {
+ int oldPathIndex = getPathIndex(pathToIndexStore, indexToPathStore, txn,
+ nextIndex, change.getOldPath());
+ if (!historyPathIndexes.contains(oldPathIndex)) {
+ historyPathIndexes.add(oldPathIndex);
+ byte[] newBytesOfHistoryPaths =
+ new byte[bytesOfHistoryPaths.length+Integer.SIZE];
+ System.arraycopy(bytesOfHistoryPaths, 0,
+ newBytesOfHistoryPaths, 0, bytesOfHistoryPaths.length);
+ ByteBuffer buffer = ByteBuffer.wrap(newBytesOfHistoryPaths,
+ bytesOfHistoryPaths.length, Integer.BYTES);
+ buffer.putInt(oldPathIndex);
+ historyPathsStore.put(txn, pathKey,
+ new ArrayByteIterable(newBytesOfHistoryPaths));
+ }
+ }
+ }
+ }
+
+ if (logCommit.getCommitDate() != null && logCommit.getParentHashes().size() <= 1) {
+ int day = new Day(logCommit.getCommitDate()).getValue();
+
+ Map<String, Integer> lineStatsOnDay = lineStats.get(day);
+ if (lineStatsOnDay == null) {
+ lineStatsOnDay = new HashMap<>();
+ lineStats.put(day, lineStatsOnDay);
+ }
+
+ Map<String, Integer> languageLines = new HashMap<>();
+ for (FileChange change: logCommit.getFileChanges()) {
+ int lines = change.getAdditions() - change.getDeletions();
+ int lastIndexOfDot = change.getPath().lastIndexOf('.');
+ if (lastIndexOfDot != -1 && lines != 0) {
+ String fileExt = change.getPath().substring(lastIndexOfDot+1).toLowerCase();
+ String language = PROGRAMMING_LANGUAGES.get(fileExt);
+ if (language != null) {
+ Integer accumulatedLines = languageLines.get(language);
+ if (accumulatedLines != null)
+ lines += accumulatedLines;
+ languageLines.put(language, lines);
+ }
+ }
+ }
+
+ for (Map.Entry<String, Integer> entry: languageLines.entrySet()) {
+ String language = entry.getKey();
+ Integer lines = entry.getValue();
+ Integer accumulatedLines = lineStatsOnDay.get(language);
+ if (accumulatedLines != null)
+ lines += accumulatedLines;
+ lineStatsOnDay.put(language, lines);
+ }
+
+ }
+
+ logCommitOptional = queue.take();
+ }
+ if (logException.get() != null)
+ throw logException.get();
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+
+ for (Map.Entry<Integer, Map<Integer, Contribution>> entry: dailyContributionsCache.entrySet()) {
+ byte[] bytesOfContributionsOnDay = serializeContributions(entry.getValue());
+ dailyContributionsStore.put(txn, new IntByteIterable(entry.getKey()),
+ new ArrayByteIterable(bytesOfContributionsOnDay));
+ }
+ defaultStore.put(txn, OVERALL_CONTRIBUTIONS_KEY,
+ new ArrayByteIterable(serializeContributions(overallContributions)));
+
+ bytesOfLineStats = SerializationUtils.serialize((Serializable) lineStats);
+ defaultStore.put(txn, LINE_STATS_KEY, new ArrayByteIterable(bytesOfLineStats));
+
+ writeInt(defaultStore, txn, NEXT_USER_INDEX_KEY, nextIndex.user);
+ writeInt(defaultStore, txn, NEXT_PATH_INDEX_KEY, nextIndex.path);
+
+ userBytes = SerializationUtils.serialize((Serializable) users);
+ defaultStore.put(txn, USERS_KEY, new ArrayByteIterable(userBytes));
+ usersCache.remove(project.getId());
+
+ if (files.size() > MAX_COLLECTING_FILES) {
+ List<String> fileList = new ArrayList<>(files.keySet());
+ fileList.sort((file1, file2)->files.get(file1).compareTo(files.get(file2)));
+ for (int i=0; i<fileList.size() - MAX_COLLECTING_FILES; i++)
+ files.remove(fileList.get(i));
+ }
+ fileBytes = SerializationUtils.serialize((Serializable) files);
+ defaultStore.put(txn, FILES_KEY, new ArrayByteIterable(fileBytes));
+ filesCache.remove(project.getId());
+
+ for (Map.Entry<Long, Integer> entry: editsCache.entrySet())
+ writeInt(editsStore, txn, new LongByteIterable(entry.getKey()), entry.getValue());
+
+ defaultStore.put(txn, LAST_COMMIT_OF_DEFAULT_BRANCH_KEY, new CommitByteIterable(currentCommitId));
+ }
+ });
+ }
+ }
+ }
+ }
+
+ private void updateContribution(Map<Integer, Contribution> contributions, int key, GitCommit commit) {
+ Contribution contribution = contributions.get(key);
+ if (contribution != null) {
+ contribution = new Contribution(
+ contribution.getCommits()+1,
+ contribution.getAdditions()+commit.getAdditions(),
+ contribution.getDeletions()+commit.getDeletions());
+ } else {
+ contribution = new Contribution(1, commit.getAdditions(), commit.getDeletions());
+ }
+ contributions.put(key, contribution);
+ }
+
+ private int getPathIndex(Store pathToIndexStore, Store indexToPathStore, Transaction txn,
+ NextIndex nextIndex, String path) {
+ StringByteIterable pathKey = new StringByteIterable(path);
+ int pathIndex = readInt(pathToIndexStore, txn, pathKey, -1);
+ if (pathIndex == -1) {
+ pathIndex = nextIndex.path++;
+ writeInt(pathToIndexStore, txn, pathKey, pathIndex);
+ indexToPathStore.put(txn, new IntByteIterable(pathIndex), new StringByteIterable(path));
+ }
+ return pathIndex;
+ }
+
+ private void updateEdits(Store store, Transaction txn,
+ Map<Long, Integer> editsCache, int userIndex, int pathIndex, int edits) {
+ long editsKey = (userIndex<<32)|pathIndex;
+
+ Integer editsOfPathByUser = editsCache.get(editsKey);
+ if (editsOfPathByUser == null)
+ editsOfPathByUser = readInt(store, txn, new LongByteIterable(editsKey), 0);
+ editsOfPathByUser += edits;
+ editsCache.put(editsKey, editsOfPathByUser);
+ }
+
+ @Override
+ public List<NameAndEmail> getUsers(Project project) {
+ List<NameAndEmail> users = usersCache.get(project.getId());
+ if (users == null) {
+ Environment env = getEnv(project.getId().toString());
+ Store store = getStore(env, DEFAULT_STORE);
+
+ users = env.computeInReadonlyTransaction(new TransactionalComputable<List<NameAndEmail>>() {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<NameAndEmail> compute(Transaction txn) {
+ byte[] bytes = readBytes(store, txn, USERS_KEY);
+ if (bytes != null) {
+ List<NameAndEmail> users =
+ new ArrayList<>((Set<NameAndEmail>) SerializationUtils.deserialize(bytes));
+ Collections.sort(users);
+ return users;
+ } else {
+ return new ArrayList<>();
+ }
+ }
+
+ });
+ usersCache.put(project.getId(), users);
+ }
+ return users;
+ }
+
+ @Override
+ public List<String> getFiles(Project project) {
+ List<String> files = filesCache.get(project.getId());
+ if (files == null) {
+ Environment env = getEnv(project.getId().toString());
+ final Store store = getStore(env, DEFAULT_STORE);
+
+ files = env.computeInReadonlyTransaction(new TransactionalComputable<List<String>>() {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<String> compute(Transaction txn) {
+ byte[] bytes = readBytes(store, txn, FILES_KEY);
+ if (bytes != null) {
+ List<String> files = new ArrayList<>(
+ ((Map<String, Long>)SerializationUtils.deserialize(bytes)).keySet());
+ Map<String, List<String>> segmentsMap = new HashMap<>();
+ Splitter splitter = Splitter.on("/");
+ for (String file: files) {
+ segmentsMap.put(file, splitter.splitToList(file));
+ }
+ files.sort(new Comparator<String>() {
+
+ @Override
+ public int compare(String o1, String o2) {
+ return PathUtils.compare(segmentsMap.get(o1), segmentsMap.get(o2));
+ }
+
+ });
+ return files;
+ } else {
+ return new ArrayList<>();
+ }
+ }
+ });
+ filesCache.put(project.getId(), files);
+ }
+ return files;
+ }
+
+ @Override
+ public Map<Day, Map<String, Integer>> getLineIncrements(Project project) {
+ Environment env = getEnv(project.getId().toString());
+ Store store = getStore(env, DEFAULT_STORE);
+
+ return env.computeInReadonlyTransaction(new TransactionalComputable<Map<Day, Map<String, Integer>>>() {
+
+ @Override
+ public Map<Day, Map<String, Integer>> compute(Transaction txn) {
+ Map<Day, Map<String, Integer>> lineIncrements = new HashMap<>();
+ byte[] bytes = readBytes(store, txn, LINE_STATS_KEY);
+ if (bytes != null) {
+ @SuppressWarnings("unchecked")
+ Map<Integer, Map<String, Integer>> storedMap =
+ (Map<Integer, Map<String, Integer>>) SerializationUtils.deserialize(bytes);
+ for (Map.Entry<Integer, Map<String, Integer>> entry: storedMap.entrySet())
+ lineIncrements.put(new Day(entry.getKey()), entry.getValue());
+ }
+ return lineIncrements;
+ }
+
+ });
+ }
+
+ @Override
+ public int getEdits(ProjectFacade project, UserFacade user, String path) {
+ if (user.getEmail() != null) {
+ Environment env = getEnv(project.getId().toString());
+ Store emailToIndexStore = getStore(env, EMAIL_TO_INDEX_STORE);
+ Store pathToIndexStore = getStore(env, PATH_TO_INDEX_STORE);
+ Store editsStore = getStore(env, EDITS_STORE);
+ return env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {
+
+ @Override
+ public Integer compute(Transaction txn) {
+ int userIndex = readInt(emailToIndexStore, txn, new StringByteIterable(user.getEmail()), -1);
+ if (userIndex != -1) {
+ int pathIndex = readInt(pathToIndexStore, txn, new StringByteIterable(path), -1);
+ if (pathIndex != -1) {
+ long editsKey = (userIndex<<32)|pathIndex;
+ return readInt(editsStore, txn, new LongByteIterable(editsKey), 0);
+ }
+ }
+ return 0;
+ }
+ });
+ } else {
+ return 0;
+ }
+ }
+
+ @Override
+ public Collection<ObjectId> getDescendants(Project project, Collection<ObjectId> ancestors) {
+ Environment env = getEnv(project.getId().toString());
+ final Store store = getStore(env, COMMITS_STORE);
+
+ return env.computeInReadonlyTransaction(new TransactionalComputable<Set<ObjectId>>() {
+
+ @Override
+ public Set<ObjectId> compute(Transaction txn) {
+ Set<ObjectId> descendants = new HashSet<>();
+
+ // Use stack instead of recursion to avoid StackOverflowException
+ Stack<ObjectId> stack = new Stack<>();
+ descendants.addAll(ancestors);
+ stack.addAll(ancestors);
+ while (!stack.isEmpty()) {
+ ObjectId current = stack.pop();
+ byte[] valueBytes = readBytes(store, txn, new CommitByteIterable(current));
+ if (valueBytes != null) {
+ if (valueBytes.length % 20 == 0) {
+ for (int i=0; i<valueBytes.length/20; i++) {
+ ObjectId child = ObjectId.fromRaw(valueBytes, i*20);
+ if (!descendants.contains(child)) {
+ descendants.add(child);
+ stack.push(child);
+ }
+ }
+ } else {
+ for (int i=0; i<(valueBytes.length-1)/20; i++) {
+ ObjectId child = ObjectId.fromRaw(valueBytes, i*20+1);
+ if (!descendants.contains(child)) {
+ descendants.add(child);
+ stack.push(child);
+ }
+ }
+ }
+ }
+ }
+
+ return descendants;
+ }
+
+ });
+ }
+
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof Project) {
+ Long projectId = event.getEntity().getId();
+ removeEnv(projectId.toString());
+ filesCache.remove(projectId);
+ commitCountCache.remove(projectId);
+ usersCache.remove(projectId);
+ }
+ }
+
+ private BatchWorker getBatchWorker(Long projectId) {
+ return new BatchWorker("project-" + projectId + "-collectCommitInfo") {
+
+ @Override
+ public void doWorks(Collection<Prioritized> works) {
+ sessionManager.run(new Runnable() {
+
+ @Override
+ public void run() {
+ Project project = projectManager.load(projectId);
+ List<CollectingWork> collectingWorks = new ArrayList<>();
+ for (Object work: works)
+ collectingWorks.add((CollectingWork)work);
+ Collections.sort(collectingWorks, new CommitTimeComparator());
+
+ for (CollectingWork work: collectingWorks) {
+ logger.debug("Collecting commit information up to ref '{}' in project '{}'...",
+ work.getRefName(), project.getName());
+ doCollect(project, work.getCommit().copy(), work.getRefName());
+ }
+ }
+
+ });
+ }
+
+ };
+ }
+
+ private void collect(Project project) {
+ List<CollectingWork> works = new ArrayList<>();
+ try (RevWalk revWalk = new RevWalk(project.getRepository())) {
+ Collection<Ref> refs = new ArrayList<>();
+ refs.addAll(project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_HEADS));
+ refs.addAll(project.getRepository().getRefDatabase().getRefsByPrefix(Constants.R_TAGS));
+
+ for (Ref ref: refs) {
+ RevObject revObj = revWalk.peel(revWalk.parseAny(ref.getObjectId()));
+ if (revObj instanceof RevCommit)
+ works.add(new CollectingWork(PRIORITY, (RevCommit) revObj, ref.getName()));
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ Collections.sort(works, new CommitTimeComparator());
+
+ for (CollectingWork work: works)
+ batchWorkManager.submit(getBatchWorker(project.getId()), work);
+ }
+
+ @Sessional
+ @Listen
+ public void on(SystemStarted event) {
+ for (Project project: projectManager.query()) {
+ checkVersion(project.getId().toString());
+ collect(project);
+ }
+ }
+
+ @Sessional
+ @Listen
+ public void on(RefUpdated event) {
+ if (!event.getNewCommitId().equals(ObjectId.zeroId())
+ && (event.getRefName().startsWith(Constants.R_HEADS)
+ || event.getRefName().startsWith(Constants.R_TAGS))) {
+ try (RevWalk revWalk = new RevWalk(event.getProject().getRepository())) {
+ RevCommit commit = GitUtils.parseCommit(revWalk, event.getNewCommitId());
+ if (commit != null) {
+ CollectingWork work = new CollectingWork(PRIORITY, commit, event.getRefName());
+ batchWorkManager.submit(getBatchWorker(event.getProject().getId()), work);
+ }
+ }
+ }
+ }
+
+ @Sessional
+ @Override
+ public int getCommitCount(Project project) {
+ Integer commitCount = commitCountCache.get(project.getId());
+ if (commitCount == null) {
+ Environment env = getEnv(project.getId().toString());
+ Store store = getStore(env, DEFAULT_STORE);
+
+ commitCount = env.computeInReadonlyTransaction(new TransactionalComputable<Integer>() {
+
+ @Override
+ public Integer compute(Transaction txn) {
+ return readInt(store, txn, COMMIT_COUNT_KEY, 0);
+ }
+ });
+ commitCountCache.put(project.getId(), commitCount);
+ }
+ return commitCount;
+ }
+
+ static class CollectingWork extends Prioritized {
+
+ private final String refName;
+
+ private final RevCommit commit;
+
+ public CollectingWork(int priority, RevCommit commit, String refName) {
+ super(priority);
+ this.commit = commit;
+ this.refName = refName;
+ }
+
+ public RevCommit getCommit() {
+ return commit;
+ }
+
+ public String getRefName() {
+ return refName;
+ }
+
+ }
+
+ static class CommitTimeComparator implements Comparator<CollectingWork> {
+
+ @Override
+ public int compare(CollectingWork o1, CollectingWork o2) {
+ return o1.getCommit().getCommitTime() - o2.getCommit().getCommitTime();
+ }
+
+ }
+
+ @Sessional
+ @Override
+ public void cloneInfo(Project source, Project target) {
+ BackupStrategy backupStrategy = getEnv(source.getId().toString()).getBackupStrategy();
+ try {
+ File targetDir = getEnvDir(target.getId().toString());
+ backupStrategy.beforeBackup();
+ try {
+ for (VirtualFileDescriptor descriptor: backupStrategy.getContents()) {
+ FileUtils.copyFileToDirectory(((FileDescriptor)descriptor).getFile(), targetDir);
+ }
+ } finally {
+ backupStrategy.afterBackup();
+ }
+ writeVersion(target.getId().toString());
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ protected File getEnvDir(String envKey) {
+ File infoDir = new File(storageManager.getProjectInfoDir(Long.valueOf(envKey)), INFO_DIR);
+ if (!infoDir.exists())
+ FileUtils.createDir(infoDir);
+ return infoDir;
+ }
+
+ @Sessional
+ @Override
+ public Collection<String> getHistoryPaths(Project project, String path) {
+ Environment env = getEnv(project.getId().toString());
+ Store historyPathsStore = getStore(env, HISTORY_PATHS_STORE);
+ Store pathToIndexStore = getStore(env, PATH_TO_INDEX_STORE);
+ Store indexToPathStore = getStore(env, INDEX_TO_PATH_STORE);
+
+ return env.computeInReadonlyTransaction(new TransactionalComputable<Collection<String>>() {
+
+ private Collection<String> getPaths(Transaction txn, Set<Integer> pathIndexes) {
+ Set<String> paths = new HashSet<>();
+ for (int pathIndex: pathIndexes) {
+ byte[] pathBytes = readBytes(indexToPathStore, txn, new IntByteIterable(pathIndex));
+ if (pathBytes != null)
+ paths.add(new String(pathBytes, Charsets.UTF_8));
+ }
+ return paths;
+ }
+
+ @Override
+ public Collection<String> compute(Transaction txn) {
+ int pathIndex = readInt(pathToIndexStore, txn, new StringByteIterable(path), -1);
+ if (pathIndex != -1) {
+ Set<Integer> pathIndexes = new HashSet<>();
+ pathIndexes.add(pathIndex);
+ while (true) {
+ Set<Integer> newPathIndexes = new HashSet<>(pathIndexes);
+ for (int eachPathIndex: pathIndexes) {
+ byte[] bytesOfHistoryPaths =
+ readBytes(historyPathsStore, txn, new IntByteIterable(eachPathIndex));
+ if (bytesOfHistoryPaths != null) {
+ int pos = 0;
+ for (int i=0; i<bytesOfHistoryPaths.length/Integer.BYTES; i++) {
+ newPathIndexes.add(ByteBuffer.wrap(bytesOfHistoryPaths, pos, Integer.BYTES).getInt());
+ if (newPathIndexes.size() == MAX_HISTORY_PATHS)
+ return getPaths(txn, newPathIndexes);
+ pos += Integer.BYTES;
+ }
+ }
+ }
+ if (pathIndexes.equals(newPathIndexes))
+ break;
+ else
+ pathIndexes = newPathIndexes;
+ }
+ return getPaths(txn, pathIndexes);
+ } else {
+ return new HashSet<>();
+ }
+ }
+ });
+ }
+
+ @Sessional
+ @Override
+ public Map<Day, Contribution> getOverallContributions(Project project) {
+ Environment env = getEnv(project.getId().toString());
+ Store store = getStore(env, DEFAULT_STORE);
+
+ return env.computeInReadonlyTransaction(new TransactionalComputable<Map<Day, Contribution>>() {
+
+ @Override
+ public Map<Day, Contribution> compute(Transaction txn) {
+ Map<Day, Contribution> overallContributions = new HashMap<>();
+ for (Map.Entry<Integer, Contribution> entry:
+ deserializeContributions(readBytes(store, txn, OVERALL_CONTRIBUTIONS_KEY)).entrySet()) {
+ overallContributions.put(new Day(entry.getKey()), entry.getValue());
+ }
+ return overallContributions;
+ }
+
+ });
+ }
+
+ @Sessional
+ @Override
+ public List<Contributor> getTopContributors(Project project, int top, Contribution.Type type,
+ Day fromDay, Day toDay) {
+ Environment env = getEnv(project.getId().toString());
+ Store defaultStore = getStore(env, DEFAULT_STORE);
+ Store indexToUserStore = getStore(env, INDEX_TO_USER_STORE);
+ Store dailyContributionsStore = getStore(env, DAILY_CONTRIBUTIONS_STORE);
+
+ return env.computeInReadonlyTransaction(new TransactionalComputable<List<Contributor>>() {
+
+ @Override
+ public List<Contributor> compute(Transaction txn) {
+ Map<Integer, Contribution> overallContributions =
+ deserializeContributions(readBytes(defaultStore, txn, OVERALL_CONTRIBUTIONS_KEY));
+ Map<Integer, Contribution> totalContributions = new HashMap<>();
+ for (int dayValue: overallContributions.keySet()) {
+ if (dayValue >= fromDay.getValue() && dayValue <= toDay.getValue()) {
+ ByteIterable dayKey = new IntByteIterable(dayValue);
+ Map<Integer, Contribution> contributionsOnDay =
+ deserializeContributions(readBytes(dailyContributionsStore, txn, dayKey));
+ for (Map.Entry<Integer, Contribution> entry: contributionsOnDay.entrySet()) {
+ Integer userIndex = entry.getKey();
+ Contribution totalContribution = totalContributions.get(userIndex);
+ if (totalContribution == null) {
+ totalContribution = entry.getValue();
+ } else {
+ totalContribution = new Contribution(
+ totalContribution.getCommits() + entry.getValue().getCommits(),
+ totalContribution.getAdditions() + entry.getValue().getAdditions(),
+ totalContribution.getDeletions() + entry.getValue().getDeletions());
+ }
+ totalContributions.put(userIndex, totalContribution);
+ }
+ }
+ }
+
+ List<Integer> topUserIndexes = new ArrayList<>(totalContributions.keySet());
+ Collections.sort(topUserIndexes, new Comparator<Integer>() {
+
+ @Override
+ public int compare(Integer o1, Integer o2) {
+ if (type == Contribution.Type.COMMITS)
+ return totalContributions.get(o2).getCommits() - totalContributions.get(o1).getCommits();
+ else if (type == Contribution.Type.ADDITIONS)
+ return totalContributions.get(o2).getAdditions() - totalContributions.get(o1).getAdditions();
+ else
+ return totalContributions.get(o2).getDeletions() - totalContributions.get(o1).getDeletions();
+ }
+
+ });
+
+ if (top < topUserIndexes.size())
+ topUserIndexes = topUserIndexes.subList(0, top);
+
+ Set<Integer> topUserIndexSet = new HashSet<>(topUserIndexes);
+
+ Map<Integer, Map<Day, Integer>> userContributions = new HashMap<>();
+
+ for (int dayValue: overallContributions.keySet()) {
+ if (dayValue >= fromDay.getValue() && dayValue <= toDay.getValue()) {
+ ByteIterable dayKey = new IntByteIterable(dayValue);
+ Map<Integer, Contribution> contributionsOnDay =
+ deserializeContributions(readBytes(dailyContributionsStore, txn, dayKey));
+ Day day = new Day(dayValue);
+ for (Map.Entry<Integer, Contribution> entry: contributionsOnDay.entrySet()) {
+ Integer userIndex = entry.getKey();
+ if (topUserIndexSet.contains(userIndex)) {
+ Map<Day, Integer> contributionsByUser = userContributions.get(userIndex);
+ if (contributionsByUser == null) {
+ contributionsByUser = new HashMap<>();
+ userContributions.put(userIndex, contributionsByUser);
+ }
+ if (type == Contribution.Type.COMMITS)
+ contributionsByUser.put(day, entry.getValue().getCommits());
+ else if (type == Contribution.Type.ADDITIONS)
+ contributionsByUser.put(day, entry.getValue().getAdditions());
+ else
+ contributionsByUser.put(day, entry.getValue().getDeletions());
+ }
+ }
+ }
+ }
+
+ List<Contributor> contributors = new ArrayList<>();
+
+ for (int userIndex: topUserIndexes) {
+ byte[] userBytes = readBytes(indexToUserStore, txn, new IntByteIterable(userIndex));
+ Map<Day, Integer> contributionsByUser = userContributions.get(userIndex);
+ if (userBytes != null && contributionsByUser != null) {
+ PersonIdent user = ((NameAndEmail)SerializationUtils.deserialize(userBytes)).asPersonIdent();
+ contributors.add(new Contributor(user, totalContributions.get(userIndex), contributionsByUser));
+ }
+ }
+
+ return contributors;
+ }
+
+ });
+ }
+
+ private Map<Integer, Contribution> deserializeContributions(byte[] bytes) {
+ if (bytes != null) {
+ Map<Integer, Contribution> contributions = new HashMap<>();
+ int pos = 0;
+ for (int i=0; i<bytes.length/4/Integer.BYTES; i++) {
+ int key = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();
+ pos += Integer.BYTES;
+ int commits = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();
+ pos += Integer.BYTES;
+ int additions = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();
+ pos += Integer.BYTES;
+ int deletions = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();
+ pos += Integer.BYTES;
+ contributions.put(key, new Contribution(commits, additions, deletions));
+ }
+ return contributions;
+ } else {
+ return new HashMap<>();
+ }
+ }
+
+ private byte[] serializeContributions(Map<Integer, Contribution> contributions) {
+ byte[] bytes = new byte[contributions.size()*Integer.BYTES*4];
+ int pos = 0;
+ for (Map.Entry<Integer, Contribution> entry: contributions.entrySet()) {
+ byte[] keyBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getKey()).array();
+ System.arraycopy(keyBytes, 0, bytes, pos, Integer.BYTES);
+ pos += Integer.BYTES;
+ byte[] commitsBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getValue().getCommits()).array();
+ System.arraycopy(commitsBytes, 0, bytes, pos, Integer.BYTES);
+ pos += Integer.BYTES;
+ byte[] additionsBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getValue().getAdditions()).array();
+ System.arraycopy(additionsBytes, 0, bytes, pos, Integer.BYTES);
+ pos += Integer.BYTES;
+ byte[] deletionsBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getValue().getDeletions()).array();
+ System.arraycopy(deletionsBytes, 0, bytes, pos, Integer.BYTES);
+ pos += Integer.BYTES;
+ }
+ return bytes;
+ }
+
+ @Override
+ protected long getLogFileSize() {
+ return LOG_FILE_SIZE;
+ }
+
+ @Override
+ protected int getEnvVersion() {
+ return INFO_VERSION;
+ }
+
+ private static class NextIndex {
+ int user;
+
+ int path;
+ }
+
+ @Override
+ public Collection<ObjectId> getFixCommits(Project project, Long issueNumber) {
+ Environment env = getEnv(project.getId().toString());
+ Store store = getStore(env, FIX_COMMITS_STORE);
+
+ return env.computeInTransaction(new TransactionalComputable<Collection<ObjectId>>() {
+
+ @Override
+ public Collection<ObjectId> compute(Transaction txn) {
+ return readCommits(store, txn, new LongByteIterable(issueNumber));
+ }
+
+ });
+
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/CISpec.java b/core/src/main/java/io/onedev/server/ci/CISpec.java
index ef76a03522..8f4f1fca21 100644
--- a/core/src/main/java/io/onedev/server/ci/CISpec.java
+++ b/core/src/main/java/io/onedev/server/ci/CISpec.java
@@ -1,133 +1,133 @@
-package io.onedev.server.ci;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-import javax.validation.ConstraintValidatorContext;
-
-import com.google.common.base.Charsets;
-import com.google.common.collect.Lists;
-
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.ci.job.Job;
-import io.onedev.server.migration.VersionedDocument;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable
-@ClassValidating
-public class CISpec implements Serializable, Validatable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String BLOB_PATH = "onedev-ci.xml";
-
- private List<Job> jobs = new ArrayList<>();
-
- private transient Map<String, Job> jobMap;
-
- @Editable
- public List<Job> getJobs() {
- return jobs;
- }
-
- public void setJobs(List<Job> jobs) {
- this.jobs = jobs;
- }
-
- public Map<String, Job> getJobMap() {
- if (jobMap == null) {
- jobMap = new HashMap<>();
- for (Job job: jobs)
- jobMap.put(job.getName(), job);
- }
- return jobMap;
- }
-
- @Override
- public boolean isValid(ConstraintValidatorContext context) {
- boolean valid = true;
-
- Set<String> jobNames = new HashSet<>();
- for (Job job: jobs) {
- if (!jobNames.add(job.getName())) {
- context.buildConstraintViolationWithTemplate("Duplicate names found: " + job.getName())
- .addPropertyNode("jobs").addConstraintViolation();
- valid = false;
- }
- }
-
- for (int i=0; i<jobs.size(); i++) {
- Job job = jobs.get(i);
- for (Dependency dependency: job.getDependencies()) {
- if (!getJobMap().containsKey(dependency.getJobName())) {
- context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJobName())
- .addPropertyNode("jobs").addPropertyNode("dependencies")
- .inIterable().atIndex(i)
- .addConstraintViolation();
- valid = false;
- }
- }
- }
-
- for (int i=0; i<jobs.size(); i++) {
- Job job = jobs.get(i);
- for (Dependency dependency: job.getDependencies()) {
- List<String> dependencyChain = Lists.newArrayList(job.getName());
- if (hasCircularDependencies(dependencyChain, dependency.getJobName())) {
- context.buildConstraintViolationWithTemplate("Circular dependencies found: " + dependencyChain)
- .addPropertyNode("jobs").addPropertyNode("dependencies")
- .inIterable().atIndex(i)
- .addConstraintViolation();
- valid = false;
- }
- }
- }
-
- if (!valid)
- context.disableDefaultConstraintViolation();
- return valid;
- }
-
- private boolean hasCircularDependencies(List<String> dependencyChain, String jobName) {
- if (dependencyChain.iterator().next().equals(jobName)) {
- dependencyChain.add(jobName);
- return true;
- } else if (dependencyChain.contains(jobName)) {
- // loop not at start of chain will be detected as a separate violation
- return false;
- } else {
- dependencyChain.add(jobName);
- Job job = getJobMap().get(jobName);
- if (job != null) {
- for (Dependency dependency: job.getDependencies()) {
- if (hasCircularDependencies(new ArrayList<>(dependencyChain), dependency.getJobName()))
- return true;
- }
- }
- return false;
- }
- }
-
- @Nullable
- public static CISpec parse(byte[] bytes) {
- String ciSpecString = new String(bytes, Charsets.UTF_8);
- if (StringUtils.isNotBlank(ciSpecString)) {
- try {
- return (CISpec) VersionedDocument.fromXML(ciSpecString).toBean();
- } catch (Exception e) {
- throw new InvalidCISpecException("Invalid CI spec", e);
- }
- } else {
- return null;
- }
- }
-
-}
+package io.onedev.server.ci;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+import javax.validation.ConstraintValidatorContext;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.ci.job.Job;
+import io.onedev.server.migration.VersionedDocument;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+@ClassValidating
+public class CISpec implements Serializable, Validatable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String BLOB_PATH = "onedev-ci.xml";
+
+ private List<Job> jobs = new ArrayList<>();
+
+ private transient Map<String, Job> jobMap;
+
+ @Editable
+ public List<Job> getJobs() {
+ return jobs;
+ }
+
+ public void setJobs(List<Job> jobs) {
+ this.jobs = jobs;
+ }
+
+ public Map<String, Job> getJobMap() {
+ if (jobMap == null) {
+ jobMap = new HashMap<>();
+ for (Job job: jobs)
+ jobMap.put(job.getName(), job);
+ }
+ return jobMap;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ boolean valid = true;
+
+ Set<String> jobNames = new HashSet<>();
+ for (Job job: jobs) {
+ if (!jobNames.add(job.getName())) {
+ context.buildConstraintViolationWithTemplate("Duplicate names found: " + job.getName())
+ .addPropertyNode("jobs").addConstraintViolation();
+ valid = false;
+ }
+ }
+
+ for (int i=0; i<jobs.size(); i++) {
+ Job job = jobs.get(i);
+ for (Dependency dependency: job.getDependencies()) {
+ if (!getJobMap().containsKey(dependency.getJobName())) {
+ context.buildConstraintViolationWithTemplate("Dependency job not found: " + dependency.getJobName())
+ .addPropertyNode("jobs").addPropertyNode("dependencies")
+ .inIterable().atIndex(i)
+ .addConstraintViolation();
+ valid = false;
+ }
+ }
+ }
+
+ for (int i=0; i<jobs.size(); i++) {
+ Job job = jobs.get(i);
+ for (Dependency dependency: job.getDependencies()) {
+ List<String> dependencyChain = Lists.newArrayList(job.getName());
+ if (hasCircularDependencies(dependencyChain, dependency.getJobName())) {
+ context.buildConstraintViolationWithTemplate("Circular dependencies found: " + dependencyChain)
+ .addPropertyNode("jobs").addPropertyNode("dependencies")
+ .inIterable().atIndex(i)
+ .addConstraintViolation();
+ valid = false;
+ }
+ }
+ }
+
+ if (!valid)
+ context.disableDefaultConstraintViolation();
+ return valid;
+ }
+
+ private boolean hasCircularDependencies(List<String> dependencyChain, String jobName) {
+ if (dependencyChain.iterator().next().equals(jobName)) {
+ dependencyChain.add(jobName);
+ return true;
+ } else if (dependencyChain.contains(jobName)) {
+ // loop not at start of chain will be detected as a separate violation
+ return false;
+ } else {
+ dependencyChain.add(jobName);
+ Job job = getJobMap().get(jobName);
+ if (job != null) {
+ for (Dependency dependency: job.getDependencies()) {
+ if (hasCircularDependencies(new ArrayList<>(dependencyChain), dependency.getJobName()))
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ @Nullable
+ public static CISpec parse(byte[] bytes) {
+ String ciSpecString = new String(bytes, Charsets.UTF_8);
+ if (StringUtils.isNotBlank(ciSpecString)) {
+ try {
+ return (CISpec) VersionedDocument.fromXML(ciSpecString).toBean();
+ } catch (Exception e) {
+ throw new InvalidCISpecException("Invalid CI spec", e);
+ }
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.java
index 507f9d0488..8d032ee02f 100644
--- a/core/src/main/java/io/onedev/server/ci/Dependency.java
+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java
@@ -2,19 +2,26 @@ package io.onedev.server.ci;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+
+import javax.validation.ConstraintValidatorContext;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.ci.job.Job;
import io.onedev.server.ci.job.param.JobParam;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.page.project.blob.render.renderers.cispec.dependency.DependencyEditPanel;
@Editable
-public class Dependency implements Serializable {
+@ClassValidating
+public class Dependency implements Serializable, Validatable {
private static final long serialVersionUID = 1L;
@@ -54,5 +61,24 @@ public class Dependency implements Serializable {
choices.remove(belongingJob.getName());
return choices;
}
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ Set<String> paramNames = new HashSet<>();
+ boolean isValid = true;
+ for (JobParam param: params) {
+ if (paramNames.contains(param.getName())) {
+ isValid = false;
+ context.buildConstraintViolationWithTemplate("Duplicate param: " + param.getName())
+ .addPropertyNode("params").addConstraintViolation();
+ } else {
+ paramNames.add(param.getName());
+ }
+ }
+
+ if (!isValid)
+ context.disableDefaultConstraintViolation();
+ return isValid;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java b/core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java
index 301c1a6f1d..5e50455a11 100644
--- a/core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java
+++ b/core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java
@@ -1,13 +1,13 @@
-package io.onedev.server.ci;
-
-import io.onedev.server.exception.OneException;
-
-public class InvalidCISpecException extends OneException {
-
- private static final long serialVersionUID = 1L;
-
- public InvalidCISpecException(String message, Exception cause) {
- super(message, cause);
- }
-
-}
+package io.onedev.server.ci;
+
+import io.onedev.server.exception.OneException;
+
+public class InvalidCISpecException extends OneException {
+
+ private static final long serialVersionUID = 1L;
+
+ public InvalidCISpecException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+}
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.java
index 97c47c98ae..863b6ae02e 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
@@ -21,13 +21,18 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import org.eclipse.jgit.lib.ObjectId;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.ScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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.FileUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.schedule.SchedulableTask;
+import io.onedev.commons.utils.schedule.TaskScheduler;
import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.Dependency;
import io.onedev.server.ci.InvalidCISpecException;
@@ -46,6 +51,7 @@ import io.onedev.server.event.build2.BuildFinished;
import io.onedev.server.event.build2.BuildPending;
import io.onedev.server.event.build2.BuildRunning;
import io.onedev.server.event.build2.BuildSubmitted;
+import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.exception.OneException;
@@ -53,6 +59,8 @@ import io.onedev.server.model.Build2;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.BuildParam;
import io.onedev.server.model.Project;
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.User;
import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.model.support.jobexecutor.SourceSnapshot;
@@ -64,13 +72,13 @@ import io.onedev.server.util.MatrixRunner;
import io.onedev.server.util.patternset.PatternSet;
@Singleton
-public class DefaultJobScheduler implements JobScheduler, Runnable {
+public class DefaultJobScheduler implements JobScheduler, Runnable, SchedulableTask {
private static final int CHECK_INTERVAL = 1000; // check internal in milli-seconds
private static final Logger logger = LoggerFactory.getLogger(DefaultJobScheduler.class);
- private enum Status {RUNNING, STOPPING, STOPPED};
+ private enum Status {STARTED, STOPPING, STOPPED};
private final Map<Long, JobExecution> jobExecutions = new ConcurrentHashMap<>();
@@ -94,13 +102,20 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
private final Set<DependencyPopulator> dependencyPopulators;
+ private final TaskScheduler taskScheduler;
+
+ private volatile List<JobExecutor> jobExecutors;
+
+ private String taskId;
+
private volatile Status status;
@Inject
public DefaultJobScheduler(ProjectManager projectManager, Build2Manager buildManager,
UserManager userManager, ListenerRegistry listenerRegistry, SettingManager settingManager,
TransactionManager transactionManager, LogManager logManager, ExecutorService executorService,
- SessionManager sessionManager, Set<DependencyPopulator> dependencyPopulators) {
+ SessionManager sessionManager, Set<DependencyPopulator> dependencyPopulators,
+ TaskScheduler taskScheduler) {
this.projectManager = projectManager;
this.settingManager = settingManager;
this.buildManager = buildManager;
@@ -111,6 +126,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
this.executorService = executorService;
this.dependencyPopulators = dependencyPopulators;
this.sessionManager = sessionManager;
+ this.taskScheduler = taskScheduler;
}
@Sessional
@@ -234,7 +250,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
@Nullable
private JobExecutor getJobExecutor(Project project, ObjectId commitId, String jobName, String image) {
- for (JobExecutor executor: settingManager.getJobExecutors()) {
+ for (JobExecutor executor: jobExecutors) {
if (executor.isApplicable(project, commitId, jobName, image))
return executor;
}
@@ -263,7 +279,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
snapshot = null;
Logger logger = logManager.getLogger(build.getProject().getId(), build.getId(), job.getLogLevel());
-
+
Long buildId = build.getId();
JobExecution execution = new JobExecution(executorService.submit(new Runnable() {
@@ -301,8 +317,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
});
- executor.execute(job.getEnvironment(), workspace, envVars, job.getCommands(),
- snapshot, new PatternSet(includeFiles, excludeFiles), logger);
+ logger.info("Executing job with executor '" + executor.getName() + "'...");
+
+ executor.execute(job.getEnvironment(), workspace, envVars, job.getCommands(), snapshot,
+ job.getCaches(), new PatternSet(includeFiles, excludeFiles), logger);
sessionManager.run(new Runnable() {
@@ -315,6 +333,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
}
});
+ } catch (Exception e) {
+ if (ExceptionUtils.find(e, InterruptedException.class) == null)
+ logger.error("Error running build", e);
+ throw e;
} finally {
logger.info("Deleting workspace...");
FileUtils.deleteDir(workspace);
@@ -401,15 +423,28 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
execution.getFuture().cancel(true);
}
+ @SuppressWarnings("unchecked")
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof Setting) {
+ Setting setting = (Setting) event.getEntity();
+ if (setting.getKey() == Key.JOB_EXECUTORS)
+ jobExecutors = (List<JobExecutor>) setting.getValue();
+ }
+ }
+
@Listen
public void on(SystemStarted event) {
- status = Status.RUNNING;
+ status = Status.STARTED;
+ jobExecutors = settingManager.getJobExecutors();
new Thread(this).start();
+ taskId = taskScheduler.schedule(this);
}
@Listen
public void on(SystemStopping event) {
- if (status == Status.RUNNING) {
+ taskScheduler.unschedule(taskId);
+ if (status == Status.STARTED) {
status = Status.STOPPING;
while (status == Status.STOPPING) {
synchronized (this) {
@@ -437,7 +472,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
public Boolean call() {
for (Build2 build: buildManager.queryUnfinished()) {
if (build.getStatus() == Build2.Status.PENDING) {
- if (status == Status.RUNNING)
+ if (status == Status.STARTED)
run(build);
} else if (build.getStatus() == Build2.Status.RUNNING) {
JobExecution execution = jobExecutions.get(build.getId());
@@ -506,6 +541,17 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
status = Status.STOPPED;
}
+ @Override
+ public void execute() {
+ for (JobExecutor executor: jobExecutors)
+ executor.checkCaches();
+ }
+
+ @Override
+ public ScheduleBuilder<?> getScheduleBuilder() {
+ return CronScheduleBuilder.dailyAtHourAndMinute(0, 0);
+ }
+
private static class JobExecution {
private final Future<?> future;
@@ -526,4 +572,5 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
}
}
+
}
diff --git a/core/src/main/java/io/onedev/server/ci/job/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.java
index 2dbbda0d08..3d997d02e8 100644
--- a/core/src/main/java/io/onedev/server/ci/job/Job.java
+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java
@@ -2,24 +2,31 @@ package io.onedev.server.ci.job;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
+import javax.validation.ConstraintValidatorContext;
import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.ci.Dependency;
+import io.onedev.server.ci.job.cache.JobCache;
import io.onedev.server.ci.job.log.LogLevel;
import io.onedev.server.ci.job.outcome.JobOutcome;
import io.onedev.server.ci.job.trigger.JobTrigger;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Horizontal;
@Editable
@Horizontal
-public class Job implements Serializable {
+@ClassValidating
+public class Job implements Serializable, Validatable {
private static final long serialVersionUID = 1L;
@@ -32,6 +39,8 @@ public class Job implements Serializable {
private boolean cloneSource = true;
private List<JobOutcome> outcomes = new ArrayList<>();
+
+ private List<JobCache> caches = new ArrayList<>();
private List<Dependency> dependencies = new ArrayList<>();
@@ -86,6 +95,18 @@ public class Job implements Serializable {
this.cloneSource = cloneSource;
}
+ @Editable(order=150, description="Cache specific paths to speed up job execution. For instance for node.js "
+ + "projects, you may cache the <tt>node_modules</tt> folder to avoid downloading node modules for "
+ + "subsequent job executions. Note that cache is considered as a best-effort approach and your "
+ + "build script should always consider that cache might not be available")
+ public List<JobCache> getCaches() {
+ return caches;
+ }
+
+ public void setCaches(List<JobCache> caches) {
+ this.caches = caches;
+ }
+
@Editable(order=200, description="Specify job outcomes")
public List<JobOutcome> getOutcomes() {
return outcomes;
@@ -149,5 +170,56 @@ public class Job implements Serializable {
}
return null;
}
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ Set<String> keys = new HashSet<>();
+ Set<String> paths = new HashSet<>();
+
+ boolean isValid = true;
+ for (JobCache cache: caches) {
+ if (keys.contains(cache.getKey())) {
+ isValid = false;
+ context.buildConstraintViolationWithTemplate("Duplicate key: " + cache.getKey())
+ .addPropertyNode("caches").addConstraintViolation();
+ } else {
+ keys.add(cache.getKey());
+ }
+ if (paths.contains(cache.getPath())) {
+ isValid = false;
+ context.buildConstraintViolationWithTemplate("Duplicate path: " + cache.getPath())
+ .addPropertyNode("caches").addConstraintViolation();
+ } else {
+ paths.add(cache.getPath());
+ }
+ }
+
+ Set<String> dependencyJobs = new HashSet<>();
+ for (Dependency dependency: dependencies) {
+ if (dependencyJobs.contains(dependency.getJobName())) {
+ isValid = false;
+ context.buildConstraintViolationWithTemplate("Duplicate dependency: " + dependency.getJobName())
+ .addPropertyNode("dependencies").addConstraintViolation();
+ } else {
+ dependencyJobs.add(dependency.getJobName());
+ }
+ }
+
+ Set<String> promptParamNames = new HashSet<>();
+ for (InputSpec promptParam: promptParams) {
+ if (promptParamNames.contains(promptParam.getName())) {
+ isValid = false;
+ context.buildConstraintViolationWithTemplate("Duplicate prompt param: " + promptParam.getName())
+ .addPropertyNode("promptParams").addConstraintViolation();
+ } else {
+ promptParamNames.add(promptParam.getName());
+ }
+ }
+
+ if (!isValid)
+ context.disableDefaultConstraintViolation();
+
+ return isValid;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/CacheAllocation.java b/core/src/main/java/io/onedev/server/ci/job/cache/CacheAllocation.java
new file mode 100644
index 0000000000..82a3205ad3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/job/cache/CacheAllocation.java
@@ -0,0 +1,48 @@
+package io.onedev.server.ci.job.cache;
+
+import java.io.File;
+
+import org.apache.commons.io.FilenameUtils;
+
+import io.onedev.server.exception.OneException;
+
+public class CacheAllocation {
+
+ private final File instance;
+
+ private final String path;
+
+ public CacheAllocation(File instance, String path) {
+ this.instance = instance;
+ this.path = path;
+ }
+
+ public File getInstance() {
+ return instance;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void release() {
+ File lockFile = new File(instance, JobCache.LOCK_FILE);
+ if (!lockFile.delete())
+ throw new OneException("Unable to delete file: " + lockFile.getAbsolutePath());
+ }
+
+ public String resolvePath(String basePath) {
+ String path = getPath();
+ if (path == null)
+ path = "";
+ if (FilenameUtils.getPrefixLength(path) != 0)
+ return path;
+ else
+ return basePath + "/" + path;
+ }
+
+ public boolean isWorkspace() {
+ return path == null || FilenameUtils.normalize(path).length() == 0;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunnable.java b/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunnable.java
new file mode 100644
index 0000000000..76f4dc0f38
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunnable.java
@@ -0,0 +1,9 @@
+package io.onedev.server.ci.job.cache;
+
+import java.util.Collection;
+
+public interface CacheRunnable {
+
+ void run(Collection<CacheAllocation> allocations);
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunner.java b/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunner.java
new file mode 100644
index 0000000000..d5c515cec7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/job/cache/CacheRunner.java
@@ -0,0 +1,45 @@
+package io.onedev.server.ci.job.cache;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.slf4j.Logger;
+
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+
+public class CacheRunner {
+
+ private final File cacheHome;
+
+ private final Collection<JobCache> caches;
+
+ public CacheRunner(File cacheHome, Collection<JobCache> caches) {
+ this.cacheHome = cacheHome;
+ this.caches = caches;
+ }
+
+ public void run(CacheRunnable runnable, Logger logger) {
+ Collection<CacheAllocation> allocations = new ArrayList<>();
+ try {
+ if (!cacheHome.exists())
+ FileUtils.createDir(cacheHome);
+
+ for (JobCache cache: caches)
+ allocations.add(cache.allocate(cacheHome));
+ runnable.run(allocations);
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ } finally {
+ for (CacheAllocation allocation: allocations) {
+ try {
+ allocation.release();
+ } catch (Exception e) {
+ logger.error("Error releasing allocated cache", e);
+ }
+ }
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/cache/JobCache.java b/core/src/main/java/io/onedev/server/ci/job/cache/JobCache.java
new file mode 100644
index 0000000000..3883c109a2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/ci/job/cache/JobCache.java
@@ -0,0 +1,80 @@
+package io.onedev.server.ci.job.cache;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.util.validation.annotation.Path;
+import io.onedev.server.util.validation.annotation.PathSegment;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class JobCache implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String LOCK_FILE = "$OneDev-Cache-Lock$";
+
+ private String key;
+
+ private String path;
+
+ @Editable(order=100, description="Specify key of the cache. Caches with same key can be shared")
+ @PathSegment
+ @NotEmpty
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ @Editable(order=200, description="Specify path to cache. Non-absolute path is considered to be relative to job workspace. "
+ + "Specify \".\" (without quote) to cache workspace itself")
+ @Path
+ @NotEmpty
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public CacheAllocation allocate(File cacheHome) {
+ File keyDir = new File(cacheHome, getKey());
+ if (!keyDir.exists())
+ FileUtils.createDir(keyDir);
+ return LockUtils.call(keyDir.getAbsolutePath(), new Callable<CacheAllocation>() {
+
+ @Override
+ public CacheAllocation call() throws Exception {
+ List<File> cacheInstances = Lists.newArrayList(keyDir.listFiles());
+ cacheInstances.sort(Comparator.comparing(File::lastModified).reversed());
+ for (File cacheInstance: cacheInstances) {
+ if (new File(cacheInstance, LOCK_FILE).createNewFile())
+ return new CacheAllocation(cacheInstance, path);
+ }
+ File cacheInstance = new File(keyDir, UUID.randomUUID().toString());
+ FileUtils.createDir(cacheInstance);
+ File lockFile = new File(cacheInstance, LOCK_FILE);
+ if (!lockFile.createNewFile())
+ throw new OneException("Unable to create file: " + lockFile.getAbsolutePath());
+ return new CacheAllocation(cacheInstance, path);
+ }
+
+ });
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
index ff7fe2ed2d..46a6cc7c03 100644
--- a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
+++ b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
@@ -93,36 +93,30 @@ public class DefaultLogManager implements LogManager {
lock.lock();
try {
LogSnippet snippet = recentSnippets.get(buildId);
- File logFile = getLogFile(projectId, buildId);
if (snippet == null) {
- snippet = new LogSnippet();
- if (logFile.exists()) {
- try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
- while (true) {
- ois.readObject();
+ File logFile = getLogFile(projectId, buildId);
+ if (!logFile.exists()) {
+ snippet = new LogSnippet();
+ recentSnippets.put(buildId, snippet);
+ }
+ }
+ if (snippet != null) {
+ snippet.entries.add(new LogEntry(new Date(), logLevel, message));
+ if (snippet.entries.size() > MAX_CACHE_ENTRIES) {
+ File logFile = getLogFile(projectId, buildId);
+ try (ObjectOutputStream oos = newOutputStream(logFile)) {
+ while (snippet.entries.size() > MIN_CACHE_ENTRIES) {
+ LogEntry entry = snippet.entries.remove(0);
+ oos.writeObject(entry);
snippet.offset++;
}
- } catch (EOFException e) {
- } catch (IOException | ClassNotFoundException e) {
+ } catch (IOException e) {
throw new RuntimeException(e);
- }
- }
- recentSnippets.put(buildId, snippet);
- }
- snippet.entries.add(new LogEntry(new Date(), logLevel, message));
- if (snippet.entries.size() > MAX_CACHE_ENTRIES) {
- try (ObjectOutputStream oos = newOutputStream(logFile)) {
- while (snippet.entries.size() > MIN_CACHE_ENTRIES) {
- LogEntry entry = snippet.entries.remove(0);
- oos.writeObject(entry);
- snippet.offset++;
}
- } catch (IOException e) {
- throw new RuntimeException(e);
}
+
+ webSocketManager.notifyObservableChange(Build2.getLogWebSocketObservable(buildId), null);
}
-
- webSocketManager.notifyObservableChange(Build2.getLogWebSocketObservable(buildId), null);
} finally {
lock.unlock();
}
@@ -232,8 +226,8 @@ public class DefaultLogManager implements LogManager {
snippet.entries.addAll(recentSnippet.entries.subList(
recentSnippet.entries.size()-count, recentSnippet.entries.size()));
} else {
- snippet.entries.addAll(recentSnippet.entries);
snippet.entries.addAll(readLogSnippetReversely(logFile, count - recentSnippet.entries.size()).entries);
+ snippet.entries.addAll(recentSnippet.entries);
}
snippet.offset = recentSnippet.entries.size() + recentSnippet.offset - snippet.entries.size();
return snippet;
@@ -279,7 +273,7 @@ public class DefaultLogManager implements LogManager {
oos.writeObject(entry);
} catch (IOException e) {
throw new RuntimeException(e);
- }
+ }
}
} finally {
lock.unlock();
diff --git a/core/src/main/java/io/onedev/server/command/BackupDBCommand.java b/core/src/main/java/io/onedev/server/command/BackupDBCommand.java
index 0c75ce560c..2141fc2c2f 100644
--- a/core/src/main/java/io/onedev/server/command/BackupDBCommand.java
+++ b/core/src/main/java/io/onedev/server/command/BackupDBCommand.java
@@ -1,79 +1,79 @@
-package io.onedev.server.command;
-
-import java.io.File;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.Interceptor;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.launcher.bootstrap.Bootstrap;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.ZipUtils;
-import io.onedev.server.persistence.DefaultPersistManager;
-import io.onedev.server.persistence.HibernateProperties;
-import io.onedev.server.persistence.IdManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.validation.EntityValidator;
-
-@Singleton
-public class BackupDBCommand extends DefaultPersistManager {
-
- private static final Logger logger = LoggerFactory.getLogger(BackupDBCommand.class);
-
- @Inject
- public BackupDBCommand(PhysicalNamingStrategy physicalNamingStrategy,
- HibernateProperties properties, Interceptor interceptor,
- IdManager idManager, Dao dao, EntityValidator validator) {
- super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);
- }
-
- @Override
- public void start() {
- if (Bootstrap.command.getArgs().length == 0) {
- logger.error("Missing backup file parameter. Usage: {} <path to database backup file>", Bootstrap.command.getScript());
- System.exit(1);
- }
- File backupFile = new File(Bootstrap.command.getArgs()[0]);
- if (!backupFile.isAbsolute())
- backupFile = new File(Bootstrap.getBinDir(), backupFile.getPath());
-
- if (backupFile.exists()) {
- logger.error("Backup file already exists: {}", backupFile.getAbsolutePath());
- System.exit(1);
- }
-
- if (Bootstrap.isServerRunning(Bootstrap.installDir) && getDialect().toLowerCase().contains("hsql")) {
- logger.error("Please stop server before backing up database");
- System.exit(1);
- }
-
- checkDataVersion(false);
-
- logger.info("Backing up database to {}...", backupFile.getAbsolutePath());
-
- Metadata metadata = buildMetadata();
- sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();
-
- File tempDir = FileUtils.createTempDir("backup");
- try {
- exportData(tempDir);
- ZipUtils.zip(tempDir, backupFile);
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- } finally {
- FileUtils.deleteDir(tempDir);
- }
-
- sessionFactory.close();
- logger.info("Database is successfully backed up to {}", backupFile.getAbsolutePath());
-
- System.exit(0);
- }
-
-}
+package io.onedev.server.command;
+
+import java.io.File;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.Interceptor;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.ZipUtils;
+import io.onedev.server.persistence.DefaultPersistManager;
+import io.onedev.server.persistence.HibernateProperties;
+import io.onedev.server.persistence.IdManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.validation.EntityValidator;
+
+@Singleton
+public class BackupDBCommand extends DefaultPersistManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(BackupDBCommand.class);
+
+ @Inject
+ public BackupDBCommand(PhysicalNamingStrategy physicalNamingStrategy,
+ HibernateProperties properties, Interceptor interceptor,
+ IdManager idManager, Dao dao, EntityValidator validator) {
+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);
+ }
+
+ @Override
+ public void start() {
+ if (Bootstrap.command.getArgs().length == 0) {
+ logger.error("Missing backup file parameter. Usage: {} <path to database backup file>", Bootstrap.command.getScript());
+ System.exit(1);
+ }
+ File backupFile = new File(Bootstrap.command.getArgs()[0]);
+ if (!backupFile.isAbsolute())
+ backupFile = new File(Bootstrap.getBinDir(), backupFile.getPath());
+
+ if (backupFile.exists()) {
+ logger.error("Backup file already exists: {}", backupFile.getAbsolutePath());
+ System.exit(1);
+ }
+
+ if (Bootstrap.isServerRunning(Bootstrap.installDir) && getDialect().toLowerCase().contains("hsql")) {
+ logger.error("Please stop server before backing up database");
+ System.exit(1);
+ }
+
+ checkDataVersion(false);
+
+ logger.info("Backing up database to {}...", backupFile.getAbsolutePath());
+
+ Metadata metadata = buildMetadata();
+ sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();
+
+ File tempDir = FileUtils.createTempDir("backup");
+ try {
+ exportData(tempDir);
+ ZipUtils.zip(tempDir, backupFile);
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ } finally {
+ FileUtils.deleteDir(tempDir);
+ }
+
+ sessionFactory.close();
+ logger.info("Database is successfully backed up to {}", backupFile.getAbsolutePath());
+
+ System.exit(0);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java b/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java
index 95dc0d0272..076ac4212b 100644
--- a/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java
+++ b/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java
@@ -1,115 +1,115 @@
-package io.onedev.server.command;
-
-import java.io.File;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.Interceptor;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.launcher.bootstrap.Bootstrap;
-import io.onedev.commons.launcher.bootstrap.Command;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.ZipUtils;
-import io.onedev.server.persistence.DefaultPersistManager;
-import io.onedev.server.persistence.HibernateProperties;
-import io.onedev.server.persistence.IdManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.validation.EntityValidator;
-
-@Singleton
-public class RestoreDBCommand extends DefaultPersistManager {
-
- private static final Logger logger = LoggerFactory.getLogger(RestoreDBCommand.class);
-
- @Inject
- public RestoreDBCommand(PhysicalNamingStrategy physicalNamingStrategy,
- HibernateProperties properties, Interceptor interceptor,
- IdManager idManager, Dao dao, EntityValidator validator) {
- super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);
- }
-
- @Override
- public void start() {
- if (Bootstrap.command.getArgs().length == 0) {
- logger.error("Missing backup file parameter. Usage: {} <path to database backup file>", Bootstrap.command.getScript());
- System.exit(1);
- }
- File backupFile = new File(Bootstrap.command.getArgs()[0]);
- if (!backupFile.isAbsolute())
- backupFile = new File(Bootstrap.getBinDir(), backupFile.getPath());
-
- if (!backupFile.exists()) {
- logger.error("Unable to find file: {}", backupFile.getAbsolutePath());
- System.exit(1);
- }
-
- logger.info("Restoring database from {}...", backupFile.getAbsolutePath());
-
- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
- logger.error("Please stop server before restoring");
- System.exit(1);
- }
-
- Metadata metadata = buildMetadata();
- sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();
-
- if (backupFile.isFile()) {
- File dataDir = FileUtils.createTempDir("restore");
- try {
- ZipUtils.unzip(backupFile, dataDir);
- doRestore(metadata, dataDir);
- } finally {
- FileUtils.deleteDir(dataDir);
- }
- } else {
- doRestore(metadata, backupFile);
- }
-
- sessionFactory.close();
-
- if (getDialect().toLowerCase().contains("hsql")) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- }
- }
-
- logger.info("Database is successfully restored from {}", backupFile.getAbsolutePath());
-
- System.exit(0);
- }
-
- private void doRestore(Metadata metadata, File dataDir) {
- migrateData(dataDir);
- validateData(metadata, dataDir);
-
- String dbDataVersion = checkDataVersion(true);
-
- if (dbDataVersion != null) {
- logger.info("Cleaning database...");
- cleanDatabase(metadata);
- }
-
- logger.info("Creating tables...");
- createTables(metadata);
-
- logger.info("Importing data into database...");
- importData(metadata, dataDir);
-
- logger.info("Applying foreign key constraints...");
- try {
- applyConstraints(metadata);
- } catch (Exception e) {
- logger.error("Failed to apply database constraints", e);
- logger.info("If above error is caused by foreign key constraint violations, you may fix it via your database sql tool, "
- + "and then run {} to reapply database constraints", Command.getScript("apply_db_constraints"));
- System.exit(1);
- }
- }
-
-}
+package io.onedev.server.command;
+
+import java.io.File;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.Interceptor;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.Command;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.ZipUtils;
+import io.onedev.server.persistence.DefaultPersistManager;
+import io.onedev.server.persistence.HibernateProperties;
+import io.onedev.server.persistence.IdManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.validation.EntityValidator;
+
+@Singleton
+public class RestoreDBCommand extends DefaultPersistManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(RestoreDBCommand.class);
+
+ @Inject
+ public RestoreDBCommand(PhysicalNamingStrategy physicalNamingStrategy,
+ HibernateProperties properties, Interceptor interceptor,
+ IdManager idManager, Dao dao, EntityValidator validator) {
+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);
+ }
+
+ @Override
+ public void start() {
+ if (Bootstrap.command.getArgs().length == 0) {
+ logger.error("Missing backup file parameter. Usage: {} <path to database backup file>", Bootstrap.command.getScript());
+ System.exit(1);
+ }
+ File backupFile = new File(Bootstrap.command.getArgs()[0]);
+ if (!backupFile.isAbsolute())
+ backupFile = new File(Bootstrap.getBinDir(), backupFile.getPath());
+
+ if (!backupFile.exists()) {
+ logger.error("Unable to find file: {}", backupFile.getAbsolutePath());
+ System.exit(1);
+ }
+
+ logger.info("Restoring database from {}...", backupFile.getAbsolutePath());
+
+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
+ logger.error("Please stop server before restoring");
+ System.exit(1);
+ }
+
+ Metadata metadata = buildMetadata();
+ sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();
+
+ if (backupFile.isFile()) {
+ File dataDir = FileUtils.createTempDir("restore");
+ try {
+ ZipUtils.unzip(backupFile, dataDir);
+ doRestore(metadata, dataDir);
+ } finally {
+ FileUtils.deleteDir(dataDir);
+ }
+ } else {
+ doRestore(metadata, backupFile);
+ }
+
+ sessionFactory.close();
+
+ if (getDialect().toLowerCase().contains("hsql")) {
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+
+ logger.info("Database is successfully restored from {}", backupFile.getAbsolutePath());
+
+ System.exit(0);
+ }
+
+ private void doRestore(Metadata metadata, File dataDir) {
+ migrateData(dataDir);
+ validateData(metadata, dataDir);
+
+ String dbDataVersion = checkDataVersion(true);
+
+ if (dbDataVersion != null) {
+ logger.info("Cleaning database...");
+ cleanDatabase(metadata);
+ }
+
+ logger.info("Creating tables...");
+ createTables(metadata);
+
+ logger.info("Importing data into database...");
+ importData(metadata, dataDir);
+
+ logger.info("Applying foreign key constraints...");
+ try {
+ applyConstraints(metadata);
+ } catch (Exception e) {
+ logger.error("Failed to apply database constraints", e);
+ logger.info("If above error is caused by foreign key constraint violations, you may fix it via your database sql tool, "
+ + "and then run {} to reapply database constraints", Command.getScript("apply_db_constraints"));
+ System.exit(1);
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
index fc6eda7034..5a31286ae2 100644
--- a/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
+++ b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java
@@ -1,502 +1,510 @@
-package io.onedev.server.command;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.lang3.SystemUtils;
-import org.hibernate.Interceptor;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Charsets;
-
-import io.onedev.commons.launcher.bootstrap.Bootstrap;
-import io.onedev.commons.launcher.loader.PluginManager;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.server.migration.DatabaseMigrator;
-import io.onedev.server.migration.MigrationHelper;
-import io.onedev.server.persistence.DefaultPersistManager;
-import io.onedev.server.persistence.HibernateProperties;
-import io.onedev.server.persistence.IdManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.validation.EntityValidator;
-
-@Singleton
-public class UpgradeCommand extends DefaultPersistManager {
-
- private static final Logger logger = LoggerFactory.getLogger(UpgradeCommand.class);
-
- private static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";
-
- private final String appName;
-
- @Inject
- public UpgradeCommand(PhysicalNamingStrategy physicalNamingStrategy,
- HibernateProperties properties, Interceptor interceptor,
- IdManager idManager, Dao dao, EntityValidator validator, PluginManager pluginManager) {
- super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);
- appName = pluginManager.getProduct().getName();
- }
-
- protected Commandline buildCommandline(File upgradeDir, String command, String...commandArgs) {
- String version;
- File versionFile = new File(upgradeDir, "version.txt");
- if (versionFile.exists()) {
- try {
- version = FileUtils.readFileToString(versionFile, Charset.defaultCharset()).trim();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- } else {
- version = "1.0-EAP-build26";
- }
-
- String bootstrapClass;
- if (version.startsWith("1.0-EAP")) {
- int build = Integer.parseInt(StringUtils.substringAfterLast(version, "build"));
- if (build <= 26)
- bootstrapClass = "com.gitplex.commons.bootstrap.Bootstrap";
- else
- bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";
- } else if (version.startsWith("1.0.0")) {
- bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";
- } else if (version.startsWith("1.0.1")) {
- bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";
- } else if (version.startsWith("2.0.")){
- bootstrapClass = "io.onedev.launcher.bootstrap.Bootstrap";
- } else {
- bootstrapClass = "io.onedev.commons.launcher.bootstrap.Bootstrap";
- }
- Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java");
- cmdline.addArgs("-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m", "-classpath", "*", bootstrapClass,
- command);
- cmdline.addArgs(commandArgs);
- cmdline.workingDir(new File(upgradeDir, "boot"));
- return cmdline;
- }
-
- private String prefixUpgradeTargetLog(String line) {
- return ">>> " + line;
- }
-
- @Override
- public void start() {
- if (Bootstrap.command.getArgs().length == 0) {
- logger.error("Missing upgrade target parameter. Usage: {} <installation directory of old {} version>",
- Bootstrap.command.getScript(), appName);
- System.exit(1);
- }
- File upgradeDir = new File(Bootstrap.command.getArgs()[0]);
- if (!upgradeDir.isAbsolute())
- upgradeDir = new File(Bootstrap.getBinDir(), upgradeDir.getPath());
-
- if (!upgradeDir.exists()) {
- logger.error("Unable to find directory: {}", upgradeDir.getAbsolutePath());
- System.exit(1);
- }
-
- logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());
-
- if (!new File(upgradeDir, "boot/bootstrap.keys").exists()) {
- logger.error("Invalid {} installation directory: {}, make sure you are specifying the top level "
- + "installation directory (it contains sub directories such as \"bin\", \"boot\", \"conf\", etc)",
- appName, upgradeDir.getAbsolutePath());
- System.exit(1);
- }
-
- if (Bootstrap.isServerRunning(upgradeDir)) {
- logger.error("Please stop server running at \"{}\" before upgrading", upgradeDir.getAbsolutePath());
- System.exit(1);
- }
- if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
- logger.error("Please stop server running at \"{}\" before upgrading", Bootstrap.installDir.getAbsolutePath());
- System.exit(1);
- }
-
- for (File file: new File(upgradeDir, "lib").listFiles()) {
- if (file.getName().contains("mariadb") || file.getName().contains("mysql")
- || file.getName().contains("ojdbc") || file.getName().contains("postgresql")
- || file.getName().contains("sqljdbc")) {
- try {
- FileUtils.moveFileToDirectory(file, new File(upgradeDir, "site/lib"), true);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
-
- AtomicReference<String> oldDataVersion = new AtomicReference<>(null);
- int ret = buildCommandline(upgradeDir, "check_data_version").execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- String prefix = "Data version: ";
- if (line.startsWith(prefix)) {
- oldDataVersion.set(line.substring(prefix.length()));
- logger.info("Old data version: " + oldDataVersion.get());
- } else {
- logger.info(prefixUpgradeTargetLog(line));
- }
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }}
-
- ).getReturnCode();
-
- if (ret != 0) {
- logger.error("Unable to upgrade specified installation due to above error");
- System.exit(1);
- }
-
- AtomicBoolean usingEmbeddedDB = new AtomicBoolean(false);
- ret = buildCommandline(upgradeDir, "db_dialect").execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- String prefix = "Database dialect: ";
- String dialect;
- if (line.startsWith(prefix)) {
- dialect = line.substring(prefix.length());
- logger.info("Database dialect: " + dialect);
- if (dialect.toLowerCase().contains("hsql"))
- usingEmbeddedDB.set(true);
- } else {
- logger.info(prefixUpgradeTargetLog(line));
- }
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }}
-
- ).getReturnCode();
-
- if (ret != 0) {
- logger.error("Unable to upgrade specified installation due to above error");
- System.exit(1);
- }
-
- File upgradeBackup = new File(Bootstrap.installDir, getBackupName(upgradeDir.getName()));
- FileUtils.createDir(upgradeBackup);
- File dbBackup = null;
-
- FileUtils.cleanDir(new File(upgradeDir, "temp"));
-
- if (usingEmbeddedDB.get()) {
- logger.info("Backing up old installation directory as {}...", upgradeBackup.getAbsolutePath());
- try {
- FileUtils.copyDirectory(upgradeDir, upgradeBackup);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- restoreExecutables(upgradeBackup);
-
- if (!MigrationHelper.getVersion(DatabaseMigrator.class).equals(oldDataVersion.get())) {
- dbBackup = new File(upgradeDir, getBackupName("dbbackup") + ".zip");
- logger.info("Backing up database as {}...", dbBackup.getAbsolutePath());
- backupDB(upgradeDir, dbBackup);
- }
- } else {
- // for non-embedded database, we should include database backup in the old installation backup directory
- // in case we need that for database restore after a failed upgrade
- if (!MigrationHelper.getVersion(DatabaseMigrator.class).equals(oldDataVersion.get())) {
- dbBackup = new File(upgradeDir, getBackupName("dbbackup") + ".zip");
- logger.info("Backing up database as {}...", dbBackup.getAbsolutePath());
- backupDB(upgradeDir, dbBackup);
- }
-
- logger.info("Backing up old installation directory as {}...", upgradeBackup.getAbsolutePath());
- try {
- FileUtils.copyDirectory(upgradeDir, upgradeBackup);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- restoreExecutables(upgradeBackup);
- }
-
- boolean failed;
- try {
- if (dbBackup != null) {
- logger.info("Cleaning database with old program version...");
- ret = buildCommandline(upgradeDir, "clean").execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }
-
- }).getReturnCode();
-
- if (ret != 0) {
- logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());
- failed = true;
- } else {
- failed = false;
- }
-
- if (!failed) {
- logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
- copyProgramFilesTo(upgradeDir);
-
- logger.info("Restoring database with new program version...");
- ret = buildCommandline(upgradeDir, "restore", dbBackup.getAbsolutePath()).execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }
-
- }).getReturnCode();
-
- if (ret != 0) {
- logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());
- failed = true;
- } else {
- failed = false;
- }
- }
- } else {
- logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
- copyProgramFilesTo(upgradeDir);
- failed = false;
- }
- } catch (Exception e) {
- logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);
- failed = true;
- }
-
- if (failed) {
- logger.info("Now restoring old installation directory due to upgrade failure...");
- try {
- /* we do not clean upgradeDir here directly as user may open
- * a command prompt inside the various sub directories to
- * cause it unable to be deleted
- */
- for (File child: upgradeDir.listFiles()) {
- if (child.isDirectory())
- FileUtils.cleanDir(child);
- else
- FileUtils.deleteFile(child);
- }
- FileUtils.copyDirectory(upgradeBackup, upgradeDir);
- restoreExecutables(upgradeDir);
- logger.info("Old installation directory is now restored.");
- } catch (Exception e2) {
- logger.error("Error restoring old installation directory", e2);
- logger.warn("Please restore it manually by deleting all contents under directory \"{}\", and then copying over all contents under directory \"{}\"",
- upgradeDir.getAbsolutePath(), upgradeBackup.getAbsolutePath());
- }
- if (!usingEmbeddedDB.get() && dbBackup != null) {
- logger.warn("The database might be in an inconsistent state due to upgrade failure. In that case, "
- + "you need to restore the database by first cleaning it, and then running below command:");
- if (SystemUtils.IS_OS_WINDOWS) {
- logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore.bat " + dbBackup.getAbsolutePath());
- } else {
- logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore.sh " + dbBackup.getAbsolutePath());
- }
- }
- System.exit(1);
- } else {
- logger.info("Successfully upgraded {}", upgradeDir.getAbsolutePath());
-
- if (Integer.parseInt(oldDataVersion.get()) <= 5) {
- logger.warn("\n"
- + "************************* IMPORTANT NOTICE *************************\n"
- + "* OneDev password hash algorithm has been changed for security *\n"
- + "* reason. Please reset administrator password with the *\n"
- + "* reset_admin_password command. Other users' password will be *\n"
- + "* reset and sent to their mail box automatically when they logs *\n"
- + "* into OneDev. *\n"
- + "********************************************************************");
- }
- System.exit(0);
- }
- }
-
- private void backupDB(File upgradeDir, File dbBackup) {
- int ret = buildCommandline(upgradeDir, "backup", dbBackup.getAbsolutePath()).execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.info(prefixUpgradeTargetLog(line));
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(prefixUpgradeTargetLog(line));
- }
-
- }).getReturnCode();
-
- if (ret != 0) {
- logger.error("Unable to upgrade specified installation due to above error");
- System.exit(1);
- }
- }
-
- private String getBackupName(String name) {
- return name + "~" + DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime());
- }
-
- protected void copyProgramFilesTo(File upgradeDir) {
- cleanAndCopy(new File(Bootstrap.installDir, "3rdparty-licenses"), new File(upgradeDir, "3rdparty-licenses"));
-
- File siteServerScriptFile = new File(upgradeDir, "bin/server.sh");
- for (File file: Bootstrap.getBinDir().listFiles()) {
- try {
- String serverScript = null;
- if (file.getName().equals("server.sh")) {
- String siteRunAsUserLine = null;
- for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {
- if (line.contains("RUN_AS_USER")) {
- siteRunAsUserLine = line;
- break;
- }
- }
- if (siteRunAsUserLine != null) {
- String newRunAsUserLine = null;
- for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {
- if (line.contains("RUN_AS_USER")) {
- newRunAsUserLine = line;
- break;
- }
- }
- if (newRunAsUserLine != null) {
- serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());
- serverScript = StringUtils.replace(serverScript, newRunAsUserLine, siteRunAsUserLine);
- }
- }
- }
- if (serverScript != null)
- FileUtils.writeStringToFile(siteServerScriptFile, serverScript, Charset.defaultCharset());
- else
- FileUtils.copyFile(file, new File(upgradeDir, "bin/" + file.getName()));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));
- cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));
- for (File file: new File(Bootstrap.getSiteDir(), "avatars").listFiles()) {
- try {
- FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/avatars"));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- File uploadedDir = new File(upgradeDir, "site/avatars/uploaded");
- File userUploadsDir = new File(uploadedDir, "users");
- if (uploadedDir.exists() && !userUploadsDir.exists()) {
- FileUtils.createDir(userUploadsDir);
- for (File file: uploadedDir.listFiles()) {
- if (file.isFile()) {
- try {
- FileUtils.moveFileToDirectory(file, userUploadsDir, false);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
- }
- try {
- File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");
- String wrapperConf = FileUtils.readFileToString(wrapperConfFile, Charsets.UTF_8);
- wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",
- "io.onedev.commons.launcher.bootstrap.Bootstrap");
- wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap",
- "io.onedev.commons.launcher.bootstrap.Bootstrap");
- wrapperConf = StringUtils.replace(wrapperConf, "com.turbodev.launcher.bootstrap.Bootstrap",
- "io.onedev.commons.launcher.bootstrap.Bootstrap");
- wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.launcher.bootstrap.Bootstrap",
- "io.onedev.commons.launcher.bootstrap.Bootstrap");
- FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, Charsets.UTF_8);
-
- File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");
- String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, Charsets.UTF_8);
- hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false",
- "hibernate.hikari.autoCommit=true");
- hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "OneDev");
- hibernateProps = StringUtils.replace(hibernateProps, "TurboDev", "OneDev");
-
- if (!hibernateProps.contains("hibernate.connection.autocommit=true")) {
- hibernateProps = StringUtils.replace(hibernateProps,
- "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider",
- "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider\r\n"
- + "hibernate.connection.autocommit=true");
- }
- FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, Charsets.UTF_8);
-
- File logbackConfigFile = new File(upgradeDir, "conf/logback.xml");
- String logbackConfig = FileUtils.readFileToString(logbackConfigFile, Charsets.UTF_8);
- logbackConfig = StringUtils.replace(logbackConfig, "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>",
- "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"><maxFileSize>1MB</maxFileSize></triggeringPolicy>");
- logbackConfig = StringUtils.replace(logbackConfig, "gitplex", "turbodev");
- logbackConfig = StringUtils.replace(logbackConfig, "com.turbodev", "io.onedev");
- logbackConfig = StringUtils.replace(logbackConfig, "turbodev", "onedev");
- FileUtils.writeStringToFile(logbackConfigFile, logbackConfig, Charsets.UTF_8);
-
- FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"),
- new File(upgradeDir, "conf/wrapper-license.conf"));
- FileUtils.copyFile(new File(Bootstrap.installDir, "readme.txt"), new File(upgradeDir, "readme.txt"));
- FileUtils.copyFile(new File(Bootstrap.installDir, "license.txt"), new File(upgradeDir, "license.txt"));
- FileUtils.copyFile(new File(Bootstrap.installDir, "version.txt"), new File(upgradeDir, "version.txt"));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- restoreExecutables(upgradeDir);
- }
-
- protected void cleanAndCopy(File srcDir, File destDir) {
- try {
- FileUtils.cleanDir(destDir);
- FileUtils.copyDirectory(srcDir, destDir);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private void restoreExecutables(File installDir) {
- for (File file: new File(installDir, "bin").listFiles()) {
- if (file.getName().endsWith(".sh"))
- file.setExecutable(true);
- }
- }
-
-}
+package io.onedev.server.command;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.lang3.SystemUtils;
+import org.hibernate.Interceptor;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Charsets;
+
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.PluginManager;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.server.migration.DatabaseMigrator;
+import io.onedev.server.migration.MigrationHelper;
+import io.onedev.server.persistence.DefaultPersistManager;
+import io.onedev.server.persistence.HibernateProperties;
+import io.onedev.server.persistence.IdManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.validation.EntityValidator;
+
+@Singleton
+public class UpgradeCommand extends DefaultPersistManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(UpgradeCommand.class);
+
+ private static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";
+
+ private final String appName;
+
+ @Inject
+ public UpgradeCommand(PhysicalNamingStrategy physicalNamingStrategy,
+ HibernateProperties properties, Interceptor interceptor,
+ IdManager idManager, Dao dao, EntityValidator validator, PluginManager pluginManager) {
+ super(physicalNamingStrategy, properties, interceptor, idManager, dao, validator);
+ appName = pluginManager.getProduct().getName();
+ }
+
+ protected Commandline buildCommandline(File upgradeDir, String command, String...commandArgs) {
+ String version;
+ File versionFile = new File(upgradeDir, "version.txt");
+ if (versionFile.exists()) {
+ try {
+ version = FileUtils.readFileToString(versionFile, Charset.defaultCharset()).trim();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ version = "1.0-EAP-build26";
+ }
+
+ String bootstrapClass;
+ if (version.startsWith("1.0-EAP")) {
+ int build = Integer.parseInt(StringUtils.substringAfterLast(version, "build"));
+ if (build <= 26)
+ bootstrapClass = "com.gitplex.commons.bootstrap.Bootstrap";
+ else
+ bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";
+ } else if (version.startsWith("1.0.0")) {
+ bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap";
+ } else if (version.startsWith("1.0.1")) {
+ bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap";
+ } else if (version.startsWith("2.0.")){
+ bootstrapClass = "io.onedev.launcher.bootstrap.Bootstrap";
+ } else {
+ bootstrapClass = "io.onedev.commons.launcher.bootstrap.Bootstrap";
+ }
+ Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java");
+ cmdline.addArgs("-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m", "-classpath", "*", bootstrapClass,
+ command);
+ cmdline.addArgs(commandArgs);
+ cmdline.workingDir(new File(upgradeDir, "boot"));
+ return cmdline;
+ }
+
+ private String prefixUpgradeTargetLog(String line) {
+ return ">>> " + line;
+ }
+
+ @Override
+ public void start() {
+ if (Bootstrap.command.getArgs().length == 0) {
+ logger.error("Missing upgrade target parameter. Usage: {} <installation directory of old {} version>",
+ Bootstrap.command.getScript(), appName);
+ System.exit(1);
+ }
+ File upgradeDir = new File(Bootstrap.command.getArgs()[0]);
+ if (!upgradeDir.isAbsolute())
+ upgradeDir = new File(Bootstrap.getBinDir(), upgradeDir.getPath());
+
+ if (!upgradeDir.exists()) {
+ logger.error("Unable to find directory: {}", upgradeDir.getAbsolutePath());
+ System.exit(1);
+ }
+
+ logger.info("Upgrading {}...", upgradeDir.getAbsolutePath());
+
+ if (!new File(upgradeDir, "boot/bootstrap.keys").exists()) {
+ logger.error("Invalid {} installation directory: {}, make sure you are specifying the top level "
+ + "installation directory (it contains sub directories such as \"bin\", \"boot\", \"conf\", etc)",
+ appName, upgradeDir.getAbsolutePath());
+ System.exit(1);
+ }
+
+ if (Bootstrap.isServerRunning(upgradeDir)) {
+ logger.error("Please stop server running at \"{}\" before upgrading", upgradeDir.getAbsolutePath());
+ System.exit(1);
+ }
+ if (Bootstrap.isServerRunning(Bootstrap.installDir)) {
+ logger.error("Please stop server running at \"{}\" before upgrading", Bootstrap.installDir.getAbsolutePath());
+ System.exit(1);
+ }
+
+ for (File file: new File(upgradeDir, "lib").listFiles()) {
+ if (file.getName().contains("mariadb") || file.getName().contains("mysql")
+ || file.getName().contains("ojdbc") || file.getName().contains("postgresql")
+ || file.getName().contains("sqljdbc")) {
+ try {
+ FileUtils.moveFileToDirectory(file, new File(upgradeDir, "site/lib"), true);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ AtomicReference<String> oldDataVersion = new AtomicReference<>(null);
+ int ret = buildCommandline(upgradeDir, "check_data_version").execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ String prefix = "Data version: ";
+ if (line.startsWith(prefix)) {
+ oldDataVersion.set(line.substring(prefix.length()));
+ logger.info("Old data version: " + oldDataVersion.get());
+ } else {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }}
+
+ ).getReturnCode();
+
+ if (ret != 0) {
+ logger.error("Unable to upgrade specified installation due to above error");
+ System.exit(1);
+ }
+
+ AtomicBoolean usingEmbeddedDB = new AtomicBoolean(false);
+ ret = buildCommandline(upgradeDir, "db_dialect").execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ String prefix = "Database dialect: ";
+ String dialect;
+ if (line.startsWith(prefix)) {
+ dialect = line.substring(prefix.length());
+ logger.info("Database dialect: " + dialect);
+ if (dialect.toLowerCase().contains("hsql"))
+ usingEmbeddedDB.set(true);
+ } else {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }}
+
+ ).getReturnCode();
+
+ if (ret != 0) {
+ logger.error("Unable to upgrade specified installation due to above error");
+ System.exit(1);
+ }
+
+ File upgradeBackup = new File(Bootstrap.installDir, getBackupName(upgradeDir.getName()));
+ FileUtils.createDir(upgradeBackup);
+ File dbBackup = null;
+
+ if (usingEmbeddedDB.get()) {
+ logger.info("Backing up old installation directory as {}...", upgradeBackup.getAbsolutePath());
+ try {
+ int baseLen = upgradeDir.getAbsolutePath().length() + 1;
+ FileUtils.copyDirectory(upgradeDir, upgradeBackup, new FileFilter() {
+
+ @Override
+ public boolean accept(File pathname) {
+ String relative = pathname.getAbsolutePath().substring(baseLen);
+ return !relative.equals("temp") && !relative.equals("cache");
+ }
+
+ });
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ restoreExecutables(upgradeBackup);
+
+ if (!MigrationHelper.getVersion(DatabaseMigrator.class).equals(oldDataVersion.get())) {
+ dbBackup = new File(upgradeDir, getBackupName("dbbackup") + ".zip");
+ logger.info("Backing up database as {}...", dbBackup.getAbsolutePath());
+ backupDB(upgradeDir, dbBackup);
+ }
+ } else {
+ // for non-embedded database, we should include database backup in the old installation backup directory
+ // in case we need that for database restore after a failed upgrade
+ if (!MigrationHelper.getVersion(DatabaseMigrator.class).equals(oldDataVersion.get())) {
+ dbBackup = new File(upgradeDir, getBackupName("dbbackup") + ".zip");
+ logger.info("Backing up database as {}...", dbBackup.getAbsolutePath());
+ backupDB(upgradeDir, dbBackup);
+ }
+
+ logger.info("Backing up old installation directory as {}...", upgradeBackup.getAbsolutePath());
+ try {
+ FileUtils.copyDirectory(upgradeDir, upgradeBackup);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ restoreExecutables(upgradeBackup);
+ }
+
+ boolean failed;
+ try {
+ if (dbBackup != null) {
+ logger.info("Cleaning database with old program version...");
+ ret = buildCommandline(upgradeDir, "clean").execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }
+
+ }).getReturnCode();
+
+ if (ret != 0) {
+ logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());
+ failed = true;
+ } else {
+ failed = false;
+ }
+
+ if (!failed) {
+ logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
+ copyProgramFilesTo(upgradeDir);
+
+ logger.info("Restoring database with new program version...");
+ ret = buildCommandline(upgradeDir, "restore", dbBackup.getAbsolutePath()).execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }
+
+ }).getReturnCode();
+
+ if (ret != 0) {
+ logger.error("Failed to upgrade {}", upgradeDir.getAbsolutePath());
+ failed = true;
+ } else {
+ failed = false;
+ }
+ }
+ } else {
+ logger.info("Copying new program files into {}...", upgradeDir.getAbsolutePath());
+ copyProgramFilesTo(upgradeDir);
+ failed = false;
+ }
+ } catch (Exception e) {
+ logger.error("Error upgrading " + upgradeDir.getAbsolutePath(), e);
+ failed = true;
+ }
+
+ if (failed) {
+ logger.info("Now restoring old installation directory due to upgrade failure...");
+ try {
+ /* we do not clean upgradeDir here directly as user may open
+ * a command prompt inside the various sub directories to
+ * cause it unable to be deleted
+ */
+ for (File child: upgradeDir.listFiles()) {
+ if (child.isDirectory())
+ FileUtils.cleanDir(child);
+ else
+ FileUtils.deleteFile(child);
+ }
+ FileUtils.copyDirectory(upgradeBackup, upgradeDir);
+ restoreExecutables(upgradeDir);
+ logger.info("Old installation directory is now restored.");
+ } catch (Exception e2) {
+ logger.error("Error restoring old installation directory", e2);
+ logger.warn("Please restore it manually by deleting all contents under directory \"{}\", and then copying over all contents under directory \"{}\"",
+ upgradeDir.getAbsolutePath(), upgradeBackup.getAbsolutePath());
+ }
+ if (!usingEmbeddedDB.get() && dbBackup != null) {
+ logger.warn("The database might be in an inconsistent state due to upgrade failure. In that case, "
+ + "you need to restore the database by first cleaning it, and then running below command:");
+ if (SystemUtils.IS_OS_WINDOWS) {
+ logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore.bat " + dbBackup.getAbsolutePath());
+ } else {
+ logger.info(upgradeDir.getAbsolutePath() + File.separator + "bin" + File.separator + "restore.sh " + dbBackup.getAbsolutePath());
+ }
+ }
+ System.exit(1);
+ } else {
+ logger.info("Successfully upgraded {}", upgradeDir.getAbsolutePath());
+
+ if (Integer.parseInt(oldDataVersion.get()) <= 5) {
+ logger.warn("\n"
+ + "************************* IMPORTANT NOTICE *************************\n"
+ + "* OneDev password hash algorithm has been changed for security *\n"
+ + "* reason. Please reset administrator password with the *\n"
+ + "* reset_admin_password command. Other users' password will be *\n"
+ + "* reset and sent to their mail box automatically when they logs *\n"
+ + "* into OneDev. *\n"
+ + "********************************************************************");
+ }
+ System.exit(0);
+ }
+ }
+
+ private void backupDB(File upgradeDir, File dbBackup) {
+ int ret = buildCommandline(upgradeDir, "backup", dbBackup.getAbsolutePath()).execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.info(prefixUpgradeTargetLog(line));
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(prefixUpgradeTargetLog(line));
+ }
+
+ }).getReturnCode();
+
+ if (ret != 0) {
+ logger.error("Unable to upgrade specified installation due to above error");
+ System.exit(1);
+ }
+ }
+
+ private String getBackupName(String name) {
+ return name + "~" + DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime());
+ }
+
+ protected void copyProgramFilesTo(File upgradeDir) {
+ cleanAndCopy(new File(Bootstrap.installDir, "3rdparty-licenses"), new File(upgradeDir, "3rdparty-licenses"));
+
+ File siteServerScriptFile = new File(upgradeDir, "bin/server.sh");
+ for (File file: Bootstrap.getBinDir().listFiles()) {
+ try {
+ String serverScript = null;
+ if (file.getName().equals("server.sh")) {
+ String siteRunAsUserLine = null;
+ for (String line: (List<String>)FileUtils.readLines(siteServerScriptFile, Charset.defaultCharset())) {
+ if (line.contains("RUN_AS_USER")) {
+ siteRunAsUserLine = line;
+ break;
+ }
+ }
+ if (siteRunAsUserLine != null) {
+ String newRunAsUserLine = null;
+ for (String line: (List<String>)FileUtils.readLines(file, Charset.defaultCharset())) {
+ if (line.contains("RUN_AS_USER")) {
+ newRunAsUserLine = line;
+ break;
+ }
+ }
+ if (newRunAsUserLine != null) {
+ serverScript = FileUtils.readFileToString(file, Charset.defaultCharset());
+ serverScript = StringUtils.replace(serverScript, newRunAsUserLine, siteRunAsUserLine);
+ }
+ }
+ }
+ if (serverScript != null)
+ FileUtils.writeStringToFile(siteServerScriptFile, serverScript, Charset.defaultCharset());
+ else
+ FileUtils.copyFile(file, new File(upgradeDir, "bin/" + file.getName()));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot"));
+ cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib"));
+ for (File file: new File(Bootstrap.getSiteDir(), "avatars").listFiles()) {
+ try {
+ FileUtils.copyFileToDirectory(file, new File(upgradeDir, "site/avatars"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ File uploadedDir = new File(upgradeDir, "site/avatars/uploaded");
+ File userUploadsDir = new File(uploadedDir, "users");
+ if (uploadedDir.exists() && !userUploadsDir.exists()) {
+ FileUtils.createDir(userUploadsDir);
+ for (File file: uploadedDir.listFiles()) {
+ if (file.isFile()) {
+ try {
+ FileUtils.moveFileToDirectory(file, userUploadsDir, false);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+ try {
+ File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf");
+ String wrapperConf = FileUtils.readFileToString(wrapperConfFile, Charsets.UTF_8);
+ wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap",
+ "io.onedev.commons.launcher.bootstrap.Bootstrap");
+ wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap",
+ "io.onedev.commons.launcher.bootstrap.Bootstrap");
+ wrapperConf = StringUtils.replace(wrapperConf, "com.turbodev.launcher.bootstrap.Bootstrap",
+ "io.onedev.commons.launcher.bootstrap.Bootstrap");
+ wrapperConf = StringUtils.replace(wrapperConf, "io.onedev.launcher.bootstrap.Bootstrap",
+ "io.onedev.commons.launcher.bootstrap.Bootstrap");
+ FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, Charsets.UTF_8);
+
+ File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties");
+ String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, Charsets.UTF_8);
+ hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false",
+ "hibernate.hikari.autoCommit=true");
+ hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "OneDev");
+ hibernateProps = StringUtils.replace(hibernateProps, "TurboDev", "OneDev");
+
+ if (!hibernateProps.contains("hibernate.connection.autocommit=true")) {
+ hibernateProps = StringUtils.replace(hibernateProps,
+ "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider",
+ "hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider\r\n"
+ + "hibernate.connection.autocommit=true");
+ }
+ FileUtils.writeStringToFile(hibernatePropsFile, hibernateProps, Charsets.UTF_8);
+
+ File logbackConfigFile = new File(upgradeDir, "conf/logback.xml");
+ String logbackConfig = FileUtils.readFileToString(logbackConfigFile, Charsets.UTF_8);
+ logbackConfig = StringUtils.replace(logbackConfig, "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>",
+ "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"><maxFileSize>1MB</maxFileSize></triggeringPolicy>");
+ logbackConfig = StringUtils.replace(logbackConfig, "gitplex", "turbodev");
+ logbackConfig = StringUtils.replace(logbackConfig, "com.turbodev", "io.onedev");
+ logbackConfig = StringUtils.replace(logbackConfig, "turbodev", "onedev");
+ FileUtils.writeStringToFile(logbackConfigFile, logbackConfig, Charsets.UTF_8);
+
+ FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"),
+ new File(upgradeDir, "conf/wrapper-license.conf"));
+ FileUtils.copyFile(new File(Bootstrap.installDir, "readme.txt"), new File(upgradeDir, "readme.txt"));
+ FileUtils.copyFile(new File(Bootstrap.installDir, "license.txt"), new File(upgradeDir, "license.txt"));
+ FileUtils.copyFile(new File(Bootstrap.installDir, "version.txt"), new File(upgradeDir, "version.txt"));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ restoreExecutables(upgradeDir);
+ }
+
+ protected void cleanAndCopy(File srcDir, File destDir) {
+ try {
+ FileUtils.cleanDir(destDir);
+ FileUtils.copyDirectory(srcDir, destDir);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private void restoreExecutables(File installDir) {
+ for (File file: new File(installDir, "bin").listFiles()) {
+ if (file.getName().endsWith(".sh"))
+ file.setExecutable(true);
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
index 11a2190ed2..facd356018 100644
--- a/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
+++ b/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
@@ -1,265 +1,265 @@
-package io.onedev.server.data;
-
-import java.io.File;
-import java.io.ObjectStreamException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.Validator;
-
-import org.apache.shiro.authc.credential.PasswordService;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.quartz.CronScheduleBuilder;
-import org.quartz.ScheduleBuilder;
-
-import com.google.common.base.Throwables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
-
-import io.onedev.commons.launcher.bootstrap.Bootstrap;
-import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.commons.launcher.loader.ManagedSerializedForm;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.ZipUtils;
-import io.onedev.commons.utils.init.ManualConfig;
-import io.onedev.commons.utils.init.Skippable;
-import io.onedev.commons.utils.schedule.SchedulableTask;
-import io.onedev.commons.utils.schedule.TaskScheduler;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.system.SystemStarting;
-import io.onedev.server.model.Setting;
-import io.onedev.server.model.Setting.Key;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.setting.BackupSetting;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.model.support.setting.MailSetting;
-import io.onedev.server.model.support.setting.SecuritySetting;
-import io.onedev.server.model.support.setting.SystemSetting;
-import io.onedev.server.notification.MailManager;
-import io.onedev.server.persistence.IdManager;
-import io.onedev.server.persistence.PersistManager;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-
-@Singleton
-public class DefaultDataManager implements DataManager, Serializable {
-
- private static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";
-
- private final UserManager userManager;
-
- private final SettingManager settingManager;
-
- private final IdManager idManager;
-
- private final Validator validator;
-
- private final PersistManager persistManager;
-
- private final MailManager mailManager;
-
- private final PasswordService passwordService;
-
- private final TaskScheduler taskScheduler;
-
- private String backupTaskId;
-
- @Inject
- public DefaultDataManager(IdManager idManager, UserManager userManager,
- SettingManager settingManager, PersistManager persistManager,
- MailManager mailManager, Validator validator, TaskScheduler taskScheduler,
- PasswordService passwordService) {
- this.userManager = userManager;
- this.settingManager = settingManager;
- this.validator = validator;
- this.taskScheduler = taskScheduler;
- this.idManager = idManager;
- this.persistManager = persistManager;
- this.mailManager = mailManager;
- this.passwordService = passwordService;
- }
-
- @SuppressWarnings("serial")
- @Transactional
- @Override
- public List<ManualConfig> init() {
- List<ManualConfig> manualConfigs = new ArrayList<ManualConfig>();
- User administrator = userManager.get(User.ROOT_ID);
- if (administrator == null) {
- administrator = new User();
- administrator.setId(User.ROOT_ID);
- Set<String> excludedProperties = Sets.newHashSet("administrator", "canCreateProjects");
- manualConfigs.add(new ManualConfig("Create Administator User", administrator, excludedProperties) {
-
- @Override
- public Skippable getSkippable() {
- return null;
- }
-
- @Override
- public void complete() {
- User user = (User) getSetting();
- user.setPassword(passwordService.encryptPassword("admin"));
- userManager.save(user, null);
- idManager.init(User.class);
- }
-
- });
- }
-
- Setting setting = settingManager.getSetting(Key.SYSTEM);
- SystemSetting systemSetting = null;
-
- if (setting == null || setting.getValue() == null) {
- systemSetting = new SystemSetting();
- systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl());
- } else {
- if (!validator.validate(setting.getValue()).isEmpty())
- systemSetting = (SystemSetting) setting.getValue();
- }
- if (systemSetting != null) {
- manualConfigs.add(new ManualConfig("Specify System Setting", systemSetting) {
-
- @Override
- public Skippable getSkippable() {
- return null;
- }
-
- @Override
- public void complete() {
- settingManager.saveSystemSetting((SystemSetting) getSetting());
- }
-
- });
- }
-
- setting = settingManager.getSetting(Key.SECURITY);
- if (setting == null) {
- settingManager.saveSecuritySetting(new SecuritySetting());
- }
- setting = settingManager.getSetting(Key.ISSUE);
- if (setting == null) {
- settingManager.saveIssueSetting(new GlobalIssueSetting());
- }
- setting = settingManager.getSetting(Key.AUTHENTICATOR);
- if (setting == null) {
- settingManager.saveAuthenticator(null);
- }
- setting = settingManager.getSetting(Key.JOB_EXECUTORS);
- if (setting == null) {
- settingManager.saveJobExecutors(new ArrayList<>());
- }
-
- setting = settingManager.getSetting(Key.MAIL);
- if (setting == null) {
- settingManager.saveMailSetting(null);
- } else if (setting.getValue() != null && !validator.validate(setting.getValue()).isEmpty()) {
- manualConfigs.add(new ManualConfig("Specify Mail Setting", setting.getValue()) {
-
- @Override
- public Skippable getSkippable() {
- return null;
- }
-
- @Override
- public void complete() {
- settingManager.saveMailSetting((MailSetting) getSetting());
- }
-
- });
- }
-
- setting = settingManager.getSetting(Key.BACKUP);
- if (setting == null) {
- settingManager.saveBackupSetting(null);
- } else if (setting.getValue() != null && !validator.validate(setting.getValue()).isEmpty()) {
- Serializable backupSetting = setting.getValue();
- manualConfigs.add(new ManualConfig("Specify Backup Setting", backupSetting) {
-
- @Override
- public Skippable getSkippable() {
- return null;
- }
-
- @Override
- public void complete() {
- settingManager.saveBackupSetting((BackupSetting) getSetting());
- }
-
- });
- }
-
- return manualConfigs;
- }
-
- @Override
- public void scheduleBackup(BackupSetting backupSetting) {
- if (backupTaskId != null)
- taskScheduler.unschedule(backupTaskId);
- if (backupSetting != null) {
- backupTaskId = taskScheduler.schedule(new SchedulableTask() {
-
- @Override
- public void execute() {
- File tempDir = FileUtils.createTempDir("backup");
- try {
- File backupDir = new File(backupSetting.getFolder());
- if (!backupDir.isAbsolute())
- backupDir = new File(Bootstrap.installDir, backupSetting.getFolder());
- if (!backupDir.exists()) {
- throw new RuntimeException("Backup directory does not exist: " + backupDir.getAbsolutePath());
- }
- persistManager.exportData(tempDir);
- File backupFile = new File(backupDir,
- DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime()) + ".zip");
- ZipUtils.zip(tempDir, backupFile);
- } catch (Exception e) {
- notifyBackupError(e);
- throw ExceptionUtils.unchecked(e);
- } finally {
- FileUtils.deleteDir(tempDir);
- }
- }
-
- @Override
- public ScheduleBuilder<?> getScheduleBuilder() {
- return CronScheduleBuilder.cronSchedule(backupSetting.getSchedule());
- }
-
- });
- }
- }
-
- @Listen
- public void on(SystemStarting event) {
- scheduleBackup(settingManager.getBackupSetting());
- }
-
- @Sessional
- protected void notifyBackupError(Exception e) {
- User root = userManager.getRoot();
- String url = settingManager.getSystemSetting().getServerUrl();
- String body = String.format(""
- + "OneDev url: <a href='%s'>%s</a>"
- + "<p style='margin: 16px 0;'>"
- + "<b>Error detail:</b>"
- + "<pre style='font-family: monospace;'>%s</pre>"
- + "<p style='margin: 16px 0;'>"
- + "-- Sent by OneDev",
- url, url, Throwables.getStackTraceAsString(e));
- mailManager.sendMail(Lists.newArrayList(root.getEmail()), "OneDev database auto-backup failed", body);
- }
-
- public Object writeReplace() throws ObjectStreamException {
- return new ManagedSerializedForm(DataManager.class);
- }
-
-}
+package io.onedev.server.data;
+
+import java.io.File;
+import java.io.ObjectStreamException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.Validator;
+
+import org.apache.shiro.authc.credential.PasswordService;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.ScheduleBuilder;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ManagedSerializedForm;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.ZipUtils;
+import io.onedev.commons.utils.init.ManualConfig;
+import io.onedev.commons.utils.init.Skippable;
+import io.onedev.commons.utils.schedule.SchedulableTask;
+import io.onedev.commons.utils.schedule.TaskScheduler;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.system.SystemStarting;
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.Setting.Key;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.setting.BackupSetting;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.model.support.setting.MailSetting;
+import io.onedev.server.model.support.setting.SecuritySetting;
+import io.onedev.server.model.support.setting.SystemSetting;
+import io.onedev.server.notification.MailManager;
+import io.onedev.server.persistence.IdManager;
+import io.onedev.server.persistence.PersistManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+
+@Singleton
+public class DefaultDataManager implements DataManager, Serializable {
+
+ private static final String BACKUP_DATETIME_FORMAT = "yyyy-MM-dd_HH-mm-ss";
+
+ private final UserManager userManager;
+
+ private final SettingManager settingManager;
+
+ private final IdManager idManager;
+
+ private final Validator validator;
+
+ private final PersistManager persistManager;
+
+ private final MailManager mailManager;
+
+ private final PasswordService passwordService;
+
+ private final TaskScheduler taskScheduler;
+
+ private String backupTaskId;
+
+ @Inject
+ public DefaultDataManager(IdManager idManager, UserManager userManager,
+ SettingManager settingManager, PersistManager persistManager,
+ MailManager mailManager, Validator validator, TaskScheduler taskScheduler,
+ PasswordService passwordService) {
+ this.userManager = userManager;
+ this.settingManager = settingManager;
+ this.validator = validator;
+ this.taskScheduler = taskScheduler;
+ this.idManager = idManager;
+ this.persistManager = persistManager;
+ this.mailManager = mailManager;
+ this.passwordService = passwordService;
+ }
+
+ @SuppressWarnings("serial")
+ @Transactional
+ @Override
+ public List<ManualConfig> init() {
+ List<ManualConfig> manualConfigs = new ArrayList<ManualConfig>();
+ User administrator = userManager.get(User.ROOT_ID);
+ if (administrator == null) {
+ administrator = new User();
+ administrator.setId(User.ROOT_ID);
+ Set<String> excludedProperties = Sets.newHashSet("administrator", "canCreateProjects");
+ manualConfigs.add(new ManualConfig("Create Administator User", administrator, excludedProperties) {
+
+ @Override
+ public Skippable getSkippable() {
+ return null;
+ }
+
+ @Override
+ public void complete() {
+ User user = (User) getSetting();
+ user.setPassword(passwordService.encryptPassword("admin"));
+ userManager.save(user, null);
+ idManager.init(User.class);
+ }
+
+ });
+ }
+
+ Setting setting = settingManager.getSetting(Key.SYSTEM);
+ SystemSetting systemSetting = null;
+
+ if (setting == null || setting.getValue() == null) {
+ systemSetting = new SystemSetting();
+ systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl());
+ } else {
+ if (!validator.validate(setting.getValue()).isEmpty())
+ systemSetting = (SystemSetting) setting.getValue();
+ }
+ if (systemSetting != null) {
+ manualConfigs.add(new ManualConfig("Specify System Setting", systemSetting) {
+
+ @Override
+ public Skippable getSkippable() {
+ return null;
+ }
+
+ @Override
+ public void complete() {
+ settingManager.saveSystemSetting((SystemSetting) getSetting());
+ }
+
+ });
+ }
+
+ setting = settingManager.getSetting(Key.SECURITY);
+ if (setting == null) {
+ settingManager.saveSecuritySetting(new SecuritySetting());
+ }
+ setting = settingManager.getSetting(Key.ISSUE);
+ if (setting == null) {
+ settingManager.saveIssueSetting(new GlobalIssueSetting());
+ }
+ setting = settingManager.getSetting(Key.AUTHENTICATOR);
+ if (setting == null) {
+ settingManager.saveAuthenticator(null);
+ }
+ setting = settingManager.getSetting(Key.JOB_EXECUTORS);
+ if (setting == null) {
+ settingManager.saveJobExecutors(new ArrayList<>());
+ }
+
+ setting = settingManager.getSetting(Key.MAIL);
+ if (setting == null) {
+ settingManager.saveMailSetting(null);
+ } else if (setting.getValue() != null && !validator.validate(setting.getValue()).isEmpty()) {
+ manualConfigs.add(new ManualConfig("Specify Mail Setting", setting.getValue()) {
+
+ @Override
+ public Skippable getSkippable() {
+ return null;
+ }
+
+ @Override
+ public void complete() {
+ settingManager.saveMailSetting((MailSetting) getSetting());
+ }
+
+ });
+ }
+
+ setting = settingManager.getSetting(Key.BACKUP);
+ if (setting == null) {
+ settingManager.saveBackupSetting(null);
+ } else if (setting.getValue() != null && !validator.validate(setting.getValue()).isEmpty()) {
+ Serializable backupSetting = setting.getValue();
+ manualConfigs.add(new ManualConfig("Specify Backup Setting", backupSetting) {
+
+ @Override
+ public Skippable getSkippable() {
+ return null;
+ }
+
+ @Override
+ public void complete() {
+ settingManager.saveBackupSetting((BackupSetting) getSetting());
+ }
+
+ });
+ }
+
+ return manualConfigs;
+ }
+
+ @Override
+ public void scheduleBackup(BackupSetting backupSetting) {
+ if (backupTaskId != null)
+ taskScheduler.unschedule(backupTaskId);
+ if (backupSetting != null) {
+ backupTaskId = taskScheduler.schedule(new SchedulableTask() {
+
+ @Override
+ public void execute() {
+ File tempDir = FileUtils.createTempDir("backup");
+ try {
+ File backupDir = new File(backupSetting.getFolder());
+ if (!backupDir.isAbsolute())
+ backupDir = new File(Bootstrap.installDir, backupSetting.getFolder());
+ if (!backupDir.exists()) {
+ throw new RuntimeException("Backup directory does not exist: " + backupDir.getAbsolutePath());
+ }
+ persistManager.exportData(tempDir);
+ File backupFile = new File(backupDir,
+ DateTimeFormat.forPattern(BACKUP_DATETIME_FORMAT).print(new DateTime()) + ".zip");
+ ZipUtils.zip(tempDir, backupFile);
+ } catch (Exception e) {
+ notifyBackupError(e);
+ throw ExceptionUtils.unchecked(e);
+ } finally {
+ FileUtils.deleteDir(tempDir);
+ }
+ }
+
+ @Override
+ public ScheduleBuilder<?> getScheduleBuilder() {
+ return CronScheduleBuilder.cronSchedule(backupSetting.getSchedule());
+ }
+
+ });
+ }
+ }
+
+ @Listen
+ public void on(SystemStarting event) {
+ scheduleBackup(settingManager.getBackupSetting());
+ }
+
+ @Sessional
+ protected void notifyBackupError(Throwable e) {
+ User root = userManager.getRoot();
+ String url = settingManager.getSystemSetting().getServerUrl();
+ String body = String.format(""
+ + "OneDev url: <a href='%s'>%s</a>"
+ + "<p style='margin: 16px 0;'>"
+ + "<b>Error detail:</b>"
+ + "<pre style='font-family: monospace;'>%s</pre>"
+ + "<p style='margin: 16px 0;'>"
+ + "-- Sent by OneDev",
+ url, url, Throwables.getStackTraceAsString(e));
+ mailManager.sendMail(Lists.newArrayList(root.getEmail()), "OneDev database auto-backup failed", body);
+ }
+
+ public Object writeReplace() throws ObjectStreamException {
+ return new ManagedSerializedForm(DataManager.class);
+ }
+
+}
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.java
index c394a81df0..1dfbb7d2f1 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
@@ -18,10 +18,12 @@ import org.hibernate.query.Query;
import com.google.common.base.Preconditions;
+import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.utils.FileUtils;
import io.onedev.server.entitymanager.Build2Manager;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.entitymanager.BuildParamManager;
+import io.onedev.server.event.build2.BuildSubmitted;
import io.onedev.server.model.Build2;
import io.onedev.server.model.Build2.Status;
import io.onedev.server.model.BuildDependence;
@@ -45,7 +47,8 @@ public class DefaultBuild2Manager extends AbstractEntityManager<Build2> implemen
@Inject
public DefaultBuild2Manager(Dao dao, BuildParamManager buildParamManager,
- BuildDependenceManager buildDependenceManager, StorageManager storageManager) {
+ BuildDependenceManager buildDependenceManager,
+ StorageManager storageManager) {
super(dao);
this.buildParamManager = buildParamManager;
this.buildDependenceManager = buildDependenceManager;
@@ -115,8 +118,11 @@ public class DefaultBuild2Manager extends AbstractEntityManager<Build2> implemen
buildParamManager.save(param);
for (BuildDependence dependence: build.getDependencies())
buildDependenceManager.save(dependence);
-
- FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getId()));
}
+ @Listen
+ public void on(BuildSubmitted event) {
+ Build2 build = event.getBuild();
+ FileUtils.deleteDir(storageManager.getBuildDir(build.getProject().getId(), build.getId()));
+ }
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
index 17ecfb1449..8559baad53 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java
@@ -1,103 +1,103 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.transport.RefSpec;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.commons.launcher.loader.ListenerRegistry;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.entitymanager.PullRequestUpdateManager;
-import io.onedev.server.event.pullrequest.PullRequestUpdated;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestUpdate;
-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 DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRequestUpdate>
- implements PullRequestUpdateManager {
-
- private final ListenerRegistry listenerRegistry;
-
- private final PullRequestManager pullRequestManager;
-
- @Inject
- public DefaultPullRequestUpdateManager(Dao dao, ListenerRegistry listenerRegistry,
- PullRequestCommentManager commentManager, PullRequestManager pullRequestManager) {
- super(dao);
-
- this.listenerRegistry = listenerRegistry;
- this.pullRequestManager = pullRequestManager;
- }
-
- @Transactional
- @Override
- public void save(PullRequestUpdate update) {
- save(update, true);
- }
-
- @Transactional
- @Override
- public void save(PullRequestUpdate update, boolean independent) {
- PullRequest request = update.getRequest();
-
- dao.persist(update);
-
- ObjectId updateHeadId = ObjectId.fromString(update.getHeadCommitHash());
- if (!request.getTargetProject().equals(request.getSourceProject())) {
- try {
- request.getTargetProject().git().fetch()
- .setRemote(request.getSourceProject().getGitDir().getAbsolutePath())
- .setRefSpecs(new RefSpec(GitUtils.branch2ref(request.getSourceBranch()) + ":" + update.getHeadRef()))
- .call();
- if (!request.getTargetProject().getObjectId(update.getHeadRef()).equals(updateHeadId)) {
- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),
- update.getHeadRef());
- refUpdate.setNewObjectId(updateHeadId);
- GitUtils.updateRef(refUpdate);
- }
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- } else {
- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),
- update.getHeadRef());
- refUpdate.setNewObjectId(updateHeadId);
- GitUtils.updateRef(refUpdate);
- }
-
- request.setHeadCommitHash(update.getHeadCommitHash());
- pullRequestManager.save(request);
-
- if (independent) {
- PullRequestUpdated event = new PullRequestUpdated(update);
- listenerRegistry.post(event);
- }
- }
-
- @Sessional
- @Override
- public List<PullRequestUpdate> queryAfter(Project project, Long afterUpdateId, int count) {
- EntityCriteria<PullRequestUpdate> criteria = newCriteria();
- criteria.createCriteria("request").add(Restrictions.eq("targetProject", project));
- criteria.addOrder(Order.asc("id"));
- if (afterUpdateId != null)
- criteria.add(Restrictions.gt("id", afterUpdateId));
- return query(criteria, 0, count);
- }
-
-}
+package io.onedev.server.entitymanager.impl;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.transport.RefSpec;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.server.entitymanager.PullRequestCommentManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.PullRequestUpdateManager;
+import io.onedev.server.event.pullrequest.PullRequestUpdated;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestUpdate;
+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 DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRequestUpdate>
+ implements PullRequestUpdateManager {
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final PullRequestManager pullRequestManager;
+
+ @Inject
+ public DefaultPullRequestUpdateManager(Dao dao, ListenerRegistry listenerRegistry,
+ PullRequestCommentManager commentManager, PullRequestManager pullRequestManager) {
+ super(dao);
+
+ this.listenerRegistry = listenerRegistry;
+ this.pullRequestManager = pullRequestManager;
+ }
+
+ @Transactional
+ @Override
+ public void save(PullRequestUpdate update) {
+ save(update, true);
+ }
+
+ @Transactional
+ @Override
+ public void save(PullRequestUpdate update, boolean independent) {
+ PullRequest request = update.getRequest();
+
+ dao.persist(update);
+
+ ObjectId updateHeadId = ObjectId.fromString(update.getHeadCommitHash());
+ if (!request.getTargetProject().equals(request.getSourceProject())) {
+ try {
+ request.getTargetProject().git().fetch()
+ .setRemote(request.getSourceProject().getGitDir().getAbsolutePath())
+ .setRefSpecs(new RefSpec(GitUtils.branch2ref(request.getSourceBranch()) + ":" + update.getHeadRef()))
+ .call();
+ if (!request.getTargetProject().getObjectId(update.getHeadRef()).equals(updateHeadId)) {
+ RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),
+ update.getHeadRef());
+ refUpdate.setNewObjectId(updateHeadId);
+ GitUtils.updateRef(refUpdate);
+ }
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ } else {
+ RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),
+ update.getHeadRef());
+ refUpdate.setNewObjectId(updateHeadId);
+ GitUtils.updateRef(refUpdate);
+ }
+
+ request.setHeadCommitHash(update.getHeadCommitHash());
+ pullRequestManager.save(request);
+
+ if (independent) {
+ PullRequestUpdated event = new PullRequestUpdated(update);
+ listenerRegistry.post(event);
+ }
+ }
+
+ @Sessional
+ @Override
+ public List<PullRequestUpdate> queryAfter(Project project, Long afterUpdateId, int count) {
+ EntityCriteria<PullRequestUpdate> criteria = newCriteria();
+ criteria.createCriteria("request").add(Restrictions.eq("targetProject", project));
+ criteria.addOrder(Order.asc("id"));
+ if (afterUpdateId != null)
+ criteria.add(Restrictions.gt("id", afterUpdateId));
+ return query(criteria, 0, count);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 6c2d2e9940..2dd9192359 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -44,10 +44,7 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
private volatile Long authenticatorId;
- /*
- * Cache job executors as it may contain internal state
- */
- private List<JobExecutor> jobExecutors;
+ private volatile Long jobExecutorsId;
@Inject
public DefaultSettingManager(Dao dao, DataManager dataManager) {
@@ -225,18 +222,21 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
@Sessional
@SuppressWarnings("unchecked")
@Override
- public synchronized List<JobExecutor> getJobExecutors() {
- if (jobExecutors == null) {
- Setting setting = Preconditions.checkNotNull(getSetting(Key.JOB_EXECUTORS));
- jobExecutors = (List<JobExecutor>) setting.getValue();
- }
- return jobExecutors;
+ public List<JobExecutor> getJobExecutors() {
+ Setting setting;
+ if (jobExecutorsId == null) {
+ setting = getSetting(Key.JOB_EXECUTORS);
+ Preconditions.checkNotNull(setting);
+ jobExecutorsId = setting.getId();
+ } else {
+ setting = load(jobExecutorsId);
+ }
+ return (List<JobExecutor>) setting.getValue();
}
@Transactional
@Override
- public synchronized void saveJobExecutors(List<JobExecutor> jobExecutors) {
- this.jobExecutors = jobExecutors;
+ public void saveJobExecutors(List<JobExecutor> jobExecutors) {
Setting setting = getSetting(Key.JOB_EXECUTORS);
if (setting == null) {
setting = new Setting();
diff --git a/core/src/main/java/io/onedev/server/git/BlobChange.java b/core/src/main/java/io/onedev/server/git/BlobChange.java
index c4d350364c..a410896e18 100644
--- a/core/src/main/java/io/onedev/server/git/BlobChange.java
+++ b/core/src/main/java/io/onedev/server/git/BlobChange.java
@@ -1,195 +1,195 @@
-package io.onedev.server.git;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.jgit.diff.DiffEntry;
-import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.jsyntax.Tokenized;
-import io.onedev.server.util.diff.DiffBlock;
-import io.onedev.server.util.diff.DiffUtils;
-import io.onedev.server.util.diff.WhitespaceOption;
-import io.onedev.server.util.diff.DiffMatchPatch.Operation;
-
-@SuppressWarnings("serial")
-public abstract class BlobChange implements Serializable {
-
- protected final ChangeType type;
-
- protected final WhitespaceOption whitespaceOption;
-
- protected final BlobIdent oldBlobIdent;
-
- protected final BlobIdent newBlobIdent;
-
- private transient List<DiffBlock<Tokenized>> diffBlocks;
-
- public BlobChange(String oldRev, String newRev, DiffEntry diffEntry,
- WhitespaceOption whitespaceOption) {
- if (diffEntry.getChangeType() == ChangeType.RENAME
- && diffEntry.getOldPath().equals(diffEntry.getNewPath())) {
- // for some unknown reason, jgit detects rename even if path
- // is the same
- type = ChangeType.MODIFY;
- } else {
- type = diffEntry.getChangeType();
- }
- this.whitespaceOption = whitespaceOption;
- oldBlobIdent = GitUtils.getOldBlobIdent(diffEntry, oldRev);
- newBlobIdent = GitUtils.getNewBlobIdent(diffEntry, newRev);
- }
-
- public BlobChange(@Nullable ChangeType type, BlobIdent oldBlobIdent, BlobIdent newBlobIdent,
- WhitespaceOption whitespaceOption) {
- this.type = type;
- this.oldBlobIdent = oldBlobIdent;
- this.newBlobIdent = newBlobIdent;
- this.whitespaceOption = whitespaceOption;
- }
-
- /**
- * Get change type. Return <tt>null</tt> if this is a faked change representing
- * an unchanged file
- *
- * @return
- * type of change, or <tt>null</tt> if the file is not changed actually
- */
- @Nullable
- public ChangeType getType() {
- return type;
- }
-
- public BlobIdent getOldBlobIdent() {
- return oldBlobIdent;
- }
-
- public BlobIdent getNewBlobIdent() {
- return newBlobIdent;
- }
-
- public BlobIdent getBlobIdent() {
- return newBlobIdent.path!=null? newBlobIdent: oldBlobIdent;
- }
-
- public String getPath() {
- return newBlobIdent.path != null? newBlobIdent.path: oldBlobIdent.path;
- }
-
- public List<DiffBlock<Tokenized>> getDiffBlocks() {
- if (diffBlocks == null) {
- try {
- if (type == ChangeType.ADD || type == ChangeType.COPY) {
- if (getNewText() != null) {
- List<String> newLines = getNewText().getLines();
- if (newLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
- List<String> oldLines = new ArrayList<>();
- diffBlocks = DiffUtils.diff(
- oldLines, "a.txt",
- newLines, newBlobIdent.isFile()?newBlobIdent.path:"b.txt",
- WhitespaceOption.DEFAULT);
- } else {
- diffBlocks = new ArrayList<>();
- }
- } else {
- diffBlocks = new ArrayList<>();
- }
- } else if (type == ChangeType.DELETE) {
- if (getOldText() != null) {
- List<String> oldLines = getOldText().getLines();
- if (oldLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
- List<String> newLines = new ArrayList<>();
- diffBlocks = DiffUtils.diff(
- oldLines, oldBlobIdent.isFile()?oldBlobIdent.path:"a.txt",
- newLines, "b.txt",
- WhitespaceOption.DEFAULT);
- } else {
- diffBlocks = new ArrayList<>();
- }
- } else {
- diffBlocks = new ArrayList<>();
- }
- } else {
- if (getOldText() != null && getNewText() != null) {
- List<String> oldLines = getOldText().getLines();
- List<String> newLines = getNewText().getLines();
- if (oldLines.size() + newLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
- diffBlocks = DiffUtils.diff(
- oldLines, oldBlobIdent.isFile()?newBlobIdent.path:"a.txt",
- newLines, newBlobIdent.isFile()?newBlobIdent.path:"b.txt",
- whitespaceOption);
- } else {
- diffBlocks = new ArrayList<>();
- }
- } else {
- diffBlocks = new ArrayList<>();
- }
- }
- } catch (Exception e) {
- throw new RuntimeException("Error calculating diff of file: " + getPath(), e);
- }
- }
- return diffBlocks;
- }
-
- public int getAdditions() {
- int additions = 0;
- for (DiffBlock<Tokenized> diff: getDiffBlocks()) {
- if (diff.getOperation() == Operation.INSERT)
- additions += diff.getUnits().size();
- }
- return additions;
- }
-
- public int getDeletions() {
- int deletions = 0;
- for (DiffBlock<Tokenized> diff: getDiffBlocks()) {
- if (diff.getOperation() == Operation.DELETE)
- deletions += diff.getUnits().size();
- }
- return deletions;
- }
-
- public Blob getOldBlob() {
- Preconditions.checkNotNull(oldBlobIdent.path);
- return getBlob(oldBlobIdent);
- }
-
- public Blob getNewBlob() {
- Preconditions.checkNotNull(newBlobIdent.path);
- return getBlob(newBlobIdent);
- }
-
- @Nullable
- public Blob.Text getOldText() {
- return getOldBlob().getText();
- }
-
- @Nullable
- public Blob.Text getNewText() {
- return getNewBlob().getText();
- }
-
- public WhitespaceOption getWhitespaceOption() {
- return whitespaceOption;
- }
-
- public Collection<String> getPaths() {
- Collection<String> paths = new HashSet<>();
- if (oldBlobIdent.path != null)
- paths.add(oldBlobIdent.path);
- if (newBlobIdent.path != null)
- paths.add(newBlobIdent.path);
- return paths;
- }
-
- public abstract Blob getBlob(BlobIdent blobIdent);
-
-}
+package io.onedev.server.git;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.jsyntax.Tokenized;
+import io.onedev.server.util.diff.DiffBlock;
+import io.onedev.server.util.diff.DiffUtils;
+import io.onedev.server.util.diff.WhitespaceOption;
+import io.onedev.server.util.diff.DiffMatchPatch.Operation;
+
+@SuppressWarnings("serial")
+public abstract class BlobChange implements Serializable {
+
+ protected final ChangeType type;
+
+ protected final WhitespaceOption whitespaceOption;
+
+ protected final BlobIdent oldBlobIdent;
+
+ protected final BlobIdent newBlobIdent;
+
+ private transient List<DiffBlock<Tokenized>> diffBlocks;
+
+ public BlobChange(String oldRev, String newRev, DiffEntry diffEntry,
+ WhitespaceOption whitespaceOption) {
+ if (diffEntry.getChangeType() == ChangeType.RENAME
+ && diffEntry.getOldPath().equals(diffEntry.getNewPath())) {
+ // for some unknown reason, jgit detects rename even if path
+ // is the same
+ type = ChangeType.MODIFY;
+ } else {
+ type = diffEntry.getChangeType();
+ }
+ this.whitespaceOption = whitespaceOption;
+ oldBlobIdent = GitUtils.getOldBlobIdent(diffEntry, oldRev);
+ newBlobIdent = GitUtils.getNewBlobIdent(diffEntry, newRev);
+ }
+
+ public BlobChange(@Nullable ChangeType type, BlobIdent oldBlobIdent, BlobIdent newBlobIdent,
+ WhitespaceOption whitespaceOption) {
+ this.type = type;
+ this.oldBlobIdent = oldBlobIdent;
+ this.newBlobIdent = newBlobIdent;
+ this.whitespaceOption = whitespaceOption;
+ }
+
+ /**
+ * Get change type. Return <tt>null</tt> if this is a faked change representing
+ * an unchanged file
+ *
+ * @return
+ * type of change, or <tt>null</tt> if the file is not changed actually
+ */
+ @Nullable
+ public ChangeType getType() {
+ return type;
+ }
+
+ public BlobIdent getOldBlobIdent() {
+ return oldBlobIdent;
+ }
+
+ public BlobIdent getNewBlobIdent() {
+ return newBlobIdent;
+ }
+
+ public BlobIdent getBlobIdent() {
+ return newBlobIdent.path!=null? newBlobIdent: oldBlobIdent;
+ }
+
+ public String getPath() {
+ return newBlobIdent.path != null? newBlobIdent.path: oldBlobIdent.path;
+ }
+
+ public List<DiffBlock<Tokenized>> getDiffBlocks() {
+ if (diffBlocks == null) {
+ try {
+ if (type == ChangeType.ADD || type == ChangeType.COPY) {
+ if (getNewText() != null) {
+ List<String> newLines = getNewText().getLines();
+ if (newLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
+ List<String> oldLines = new ArrayList<>();
+ diffBlocks = DiffUtils.diff(
+ oldLines, "a.txt",
+ newLines, newBlobIdent.isFile()?newBlobIdent.path:"b.txt",
+ WhitespaceOption.DEFAULT);
+ } else {
+ diffBlocks = new ArrayList<>();
+ }
+ } else {
+ diffBlocks = new ArrayList<>();
+ }
+ } else if (type == ChangeType.DELETE) {
+ if (getOldText() != null) {
+ List<String> oldLines = getOldText().getLines();
+ if (oldLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
+ List<String> newLines = new ArrayList<>();
+ diffBlocks = DiffUtils.diff(
+ oldLines, oldBlobIdent.isFile()?oldBlobIdent.path:"a.txt",
+ newLines, "b.txt",
+ WhitespaceOption.DEFAULT);
+ } else {
+ diffBlocks = new ArrayList<>();
+ }
+ } else {
+ diffBlocks = new ArrayList<>();
+ }
+ } else {
+ if (getOldText() != null && getNewText() != null) {
+ List<String> oldLines = getOldText().getLines();
+ List<String> newLines = getNewText().getLines();
+ if (oldLines.size() + newLines.size() <= DiffUtils.MAX_DIFF_SIZE) {
+ diffBlocks = DiffUtils.diff(
+ oldLines, oldBlobIdent.isFile()?newBlobIdent.path:"a.txt",
+ newLines, newBlobIdent.isFile()?newBlobIdent.path:"b.txt",
+ whitespaceOption);
+ } else {
+ diffBlocks = new ArrayList<>();
+ }
+ } else {
+ diffBlocks = new ArrayList<>();
+ }
+ }
+ } catch (Exception e) {
+ throw new RuntimeException("Error calculating diff of file: " + getPath(), e);
+ }
+ }
+ return diffBlocks;
+ }
+
+ public int getAdditions() {
+ int additions = 0;
+ for (DiffBlock<Tokenized> diff: getDiffBlocks()) {
+ if (diff.getOperation() == Operation.INSERT)
+ additions += diff.getUnits().size();
+ }
+ return additions;
+ }
+
+ public int getDeletions() {
+ int deletions = 0;
+ for (DiffBlock<Tokenized> diff: getDiffBlocks()) {
+ if (diff.getOperation() == Operation.DELETE)
+ deletions += diff.getUnits().size();
+ }
+ return deletions;
+ }
+
+ public Blob getOldBlob() {
+ Preconditions.checkNotNull(oldBlobIdent.path);
+ return getBlob(oldBlobIdent);
+ }
+
+ public Blob getNewBlob() {
+ Preconditions.checkNotNull(newBlobIdent.path);
+ return getBlob(newBlobIdent);
+ }
+
+ @Nullable
+ public Blob.Text getOldText() {
+ return getOldBlob().getText();
+ }
+
+ @Nullable
+ public Blob.Text getNewText() {
+ return getNewBlob().getText();
+ }
+
+ public WhitespaceOption getWhitespaceOption() {
+ return whitespaceOption;
+ }
+
+ public Collection<String> getPaths() {
+ Collection<String> paths = new HashSet<>();
+ if (oldBlobIdent.path != null)
+ paths.add(oldBlobIdent.path);
+ if (newBlobIdent.path != null)
+ paths.add(newBlobIdent.path);
+ return paths;
+ }
+
+ public abstract Blob getBlob(BlobIdent blobIdent);
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/GitFilter.java b/core/src/main/java/io/onedev/server/git/GitFilter.java
index dc62499035..bbceeb990f 100644
--- a/core/src/main/java/io/onedev/server/git/GitFilter.java
+++ b/core/src/main/java/io/onedev/server/git/GitFilter.java
@@ -1,250 +1,250 @@
-package io.onedev.server.git;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.eclipse.jgit.http.server.GitSmartHttpTools;
-import org.eclipse.jgit.http.server.ServletUtils;
-import org.eclipse.jgit.transport.PacketLineOut;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.utils.concurrent.PrioritizedRunnable;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.git.command.AdvertiseReceiveRefsCommand;
-import io.onedev.server.git.command.AdvertiseUploadRefsCommand;
-import io.onedev.server.git.command.ReceiveCommand;
-import io.onedev.server.git.command.UploadCommand;
-import io.onedev.server.git.exception.GitException;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.serverconfig.ServerConfig;
-import io.onedev.server.util.work.WorkExecutor;
-
-@Singleton
-public class GitFilter implements Filter {
-
- private static final Logger logger = LoggerFactory.getLogger(GitFilter.class);
-
- private static final int PRIORITY = 2;
-
- private static final String INFO_REFS = "info/refs";
-
- private final OneDev oneDev;
-
- private final StorageManager storageManager;
-
- private final ProjectManager projectManager;
-
- private final WorkExecutor workExecutor;
-
- private final ServerConfig serverConfig;
-
- private final SettingManager configManager;
-
- @Inject
- public GitFilter(OneDev oneDev, StorageManager storageManager, ProjectManager projectManager,
- WorkExecutor workManager, ServerConfig serverConfig, SettingManager configManager) {
- this.oneDev = oneDev;
- this.storageManager = storageManager;
- this.projectManager = projectManager;
- this.workExecutor = workManager;
- this.serverConfig = serverConfig;
- this.configManager = configManager;
- }
-
- private String getPathInfo(HttpServletRequest request) {
- String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
- return StringUtils.stripStart(pathInfo, "/");
- }
-
- private Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)
- throws IOException {
- projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");
-
- if (StringUtils.isBlank(projectInfo) || !projectInfo.startsWith("projects/")) {
- String url = request.getRequestURL().toString();
- String urlRoot = url.substring(0, url.length()-getPathInfo(request).length());
- throw new GitException(String.format("Expecting url of format %sprojects/<project name>", urlRoot));
- }
-
- String projectName = StringUtils.substringAfter(projectInfo, "/");
-
- Project project = projectManager.find(projectName);
- if (project == null) {
- throw new GitException(String.format("Unable to find project %s", projectName));
- }
-
- return project;
- }
-
- private void doNotCache(HttpServletResponse response) {
- response.setHeader("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
- response.setHeader("Pragma", "no-cache");
- response.setHeader("Cache-Control", "no-cache, max-age=0, must-revalidate");
- }
-
- private void processPacks(final HttpServletRequest request, final HttpServletResponse response)
- throws ServletException, IOException, InterruptedException, ExecutionException {
- String pathInfo = getPathInfo(request);
-
- String service = StringUtils.substringAfterLast(pathInfo, "/");
-
- String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");
- Project project = getProject(request, response, projectInfo);
-
- doNotCache(response);
- response.setHeader("Content-Type", "application/x-" + service + "-result");
-
- final Map<String, String> environments = new HashMap<>();
- String serverUrl;
- if (serverConfig.getHttpPort() != 0)
- serverUrl = "http://localhost:" + serverConfig.getHttpPort();
- else
- serverUrl = "https://localhost:" + serverConfig.getSslConfig().getPort();
-
- environments.put("ONEDEV_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());
- environments.put("ONEDEV_URL", serverUrl);
- environments.put("ONEDEV_USER_ID", User.getCurrentId().toString());
- environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());
-
- // to be compatible with old repository
- environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());
- environments.put("GITPLEX_URL", serverUrl);
- environments.put("GITPLEX_USER_ID", User.getCurrentId().toString());
- environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());
-
- File gitDir = storageManager.getProjectGitDir(project.getId());
-
- if (GitSmartHttpTools.isUploadPack(request)) {
- if (!SecurityUtils.canReadCode(project.getFacade()))
- throw new UnauthorizedException("You do not have permission to pull from this project.");
- workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
-
- @Override
- public void run() {
- try {
- new UploadCommand(gitDir, environments)
- .input(ServletUtils.getInputStream(request))
- .output(response.getOutputStream())
- .call();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- }).get();
- } else {
- if (!SecurityUtils.canWriteCode(project.getFacade())) {
- throw new UnauthorizedException("You do not have permission to push to this project.");
- }
- workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
-
- @Override
- public void run() {
- try {
- new ReceiveCommand(gitDir, environments)
- .input(ServletUtils.getInputStream(request))
- .output(response.getOutputStream())
- .call();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- }).get();
- }
- }
-
- private void writeInitial(HttpServletResponse response, String service) throws IOException {
- doNotCache(response);
- response.setHeader("Content-Type", "application/x-" + service + "-advertisement");
-
- PacketLineOut pack = new PacketLineOut(response.getOutputStream());
- pack.setFlushOnEnd(false);
- pack.writeString("# service=" + service + "\n");
- pack.end();
- }
-
- private void processRefs(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
- pathInfo = StringUtils.stripStart(pathInfo, "/");
-
- String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());
- Project project = getProject(request, response, projectInfo);
- String service = request.getParameter("service");
-
- File gitDir = storageManager.getProjectGitDir(project.getId());
-
- if (service.contains("upload")) {
- if (!SecurityUtils.canReadCode(project.getFacade()))
- throw new UnauthorizedException("You do not have permission to pull from this project.");
- writeInitial(response, service);
- new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();
- } else {
- if (!SecurityUtils.canWriteCode(project.getFacade())) {
- throw new UnauthorizedException("You do not have permission to push to this project.");
- }
- writeInitial(response, service);
- new AdvertiseReceiveRefsCommand(gitDir).output(response.getOutputStream()).call();
- }
- }
-
- @Override
- public void init(FilterConfig filterConfig) throws ServletException {
- }
-
- @Sessional
- @Override
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
- HttpServletRequest httpRequest = (HttpServletRequest) request;
- HttpServletResponse httpResponse = (HttpServletResponse) response;
-
- try {
- if (GitSmartHttpTools.isInfoRefs(httpRequest)) {
- if (oneDev.isReady())
- processRefs(httpRequest, httpResponse);
- else
- throw new GitException("Server is not ready");
- } else if (GitSmartHttpTools.isReceivePack(httpRequest) || GitSmartHttpTools.isUploadPack(httpRequest)) {
- if (oneDev.isReady())
- processPacks(httpRequest, httpResponse);
- else
- throw new GitException("Server is not ready");
- } else {
- chain.doFilter(request, response);
- }
- } catch (GitException|InterruptedException|ExecutionException e) {
- logger.error("Error serving git request", e);
- GitSmartHttpTools.sendError(httpRequest, httpResponse, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
- }
- }
-
- @Override
- public void destroy() {
- }
-
-}
+package io.onedev.server.git;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.eclipse.jgit.http.server.GitSmartHttpTools;
+import org.eclipse.jgit.http.server.ServletUtils;
+import org.eclipse.jgit.transport.PacketLineOut;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.utils.concurrent.PrioritizedRunnable;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.git.command.AdvertiseReceiveRefsCommand;
+import io.onedev.server.git.command.AdvertiseUploadRefsCommand;
+import io.onedev.server.git.command.ReceiveCommand;
+import io.onedev.server.git.command.UploadCommand;
+import io.onedev.server.git.exception.GitException;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.serverconfig.ServerConfig;
+import io.onedev.server.util.work.WorkExecutor;
+
+@Singleton
+public class GitFilter implements Filter {
+
+ private static final Logger logger = LoggerFactory.getLogger(GitFilter.class);
+
+ private static final int PRIORITY = 2;
+
+ private static final String INFO_REFS = "info/refs";
+
+ private final OneDev oneDev;
+
+ private final StorageManager storageManager;
+
+ private final ProjectManager projectManager;
+
+ private final WorkExecutor workExecutor;
+
+ private final ServerConfig serverConfig;
+
+ private final SettingManager configManager;
+
+ @Inject
+ public GitFilter(OneDev oneDev, StorageManager storageManager, ProjectManager projectManager,
+ WorkExecutor workManager, ServerConfig serverConfig, SettingManager configManager) {
+ this.oneDev = oneDev;
+ this.storageManager = storageManager;
+ this.projectManager = projectManager;
+ this.workExecutor = workManager;
+ this.serverConfig = serverConfig;
+ this.configManager = configManager;
+ }
+
+ private String getPathInfo(HttpServletRequest request) {
+ String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
+ return StringUtils.stripStart(pathInfo, "/");
+ }
+
+ private Project getProject(HttpServletRequest request, HttpServletResponse response, String projectInfo)
+ throws IOException {
+ projectInfo = StringUtils.stripStart(StringUtils.stripEnd(projectInfo, "/"), "/");
+
+ if (StringUtils.isBlank(projectInfo) || !projectInfo.startsWith("projects/")) {
+ String url = request.getRequestURL().toString();
+ String urlRoot = url.substring(0, url.length()-getPathInfo(request).length());
+ throw new GitException(String.format("Expecting url of format %sprojects/<project name>", urlRoot));
+ }
+
+ String projectName = StringUtils.substringAfter(projectInfo, "/");
+
+ Project project = projectManager.find(projectName);
+ if (project == null) {
+ throw new GitException(String.format("Unable to find project %s", projectName));
+ }
+
+ return project;
+ }
+
+ private void doNotCache(HttpServletResponse response) {
+ response.setHeader("Expires", "Fri, 01 Jan 1980 00:00:00 GMT");
+ response.setHeader("Pragma", "no-cache");
+ response.setHeader("Cache-Control", "no-cache, max-age=0, must-revalidate");
+ }
+
+ private void processPacks(final HttpServletRequest request, final HttpServletResponse response)
+ throws ServletException, IOException, InterruptedException, ExecutionException {
+ String pathInfo = getPathInfo(request);
+
+ String service = StringUtils.substringAfterLast(pathInfo, "/");
+
+ String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");
+ Project project = getProject(request, response, projectInfo);
+
+ doNotCache(response);
+ response.setHeader("Content-Type", "application/x-" + service + "-result");
+
+ final Map<String, String> environments = new HashMap<>();
+ String serverUrl;
+ if (serverConfig.getHttpPort() != 0)
+ serverUrl = "http://localhost:" + serverConfig.getHttpPort();
+ else
+ serverUrl = "https://localhost:" + serverConfig.getSslConfig().getPort();
+
+ environments.put("ONEDEV_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());
+ environments.put("ONEDEV_URL", serverUrl);
+ environments.put("ONEDEV_USER_ID", User.getCurrentId().toString());
+ environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());
+
+ // to be compatible with old repository
+ environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable());
+ environments.put("GITPLEX_URL", serverUrl);
+ environments.put("GITPLEX_USER_ID", User.getCurrentId().toString());
+ environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());
+
+ File gitDir = storageManager.getProjectGitDir(project.getId());
+
+ if (GitSmartHttpTools.isUploadPack(request)) {
+ if (!SecurityUtils.canReadCode(project.getFacade()))
+ throw new UnauthorizedException("You do not have permission to pull from this project.");
+ workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
+
+ @Override
+ public void run() {
+ try {
+ new UploadCommand(gitDir, environments)
+ .input(ServletUtils.getInputStream(request))
+ .output(response.getOutputStream())
+ .call();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ }).get();
+ } else {
+ if (!SecurityUtils.canWriteCode(project.getFacade())) {
+ throw new UnauthorizedException("You do not have permission to push to this project.");
+ }
+ workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
+
+ @Override
+ public void run() {
+ try {
+ new ReceiveCommand(gitDir, environments)
+ .input(ServletUtils.getInputStream(request))
+ .output(response.getOutputStream())
+ .call();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ }).get();
+ }
+ }
+
+ private void writeInitial(HttpServletResponse response, String service) throws IOException {
+ doNotCache(response);
+ response.setHeader("Content-Type", "application/x-" + service + "-advertisement");
+
+ PacketLineOut pack = new PacketLineOut(response.getOutputStream());
+ pack.setFlushOnEnd(false);
+ pack.writeString("# service=" + service + "\n");
+ pack.end();
+ }
+
+ private void processRefs(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ String pathInfo = request.getRequestURI().substring(request.getContextPath().length());
+ pathInfo = StringUtils.stripStart(pathInfo, "/");
+
+ String projectInfo = pathInfo.substring(0, pathInfo.length() - INFO_REFS.length());
+ Project project = getProject(request, response, projectInfo);
+ String service = request.getParameter("service");
+
+ File gitDir = storageManager.getProjectGitDir(project.getId());
+
+ if (service.contains("upload")) {
+ if (!SecurityUtils.canReadCode(project.getFacade()))
+ throw new UnauthorizedException("You do not have permission to pull from this project.");
+ writeInitial(response, service);
+ new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();
+ } else {
+ if (!SecurityUtils.canWriteCode(project.getFacade())) {
+ throw new UnauthorizedException("You do not have permission to push to this project.");
+ }
+ writeInitial(response, service);
+ new AdvertiseReceiveRefsCommand(gitDir).output(response.getOutputStream()).call();
+ }
+ }
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ @Sessional
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
+
+ try {
+ if (GitSmartHttpTools.isInfoRefs(httpRequest)) {
+ if (oneDev.isReady())
+ processRefs(httpRequest, httpResponse);
+ else
+ throw new GitException("Server is not ready");
+ } else if (GitSmartHttpTools.isReceivePack(httpRequest) || GitSmartHttpTools.isUploadPack(httpRequest)) {
+ if (oneDev.isReady())
+ processPacks(httpRequest, httpResponse);
+ else
+ throw new GitException("Server is not ready");
+ } else {
+ chain.doFilter(request, response);
+ }
+ } catch (GitException|InterruptedException|ExecutionException e) {
+ logger.error("Error serving git request", e);
+ GitSmartHttpTools.sendError(httpRequest, httpResponse, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage());
+ }
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java
index 89f92b355f..aad07eaa16 100644
--- a/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java
+++ b/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java
@@ -1,138 +1,138 @@
-package io.onedev.server.git;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.Enumeration;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.util.ThreadContext;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.launcher.loader.ListenerRegistry;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.event.RefUpdated;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.SessionManager;
-
-import com.google.common.base.Preconditions;
-
-@SuppressWarnings("serial")
-@Singleton
-public class GitPostReceiveCallback extends HttpServlet {
-
- private static final Logger logger = LoggerFactory.getLogger(GitPostReceiveCallback.class);
-
- public static final String PATH = "/git-postreceive-callback";
-
- private final ProjectManager projectManager;
-
- private final ListenerRegistry listenerRegistry;
-
- private final SessionManager sessionManager;
-
- @Inject
- public GitPostReceiveCallback(ProjectManager projectManager, SessionManager sessionManager, ListenerRegistry listenerRegistry) {
- this.projectManager = projectManager;
- this.sessionManager = sessionManager;
- this.listenerRegistry = listenerRegistry;
- }
-
- @Override
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String clientIp = request.getHeader("X-Forwarded-For");
- if (clientIp == null) clientIp = request.getRemoteAddr();
-
- if (!InetAddress.getByName(clientIp).isLoopbackAddress()) {
- response.sendError(HttpServletResponse.SC_FORBIDDEN,
- "Git hook callbacks can only be accessed from localhost.");
- return;
- }
-
- List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");
- Preconditions.checkState(fields.size() == 2);
-
- Long projectId = Long.valueOf(fields.get(0));
- Long userId = Long.valueOf(fields.get(1));
-
- String refUpdateInfo = null;
- Enumeration<String> paramNames = request.getParameterNames();
- while (paramNames.hasMoreElements()) {
- String paramName = paramNames.nextElement();
- if (paramName.contains(" ")) {
- refUpdateInfo = paramName;
- }
- }
- Preconditions.checkState(refUpdateInfo != null, "Git ref update information is not available");
-
- /*
- * If multiple refs are updated, the hook stdin will put each ref update info into
- * a separate line, however the line breaks is omitted when forward the hook stdin
- * to curl via "@-", below logic is used to parse these info correctly even
- * without line breaks.
- */
- refUpdateInfo = StringUtils.reverse(StringUtils.remove(refUpdateInfo, '\n'));
-
- fields.clear();
- fields.addAll(StringUtils.splitAndTrim(refUpdateInfo, " "));
-
- sessionManager.runAsync(new Runnable() {
-
- @Override
- public void run() {
- ThreadContext.bind(User.asSubject(userId));
- try {
- Project project = projectManager.load(projectId);
-
- int pos = 0;
- while (true) {
- String refName = StringUtils.reverse(fields.get(pos));
- pos++;
- ObjectId newObjectId = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));
- pos++;
- String field = fields.get(pos);
- ObjectId oldObjectId = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));
-
- if (!newObjectId.equals(ObjectId.zeroId())) {
- project.cacheObjectId(refName, newObjectId);
- } else {
- newObjectId = ObjectId.zeroId();
- project.cacheObjectId(refName, null);
- }
-
- String branch = GitUtils.ref2branch(refName);
- if (branch != null && project.getDefaultBranch() == null) {
- RefUpdate refUpdate = GitUtils.getRefUpdate(project.getRepository(), "HEAD");
- GitUtils.linkRef(refUpdate, refName);
- }
-
- listenerRegistry.post(new RefUpdated(project, refName, oldObjectId, newObjectId));
-
- field = field.substring(40);
- if (field.length() == 0)
- break;
- else
- fields.set(pos, field);
- }
- } catch (Exception e) {
- logger.error("Error executing post-receive callback", e);
- } finally {
- ThreadContext.unbindSubject();
- }
- }
-
- });
- }
-
-}
+package io.onedev.server.git;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.Enumeration;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.util.ThreadContext;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.SessionManager;
+
+import com.google.common.base.Preconditions;
+
+@SuppressWarnings("serial")
+@Singleton
+public class GitPostReceiveCallback extends HttpServlet {
+
+ private static final Logger logger = LoggerFactory.getLogger(GitPostReceiveCallback.class);
+
+ public static final String PATH = "/git-postreceive-callback";
+
+ private final ProjectManager projectManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final SessionManager sessionManager;
+
+ @Inject
+ public GitPostReceiveCallback(ProjectManager projectManager, SessionManager sessionManager, ListenerRegistry listenerRegistry) {
+ this.projectManager = projectManager;
+ this.sessionManager = sessionManager;
+ this.listenerRegistry = listenerRegistry;
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ String clientIp = request.getHeader("X-Forwarded-For");
+ if (clientIp == null) clientIp = request.getRemoteAddr();
+
+ if (!InetAddress.getByName(clientIp).isLoopbackAddress()) {
+ response.sendError(HttpServletResponse.SC_FORBIDDEN,
+ "Git hook callbacks can only be accessed from localhost.");
+ return;
+ }
+
+ List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");
+ Preconditions.checkState(fields.size() == 2);
+
+ Long projectId = Long.valueOf(fields.get(0));
+ Long userId = Long.valueOf(fields.get(1));
+
+ String refUpdateInfo = null;
+ Enumeration<String> paramNames = request.getParameterNames();
+ while (paramNames.hasMoreElements()) {
+ String paramName = paramNames.nextElement();
+ if (paramName.contains(" ")) {
+ refUpdateInfo = paramName;
+ }
+ }
+ Preconditions.checkState(refUpdateInfo != null, "Git ref update information is not available");
+
+ /*
+ * If multiple refs are updated, the hook stdin will put each ref update info into
+ * a separate line, however the line breaks is omitted when forward the hook stdin
+ * to curl via "@-", below logic is used to parse these info correctly even
+ * without line breaks.
+ */
+ refUpdateInfo = StringUtils.reverse(StringUtils.remove(refUpdateInfo, '\n'));
+
+ fields.clear();
+ fields.addAll(StringUtils.splitAndTrim(refUpdateInfo, " "));
+
+ sessionManager.runAsync(new Runnable() {
+
+ @Override
+ public void run() {
+ ThreadContext.bind(User.asSubject(userId));
+ try {
+ Project project = projectManager.load(projectId);
+
+ int pos = 0;
+ while (true) {
+ String refName = StringUtils.reverse(fields.get(pos));
+ pos++;
+ ObjectId newObjectId = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));
+ pos++;
+ String field = fields.get(pos);
+ ObjectId oldObjectId = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));
+
+ if (!newObjectId.equals(ObjectId.zeroId())) {
+ project.cacheObjectId(refName, newObjectId);
+ } else {
+ newObjectId = ObjectId.zeroId();
+ project.cacheObjectId(refName, null);
+ }
+
+ String branch = GitUtils.ref2branch(refName);
+ if (branch != null && project.getDefaultBranch() == null) {
+ RefUpdate refUpdate = GitUtils.getRefUpdate(project.getRepository(), "HEAD");
+ GitUtils.linkRef(refUpdate, refName);
+ }
+
+ listenerRegistry.post(new RefUpdated(project, refName, oldObjectId, newObjectId));
+
+ field = field.substring(40);
+ if (field.length() == 0)
+ break;
+ else
+ fields.set(pos, field);
+ }
+ } catch (Exception e) {
+ logger.error("Error executing post-receive callback", e);
+ } finally {
+ ThreadContext.unbindSubject();
+ }
+ }
+
+ });
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java b/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
index c0628cbd80..50239d81f7 100644
--- a/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
@@ -1,46 +1,46 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.io.OutputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class AdvertiseReceiveRefsCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(AdvertiseReceiveRefsCommand.class);
-
- private OutputStream output;
-
- public AdvertiseReceiveRefsCommand(File gitDir) {
- super(gitDir);
- }
-
- public AdvertiseReceiveRefsCommand output(OutputStream output) {
- this.output = output;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkNotNull(output);
-
- Commandline cmd = cmd();
- cmd.addArgs("receive-pack", "--stateless-rpc", "--advertise-refs", ".");
- cmd.execute(output, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
- return null;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.io.OutputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class AdvertiseReceiveRefsCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(AdvertiseReceiveRefsCommand.class);
+
+ private OutputStream output;
+
+ public AdvertiseReceiveRefsCommand(File gitDir) {
+ super(gitDir);
+ }
+
+ public AdvertiseReceiveRefsCommand output(OutputStream output) {
+ this.output = output;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(output);
+
+ Commandline cmd = cmd();
+ cmd.addArgs("receive-pack", "--stateless-rpc", "--advertise-refs", ".");
+ cmd.execute(output, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java b/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java
index ea5d85e95b..53861300ab 100644
--- a/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java
@@ -1,46 +1,46 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.io.OutputStream;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class AdvertiseUploadRefsCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(AdvertiseUploadRefsCommand.class);
-
- private OutputStream output;
-
- public AdvertiseUploadRefsCommand(File gitDir) {
- super(gitDir);
- }
-
- public AdvertiseUploadRefsCommand output(OutputStream output) {
- this.output = output;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkNotNull(output);
-
- Commandline cmd = cmd();
- cmd.addArgs("upload-pack", "--stateless-rpc", "--advertise-refs", ".");
- cmd.execute(output, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
- return null;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.io.OutputStream;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class AdvertiseUploadRefsCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(AdvertiseUploadRefsCommand.class);
+
+ private OutputStream output;
+
+ public AdvertiseUploadRefsCommand(File gitDir) {
+ super(gitDir);
+ }
+
+ public AdvertiseUploadRefsCommand output(OutputStream output) {
+ this.output = output;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(output);
+
+ Commandline cmd = cmd();
+ cmd.addArgs("upload-pack", "--stateless-rpc", "--advertise-refs", ".");
+ cmd.execute(output, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/BlameCommand.java b/core/src/main/java/io/onedev/server/git/command/BlameCommand.java
index 0a117e9180..5d10781db6 100644
--- a/core/src/main/java/io/onedev/server/git/command/BlameCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/BlameCommand.java
@@ -1,214 +1,214 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
-import org.apache.commons.collections4.map.ReferenceMap;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.Range;
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.ExecuteResult;
-import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.server.git.BlameBlock;
-import io.onedev.server.git.BlameCommit;
-import io.onedev.server.git.GitUtils;
-
-public class BlameCommand extends GitCommand<Collection<BlameBlock>> {
-
- private static final Logger logger = LoggerFactory.getLogger(BlameCommand.class);
-
- private static final ReferenceMap<String, Collection<BlameBlock>> cache =
- new ReferenceMap<>(ReferenceStrength.HARD, ReferenceStrength.SOFT);
-
- private static final int CACHE_THRESHOLD = 1000;
-
- private String commitHash;
-
- private String file;
-
- private Range range;
-
- public BlameCommand(File gitDir) {
- super(gitDir);
- }
-
- public BlameCommand commitHash(String commitHash) {
- this.commitHash = commitHash;
- return this;
- }
-
- public BlameCommand file(String file) {
- this.file = file;
- return this;
- }
-
- /**
- * Calculate blames of specified range
- * @param range
- * 0-indexed and inclusive from and to
- * @return
- */
- public BlameCommand range(@Nullable Range range) {
- this.range = range;
- return this;
- }
-
- private Commandline buildCmd() {
- Commandline cmd = cmd().addArgs("blame", "--porcelain");
- if (range != null)
- cmd.addArgs("-L" + (range.getFrom()+1) + "," + (range.getTo()+1));
- cmd.addArgs(commitHash, "--", file);
- return cmd;
- }
-
- @Override
- public Collection<BlameBlock> call() {
- Preconditions.checkArgument(commitHash!=null && GitUtils.isHash(commitHash), "commit hash has to be specified.");
- Preconditions.checkNotNull(file, "file parameter has to be specified.");
-
- String cacheKey = commitHash + ":" + file + ":" + (range!=null?range.toString():"");
-
- Collection<BlameBlock> cached = cache.get(cacheKey);
- if (cached != null)
- return cached;
-
- Commandline cmd = buildCmd();
-
- Map<String, BlameBlock> blocks = new HashMap<>();
- Map<String, BlameCommit> commitMap = new HashMap<>();
-
- AtomicReference<BlameCommit> commitRef = new AtomicReference<>(null);
- CommitBuilder commitBuilder = new CommitBuilder();
-
- AtomicBoolean endOfFile = new AtomicBoolean(false);
-
- AtomicInteger beginLine;
- AtomicInteger endLine;
-
- if (range != null) {
- beginLine = new AtomicInteger(range.getFrom());
- endLine = new AtomicInteger(range.getFrom());
- } else {
- beginLine = new AtomicInteger(0);
- endLine = new AtomicInteger(0);
- }
-
- long time = System.currentTimeMillis();
-
- ExecuteResult result = cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.startsWith("\t")) {
- if (commitRef.get() == null)
- commitRef.set(commitMap.get(commitBuilder.hash));
- endLine.getAndIncrement();
- commitBuilder.hash = null;
- } else if (commitBuilder.hash == null) {
- commitBuilder.hash = StringUtils.substringBefore(line, " ");
- BlameCommit commit = commitRef.get();
- if (commit != null && !commitBuilder.hash.equals(commit.getHash())) {
- BlameBlock block = blocks.get(commit.getHash());
- if (block == null) {
- block = new BlameBlock(commit, new ArrayList<>());
- blocks.put(commit.getHash(), block);
- }
- block.getRanges().add(new Range(beginLine.get(), endLine.get()-1));
- commitRef.set(null);
- beginLine.set(endLine.get());
- }
- } else if (line.startsWith("author ")) {
- commitBuilder.author = line.substring("author ".length());
- } else if (line.startsWith("author-mail ")) {
- line = StringUtils.substringAfter(line, "<");
- commitBuilder.authorEmail = StringUtils.substringBeforeLast(line, ">");
- } else if (line.startsWith("author-time ")) {
- commitBuilder.authorDate = new Date(1000L * Long.parseLong(line.substring("author-time ".length())));
- } else if (line.startsWith("committer ")) {
- commitBuilder.committer = line.substring("committer ".length());
- } else if (line.startsWith("committer-mail ")) {
- line = StringUtils.substringAfter(line, "<");
- commitBuilder.committerEmail = StringUtils.substringBeforeLast(line, ">");
- } else if (line.startsWith("committer-time ")) {
- commitBuilder.committerDate = new Date(1000L * Long.parseLong(line.substring("committer-time ".length())));
- } else if (line.startsWith("summary ")) {
- commitBuilder.summary = line.substring("summary ".length());
- commitMap.put(commitBuilder.hash, commitBuilder.build());
- }
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.startsWith("fatal: file ") && line.contains("has only ")) {
- endOfFile.set(true);
- logger.trace(line.substring("fatal: ".length()));
- } else {
- logger.error(line);
- }
- }
-
- });
-
- if (!endOfFile.get())
- result.checkReturnCode();
-
- if (endLine.get() > beginLine.get()) {
- BlameCommit commit = commitRef.get();
- BlameBlock block = blocks.get(commit.getHash());
- if (block == null) {
- block = new BlameBlock(commit, new ArrayList<Range>());
- blocks.put(commit.getHash(), block);
- }
- block.getRanges().add(new Range(beginLine.get(), endLine.get()-1));
- }
-
- if (System.currentTimeMillis()-time > CACHE_THRESHOLD)
- cache.put(cacheKey, blocks.values());
-
- return blocks.values();
- }
-
- private static class CommitBuilder {
-
- private Date committerDate;
-
- private Date authorDate;
-
- private String author;
-
- private String committer;
-
- private String authorEmail;
-
- private String committerEmail;
-
- private String hash;
-
- private String summary;
-
- private BlameCommit build() {
- return new BlameCommit(
- hash,
- GitUtils.newPersonIdent(committer, committerEmail, committerDate),
- GitUtils.newPersonIdent(author, authorEmail, authorDate),
- summary.trim());
- }
- }
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.collections4.map.AbstractReferenceMap.ReferenceStrength;
+import org.apache.commons.collections4.map.ReferenceMap;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.ExecuteResult;
+import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.server.git.BlameBlock;
+import io.onedev.server.git.BlameCommit;
+import io.onedev.server.git.GitUtils;
+
+public class BlameCommand extends GitCommand<Collection<BlameBlock>> {
+
+ private static final Logger logger = LoggerFactory.getLogger(BlameCommand.class);
+
+ private static final ReferenceMap<String, Collection<BlameBlock>> cache =
+ new ReferenceMap<>(ReferenceStrength.HARD, ReferenceStrength.SOFT);
+
+ private static final int CACHE_THRESHOLD = 1000;
+
+ private String commitHash;
+
+ private String file;
+
+ private Range range;
+
+ public BlameCommand(File gitDir) {
+ super(gitDir);
+ }
+
+ public BlameCommand commitHash(String commitHash) {
+ this.commitHash = commitHash;
+ return this;
+ }
+
+ public BlameCommand file(String file) {
+ this.file = file;
+ return this;
+ }
+
+ /**
+ * Calculate blames of specified range
+ * @param range
+ * 0-indexed and inclusive from and to
+ * @return
+ */
+ public BlameCommand range(@Nullable Range range) {
+ this.range = range;
+ return this;
+ }
+
+ private Commandline buildCmd() {
+ Commandline cmd = cmd().addArgs("blame", "--porcelain");
+ if (range != null)
+ cmd.addArgs("-L" + (range.getFrom()+1) + "," + (range.getTo()+1));
+ cmd.addArgs(commitHash, "--", file);
+ return cmd;
+ }
+
+ @Override
+ public Collection<BlameBlock> call() {
+ Preconditions.checkArgument(commitHash!=null && GitUtils.isHash(commitHash), "commit hash has to be specified.");
+ Preconditions.checkNotNull(file, "file parameter has to be specified.");
+
+ String cacheKey = commitHash + ":" + file + ":" + (range!=null?range.toString():"");
+
+ Collection<BlameBlock> cached = cache.get(cacheKey);
+ if (cached != null)
+ return cached;
+
+ Commandline cmd = buildCmd();
+
+ Map<String, BlameBlock> blocks = new HashMap<>();
+ Map<String, BlameCommit> commitMap = new HashMap<>();
+
+ AtomicReference<BlameCommit> commitRef = new AtomicReference<>(null);
+ CommitBuilder commitBuilder = new CommitBuilder();
+
+ AtomicBoolean endOfFile = new AtomicBoolean(false);
+
+ AtomicInteger beginLine;
+ AtomicInteger endLine;
+
+ if (range != null) {
+ beginLine = new AtomicInteger(range.getFrom());
+ endLine = new AtomicInteger(range.getFrom());
+ } else {
+ beginLine = new AtomicInteger(0);
+ endLine = new AtomicInteger(0);
+ }
+
+ long time = System.currentTimeMillis();
+
+ ExecuteResult result = cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.startsWith("\t")) {
+ if (commitRef.get() == null)
+ commitRef.set(commitMap.get(commitBuilder.hash));
+ endLine.getAndIncrement();
+ commitBuilder.hash = null;
+ } else if (commitBuilder.hash == null) {
+ commitBuilder.hash = StringUtils.substringBefore(line, " ");
+ BlameCommit commit = commitRef.get();
+ if (commit != null && !commitBuilder.hash.equals(commit.getHash())) {
+ BlameBlock block = blocks.get(commit.getHash());
+ if (block == null) {
+ block = new BlameBlock(commit, new ArrayList<>());
+ blocks.put(commit.getHash(), block);
+ }
+ block.getRanges().add(new Range(beginLine.get(), endLine.get()-1));
+ commitRef.set(null);
+ beginLine.set(endLine.get());
+ }
+ } else if (line.startsWith("author ")) {
+ commitBuilder.author = line.substring("author ".length());
+ } else if (line.startsWith("author-mail ")) {
+ line = StringUtils.substringAfter(line, "<");
+ commitBuilder.authorEmail = StringUtils.substringBeforeLast(line, ">");
+ } else if (line.startsWith("author-time ")) {
+ commitBuilder.authorDate = new Date(1000L * Long.parseLong(line.substring("author-time ".length())));
+ } else if (line.startsWith("committer ")) {
+ commitBuilder.committer = line.substring("committer ".length());
+ } else if (line.startsWith("committer-mail ")) {
+ line = StringUtils.substringAfter(line, "<");
+ commitBuilder.committerEmail = StringUtils.substringBeforeLast(line, ">");
+ } else if (line.startsWith("committer-time ")) {
+ commitBuilder.committerDate = new Date(1000L * Long.parseLong(line.substring("committer-time ".length())));
+ } else if (line.startsWith("summary ")) {
+ commitBuilder.summary = line.substring("summary ".length());
+ commitMap.put(commitBuilder.hash, commitBuilder.build());
+ }
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.startsWith("fatal: file ") && line.contains("has only ")) {
+ endOfFile.set(true);
+ logger.trace(line.substring("fatal: ".length()));
+ } else {
+ logger.error(line);
+ }
+ }
+
+ });
+
+ if (!endOfFile.get())
+ result.checkReturnCode();
+
+ if (endLine.get() > beginLine.get()) {
+ BlameCommit commit = commitRef.get();
+ BlameBlock block = blocks.get(commit.getHash());
+ if (block == null) {
+ block = new BlameBlock(commit, new ArrayList<Range>());
+ blocks.put(commit.getHash(), block);
+ }
+ block.getRanges().add(new Range(beginLine.get(), endLine.get()-1));
+ }
+
+ if (System.currentTimeMillis()-time > CACHE_THRESHOLD)
+ cache.put(cacheKey, blocks.values());
+
+ return blocks.values();
+ }
+
+ private static class CommitBuilder {
+
+ private Date committerDate;
+
+ private Date authorDate;
+
+ private String author;
+
+ private String committer;
+
+ private String authorEmail;
+
+ private String committerEmail;
+
+ private String hash;
+
+ private String summary;
+
+ private BlameCommit build() {
+ return new BlameCommit(
+ hash,
+ GitUtils.newPersonIdent(committer, committerEmail, committerDate),
+ GitUtils.newPersonIdent(author, authorEmail, authorDate),
+ summary.trim());
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/CleanCommand.java b/core/src/main/java/io/onedev/server/git/command/CleanCommand.java
new file mode 100644
index 0000000000..845fe17a8b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/git/command/CleanCommand.java
@@ -0,0 +1,52 @@
+package io.onedev.server.git.command;
+
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class CleanCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(CleanCommand.class);
+
+ private String[] options;
+
+ public CleanCommand(final File gitDir) {
+ super(gitDir);
+ }
+
+ public CleanCommand options(String...options) {
+ this.options = options;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Commandline cmd = cmd().addArgs("clean");
+
+ if (options != null)
+ cmd.addArgs(options);
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/CloneCommand.java b/core/src/main/java/io/onedev/server/git/command/CloneCommand.java
index e30ce33765..0cd66509d8 100644
--- a/core/src/main/java/io/onedev/server/git/command/CloneCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/CloneCommand.java
@@ -1,106 +1,106 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class CloneCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(CloneCommand.class);
-
- private String from;
-
- private boolean bare;
-
- private boolean shared;
-
- private boolean mirror;
-
- private boolean noCheckout;
-
- private String branch;
-
- public CloneCommand(File gitDir) {
- super(gitDir);
- }
-
- public CloneCommand from(String from) {
- this.from = from;
- return this;
- }
-
- public CloneCommand bare(boolean bare) {
- this.bare = bare;
- return this;
- }
-
- public CloneCommand mirror(boolean mirror) {
- this.mirror = mirror;
- return this;
- }
-
- public CloneCommand shared(boolean shared) {
- this.shared = shared;
- return this;
- }
-
- public CloneCommand noCheckout(boolean noCheckout) {
- this.noCheckout = noCheckout;
- return this;
- }
-
- public CloneCommand branch(String branch) {
- this.branch = branch;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkNotNull(from, "from has to be specified.");
-
- Commandline cmd = cmd().addArgs("clone");
- if (bare)
- cmd.addArgs("--bare");
- if (mirror)
- cmd.addArgs("--mirror");
- if (shared)
- cmd.addArgs("--shared");
- if (noCheckout)
- cmd.addArgs("--no-checkout");
- if (branch != null)
- cmd.addArgs("-b", branch);
-
- cmd.addArgs(from);
- cmd.addArgs(".");
-
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.trace(line);
- }
-
- }, new LineConsumer(){
-
- @Override
- public void consume(String line) {
- if (line.startsWith("Cloning into ") || line.equals("done."))
- logger.trace(line);
- else if (line.contains("You appear to have cloned an empty repository"))
- logger.warn(line);
- else
- logger.error(line);
- }
-
- }).checkReturnCode();
-
- return null;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class CloneCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(CloneCommand.class);
+
+ private String from;
+
+ private boolean bare;
+
+ private boolean shared;
+
+ private boolean mirror;
+
+ private boolean noCheckout;
+
+ private String branch;
+
+ public CloneCommand(File gitDir) {
+ super(gitDir);
+ }
+
+ public CloneCommand from(String from) {
+ this.from = from;
+ return this;
+ }
+
+ public CloneCommand bare(boolean bare) {
+ this.bare = bare;
+ return this;
+ }
+
+ public CloneCommand mirror(boolean mirror) {
+ this.mirror = mirror;
+ return this;
+ }
+
+ public CloneCommand shared(boolean shared) {
+ this.shared = shared;
+ return this;
+ }
+
+ public CloneCommand noCheckout(boolean noCheckout) {
+ this.noCheckout = noCheckout;
+ return this;
+ }
+
+ public CloneCommand branch(String branch) {
+ this.branch = branch;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(from, "from has to be specified.");
+
+ Commandline cmd = cmd().addArgs("clone");
+ if (bare)
+ cmd.addArgs("--bare");
+ if (mirror)
+ cmd.addArgs("--mirror");
+ if (shared)
+ cmd.addArgs("--shared");
+ if (noCheckout)
+ cmd.addArgs("--no-checkout");
+ if (branch != null)
+ cmd.addArgs("-b", branch);
+
+ cmd.addArgs(from);
+ cmd.addArgs(".");
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer(){
+
+ @Override
+ public void consume(String line) {
+ if (line.startsWith("Cloning into ") || line.equals("done."))
+ logger.trace(line);
+ else if (line.contains("You appear to have cloned an empty repository"))
+ logger.warn(line);
+ else
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java b/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java
index f849003f14..1434bf4ecd 100644
--- a/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java
@@ -1,69 +1,69 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.ExecuteResult;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class IsAncestorCommand extends GitCommand<Boolean> {
-
- private static final Logger logger = LoggerFactory.getLogger(IsAncestorCommand.class);
-
- private String ancestor;
-
- private String descendant;
-
- public IsAncestorCommand(File gitDir, Map<String, String> gitEnvs) {
- super(gitDir, gitEnvs);
- }
-
- public IsAncestorCommand ancestor(String ancestor) {
- this.ancestor = ancestor;
- return this;
- }
-
- public IsAncestorCommand descendant(String descendant) {
- this.descendant = descendant;
- return this;
- }
-
- @Override
- public Boolean call() {
- Preconditions.checkNotNull(ancestor, "ancestor has to be specified.");
- Preconditions.checkNotNull(descendant, "descendant has to be specified.");
-
- Commandline cmd = cmd();
-
- cmd.addArgs("merge-base", "--is-ancestor", ancestor, descendant);
-
- ExecuteResult result = cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- });
-
- if (result.getReturnCode() == 0)
- return true;
- else if (result.getReturnCode() == 1)
- return false;
- else
- throw result.buildException();
- }
-
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.ExecuteResult;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class IsAncestorCommand extends GitCommand<Boolean> {
+
+ private static final Logger logger = LoggerFactory.getLogger(IsAncestorCommand.class);
+
+ private String ancestor;
+
+ private String descendant;
+
+ public IsAncestorCommand(File gitDir, Map<String, String> gitEnvs) {
+ super(gitDir, gitEnvs);
+ }
+
+ public IsAncestorCommand ancestor(String ancestor) {
+ this.ancestor = ancestor;
+ return this;
+ }
+
+ public IsAncestorCommand descendant(String descendant) {
+ this.descendant = descendant;
+ return this;
+ }
+
+ @Override
+ public Boolean call() {
+ Preconditions.checkNotNull(ancestor, "ancestor has to be specified.");
+ Preconditions.checkNotNull(descendant, "descendant has to be specified.");
+
+ Commandline cmd = cmd();
+
+ cmd.addArgs("merge-base", "--is-ancestor", ancestor, descendant);
+
+ ExecuteResult result = cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ });
+
+ if (result.getReturnCode() == 0)
+ return true;
+ else if (result.getReturnCode() == 1)
+ return false;
+ else
+ throw result.buildException();
+ }
+
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java b/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java
index 9a1ed6c4fd..7663908a0d 100644
--- a/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java
@@ -1,81 +1,81 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jgit.util.QuotedString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class ListChangedFilesCommand extends GitCommand<Collection<String>> {
-
- private static final Logger logger = LoggerFactory.getLogger(ListChangedFilesCommand.class);
-
- private String fromRev;
-
- private String toRev;
-
- private String path;
-
- public ListChangedFilesCommand(File gitDir, Map<String, String> gitEnvs) {
- super(gitDir, gitEnvs);
- }
-
- public ListChangedFilesCommand fromRev(String fromRev) {
- this.fromRev = fromRev;
- return this;
- }
-
- public ListChangedFilesCommand toRev(String toRev) {
- this.toRev = toRev;
- return this;
- }
-
- public ListChangedFilesCommand path(String path) {
- this.path = path;
- return this;
- }
-
- @Override
- public Collection<String> call() {
- Preconditions.checkNotNull(toRev, "toRev has to be specified.");
- Preconditions.checkNotNull(fromRev, "fromRev has to be specified.");
-
- final Set<String> changedFiles = new HashSet<String>();
-
- Commandline cmd = cmd();
-
- cmd.addArgs("diff", "--name-only", "--no-renames", fromRev + ".." + toRev);
-
- if (path != null)
- cmd.addArgs("--", path);
-
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.trim().length() != 0)
- changedFiles.add(QuotedString.GIT_PATH.dequote(line));
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
-
- return changedFiles;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.eclipse.jgit.util.QuotedString;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class ListChangedFilesCommand extends GitCommand<Collection<String>> {
+
+ private static final Logger logger = LoggerFactory.getLogger(ListChangedFilesCommand.class);
+
+ private String fromRev;
+
+ private String toRev;
+
+ private String path;
+
+ public ListChangedFilesCommand(File gitDir, Map<String, String> gitEnvs) {
+ super(gitDir, gitEnvs);
+ }
+
+ public ListChangedFilesCommand fromRev(String fromRev) {
+ this.fromRev = fromRev;
+ return this;
+ }
+
+ public ListChangedFilesCommand toRev(String toRev) {
+ this.toRev = toRev;
+ return this;
+ }
+
+ public ListChangedFilesCommand path(String path) {
+ this.path = path;
+ return this;
+ }
+
+ @Override
+ public Collection<String> call() {
+ Preconditions.checkNotNull(toRev, "toRev has to be specified.");
+ Preconditions.checkNotNull(fromRev, "fromRev has to be specified.");
+
+ final Set<String> changedFiles = new HashSet<String>();
+
+ Commandline cmd = cmd();
+
+ cmd.addArgs("diff", "--name-only", "--no-renames", fromRev + ".." + toRev);
+
+ if (path != null)
+ cmd.addArgs("--", path);
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.trim().length() != 0)
+ changedFiles.add(QuotedString.GIT_PATH.dequote(line));
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return changedFiles;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java b/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java
index 738d4b689e..7f66c723a2 100644
--- a/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java
@@ -1,99 +1,99 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.StringTokenizer;
-
-import org.eclipse.jgit.util.QuotedString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class ListFileChangesCommand extends GitCommand<Collection<FileChange>> {
-
- private static final Logger logger = LoggerFactory.getLogger(ListFileChangesCommand.class);
-
- private String fromRev;
-
- private String toRev;
-
- private String path;
-
- public ListFileChangesCommand(File gitDir) {
- super(gitDir);
- }
-
- public ListFileChangesCommand fromRev(String fromRev) {
- this.fromRev = fromRev;
- return this;
- }
-
- public ListFileChangesCommand toRev(String toRev) {
- this.toRev = toRev;
- return this;
- }
-
- public ListFileChangesCommand path(String path) {
- this.path = path;
- return this;
- }
-
- @Override
- public Collection<FileChange> call() {
- Preconditions.checkNotNull(toRev, "toRev has to be specified.");
- Preconditions.checkNotNull(fromRev, "fromRev has to be specified.");
-
- final Collection<FileChange> fileChanges = new ArrayList<>();
-
- Commandline cmd = cmd();
-
- cmd.addArgs("diff", "--numstat", "--no-renames", fromRev + ".." + toRev);
-
- if (path != null)
- cmd.addArgs("--", path);
-
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.contains("\t")) {
- StringTokenizer tokenizer = new StringTokenizer(line, "\t");
-
- int additions;
- String field = tokenizer.nextToken();
- if (field.equals("-"))
- additions = -1;
- else
- additions = Integer.parseInt(field);
-
- int deletions;
- field = tokenizer.nextToken();
- if (field.equals("-"))
- deletions = -1;
- else
- deletions = Integer.parseInt(field);
-
- String file = QuotedString.GIT_PATH.dequote(tokenizer.nextToken());
-
- fileChanges.add(new FileChange(null, file, additions, deletions));
- }
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
-
- return fileChanges;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.StringTokenizer;
+
+import org.eclipse.jgit.util.QuotedString;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class ListFileChangesCommand extends GitCommand<Collection<FileChange>> {
+
+ private static final Logger logger = LoggerFactory.getLogger(ListFileChangesCommand.class);
+
+ private String fromRev;
+
+ private String toRev;
+
+ private String path;
+
+ public ListFileChangesCommand(File gitDir) {
+ super(gitDir);
+ }
+
+ public ListFileChangesCommand fromRev(String fromRev) {
+ this.fromRev = fromRev;
+ return this;
+ }
+
+ public ListFileChangesCommand toRev(String toRev) {
+ this.toRev = toRev;
+ return this;
+ }
+
+ public ListFileChangesCommand path(String path) {
+ this.path = path;
+ return this;
+ }
+
+ @Override
+ public Collection<FileChange> call() {
+ Preconditions.checkNotNull(toRev, "toRev has to be specified.");
+ Preconditions.checkNotNull(fromRev, "fromRev has to be specified.");
+
+ final Collection<FileChange> fileChanges = new ArrayList<>();
+
+ Commandline cmd = cmd();
+
+ cmd.addArgs("diff", "--numstat", "--no-renames", fromRev + ".." + toRev);
+
+ if (path != null)
+ cmd.addArgs("--", path);
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.contains("\t")) {
+ StringTokenizer tokenizer = new StringTokenizer(line, "\t");
+
+ int additions;
+ String field = tokenizer.nextToken();
+ if (field.equals("-"))
+ additions = -1;
+ else
+ additions = Integer.parseInt(field);
+
+ int deletions;
+ field = tokenizer.nextToken();
+ if (field.equals("-"))
+ deletions = -1;
+ else
+ deletions = Integer.parseInt(field);
+
+ String file = QuotedString.GIT_PATH.dequote(tokenizer.nextToken());
+
+ fileChanges.add(new FileChange(null, file, additions, deletions));
+ }
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return fileChanges;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/LogCommand.java b/core/src/main/java/io/onedev/server/git/command/LogCommand.java
index 5eec51f59d..d46805a481 100644
--- a/core/src/main/java/io/onedev/server/git/command/LogCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/LogCommand.java
@@ -1,176 +1,176 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.EnumSet;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.concurrent.atomic.AtomicReference;
-
-import org.eclipse.jgit.util.QuotedString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.server.git.GitUtils;
-
-public abstract class LogCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(LogCommand.class);
-
- public enum Field {PARENTS, AUTHOR, COMMITTER, FILE_CHANGES};
-
- private EnumSet<Field> fields = EnumSet.allOf(Field.class);
-
- private List<String> revisions = new ArrayList<>();
-
- public LogCommand(File gitDir) {
- super(gitDir);
- }
-
- public List<String> revisions() {
- return revisions;
- }
-
- public LogCommand revisions(List<String> revisions) {
- this.revisions = revisions;
- return this;
- }
-
- public EnumSet<Field> fields() {
- return fields;
- }
-
- public LogCommand fields(EnumSet<Field> fields) {
- this.fields = fields;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkArgument(!revisions.isEmpty(), "Log revisions have to be specified");
-
- Commandline cmd = cmd();
-
- String format = "hash:%H %n";
-
- if (fields.contains(Field.PARENTS)) {
- format += "parents:%P %n";
- }
- if (fields.contains(Field.AUTHOR)) {
- format += ""
- + "author:%aN %n"
- + "authorEmail:%aE %n"
- + "authorDate:%ad %n";
- }
- if (fields.contains(Field.COMMITTER)) {
- format += ""
- + "committer:%cN %n"
- + "committerEmail:%cE %n"
- + "committerDate:%cd %n";
- }
-
- if (fields.contains(Field.FILE_CHANGES))
- cmd.addArgs("-c", "diff.renameLimit=1000", "log", "--numstat", "--find-renames");
- else
- cmd.addArgs("log");
-
- cmd.addArgs("--format=" + format, "--date=raw");
-
- for (String revision: revisions)
- cmd.addArgs(revision);
-
- AtomicReference<GitCommit.Builder> commitBuilderRef = new AtomicReference<>(null);
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.startsWith("hash:")) {
- if (commitBuilderRef.get() != null)
- LogCommand.this.consume(commitBuilderRef.get().build());
- commitBuilderRef.set(new GitCommit.Builder());
- if (fields.contains(Field.PARENTS))
- commitBuilderRef.get().parentHashes = new ArrayList<>();
- if (fields.contains(Field.FILE_CHANGES))
- commitBuilderRef.get().fileChanges = new ArrayList<>();
- commitBuilderRef.get().hash = line.substring("hash:".length()).trim();
- } else if (line.startsWith("author:")) {
- commitBuilderRef.get().authorName = line.substring("author:".length()).trim();
- } else if (line.startsWith("committer:")) {
- commitBuilderRef.get().committerName = line.substring("committer:".length()).trim();
- } else if (line.startsWith("authorEmail:")) {
- commitBuilderRef.get().authorEmail = line.substring("authorEmail:".length()).trim();
- } else if (line.startsWith("committerEmail:")) {
- commitBuilderRef.get().committerEmail = line.substring("committerEmail:".length()).trim();
- } else if (line.startsWith("parents:")) {
- Splitter splitter = Splitter.on(" ").omitEmptyStrings().trimResults();
- for (String each: splitter.split(line.substring("parents:".length())))
- commitBuilderRef.get().parentHashes.add(each);
- } else if (line.startsWith("committerDate:")) {
- commitBuilderRef.get().committerDate =
- GitUtils.parseRawDate(line.substring("committerDate:".length()).trim());
- } else if (line.startsWith("authorDate:")) {
- commitBuilderRef.get().authorDate =
- GitUtils.parseRawDate(line.substring("authorDate:".length()).trim());
- } else if (line.trim().length() != 0) {
- StringTokenizer tokenizer = new StringTokenizer(line, "\t");
- String additionsToken = tokenizer.nextToken();
- int additions = additionsToken.equals("-")?-1:Integer.parseInt(additionsToken);
- String deletionsToken = tokenizer.nextToken();
- int deletions = deletionsToken.equals("-")?-1:Integer.parseInt(deletionsToken);
-
- String path = tokenizer.nextToken();
- int renameSignIndex = path.indexOf(" => ");
- if (renameSignIndex != -1) {
- int leftBraceIndex = path.indexOf("{");
- int rightBraceIndex = path.indexOf("}");
- if (leftBraceIndex != -1 && rightBraceIndex != -1 && leftBraceIndex<renameSignIndex
- && rightBraceIndex>renameSignIndex) {
- String leftCommon = path.substring(0, leftBraceIndex);
- String rightCommon = path.substring(rightBraceIndex+1);
- String oldPath = leftCommon + path.substring(leftBraceIndex+1, renameSignIndex)
- + rightCommon;
- String newPath = leftCommon + path.substring(renameSignIndex+4, rightBraceIndex)
- + rightCommon;
- commitBuilderRef.get().fileChanges.add(
- new FileChange(oldPath, newPath, additions, deletions));
- } else {
- String oldPath = QuotedString.GIT_PATH.dequote(path.substring(0, renameSignIndex));
- String newPath = QuotedString.GIT_PATH.dequote(path.substring(renameSignIndex+4));
- commitBuilderRef.get().fileChanges.add(
- new FileChange(oldPath, newPath, additions, deletions));
- }
- } else {
- path = QuotedString.GIT_PATH.dequote(path);
- commitBuilderRef.get().fileChanges.add(new FileChange(null, path, additions, deletions));
- }
- }
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.contains("inexact rename detection was skipped")
- || line.contains("you may want to set your diff.renameLimit variable")) {
- logger.trace(line);
- } else {
- logger.error(line);
- }
- }
-
- }).checkReturnCode();
-
- if (commitBuilderRef.get() != null)
- consume(commitBuilderRef.get().build());
-
- return null;
- }
-
- protected abstract void consume(GitCommit commit);
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.eclipse.jgit.util.QuotedString;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.server.git.GitUtils;
+
+public abstract class LogCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(LogCommand.class);
+
+ public enum Field {PARENTS, AUTHOR, COMMITTER, FILE_CHANGES};
+
+ private EnumSet<Field> fields = EnumSet.allOf(Field.class);
+
+ private List<String> revisions = new ArrayList<>();
+
+ public LogCommand(File gitDir) {
+ super(gitDir);
+ }
+
+ public List<String> revisions() {
+ return revisions;
+ }
+
+ public LogCommand revisions(List<String> revisions) {
+ this.revisions = revisions;
+ return this;
+ }
+
+ public EnumSet<Field> fields() {
+ return fields;
+ }
+
+ public LogCommand fields(EnumSet<Field> fields) {
+ this.fields = fields;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkArgument(!revisions.isEmpty(), "Log revisions have to be specified");
+
+ Commandline cmd = cmd();
+
+ String format = "hash:%H %n";
+
+ if (fields.contains(Field.PARENTS)) {
+ format += "parents:%P %n";
+ }
+ if (fields.contains(Field.AUTHOR)) {
+ format += ""
+ + "author:%aN %n"
+ + "authorEmail:%aE %n"
+ + "authorDate:%ad %n";
+ }
+ if (fields.contains(Field.COMMITTER)) {
+ format += ""
+ + "committer:%cN %n"
+ + "committerEmail:%cE %n"
+ + "committerDate:%cd %n";
+ }
+
+ if (fields.contains(Field.FILE_CHANGES))
+ cmd.addArgs("-c", "diff.renameLimit=1000", "log", "--numstat", "--find-renames");
+ else
+ cmd.addArgs("log");
+
+ cmd.addArgs("--format=" + format, "--date=raw");
+
+ for (String revision: revisions)
+ cmd.addArgs(revision);
+
+ AtomicReference<GitCommit.Builder> commitBuilderRef = new AtomicReference<>(null);
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.startsWith("hash:")) {
+ if (commitBuilderRef.get() != null)
+ LogCommand.this.consume(commitBuilderRef.get().build());
+ commitBuilderRef.set(new GitCommit.Builder());
+ if (fields.contains(Field.PARENTS))
+ commitBuilderRef.get().parentHashes = new ArrayList<>();
+ if (fields.contains(Field.FILE_CHANGES))
+ commitBuilderRef.get().fileChanges = new ArrayList<>();
+ commitBuilderRef.get().hash = line.substring("hash:".length()).trim();
+ } else if (line.startsWith("author:")) {
+ commitBuilderRef.get().authorName = line.substring("author:".length()).trim();
+ } else if (line.startsWith("committer:")) {
+ commitBuilderRef.get().committerName = line.substring("committer:".length()).trim();
+ } else if (line.startsWith("authorEmail:")) {
+ commitBuilderRef.get().authorEmail = line.substring("authorEmail:".length()).trim();
+ } else if (line.startsWith("committerEmail:")) {
+ commitBuilderRef.get().committerEmail = line.substring("committerEmail:".length()).trim();
+ } else if (line.startsWith("parents:")) {
+ Splitter splitter = Splitter.on(" ").omitEmptyStrings().trimResults();
+ for (String each: splitter.split(line.substring("parents:".length())))
+ commitBuilderRef.get().parentHashes.add(each);
+ } else if (line.startsWith("committerDate:")) {
+ commitBuilderRef.get().committerDate =
+ GitUtils.parseRawDate(line.substring("committerDate:".length()).trim());
+ } else if (line.startsWith("authorDate:")) {
+ commitBuilderRef.get().authorDate =
+ GitUtils.parseRawDate(line.substring("authorDate:".length()).trim());
+ } else if (line.trim().length() != 0) {
+ StringTokenizer tokenizer = new StringTokenizer(line, "\t");
+ String additionsToken = tokenizer.nextToken();
+ int additions = additionsToken.equals("-")?-1:Integer.parseInt(additionsToken);
+ String deletionsToken = tokenizer.nextToken();
+ int deletions = deletionsToken.equals("-")?-1:Integer.parseInt(deletionsToken);
+
+ String path = tokenizer.nextToken();
+ int renameSignIndex = path.indexOf(" => ");
+ if (renameSignIndex != -1) {
+ int leftBraceIndex = path.indexOf("{");
+ int rightBraceIndex = path.indexOf("}");
+ if (leftBraceIndex != -1 && rightBraceIndex != -1 && leftBraceIndex<renameSignIndex
+ && rightBraceIndex>renameSignIndex) {
+ String leftCommon = path.substring(0, leftBraceIndex);
+ String rightCommon = path.substring(rightBraceIndex+1);
+ String oldPath = leftCommon + path.substring(leftBraceIndex+1, renameSignIndex)
+ + rightCommon;
+ String newPath = leftCommon + path.substring(renameSignIndex+4, rightBraceIndex)
+ + rightCommon;
+ commitBuilderRef.get().fileChanges.add(
+ new FileChange(oldPath, newPath, additions, deletions));
+ } else {
+ String oldPath = QuotedString.GIT_PATH.dequote(path.substring(0, renameSignIndex));
+ String newPath = QuotedString.GIT_PATH.dequote(path.substring(renameSignIndex+4));
+ commitBuilderRef.get().fileChanges.add(
+ new FileChange(oldPath, newPath, additions, deletions));
+ }
+ } else {
+ path = QuotedString.GIT_PATH.dequote(path);
+ commitBuilderRef.get().fileChanges.add(new FileChange(null, path, additions, deletions));
+ }
+ }
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.contains("inexact rename detection was skipped")
+ || line.contains("you may want to set your diff.renameLimit variable")) {
+ logger.trace(line);
+ } else {
+ logger.error(line);
+ }
+ }
+
+ }).checkReturnCode();
+
+ if (commitBuilderRef.get() != null)
+ consume(commitBuilderRef.get().build());
+
+ return null;
+ }
+
+ protected abstract void consume(GitCommit commit);
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java b/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java
index 44cef5f5ff..10c4c2a6c7 100644
--- a/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java
@@ -1,58 +1,58 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class ReceiveCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
-
- private InputStream input;
-
- private OutputStream output;
-
- public ReceiveCommand(File gitDir, Map<String, String> environments) {
- super(gitDir, environments);
- }
-
- public ReceiveCommand input(InputStream input) {
- this.input = input;
- return this;
- }
-
- public ReceiveCommand output(OutputStream output) {
- this.output = output;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkNotNull(input);
- Preconditions.checkNotNull(output);
-
- Commandline cmd = cmd();
- cmd.addArgs("receive-pack", "--stateless-rpc", ".");
-
- cmd.execute(output, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }, input).checkReturnCode();
-
- return null;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class ReceiveCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);
+
+ private InputStream input;
+
+ private OutputStream output;
+
+ public ReceiveCommand(File gitDir, Map<String, String> environments) {
+ super(gitDir, environments);
+ }
+
+ public ReceiveCommand input(InputStream input) {
+ this.input = input;
+ return this;
+ }
+
+ public ReceiveCommand output(OutputStream output) {
+ this.output = output;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(input);
+ Preconditions.checkNotNull(output);
+
+ Commandline cmd = cmd();
+ cmd.addArgs("receive-pack", "--stateless-rpc", ".");
+
+ cmd.execute(output, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }, input).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/RevListCommand.java b/core/src/main/java/io/onedev/server/git/command/RevListCommand.java
index 36b8f46ace..680eddda46 100644
--- a/core/src/main/java/io/onedev/server/git/command/RevListCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/RevListCommand.java
@@ -1,241 +1,241 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class RevListCommand extends GitCommand<List<String>> {
-
- private static final Logger logger = LoggerFactory.getLogger(RevListCommand.class);
-
- public enum Order {DATE, AUTHOR_DATE, TOPO};
-
- private List<String> revisions = new ArrayList<>();
-
- private List<String> paths = new ArrayList<>();
-
- private String after;
-
- private String before;
-
- private int count;
-
- private int skip;
-
- private Order order;
-
- private boolean firstParent;
-
- private boolean ignoreCase;
-
- private List<String> messages = new ArrayList<>();
-
- private List<String> authors = new ArrayList<>();
-
- private List<String> committers = new ArrayList<>();
-
- public RevListCommand(File gitDir) {
- super(gitDir);
- }
-
- public List<String> revisions() {
- return revisions;
- }
-
- public RevListCommand revisions(List<String> revisions) {
- this.revisions = revisions;
- return this;
- }
-
- public List<String> paths() {
- return paths;
- }
-
- public RevListCommand paths(List<String> paths) {
- this.paths = paths;
- return this;
- }
-
- public String after() {
- return after;
- }
-
- public RevListCommand after(String after) {
- this.after = after;
- return this;
- }
-
- public Order order() {
- return order;
- }
-
- public RevListCommand order(Order order) {
- this.order = order;
- return this;
- }
-
- public boolean firstParent() {
- return firstParent;
- }
-
- public RevListCommand firstParent(boolean firstParent) {
- this.firstParent = firstParent;
- return this;
- }
-
- public RevListCommand after(Date after) {
- this.after = DateFormatUtils.ISO_8601_EXTENDED_DATE_FORMAT.format(after);
- return this;
- }
-
- public String before() {
- return before;
- }
-
- public RevListCommand before(String before) {
- this.before = before;
- return this;
- }
-
- public RevListCommand before(Date before) {
- this.before = DateFormatUtils.ISO_8601_EXTENDED_DATE_FORMAT.format(before);
- return this;
- }
-
- public int count() {
- return count;
- }
-
- public RevListCommand count(int count) {
- this.count = count;
- return this;
- }
-
- public int skip() {
- return skip;
- }
-
- public RevListCommand skip(int skip) {
- this.skip = skip;
- return this;
- }
-
- public boolean ignoreCase() {
- return ignoreCase;
- }
-
- public RevListCommand ignoreCase(boolean ignoreCase) {
- this.ignoreCase = ignoreCase;
- return this;
- }
-
- public List<String> messages() {
- return messages;
- }
-
- public RevListCommand messages(List<String> messages) {
- this.messages = messages;
- return this;
- }
-
- public List<String> authors() {
- return authors;
- }
-
- public RevListCommand authors(List<String> authors) {
- this.authors = authors;
- return this;
- }
-
- public List<String> committers() {
- return committers;
- }
-
- public RevListCommand commmitters(List<String> committers) {
- this.committers = committers;
- return this;
- }
-
- @Override
- public List<String> call() {
- Commandline cmd = cmd();
- cmd.addArgs("rev-list");
-
- boolean hasRevisions = false;
- if (!revisions.isEmpty()) {
- for (String revision: revisions) {
- cmd.addArgs(revision);
- if (!revision.startsWith("^"))
- hasRevisions = true;
- }
- }
- if (!hasRevisions)
- cmd.addArgs("--branches");
-
- if (before != null)
- cmd.addArgs("--before", before);
-
- if (after != null)
- cmd.addArgs("--after", after);
-
- if (count != 0)
- cmd.addArgs("-" + count);
- if (skip != 0)
- cmd.addArgs("--skip=" + skip);
-
- if (order == Order.DATE)
- cmd.addArgs("--date-order");
- else if (order == Order.AUTHOR_DATE)
- cmd.addArgs("--author-date-order");
- else if (order == Order.TOPO)
- cmd.addArgs("--topo-order");
-
- if (firstParent)
- cmd.addArgs("--first-parent");
-
- for (String author: authors)
- cmd.addArgs("--author=" + author);
-
- for (String committer: committers)
- cmd.addArgs("--committer=" + committer);
-
- for (String message: messages)
- cmd.addArgs("--grep=" + message);
-
- if (ignoreCase)
- cmd.addArgs("-i");
-
- cmd.addArgs("--");
-
- for (String path: paths)
- cmd.addArgs(path);
-
- List<String> commitHashes = new ArrayList<>();
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- commitHashes.add(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
-
- return commitHashes;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class RevListCommand extends GitCommand<List<String>> {
+
+ private static final Logger logger = LoggerFactory.getLogger(RevListCommand.class);
+
+ public enum Order {DATE, AUTHOR_DATE, TOPO};
+
+ private List<String> revisions = new ArrayList<>();
+
+ private List<String> paths = new ArrayList<>();
+
+ private String after;
+
+ private String before;
+
+ private int count;
+
+ private int skip;
+
+ private Order order;
+
+ private boolean firstParent;
+
+ private boolean ignoreCase;
+
+ private List<String> messages = new ArrayList<>();
+
+ private List<String> authors = new ArrayList<>();
+
+ private List<String> committers = new ArrayList<>();
+
+ public RevListCommand(File gitDir) {
+ super(gitDir);
+ }
+
+ public List<String> revisions() {
+ return revisions;
+ }
+
+ public RevListCommand revisions(List<String> revisions) {
+ this.revisions = revisions;
+ return this;
+ }
+
+ public List<String> paths() {
+ return paths;
+ }
+
+ public RevListCommand paths(List<String> paths) {
+ this.paths = paths;
+ return this;
+ }
+
+ public String after() {
+ return after;
+ }
+
+ public RevListCommand after(String after) {
+ this.after = after;
+ return this;
+ }
+
+ public Order order() {
+ return order;
+ }
+
+ public RevListCommand order(Order order) {
+ this.order = order;
+ return this;
+ }
+
+ public boolean firstParent() {
+ return firstParent;
+ }
+
+ public RevListCommand firstParent(boolean firstParent) {
+ this.firstParent = firstParent;
+ return this;
+ }
+
+ public RevListCommand after(Date after) {
+ this.after = DateFormatUtils.ISO_8601_EXTENDED_DATE_FORMAT.format(after);
+ return this;
+ }
+
+ public String before() {
+ return before;
+ }
+
+ public RevListCommand before(String before) {
+ this.before = before;
+ return this;
+ }
+
+ public RevListCommand before(Date before) {
+ this.before = DateFormatUtils.ISO_8601_EXTENDED_DATE_FORMAT.format(before);
+ return this;
+ }
+
+ public int count() {
+ return count;
+ }
+
+ public RevListCommand count(int count) {
+ this.count = count;
+ return this;
+ }
+
+ public int skip() {
+ return skip;
+ }
+
+ public RevListCommand skip(int skip) {
+ this.skip = skip;
+ return this;
+ }
+
+ public boolean ignoreCase() {
+ return ignoreCase;
+ }
+
+ public RevListCommand ignoreCase(boolean ignoreCase) {
+ this.ignoreCase = ignoreCase;
+ return this;
+ }
+
+ public List<String> messages() {
+ return messages;
+ }
+
+ public RevListCommand messages(List<String> messages) {
+ this.messages = messages;
+ return this;
+ }
+
+ public List<String> authors() {
+ return authors;
+ }
+
+ public RevListCommand authors(List<String> authors) {
+ this.authors = authors;
+ return this;
+ }
+
+ public List<String> committers() {
+ return committers;
+ }
+
+ public RevListCommand commmitters(List<String> committers) {
+ this.committers = committers;
+ return this;
+ }
+
+ @Override
+ public List<String> call() {
+ Commandline cmd = cmd();
+ cmd.addArgs("rev-list");
+
+ boolean hasRevisions = false;
+ if (!revisions.isEmpty()) {
+ for (String revision: revisions) {
+ cmd.addArgs(revision);
+ if (!revision.startsWith("^"))
+ hasRevisions = true;
+ }
+ }
+ if (!hasRevisions)
+ cmd.addArgs("--branches");
+
+ if (before != null)
+ cmd.addArgs("--before", before);
+
+ if (after != null)
+ cmd.addArgs("--after", after);
+
+ if (count != 0)
+ cmd.addArgs("-" + count);
+ if (skip != 0)
+ cmd.addArgs("--skip=" + skip);
+
+ if (order == Order.DATE)
+ cmd.addArgs("--date-order");
+ else if (order == Order.AUTHOR_DATE)
+ cmd.addArgs("--author-date-order");
+ else if (order == Order.TOPO)
+ cmd.addArgs("--topo-order");
+
+ if (firstParent)
+ cmd.addArgs("--first-parent");
+
+ for (String author: authors)
+ cmd.addArgs("--author=" + author);
+
+ for (String committer: committers)
+ cmd.addArgs("--committer=" + committer);
+
+ for (String message: messages)
+ cmd.addArgs("--grep=" + message);
+
+ if (ignoreCase)
+ cmd.addArgs("-i");
+
+ cmd.addArgs("--");
+
+ for (String path: paths)
+ cmd.addArgs(path);
+
+ List<String> commitHashes = new ArrayList<>();
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ commitHashes.add(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return commitHashes;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/UploadCommand.java b/core/src/main/java/io/onedev/server/git/command/UploadCommand.java
index 44e894233b..1221ef27be 100644
--- a/core/src/main/java/io/onedev/server/git/command/UploadCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/UploadCommand.java
@@ -1,58 +1,58 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class UploadCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(UploadCommand.class);
-
- private InputStream input;
-
- private OutputStream output;
-
- public UploadCommand(File gitDir, Map<String, String> environments) {
- super(gitDir, environments);
- }
-
- public UploadCommand input(InputStream input) {
- this.input = input;
- return this;
- }
-
- public UploadCommand output(OutputStream output) {
- this.output = output;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkNotNull(input);
- Preconditions.checkNotNull(output);
-
- Commandline cmd = cmd();
- cmd.addArgs("upload-pack", "--stateless-rpc", ".");
-
- cmd.execute(output, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }, input).checkReturnCode();
-
- return null;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class UploadCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(UploadCommand.class);
+
+ private InputStream input;
+
+ private OutputStream output;
+
+ public UploadCommand(File gitDir, Map<String, String> environments) {
+ super(gitDir, environments);
+ }
+
+ public UploadCommand input(InputStream input) {
+ this.input = input;
+ return this;
+ }
+
+ public UploadCommand output(OutputStream output) {
+ this.output = output;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(input);
+ Preconditions.checkNotNull(output);
+
+ Commandline cmd = cmd();
+ cmd.addArgs("upload-pack", "--stateless-rpc", ".");
+
+ cmd.execute(output, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }, input).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/config/CurlConfig.java b/core/src/main/java/io/onedev/server/git/config/CurlConfig.java
index ff7bd2fe5c..f81dc2a777 100644
--- a/core/src/main/java/io/onedev/server/git/config/CurlConfig.java
+++ b/core/src/main/java/io/onedev/server/git/config/CurlConfig.java
@@ -1,74 +1,74 @@
-package io.onedev.server.git.config;
-
-import java.io.Serializable;
-
-import javax.validation.ConstraintValidatorContext;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.Editable;
-
-/**
- * Git relevant settings.
- *
- * @author robin
- *
- */
-@Editable
-@ClassValidating
-public abstract class CurlConfig implements Serializable, Validatable {
-
- private static final long serialVersionUID = 1L;
-
- private static final Logger logger = LoggerFactory.getLogger(CurlConfig.class);
-
- public abstract String getExecutable();
-
- @Override
- public boolean isValid(ConstraintValidatorContext context) {
- String curlExe = getExecutable();
- if (curlExe != null) {
- String errorMessage = null;
- try {
- new Commandline(curlExe).addArgs("--version").execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.trace(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
- } catch (Exception e) {
- errorMessage = ExceptionUtils.getMessage(e);
- if (errorMessage.contains("CreateProcess error=2"))
- errorMessage = "Unable to find curl command: " + curlExe;
- else if (errorMessage.contains("error launching curl"))
- errorMessage = "Unable to launch git command: " + curlExe;
- }
-
- if (errorMessage != null) {
- context.disableDefaultConstraintViolation();
- context.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();
- return false;
- } else {
- return true;
- }
- } else {
- return true;
- }
- }
-
-}
+package io.onedev.server.git.config;
+
+import java.io.Serializable;
+
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
+import io.onedev.server.web.editable.annotation.Editable;
+
+/**
+ * Git relevant settings.
+ *
+ * @author robin
+ *
+ */
+@Editable
+@ClassValidating
+public abstract class CurlConfig implements Serializable, Validatable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(CurlConfig.class);
+
+ public abstract String getExecutable();
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ String curlExe = getExecutable();
+ if (curlExe != null) {
+ String errorMessage = null;
+ try {
+ new Commandline(curlExe).addArgs("--version").execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+ } catch (Exception e) {
+ errorMessage = ExceptionUtils.getMessage(e);
+ if (errorMessage.contains("CreateProcess error=2"))
+ errorMessage = "Unable to find curl command: " + curlExe;
+ else if (errorMessage.contains("error launching curl"))
+ errorMessage = "Unable to launch git command: " + curlExe;
+ }
+
+ if (errorMessage != null) {
+ context.disableDefaultConstraintViolation();
+ context.buildConstraintViolationWithTemplate(errorMessage).addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ } else {
+ return true;
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/migration/JpaConverter.java b/core/src/main/java/io/onedev/server/migration/JpaConverter.java
index 0ef3368fea..89d2be10c0 100644
--- a/core/src/main/java/io/onedev/server/migration/JpaConverter.java
+++ b/core/src/main/java/io/onedev/server/migration/JpaConverter.java
@@ -1,243 +1,243 @@
-package io.onedev.server.migration;
-
-import java.lang.reflect.Field;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import javax.persistence.ManyToOne;
-
-import org.dom4j.Attribute;
-import org.dom4j.Branch;
-import org.dom4j.Element;
-import org.hibernate.collection.internal.PersistentBag;
-import org.hibernate.proxy.HibernateProxy;
-
-import com.thoughtworks.xstream.converters.MarshallingContext;
-import com.thoughtworks.xstream.converters.UnmarshallingContext;
-import com.thoughtworks.xstream.converters.reflection.ReflectionConverter;
-import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
-import com.thoughtworks.xstream.core.util.HierarchicalStreams;
-import com.thoughtworks.xstream.io.HierarchicalStreamReader;
-import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
-import com.thoughtworks.xstream.mapper.Mapper;
-
-import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.commons.utils.ClassUtils;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.ReflectionUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.persistence.dao.Dao;
-
-@SuppressWarnings({"rawtypes", "unchecked"})
-public class JpaConverter extends ReflectionConverter {
-
- private ThreadLocal<Stack<HierarchicalStreamReader>> readerStack =
- new ThreadLocal<Stack<HierarchicalStreamReader>>() {
-
- @Override
- protected Stack<HierarchicalStreamReader> initialValue() {
- return new Stack<HierarchicalStreamReader>();
- }
-
- };
-
- private ThreadLocal<Stack<HierarchicalStreamWriter>> writerStack =
- new ThreadLocal<Stack<HierarchicalStreamWriter>>() {
-
- @Override
- protected Stack<HierarchicalStreamWriter> initialValue() {
- return new Stack<HierarchicalStreamWriter>();
- }
-
- };
-
- public JpaConverter(Mapper mapper, ReflectionProvider reflectionProvider) {
- super(mapper, reflectionProvider);
- }
-
- @Override
- public void marshal(Object original, HierarchicalStreamWriter writer, MarshallingContext context) {
- try {
- writerStack.get().push(writer);
- if (original instanceof HibernateProxy)
- original = ((HibernateProxy)original).getHibernateLazyInitializer().getImplementation();
- super.marshal(original, writer, context);
- } finally {
- writerStack.get().pop();
- }
- }
-
- @Override
- protected void marshallField(MarshallingContext context, Object newObj, Field field) {
- HierarchicalStreamWriter writer = writerStack.get().peek();
- if (field.getAnnotation(ManyToOne.class) != null) {
- super.marshallField(context, ((AbstractEntity) newObj).getId(), field);
- } else if (newObj instanceof HibernateProxy) {
- newObj = ((HibernateProxy)newObj).getHibernateLazyInitializer().getImplementation();
- super.marshallField(context, newObj, field);
- } else if (newObj instanceof VersionedDocument) {
- marshallElement(writer, ((VersionedDocument)newObj).getRootElement());
- } else if (Collection.class.isAssignableFrom(field.getType())
- && ReflectionUtils.getCollectionElementType(field.getGenericType()) == VersionedDocument.class) {
- for (VersionedDocument vdom: (List<VersionedDocument>)newObj) {
- if (vdom != null) {
- marshallElement(writer, vdom.getRootElement());
- } else {
- writer.startNode(mapper.serializedClass(null));
- writer.endNode();
- }
- }
- } else if (Map.class.isAssignableFrom(field.getType())
- && ReflectionUtils.getMapValueType(field.getGenericType()) == VersionedDocument.class) {
- for (Map.Entry<Object, VersionedDocument> entry:
- ((Map<Object, VersionedDocument>)newObj).entrySet()) {
- writer.startNode(mapper.serializedClass(Map.Entry.class));
- if (entry.getKey() != null) {
- writer.startNode(mapper.serializedClass(entry.getKey().getClass()));
- context.convertAnother(entry.getKey());
- writer.endNode();
- } else {
- writer.startNode(mapper.serializedClass(null));
- writer.endNode();
- }
- if (entry.getValue() != null) {
- marshallElement(writer, entry.getValue().getRootElement());
- } else {
- writer.startNode(mapper.serializedClass(null));
- writer.endNode();
- }
- writer.endNode();
- }
- } else if (field.getType().isEnum()) {
- writer.setValue(((Enum)newObj).name());
- } else if (field.getType() == String.class) {
- String stringValue = (String) newObj;
- if (stringValue.indexOf('\0') != -1)
- writer.setValue(StringUtils.replace(stringValue, "\0", ""));
- else
- writer.setValue(stringValue);
- } else {
- super.marshallField(context, newObj, field);
- }
- }
-
- @Override
- public Object unmarshal(HierarchicalStreamReader reader,
- UnmarshallingContext context) {
- try {
- readerStack.get().push(reader);
- return super.unmarshal(reader, context);
- } finally {
- readerStack.get().pop();
- }
- }
-
- @Override
- protected Object unmarshallField(UnmarshallingContext context,
- Object result, Class type, Field field) {
- HierarchicalStreamReader reader = readerStack.get().peek();
- if (field.getAnnotation(ManyToOne.class) != null) {
- return AppLoader.getInstance(Dao.class).load(
- (Class<? extends AbstractEntity>) field.getType(),
- Long.valueOf(reader.getValue()));
- } else if (field.getType() == VersionedDocument.class) {
- VersionedDocument vdom = new VersionedDocument();
- reader.moveDown();
- unmarshallElement(reader, vdom);
- reader.moveUp();
- return vdom;
- } else if (Collection.class.isAssignableFrom(field.getType())
- && ReflectionUtils.getCollectionElementType(field.getGenericType()) == VersionedDocument.class) {
- Collection collection;
- try {
- collection = (Collection) mapper.defaultImplementationOf(
- field.getType()).newInstance();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- while (reader.hasMoreChildren()) {
- reader.moveDown();
- if (!reader.getNodeName().equals("null")) {
- VersionedDocument vdom = new VersionedDocument();
- unmarshallElement(reader, vdom);
- collection.add(vdom);
- } else {
- collection.add(null);
- }
- reader.moveUp();
- }
- return collection;
- } else if (Map.class.isAssignableFrom(field.getType())
- && ReflectionUtils.getMapValueType(field.getGenericType()) == VersionedDocument.class) {
- Map map;
- try {
- map = (Map) mapper.defaultImplementationOf(field.getType()).newInstance();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- while (reader.hasMoreChildren()) {
- reader.moveDown();
- reader.moveDown();
- Class keyType = HierarchicalStreams.readClassType(reader, mapper);
- Object key;
- if (!reader.getNodeName().equals("null"))
- key = context.convertAnother(reader, keyType);
- else
- key = null;
- reader.moveUp();
- reader.moveDown();
- if (!reader.getNodeName().equals("null")) {
- VersionedDocument vdom = new VersionedDocument();
- unmarshallElement(reader, vdom);
- map.put(key, vdom);
- } else {
- map.put(key, null);
- }
- reader.moveUp();
- reader.moveUp();
- }
- return map;
- } else if (field.getType().isEnum()) {
- // process this separately since the default implementation
- // adds enum ordinal besides name for polymorphic enums
- // (for example Subscription.Condition)
- return Enum.valueOf((Class)field.getType(), reader.getValue());
- } else {
- return super.unmarshallField(context, result, type, field);
- }
- }
-
- public boolean canConvert(Class clazz) {
- return !ClassUtils.isSystemType(clazz) && clazz != PersistentBag.class;
- }
-
- private void marshallElement(HierarchicalStreamWriter writer, Element element) {
- writer.startNode(element.getName());
- for (Attribute attribute: (List<Attribute>)element.attributes())
- writer.addAttribute(attribute.getName(), attribute.getValue());
- if (element.getText().trim().length() != 0)
- writer.setValue(element.getText().trim());
- for (Element child: (List<Element>)element.elements())
- marshallElement(writer, child);
- writer.endNode();
- }
-
- private void unmarshallElement(HierarchicalStreamReader reader, Branch branch) {
- Element element = branch.addElement(reader.getNodeName());
- for (int i=0; i<reader.getAttributeCount(); i++) {
- String attributeName = reader.getAttributeName(i);
- String attributeValue = reader.getAttribute(i);
- element.addAttribute(attributeName, attributeValue);
- }
- if (StringUtils.isNotBlank(reader.getValue()))
- element.setText(reader.getValue().trim());
- while (reader.hasMoreChildren()) {
- reader.moveDown();
- unmarshallElement(reader, element);
- reader.moveUp();
- }
- }
-}
+package io.onedev.server.migration;
+
+import java.lang.reflect.Field;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+import javax.persistence.ManyToOne;
+
+import org.dom4j.Attribute;
+import org.dom4j.Branch;
+import org.dom4j.Element;
+import org.hibernate.collection.internal.PersistentBag;
+import org.hibernate.proxy.HibernateProxy;
+
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.converters.reflection.ReflectionConverter;
+import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
+import com.thoughtworks.xstream.core.util.HierarchicalStreams;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.mapper.Mapper;
+
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ReflectionUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.persistence.dao.Dao;
+
+@SuppressWarnings({"rawtypes", "unchecked"})
+public class JpaConverter extends ReflectionConverter {
+
+ private ThreadLocal<Stack<HierarchicalStreamReader>> readerStack =
+ new ThreadLocal<Stack<HierarchicalStreamReader>>() {
+
+ @Override
+ protected Stack<HierarchicalStreamReader> initialValue() {
+ return new Stack<HierarchicalStreamReader>();
+ }
+
+ };
+
+ private ThreadLocal<Stack<HierarchicalStreamWriter>> writerStack =
+ new ThreadLocal<Stack<HierarchicalStreamWriter>>() {
+
+ @Override
+ protected Stack<HierarchicalStreamWriter> initialValue() {
+ return new Stack<HierarchicalStreamWriter>();
+ }
+
+ };
+
+ public JpaConverter(Mapper mapper, ReflectionProvider reflectionProvider) {
+ super(mapper, reflectionProvider);
+ }
+
+ @Override
+ public void marshal(Object original, HierarchicalStreamWriter writer, MarshallingContext context) {
+ try {
+ writerStack.get().push(writer);
+ if (original instanceof HibernateProxy)
+ original = ((HibernateProxy)original).getHibernateLazyInitializer().getImplementation();
+ super.marshal(original, writer, context);
+ } finally {
+ writerStack.get().pop();
+ }
+ }
+
+ @Override
+ protected void marshallField(MarshallingContext context, Object newObj, Field field) {
+ HierarchicalStreamWriter writer = writerStack.get().peek();
+ if (field.getAnnotation(ManyToOne.class) != null) {
+ super.marshallField(context, ((AbstractEntity) newObj).getId(), field);
+ } else if (newObj instanceof HibernateProxy) {
+ newObj = ((HibernateProxy)newObj).getHibernateLazyInitializer().getImplementation();
+ super.marshallField(context, newObj, field);
+ } else if (newObj instanceof VersionedDocument) {
+ marshallElement(writer, ((VersionedDocument)newObj).getRootElement());
+ } else if (Collection.class.isAssignableFrom(field.getType())
+ && ReflectionUtils.getCollectionElementType(field.getGenericType()) == VersionedDocument.class) {
+ for (VersionedDocument vdom: (List<VersionedDocument>)newObj) {
+ if (vdom != null) {
+ marshallElement(writer, vdom.getRootElement());
+ } else {
+ writer.startNode(mapper.serializedClass(null));
+ writer.endNode();
+ }
+ }
+ } else if (Map.class.isAssignableFrom(field.getType())
+ && ReflectionUtils.getMapValueType(field.getGenericType()) == VersionedDocument.class) {
+ for (Map.Entry<Object, VersionedDocument> entry:
+ ((Map<Object, VersionedDocument>)newObj).entrySet()) {
+ writer.startNode(mapper.serializedClass(Map.Entry.class));
+ if (entry.getKey() != null) {
+ writer.startNode(mapper.serializedClass(entry.getKey().getClass()));
+ context.convertAnother(entry.getKey());
+ writer.endNode();
+ } else {
+ writer.startNode(mapper.serializedClass(null));
+ writer.endNode();
+ }
+ if (entry.getValue() != null) {
+ marshallElement(writer, entry.getValue().getRootElement());
+ } else {
+ writer.startNode(mapper.serializedClass(null));
+ writer.endNode();
+ }
+ writer.endNode();
+ }
+ } else if (field.getType().isEnum()) {
+ writer.setValue(((Enum)newObj).name());
+ } else if (field.getType() == String.class) {
+ String stringValue = (String) newObj;
+ if (stringValue.indexOf('\0') != -1)
+ writer.setValue(StringUtils.replace(stringValue, "\0", ""));
+ else
+ writer.setValue(stringValue);
+ } else {
+ super.marshallField(context, newObj, field);
+ }
+ }
+
+ @Override
+ public Object unmarshal(HierarchicalStreamReader reader,
+ UnmarshallingContext context) {
+ try {
+ readerStack.get().push(reader);
+ return super.unmarshal(reader, context);
+ } finally {
+ readerStack.get().pop();
+ }
+ }
+
+ @Override
+ protected Object unmarshallField(UnmarshallingContext context,
+ Object result, Class type, Field field) {
+ HierarchicalStreamReader reader = readerStack.get().peek();
+ if (field.getAnnotation(ManyToOne.class) != null) {
+ return AppLoader.getInstance(Dao.class).load(
+ (Class<? extends AbstractEntity>) field.getType(),
+ Long.valueOf(reader.getValue()));
+ } else if (field.getType() == VersionedDocument.class) {
+ VersionedDocument vdom = new VersionedDocument();
+ reader.moveDown();
+ unmarshallElement(reader, vdom);
+ reader.moveUp();
+ return vdom;
+ } else if (Collection.class.isAssignableFrom(field.getType())
+ && ReflectionUtils.getCollectionElementType(field.getGenericType()) == VersionedDocument.class) {
+ Collection collection;
+ try {
+ collection = (Collection) mapper.defaultImplementationOf(
+ field.getType()).newInstance();
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ while (reader.hasMoreChildren()) {
+ reader.moveDown();
+ if (!reader.getNodeName().equals("null")) {
+ VersionedDocument vdom = new VersionedDocument();
+ unmarshallElement(reader, vdom);
+ collection.add(vdom);
+ } else {
+ collection.add(null);
+ }
+ reader.moveUp();
+ }
+ return collection;
+ } else if (Map.class.isAssignableFrom(field.getType())
+ && ReflectionUtils.getMapValueType(field.getGenericType()) == VersionedDocument.class) {
+ Map map;
+ try {
+ map = (Map) mapper.defaultImplementationOf(field.getType()).newInstance();
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ while (reader.hasMoreChildren()) {
+ reader.moveDown();
+ reader.moveDown();
+ Class keyType = HierarchicalStreams.readClassType(reader, mapper);
+ Object key;
+ if (!reader.getNodeName().equals("null"))
+ key = context.convertAnother(reader, keyType);
+ else
+ key = null;
+ reader.moveUp();
+ reader.moveDown();
+ if (!reader.getNodeName().equals("null")) {
+ VersionedDocument vdom = new VersionedDocument();
+ unmarshallElement(reader, vdom);
+ map.put(key, vdom);
+ } else {
+ map.put(key, null);
+ }
+ reader.moveUp();
+ reader.moveUp();
+ }
+ return map;
+ } else if (field.getType().isEnum()) {
+ // process this separately since the default implementation
+ // adds enum ordinal besides name for polymorphic enums
+ // (for example Subscription.Condition)
+ return Enum.valueOf((Class)field.getType(), reader.getValue());
+ } else {
+ return super.unmarshallField(context, result, type, field);
+ }
+ }
+
+ public boolean canConvert(Class clazz) {
+ return !ClassUtils.isSystemType(clazz) && clazz != PersistentBag.class;
+ }
+
+ private void marshallElement(HierarchicalStreamWriter writer, Element element) {
+ writer.startNode(element.getName());
+ for (Attribute attribute: (List<Attribute>)element.attributes())
+ writer.addAttribute(attribute.getName(), attribute.getValue());
+ if (element.getText().trim().length() != 0)
+ writer.setValue(element.getText().trim());
+ for (Element child: (List<Element>)element.elements())
+ marshallElement(writer, child);
+ writer.endNode();
+ }
+
+ private void unmarshallElement(HierarchicalStreamReader reader, Branch branch) {
+ Element element = branch.addElement(reader.getNodeName());
+ for (int i=0; i<reader.getAttributeCount(); i++) {
+ String attributeName = reader.getAttributeName(i);
+ String attributeValue = reader.getAttribute(i);
+ element.addAttribute(attributeName, attributeValue);
+ }
+ if (StringUtils.isNotBlank(reader.getValue()))
+ element.setText(reader.getValue().trim());
+ while (reader.hasMoreChildren()) {
+ reader.moveDown();
+ unmarshallElement(reader, element);
+ reader.moveUp();
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/migration/MigrationHelper.java b/core/src/main/java/io/onedev/server/migration/MigrationHelper.java
index 24fb94c897..5278fce23f 100644
--- a/core/src/main/java/io/onedev/server/migration/MigrationHelper.java
+++ b/core/src/main/java/io/onedev/server/migration/MigrationHelper.java
@@ -1,159 +1,159 @@
-package io.onedev.server.migration;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.StringUtils;
-
-public class MigrationHelper {
-
- private static final Logger logger = LoggerFactory.getLogger(MigrationHelper.class);
-
- private static final Pattern migrateMethodPattern =
- Pattern.compile("^migrate(\\d+)$");
-
- private static Map<String, MigratorAnalyzeResult> migratorAnalyzeResults =
- new ConcurrentHashMap<String, MigratorAnalyzeResult>();
-
- private static MigratorAnalyzeResult getMigratorAnalyzeResult(Class<?> migrator) {
- MigratorAnalyzeResult migratorAnalyzeResult =
- migratorAnalyzeResults.get(migrator.getName());
- if (migratorAnalyzeResult == null) {
- final MigratorAnalyzeResult newMigratorAnalyzeResult =
- new MigratorAnalyzeResult();
-
- Method[] methods = migrator.getDeclaredMethods();
- for (int i=0; i<methods.length; i++) {
- Method method = methods[i];
- int migrateVersion = getVersion(method);
- if (migrateVersion != 0) {
- if (Modifier.isPrivate(method.getModifiers()) &&
- !Modifier.isStatic(method.getModifiers())) {
- method.setAccessible(true);
- newMigratorAnalyzeResult.getMigrateVersions()
- .put(method.getName(), migrateVersion);
- newMigratorAnalyzeResult.getMigrateMethods().add(method);
- } else {
- throw new RuntimeException("Migrate method should be declared " +
- "as a private non-static method.");
- }
- }
- }
-
- Collections.sort(newMigratorAnalyzeResult.getMigrateMethods(),
- new Comparator<Method>() {
-
- public int compare(Method migrate_x, Method migrate_y) {
- return newMigratorAnalyzeResult.getMigrateVersions().get(migrate_x.getName()) -
- newMigratorAnalyzeResult.getMigrateVersions().get(migrate_y.getName());
- }
-
- });
- migratorAnalyzeResults.put(migrator.getName(), newMigratorAnalyzeResult);
- return newMigratorAnalyzeResult;
- } else {
- return migratorAnalyzeResult;
- }
- }
-
- private static int getVersion(Method method) {
- Matcher matcher = migrateMethodPattern.matcher(method.getName());
- if (matcher.find()) {
- int migrateVersion = Integer.parseInt(matcher.group(1));
- if (migrateVersion == 0) {
- throw new RuntimeException("Invalid migrate method name: " + method.getName());
- }
- return migrateVersion;
- } else
- return 0;
- }
-
- public static String getVersion(Class<?> migratorClass) {
- List<String> versionParts = new ArrayList<String>();
- Class<?> current = migratorClass;
- while (current != null && current != Object.class) {
- versionParts.add(String.valueOf(getMigratorAnalyzeResult(current).getDataVersion()));
- current = current.getSuperclass();
- }
- Collections.reverse(versionParts);
- return StringUtils.join(versionParts, '.');
- }
-
- public static boolean migrate(String fromVersion, Object migrator, Object customData) {
- Stack<Integer> versionParts = new Stack<Integer>();
- for (String part: StringUtils.split(fromVersion, "."))
- versionParts.push(Integer.valueOf(part));
-
- boolean migrated = false;
-
- Class<?> current = migrator.getClass();
- while (current != null && current != Object.class) {
- MigratorAnalyzeResult migratorAnalyzeResult = getMigratorAnalyzeResult(current);
-
- int version;
- if (!versionParts.empty())
- version = versionParts.pop();
- else
- version = 0;
- int size = migratorAnalyzeResult.getMigrateMethods().size();
- int start;
- if (version != 0) {
- start = size;
- for (int i=0; i<size; i++) {
- Method method = migratorAnalyzeResult.getMigrateMethods().get(i);
- if (method.getName().equals("migrate" + version)) {
- start = i;
- break;
- }
- }
- if (start == size) {
- throw new RuntimeException("Can not find migrate method (migrator: " + current.getName() + ", method: " + "migrate" + version + ")");
- } else {
- start++;
- }
- } else {
- start = 0;
- }
-
- for (int i=start; i<size; i++) {
- Method migrateMethod = migratorAnalyzeResult.getMigrateMethods().get(i);
- int previousVersion;
- if (i != 0) {
- Method previousMigrateMethod =
- migratorAnalyzeResult.getMigrateMethods().get(i-1);
- previousVersion = migratorAnalyzeResult.getMigrateVersions()
- .get(previousMigrateMethod.getName());
- } else {
- previousVersion = 0;
- }
- int currentVersion = migratorAnalyzeResult.getMigrateVersions()
- .get(migrateMethod.getName());
- Object[] params = new String[]{current.getName(),
- String.valueOf(previousVersion),
- String.valueOf(currentVersion)};
- logger.debug("Migrating data (migrator: {}, from version: {}, " + "to version: {})", params);
- try {
- migrateMethod.invoke(migrator, customData, versionParts);
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- migrated = true;
- }
- current = current.getSuperclass();
- }
- return migrated;
- }
-}
+package io.onedev.server.migration;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.StringUtils;
+
+public class MigrationHelper {
+
+ private static final Logger logger = LoggerFactory.getLogger(MigrationHelper.class);
+
+ private static final Pattern migrateMethodPattern =
+ Pattern.compile("^migrate(\\d+)$");
+
+ private static Map<String, MigratorAnalyzeResult> migratorAnalyzeResults =
+ new ConcurrentHashMap<String, MigratorAnalyzeResult>();
+
+ private static MigratorAnalyzeResult getMigratorAnalyzeResult(Class<?> migrator) {
+ MigratorAnalyzeResult migratorAnalyzeResult =
+ migratorAnalyzeResults.get(migrator.getName());
+ if (migratorAnalyzeResult == null) {
+ final MigratorAnalyzeResult newMigratorAnalyzeResult =
+ new MigratorAnalyzeResult();
+
+ Method[] methods = migrator.getDeclaredMethods();
+ for (int i=0; i<methods.length; i++) {
+ Method method = methods[i];
+ int migrateVersion = getVersion(method);
+ if (migrateVersion != 0) {
+ if (Modifier.isPrivate(method.getModifiers()) &&
+ !Modifier.isStatic(method.getModifiers())) {
+ method.setAccessible(true);
+ newMigratorAnalyzeResult.getMigrateVersions()
+ .put(method.getName(), migrateVersion);
+ newMigratorAnalyzeResult.getMigrateMethods().add(method);
+ } else {
+ throw new RuntimeException("Migrate method should be declared " +
+ "as a private non-static method.");
+ }
+ }
+ }
+
+ Collections.sort(newMigratorAnalyzeResult.getMigrateMethods(),
+ new Comparator<Method>() {
+
+ public int compare(Method migrate_x, Method migrate_y) {
+ return newMigratorAnalyzeResult.getMigrateVersions().get(migrate_x.getName()) -
+ newMigratorAnalyzeResult.getMigrateVersions().get(migrate_y.getName());
+ }
+
+ });
+ migratorAnalyzeResults.put(migrator.getName(), newMigratorAnalyzeResult);
+ return newMigratorAnalyzeResult;
+ } else {
+ return migratorAnalyzeResult;
+ }
+ }
+
+ private static int getVersion(Method method) {
+ Matcher matcher = migrateMethodPattern.matcher(method.getName());
+ if (matcher.find()) {
+ int migrateVersion = Integer.parseInt(matcher.group(1));
+ if (migrateVersion == 0) {
+ throw new RuntimeException("Invalid migrate method name: " + method.getName());
+ }
+ return migrateVersion;
+ } else
+ return 0;
+ }
+
+ public static String getVersion(Class<?> migratorClass) {
+ List<String> versionParts = new ArrayList<String>();
+ Class<?> current = migratorClass;
+ while (current != null && current != Object.class) {
+ versionParts.add(String.valueOf(getMigratorAnalyzeResult(current).getDataVersion()));
+ current = current.getSuperclass();
+ }
+ Collections.reverse(versionParts);
+ return StringUtils.join(versionParts, '.');
+ }
+
+ public static boolean migrate(String fromVersion, Object migrator, Object customData) {
+ Stack<Integer> versionParts = new Stack<Integer>();
+ for (String part: StringUtils.split(fromVersion, "."))
+ versionParts.push(Integer.valueOf(part));
+
+ boolean migrated = false;
+
+ Class<?> current = migrator.getClass();
+ while (current != null && current != Object.class) {
+ MigratorAnalyzeResult migratorAnalyzeResult = getMigratorAnalyzeResult(current);
+
+ int version;
+ if (!versionParts.empty())
+ version = versionParts.pop();
+ else
+ version = 0;
+ int size = migratorAnalyzeResult.getMigrateMethods().size();
+ int start;
+ if (version != 0) {
+ start = size;
+ for (int i=0; i<size; i++) {
+ Method method = migratorAnalyzeResult.getMigrateMethods().get(i);
+ if (method.getName().equals("migrate" + version)) {
+ start = i;
+ break;
+ }
+ }
+ if (start == size) {
+ throw new RuntimeException("Can not find migrate method (migrator: " + current.getName() + ", method: " + "migrate" + version + ")");
+ } else {
+ start++;
+ }
+ } else {
+ start = 0;
+ }
+
+ for (int i=start; i<size; i++) {
+ Method migrateMethod = migratorAnalyzeResult.getMigrateMethods().get(i);
+ int previousVersion;
+ if (i != 0) {
+ Method previousMigrateMethod =
+ migratorAnalyzeResult.getMigrateMethods().get(i-1);
+ previousVersion = migratorAnalyzeResult.getMigrateVersions()
+ .get(previousMigrateMethod.getName());
+ } else {
+ previousVersion = 0;
+ }
+ int currentVersion = migratorAnalyzeResult.getMigrateVersions()
+ .get(migrateMethod.getName());
+ Object[] params = new String[]{current.getName(),
+ String.valueOf(previousVersion),
+ String.valueOf(currentVersion)};
+ logger.debug("Migrating data (migrator: {}, from version: {}, " + "to version: {})", params);
+ try {
+ migrateMethod.invoke(migrator, customData, versionParts);
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ migrated = true;
+ }
+ current = current.getSuperclass();
+ }
+ return migrated;
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/migration/VersionedDocument.java b/core/src/main/java/io/onedev/server/migration/VersionedDocument.java
index fa1611c32b..42bb298d56 100644
--- a/core/src/main/java/io/onedev/server/migration/VersionedDocument.java
+++ b/core/src/main/java/io/onedev/server/migration/VersionedDocument.java
@@ -1,526 +1,526 @@
-package io.onedev.server.migration;
-
-import java.io.ByteArrayOutputStream;
-import java.io.Externalizable;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.ObjectUtils.Null;
-import org.dom4j.Branch;
-import org.dom4j.Comment;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.DocumentType;
-import org.dom4j.Element;
-import org.dom4j.InvalidXPathException;
-import org.dom4j.Node;
-import org.dom4j.ProcessingInstruction;
-import org.dom4j.QName;
-import org.dom4j.Visitor;
-import org.dom4j.XPath;
-import org.dom4j.io.OutputFormat;
-import org.dom4j.io.SAXReader;
-import org.dom4j.io.XMLWriter;
-import org.xml.sax.EntityResolver;
-
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
-import com.thoughtworks.xstream.XStream;
-import com.thoughtworks.xstream.core.util.HierarchicalStreams;
-import com.thoughtworks.xstream.io.xml.Dom4JReader;
-import com.thoughtworks.xstream.io.xml.Dom4JWriter;
-import com.thoughtworks.xstream.mapper.CannotResolveClassException;
-
-import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.commons.utils.ClassUtils;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.FileUtils;
-
-public final class VersionedDocument implements Document, Externalizable {
-
- private static final long serialVersionUID = 1L;
-
- private transient String xml;
-
- private transient Document wrapped;
-
- public VersionedDocument() {
- wrapped = DocumentHelper.createDocument();
- }
-
- public VersionedDocument(Document wrapped) {
- this.wrapped = Preconditions.checkNotNull(wrapped);
- }
-
- public synchronized void setWrapped(Document wrapped) {
- this.wrapped = Preconditions.checkNotNull(wrapped);
- }
-
- public Document addComment(String comment) {
- return getWrapped().addComment(comment);
- }
-
- public Document addDocType(String name, String publicId, String systemId) {
- return getWrapped().addDocType(name, publicId, systemId);
- }
-
- public Document addProcessingInstruction(String target, String text) {
- return getWrapped().addProcessingInstruction(target, text);
- }
-
- public Document addProcessingInstruction(String target, Map<String, String> data) {
- return getWrapped().addProcessingInstruction(target, data);
- }
-
- public DocumentType getDocType() {
- return getWrapped().getDocType();
- }
-
- public EntityResolver getEntityResolver() {
- return getWrapped().getEntityResolver();
- }
-
- public Element getRootElement() {
- return getWrapped().getRootElement();
- }
-
- public String getXMLEncoding() {
- return getWrapped().getXMLEncoding();
- }
-
- public void setDocType(DocumentType docType) {
- getWrapped().setDocType(docType);
- }
-
- public void setEntityResolver(EntityResolver entityResolver) {
- getWrapped().setEntityResolver(entityResolver);
- }
-
- public void setRootElement(Element rootElement) {
- getWrapped().setRootElement(rootElement);
- }
-
- public void setXMLEncoding(String encoding) {
- getWrapped().setXMLEncoding(encoding);
- }
-
- public void add(Node node) {
- getWrapped().add(node);
- }
-
- public void add(Comment comment) {
- getWrapped().add(comment);
- }
-
- public void add(Element element) {
- getWrapped().add(element);
- }
-
- public void add(ProcessingInstruction pi) {
- getWrapped().add(pi);
- }
-
- public Element addElement(String name) {
- return getWrapped().addElement(name);
- }
-
- public Element addElement(QName qname) {
- return getWrapped().addElement(qname);
- }
-
- public Element addElement(String qualifiedName, String namespaceURI) {
- return getWrapped().addElement(qualifiedName, namespaceURI);
- }
-
- public void appendContent(Branch branch) {
- getWrapped().appendContent(branch);
- }
-
- public void clearContent() {
- getWrapped().clearContent();
- }
-
- public List<Node> content() {
- return getWrapped().content();
- }
-
- public Element elementByID(String elementID) {
- return getWrapped().elementByID(elementID);
- }
-
- public int indexOf(Node node) {
- return getWrapped().indexOf(node);
- }
-
- public Node node(int index) throws IndexOutOfBoundsException {
- return getWrapped().node(index);
- }
-
- public int nodeCount() {
- return getWrapped().nodeCount();
- }
-
- public Iterator<Node> nodeIterator() {
- return getWrapped().nodeIterator();
- }
-
- public void normalize() {
- getWrapped().normalize();
- }
-
- public ProcessingInstruction processingInstruction(String target) {
- return getWrapped().processingInstruction(target);
- }
-
- public List<ProcessingInstruction> processingInstructions() {
- return getWrapped().processingInstructions();
- }
-
- public List<ProcessingInstruction> processingInstructions(String target) {
- return getWrapped().processingInstructions(target);
- }
-
- public boolean remove(Node node) {
- return getWrapped().remove(node);
- }
-
- public boolean remove(Comment comment) {
- return getWrapped().remove(comment);
- }
-
- public boolean remove(Element element) {
- return getWrapped().remove(element);
- }
-
- public boolean remove(ProcessingInstruction pi) {
- return getWrapped().remove(pi);
- }
-
- public boolean removeProcessingInstruction(String target) {
- return getWrapped().removeProcessingInstruction(target);
- }
-
- public void setContent(List<Node> content) {
- getWrapped().setContent(content);
- }
-
- public void setProcessingInstructions(List<ProcessingInstruction> listOfPIs) {
- getWrapped().setProcessingInstructions(listOfPIs);
- }
-
- public void accept(Visitor visitor) {
- getWrapped().accept(visitor);
- }
-
- public String asXML() {
- return getWrapped().asXML();
- }
-
- public Node asXPathResult(Element parent) {
- return getWrapped().asXPathResult(parent);
- }
-
- public XPath createXPath(String xpathExpression)
- throws InvalidXPathException {
- return getWrapped().createXPath(xpathExpression);
- }
-
- public Node detach() {
- return getWrapped().detach();
- }
-
- public Document getDocument() {
- return getWrapped().getDocument();
- }
-
- public String getName() {
- return getWrapped().getName();
- }
-
- public short getNodeType() {
- return getWrapped().getNodeType();
- }
-
- public String getNodeTypeName() {
- return getWrapped().getNodeTypeName();
- }
-
- public Element getParent() {
- return getWrapped().getParent();
- }
-
- public String getPath() {
- return getWrapped().getPath();
- }
-
- public String getPath(Element context) {
- return getWrapped().getPath(context);
- }
-
- public String getStringValue() {
- return getWrapped().getStringValue();
- }
-
- public String getText() {
- return getWrapped().getText();
- }
-
- public String getUniquePath() {
- return getWrapped().getUniquePath();
- }
-
- public String getUniquePath(Element context) {
- return getWrapped().getUniquePath(context);
- }
-
- public boolean hasContent() {
- return getWrapped().hasContent();
- }
-
- public boolean isReadOnly() {
- return getWrapped().isReadOnly();
- }
-
- public boolean matches(String xpathExpression) {
- return getWrapped().matches(xpathExpression);
- }
-
- public Number numberValueOf(String xpathExpression) {
- return getWrapped().numberValueOf(xpathExpression);
- }
-
- public List<Node> selectNodes(String xpathExpression) {
- return getWrapped().selectNodes(xpathExpression);
- }
-
- public List<Node> selectNodes(String xpathExpression,
- String comparisonXPathExpression) {
- return getWrapped().selectNodes(xpathExpression, comparisonXPathExpression);
- }
-
- public List<Node> selectNodes(String xpathExpression,
- String comparisonXPathExpression, boolean removeDuplicates) {
- return getWrapped().selectNodes(xpathExpression, comparisonXPathExpression,
- removeDuplicates);
- }
-
- public Object selectObject(String xpathExpression) {
- return getWrapped().selectObject(xpathExpression);
- }
-
- public Node selectSingleNode(String xpathExpression) {
- return getWrapped().selectSingleNode(xpathExpression);
- }
-
- public void setDocument(Document document) {
- getWrapped().setDocument(document);
- }
-
- public void setName(String name) {
- getWrapped().setName(name);
- }
-
- public void setParent(Element parent) {
- getWrapped().setParent(parent);
- }
-
- public void setText(String text) {
- getWrapped().setText(text);
- }
-
- public boolean supportsParent() {
- return getWrapped().supportsParent();
- }
-
- public String valueOf(String xpathExpression) {
- return getWrapped().valueOf(xpathExpression);
- }
-
- public void write(Writer writer) throws IOException {
- getWrapped().write(writer);
- }
-
- @Override
- public Object clone() {
- return new VersionedDocument((Document) getWrapped().clone());
- }
-
- public String toXML() {
- return toXML(true);
- }
-
- public String toXML(boolean pretty) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- try {
- OutputFormat format = new OutputFormat();
- format.setEncoding(Charsets.UTF_8.name());
- if (pretty) {
- format.setIndent(true);
- format.setNewlines(true);
- } else {
- format.setIndent(false);
- format.setNewlines(false);
- }
- new XMLWriter(baos, format).write(getWrapped());
- return baos.toString(Charsets.UTF_8.name());
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- public void writeToFile(File file, boolean pretty) {
- OutputStream os = null;
- try {
- os = new FileOutputStream(file);
- OutputFormat format = new OutputFormat();
- format.setIndent(pretty);
- format.setNewlines(pretty);
- format.setEncoding(Charsets.UTF_8.name());
- XMLWriter writer = new XMLWriter(os, format);
- writer.write(this);
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- } finally {
- IOUtils.closeQuietly(os);
- }
- }
-
- public static VersionedDocument fromXML(String xml) {
- try {
- return new VersionedDocument(new SAXReader().read(new StringReader(xml)));
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- public static VersionedDocument fromFile(File file) {
- try {
- return fromXML(FileUtils.readFileToString(file, Charsets.UTF_8.name()));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public synchronized Document getWrapped() {
- if (wrapped == null) {
- wrapped = fromXML(Preconditions.checkNotNull(xml)).getWrapped();
- }
- return wrapped;
- }
-
- public static VersionedDocument fromBean(@Nullable Object bean) {
- Document dom = DocumentHelper.createDocument();
- AppLoader.getInstance(XStream.class).marshal(bean, new Dom4JWriter(dom));
- VersionedDocument versionedDom = new VersionedDocument(dom);
- if (bean != null) {
- versionedDom.setVersion(MigrationHelper.getVersion(ClassUtils.unproxy(bean.getClass())));
- }
- return versionedDom;
- }
-
- /**
- * Convert this document to bean. Migration will performed if necessary.
- * During the migration, content of the document will also get updated
- * to reflect current migration result.
- * @return
- */
- public Object toBean() {
- return toBean(null);
- }
-
- /**
- * Convert this document to bean. Migration will performed if necessary.
- * During the migration, content of the document will also get updated
- * to reflect current migration result.
- * @return
- */
- public Object toBean(MigrationListener listener) {
- return toBean(listener, null);
- }
-
- /**
- * Convert this document to bean. Migration will performed if necessary.
- * During the migration, content of the document will also get updated
- * to reflect current migration result.
- * @return
- */
- public Object toBean(MigrationListener listener, Class<?> beanClass) {
- XStream xstream = AppLoader.getInstance(XStream.class);
- Dom4JReader domReader = new Dom4JReader(this);
- Class<?> origBeanClass;
- try {
- origBeanClass = HierarchicalStreams.readClassType(domReader, xstream.getMapper());
- } catch (CannotResolveClassException e) {
- if (beanClass == null)
- throw e;
- else
- origBeanClass = beanClass;
- }
-
- if (origBeanClass == null)
- return null;
- else if (origBeanClass == Null.class)
- return ObjectUtils.NULL;
-
- if (beanClass == null)
- beanClass = origBeanClass;
- else
- getRootElement().setName(xstream.getMapper().serializedClass(beanClass));
- if (getVersion() != null) {
- try {
- Object migrator = beanClass.newInstance();
- if (MigrationHelper.migrate(getVersion(), migrator, this)) {
- setVersion(MigrationHelper.getVersion(migrator.getClass()));
- Object bean = xstream.unmarshal(domReader);
- if (listener != null)
- listener.afterMigration(bean);
- return bean;
- } else {
- return xstream.unmarshal(domReader);
- }
- } catch (InstantiationException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
- } else {
- return xstream.unmarshal(domReader);
- }
- }
-
- public String getVersion() {
- Preconditions.checkNotNull(getRootElement());
- return getRootElement().attributeValue("revision");
- }
-
- public void setVersion(String version) {
- Preconditions.checkNotNull(getRootElement());
- getRootElement().addAttribute("revision", version);
- }
-
- @Override
- public synchronized void writeExternal(ObjectOutput out) throws IOException {
- if (wrapped != null)
- out.writeObject(toXML(false));
- else
- out.writeObject(xml);
- }
-
- @Override
- public synchronized void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
- xml = Preconditions.checkNotNull((String) in.readObject());
- wrapped = null;
- }
-
-}
+package io.onedev.server.migration;
+
+import java.io.ByteArrayOutputStream;
+import java.io.Externalizable;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.io.Writer;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.ObjectUtils.Null;
+import org.dom4j.Branch;
+import org.dom4j.Comment;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.DocumentType;
+import org.dom4j.Element;
+import org.dom4j.InvalidXPathException;
+import org.dom4j.Node;
+import org.dom4j.ProcessingInstruction;
+import org.dom4j.QName;
+import org.dom4j.Visitor;
+import org.dom4j.XPath;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XMLWriter;
+import org.xml.sax.EntityResolver;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
+import com.thoughtworks.xstream.XStream;
+import com.thoughtworks.xstream.core.util.HierarchicalStreams;
+import com.thoughtworks.xstream.io.xml.Dom4JReader;
+import com.thoughtworks.xstream.io.xml.Dom4JWriter;
+import com.thoughtworks.xstream.mapper.CannotResolveClassException;
+
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+
+public final class VersionedDocument implements Document, Externalizable {
+
+ private static final long serialVersionUID = 1L;
+
+ private transient String xml;
+
+ private transient Document wrapped;
+
+ public VersionedDocument() {
+ wrapped = DocumentHelper.createDocument();
+ }
+
+ public VersionedDocument(Document wrapped) {
+ this.wrapped = Preconditions.checkNotNull(wrapped);
+ }
+
+ public synchronized void setWrapped(Document wrapped) {
+ this.wrapped = Preconditions.checkNotNull(wrapped);
+ }
+
+ public Document addComment(String comment) {
+ return getWrapped().addComment(comment);
+ }
+
+ public Document addDocType(String name, String publicId, String systemId) {
+ return getWrapped().addDocType(name, publicId, systemId);
+ }
+
+ public Document addProcessingInstruction(String target, String text) {
+ return getWrapped().addProcessingInstruction(target, text);
+ }
+
+ public Document addProcessingInstruction(String target, Map<String, String> data) {
+ return getWrapped().addProcessingInstruction(target, data);
+ }
+
+ public DocumentType getDocType() {
+ return getWrapped().getDocType();
+ }
+
+ public EntityResolver getEntityResolver() {
+ return getWrapped().getEntityResolver();
+ }
+
+ public Element getRootElement() {
+ return getWrapped().getRootElement();
+ }
+
+ public String getXMLEncoding() {
+ return getWrapped().getXMLEncoding();
+ }
+
+ public void setDocType(DocumentType docType) {
+ getWrapped().setDocType(docType);
+ }
+
+ public void setEntityResolver(EntityResolver entityResolver) {
+ getWrapped().setEntityResolver(entityResolver);
+ }
+
+ public void setRootElement(Element rootElement) {
+ getWrapped().setRootElement(rootElement);
+ }
+
+ public void setXMLEncoding(String encoding) {
+ getWrapped().setXMLEncoding(encoding);
+ }
+
+ public void add(Node node) {
+ getWrapped().add(node);
+ }
+
+ public void add(Comment comment) {
+ getWrapped().add(comment);
+ }
+
+ public void add(Element element) {
+ getWrapped().add(element);
+ }
+
+ public void add(ProcessingInstruction pi) {
+ getWrapped().add(pi);
+ }
+
+ public Element addElement(String name) {
+ return getWrapped().addElement(name);
+ }
+
+ public Element addElement(QName qname) {
+ return getWrapped().addElement(qname);
+ }
+
+ public Element addElement(String qualifiedName, String namespaceURI) {
+ return getWrapped().addElement(qualifiedName, namespaceURI);
+ }
+
+ public void appendContent(Branch branch) {
+ getWrapped().appendContent(branch);
+ }
+
+ public void clearContent() {
+ getWrapped().clearContent();
+ }
+
+ public List<Node> content() {
+ return getWrapped().content();
+ }
+
+ public Element elementByID(String elementID) {
+ return getWrapped().elementByID(elementID);
+ }
+
+ public int indexOf(Node node) {
+ return getWrapped().indexOf(node);
+ }
+
+ public Node node(int index) throws IndexOutOfBoundsException {
+ return getWrapped().node(index);
+ }
+
+ public int nodeCount() {
+ return getWrapped().nodeCount();
+ }
+
+ public Iterator<Node> nodeIterator() {
+ return getWrapped().nodeIterator();
+ }
+
+ public void normalize() {
+ getWrapped().normalize();
+ }
+
+ public ProcessingInstruction processingInstruction(String target) {
+ return getWrapped().processingInstruction(target);
+ }
+
+ public List<ProcessingInstruction> processingInstructions() {
+ return getWrapped().processingInstructions();
+ }
+
+ public List<ProcessingInstruction> processingInstructions(String target) {
+ return getWrapped().processingInstructions(target);
+ }
+
+ public boolean remove(Node node) {
+ return getWrapped().remove(node);
+ }
+
+ public boolean remove(Comment comment) {
+ return getWrapped().remove(comment);
+ }
+
+ public boolean remove(Element element) {
+ return getWrapped().remove(element);
+ }
+
+ public boolean remove(ProcessingInstruction pi) {
+ return getWrapped().remove(pi);
+ }
+
+ public boolean removeProcessingInstruction(String target) {
+ return getWrapped().removeProcessingInstruction(target);
+ }
+
+ public void setContent(List<Node> content) {
+ getWrapped().setContent(content);
+ }
+
+ public void setProcessingInstructions(List<ProcessingInstruction> listOfPIs) {
+ getWrapped().setProcessingInstructions(listOfPIs);
+ }
+
+ public void accept(Visitor visitor) {
+ getWrapped().accept(visitor);
+ }
+
+ public String asXML() {
+ return getWrapped().asXML();
+ }
+
+ public Node asXPathResult(Element parent) {
+ return getWrapped().asXPathResult(parent);
+ }
+
+ public XPath createXPath(String xpathExpression)
+ throws InvalidXPathException {
+ return getWrapped().createXPath(xpathExpression);
+ }
+
+ public Node detach() {
+ return getWrapped().detach();
+ }
+
+ public Document getDocument() {
+ return getWrapped().getDocument();
+ }
+
+ public String getName() {
+ return getWrapped().getName();
+ }
+
+ public short getNodeType() {
+ return getWrapped().getNodeType();
+ }
+
+ public String getNodeTypeName() {
+ return getWrapped().getNodeTypeName();
+ }
+
+ public Element getParent() {
+ return getWrapped().getParent();
+ }
+
+ public String getPath() {
+ return getWrapped().getPath();
+ }
+
+ public String getPath(Element context) {
+ return getWrapped().getPath(context);
+ }
+
+ public String getStringValue() {
+ return getWrapped().getStringValue();
+ }
+
+ public String getText() {
+ return getWrapped().getText();
+ }
+
+ public String getUniquePath() {
+ return getWrapped().getUniquePath();
+ }
+
+ public String getUniquePath(Element context) {
+ return getWrapped().getUniquePath(context);
+ }
+
+ public boolean hasContent() {
+ return getWrapped().hasContent();
+ }
+
+ public boolean isReadOnly() {
+ return getWrapped().isReadOnly();
+ }
+
+ public boolean matches(String xpathExpression) {
+ return getWrapped().matches(xpathExpression);
+ }
+
+ public Number numberValueOf(String xpathExpression) {
+ return getWrapped().numberValueOf(xpathExpression);
+ }
+
+ public List<Node> selectNodes(String xpathExpression) {
+ return getWrapped().selectNodes(xpathExpression);
+ }
+
+ public List<Node> selectNodes(String xpathExpression,
+ String comparisonXPathExpression) {
+ return getWrapped().selectNodes(xpathExpression, comparisonXPathExpression);
+ }
+
+ public List<Node> selectNodes(String xpathExpression,
+ String comparisonXPathExpression, boolean removeDuplicates) {
+ return getWrapped().selectNodes(xpathExpression, comparisonXPathExpression,
+ removeDuplicates);
+ }
+
+ public Object selectObject(String xpathExpression) {
+ return getWrapped().selectObject(xpathExpression);
+ }
+
+ public Node selectSingleNode(String xpathExpression) {
+ return getWrapped().selectSingleNode(xpathExpression);
+ }
+
+ public void setDocument(Document document) {
+ getWrapped().setDocument(document);
+ }
+
+ public void setName(String name) {
+ getWrapped().setName(name);
+ }
+
+ public void setParent(Element parent) {
+ getWrapped().setParent(parent);
+ }
+
+ public void setText(String text) {
+ getWrapped().setText(text);
+ }
+
+ public boolean supportsParent() {
+ return getWrapped().supportsParent();
+ }
+
+ public String valueOf(String xpathExpression) {
+ return getWrapped().valueOf(xpathExpression);
+ }
+
+ public void write(Writer writer) throws IOException {
+ getWrapped().write(writer);
+ }
+
+ @Override
+ public Object clone() {
+ return new VersionedDocument((Document) getWrapped().clone());
+ }
+
+ public String toXML() {
+ return toXML(true);
+ }
+
+ public String toXML(boolean pretty) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ try {
+ OutputFormat format = new OutputFormat();
+ format.setEncoding(Charsets.UTF_8.name());
+ if (pretty) {
+ format.setIndent(true);
+ format.setNewlines(true);
+ } else {
+ format.setIndent(false);
+ format.setNewlines(false);
+ }
+ new XMLWriter(baos, format).write(getWrapped());
+ return baos.toString(Charsets.UTF_8.name());
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ public void writeToFile(File file, boolean pretty) {
+ OutputStream os = null;
+ try {
+ os = new FileOutputStream(file);
+ OutputFormat format = new OutputFormat();
+ format.setIndent(pretty);
+ format.setNewlines(pretty);
+ format.setEncoding(Charsets.UTF_8.name());
+ XMLWriter writer = new XMLWriter(os, format);
+ writer.write(this);
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ } finally {
+ IOUtils.closeQuietly(os);
+ }
+ }
+
+ public static VersionedDocument fromXML(String xml) {
+ try {
+ return new VersionedDocument(new SAXReader().read(new StringReader(xml)));
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ public static VersionedDocument fromFile(File file) {
+ try {
+ return fromXML(FileUtils.readFileToString(file, Charsets.UTF_8.name()));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public synchronized Document getWrapped() {
+ if (wrapped == null) {
+ wrapped = fromXML(Preconditions.checkNotNull(xml)).getWrapped();
+ }
+ return wrapped;
+ }
+
+ public static VersionedDocument fromBean(@Nullable Object bean) {
+ Document dom = DocumentHelper.createDocument();
+ AppLoader.getInstance(XStream.class).marshal(bean, new Dom4JWriter(dom));
+ VersionedDocument versionedDom = new VersionedDocument(dom);
+ if (bean != null) {
+ versionedDom.setVersion(MigrationHelper.getVersion(ClassUtils.unproxy(bean.getClass())));
+ }
+ return versionedDom;
+ }
+
+ /**
+ * Convert this document to bean. Migration will performed if necessary.
+ * During the migration, content of the document will also get updated
+ * to reflect current migration result.
+ * @return
+ */
+ public Object toBean() {
+ return toBean(null);
+ }
+
+ /**
+ * Convert this document to bean. Migration will performed if necessary.
+ * During the migration, content of the document will also get updated
+ * to reflect current migration result.
+ * @return
+ */
+ public Object toBean(MigrationListener listener) {
+ return toBean(listener, null);
+ }
+
+ /**
+ * Convert this document to bean. Migration will performed if necessary.
+ * During the migration, content of the document will also get updated
+ * to reflect current migration result.
+ * @return
+ */
+ public Object toBean(MigrationListener listener, Class<?> beanClass) {
+ XStream xstream = AppLoader.getInstance(XStream.class);
+ Dom4JReader domReader = new Dom4JReader(this);
+ Class<?> origBeanClass;
+ try {
+ origBeanClass = HierarchicalStreams.readClassType(domReader, xstream.getMapper());
+ } catch (CannotResolveClassException e) {
+ if (beanClass == null)
+ throw e;
+ else
+ origBeanClass = beanClass;
+ }
+
+ if (origBeanClass == null)
+ return null;
+ else if (origBeanClass == Null.class)
+ return ObjectUtils.NULL;
+
+ if (beanClass == null)
+ beanClass = origBeanClass;
+ else
+ getRootElement().setName(xstream.getMapper().serializedClass(beanClass));
+ if (getVersion() != null) {
+ try {
+ Object migrator = beanClass.newInstance();
+ if (MigrationHelper.migrate(getVersion(), migrator, this)) {
+ setVersion(MigrationHelper.getVersion(migrator.getClass()));
+ Object bean = xstream.unmarshal(domReader);
+ if (listener != null)
+ listener.afterMigration(bean);
+ return bean;
+ } else {
+ return xstream.unmarshal(domReader);
+ }
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ return xstream.unmarshal(domReader);
+ }
+ }
+
+ public String getVersion() {
+ Preconditions.checkNotNull(getRootElement());
+ return getRootElement().attributeValue("revision");
+ }
+
+ public void setVersion(String version) {
+ Preconditions.checkNotNull(getRootElement());
+ getRootElement().addAttribute("revision", version);
+ }
+
+ @Override
+ public synchronized void writeExternal(ObjectOutput out) throws IOException {
+ if (wrapped != null)
+ out.writeObject(toXML(false));
+ else
+ out.writeObject(xml);
+ }
+
+ @Override
+ public synchronized void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
+ xml = Preconditions.checkNotNull((String) in.readObject());
+ wrapped = null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index 44fabc739b..fab49530db 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -1,520 +1,520 @@
-package io.onedev.server.model.support.issue;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-import javax.validation.constraints.Size;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.OneContext;
-import io.onedev.server.util.ValueSetEdit;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
-import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;
-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
-import io.onedev.server.web.component.stringchoice.StringChoiceProvider;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.IssueQuery;
-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;
-
-@Editable
-public class BoardSpec implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final String NULL_COLUMN = StringChoiceProvider.SPECIAL_CHOICE_PREFIX + "Null";
-
- private String name;
-
- private String baseQuery;
-
- private String backlogBaseQuery = "outstanding";
-
- private String identifyField;
-
- private List<String> columns = new ArrayList<>();
-
- private List<String> displayFields = Lists.newArrayList(IssueConstants.FIELD_STATE);
-
- private List<String> editColumns;
-
- @Editable(order=100)
- @NotEmpty
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Editable(order=200, description="Optionally specify a base query to filter/order issues of the board")
- @IssueQuery
- @Nullable
- public String getBaseQuery() {
- return baseQuery;
- }
-
- public void setBaseQuery(String baseQuery) {
- this.baseQuery = baseQuery;
- }
-
- @Editable(order=250, description="Optionally specify a base query to filter/order issues in backlog. "
- + "Backlog issues are those not associating with any milestones")
- @IssueQuery
- @Nullable
- public String getBacklogBaseQuery() {
- return backlogBaseQuery;
- }
-
- public void setBacklogBaseQuery(String backlogBaseQuery) {
- this.backlogBaseQuery = backlogBaseQuery;
- }
-
- @Editable(order=300, description="Specify issue field to identify different columns of the board")
- @ChoiceProvider("getIdentifyFieldChoices")
- @NotEmpty
- public String getIdentifyField() {
- return identifyField;
- }
-
- public void setIdentifyField(String identifyField) {
- this.identifyField = identifyField;
- }
-
- public List<String> getColumns() {
- return columns;
- }
-
- public void setColumns(List<String> columns) {
- this.columns = columns;
- }
-
- @Editable(order=400, description="Specify columns of the board. Each column corresponds to "
- + "a value of the issue field specified above")
- @Size(min=2, message="At least two columns need to be defined")
- @ChoiceProvider("getColumnChoices")
- public List<String> getEditColumns() {
- if (editColumns == null)
- editColumns = new ArrayList<>();
- return editColumns;
- }
-
- public void setEditColumns(List<String> editColumns) {
- this.editColumns = editColumns;
- }
-
- @Editable(order=500, description="Specify fields to display in board card except issue number and title")
- @ChoiceProvider("getDisplayFieldsChoices")
- public List<String> getDisplayFields() {
- return displayFields;
- }
-
- public void setDisplayFields(List<String> displayFields) {
- this.displayFields = displayFields;
- }
-
- @SuppressWarnings("unused")
- private static List<String> getIdentifyFieldChoices() {
- List<String> choices = new ArrayList<>();
- Project project = OneContext.get().getProject();
- choices.add(IssueConstants.FIELD_STATE);
- for (InputSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {
- if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof GroupChoiceInput))
- choices.add(fieldSpec.getName());
- }
- return choices;
- }
-
- @SuppressWarnings("unused")
- private static List<String> getDisplayFieldsChoices() {
- List<String> choices = new ArrayList<>();
- Project project = OneContext.get().getProject();
- choices.add(IssueConstants.FIELD_STATE);
- for (InputSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {
- choices.add(fieldSpec.getName());
- }
- return choices;
- }
-
- @SuppressWarnings("unused")
- private static Map<String, String> getColumnChoices() {
- Map<String, String> choices = new LinkedHashMap<>();
- Project project = OneContext.get().getProject();
- String fieldName = (String) OneContext.get().getEditContext().getInputValue("identifyField");
- if (IssueConstants.FIELD_STATE.equals(fieldName)) {
- for (StateSpec state: getGlobalIssueSetting().getStateSpecs())
- choices.put(state.getName(), state.getName());
- } else if (fieldName != null) {
- InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);
- if (fieldSpec != null) {
- for (String each: fieldSpec.getPossibleValues())
- choices.put(each, each);
- if (fieldSpec.isAllowEmpty())
- choices.put(NULL_COLUMN, fieldSpec.getNameOfEmptyValue());
- }
- }
- return choices;
- }
-
- private static GlobalIssueSetting getGlobalIssueSetting() {
- return OneDev.getInstance(SettingManager.class).getIssueSetting();
- }
-
- public static int getBoardIndex(List<BoardSpec> boards, String name) {
- for (int i=0; i<boards.size(); i++) {
- if (name.equals(boards.get(i).getName()))
- return i;
- }
- return -1;
- }
-
- public Set<String> getUndefinedStates() {
- Set<String> undefinedStates = new HashSet<>();
- if (getBaseQuery() != null) {
- try {
- undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false).getUndefinedStates());
- } catch (Exception e) {
- }
- }
- if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
- for (String column: getColumns()) {
- if (getGlobalIssueSetting().getStateSpec(column) == null)
- undefinedStates.add(column);
- }
- }
- return undefinedStates;
- }
-
- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
- if (getBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
- for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())
- query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());
- setBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
- if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
- for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {
- int index = getColumns().indexOf(entry.getKey());
- if (index != -1) {
- if (getColumns().contains(entry.getValue().getNewState()))
- getColumns().remove(index);
- else
- getColumns().set(index, entry.getValue().getNewState());
- }
- }
- }
- }
-
- public Set<String> getUndefinedFields() {
- Set<String> undefinedFields = new HashSet<>();
- if (getBaseQuery() != null) {
- try {
- undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false).getUndefinedFields());
- } catch (Exception e) {
- }
- }
- if (!IssueConstants.FIELD_STATE.equals(getIdentifyField())) {
- InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(getIdentifyField());
- if (fieldSpec == null)
- undefinedFields.add(getIdentifyField());
- }
- for (String displayField: getDisplayFields()) {
- if (!IssueConstants.FIELD_STATE.equals(displayField)) {
- InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(displayField);
- if (fieldSpec == null)
- undefinedFields.add(displayField);
- }
- }
- return undefinedFields;
- }
-
- public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
- if (getBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), 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)
- setBaseQuery(null);
- else
- setBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
-
- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
- UndefinedFieldResolution resolution = entry.getValue();
- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
- if (getIdentifyField().equals(entry.getKey()))
- setIdentifyField(resolution.getNewField());
- int index = getDisplayFields().indexOf(entry.getKey());
- if (index != -1) {
- if (getDisplayFields().contains(resolution.getNewField()))
- getDisplayFields().remove(index);
- else
- getDisplayFields().set(index, resolution.getNewField());
- }
- } else {
- getDisplayFields().remove(entry.getKey());
- if (getIdentifyField().equals(entry.getKey()))
- return true;
- }
- }
- return false;
- }
-
- public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
- for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
- if (onEditFieldValues(entry.getKey(), entry.getValue()))
- return true;
- }
- return false;
- }
-
- public static String getWebSocketObservable(Long projectId) {
- return BoardSpec.class.getName() + ":" + projectId;
- }
-
- public void onRenameUser(GlobalIssueSetting issueSetting, String oldName, String newName) {
- InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());
- if (fieldSpec instanceof UserChoiceInput) {
- for (int i=0; i<getColumns().size(); i++) {
- if (getColumns().get(i).equals(oldName))
- getColumns().set(i, newName);
- }
- }
- }
-
- public boolean onDeleteUser(GlobalIssueSetting issueSetting, String userName) {
- InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());
- if (fieldSpec instanceof UserChoiceInput) {
- for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {
- if (it.next().equals(userName))
- it.remove();
- }
- }
- return getColumns().size() < 2;
- }
-
- public void onRenameField(GlobalIssueSetting issueSetting, String oldName, String newName) {
- if (getIdentifyField().equals(oldName))
- setIdentifyField(newName);
- int index = getDisplayFields().indexOf(oldName);
- if (index != -1) {
- if (getDisplayFields().contains(newName))
- getDisplayFields().remove(index);
- else
- getDisplayFields().set(index, newName);
- }
- if (getBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
- query.onRenameField(oldName, newName);
- setBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
- if (getBacklogBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
- query.onRenameField(oldName, newName);
- setBacklogBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
- }
-
- public void onRenameState(String oldName, String newName) {
- if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
- int index = getColumns().indexOf(oldName);
- if (index != -1) {
- if (getColumns().contains(newName))
- getColumns().remove(index);
- else
- getColumns().set(index, newName);
- }
- }
-
- if (getBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
- query.onRenameState(oldName, newName);
- setBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
- if (getBacklogBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
- query.onRenameState(oldName, newName);
- setBacklogBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
-
- }
-
- public boolean onDeleteField(GlobalIssueSetting issueSetting, String fieldName) {
- getDisplayFields().remove(fieldName);
- if (getBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
- if (query.onDeleteField(fieldName))
- setBaseQuery(null);
- else
- setBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
- if (getBacklogBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
- if (query.onDeleteField(fieldName))
- setBacklogBaseQuery(null);
- else
- setBacklogBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
-
- return getIdentifyField().equals(fieldName);
- }
-
- public boolean onDeleteState(String stateName) {
- if (getIdentifyField().equals(IssueConstants.FIELD_STATE))
- getColumns().remove(stateName);
- if (getBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
- if (query.onDeleteState(stateName))
- setBaseQuery(null);
- else
- setBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
- if (getBacklogBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
- if (query.onDeleteState(stateName))
- setBacklogBaseQuery(null);
- else
- setBacklogBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
-
- return getColumns().size() < 2;
- }
-
- public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
- if (fieldName.equals(getIdentifyField())) {
- getColumns().removeAll(valueSetEdit.getDeletions());
- for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {
- int index = getColumns().indexOf(entry.getKey());
- if (index != -1) {
- if (getColumns().contains(entry.getValue()))
- getColumns().remove(index);
- else
- getColumns().set(index, entry.getValue());
- }
- }
- }
- if (getBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
- if (query.onEditFieldValues(fieldName, valueSetEdit))
- setBaseQuery(null);
- else
- setBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
- if (getBacklogBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
- if (query.onEditFieldValues(fieldName, valueSetEdit))
- setBacklogBaseQuery(null);
- else
- setBacklogBaseQuery(query.toString());
- } catch (Exception e) {
- }
- }
- return getColumns().size() < 2;
- }
-
- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- if (!identifyField.equals(IssueConstants.FIELD_STATE)) {
- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(identifyField));
- if (specifiedChoices != null) {
- for (String column: getColumns()) {
- if (column != null && !specifiedChoices.getChoiceValues().contains(column))
- undefinedFieldValues.add(new UndefinedFieldValue(identifyField, column));
- }
- }
- }
- if (getBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
- undefinedFieldValues.addAll(query.getUndefinedFieldValues());
- } catch (Exception e) {
- }
- }
- if (getBacklogBaseQuery() != null) {
- try {
- io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
- undefinedFieldValues.addAll(query.getUndefinedFieldValues());
- } catch (Exception e) {
- }
- }
- return undefinedFieldValues;
- }
-
-}
+package io.onedev.server.model.support.issue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+import javax.validation.constraints.Size;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.OneContext;
+import io.onedev.server.util.ValueSetEdit;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;
+import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
+import io.onedev.server.web.component.stringchoice.StringChoiceProvider;
+import io.onedev.server.web.editable.annotation.ChoiceProvider;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.IssueQuery;
+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;
+
+@Editable
+public class BoardSpec implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String NULL_COLUMN = StringChoiceProvider.SPECIAL_CHOICE_PREFIX + "Null";
+
+ private String name;
+
+ private String baseQuery;
+
+ private String backlogBaseQuery = "outstanding";
+
+ private String identifyField;
+
+ private List<String> columns = new ArrayList<>();
+
+ private List<String> displayFields = Lists.newArrayList(IssueConstants.FIELD_STATE);
+
+ private List<String> editColumns;
+
+ @Editable(order=100)
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200, description="Optionally specify a base query to filter/order issues of the board")
+ @IssueQuery
+ @Nullable
+ public String getBaseQuery() {
+ return baseQuery;
+ }
+
+ public void setBaseQuery(String baseQuery) {
+ this.baseQuery = baseQuery;
+ }
+
+ @Editable(order=250, description="Optionally specify a base query to filter/order issues in backlog. "
+ + "Backlog issues are those not associating with any milestones")
+ @IssueQuery
+ @Nullable
+ public String getBacklogBaseQuery() {
+ return backlogBaseQuery;
+ }
+
+ public void setBacklogBaseQuery(String backlogBaseQuery) {
+ this.backlogBaseQuery = backlogBaseQuery;
+ }
+
+ @Editable(order=300, description="Specify issue field to identify different columns of the board")
+ @ChoiceProvider("getIdentifyFieldChoices")
+ @NotEmpty
+ public String getIdentifyField() {
+ return identifyField;
+ }
+
+ public void setIdentifyField(String identifyField) {
+ this.identifyField = identifyField;
+ }
+
+ public List<String> getColumns() {
+ return columns;
+ }
+
+ public void setColumns(List<String> columns) {
+ this.columns = columns;
+ }
+
+ @Editable(order=400, description="Specify columns of the board. Each column corresponds to "
+ + "a value of the issue field specified above")
+ @Size(min=2, message="At least two columns need to be defined")
+ @ChoiceProvider("getColumnChoices")
+ public List<String> getEditColumns() {
+ if (editColumns == null)
+ editColumns = new ArrayList<>();
+ return editColumns;
+ }
+
+ public void setEditColumns(List<String> editColumns) {
+ this.editColumns = editColumns;
+ }
+
+ @Editable(order=500, description="Specify fields to display in board card except issue number and title")
+ @ChoiceProvider("getDisplayFieldsChoices")
+ public List<String> getDisplayFields() {
+ return displayFields;
+ }
+
+ public void setDisplayFields(List<String> displayFields) {
+ this.displayFields = displayFields;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getIdentifyFieldChoices() {
+ List<String> choices = new ArrayList<>();
+ Project project = OneContext.get().getProject();
+ choices.add(IssueConstants.FIELD_STATE);
+ for (InputSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {
+ if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof GroupChoiceInput))
+ choices.add(fieldSpec.getName());
+ }
+ return choices;
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getDisplayFieldsChoices() {
+ List<String> choices = new ArrayList<>();
+ Project project = OneContext.get().getProject();
+ choices.add(IssueConstants.FIELD_STATE);
+ for (InputSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {
+ choices.add(fieldSpec.getName());
+ }
+ return choices;
+ }
+
+ @SuppressWarnings("unused")
+ private static Map<String, String> getColumnChoices() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ Project project = OneContext.get().getProject();
+ String fieldName = (String) OneContext.get().getEditContext().getInputValue("identifyField");
+ if (IssueConstants.FIELD_STATE.equals(fieldName)) {
+ for (StateSpec state: getGlobalIssueSetting().getStateSpecs())
+ choices.put(state.getName(), state.getName());
+ } else if (fieldName != null) {
+ InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);
+ if (fieldSpec != null) {
+ for (String each: fieldSpec.getPossibleValues())
+ choices.put(each, each);
+ if (fieldSpec.isAllowEmpty())
+ choices.put(NULL_COLUMN, fieldSpec.getNameOfEmptyValue());
+ }
+ }
+ return choices;
+ }
+
+ private static GlobalIssueSetting getGlobalIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
+ public static int getBoardIndex(List<BoardSpec> boards, String name) {
+ for (int i=0; i<boards.size(); i++) {
+ if (name.equals(boards.get(i).getName()))
+ return i;
+ }
+ return -1;
+ }
+
+ public Set<String> getUndefinedStates() {
+ Set<String> undefinedStates = new HashSet<>();
+ if (getBaseQuery() != null) {
+ try {
+ undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false).getUndefinedStates());
+ } catch (Exception e) {
+ }
+ }
+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
+ for (String column: getColumns()) {
+ if (getGlobalIssueSetting().getStateSpec(column) == null)
+ undefinedStates.add(column);
+ }
+ }
+ return undefinedStates;
+ }
+
+ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())
+ query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
+ for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {
+ int index = getColumns().indexOf(entry.getKey());
+ if (index != -1) {
+ if (getColumns().contains(entry.getValue().getNewState()))
+ getColumns().remove(index);
+ else
+ getColumns().set(index, entry.getValue().getNewState());
+ }
+ }
+ }
+ }
+
+ public Set<String> getUndefinedFields() {
+ Set<String> undefinedFields = new HashSet<>();
+ if (getBaseQuery() != null) {
+ try {
+ undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false).getUndefinedFields());
+ } catch (Exception e) {
+ }
+ }
+ if (!IssueConstants.FIELD_STATE.equals(getIdentifyField())) {
+ InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(getIdentifyField());
+ if (fieldSpec == null)
+ undefinedFields.add(getIdentifyField());
+ }
+ for (String displayField: getDisplayFields()) {
+ if (!IssueConstants.FIELD_STATE.equals(displayField)) {
+ InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(displayField);
+ if (fieldSpec == null)
+ undefinedFields.add(displayField);
+ }
+ }
+ return undefinedFields;
+ }
+
+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), 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)
+ setBaseQuery(null);
+ else
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+
+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
+ UndefinedFieldResolution resolution = entry.getValue();
+ if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
+ if (getIdentifyField().equals(entry.getKey()))
+ setIdentifyField(resolution.getNewField());
+ int index = getDisplayFields().indexOf(entry.getKey());
+ if (index != -1) {
+ if (getDisplayFields().contains(resolution.getNewField()))
+ getDisplayFields().remove(index);
+ else
+ getDisplayFields().set(index, resolution.getNewField());
+ }
+ } else {
+ getDisplayFields().remove(entry.getKey());
+ if (getIdentifyField().equals(entry.getKey()))
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
+ for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
+ if (onEditFieldValues(entry.getKey(), entry.getValue()))
+ return true;
+ }
+ return false;
+ }
+
+ public static String getWebSocketObservable(Long projectId) {
+ return BoardSpec.class.getName() + ":" + projectId;
+ }
+
+ public void onRenameUser(GlobalIssueSetting issueSetting, String oldName, String newName) {
+ InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());
+ if (fieldSpec instanceof UserChoiceInput) {
+ for (int i=0; i<getColumns().size(); i++) {
+ if (getColumns().get(i).equals(oldName))
+ getColumns().set(i, newName);
+ }
+ }
+ }
+
+ public boolean onDeleteUser(GlobalIssueSetting issueSetting, String userName) {
+ InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());
+ if (fieldSpec instanceof UserChoiceInput) {
+ for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {
+ if (it.next().equals(userName))
+ it.remove();
+ }
+ }
+ return getColumns().size() < 2;
+ }
+
+ public void onRenameField(GlobalIssueSetting issueSetting, String oldName, String newName) {
+ if (getIdentifyField().equals(oldName))
+ setIdentifyField(newName);
+ int index = getDisplayFields().indexOf(oldName);
+ if (index != -1) {
+ if (getDisplayFields().contains(newName))
+ getDisplayFields().remove(index);
+ else
+ getDisplayFields().set(index, newName);
+ }
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ query.onRenameField(oldName, newName);
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ query.onRenameField(oldName, newName);
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ public void onRenameState(String oldName, String newName) {
+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
+ int index = getColumns().indexOf(oldName);
+ if (index != -1) {
+ if (getColumns().contains(newName))
+ getColumns().remove(index);
+ else
+ getColumns().set(index, newName);
+ }
+ }
+
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ query.onRenameState(oldName, newName);
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ query.onRenameState(oldName, newName);
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+
+ }
+
+ public boolean onDeleteField(GlobalIssueSetting issueSetting, String fieldName) {
+ getDisplayFields().remove(fieldName);
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ if (query.onDeleteField(fieldName))
+ setBaseQuery(null);
+ else
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ if (query.onDeleteField(fieldName))
+ setBacklogBaseQuery(null);
+ else
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+
+ return getIdentifyField().equals(fieldName);
+ }
+
+ public boolean onDeleteState(String stateName) {
+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE))
+ getColumns().remove(stateName);
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ if (query.onDeleteState(stateName))
+ setBaseQuery(null);
+ else
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ if (query.onDeleteState(stateName))
+ setBacklogBaseQuery(null);
+ else
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+
+ return getColumns().size() < 2;
+ }
+
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ if (fieldName.equals(getIdentifyField())) {
+ getColumns().removeAll(valueSetEdit.getDeletions());
+ for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {
+ int index = getColumns().indexOf(entry.getKey());
+ if (index != -1) {
+ if (getColumns().contains(entry.getValue()))
+ getColumns().remove(index);
+ else
+ getColumns().set(index, entry.getValue());
+ }
+ }
+ }
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ if (query.onEditFieldValues(fieldName, valueSetEdit))
+ setBaseQuery(null);
+ else
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ if (query.onEditFieldValues(fieldName, valueSetEdit))
+ setBacklogBaseQuery(null);
+ else
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ return getColumns().size() < 2;
+ }
+
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ if (!identifyField.equals(IssueConstants.FIELD_STATE)) {
+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(identifyField));
+ if (specifiedChoices != null) {
+ for (String column: getColumns()) {
+ if (column != null && !specifiedChoices.getChoiceValues().contains(column))
+ undefinedFieldValues.add(new UndefinedFieldValue(identifyField, column));
+ }
+ }
+ }
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ undefinedFieldValues.addAll(query.getUndefinedFieldValues());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ undefinedFieldValues.addAll(query.getUndefinedFieldValues());
+ } catch (Exception e) {
+ }
+ }
+ return undefinedFieldValues;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
index 1f003a701d..b304eff1c3 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
@@ -1,368 +1,368 @@
-package io.onedev.server.model.support.issue;
-
-import java.io.Serializable;
-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 io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.util.ValueSetEdit;
-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;
-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;
-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;
-
-public class IssueSetting implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private List<TransitionSpec> transitionSpecs;
-
- private Set<String> promptFieldsUponIssueOpen;
-
- private Set<String> listFields;
-
- private List<BoardSpec> boardSpecs;
-
- private List<NamedIssueQuery> savedQueries;
-
- private transient GlobalIssueSetting globalSetting;
-
- private GlobalIssueSetting getGlobalSetting() {
- if (globalSetting == null)
- globalSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- return globalSetting;
- }
-
- @Nullable
- public List<TransitionSpec> getTransitionSpecs(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && transitionSpecs == null)
- return new ArrayList<>(getGlobalSetting().getDefaultTransitionSpecs());
- else
- return transitionSpecs;
- }
-
- public void setTransitionSpecs(List<TransitionSpec> stateTransitions) {
- this.transitionSpecs = stateTransitions;
- }
-
- @Nullable
- public Set<String> getPromptFieldsUponIssueOpen(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && promptFieldsUponIssueOpen == null)
- return new HashSet<>(getGlobalSetting().getDefaultPromptFieldsUponIssueOpen());
- else
- return promptFieldsUponIssueOpen;
- }
-
- public void setPromptFieldsUponIssueOpen(@Nullable Set<String> promptFieldsUponIssueOpen) {
- this.promptFieldsUponIssueOpen = promptFieldsUponIssueOpen;
- }
-
- @Nullable
- public Set<String> getListFields(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && listFields == null)
- return new HashSet<>(getGlobalSetting().getDefaultListFields());
- else
- return listFields;
- }
-
- public void setListFields(@Nullable Set<String> listFields) {
- this.listFields = listFields;
- }
-
- @Nullable
- public List<BoardSpec> getBoardSpecs(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && boardSpecs == null)
- return new ArrayList<>(getGlobalSetting().getDefaultBoardSpecs());
- else
- return boardSpecs;
- }
-
- public void setBoardSpecs(@Nullable List<BoardSpec> boardSpecs) {
- this.boardSpecs = boardSpecs;
- }
-
- @Nullable
- public List<NamedIssueQuery> getSavedQueries(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && savedQueries == null)
- return new ArrayList<>(getGlobalSetting().getDefaultQueries());
- else
- return savedQueries;
- }
-
- public void setSavedQueries(@Nullable List<NamedIssueQuery> savedQueries) {
- this.savedQueries = savedQueries;
- }
-
- @Nullable
- public NamedIssueQuery getSavedQuery(String name) {
- for (NamedIssueQuery namedQuery: getSavedQueries(true)) {
- if (namedQuery.getName().equals(name))
- return namedQuery;
- }
- return null;
- }
-
- public void onRenameUser(String oldName, String newName) {
- if (transitionSpecs != null) {
- for (TransitionSpec transition: transitionSpecs)
- transition.onRenameUser(oldName, newName);
- }
- if (boardSpecs != null) {
- for (BoardSpec board: boardSpecs)
- board.onRenameUser(getGlobalSetting(), oldName, newName);
- }
- }
-
- public void onDeleteUser(String userName) {
- if (transitionSpecs != null) {
- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
- if (it.next().onDeleteUser(userName))
- it.remove();
- }
- }
- if (boardSpecs != null) {
- for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
- if (it.next().onDeleteUser(getGlobalSetting(), userName))
- it.remove();
- }
- }
- }
-
- public void onRenameGroup(String oldName, String newName) {
- if (transitionSpecs != null) {
- for (TransitionSpec transition: transitionSpecs)
- transition.onRenameGroup(oldName, newName);
- }
- }
-
- public void onDeleteGroup(String groupName) {
- if (transitionSpecs != null) {
- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
- if (it.next().onDeleteGroup(groupName))
- it.remove();
- }
- }
- }
-
- public void onRenameConfiguration(String oldName, String newName) {
- if (transitionSpecs != null) {
- for (TransitionSpec transition: transitionSpecs)
- transition.onRenameConfiguration(oldName, newName);
- }
- }
-
- public void onDeleteConfiguration(String configurationName) {
- if (transitionSpecs != null) {
- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
- if (it.next().onDeleteConfiguration(configurationName))
- it.remove();
- }
- }
- }
-
- public Collection<String> getUndefinedFields(Project project) {
- Set<String> undefinedFields = new HashSet<>();
- if (listFields != null) {
- for (String fieldName: listFields) {
- if (getGlobalSetting().getFieldSpec(fieldName) == null)
- undefinedFields.add(fieldName);
- }
- }
- if (promptFieldsUponIssueOpen != null) {
- for (String fieldName: promptFieldsUponIssueOpen) {
- if (getGlobalSetting().getFieldSpec(fieldName) == null)
- undefinedFields.add(fieldName);
- }
- }
- if (transitionSpecs != null) {
- for (TransitionSpec transition: transitionSpecs)
- undefinedFields.addAll(transition.getUndefinedFields(getGlobalSetting()));
- }
- if (savedQueries != null) {
- for (NamedIssueQuery namedQuery: savedQueries) {
- try {
- undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields());
- } catch (Exception e) {
- }
- }
- }
- if (boardSpecs != null) {
- for (BoardSpec board: boardSpecs)
- undefinedFields.addAll(board.getUndefinedFields());
- }
- return undefinedFields;
- }
-
- public void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
- if (listFields != null) {
- listFields.remove(entry.getKey());
- if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)
- listFields.add(entry.getValue().getNewField());
- }
- if (promptFieldsUponIssueOpen != null) {
- promptFieldsUponIssueOpen.remove(entry.getKey());
- if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)
- promptFieldsUponIssueOpen.add(entry.getValue().getNewField());
- }
- }
- if (savedQueries != null) {
- for (Iterator<NamedIssueQuery> it = savedQueries.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) {
- }
- }
- }
-
- if (transitionSpecs != null) {
- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
- if (it.next().fixUndefinedFields(resolutions))
- it.remove();
- }
- }
-
- if (boardSpecs != null) {
- for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
- if (it.next().fixUndefinedFields(resolutions))
- it.remove();
- }
- }
- }
-
- public Collection<String> getUndefinedStates(Project project) {
- Set<String> undefinedStates = new HashSet<>();
-
- if (savedQueries != null) {
- for (NamedIssueQuery namedQuery: savedQueries) {
- try {
- undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates());
- } catch (Exception e) {
- }
- }
- }
-
- if (boardSpecs != null) {
- for (BoardSpec board: boardSpecs)
- undefinedStates.addAll(board.getUndefinedStates());
- }
-
- if (transitionSpecs != null) {
- for (TransitionSpec transition: transitionSpecs)
- undefinedStates.addAll(transition.getUndefinedStates());
- }
-
- return undefinedStates;
- }
-
- public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
- if (savedQueries != null) {
- for (NamedIssueQuery namedQuery: savedQueries) {
- try {
- IssueQuery query = IssueQuery.parse(null, 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) {
- }
- }
- }
-
- if (boardSpecs != null) {
- for (BoardSpec board: boardSpecs)
- board.fixUndefinedStates(resolutions);
- }
-
- if (transitionSpecs != null) {
- for (TransitionSpec transition: transitionSpecs)
- transition.fixUndefinedStates(resolutions);
- }
- }
-
- public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
- Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- if (savedQueries != null) {
- for (NamedIssueQuery namedQuery: savedQueries) {
- try {
- undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false).getUndefinedFieldValues());
- } catch (Exception e) {
- }
- }
- }
- if (boardSpecs != null) {
- for (BoardSpec board: boardSpecs)
- undefinedFieldValues.addAll(board.getUndefinedFieldValues());
- }
- if (transitionSpecs != null) {
- for (TransitionSpec transition: transitionSpecs)
- undefinedFieldValues.addAll(transition.getUndefinedFieldValues());
- }
- return undefinedFieldValues;
- }
-
- public void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
- if (savedQueries != null) {
- for (Iterator<NamedIssueQuery> it = savedQueries.iterator(); it.hasNext();) {
- NamedIssueQuery namedQuery = it.next();
- try {
- boolean remove = false;
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
- for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
- if (query.onEditFieldValues(entry.getKey(), entry.getValue())) {
- remove = true;
- break;
- }
- }
- if (remove)
- it.remove();
- else
- namedQuery.setQuery(query.toString());
- } catch (Exception e) {
- }
- }
- }
- if (boardSpecs != null) {
- for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
- if (it.next().fixUndefinedFieldValues(valueSetEdits)) {
- it.remove();
- break;
- }
- }
- }
- if (transitionSpecs != null) {
- for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
- if (it.next().fixUndefinedFieldValues(valueSetEdits)) {
- it.remove();
- break;
- }
- }
- }
- }
-
-}
+package io.onedev.server.model.support.issue;
+
+import java.io.Serializable;
+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 io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.util.ValueSetEdit;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;
+
+public class IssueSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<TransitionSpec> transitionSpecs;
+
+ private Set<String> promptFieldsUponIssueOpen;
+
+ private Set<String> listFields;
+
+ private List<BoardSpec> boardSpecs;
+
+ private List<NamedIssueQuery> savedQueries;
+
+ private transient GlobalIssueSetting globalSetting;
+
+ private GlobalIssueSetting getGlobalSetting() {
+ if (globalSetting == null)
+ globalSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ return globalSetting;
+ }
+
+ @Nullable
+ public List<TransitionSpec> getTransitionSpecs(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && transitionSpecs == null)
+ return new ArrayList<>(getGlobalSetting().getDefaultTransitionSpecs());
+ else
+ return transitionSpecs;
+ }
+
+ public void setTransitionSpecs(List<TransitionSpec> stateTransitions) {
+ this.transitionSpecs = stateTransitions;
+ }
+
+ @Nullable
+ public Set<String> getPromptFieldsUponIssueOpen(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && promptFieldsUponIssueOpen == null)
+ return new HashSet<>(getGlobalSetting().getDefaultPromptFieldsUponIssueOpen());
+ else
+ return promptFieldsUponIssueOpen;
+ }
+
+ public void setPromptFieldsUponIssueOpen(@Nullable Set<String> promptFieldsUponIssueOpen) {
+ this.promptFieldsUponIssueOpen = promptFieldsUponIssueOpen;
+ }
+
+ @Nullable
+ public Set<String> getListFields(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && listFields == null)
+ return new HashSet<>(getGlobalSetting().getDefaultListFields());
+ else
+ return listFields;
+ }
+
+ public void setListFields(@Nullable Set<String> listFields) {
+ this.listFields = listFields;
+ }
+
+ @Nullable
+ public List<BoardSpec> getBoardSpecs(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && boardSpecs == null)
+ return new ArrayList<>(getGlobalSetting().getDefaultBoardSpecs());
+ else
+ return boardSpecs;
+ }
+
+ public void setBoardSpecs(@Nullable List<BoardSpec> boardSpecs) {
+ this.boardSpecs = boardSpecs;
+ }
+
+ @Nullable
+ public List<NamedIssueQuery> getSavedQueries(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && savedQueries == null)
+ return new ArrayList<>(getGlobalSetting().getDefaultQueries());
+ else
+ return savedQueries;
+ }
+
+ public void setSavedQueries(@Nullable List<NamedIssueQuery> savedQueries) {
+ this.savedQueries = savedQueries;
+ }
+
+ @Nullable
+ public NamedIssueQuery getSavedQuery(String name) {
+ for (NamedIssueQuery namedQuery: getSavedQueries(true)) {
+ if (namedQuery.getName().equals(name))
+ return namedQuery;
+ }
+ return null;
+ }
+
+ public void onRenameUser(String oldName, String newName) {
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ transition.onRenameUser(oldName, newName);
+ }
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ board.onRenameUser(getGlobalSetting(), oldName, newName);
+ }
+ }
+
+ public void onDeleteUser(String userName) {
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().onDeleteUser(userName))
+ it.remove();
+ }
+ }
+ if (boardSpecs != null) {
+ for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
+ if (it.next().onDeleteUser(getGlobalSetting(), userName))
+ it.remove();
+ }
+ }
+ }
+
+ public void onRenameGroup(String oldName, String newName) {
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ transition.onRenameGroup(oldName, newName);
+ }
+ }
+
+ public void onDeleteGroup(String groupName) {
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().onDeleteGroup(groupName))
+ it.remove();
+ }
+ }
+ }
+
+ public void onRenameConfiguration(String oldName, String newName) {
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ transition.onRenameConfiguration(oldName, newName);
+ }
+ }
+
+ public void onDeleteConfiguration(String configurationName) {
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().onDeleteConfiguration(configurationName))
+ it.remove();
+ }
+ }
+ }
+
+ public Collection<String> getUndefinedFields(Project project) {
+ Set<String> undefinedFields = new HashSet<>();
+ if (listFields != null) {
+ for (String fieldName: listFields) {
+ if (getGlobalSetting().getFieldSpec(fieldName) == null)
+ undefinedFields.add(fieldName);
+ }
+ }
+ if (promptFieldsUponIssueOpen != null) {
+ for (String fieldName: promptFieldsUponIssueOpen) {
+ if (getGlobalSetting().getFieldSpec(fieldName) == null)
+ undefinedFields.add(fieldName);
+ }
+ }
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ undefinedFields.addAll(transition.getUndefinedFields(getGlobalSetting()));
+ }
+ if (savedQueries != null) {
+ for (NamedIssueQuery namedQuery: savedQueries) {
+ try {
+ undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields());
+ } catch (Exception e) {
+ }
+ }
+ }
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ undefinedFields.addAll(board.getUndefinedFields());
+ }
+ return undefinedFields;
+ }
+
+ public void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
+ if (listFields != null) {
+ listFields.remove(entry.getKey());
+ if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)
+ listFields.add(entry.getValue().getNewField());
+ }
+ if (promptFieldsUponIssueOpen != null) {
+ promptFieldsUponIssueOpen.remove(entry.getKey());
+ if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)
+ promptFieldsUponIssueOpen.add(entry.getValue().getNewField());
+ }
+ }
+ if (savedQueries != null) {
+ for (Iterator<NamedIssueQuery> it = savedQueries.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) {
+ }
+ }
+ }
+
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().fixUndefinedFields(resolutions))
+ it.remove();
+ }
+ }
+
+ if (boardSpecs != null) {
+ for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
+ if (it.next().fixUndefinedFields(resolutions))
+ it.remove();
+ }
+ }
+ }
+
+ public Collection<String> getUndefinedStates(Project project) {
+ Set<String> undefinedStates = new HashSet<>();
+
+ if (savedQueries != null) {
+ for (NamedIssueQuery namedQuery: savedQueries) {
+ try {
+ undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates());
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ undefinedStates.addAll(board.getUndefinedStates());
+ }
+
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ undefinedStates.addAll(transition.getUndefinedStates());
+ }
+
+ return undefinedStates;
+ }
+
+ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
+ if (savedQueries != null) {
+ for (NamedIssueQuery namedQuery: savedQueries) {
+ try {
+ IssueQuery query = IssueQuery.parse(null, 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) {
+ }
+ }
+ }
+
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ board.fixUndefinedStates(resolutions);
+ }
+
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ transition.fixUndefinedStates(resolutions);
+ }
+ }
+
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ if (savedQueries != null) {
+ for (NamedIssueQuery namedQuery: savedQueries) {
+ try {
+ undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false).getUndefinedFieldValues());
+ } catch (Exception e) {
+ }
+ }
+ }
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ undefinedFieldValues.addAll(board.getUndefinedFieldValues());
+ }
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ undefinedFieldValues.addAll(transition.getUndefinedFieldValues());
+ }
+ return undefinedFieldValues;
+ }
+
+ public void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
+ if (savedQueries != null) {
+ for (Iterator<NamedIssueQuery> it = savedQueries.iterator(); it.hasNext();) {
+ NamedIssueQuery namedQuery = it.next();
+ try {
+ boolean remove = false;
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
+ if (query.onEditFieldValues(entry.getKey(), entry.getValue())) {
+ remove = true;
+ break;
+ }
+ }
+ if (remove)
+ it.remove();
+ else
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ }
+ if (boardSpecs != null) {
+ for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
+ if (it.next().fixUndefinedFieldValues(valueSetEdits)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().fixUndefinedFieldValues(valueSetEdits)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
index 12025ca905..36b50e66cb 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
@@ -9,6 +9,7 @@ import java.util.Map;
import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
+import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import com.google.common.base.Preconditions;
@@ -18,10 +19,12 @@ import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
import io.onedev.commons.utils.stringmatch.Matcher;
import io.onedev.server.OneDev;
import io.onedev.server.cache.CommitInfoManager;
+import io.onedev.server.ci.job.cache.JobCache;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.model.Project;
import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.util.validation.annotation.ExecutorName;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.Patterns;
@@ -32,10 +35,12 @@ public abstract class JobExecutor implements Serializable {
private static final long serialVersionUID = 1L;
- public static final String ENVIRONMENT_WORKSPACE = "onedev-workspace";
+ public static final String WORKSPACE = "onedev-workspace";
private boolean enabled = true;
+ private String name;
+
private String projects;
private String branches;
@@ -44,6 +49,8 @@ public abstract class JobExecutor implements Serializable {
private String environments;
+ private int cacheTTL = 7;
+
public boolean isEnabled() {
return enabled;
}
@@ -52,6 +59,17 @@ public abstract class JobExecutor implements Serializable {
this.enabled = enabled;
}
+ @Editable(order=50, description="Specify a name to identify the executor")
+ @ExecutorName
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
@Editable(order=100, name="Applicable Projects",
description="Optionally specify space-separated projects applicable for this executor. Use * or ? for wildcard match. "
+ "Leave empty to match all projects")
@@ -105,9 +123,21 @@ public abstract class JobExecutor implements Serializable {
this.environments = environments;
}
+ @Editable(order=10000, description="Specify job cache TTL (time to live) by days. OneDev may create "
+ + "multiple job caches even for same cache key to avoid cache conflicts when running jobs "
+ + "concurrently. This setting tells OneDev to remove caches inactive for specified "
+ + "time period to save disk space")
+ public int getCacheTTL() {
+ return cacheTTL;
+ }
+
+ public void setCacheTTL(int cacheTTL) {
+ this.cacheTTL = cacheTTL;
+ }
+
public abstract void execute(String environment, File workspace, Map<String, String> envVars,
- List<String> commands, @Nullable SourceSnapshot snapshot, PatternSet collectFiles,
- Logger logger);
+ List<String> commands, @Nullable SourceSnapshot snapshot, Collection<JobCache> caches,
+ PatternSet collectFiles, Logger logger);
public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String image) {
Matcher matcher = new ChildAwareMatcher();
@@ -137,4 +167,6 @@ public abstract class JobExecutor implements Serializable {
return true;
}
+ public abstract void checkCaches();
+
}
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
index daffdafa78..cd0154ed3d 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
@@ -1,11 +1,13 @@
package io.onedev.server.model.support.jobexecutor;
import java.io.File;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
+import io.onedev.server.ci.job.cache.JobCache;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.annotation.Editable;
@@ -16,8 +18,13 @@ public class KubernetesExecutor extends JobExecutor {
@Override
public void execute(String environment, File workspace, Map<String, String> envVars,
- List<String> commands, SourceSnapshot snapshot, PatternSet collectFiles,
- Logger logger) {
+ List<String> commands, SourceSnapshot snapshot, Collection<JobCache> caches,
+ PatternSet collectFiles, Logger logger) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void checkCaches() {
throw new UnsupportedOperationException();
}
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
index 32e0e54a37..32afc6fff4 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/ServerDockerExecutor.java
@@ -5,9 +5,11 @@ import java.io.File;
import java.io.IOException;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.UUID;
+import java.util.concurrent.Callable;
import javax.validation.ConstraintValidatorContext;
@@ -19,12 +21,18 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.base.Joiner;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.LineConsumer;
import io.onedev.commons.utils.command.ProcessKiller;
import io.onedev.commons.utils.concurrent.ConstrainedRunner;
+import io.onedev.server.ci.job.cache.CacheAllocation;
+import io.onedev.server.ci.job.cache.CacheRunnable;
+import io.onedev.server.ci.job.cache.CacheRunner;
+import io.onedev.server.ci.job.cache.JobCache;
import io.onedev.server.model.support.jobexecutor.ServerDockerExecutor.TestData;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.patternset.PatternSet;
@@ -58,8 +66,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
private String runOptions;
private int capacity = Runtime.getRuntime().availableProcessors();
-
- private transient ConstrainedRunner runner;
+
+ private transient ConstrainedRunner constrainedRunner;
@Editable(order=1000, description="Optionally specify docker executable, for instance <i>/usr/local/bin/docker</i>. "
+ "Leave empty to use docker executable in PATH")
@@ -181,83 +189,132 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
}
- private synchronized ConstrainedRunner getRunner() {
- if (runner == null)
- runner = new ConstrainedRunner(capacity);
- return runner;
+ private synchronized ConstrainedRunner getConstrainedRunner() {
+ if (constrainedRunner == null)
+ constrainedRunner = new ConstrainedRunner(capacity);
+ return constrainedRunner;
}
@Override
public boolean hasCapacity() {
- return getRunner().hasCapacity();
+ return getConstrainedRunner().hasCapacity();
+ }
+
+ private File getCacheHome() {
+ return new File(Bootstrap.getCacheDir(), getName());
}
@Override
public void execute(String environment, File workspace, Map<String, String> envVars,
- List<String> commands, SourceSnapshot snapshot, PatternSet collectFiles,
- Logger logger) {
- getRunner().run(new Runnable() {
+ List<String> commands, SourceSnapshot snapshot, Collection<JobCache> caches,
+ PatternSet collectFiles, Logger logger) {
+ getConstrainedRunner().run(new Runnable() {
@Override
public void run() {
- String jobInstance = UUID.randomUUID().toString();
- try {
- if (snapshot != null) {
- logger.info("Cloning source code...");
- snapshot.checkout(workspace);
- }
-
- login(logger);
-
- logger.info("Pulling image...") ;
- Commandline cmd = getDockerCmd();
- cmd.addArgs("pull", getPullImage(environment));
- cmd.execute(newInfoLogger(logger), newErrorLogger(logger)).checkReturnCode();
-
- cmd.clearArgs();
- cmd.addArgs("run", "--rm", "--name", jobInstance);
- for (Map.Entry<String, String> entry: envVars.entrySet())
- cmd.addArgs("--env", entry.getKey() + "=" + entry.getValue());
- if (getRunOptions() != null)
- cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
-
- String imageOS = getImageOS(logger, environment);
-
- if (imageOS.equals("windows")) {
- logger.info("Image OS is windows, run commands with cmd.exe...");
- String environmentWorkspacePath = "C:\\" + ENVIRONMENT_WORKSPACE;
- File scriptFile = new File(workspace, "onedev-job-commands.bat");
- FileUtils.writeLines(scriptFile, commands, "\r\n");
- cmd.addArgs("-v", workspace.getAbsolutePath() + ":" + environmentWorkspacePath);
- cmd.addArgs("-w", environmentWorkspacePath);
- cmd.addArgs(environment);
- cmd.addArgs("cmd", "/c", environmentWorkspacePath + "\\onedev-job-commands.bat");
- } else {
- logger.info("Image OS is " + imageOS + ", run commands with sh...");
- String environmentWorkspacePath = "/" + ENVIRONMENT_WORKSPACE;
- File scriptFile = new File(workspace, "onedev-job-commands.sh");
- FileUtils.writeLines(scriptFile, commands, "\n");
- cmd.addArgs("-v", workspace.getAbsolutePath() + ":" + environmentWorkspacePath);
- cmd.addArgs("-w", environmentWorkspacePath);
- cmd.addArgs(environment);
- cmd.addArgs("sh", "-c", environmentWorkspacePath + "/onedev-job-commands.sh");
- }
+ new CacheRunner(getCacheHome(), caches).run(new CacheRunnable() {
- logger.info("Running container to execute job...");
- cmd.execute(newInfoLogger(logger), newErrorLogger(logger), null, new ProcessKiller() {
+ @Override
+ public void run(Collection<CacheAllocation> allocations) {
+ login(logger);
+
+ logger.info("Pulling image...") ;
+ Commandline cmd = getDockerCmd();
+ cmd.addArgs("pull", getPullImage(environment));
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger)).checkReturnCode();
+
+ cmd.clearArgs();
+ String jobInstance = UUID.randomUUID().toString();
+ cmd.addArgs("run", "--rm", "--name", jobInstance);
+ for (Map.Entry<String, String> entry: envVars.entrySet())
+ cmd.addArgs("--env", entry.getKey() + "=" + entry.getValue());
+ if (getRunOptions() != null)
+ cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
+
+ String imageOS = getImageOS(logger, environment);
+ logger.info("Detected image OS: " + imageOS);
- @Override
- public void kill(Process process) {
- logger.info("Stopping container...");
- Commandline cmd = getDockerCmd();
- cmd.addArgs("stop", jobInstance);
- cmd.execute(newInfoLogger(logger), newErrorLogger(logger));
+ boolean windows = imageOS.equals("windows");
+
+ String dockerWorkspacePath;
+ if (windows)
+ dockerWorkspacePath = "C:\\" + WORKSPACE;
+ else
+ dockerWorkspacePath = "/" + WORKSPACE;
+
+ File workspaceCache = null;
+ for (CacheAllocation allocation: allocations) {
+ if (allocation.isWorkspace()) {
+ workspaceCache = allocation.getInstance();
+ try {
+ FileUtils.copyDirectory(workspace, workspaceCache);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ break;
+ }
}
- }).checkReturnCode();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ File effectiveWorkspace = workspaceCache != null? workspaceCache: workspace;
+
+ if (snapshot != null) {
+ logger.info("Cloning source code...");
+ snapshot.checkout(effectiveWorkspace);
+ }
+
+ cmd.addArgs("-v", effectiveWorkspace.getAbsolutePath() + ":" + dockerWorkspacePath);
+ for (CacheAllocation allocation: allocations) {
+ if (!allocation.isWorkspace())
+ cmd.addArgs("-v", allocation.getInstance().getAbsolutePath() + ":" + allocation.getPath());
+ }
+ cmd.addArgs("-w", dockerWorkspacePath);
+
+ if (windows) {
+ File scriptFile = new File(effectiveWorkspace, "onedev-job-commands.bat");
+ try {
+ FileUtils.writeLines(scriptFile, commands, "\r\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ cmd.addArgs(environment);
+ cmd.addArgs("cmd", "/c", dockerWorkspacePath + "\\onedev-job-commands.bat");
+ } else {
+ File scriptFile = new File(effectiveWorkspace, "onedev-job-commands.sh");
+ try {
+ FileUtils.writeLines(scriptFile, commands, "\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ cmd.addArgs(environment);
+ cmd.addArgs("sh", "-c", dockerWorkspacePath + "/onedev-job-commands.sh");
+ }
+
+ logger.info("Running container to execute job...");
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger), null, new ProcessKiller() {
+
+ @Override
+ public void kill(Process process) {
+ logger.info("Stopping container...");
+ Commandline cmd = getDockerCmd();
+ cmd.addArgs("stop", jobInstance);
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger));
+ }
+
+ }).checkReturnCode();
+
+ if (workspaceCache != null) {
+ int baseLen = workspaceCache.getAbsolutePath().length()+1;
+ for (File file: collectFiles.listFiles(workspaceCache)) {
+ try {
+ FileUtils.copyFile(file, new File(workspace, file.getAbsolutePath().substring(baseLen)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ }, logger);
}
});
@@ -319,6 +376,46 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
return false;
}
+ @Override
+ public void checkCaches() {
+ File cacheHome = getCacheHome();
+ if (cacheHome.exists()) {
+ for (File keyDir: cacheHome.listFiles()) {
+ for (File cacheInstance: keyDir.listFiles()) {
+ if (System.currentTimeMillis() - cacheInstance.lastModified() > getCacheTTL() * 24L * 3600L * 1000L) {
+ File lockFile = new File(cacheInstance, JobCache.LOCK_FILE);
+ try {
+ if (lockFile.createNewFile()) {
+ /*
+ * Remove other files first to avoid locking for too long time
+ */
+ for (File each: cacheInstance.listFiles()) {
+ if (!each.getName().equals(JobCache.LOCK_FILE)) {
+ if (each.isFile())
+ FileUtils.deleteFile(each);
+ else
+ FileUtils.deleteDir(each);
+ }
+ }
+ LockUtils.call(keyDir.getAbsolutePath(), new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ FileUtils.deleteDir(cacheInstance);
+ return null;
+ }
+
+ });
+ }
+ } catch (IOException e) {
+ logger.error("Error removing cache '" + cacheInstance.getAbsolutePath() + "'", e);
+ }
+ }
+ }
+ }
+ }
+ }
+
@Override
public boolean isValid(ConstraintValidatorContext context) {
if (getRunOptions() != null) {
@@ -349,31 +446,50 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
cmd.addArgs("pull", getPullImage(testData.getDockerImage()));
cmd.execute(newInfoLogger(logger), newErrorLogger(logger)).checkReturnCode();
- String imageOS = getImageOS(logger, testData.getDockerImage());
+ boolean windows = getImageOS(logger, testData.getDockerImage()).equals("windows");
logger.info("Running container...");
- File workspaceDir = FileUtils.createTempDir("workspace");
+ File cacheHome = getCacheHome();
+ boolean cacheHomeExists = cacheHome.exists();
+ File workspaceDir = null;
+ File cacheDir = null;
try {
+ workspaceDir = Bootstrap.createTempDir("workspace");
+ cacheDir = new File(cacheHome, UUID.randomUUID().toString());
+ FileUtils.createDir(cacheDir);
+
cmd.clearArgs();
cmd.addArgs("run", "--rm");
if (getRunOptions() != null)
cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
- if (imageOS.equals("windows")) {
- String environmentWorkspacePath = "C:\\" + ENVIRONMENT_WORKSPACE;
- cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + environmentWorkspacePath);
- cmd.addArgs("-w", environmentWorkspacePath);
- cmd.addArgs(testData.getDockerImage());
- cmd.addArgs("cmd", "/c", "echo this is a test");
+ String dockerWorkspacePath;
+ String dockerCachePath = "$onedev-cache-test$";
+ if (windows) {
+ dockerWorkspacePath = "C:\\" + WORKSPACE;
+ dockerCachePath = "C:\\" + dockerCachePath;
} else {
- String environmentWorkspacePath = "/" + ENVIRONMENT_WORKSPACE;
- cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + environmentWorkspacePath);
- cmd.addArgs("-w", environmentWorkspacePath);
- cmd.addArgs(testData.getDockerImage());
- cmd.addArgs("sh", "-c", "echo this is a test");
+ dockerWorkspacePath = "/" + WORKSPACE;
+ dockerCachePath = "/" + dockerCachePath;
}
+ cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + dockerWorkspacePath);
+ cmd.addArgs("-v", cacheDir.getAbsolutePath() + ":" + dockerCachePath);
+
+ cmd.addArgs("-w", dockerWorkspacePath);
+ cmd.addArgs(testData.getDockerImage());
+
+ if (windows)
+ cmd.addArgs("cmd", "/c", "echo this is a test");
+ else
+ cmd.addArgs("sh", "-c", "echo this is a test");
+
cmd.execute(newInfoLogger(logger), newErrorLogger(logger)).checkReturnCode();
} finally {
- FileUtils.deleteDir(workspaceDir);
+ if (workspaceDir != null)
+ FileUtils.deleteDir(workspaceDir);
+ if (cacheDir != null)
+ FileUtils.deleteDir(cacheDir);
+ if (!cacheHomeExists)
+ FileUtils.deleteDir(cacheHome);
}
}
@@ -396,5 +512,5 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
}
-
+
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java
index a5601145a7..8332a71b48 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java
@@ -1,12 +1,16 @@
package io.onedev.server.model.support.jobexecutor;
import java.io.File;
+import java.io.IOException;
import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.server.ci.job.cache.JobCache;
import io.onedev.server.git.command.CheckoutCommand;
+import io.onedev.server.git.command.CleanCommand;
import io.onedev.server.git.command.FetchCommand;
import io.onedev.server.model.Project;
@@ -28,13 +32,26 @@ public class SourceSnapshot {
public ObjectId getCommitId() {
return commitId;
}
+
+ private void fetchAndCheckout(File gitDir) {
+ new FetchCommand(gitDir).depth(1).from(project.getGitDir().getAbsolutePath()).refspec(commitId.name()).call();
+ new CheckoutCommand(gitDir).refspec(commitId.name()).call();
+ }
public void checkout(File dir) {
- try (Git git = Git.init().setDirectory(dir).call()) {
- new FetchCommand(dir).depth(1).from(project.getGitDir().getAbsolutePath()).refspec(commitId.name()).call();
- new CheckoutCommand(dir).refspec(commitId.name()).call();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
+ if (new File(dir, ".git").exists()) {
+ try (Git git = Git.open(dir)) {
+ new CleanCommand(dir).options("-d", "-f", "--exclude", JobCache.LOCK_FILE).call();
+ fetchAndCheckout(dir);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ try (Git git = Git.init().setDirectory(dir).call()) {
+ fetchAndCheckout(dir);
+ } catch (GitAPIException e) {
+ throw ExceptionUtils.unchecked(e);
+ }
}
}
diff --git a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
index 7602705a32..3d04e13b0f 100644
--- a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
@@ -1,548 +1,548 @@
-package io.onedev.server.model.support.setting;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.Lists;
-
-import edu.emory.mathcs.backport.java.util.Collections;
-import io.onedev.server.exception.OneException;
-import io.onedev.server.model.support.issue.BoardSpec;
-import io.onedev.server.model.support.issue.NamedIssueQuery;
-import io.onedev.server.model.support.issue.StateSpec;
-import io.onedev.server.model.support.issue.TransitionSpec;
-import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
-import io.onedev.server.model.support.usermatcher.CodeWriters;
-import io.onedev.server.search.entity.issue.IssueCriteria;
-import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.search.entity.issue.OrCriteria;
-import io.onedev.server.search.entity.issue.StateCriteria;
-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.IssueChoiceInput;
-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;
-import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
-import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;
-import io.onedev.server.util.inputspec.showcondition.ShowCondition;
-import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;
-import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable
-public class GlobalIssueSetting implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private List<StateSpec> stateSpecs = new ArrayList<>();
-
- private List<TransitionSpec> defaultTransitionSpecs = new ArrayList<>();
-
- private List<InputSpec> fieldSpecs = new ArrayList<>();
-
- private Set<String> defaultPromptFieldsUponIssueOpen = new HashSet<>();
-
- private List<BoardSpec> defaultBoardSpecs = new ArrayList<>();
-
- private Set<String> defaultListFields = new HashSet<>();
-
- private List<NamedIssueQuery> defaultQueries = new ArrayList<>();
-
- private boolean reconciled = true;
-
- public GlobalIssueSetting() {
- ChoiceInput type = new ChoiceInput();
- type.setName("Type");
- SpecifiedChoices specifiedChoices = new SpecifiedChoices();
-
- List<Choice> choices = new ArrayList<>();
- Choice newFeature = new Choice();
- newFeature.setValue("New Feature");
- choices.add(newFeature);
-
- Choice improvement = new Choice();
- improvement.setValue("Improvement");
- choices.add(improvement);
-
- Choice bug = new Choice();
- bug.setValue("Bug");
- choices.add(bug);
-
- Choice task = new Choice();
- task.setValue("Task");
- choices.add(task);
-
- specifiedChoices.setChoices(choices);
- type.setChoiceProvider(specifiedChoices);
-
- SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();
- specifiedDefaultValue.setValue("Bug");
- type.setDefaultValueProvider(specifiedDefaultValue);
-
- fieldSpecs.add(type);
-
- ChoiceInput priority = new ChoiceInput();
- priority.setName("Priority");
- specifiedChoices = new SpecifiedChoices();
-
- choices = new ArrayList<>();
-
- Choice minor = new Choice();
- minor.setValue("Minor");
- minor.setColor("#CCCCCC");
- choices.add(minor);
-
- Choice normal = new Choice();
- normal.setValue("Normal");
- normal.setColor("#9fc5e8");
- choices.add(normal);
-
- Choice major = new Choice();
- major.setValue("Major");
- major.setColor("#ff9900");
- choices.add(major);
-
- Choice critical = new Choice();
- critical.setValue("Critical");
- critical.setColor("#cc0000");
- choices.add(critical);
-
- specifiedChoices.setChoices(choices);
- priority.setChoiceProvider(specifiedChoices);
-
- specifiedDefaultValue = new SpecifiedDefaultValue();
- specifiedDefaultValue.setValue("Normal");
- priority.setDefaultValueProvider(specifiedDefaultValue);
-
- fieldSpecs.add(priority);
-
- UserChoiceInput assignee = new UserChoiceInput();
- assignee.setChoiceProvider(new io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.CodeWriters());
- assignee.setCanBeChangedBy(new CodeWriters());
- assignee.setAllowEmpty(true);
- assignee.setNameOfEmptyValue("Not assigned");
- assignee.setName("Assignee");
-
- fieldSpecs.add(assignee);
-
- ChoiceInput resolution = new ChoiceInput();
- resolution.setName("Resolution");
- specifiedChoices = new SpecifiedChoices();
-
- choices = new ArrayList<>();
-
- Choice fixed = new Choice();
- fixed.setValue("Fixed");
- choices.add(fixed);
-
- Choice wontFix = new Choice();
- wontFix.setValue("Invalid");
- choices.add(wontFix);
-
- Choice duplicated = new Choice();
- duplicated.setValue("Duplicated");
- choices.add(duplicated);
-
- specifiedChoices.setChoices(choices);
- resolution.setChoiceProvider(specifiedChoices);
-
- specifiedDefaultValue = new SpecifiedDefaultValue();
- specifiedDefaultValue.setValue("Fixed");
- resolution.setDefaultValueProvider(specifiedDefaultValue);
-
- fieldSpecs.add(resolution);
-
- IssueChoiceInput duplicateWith = new IssueChoiceInput();
- duplicateWith.setName("Duplicate With");
-
- ShowCondition showCondition = new ShowCondition();
- showCondition.setInputName("Resolution");
- ValueIsOneOf valueIsOneOf = new ValueIsOneOf();
- valueIsOneOf.setValues(Lists.newArrayList("Duplicated"));
- showCondition.setValueMatcher(valueIsOneOf);
- duplicateWith.setShowCondition(showCondition);
-
- fieldSpecs.add(duplicateWith);
-
- StateSpec open = new StateSpec();
- open.setName("Open");
- open.setCategory(StateSpec.Category.OPEN);
- open.setColor("#f0ad4e");
-
- stateSpecs.add(open);
-
- StateSpec closed = new StateSpec();
- closed.setColor("#5cb85c");
- closed.setName("Closed");
- closed.setCategory(StateSpec.Category.CLOSED);
-
- stateSpecs.add(closed);
-
- TransitionSpec transition = new TransitionSpec();
- transition.setFromStates(Lists.newArrayList("Open"));
- transition.setToState("Closed");
- PressButtonTrigger pressButton = new PressButtonTrigger();
- pressButton.setButtonLabel("Close");
- pressButton.setAuthorized(new CodeWriters());
- pressButton.setPromptFields(Lists.newArrayList("Resolution", "Duplicate With"));
- transition.setTrigger(pressButton);
-
- defaultTransitionSpecs.add(transition);
-
- transition = new TransitionSpec();
- transition.setFromStates(Lists.newArrayList("Closed"));
- transition.setToState("Open");
- pressButton = new PressButtonTrigger();
- pressButton.setButtonLabel("Reopen");
- transition.setRemoveFields(Lists.newArrayList("Resolution", "Duplicate With"));
- pressButton.setAuthorized(new CodeWriters());
- transition.setTrigger(pressButton);
-
- defaultTransitionSpecs.add(transition);
-
- defaultPromptFieldsUponIssueOpen.add("Type");
- defaultPromptFieldsUponIssueOpen.add("Priority");
- defaultPromptFieldsUponIssueOpen.add("Assignee");
-
- BoardSpec board = new BoardSpec();
- board.setName(IssueConstants.FIELD_STATE);
- board.setIdentifyField(IssueConstants.FIELD_STATE);
- board.setColumns(Lists.newArrayList("Open", "Closed"));
- board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
- defaultBoardSpecs.add(board);
-
- defaultListFields.add("Type");
- defaultListFields.add("Priority");
- defaultListFields.add("Assignee");
-
- defaultQueries.add(new NamedIssueQuery("Outstanding", "outstanding"));
- defaultQueries.add(new NamedIssueQuery("My outstanding", "outstanding and mine"));
- defaultQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));
- defaultQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));
- defaultQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));
- defaultQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));
- defaultQueries.add(new NamedIssueQuery("Critical outstanding", "outstanding and \"Priority\" is \"Critical\""));
- defaultQueries.add(new NamedIssueQuery("Unassigned outstanding", "outstanding and \"Assignee\" is empty"));
- defaultQueries.add(new NamedIssueQuery("Closed", "closed"));
- defaultQueries.add(new NamedIssueQuery("All", "all"));
- }
-
- public List<String> sortFieldNames(Collection<String> fieldNames) {
- List<String> sorted = new ArrayList<>(fieldNames);
- List<String> allFieldNames = getFieldNames();
- Collections.sort(sorted, new Comparator<String>() {
-
- @Override
- public int compare(String o1, String o2) {
- return allFieldNames.indexOf(o1) - allFieldNames.indexOf(o2);
- }
-
- });
- return sorted;
- }
-
- public List<StateSpec> getStateSpecs() {
- return stateSpecs;
- }
-
- public void setStateSpecs(List<StateSpec> stateSpecs) {
- this.stateSpecs = stateSpecs;
- }
-
- public List<TransitionSpec> getDefaultTransitionSpecs() {
- return defaultTransitionSpecs;
- }
-
- public void setDefaultTransitionSpecs(List<TransitionSpec> defaultStateTransitions) {
- this.defaultTransitionSpecs = defaultStateTransitions;
- }
-
- @Editable
- public List<InputSpec> getFieldSpecs() {
- return fieldSpecs;
- }
-
- public void setFieldSpecs(List<InputSpec> fieldSpecs) {
- this.fieldSpecs = fieldSpecs;
- }
-
- public Set<String> getDefaultPromptFieldsUponIssueOpen() {
- return defaultPromptFieldsUponIssueOpen;
- }
-
- public void setDefaultPromptFieldsUponIssueOpen(Set<String> defaultPromptFieldsUponIssueOpen) {
- this.defaultPromptFieldsUponIssueOpen = defaultPromptFieldsUponIssueOpen;
- }
-
- public boolean isReconciled() {
- return reconciled;
- }
-
- public void setReconciled(boolean reconciled) {
- this.reconciled = reconciled;
- }
-
- private Map<String, InputSpec> getFieldSpecMap() {
- // Do not use cache here as we may change fieldSpecs while editing IssueSetting
- Map<String, InputSpec> fieldSpecMap = new LinkedHashMap<>();
- for (InputSpec field: getFieldSpecs())
- fieldSpecMap.put(field.getName(), field);
- return fieldSpecMap;
- }
-
- private Map<String, StateSpec> getStateSpecMap() {
- // Do not use cache here as we may change fieldSpecs while editing IssueSetting
- Map<String, StateSpec> stateSpecMap = new LinkedHashMap<>();
- for (StateSpec state: getStateSpecs())
- stateSpecMap.put(state.getName(), state);
- return stateSpecMap;
- }
-
- public List<String> getFieldNames() {
- return new ArrayList<>(getFieldSpecMap().keySet());
- }
-
- public void onDeleteState(String stateName) {
- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
- if (it.next().onDeleteState(stateName))
- it.remove();
- }
- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
- if (it.next().onDeleteState(stateName))
- it.remove();
- }
-
- for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
- NamedIssueQuery namedQuery = it.next();
- try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
- if (query.onDeleteState(stateName))
- it.remove();
- else
- namedQuery.setQuery(query.toString());
- } catch (Exception e) {
- }
- }
- }
-
- public void onRenameState(String oldName, String newName) {
- for (TransitionSpec transition: getDefaultTransitionSpecs())
- transition.onRenameState(oldName, newName);
- for (BoardSpec board: getDefaultBoardSpecs())
- board.onRenameState(oldName, newName);
- for (NamedIssueQuery namedQuery: getDefaultQueries()) {
- try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
- query.onRenameState(oldName, newName);
- namedQuery.setQuery(query.toString());
- } catch (Exception e) {
- }
- }
- }
-
- @Nullable
- public StateSpec getStateSpec(String stateName) {
- return getStateSpecMap().get(stateName);
- }
-
- @Nullable
- public InputSpec getFieldSpec(String fieldName) {
- return getFieldSpecMap().get(fieldName);
- }
-
- public void onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
- TransitionSpec transition = it.next();
- if (transition.onEditFieldValues(fieldName, valueSetEdit))
- it.remove();
- }
- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
- if (it.next().onEditFieldValues(fieldName, valueSetEdit))
- it.remove();
- }
-
- for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
- NamedIssueQuery namedQuery = it.next();
- try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
- if (query.onEditFieldValues(fieldName, valueSetEdit))
- it.remove();
- else
- namedQuery.setQuery(query.toString());
- } catch (Exception e) {
- }
- }
- Set<String> deletedFields = new HashSet<>();
- for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
- InputSpec field = it.next();
- if (field.onEditInputValues(fieldName, valueSetEdit)) {
- it.remove();
- deletedFields.add(field.getName());
- }
- }
- for (String deletedField: deletedFields)
- onDeleteField(deletedField);
- }
-
- public void onRenameField(String oldName, String newName) {
- for (TransitionSpec transition: getDefaultTransitionSpecs())
- transition.onRenameField(oldName, newName);
- for (InputSpec field: getFieldSpecs())
- field.onRenameInput(oldName, newName);
- for (BoardSpec board: getDefaultBoardSpecs())
- board.onRenameField(this, oldName, newName);
- for (NamedIssueQuery namedQuery: getDefaultQueries()) {
- try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
- query.onRenameField(oldName, newName);
- namedQuery.setQuery(query.toString());
- } catch (Exception e) {
- }
- }
- }
-
- public void onDeleteField(String fieldName) {
- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
- if (it.next().onDeleteField(fieldName))
- it.remove();
- }
-
- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
- if (it.next().onDeleteField(this, fieldName))
- it.remove();
- }
-
- for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
- NamedIssueQuery namedQuery = it.next();
- try {
- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
- if (query.onDeleteField(fieldName))
- it.remove();
- else
- namedQuery.setQuery(query.toString());
- } catch (Exception e) {
- }
- }
-
- Set<String> deletedFields = new HashSet<>();
- for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
- InputSpec field = it.next();
- if (field.onDeleteInput(fieldName)) {
- it.remove();
- deletedFields.add(field.getName());
- }
- }
- for (String deletedField: deletedFields)
- onDeleteField(deletedField);
- }
-
- public void onRenameUser(String oldName, String newName) {
- for (TransitionSpec transition: getDefaultTransitionSpecs())
- transition.onRenameUser(oldName, newName);
- for (InputSpec field: getFieldSpecs())
- field.onRenameUser(oldName, newName);
- for (BoardSpec board: getDefaultBoardSpecs())
- board.onRenameUser(this, oldName, newName);
- }
-
- public void onDeleteUser(String userName) {
- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
- TransitionSpec transition = it.next();
- if (transition.onDeleteUser(userName))
- it.remove();
- }
- for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
- if (it.next().onDeleteUser(this, userName))
- it.remove();
- }
-
- Set<String> deletedFields = new HashSet<>();
- for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
- InputSpec field = it.next();
- if (field.onDeleteUser(userName)) {
- it.remove();
- deletedFields.add(field.getName());
- }
- }
- for (String deletedField: deletedFields)
- onDeleteField(deletedField);
- }
-
- public void onRenameGroup(String oldName, String newName) {
- for (TransitionSpec transition: getDefaultTransitionSpecs())
- transition.onRenameGroup(oldName, newName);
- for (InputSpec field: getFieldSpecs())
- field.onRenameGroup(oldName, newName);
- }
-
- public void onDeleteGroup(String groupName) {
- for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
- TransitionSpec transition = it.next();
- if (transition.onDeleteGroup(groupName))
- it.remove();
- }
- Set<String> deletedFields = new HashSet<>();
- for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
- InputSpec field = it.next();
- if (field.onDeleteGroup(groupName)) {
- it.remove();
- deletedFields.add(field.getName());
- }
- }
- for (String deletedField: deletedFields)
- onDeleteField(deletedField);
- }
-
- public StateSpec getInitialStateSpec() {
- if (!getStateSpecs().isEmpty())
- return getStateSpecs().iterator().next();
- else
- throw new OneException("No any issue state is defined");
- }
-
- public IssueCriteria getCategoryCriteria(StateSpec.Category category) {
- List<IssueCriteria> criterias = new ArrayList<>();
- for (StateSpec state: getStateSpecs()) {
- if (category == state.getCategory())
- criterias.add(new StateCriteria(state.getName()));
- }
- return new OrCriteria(criterias);
- }
-
- public List<BoardSpec> getDefaultBoardSpecs() {
- return defaultBoardSpecs;
- }
-
- public void setDefaultBoardSpecs(List<BoardSpec> defaultBoardSpecs) {
- this.defaultBoardSpecs = defaultBoardSpecs;
- }
-
- public Set<String> getDefaultListFields() {
- return defaultListFields;
- }
-
- public void setDefaultListFields(Set<String> defaultListFields) {
- this.defaultListFields = defaultListFields;
- }
-
- @Editable(order=300, description="Define default issue queries for all projects")
- public List<NamedIssueQuery> getDefaultQueries() {
- return defaultQueries;
- }
-
- public void setDefaultQueries(List<NamedIssueQuery> defaultQueries) {
- this.defaultQueries = defaultQueries;
- }
-
-}
+package io.onedev.server.model.support.setting;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import com.google.common.collect.Lists;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.model.support.issue.BoardSpec;
+import io.onedev.server.model.support.issue.NamedIssueQuery;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.usermatcher.CodeWriters;
+import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.search.entity.issue.OrCriteria;
+import io.onedev.server.search.entity.issue.StateCriteria;
+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.IssueChoiceInput;
+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.SpecifiedDefaultValue;
+import io.onedev.server.util.inputspec.showcondition.ShowCondition;
+import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;
+import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class GlobalIssueSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<StateSpec> stateSpecs = new ArrayList<>();
+
+ private List<TransitionSpec> defaultTransitionSpecs = new ArrayList<>();
+
+ private List<InputSpec> fieldSpecs = new ArrayList<>();
+
+ private Set<String> defaultPromptFieldsUponIssueOpen = new HashSet<>();
+
+ private List<BoardSpec> defaultBoardSpecs = new ArrayList<>();
+
+ private Set<String> defaultListFields = new HashSet<>();
+
+ private List<NamedIssueQuery> defaultQueries = new ArrayList<>();
+
+ private boolean reconciled = true;
+
+ public GlobalIssueSetting() {
+ ChoiceInput type = new ChoiceInput();
+ type.setName("Type");
+ SpecifiedChoices specifiedChoices = new SpecifiedChoices();
+
+ List<Choice> choices = new ArrayList<>();
+ Choice newFeature = new Choice();
+ newFeature.setValue("New Feature");
+ choices.add(newFeature);
+
+ Choice improvement = new Choice();
+ improvement.setValue("Improvement");
+ choices.add(improvement);
+
+ Choice bug = new Choice();
+ bug.setValue("Bug");
+ choices.add(bug);
+
+ Choice task = new Choice();
+ task.setValue("Task");
+ choices.add(task);
+
+ specifiedChoices.setChoices(choices);
+ type.setChoiceProvider(specifiedChoices);
+
+ SpecifiedDefaultValue specifiedDefaultValue = new SpecifiedDefaultValue();
+ specifiedDefaultValue.setValue("Bug");
+ type.setDefaultValueProvider(specifiedDefaultValue);
+
+ fieldSpecs.add(type);
+
+ ChoiceInput priority = new ChoiceInput();
+ priority.setName("Priority");
+ specifiedChoices = new SpecifiedChoices();
+
+ choices = new ArrayList<>();
+
+ Choice minor = new Choice();
+ minor.setValue("Minor");
+ minor.setColor("#CCCCCC");
+ choices.add(minor);
+
+ Choice normal = new Choice();
+ normal.setValue("Normal");
+ normal.setColor("#9fc5e8");
+ choices.add(normal);
+
+ Choice major = new Choice();
+ major.setValue("Major");
+ major.setColor("#ff9900");
+ choices.add(major);
+
+ Choice critical = new Choice();
+ critical.setValue("Critical");
+ critical.setColor("#cc0000");
+ choices.add(critical);
+
+ specifiedChoices.setChoices(choices);
+ priority.setChoiceProvider(specifiedChoices);
+
+ specifiedDefaultValue = new SpecifiedDefaultValue();
+ specifiedDefaultValue.setValue("Normal");
+ priority.setDefaultValueProvider(specifiedDefaultValue);
+
+ fieldSpecs.add(priority);
+
+ UserChoiceInput assignee = new UserChoiceInput();
+ assignee.setChoiceProvider(new io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.CodeWriters());
+ assignee.setCanBeChangedBy(new CodeWriters());
+ assignee.setAllowEmpty(true);
+ assignee.setNameOfEmptyValue("Not assigned");
+ assignee.setName("Assignee");
+
+ fieldSpecs.add(assignee);
+
+ ChoiceInput resolution = new ChoiceInput();
+ resolution.setName("Resolution");
+ specifiedChoices = new SpecifiedChoices();
+
+ choices = new ArrayList<>();
+
+ Choice fixed = new Choice();
+ fixed.setValue("Fixed");
+ choices.add(fixed);
+
+ Choice wontFix = new Choice();
+ wontFix.setValue("Invalid");
+ choices.add(wontFix);
+
+ Choice duplicated = new Choice();
+ duplicated.setValue("Duplicated");
+ choices.add(duplicated);
+
+ specifiedChoices.setChoices(choices);
+ resolution.setChoiceProvider(specifiedChoices);
+
+ specifiedDefaultValue = new SpecifiedDefaultValue();
+ specifiedDefaultValue.setValue("Fixed");
+ resolution.setDefaultValueProvider(specifiedDefaultValue);
+
+ fieldSpecs.add(resolution);
+
+ IssueChoiceInput duplicateWith = new IssueChoiceInput();
+ duplicateWith.setName("Duplicate With");
+
+ ShowCondition showCondition = new ShowCondition();
+ showCondition.setInputName("Resolution");
+ ValueIsOneOf valueIsOneOf = new ValueIsOneOf();
+ valueIsOneOf.setValues(Lists.newArrayList("Duplicated"));
+ showCondition.setValueMatcher(valueIsOneOf);
+ duplicateWith.setShowCondition(showCondition);
+
+ fieldSpecs.add(duplicateWith);
+
+ StateSpec open = new StateSpec();
+ open.setName("Open");
+ open.setCategory(StateSpec.Category.OPEN);
+ open.setColor("#f0ad4e");
+
+ stateSpecs.add(open);
+
+ StateSpec closed = new StateSpec();
+ closed.setColor("#5cb85c");
+ closed.setName("Closed");
+ closed.setCategory(StateSpec.Category.CLOSED);
+
+ stateSpecs.add(closed);
+
+ TransitionSpec transition = new TransitionSpec();
+ transition.setFromStates(Lists.newArrayList("Open"));
+ transition.setToState("Closed");
+ PressButtonTrigger pressButton = new PressButtonTrigger();
+ pressButton.setButtonLabel("Close");
+ pressButton.setAuthorized(new CodeWriters());
+ pressButton.setPromptFields(Lists.newArrayList("Resolution", "Duplicate With"));
+ transition.setTrigger(pressButton);
+
+ defaultTransitionSpecs.add(transition);
+
+ transition = new TransitionSpec();
+ transition.setFromStates(Lists.newArrayList("Closed"));
+ transition.setToState("Open");
+ pressButton = new PressButtonTrigger();
+ pressButton.setButtonLabel("Reopen");
+ transition.setRemoveFields(Lists.newArrayList("Resolution", "Duplicate With"));
+ pressButton.setAuthorized(new CodeWriters());
+ transition.setTrigger(pressButton);
+
+ defaultTransitionSpecs.add(transition);
+
+ defaultPromptFieldsUponIssueOpen.add("Type");
+ defaultPromptFieldsUponIssueOpen.add("Priority");
+ defaultPromptFieldsUponIssueOpen.add("Assignee");
+
+ BoardSpec board = new BoardSpec();
+ board.setName(IssueConstants.FIELD_STATE);
+ board.setIdentifyField(IssueConstants.FIELD_STATE);
+ board.setColumns(Lists.newArrayList("Open", "Closed"));
+ board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
+ defaultBoardSpecs.add(board);
+
+ defaultListFields.add("Type");
+ defaultListFields.add("Priority");
+ defaultListFields.add("Assignee");
+
+ defaultQueries.add(new NamedIssueQuery("Outstanding", "outstanding"));
+ defaultQueries.add(new NamedIssueQuery("My outstanding", "outstanding and mine"));
+ defaultQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));
+ defaultQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));
+ defaultQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));
+ defaultQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));
+ defaultQueries.add(new NamedIssueQuery("Critical outstanding", "outstanding and \"Priority\" is \"Critical\""));
+ defaultQueries.add(new NamedIssueQuery("Unassigned outstanding", "outstanding and \"Assignee\" is empty"));
+ defaultQueries.add(new NamedIssueQuery("Closed", "closed"));
+ defaultQueries.add(new NamedIssueQuery("All", "all"));
+ }
+
+ public List<String> sortFieldNames(Collection<String> fieldNames) {
+ List<String> sorted = new ArrayList<>(fieldNames);
+ List<String> allFieldNames = getFieldNames();
+ Collections.sort(sorted, new Comparator<String>() {
+
+ @Override
+ public int compare(String o1, String o2) {
+ return allFieldNames.indexOf(o1) - allFieldNames.indexOf(o2);
+ }
+
+ });
+ return sorted;
+ }
+
+ public List<StateSpec> getStateSpecs() {
+ return stateSpecs;
+ }
+
+ public void setStateSpecs(List<StateSpec> stateSpecs) {
+ this.stateSpecs = stateSpecs;
+ }
+
+ public List<TransitionSpec> getDefaultTransitionSpecs() {
+ return defaultTransitionSpecs;
+ }
+
+ public void setDefaultTransitionSpecs(List<TransitionSpec> defaultStateTransitions) {
+ this.defaultTransitionSpecs = defaultStateTransitions;
+ }
+
+ @Editable
+ public List<InputSpec> getFieldSpecs() {
+ return fieldSpecs;
+ }
+
+ public void setFieldSpecs(List<InputSpec> fieldSpecs) {
+ this.fieldSpecs = fieldSpecs;
+ }
+
+ public Set<String> getDefaultPromptFieldsUponIssueOpen() {
+ return defaultPromptFieldsUponIssueOpen;
+ }
+
+ public void setDefaultPromptFieldsUponIssueOpen(Set<String> defaultPromptFieldsUponIssueOpen) {
+ this.defaultPromptFieldsUponIssueOpen = defaultPromptFieldsUponIssueOpen;
+ }
+
+ public boolean isReconciled() {
+ return reconciled;
+ }
+
+ public void setReconciled(boolean reconciled) {
+ this.reconciled = reconciled;
+ }
+
+ private Map<String, InputSpec> getFieldSpecMap() {
+ // Do not use cache here as we may change fieldSpecs while editing IssueSetting
+ Map<String, InputSpec> fieldSpecMap = new LinkedHashMap<>();
+ for (InputSpec field: getFieldSpecs())
+ fieldSpecMap.put(field.getName(), field);
+ return fieldSpecMap;
+ }
+
+ private Map<String, StateSpec> getStateSpecMap() {
+ // Do not use cache here as we may change fieldSpecs while editing IssueSetting
+ Map<String, StateSpec> stateSpecMap = new LinkedHashMap<>();
+ for (StateSpec state: getStateSpecs())
+ stateSpecMap.put(state.getName(), state);
+ return stateSpecMap;
+ }
+
+ public List<String> getFieldNames() {
+ return new ArrayList<>(getFieldSpecMap().keySet());
+ }
+
+ public void onDeleteState(String stateName) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
+ if (it.next().onDeleteState(stateName))
+ it.remove();
+ }
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ if (it.next().onDeleteState(stateName))
+ it.remove();
+ }
+
+ for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
+ NamedIssueQuery namedQuery = it.next();
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ if (query.onDeleteState(stateName))
+ it.remove();
+ else
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ public void onRenameState(String oldName, String newName) {
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
+ transition.onRenameState(oldName, newName);
+ for (BoardSpec board: getDefaultBoardSpecs())
+ board.onRenameState(oldName, newName);
+ for (NamedIssueQuery namedQuery: getDefaultQueries()) {
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ query.onRenameState(oldName, newName);
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ @Nullable
+ public StateSpec getStateSpec(String stateName) {
+ return getStateSpecMap().get(stateName);
+ }
+
+ @Nullable
+ public InputSpec getFieldSpec(String fieldName) {
+ return getFieldSpecMap().get(fieldName);
+ }
+
+ public void onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
+ TransitionSpec transition = it.next();
+ if (transition.onEditFieldValues(fieldName, valueSetEdit))
+ it.remove();
+ }
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ if (it.next().onEditFieldValues(fieldName, valueSetEdit))
+ it.remove();
+ }
+
+ for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
+ NamedIssueQuery namedQuery = it.next();
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ if (query.onEditFieldValues(fieldName, valueSetEdit))
+ it.remove();
+ else
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ Set<String> deletedFields = new HashSet<>();
+ for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
+ InputSpec field = it.next();
+ if (field.onEditInputValues(fieldName, valueSetEdit)) {
+ it.remove();
+ deletedFields.add(field.getName());
+ }
+ }
+ for (String deletedField: deletedFields)
+ onDeleteField(deletedField);
+ }
+
+ public void onRenameField(String oldName, String newName) {
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
+ transition.onRenameField(oldName, newName);
+ for (InputSpec field: getFieldSpecs())
+ field.onRenameInput(oldName, newName);
+ for (BoardSpec board: getDefaultBoardSpecs())
+ board.onRenameField(this, oldName, newName);
+ for (NamedIssueQuery namedQuery: getDefaultQueries()) {
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ query.onRenameField(oldName, newName);
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ public void onDeleteField(String fieldName) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
+ if (it.next().onDeleteField(fieldName))
+ it.remove();
+ }
+
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ if (it.next().onDeleteField(this, fieldName))
+ it.remove();
+ }
+
+ for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
+ NamedIssueQuery namedQuery = it.next();
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ if (query.onDeleteField(fieldName))
+ it.remove();
+ else
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+
+ Set<String> deletedFields = new HashSet<>();
+ for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
+ InputSpec field = it.next();
+ if (field.onDeleteInput(fieldName)) {
+ it.remove();
+ deletedFields.add(field.getName());
+ }
+ }
+ for (String deletedField: deletedFields)
+ onDeleteField(deletedField);
+ }
+
+ public void onRenameUser(String oldName, String newName) {
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
+ transition.onRenameUser(oldName, newName);
+ for (InputSpec field: getFieldSpecs())
+ field.onRenameUser(oldName, newName);
+ for (BoardSpec board: getDefaultBoardSpecs())
+ board.onRenameUser(this, oldName, newName);
+ }
+
+ public void onDeleteUser(String userName) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
+ TransitionSpec transition = it.next();
+ if (transition.onDeleteUser(userName))
+ it.remove();
+ }
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ if (it.next().onDeleteUser(this, userName))
+ it.remove();
+ }
+
+ Set<String> deletedFields = new HashSet<>();
+ for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
+ InputSpec field = it.next();
+ if (field.onDeleteUser(userName)) {
+ it.remove();
+ deletedFields.add(field.getName());
+ }
+ }
+ for (String deletedField: deletedFields)
+ onDeleteField(deletedField);
+ }
+
+ public void onRenameGroup(String oldName, String newName) {
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
+ transition.onRenameGroup(oldName, newName);
+ for (InputSpec field: getFieldSpecs())
+ field.onRenameGroup(oldName, newName);
+ }
+
+ public void onDeleteGroup(String groupName) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
+ TransitionSpec transition = it.next();
+ if (transition.onDeleteGroup(groupName))
+ it.remove();
+ }
+ Set<String> deletedFields = new HashSet<>();
+ for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
+ InputSpec field = it.next();
+ if (field.onDeleteGroup(groupName)) {
+ it.remove();
+ deletedFields.add(field.getName());
+ }
+ }
+ for (String deletedField: deletedFields)
+ onDeleteField(deletedField);
+ }
+
+ public StateSpec getInitialStateSpec() {
+ if (!getStateSpecs().isEmpty())
+ return getStateSpecs().iterator().next();
+ else
+ throw new OneException("No any issue state is defined");
+ }
+
+ public IssueCriteria getCategoryCriteria(StateSpec.Category category) {
+ List<IssueCriteria> criterias = new ArrayList<>();
+ for (StateSpec state: getStateSpecs()) {
+ if (category == state.getCategory())
+ criterias.add(new StateCriteria(state.getName()));
+ }
+ return new OrCriteria(criterias);
+ }
+
+ public List<BoardSpec> getDefaultBoardSpecs() {
+ return defaultBoardSpecs;
+ }
+
+ public void setDefaultBoardSpecs(List<BoardSpec> defaultBoardSpecs) {
+ this.defaultBoardSpecs = defaultBoardSpecs;
+ }
+
+ public Set<String> getDefaultListFields() {
+ return defaultListFields;
+ }
+
+ public void setDefaultListFields(Set<String> defaultListFields) {
+ this.defaultListFields = defaultListFields;
+ }
+
+ @Editable(order=300, description="Define default issue queries for all projects")
+ public List<NamedIssueQuery> getDefaultQueries() {
+ return defaultQueries;
+ }
+
+ public void setDefaultQueries(List<NamedIssueQuery> defaultQueries) {
+ this.defaultQueries = defaultQueries;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
index 9eef43c54f..72b971d2e8 100644
--- a/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
+++ b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
@@ -1,607 +1,607 @@
-package io.onedev.server.persistence;
-
-import java.io.File;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.nio.charset.Charset;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.List;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.ManyToOne;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-import javax.persistence.metamodel.EntityType;
-
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.hibernate.Interceptor;
-import org.hibernate.ReplicationMode;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.MetadataBuilder;
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.model.naming.Identifier;
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
-import org.hibernate.query.Query;
-import org.hibernate.tool.hbm2ddl.SchemaExport;
-import org.hibernate.tool.schema.TargetType;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
-
-import io.onedev.commons.utils.BeanUtils;
-import io.onedev.commons.utils.ClassUtils;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.server.migration.DatabaseMigrator;
-import io.onedev.server.migration.MigrationHelper;
-import io.onedev.server.migration.VersionedDocument;
-import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.ModelVersion;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.validation.EntityValidator;
-
-@Singleton
-public class DefaultPersistManager implements PersistManager {
-
- private static final int BACKUP_BATCH_SIZE = 1000;
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultPersistManager.class);
-
- protected final PhysicalNamingStrategy physicalNamingStrategy;
-
- protected final HibernateProperties properties;
-
- protected final Interceptor interceptor;
-
- protected final IdManager idManager;
-
- protected final Dao dao;
-
- protected final EntityValidator validator;
-
- protected final StandardServiceRegistry serviceRegistry;
-
- protected volatile SessionFactory sessionFactory;
-
- @Inject
- public DefaultPersistManager(PhysicalNamingStrategy physicalNamingStrategy,
- HibernateProperties properties, Interceptor interceptor,
- IdManager idManager, Dao dao, EntityValidator validator) {
- this.physicalNamingStrategy = physicalNamingStrategy;
- this.properties = properties;
- this.interceptor = interceptor;
- this.idManager = idManager;
- this.dao = dao;
- this.validator = validator;
- serviceRegistry = new StandardServiceRegistryBuilder().applySettings(properties).build();
- }
-
- protected String getDialect() {
- return properties.getDialect();
- }
-
- protected void execute(List<String> sqls, boolean failOnError) {
- try ( Connection conn = getConnection();
- Statement stmt = conn.createStatement();) {
- for (String sql: sqls) {
- logger.debug("Executing sql: " + sql);
- if (failOnError) {
- stmt.execute(sql);
- } else {
- try {
- stmt.execute(sql);
- } catch (Exception e) {
- logger.error("Error executing sql", e);
- }
- }
- }
- } catch (SQLException e) {
- throw new RuntimeException(e);
- }
- }
-
- protected Metadata buildMetadata() {
- MetadataSources metadataSources = new MetadataSources(serviceRegistry);
- for (Class<? extends AbstractEntity> each: ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class)) {
- metadataSources.addAnnotatedClass(each);
- }
-
- MetadataBuilder builder = metadataSources.getMetadataBuilder();
- builder.applyPhysicalNamingStrategy(physicalNamingStrategy);
- return builder.build();
- }
-
- protected SessionFactory buildSessionFactory(Metadata metadata) {
- return metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();
- }
-
- protected String checkDataVersion(boolean allowEmptyDB) {
- String dbDataVersion = readDbDataVersion();
- if (!allowEmptyDB && dbDataVersion == null) {
- logger.error("Database is not populated yet");
- System.exit(1);
- }
- String appDataVersion = MigrationHelper.getVersion(DatabaseMigrator.class);
- if (dbDataVersion != null && !dbDataVersion.equals(appDataVersion)) {
- logger.error("Data version mismatch (app data version: {}, db data version: {})", appDataVersion, dbDataVersion);
- System.exit(1);
- }
- return dbDataVersion;
- }
-
- @Override
- public void start() {
- String dbDataVersion = checkDataVersion(true);
-
- Metadata metadata = buildMetadata();
-
- if (dbDataVersion == null) {
- File tempFile = null;
- try {
- tempFile = File.createTempFile("schema", ".sql");
- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
- .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), metadata);
- List<String> sqls = new ArrayList<String>();
- for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
- if (shouldInclude(sql))
- sqls.add(sql);
- }
- execute(sqls, true);
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- if (tempFile != null)
- tempFile.delete();
- }
-
- sessionFactory = buildSessionFactory(metadata);
-
- idManager.init();
-
- Session session = sessionFactory.openSession();
- Transaction transaction = session.beginTransaction();
- try {
- ModelVersion dataVersion = new ModelVersion();
- dataVersion.versionColumn = MigrationHelper.getVersion(DatabaseMigrator.class);
- session.save(dataVersion);
- session.flush();
- transaction.commit();
- } catch (Exception e) {
- transaction.rollback();
- } finally {
- session.close();
- }
- } else {
- sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();
- idManager.init();
- }
- }
-
- @Override
- public void stop() {
- if (sessionFactory != null) {
- sessionFactory.close();
- sessionFactory = null;
- }
- }
-
- protected Connection getConnection() {
- try {
- Class.forName(properties.getDriver());
- Connection conn = DriverManager.getConnection(properties.getUrl(),
- properties.getUser(), properties.getPassword());
- return conn;
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- private String getVersionTableName() {
- JdbcEnvironment environment = serviceRegistry.getService(JdbcEnvironment.class);
- Identifier identifier = Identifier.toIdentifier(ModelVersion.class.getSimpleName());
- return physicalNamingStrategy.toPhysicalTableName(identifier, environment).getText();
- }
-
- private String getVersionFieldName() {
- return ModelVersion.class.getFields()[0].getName();
- }
-
- private String getVersionColumnName() {
- JdbcEnvironment environment = serviceRegistry.getService(JdbcEnvironment.class);
- Identifier identifier = Identifier.toIdentifier(getVersionFieldName());
- return physicalNamingStrategy.toPhysicalColumnName(identifier, environment).getText();
- }
-
- protected String readDbDataVersion() {
- try (Connection conn = getConnection()) {
- conn.setAutoCommit(false);
- String versionTableName = getVersionTableName();
- boolean versionTableExists = false;
- try (ResultSet resultset = conn.getMetaData().getTables(null, null, versionTableName.toUpperCase(), null)) {
- if (resultset.next())
- versionTableExists = true;
- }
- if (!versionTableExists) {
- try (ResultSet resultset = conn.getMetaData().getTables(null, null, versionTableName.toLowerCase(), null)) {
- if (resultset.next()) {
- versionTableExists = true;
- }
- }
- }
- if (!versionTableExists) {
- try (ResultSet resultset = conn.getMetaData().getTables(null, null, versionTableName, null)) {
- if (resultset.next()) {
- versionTableExists = true;
- }
- }
- }
- if (!versionTableExists) {
- return null;
- } else {
- try ( Statement stmt = conn.createStatement();
- ResultSet resultset = stmt.executeQuery("select " + getVersionColumnName() + " from " + versionTableName)) {
- if (!resultset.next())
- throw new RuntimeException("No data version found in database: this is normally caused "
- + "by unsuccessful restore/upgrade, please clean the database and try again");
- String dataVersion = resultset.getString(1);
- if (resultset.next())
- throw new RuntimeException("Illegal data version format in database");
- return dataVersion;
- }
- }
- } catch (Throwable e) {
- if (e.getMessage() != null && e.getMessage().contains("ORA-00942"))
- return null;
- else
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- private File getVersionFile(File dataDir) {
- File versionFile = new File(dataDir, ModelVersion.class.getSimpleName() + "s.xml");
- if (!versionFile.exists())
- versionFile = new File(dataDir, "VersionTables.xml");
- return versionFile;
- }
-
- protected void migrateData(File dataDir) {
- File versionFile = getVersionFile(dataDir);
-
- VersionedDocument dom = VersionedDocument.fromFile(versionFile);
- List<Element> elements = dom.getRootElement().elements();
- if (elements.size() != 1)
- throw new RuntimeException("Incorrect data format: illegal data version");
- Element versionElement = elements.iterator().next().element(getVersionFieldName());
- if (versionElement == null) {
- throw new RuntimeException("Incorrect data format: no data version");
- }
-
- if (MigrationHelper.migrate(versionElement.getText(), new DatabaseMigrator(), dataDir)) {
- // load version file again in case we changed something of it while migrating
- versionFile = getVersionFile(dataDir);
- dom = VersionedDocument.fromFile(versionFile);
- elements = dom.getRootElement().elements();
- Preconditions.checkState(elements.size() == 1);
- versionElement = Preconditions.checkNotNull(elements.iterator().next().element(getVersionFieldName()));
- versionElement.setText(MigrationHelper.getVersion(DatabaseMigrator.class));
- dom.writeToFile(versionFile, false);
- }
- }
-
- /**
- * Determines whether or not entityType1 has transitive foreign key
- * dependency on entityType2.
- *
- * @param entityType1
- * @param entityType2
- * @return
- */
- private boolean hasForeignKeyDependency(Class<?> entityType1, Class<?> entityType2) {
- for (Field field: BeanUtils.getFields(entityType1)) {
- if (field.getAnnotation(ManyToOne.class) != null) {
- if (field.getType() == entityType2)
- return true;
- if (field.getType() != entityType1 &&
- hasForeignKeyDependency(field.getType(), entityType2)) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * @return hibernate entity types ordered using foreign key dependency
- * information. For example, Build type comes before Configuration
- * type as it has Build has foreign key reference to Configuration.
- */
- private List<Class<?>> getEntityTypes(SessionFactory sessionFactory) {
- List<Class<?>> entityTypes = new ArrayList<>();
- for (EntityType<?> entityType: ((EntityManagerFactory)sessionFactory).getMetamodel().getEntities()) {
- entityTypes.add(entityType.getJavaType());
- }
-
- /* Collections.sort does not work here */
- List<Class<?>> sorted = new ArrayList<Class<?>>();
- while (!entityTypes.isEmpty()) {
- Class<?> dependencyLeaf = null;
- for (Class<?> entityType: entityTypes) {
- boolean hasDependents = false;
- for (Class<?> each: entityTypes) {
- if (each != entityType) {
- if (hasForeignKeyDependency(each, entityType)) {
- hasDependents = true;
- break;
- }
- }
- }
- if (!hasDependents) {
- dependencyLeaf = entityType;
- break;
- }
- }
- if (dependencyLeaf != null) {
- sorted.add(dependencyLeaf);
- entityTypes.remove(dependencyLeaf);
- } else {
- throw new RuntimeException("Looped foreigh key dependency found between model classes");
- }
- }
- return sorted;
- }
-
- @Override
- public void exportData(File exportDir) {
- exportData(exportDir, BACKUP_BATCH_SIZE);
- }
-
- @Sessional
- @Override
- public void exportData(File exportDir, int batchSize) {
- Session session = sessionFactory.openSession();
- for (Class<?> entityType: getEntityTypes(sessionFactory)) {
- logger.info("Exporting table '" + entityType.getSimpleName() + "'...");
-
- logger.info("Querying table ids...");
-
- CriteriaBuilder builder = sessionFactory.getCriteriaBuilder();
- CriteriaQuery<Number> query = builder.createQuery(Number.class);
- Root<?> root = query.from(entityType);
- query.select(root.get("id")).orderBy(builder.asc(root.get("id")));
-
- List<Number> ids = session.createQuery(query).list();
-
- int count = ids.size();
-
- for (int i=0; i<count/batchSize; i++) {
- exportEntity(session, entityType, ids, i*batchSize, batchSize, batchSize, exportDir);
- // clear session to free memory
- session.clear();
- }
-
- if (count%batchSize != 0) {
- exportEntity(session, entityType, ids, count/batchSize*batchSize, count%batchSize, batchSize, exportDir);
- }
- logger.info("");
- }
- }
-
- private void exportEntity(Session session, Class<?> entityType, List<Number> ids, int start, int count, int batchSize, File exportDir) {
- logger.info("Loading table rows ({}->{}) from database...", String.valueOf(start+1), (start + count));
-
- Query<?> query = session.createQuery("from " + entityType.getSimpleName() + " where id>=:fromId and id<=:toId");
- query.setParameter("fromId", ids.get(start));
- query.setParameter("toId", ids.get(start+count-1));
-
- logger.info("Converting table rows to XML...");
- VersionedDocument dom = new VersionedDocument();
- Element rootElement = dom.addElement("list");
- for (Object entity: query.list())
- rootElement.appendContent(VersionedDocument.fromBean(entity));
- String fileName;
-
- if (start == 0)
- fileName = entityType.getSimpleName() + "s.xml";
- else
- fileName = entityType.getSimpleName() + "s.xml." + (start/batchSize + 1);
-
- logger.info("Writing resulting XML to file '" + fileName + "...");
- dom.writeToFile(new File(exportDir, fileName), true);
- }
-
- /*
- * We do not use @Transactional annotation and will manage the session and transaction manually
- * in this method to reduce memory usage if importing a large database.
- */
- @Sessional
- @Override
- public void importData(Metadata metadata, File dataDir) {
- Session session = dao.getSessionManager().getSession();
- List<Class<?>> entityTypes = getEntityTypes(sessionFactory);
- Collections.reverse(entityTypes);
- for (Class<?> entityType: entityTypes) {
- File[] dataFiles = dataDir.listFiles(new FilenameFilter() {
-
- @Override
- public boolean accept(File dir, String name) {
- return name.startsWith(entityType.getSimpleName() + "s.xml");
- }
-
- });
- for (File file: dataFiles) {
- Transaction transaction = session.beginTransaction();
- try {
- logger.info("Importing from data file '" + file.getName() + "'...");
- VersionedDocument dom = VersionedDocument.fromFile(file);
-
- for (Element element: dom.getRootElement().elements()) {
- element.detach();
- AbstractEntity entity = (AbstractEntity) new VersionedDocument(DocumentHelper.createDocument(element)).toBean();
- session.replicate(entity, ReplicationMode.EXCEPTION);
- }
- session.flush();
- session.clear();
- transaction.commit();
- } catch (Throwable e) {
- transaction.rollback();
- throw ExceptionUtils.unchecked(e);
- }
- }
- }
- }
-
- protected void validateData(Metadata metadata, File dataDir) {
- List<Class<?>> entityTypes = getEntityTypes(sessionFactory);
- Collections.reverse(entityTypes);
- for (Class<?> entityType: entityTypes) {
- File[] dataFiles = dataDir.listFiles(new FilenameFilter() {
-
- @Override
- public boolean accept(File dir, String name) {
- return name.startsWith(entityType.getSimpleName() + "s.xml");
- }
-
- });
- for (File file: dataFiles) {
- try {
- logger.info("Validating data file '" + file.getName() + "'...");
- VersionedDocument dom = VersionedDocument.fromFile(file);
-
- for (Element element: dom.getRootElement().elements()) {
- element.detach();
- AbstractEntity entity = (AbstractEntity) new VersionedDocument(DocumentHelper.createDocument(element)).toBean();
- validator.validate(entity);
- }
- } catch (Throwable e) {
- throw ExceptionUtils.unchecked(e);
- }
- }
- }
- }
-
- protected void applyConstraints(Metadata metadata) {
- File tempFile = null;
- try {
- tempFile = File.createTempFile("schema", ".sql");
- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
- .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), metadata);
- List<String> sqls = new ArrayList<>();
- for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
- if (isApplyingConstraints(sql)) {
- sqls.add(sql);
- }
- }
- execute(sqls, true);
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- if (tempFile != null)
- tempFile.delete();
- }
- }
-
- protected void createTables(Metadata metadata) {
- File tempFile = null;
- try {
- tempFile = File.createTempFile("schema", ".sql");
- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
- .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), metadata);
- List<String> sqls = new ArrayList<>();
- for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
- if (shouldInclude(sql) && !isApplyingConstraints(sql))
- sqls.add(sql);
- }
- execute(sqls, true);
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- if (tempFile != null)
- FileUtils.deleteFile(tempFile);
- }
- }
-
- protected void dropConstraints(Metadata metadata) {
- File tempFile = null;
- try {
- tempFile = File.createTempFile("schema", ".sql");
- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
- .setFormat(false).drop(EnumSet.of(TargetType.SCRIPT), metadata);
- List<String> sqls = new ArrayList<>();
- for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
- if (isDroppingConstraints(sql))
- sqls.add(sql);
- }
- execute(sqls, false);
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- if (tempFile != null)
- tempFile.delete();
- }
- }
-
- protected void cleanDatabase(Metadata metadata) {
- File tempFile = null;
- try {
- tempFile = File.createTempFile("schema", ".sql");
- new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
- .setFormat(false).drop(EnumSet.of(TargetType.SCRIPT), metadata);
- List<String> sqls = new ArrayList<>();
- for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
- sqls.add(sql);
- }
- execute(sqls, false);
- } catch (IOException e) {
- throw new RuntimeException(e);
- } finally {
- if (tempFile != null)
- tempFile.delete();
- }
- }
-
- private boolean isApplyingConstraints(String sql) {
- return sql.toLowerCase().contains(" foreign key ");
- }
-
- private boolean isDroppingConstraints(String sql) {
- return sql.toLowerCase().contains(" drop constraint ");
- }
-
- private boolean shouldInclude(String sql) {
- // some databases will create index on foreign keys automatically, so
- // we skip creating indexes for those
- if (!sql.toLowerCase().startsWith("create index") || !sql.toLowerCase().endsWith("_id)")) {
- return true;
- } else {
- String dialect = getDialect().toLowerCase();
- return !dialect.contains("mysql") && !dialect.contains("hsql");
- }
- }
-
- @Override
- public SessionFactory getSessionFactory() {
- return sessionFactory;
- }
-
-}
+package io.onedev.server.persistence;
+
+import java.io.File;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.ManyToOne;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+import javax.persistence.metamodel.EntityType;
+
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.hibernate.Interceptor;
+import org.hibernate.ReplicationMode;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.Transaction;
+import org.hibernate.boot.Metadata;
+import org.hibernate.boot.MetadataBuilder;
+import org.hibernate.boot.MetadataSources;
+import org.hibernate.boot.model.naming.Identifier;
+import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
+import org.hibernate.boot.registry.StandardServiceRegistry;
+import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
+import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
+import org.hibernate.query.Query;
+import org.hibernate.tool.hbm2ddl.SchemaExport;
+import org.hibernate.tool.schema.TargetType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+import io.onedev.commons.utils.BeanUtils;
+import io.onedev.commons.utils.ClassUtils;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.server.migration.DatabaseMigrator;
+import io.onedev.server.migration.MigrationHelper;
+import io.onedev.server.migration.VersionedDocument;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.ModelVersion;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.util.validation.EntityValidator;
+
+@Singleton
+public class DefaultPersistManager implements PersistManager {
+
+ private static final int BACKUP_BATCH_SIZE = 1000;
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultPersistManager.class);
+
+ protected final PhysicalNamingStrategy physicalNamingStrategy;
+
+ protected final HibernateProperties properties;
+
+ protected final Interceptor interceptor;
+
+ protected final IdManager idManager;
+
+ protected final Dao dao;
+
+ protected final EntityValidator validator;
+
+ protected final StandardServiceRegistry serviceRegistry;
+
+ protected volatile SessionFactory sessionFactory;
+
+ @Inject
+ public DefaultPersistManager(PhysicalNamingStrategy physicalNamingStrategy,
+ HibernateProperties properties, Interceptor interceptor,
+ IdManager idManager, Dao dao, EntityValidator validator) {
+ this.physicalNamingStrategy = physicalNamingStrategy;
+ this.properties = properties;
+ this.interceptor = interceptor;
+ this.idManager = idManager;
+ this.dao = dao;
+ this.validator = validator;
+ serviceRegistry = new StandardServiceRegistryBuilder().applySettings(properties).build();
+ }
+
+ protected String getDialect() {
+ return properties.getDialect();
+ }
+
+ protected void execute(List<String> sqls, boolean failOnError) {
+ try ( Connection conn = getConnection();
+ Statement stmt = conn.createStatement();) {
+ for (String sql: sqls) {
+ logger.debug("Executing sql: " + sql);
+ if (failOnError) {
+ stmt.execute(sql);
+ } else {
+ try {
+ stmt.execute(sql);
+ } catch (Exception e) {
+ logger.error("Error executing sql", e);
+ }
+ }
+ }
+ } catch (SQLException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected Metadata buildMetadata() {
+ MetadataSources metadataSources = new MetadataSources(serviceRegistry);
+ for (Class<? extends AbstractEntity> each: ClassUtils.findImplementations(AbstractEntity.class, AbstractEntity.class)) {
+ metadataSources.addAnnotatedClass(each);
+ }
+
+ MetadataBuilder builder = metadataSources.getMetadataBuilder();
+ builder.applyPhysicalNamingStrategy(physicalNamingStrategy);
+ return builder.build();
+ }
+
+ protected SessionFactory buildSessionFactory(Metadata metadata) {
+ return metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();
+ }
+
+ protected String checkDataVersion(boolean allowEmptyDB) {
+ String dbDataVersion = readDbDataVersion();
+ if (!allowEmptyDB && dbDataVersion == null) {
+ logger.error("Database is not populated yet");
+ System.exit(1);
+ }
+ String appDataVersion = MigrationHelper.getVersion(DatabaseMigrator.class);
+ if (dbDataVersion != null && !dbDataVersion.equals(appDataVersion)) {
+ logger.error("Data version mismatch (app data version: {}, db data version: {})", appDataVersion, dbDataVersion);
+ System.exit(1);
+ }
+ return dbDataVersion;
+ }
+
+ @Override
+ public void start() {
+ String dbDataVersion = checkDataVersion(true);
+
+ Metadata metadata = buildMetadata();
+
+ if (dbDataVersion == null) {
+ File tempFile = null;
+ try {
+ tempFile = File.createTempFile("schema", ".sql");
+ new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
+ .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), metadata);
+ List<String> sqls = new ArrayList<String>();
+ for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
+ if (shouldInclude(sql))
+ sqls.add(sql);
+ }
+ execute(sqls, true);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (tempFile != null)
+ tempFile.delete();
+ }
+
+ sessionFactory = buildSessionFactory(metadata);
+
+ idManager.init();
+
+ Session session = sessionFactory.openSession();
+ Transaction transaction = session.beginTransaction();
+ try {
+ ModelVersion dataVersion = new ModelVersion();
+ dataVersion.versionColumn = MigrationHelper.getVersion(DatabaseMigrator.class);
+ session.save(dataVersion);
+ session.flush();
+ transaction.commit();
+ } catch (Exception e) {
+ transaction.rollback();
+ } finally {
+ session.close();
+ }
+ } else {
+ sessionFactory = metadata.getSessionFactoryBuilder().applyInterceptor(interceptor).build();
+ idManager.init();
+ }
+ }
+
+ @Override
+ public void stop() {
+ if (sessionFactory != null) {
+ sessionFactory.close();
+ sessionFactory = null;
+ }
+ }
+
+ protected Connection getConnection() {
+ try {
+ Class.forName(properties.getDriver());
+ Connection conn = DriverManager.getConnection(properties.getUrl(),
+ properties.getUser(), properties.getPassword());
+ return conn;
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ private String getVersionTableName() {
+ JdbcEnvironment environment = serviceRegistry.getService(JdbcEnvironment.class);
+ Identifier identifier = Identifier.toIdentifier(ModelVersion.class.getSimpleName());
+ return physicalNamingStrategy.toPhysicalTableName(identifier, environment).getText();
+ }
+
+ private String getVersionFieldName() {
+ return ModelVersion.class.getFields()[0].getName();
+ }
+
+ private String getVersionColumnName() {
+ JdbcEnvironment environment = serviceRegistry.getService(JdbcEnvironment.class);
+ Identifier identifier = Identifier.toIdentifier(getVersionFieldName());
+ return physicalNamingStrategy.toPhysicalColumnName(identifier, environment).getText();
+ }
+
+ protected String readDbDataVersion() {
+ try (Connection conn = getConnection()) {
+ conn.setAutoCommit(false);
+ String versionTableName = getVersionTableName();
+ boolean versionTableExists = false;
+ try (ResultSet resultset = conn.getMetaData().getTables(null, null, versionTableName.toUpperCase(), null)) {
+ if (resultset.next())
+ versionTableExists = true;
+ }
+ if (!versionTableExists) {
+ try (ResultSet resultset = conn.getMetaData().getTables(null, null, versionTableName.toLowerCase(), null)) {
+ if (resultset.next()) {
+ versionTableExists = true;
+ }
+ }
+ }
+ if (!versionTableExists) {
+ try (ResultSet resultset = conn.getMetaData().getTables(null, null, versionTableName, null)) {
+ if (resultset.next()) {
+ versionTableExists = true;
+ }
+ }
+ }
+ if (!versionTableExists) {
+ return null;
+ } else {
+ try ( Statement stmt = conn.createStatement();
+ ResultSet resultset = stmt.executeQuery("select " + getVersionColumnName() + " from " + versionTableName)) {
+ if (!resultset.next())
+ throw new RuntimeException("No data version found in database: this is normally caused "
+ + "by unsuccessful restore/upgrade, please clean the database and try again");
+ String dataVersion = resultset.getString(1);
+ if (resultset.next())
+ throw new RuntimeException("Illegal data version format in database");
+ return dataVersion;
+ }
+ }
+ } catch (Exception e) {
+ if (e.getMessage() != null && e.getMessage().contains("ORA-00942"))
+ return null;
+ else
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ private File getVersionFile(File dataDir) {
+ File versionFile = new File(dataDir, ModelVersion.class.getSimpleName() + "s.xml");
+ if (!versionFile.exists())
+ versionFile = new File(dataDir, "VersionTables.xml");
+ return versionFile;
+ }
+
+ protected void migrateData(File dataDir) {
+ File versionFile = getVersionFile(dataDir);
+
+ VersionedDocument dom = VersionedDocument.fromFile(versionFile);
+ List<Element> elements = dom.getRootElement().elements();
+ if (elements.size() != 1)
+ throw new RuntimeException("Incorrect data format: illegal data version");
+ Element versionElement = elements.iterator().next().element(getVersionFieldName());
+ if (versionElement == null) {
+ throw new RuntimeException("Incorrect data format: no data version");
+ }
+
+ if (MigrationHelper.migrate(versionElement.getText(), new DatabaseMigrator(), dataDir)) {
+ // load version file again in case we changed something of it while migrating
+ versionFile = getVersionFile(dataDir);
+ dom = VersionedDocument.fromFile(versionFile);
+ elements = dom.getRootElement().elements();
+ Preconditions.checkState(elements.size() == 1);
+ versionElement = Preconditions.checkNotNull(elements.iterator().next().element(getVersionFieldName()));
+ versionElement.setText(MigrationHelper.getVersion(DatabaseMigrator.class));
+ dom.writeToFile(versionFile, false);
+ }
+ }
+
+ /**
+ * Determines whether or not entityType1 has transitive foreign key
+ * dependency on entityType2.
+ *
+ * @param entityType1
+ * @param entityType2
+ * @return
+ */
+ private boolean hasForeignKeyDependency(Class<?> entityType1, Class<?> entityType2) {
+ for (Field field: BeanUtils.getFields(entityType1)) {
+ if (field.getAnnotation(ManyToOne.class) != null) {
+ if (field.getType() == entityType2)
+ return true;
+ if (field.getType() != entityType1 &&
+ hasForeignKeyDependency(field.getType(), entityType2)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * @return hibernate entity types ordered using foreign key dependency
+ * information. For example, Build type comes before Configuration
+ * type as it has Build has foreign key reference to Configuration.
+ */
+ private List<Class<?>> getEntityTypes(SessionFactory sessionFactory) {
+ List<Class<?>> entityTypes = new ArrayList<>();
+ for (EntityType<?> entityType: ((EntityManagerFactory)sessionFactory).getMetamodel().getEntities()) {
+ entityTypes.add(entityType.getJavaType());
+ }
+
+ /* Collections.sort does not work here */
+ List<Class<?>> sorted = new ArrayList<Class<?>>();
+ while (!entityTypes.isEmpty()) {
+ Class<?> dependencyLeaf = null;
+ for (Class<?> entityType: entityTypes) {
+ boolean hasDependents = false;
+ for (Class<?> each: entityTypes) {
+ if (each != entityType) {
+ if (hasForeignKeyDependency(each, entityType)) {
+ hasDependents = true;
+ break;
+ }
+ }
+ }
+ if (!hasDependents) {
+ dependencyLeaf = entityType;
+ break;
+ }
+ }
+ if (dependencyLeaf != null) {
+ sorted.add(dependencyLeaf);
+ entityTypes.remove(dependencyLeaf);
+ } else {
+ throw new RuntimeException("Looped foreigh key dependency found between model classes");
+ }
+ }
+ return sorted;
+ }
+
+ @Override
+ public void exportData(File exportDir) {
+ exportData(exportDir, BACKUP_BATCH_SIZE);
+ }
+
+ @Sessional
+ @Override
+ public void exportData(File exportDir, int batchSize) {
+ Session session = sessionFactory.openSession();
+ for (Class<?> entityType: getEntityTypes(sessionFactory)) {
+ logger.info("Exporting table '" + entityType.getSimpleName() + "'...");
+
+ logger.info("Querying table ids...");
+
+ CriteriaBuilder builder = sessionFactory.getCriteriaBuilder();
+ CriteriaQuery<Number> query = builder.createQuery(Number.class);
+ Root<?> root = query.from(entityType);
+ query.select(root.get("id")).orderBy(builder.asc(root.get("id")));
+
+ List<Number> ids = session.createQuery(query).list();
+
+ int count = ids.size();
+
+ for (int i=0; i<count/batchSize; i++) {
+ exportEntity(session, entityType, ids, i*batchSize, batchSize, batchSize, exportDir);
+ // clear session to free memory
+ session.clear();
+ }
+
+ if (count%batchSize != 0) {
+ exportEntity(session, entityType, ids, count/batchSize*batchSize, count%batchSize, batchSize, exportDir);
+ }
+ logger.info("");
+ }
+ }
+
+ private void exportEntity(Session session, Class<?> entityType, List<Number> ids, int start, int count, int batchSize, File exportDir) {
+ logger.info("Loading table rows ({}->{}) from database...", String.valueOf(start+1), (start + count));
+
+ Query<?> query = session.createQuery("from " + entityType.getSimpleName() + " where id>=:fromId and id<=:toId");
+ query.setParameter("fromId", ids.get(start));
+ query.setParameter("toId", ids.get(start+count-1));
+
+ logger.info("Converting table rows to XML...");
+ VersionedDocument dom = new VersionedDocument();
+ Element rootElement = dom.addElement("list");
+ for (Object entity: query.list())
+ rootElement.appendContent(VersionedDocument.fromBean(entity));
+ String fileName;
+
+ if (start == 0)
+ fileName = entityType.getSimpleName() + "s.xml";
+ else
+ fileName = entityType.getSimpleName() + "s.xml." + (start/batchSize + 1);
+
+ logger.info("Writing resulting XML to file '" + fileName + "...");
+ dom.writeToFile(new File(exportDir, fileName), true);
+ }
+
+ /*
+ * We do not use @Transactional annotation and will manage the session and transaction manually
+ * in this method to reduce memory usage if importing a large database.
+ */
+ @Sessional
+ @Override
+ public void importData(Metadata metadata, File dataDir) {
+ Session session = dao.getSessionManager().getSession();
+ List<Class<?>> entityTypes = getEntityTypes(sessionFactory);
+ Collections.reverse(entityTypes);
+ for (Class<?> entityType: entityTypes) {
+ File[] dataFiles = dataDir.listFiles(new FilenameFilter() {
+
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith(entityType.getSimpleName() + "s.xml");
+ }
+
+ });
+ for (File file: dataFiles) {
+ Transaction transaction = session.beginTransaction();
+ try {
+ logger.info("Importing from data file '" + file.getName() + "'...");
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+
+ for (Element element: dom.getRootElement().elements()) {
+ element.detach();
+ AbstractEntity entity = (AbstractEntity) new VersionedDocument(DocumentHelper.createDocument(element)).toBean();
+ session.replicate(entity, ReplicationMode.EXCEPTION);
+ }
+ session.flush();
+ session.clear();
+ transaction.commit();
+ } catch (Exception e) {
+ transaction.rollback();
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+ }
+ }
+
+ protected void validateData(Metadata metadata, File dataDir) {
+ List<Class<?>> entityTypes = getEntityTypes(sessionFactory);
+ Collections.reverse(entityTypes);
+ for (Class<?> entityType: entityTypes) {
+ File[] dataFiles = dataDir.listFiles(new FilenameFilter() {
+
+ @Override
+ public boolean accept(File dir, String name) {
+ return name.startsWith(entityType.getSimpleName() + "s.xml");
+ }
+
+ });
+ for (File file: dataFiles) {
+ try {
+ logger.info("Validating data file '" + file.getName() + "'...");
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+
+ for (Element element: dom.getRootElement().elements()) {
+ element.detach();
+ AbstractEntity entity = (AbstractEntity) new VersionedDocument(DocumentHelper.createDocument(element)).toBean();
+ validator.validate(entity);
+ }
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+ }
+ }
+
+ protected void applyConstraints(Metadata metadata) {
+ File tempFile = null;
+ try {
+ tempFile = File.createTempFile("schema", ".sql");
+ new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
+ .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), metadata);
+ List<String> sqls = new ArrayList<>();
+ for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
+ if (isApplyingConstraints(sql)) {
+ sqls.add(sql);
+ }
+ }
+ execute(sqls, true);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (tempFile != null)
+ tempFile.delete();
+ }
+ }
+
+ protected void createTables(Metadata metadata) {
+ File tempFile = null;
+ try {
+ tempFile = File.createTempFile("schema", ".sql");
+ new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
+ .setFormat(false).createOnly(EnumSet.of(TargetType.SCRIPT), metadata);
+ List<String> sqls = new ArrayList<>();
+ for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
+ if (shouldInclude(sql) && !isApplyingConstraints(sql))
+ sqls.add(sql);
+ }
+ execute(sqls, true);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (tempFile != null)
+ FileUtils.deleteFile(tempFile);
+ }
+ }
+
+ protected void dropConstraints(Metadata metadata) {
+ File tempFile = null;
+ try {
+ tempFile = File.createTempFile("schema", ".sql");
+ new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
+ .setFormat(false).drop(EnumSet.of(TargetType.SCRIPT), metadata);
+ List<String> sqls = new ArrayList<>();
+ for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
+ if (isDroppingConstraints(sql))
+ sqls.add(sql);
+ }
+ execute(sqls, false);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (tempFile != null)
+ tempFile.delete();
+ }
+ }
+
+ protected void cleanDatabase(Metadata metadata) {
+ File tempFile = null;
+ try {
+ tempFile = File.createTempFile("schema", ".sql");
+ new SchemaExport().setOutputFile(tempFile.getAbsolutePath())
+ .setFormat(false).drop(EnumSet.of(TargetType.SCRIPT), metadata);
+ List<String> sqls = new ArrayList<>();
+ for (String sql: FileUtils.readLines(tempFile, Charset.defaultCharset())) {
+ sqls.add(sql);
+ }
+ execute(sqls, false);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ if (tempFile != null)
+ tempFile.delete();
+ }
+ }
+
+ private boolean isApplyingConstraints(String sql) {
+ return sql.toLowerCase().contains(" foreign key ");
+ }
+
+ private boolean isDroppingConstraints(String sql) {
+ return sql.toLowerCase().contains(" drop constraint ");
+ }
+
+ private boolean shouldInclude(String sql) {
+ // some databases will create index on foreign keys automatically, so
+ // we skip creating indexes for those
+ if (!sql.toLowerCase().startsWith("create index") || !sql.toLowerCase().endsWith("_id)")) {
+ return true;
+ } else {
+ String dialect = getDialect().toLowerCase();
+ return !dialect.contains("mysql") && !dialect.contains("hsql");
+ }
+ }
+
+ @Override
+ public SessionFactory getSessionFactory() {
+ return sessionFactory;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java b/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java
index fc83ea59b3..5cc87cefa9 100644
--- a/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java
+++ b/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java
@@ -1,32 +1,32 @@
-package io.onedev.server.persistence;
-
-import java.util.concurrent.Callable;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import com.google.inject.Inject;
-
-import io.onedev.commons.utils.ExceptionUtils;
-
-public class SessionInterceptor implements MethodInterceptor {
-
- @Inject
- private SessionManager sessionManager;
-
- public Object invoke(MethodInvocation mi) throws Throwable {
- return sessionManager.call(new Callable<Object>() {
-
- @Override
- public Object call() throws Exception {
- try {
- return mi.proceed();
- } catch (Throwable e) {
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- });
- }
-
+package io.onedev.server.persistence;
+
+import java.util.concurrent.Callable;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+import com.google.inject.Inject;
+
+import io.onedev.commons.utils.ExceptionUtils;
+
+public class SessionInterceptor implements MethodInterceptor {
+
+ @Inject
+ private SessionManager sessionManager;
+
+ public Object invoke(MethodInvocation mi) throws Throwable {
+ return sessionManager.call(new Callable<Object>() {
+
+ @Override
+ public Object call() throws Exception {
+ try {
+ return mi.proceed();
+ } catch (Throwable e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ });
+ }
+
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java b/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java
index 6437822157..68b4c0a0ca 100644
--- a/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java
+++ b/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java
@@ -1,32 +1,32 @@
-package io.onedev.server.persistence;
-
-import java.util.concurrent.Callable;
-
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
-
-import com.google.inject.Inject;
-
-import io.onedev.commons.utils.ExceptionUtils;
-
-public class TransactionInterceptor implements MethodInterceptor {
-
- @Inject
- private TransactionManager transactionManager;
-
- public Object invoke(MethodInvocation mi) throws Throwable {
- return transactionManager.call(new Callable<Object>() {
-
- @Override
- public Object call() throws Exception {
- try {
- return mi.proceed();
- } catch (Throwable e) {
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- });
- }
-
-}
+package io.onedev.server.persistence;
+
+import java.util.concurrent.Callable;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+import com.google.inject.Inject;
+
+import io.onedev.commons.utils.ExceptionUtils;
+
+public class TransactionInterceptor implements MethodInterceptor {
+
+ @Inject
+ private TransactionManager transactionManager;
+
+ public Object invoke(MethodInvocation mi) throws Throwable {
+ return transactionManager.call(new Callable<Object>() {
+
+ @Override
+ public Object call() throws Exception {
+ try {
+ return mi.proceed();
+ } catch (Throwable e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ });
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
index 501749cfc9..eadf9a7da5 100644
--- a/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
+++ b/core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
@@ -1,455 +1,455 @@
-package io.onedev.server.search.code;
-
-import static io.onedev.server.search.code.FieldConstants.BLOB_HASH;
-import static io.onedev.server.search.code.FieldConstants.BLOB_INDEX_VERSION;
-import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
-import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;
-import static io.onedev.server.search.code.FieldConstants.BLOB_PRIMARY_SYMBOLS;
-import static io.onedev.server.search.code.FieldConstants.BLOB_SECONDARY_SYMBOLS;
-import static io.onedev.server.search.code.FieldConstants.BLOB_SYMBOL_LIST;
-import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;
-import static io.onedev.server.search.code.FieldConstants.COMMIT_HASH;
-import static io.onedev.server.search.code.FieldConstants.COMMIT_INDEX_VERSION;
-import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT;
-import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_HASH;
-import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_INDEX_VERSION;
-import static io.onedev.server.search.code.FieldConstants.META;
-import static io.onedev.server.search.code.IndexConstants.MAX_INDEXABLE_SIZE;
-import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.nio.charset.StandardCharsets;
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.lang.SerializationUtils;
-import org.apache.lucene.document.BinaryDocValuesField;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field.Store;
-import org.apache.lucene.document.StoredField;
-import org.apache.lucene.document.StringField;
-import org.apache.lucene.document.TextField;
-import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.IndexFormatTooOldException;
-import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.index.IndexWriterConfig.OpenMode;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.SimpleCollector;
-import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.util.BytesRef;
-import org.apache.wicket.request.cycle.RequestCycle;
-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.Repository;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.treewalk.TreeWalk;
-import org.eclipse.jgit.treewalk.filter.TreeFilter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.jsymbol.Symbol;
-import io.onedev.commons.jsymbol.SymbolExtractor;
-import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
-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.FileUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.concurrent.Prioritized;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.event.RefUpdated;
-import io.onedev.server.event.system.SystemStarted;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Project;
-import io.onedev.server.persistence.SessionManager;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.ContentDetector;
-import io.onedev.server.util.IndexResult;
-import io.onedev.server.util.work.BatchWorkManager;
-import io.onedev.server.util.work.BatchWorker;
-
-@Singleton
-public class DefaultIndexManager implements IndexManager {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultIndexManager.class);
-
- private static final int UI_INDEXING_PRIORITY = 10;
-
- private static final int BACKEND_INDEXING_PRIORITY = 50;
-
- private static final int DATA_VERSION = 5;
-
- private final StorageManager storageManager;
-
- private final BatchWorkManager batchWorkManager;
-
- private final SessionManager sessionManager;
-
- private final ProjectManager projectManager;
-
- private final ListenerRegistry listenerRegistry;
-
- @Inject
- public DefaultIndexManager(ListenerRegistry listenerRegistry, StorageManager storageManager,
- BatchWorkManager batchWorkManager, SessionManager sessionManager, ProjectManager projectManager) {
- this.listenerRegistry = listenerRegistry;
- this.storageManager = storageManager;
- this.batchWorkManager = batchWorkManager;
- this.sessionManager = sessionManager;
- this.projectManager = projectManager;
- }
-
- private String getCommitIndexVersion(final IndexSearcher searcher, AnyObjectId commitId) throws IOException {
- final AtomicReference<String> indexVersion = new AtomicReference<>(null);
-
- searcher.search(COMMIT_HASH.query(commitId.getName()), new SimpleCollector() {
-
- private int docBase;
-
- @Override
- public void collect(int doc) throws IOException {
- indexVersion.set(searcher.doc(docBase+doc).get(COMMIT_INDEX_VERSION.name()));
- }
-
- @Override
- protected void doSetNextReader(LeafReaderContext context) throws IOException {
- docBase = context.docBase;
- }
-
- @Override
- public boolean needsScores() {
- return false;
- }
-
- });
- return indexVersion.get();
- }
-
- private IndexResult index(Repository repository, AnyObjectId commitId,
- IndexWriter writer, final IndexSearcher searcher) throws Exception {
- try ( RevWalk revWalk = new RevWalk(repository);
- TreeWalk treeWalk = new TreeWalk(repository)) {
- treeWalk.addTree(revWalk.parseCommit(commitId).getTree());
- treeWalk.setRecursive(true);
-
- if (searcher != null) {
- TopDocs topDocs = searcher.search(META.query(LAST_COMMIT.name()), 1);
- if (topDocs.scoreDocs.length != 0) {
- Document doc = searcher.doc(topDocs.scoreDocs[0].doc);
- String lastCommitIndexVersion = doc.get(LAST_COMMIT_INDEX_VERSION.name());
- if (lastCommitIndexVersion.equals(getIndexVersion())) {
- String lastCommitHash = doc.get(LAST_COMMIT_HASH.name());
- ObjectId lastCommitId = ObjectId.fromString(lastCommitHash);
- if (repository.hasObject(lastCommitId)) {
- treeWalk.addTree(revWalk.parseCommit(lastCommitId).getTree());
- treeWalk.setFilter(TreeFilter.ANY_DIFF);
- }
- }
- }
- }
-
- int indexed = 0;
- int checked = 0;
- while (treeWalk.next()) {
- if ((treeWalk.getRawMode(0) & FileMode.TYPE_MASK) == FileMode.TYPE_FILE
- && (treeWalk.getTreeCount() == 1 || !treeWalk.idEqual(0, 1))) {
- ObjectId blobId = treeWalk.getObjectId(0);
- String blobPath = treeWalk.getPathString();
- String blobName = treeWalk.getNameString();
-
- BooleanQuery.Builder builder = new BooleanQuery.Builder();
- builder.add(BLOB_HASH.query(blobId.name()), Occur.MUST);
- builder.add(BLOB_PATH.query(blobPath), Occur.MUST);
- BooleanQuery query = builder.build();
-
- final AtomicReference<String> blobIndexVersionRef = new AtomicReference<>(null);
- if (searcher != null) {
- searcher.search(query, new SimpleCollector() {
-
- private LeafReaderContext context;
-
- @Override
- public void collect(int doc) throws IOException {
- blobIndexVersionRef.set(searcher.doc(context.docBase+doc).get(BLOB_INDEX_VERSION.name()));
- }
-
- @Override
- protected void doSetNextReader(LeafReaderContext context) throws IOException {
- this.context = context;
- }
-
- @Override
- public boolean needsScores() {
- return false;
- }
-
- });
- checked++;
- }
-
- SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);
- String currentBlobIndexVersion = getIndexVersion(extractor);
- String blobIndexVersion = blobIndexVersionRef.get();
- if (blobIndexVersion != null) {
- if (!blobIndexVersion.equals(currentBlobIndexVersion)) {
- writer.deleteDocuments(query);
- indexBlob(writer, repository, extractor, blobId, blobPath);
- indexed++;
- }
- } else {
- indexBlob(writer, repository, extractor, blobId, blobPath);
- indexed++;
- }
- }
- }
-
- // record current commit so that we know which commit has been indexed
- Document document = new Document();
- document.add(new StringField(COMMIT_HASH.name(), commitId.getName(), Store.NO));
- document.add(new StoredField(COMMIT_INDEX_VERSION.name(), getIndexVersion()));
- writer.updateDocument(COMMIT_HASH.term(commitId.getName()), document);
-
- // record last commit so that we only need to indexing changed files for subsequent commits
- document = new Document();
- document.add(new StringField(META.name(), LAST_COMMIT.name(), Store.NO));
- document.add(new StoredField(LAST_COMMIT_INDEX_VERSION.name(), getIndexVersion()));
- document.add(new StoredField(LAST_COMMIT_HASH.name(), commitId.getName()));
- writer.updateDocument(META.term(LAST_COMMIT.name()), document);
-
- return new IndexResult(checked, indexed);
- }
- }
-
- private void indexBlob(IndexWriter writer, Repository repository,
- SymbolExtractor<Symbol> extractor, ObjectId blobId, String blobPath) throws IOException {
- Document document = new Document();
-
- document.add(new StoredField(BLOB_INDEX_VERSION.name(), getIndexVersion(extractor)));
- document.add(new StringField(BLOB_HASH.name(), blobId.name(), Store.NO));
- document.add(new StringField(BLOB_PATH.name(), blobPath, Store.NO));
- document.add(new BinaryDocValuesField(BLOB_PATH.name(), new BytesRef(blobPath.getBytes(StandardCharsets.UTF_8))));
-
- String blobName = blobPath;
- if (blobPath.indexOf('/') != -1)
- blobName = StringUtils.substringAfterLast(blobPath, "/");
-
- document.add(new StringField(BLOB_NAME.name(), blobName.toLowerCase(), Store.NO));
-
- ObjectLoader objectLoader = repository.open(blobId);
- if (objectLoader.getSize() <= MAX_INDEXABLE_SIZE) {
- byte[] bytes = objectLoader.getCachedBytes();
- String content = ContentDetector.convertToText(bytes, blobName);
- if (content != null) {
- document.add(new TextField(BLOB_TEXT.name(), content, Store.NO));
-
- if (extractor != null) {
- List<Symbol> symbols = null;
- try {
- symbols = extractor.extract(blobName, StringUtils.removeBOM(content));
- } catch (Throwable e) {
- logger.trace("Can not extract symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);
- }
- if (symbols != null) {
- for (Symbol symbol: symbols) {
- String fieldValue = symbol.getName();
- if (fieldValue != null && symbol.isSearchable()) {
- fieldValue = fieldValue.toLowerCase();
-
- String fieldName;
- if (symbol.isPrimary())
- fieldName = BLOB_PRIMARY_SYMBOLS.name();
- else
- fieldName = BLOB_SECONDARY_SYMBOLS.name();
- document.add(new StringField(fieldName, fieldValue, Store.NO));
- }
- }
- byte[] bytesOfSymbols = SerializationUtils.serialize((Serializable) symbols);
- document.add(new StoredField(BLOB_SYMBOL_LIST.name(), bytesOfSymbols));
- }
- }
- } else {
- logger.debug("Ignore content of binary file '{}'.", blobPath);
- }
- } else {
- logger.debug("Ignore content of large file '{}'.", blobPath);
- }
-
- writer.addDocument(document);
- }
-
- private BatchWorker getBatchWorker(Long projectId, Long forkRootId) {
- return new BatchWorker("project-" + forkRootId + "-indexBlob", 1) {
-
- @Override
- public void doWorks(Collection<Prioritized> works) {
- sessionManager.run(new Runnable() {
-
- @Override
- public void run() {
- Preconditions.checkState(works.size() == 1);
-
- Project project = projectManager.load(projectId);
- Project forkRoot = project.getForkRoot();
-
- ObjectId commitId = ((IndexWork) works.iterator().next()).getCommitId();
-
- if (!forkRootId.equals(projectId) && !forkRoot.getRepository().hasObject(commitId))
- GitUtils.fetch(project.getRepository(), commitId, forkRoot.getRepository(), null);
- doIndex(forkRoot, commitId);
-
- listenerRegistry.post(new CommitIndexed(project, commitId.copy()));
- }
-
- });
- }
-
- };
- }
-
- private IndexResult doIndex(Project project, ObjectId commit, Directory directory, IndexSearcher searcher) {
- IndexWriterConfig writerConfig = new IndexWriterConfig(new NGramAnalyzer(NGRAM_SIZE, NGRAM_SIZE));
- writerConfig.setOpenMode(OpenMode.CREATE_OR_APPEND);
- try (IndexWriter writer = new IndexWriter(directory, writerConfig)) {
- try {
- logger.debug("Indexing commit (project: {}, commit: {})", project.getName(), commit.getName());
- IndexResult indexResult = index(project.getRepository(), commit, writer, searcher);
- writer.commit();
- return indexResult;
- } catch (Exception e) {
- writer.rollback();
- throw ExceptionUtils.unchecked(e);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private IndexResult doIndex(Project project, ObjectId commit) {
- try (Directory directory = FSDirectory.open(storageManager.getProjectIndexDir(project.getId()).toPath())) {
- if (DirectoryReader.indexExists(directory)) {
- try (IndexReader reader = DirectoryReader.open(directory)) {
- IndexSearcher searcher = new IndexSearcher(reader);
- if (getIndexVersion().equals(getCommitIndexVersion(searcher, commit)))
- return new IndexResult(0, 0);
- else
- return doIndex(project, commit, directory, searcher);
- }
- } else {
- return doIndex(project, commit, directory, null);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public String getIndexVersion() {
- return DigestUtils.md5Hex(DATA_VERSION + ";" + SymbolExtractorRegistry.getVersion());
- }
-
- @Override
- public String getIndexVersion(SymbolExtractor<Symbol> extractor) {
- String version;
- if (extractor != null)
- version = DATA_VERSION + ";" + extractor.getClass().getName() + ":" + extractor.getVersion();
- else
- version = String.valueOf(DATA_VERSION);
- return DigestUtils.md5Hex(version);
- }
-
- @Override
- public boolean isIndexed(Project project, ObjectId commit) {
- File indexDir = storageManager.getProjectIndexDir(project.getForkRoot().getId());
- try (Directory directory = FSDirectory.open(indexDir.toPath())) {
- if (DirectoryReader.indexExists(directory)) {
- try (IndexReader reader = DirectoryReader.open(directory)) {
- IndexSearcher searcher = new IndexSearcher(reader);
- return getIndexVersion().equals(getCommitIndexVersion(searcher, commit));
- }
- } else {
- return false;
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Sessional
- @Listen
- public void on(RefUpdated event) {
- // only index branches at back end, tags will be indexed on demand from GUI
- // as many tags might be pushed all at once when the repository is imported
- if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewCommitId().equals(ObjectId.zeroId())) {
- IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewCommitId());
- batchWorkManager.submit(getBatchWorker(event.getProject().getId(), event.getProject().getForkRoot().getId()), work);
- }
- }
-
- @Sessional
- @Listen
- public void on(SystemStarted event) {
- for (Project project: projectManager.query()) {
- File indexDir = storageManager.getProjectIndexDir(project.getId());
- if (indexDir.exists()) {
- try (Directory directory = FSDirectory.open(indexDir.toPath())) {
- if (DirectoryReader.indexExists(directory)) {
- try (IndexReader reader = DirectoryReader.open(directory)) {
- } catch (IndexFormatTooOldException e) {
- FileUtils.cleanDir(indexDir);
- }
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
- }
-
- @Sessional
- @Override
- public void indexAsync(Project project, ObjectId commit) {
- int priority;
- if (RequestCycle.get() != null)
- priority = UI_INDEXING_PRIORITY;
- else
- priority = BACKEND_INDEXING_PRIORITY;
- IndexWork work = new IndexWork(priority, commit);
- batchWorkManager.submit(getBatchWorker(project.getId(), project.getForkRoot().getId()), work);
- }
-
- private static class IndexWork extends Prioritized {
-
- private final ObjectId commitId;
-
- public IndexWork(int priority, ObjectId commitId) {
- super(priority);
- this.commitId = commitId;
- }
-
- public ObjectId getCommitId() {
- return commitId;
- }
-
- }
-
-}
+package io.onedev.server.search.code;
+
+import static io.onedev.server.search.code.FieldConstants.BLOB_HASH;
+import static io.onedev.server.search.code.FieldConstants.BLOB_INDEX_VERSION;
+import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;
+import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;
+import static io.onedev.server.search.code.FieldConstants.BLOB_PRIMARY_SYMBOLS;
+import static io.onedev.server.search.code.FieldConstants.BLOB_SECONDARY_SYMBOLS;
+import static io.onedev.server.search.code.FieldConstants.BLOB_SYMBOL_LIST;
+import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;
+import static io.onedev.server.search.code.FieldConstants.COMMIT_HASH;
+import static io.onedev.server.search.code.FieldConstants.COMMIT_INDEX_VERSION;
+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT;
+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_HASH;
+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_INDEX_VERSION;
+import static io.onedev.server.search.code.FieldConstants.META;
+import static io.onedev.server.search.code.IndexConstants.MAX_INDEXABLE_SIZE;
+import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang.SerializationUtils;
+import org.apache.lucene.document.BinaryDocValuesField;
+import org.apache.lucene.document.Document;
+import org.apache.lucene.document.Field.Store;
+import org.apache.lucene.document.StoredField;
+import org.apache.lucene.document.StringField;
+import org.apache.lucene.document.TextField;
+import org.apache.lucene.index.DirectoryReader;
+import org.apache.lucene.index.IndexFormatTooOldException;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.IndexWriterConfig;
+import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.LeafReaderContext;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.SimpleCollector;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.FSDirectory;
+import org.apache.lucene.util.BytesRef;
+import org.apache.wicket.request.cycle.RequestCycle;
+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.Repository;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.SymbolExtractor;
+import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
+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.FileUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.concurrent.Prioritized;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.ContentDetector;
+import io.onedev.server.util.IndexResult;
+import io.onedev.server.util.work.BatchWorkManager;
+import io.onedev.server.util.work.BatchWorker;
+
+@Singleton
+public class DefaultIndexManager implements IndexManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultIndexManager.class);
+
+ private static final int UI_INDEXING_PRIORITY = 10;
+
+ private static final int BACKEND_INDEXING_PRIORITY = 50;
+
+ private static final int DATA_VERSION = 5;
+
+ private final StorageManager storageManager;
+
+ private final BatchWorkManager batchWorkManager;
+
+ private final SessionManager sessionManager;
+
+ private final ProjectManager projectManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ @Inject
+ public DefaultIndexManager(ListenerRegistry listenerRegistry, StorageManager storageManager,
+ BatchWorkManager batchWorkManager, SessionManager sessionManager, ProjectManager projectManager) {
+ this.listenerRegistry = listenerRegistry;
+ this.storageManager = storageManager;
+ this.batchWorkManager = batchWorkManager;
+ this.sessionManager = sessionManager;
+ this.projectManager = projectManager;
+ }
+
+ private String getCommitIndexVersion(final IndexSearcher searcher, AnyObjectId commitId) throws IOException {
+ final AtomicReference<String> indexVersion = new AtomicReference<>(null);
+
+ searcher.search(COMMIT_HASH.query(commitId.getName()), new SimpleCollector() {
+
+ private int docBase;
+
+ @Override
+ public void collect(int doc) throws IOException {
+ indexVersion.set(searcher.doc(docBase+doc).get(COMMIT_INDEX_VERSION.name()));
+ }
+
+ @Override
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
+ docBase = context.docBase;
+ }
+
+ @Override
+ public boolean needsScores() {
+ return false;
+ }
+
+ });
+ return indexVersion.get();
+ }
+
+ private IndexResult index(Repository repository, AnyObjectId commitId,
+ IndexWriter writer, final IndexSearcher searcher) throws Exception {
+ try ( RevWalk revWalk = new RevWalk(repository);
+ TreeWalk treeWalk = new TreeWalk(repository)) {
+ treeWalk.addTree(revWalk.parseCommit(commitId).getTree());
+ treeWalk.setRecursive(true);
+
+ if (searcher != null) {
+ TopDocs topDocs = searcher.search(META.query(LAST_COMMIT.name()), 1);
+ if (topDocs.scoreDocs.length != 0) {
+ Document doc = searcher.doc(topDocs.scoreDocs[0].doc);
+ String lastCommitIndexVersion = doc.get(LAST_COMMIT_INDEX_VERSION.name());
+ if (lastCommitIndexVersion.equals(getIndexVersion())) {
+ String lastCommitHash = doc.get(LAST_COMMIT_HASH.name());
+ ObjectId lastCommitId = ObjectId.fromString(lastCommitHash);
+ if (repository.hasObject(lastCommitId)) {
+ treeWalk.addTree(revWalk.parseCommit(lastCommitId).getTree());
+ treeWalk.setFilter(TreeFilter.ANY_DIFF);
+ }
+ }
+ }
+ }
+
+ int indexed = 0;
+ int checked = 0;
+ while (treeWalk.next()) {
+ if ((treeWalk.getRawMode(0) & FileMode.TYPE_MASK) == FileMode.TYPE_FILE
+ && (treeWalk.getTreeCount() == 1 || !treeWalk.idEqual(0, 1))) {
+ ObjectId blobId = treeWalk.getObjectId(0);
+ String blobPath = treeWalk.getPathString();
+ String blobName = treeWalk.getNameString();
+
+ BooleanQuery.Builder builder = new BooleanQuery.Builder();
+ builder.add(BLOB_HASH.query(blobId.name()), Occur.MUST);
+ builder.add(BLOB_PATH.query(blobPath), Occur.MUST);
+ BooleanQuery query = builder.build();
+
+ final AtomicReference<String> blobIndexVersionRef = new AtomicReference<>(null);
+ if (searcher != null) {
+ searcher.search(query, new SimpleCollector() {
+
+ private LeafReaderContext context;
+
+ @Override
+ public void collect(int doc) throws IOException {
+ blobIndexVersionRef.set(searcher.doc(context.docBase+doc).get(BLOB_INDEX_VERSION.name()));
+ }
+
+ @Override
+ protected void doSetNextReader(LeafReaderContext context) throws IOException {
+ this.context = context;
+ }
+
+ @Override
+ public boolean needsScores() {
+ return false;
+ }
+
+ });
+ checked++;
+ }
+
+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);
+ String currentBlobIndexVersion = getIndexVersion(extractor);
+ String blobIndexVersion = blobIndexVersionRef.get();
+ if (blobIndexVersion != null) {
+ if (!blobIndexVersion.equals(currentBlobIndexVersion)) {
+ writer.deleteDocuments(query);
+ indexBlob(writer, repository, extractor, blobId, blobPath);
+ indexed++;
+ }
+ } else {
+ indexBlob(writer, repository, extractor, blobId, blobPath);
+ indexed++;
+ }
+ }
+ }
+
+ // record current commit so that we know which commit has been indexed
+ Document document = new Document();
+ document.add(new StringField(COMMIT_HASH.name(), commitId.getName(), Store.NO));
+ document.add(new StoredField(COMMIT_INDEX_VERSION.name(), getIndexVersion()));
+ writer.updateDocument(COMMIT_HASH.term(commitId.getName()), document);
+
+ // record last commit so that we only need to indexing changed files for subsequent commits
+ document = new Document();
+ document.add(new StringField(META.name(), LAST_COMMIT.name(), Store.NO));
+ document.add(new StoredField(LAST_COMMIT_INDEX_VERSION.name(), getIndexVersion()));
+ document.add(new StoredField(LAST_COMMIT_HASH.name(), commitId.getName()));
+ writer.updateDocument(META.term(LAST_COMMIT.name()), document);
+
+ return new IndexResult(checked, indexed);
+ }
+ }
+
+ private void indexBlob(IndexWriter writer, Repository repository,
+ SymbolExtractor<Symbol> extractor, ObjectId blobId, String blobPath) throws IOException {
+ Document document = new Document();
+
+ document.add(new StoredField(BLOB_INDEX_VERSION.name(), getIndexVersion(extractor)));
+ document.add(new StringField(BLOB_HASH.name(), blobId.name(), Store.NO));
+ document.add(new StringField(BLOB_PATH.name(), blobPath, Store.NO));
+ document.add(new BinaryDocValuesField(BLOB_PATH.name(), new BytesRef(blobPath.getBytes(StandardCharsets.UTF_8))));
+
+ String blobName = blobPath;
+ if (blobPath.indexOf('/') != -1)
+ blobName = StringUtils.substringAfterLast(blobPath, "/");
+
+ document.add(new StringField(BLOB_NAME.name(), blobName.toLowerCase(), Store.NO));
+
+ ObjectLoader objectLoader = repository.open(blobId);
+ if (objectLoader.getSize() <= MAX_INDEXABLE_SIZE) {
+ byte[] bytes = objectLoader.getCachedBytes();
+ String content = ContentDetector.convertToText(bytes, blobName);
+ if (content != null) {
+ document.add(new TextField(BLOB_TEXT.name(), content, Store.NO));
+
+ if (extractor != null) {
+ List<Symbol> symbols = null;
+ try {
+ symbols = extractor.extract(blobName, StringUtils.removeBOM(content));
+ } catch (Exception e) {
+ logger.trace("Can not extract symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);
+ }
+ if (symbols != null) {
+ for (Symbol symbol: symbols) {
+ String fieldValue = symbol.getName();
+ if (fieldValue != null && symbol.isSearchable()) {
+ fieldValue = fieldValue.toLowerCase();
+
+ String fieldName;
+ if (symbol.isPrimary())
+ fieldName = BLOB_PRIMARY_SYMBOLS.name();
+ else
+ fieldName = BLOB_SECONDARY_SYMBOLS.name();
+ document.add(new StringField(fieldName, fieldValue, Store.NO));
+ }
+ }
+ byte[] bytesOfSymbols = SerializationUtils.serialize((Serializable) symbols);
+ document.add(new StoredField(BLOB_SYMBOL_LIST.name(), bytesOfSymbols));
+ }
+ }
+ } else {
+ logger.debug("Ignore content of binary file '{}'.", blobPath);
+ }
+ } else {
+ logger.debug("Ignore content of large file '{}'.", blobPath);
+ }
+
+ writer.addDocument(document);
+ }
+
+ private BatchWorker getBatchWorker(Long projectId, Long forkRootId) {
+ return new BatchWorker("project-" + forkRootId + "-indexBlob", 1) {
+
+ @Override
+ public void doWorks(Collection<Prioritized> works) {
+ sessionManager.run(new Runnable() {
+
+ @Override
+ public void run() {
+ Preconditions.checkState(works.size() == 1);
+
+ Project project = projectManager.load(projectId);
+ Project forkRoot = project.getForkRoot();
+
+ ObjectId commitId = ((IndexWork) works.iterator().next()).getCommitId();
+
+ if (!forkRootId.equals(projectId) && !forkRoot.getRepository().hasObject(commitId))
+ GitUtils.fetch(project.getRepository(), commitId, forkRoot.getRepository(), null);
+ doIndex(forkRoot, commitId);
+
+ listenerRegistry.post(new CommitIndexed(project, commitId.copy()));
+ }
+
+ });
+ }
+
+ };
+ }
+
+ private IndexResult doIndex(Project project, ObjectId commit, Directory directory, IndexSearcher searcher) {
+ IndexWriterConfig writerConfig = new IndexWriterConfig(new NGramAnalyzer(NGRAM_SIZE, NGRAM_SIZE));
+ writerConfig.setOpenMode(OpenMode.CREATE_OR_APPEND);
+ try (IndexWriter writer = new IndexWriter(directory, writerConfig)) {
+ try {
+ logger.debug("Indexing commit (project: {}, commit: {})", project.getName(), commit.getName());
+ IndexResult indexResult = index(project.getRepository(), commit, writer, searcher);
+ writer.commit();
+ return indexResult;
+ } catch (Exception e) {
+ writer.rollback();
+ throw ExceptionUtils.unchecked(e);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private IndexResult doIndex(Project project, ObjectId commit) {
+ try (Directory directory = FSDirectory.open(storageManager.getProjectIndexDir(project.getId()).toPath())) {
+ if (DirectoryReader.indexExists(directory)) {
+ try (IndexReader reader = DirectoryReader.open(directory)) {
+ IndexSearcher searcher = new IndexSearcher(reader);
+ if (getIndexVersion().equals(getCommitIndexVersion(searcher, commit)))
+ return new IndexResult(0, 0);
+ else
+ return doIndex(project, commit, directory, searcher);
+ }
+ } else {
+ return doIndex(project, commit, directory, null);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public String getIndexVersion() {
+ return DigestUtils.md5Hex(DATA_VERSION + ";" + SymbolExtractorRegistry.getVersion());
+ }
+
+ @Override
+ public String getIndexVersion(SymbolExtractor<Symbol> extractor) {
+ String version;
+ if (extractor != null)
+ version = DATA_VERSION + ";" + extractor.getClass().getName() + ":" + extractor.getVersion();
+ else
+ version = String.valueOf(DATA_VERSION);
+ return DigestUtils.md5Hex(version);
+ }
+
+ @Override
+ public boolean isIndexed(Project project, ObjectId commit) {
+ File indexDir = storageManager.getProjectIndexDir(project.getForkRoot().getId());
+ try (Directory directory = FSDirectory.open(indexDir.toPath())) {
+ if (DirectoryReader.indexExists(directory)) {
+ try (IndexReader reader = DirectoryReader.open(directory)) {
+ IndexSearcher searcher = new IndexSearcher(reader);
+ return getIndexVersion().equals(getCommitIndexVersion(searcher, commit));
+ }
+ } else {
+ return false;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Sessional
+ @Listen
+ public void on(RefUpdated event) {
+ // only index branches at back end, tags will be indexed on demand from GUI
+ // as many tags might be pushed all at once when the repository is imported
+ if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewCommitId().equals(ObjectId.zeroId())) {
+ IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewCommitId());
+ batchWorkManager.submit(getBatchWorker(event.getProject().getId(), event.getProject().getForkRoot().getId()), work);
+ }
+ }
+
+ @Sessional
+ @Listen
+ public void on(SystemStarted event) {
+ for (Project project: projectManager.query()) {
+ File indexDir = storageManager.getProjectIndexDir(project.getId());
+ if (indexDir.exists()) {
+ try (Directory directory = FSDirectory.open(indexDir.toPath())) {
+ if (DirectoryReader.indexExists(directory)) {
+ try (IndexReader reader = DirectoryReader.open(directory)) {
+ } catch (IndexFormatTooOldException e) {
+ FileUtils.cleanDir(indexDir);
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+ }
+
+ @Sessional
+ @Override
+ public void indexAsync(Project project, ObjectId commit) {
+ int priority;
+ if (RequestCycle.get() != null)
+ priority = UI_INDEXING_PRIORITY;
+ else
+ priority = BACKEND_INDEXING_PRIORITY;
+ IndexWork work = new IndexWork(priority, commit);
+ batchWorkManager.submit(getBatchWorker(project.getId(), project.getForkRoot().getId()), work);
+ }
+
+ private static class IndexWork extends Prioritized {
+
+ private final ObjectId commitId;
+
+ public IndexWork(int priority, ObjectId commitId) {
+ super(priority);
+ this.commitId = commitId;
+ }
+
+ public ObjectId getCommitId() {
+ return commitId;
+ }
+
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
index ad228d9582..3f95b1a853 100644
--- a/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
+++ b/core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java
@@ -1,250 +1,250 @@
-package io.onedev.server.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.authc.credential.PasswordMatcher;
-import org.apache.shiro.authc.credential.PasswordService;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.authz.Permission;
-import org.apache.shiro.realm.AuthorizingRealm;
-import org.apache.shiro.subject.PrincipalCollection;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.cache.CacheManager;
-import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.MembershipManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.Membership;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.authenticator.Authenticated;
-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.security.permission.CreateProjects;
-import io.onedev.server.security.permission.ProjectPermission;
-import io.onedev.server.security.permission.SystemAdministration;
-import io.onedev.server.security.permission.UserAdministration;
-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;
-
-@Singleton
-public class OneAuthorizingRealm extends AuthorizingRealm {
-
- private static final Logger logger = LoggerFactory.getLogger(OneAuthorizingRealm.class);
-
- private final UserManager userManager;
-
- private final CacheManager cacheManager;
-
- private final SettingManager configManager;
-
- private final MembershipManager membershipManager;
-
- private final GroupManager groupManager;
-
- @Inject
- public OneAuthorizingRealm(UserManager userManager, CacheManager cacheManager, SettingManager configManager,
- MembershipManager membershipManager, GroupManager groupManager) {
- PasswordMatcher passwordMatcher = new PasswordMatcher();
- passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));
- setCredentialsMatcher(passwordMatcher);
-
- this.userManager = userManager;
- this.cacheManager = cacheManager;
- this.configManager = configManager;
- this.membershipManager = membershipManager;
- this.groupManager = groupManager;
- }
-
- private Collection<Permission> getDefaultPermissions() {
- Collection<Permission> defaultPermissions = new ArrayList<>();
- for (ProjectFacade project: cacheManager.getProjects().values()) {
- if (project.getDefaultPrivilege() != null)
- defaultPermissions.add(new ProjectPermission(project, project.getDefaultPrivilege().getProjectPrivilege()));
- }
- return defaultPermissions;
- }
-
- @Sessional
- protected Collection<Permission> getObjectPermissionsInSession(Long userId) {
- Collection<Permission> permissions = new ArrayList<>();
-
- UserFacade user = null;
- if (userId != 0L)
- user = cacheManager.getUser(userId);
- if (user != null) {
- permissions.addAll(getDefaultPermissions());
- if (user.isRoot())
- permissions.add(new SystemAdministration());
- permissions.add(new UserAdministration(user));
- for (MembershipFacade membership: cacheManager.getMemberships().values()) {
- if (membership.getUserId().equals(userId)) {
- GroupFacade group = cacheManager.getGroup(membership.getGroupId());
- if (group.isAdministrator())
- permissions.add(new SystemAdministration());
- if (group.isCanCreateProjects())
- permissions.add(new CreateProjects());
- for (GroupAuthorizationFacade authorization:
- cacheManager.getGroupAuthorizations().values()) {
- if (authorization.getGroupId().equals(group.getId())) {
- permissions.add(new ProjectPermission(
- cacheManager.getProject(authorization.getProjectId()),
- authorization.getPrivilege()));
- }
- }
- }
- }
- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {
- if (authorization.getUserId().equals(userId)) {
- permissions.add(new ProjectPermission(
- cacheManager.getProject(authorization.getProjectId()),
- authorization.getPrivilege()));
- }
- }
- } else if (configManager.getSecuritySetting().isEnableAnonymousAccess()) {
- permissions.addAll(getDefaultPermissions());
- }
- return permissions;
- }
-
- @Override
- protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
- return new AuthorizationInfo() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Collection<String> getStringPermissions() {
- return new HashSet<>();
- }
-
- @Override
- public Collection<String> getRoles() {
- return new HashSet<>();
- }
-
- @Override
- public Collection<Permission> getObjectPermissions() {
- return getObjectPermissionsInSession((Long) principals.getPrimaryPrincipal());
- }
- };
- }
-
- @Transactional
- protected AuthenticationInfo doGetAuthenticationInfoInTransaction(AuthenticationToken token)
- throws AuthenticationException {
- User user = userManager.findByName(((UsernamePasswordToken) token).getUsername());
- if (user != null && user.isRoot())
- return user;
-
- if (user == null || StringUtils.isBlank(user.getPassword())) {
- Authenticator authenticator = configManager.getAuthenticator();
- if (authenticator != null) {
- Authenticated authenticated;
- try {
- authenticated = authenticator.authenticate((UsernamePasswordToken) token);
- } catch (Throwable e) {
- if (e instanceof AuthenticationException) {
- logger.debug("Authentication not passed", e);
- throw ExceptionUtils.unchecked(e);
- } else {
- logger.error("Error authenticating user", e);
- throw new AuthenticationException("Error authenticating user", e);
- }
- }
- if (user != null) {
- if (authenticated.getEmail() != null)
- user.setEmail(authenticated.getEmail());
- if (authenticated.getFullName() != null)
- user.setFullName(authenticated.getFullName());
-
- Collection<String> existingGroupNames = new HashSet<>();
- for (Membership membership: user.getMemberships())
- existingGroupNames.add(membership.getGroup().getName());
- if (!authenticated.getGroupNames().isEmpty()) {
- Collection<String> retrievedGroupNames = new HashSet<>();
- for (String groupName: authenticated.getGroupNames()) {
- Group group = groupManager.find(groupName);
- if (group != null) {
- if (!existingGroupNames.contains(groupName)) {
- Membership membership = new Membership();
- membership.setGroup(group);
- membership.setUser(user);
- membershipManager.save(membership);
- user.getMemberships().add(membership);
- existingGroupNames.add(groupName);
- }
- retrievedGroupNames.add(groupName);
- } else {
- logger.debug("Group '{}' from external authenticator is not defined", groupName);
- }
- }
- for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {
- Membership membership = it.next();
- if (!retrievedGroupNames.contains(membership.getGroup().getName())) {
- it.remove();
- membershipManager.delete(membership);
- }
- }
- }
- userManager.save(user);
- } else {
- user = new User();
- user.setName(((UsernamePasswordToken) token).getUsername());
- user.setPassword("");
- if (authenticated.getEmail() != null)
- user.setEmail(authenticated.getEmail());
- if (authenticated.getFullName() != null)
- user.setFullName(authenticated.getFullName());
- userManager.save(user);
- if (authenticated.getGroupNames().isEmpty()) {
- for (String groupName: authenticator.getDefaultGroupNames()) {
- Group group = groupManager.find(groupName);
- if (group != null) {
- Membership membership = new Membership();
- membership.setGroup(group);
- membership.setUser(user);
- user.getMemberships().add(membership);
- membershipManager.save(membership);
- } else {
- logger.warn("Default group '{}' of external authenticator is not defined", groupName);
- }
- }
- }
- }
- } else {
- user = null;
- }
- }
-
- return user;
- }
-
- @Override
- protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)
- throws AuthenticationException {
- // transaction annotation can not be applied to final method, so we relay to another method
- return doGetAuthenticationInfoInTransaction(token);
- }
-
-}
+package io.onedev.server.security;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.AuthenticationInfo;
+import org.apache.shiro.authc.AuthenticationToken;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.authc.credential.PasswordMatcher;
+import org.apache.shiro.authc.credential.PasswordService;
+import org.apache.shiro.authz.AuthorizationInfo;
+import org.apache.shiro.authz.Permission;
+import org.apache.shiro.realm.AuthorizingRealm;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.cache.CacheManager;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.entitymanager.MembershipManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Group;
+import io.onedev.server.model.Membership;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.authenticator.Authenticated;
+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.security.permission.CreateProjects;
+import io.onedev.server.security.permission.ProjectPermission;
+import io.onedev.server.security.permission.SystemAdministration;
+import io.onedev.server.security.permission.UserAdministration;
+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;
+
+@Singleton
+public class OneAuthorizingRealm extends AuthorizingRealm {
+
+ private static final Logger logger = LoggerFactory.getLogger(OneAuthorizingRealm.class);
+
+ private final UserManager userManager;
+
+ private final CacheManager cacheManager;
+
+ private final SettingManager configManager;
+
+ private final MembershipManager membershipManager;
+
+ private final GroupManager groupManager;
+
+ @Inject
+ public OneAuthorizingRealm(UserManager userManager, CacheManager cacheManager, SettingManager configManager,
+ MembershipManager membershipManager, GroupManager groupManager) {
+ PasswordMatcher passwordMatcher = new PasswordMatcher();
+ passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class));
+ setCredentialsMatcher(passwordMatcher);
+
+ this.userManager = userManager;
+ this.cacheManager = cacheManager;
+ this.configManager = configManager;
+ this.membershipManager = membershipManager;
+ this.groupManager = groupManager;
+ }
+
+ private Collection<Permission> getDefaultPermissions() {
+ Collection<Permission> defaultPermissions = new ArrayList<>();
+ for (ProjectFacade project: cacheManager.getProjects().values()) {
+ if (project.getDefaultPrivilege() != null)
+ defaultPermissions.add(new ProjectPermission(project, project.getDefaultPrivilege().getProjectPrivilege()));
+ }
+ return defaultPermissions;
+ }
+
+ @Sessional
+ protected Collection<Permission> getObjectPermissionsInSession(Long userId) {
+ Collection<Permission> permissions = new ArrayList<>();
+
+ UserFacade user = null;
+ if (userId != 0L)
+ user = cacheManager.getUser(userId);
+ if (user != null) {
+ permissions.addAll(getDefaultPermissions());
+ if (user.isRoot())
+ permissions.add(new SystemAdministration());
+ permissions.add(new UserAdministration(user));
+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {
+ if (membership.getUserId().equals(userId)) {
+ GroupFacade group = cacheManager.getGroup(membership.getGroupId());
+ if (group.isAdministrator())
+ permissions.add(new SystemAdministration());
+ if (group.isCanCreateProjects())
+ permissions.add(new CreateProjects());
+ for (GroupAuthorizationFacade authorization:
+ cacheManager.getGroupAuthorizations().values()) {
+ if (authorization.getGroupId().equals(group.getId())) {
+ permissions.add(new ProjectPermission(
+ cacheManager.getProject(authorization.getProjectId()),
+ authorization.getPrivilege()));
+ }
+ }
+ }
+ }
+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {
+ if (authorization.getUserId().equals(userId)) {
+ permissions.add(new ProjectPermission(
+ cacheManager.getProject(authorization.getProjectId()),
+ authorization.getPrivilege()));
+ }
+ }
+ } else if (configManager.getSecuritySetting().isEnableAnonymousAccess()) {
+ permissions.addAll(getDefaultPermissions());
+ }
+ return permissions;
+ }
+
+ @Override
+ protected AuthorizationInfo doGetAuthorizationInfo(PrincipalCollection principals) {
+ return new AuthorizationInfo() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Collection<String> getStringPermissions() {
+ return new HashSet<>();
+ }
+
+ @Override
+ public Collection<String> getRoles() {
+ return new HashSet<>();
+ }
+
+ @Override
+ public Collection<Permission> getObjectPermissions() {
+ return getObjectPermissionsInSession((Long) principals.getPrimaryPrincipal());
+ }
+ };
+ }
+
+ @Transactional
+ protected AuthenticationInfo doGetAuthenticationInfoInTransaction(AuthenticationToken token)
+ throws AuthenticationException {
+ User user = userManager.findByName(((UsernamePasswordToken) token).getUsername());
+ if (user != null && user.isRoot())
+ return user;
+
+ if (user == null || StringUtils.isBlank(user.getPassword())) {
+ Authenticator authenticator = configManager.getAuthenticator();
+ if (authenticator != null) {
+ Authenticated authenticated;
+ try {
+ authenticated = authenticator.authenticate((UsernamePasswordToken) token);
+ } catch (Exception e) {
+ if (e instanceof AuthenticationException) {
+ logger.debug("Authentication not passed", e);
+ throw ExceptionUtils.unchecked(e);
+ } else {
+ logger.error("Error authenticating user", e);
+ throw new AuthenticationException("Error authenticating user", e);
+ }
+ }
+ if (user != null) {
+ if (authenticated.getEmail() != null)
+ user.setEmail(authenticated.getEmail());
+ if (authenticated.getFullName() != null)
+ user.setFullName(authenticated.getFullName());
+
+ Collection<String> existingGroupNames = new HashSet<>();
+ for (Membership membership: user.getMemberships())
+ existingGroupNames.add(membership.getGroup().getName());
+ if (!authenticated.getGroupNames().isEmpty()) {
+ Collection<String> retrievedGroupNames = new HashSet<>();
+ for (String groupName: authenticated.getGroupNames()) {
+ Group group = groupManager.find(groupName);
+ if (group != null) {
+ if (!existingGroupNames.contains(groupName)) {
+ Membership membership = new Membership();
+ membership.setGroup(group);
+ membership.setUser(user);
+ membershipManager.save(membership);
+ user.getMemberships().add(membership);
+ existingGroupNames.add(groupName);
+ }
+ retrievedGroupNames.add(groupName);
+ } else {
+ logger.debug("Group '{}' from external authenticator is not defined", groupName);
+ }
+ }
+ for (Iterator<Membership> it = user.getMemberships().iterator(); it.hasNext();) {
+ Membership membership = it.next();
+ if (!retrievedGroupNames.contains(membership.getGroup().getName())) {
+ it.remove();
+ membershipManager.delete(membership);
+ }
+ }
+ }
+ userManager.save(user);
+ } else {
+ user = new User();
+ user.setName(((UsernamePasswordToken) token).getUsername());
+ user.setPassword("");
+ if (authenticated.getEmail() != null)
+ user.setEmail(authenticated.getEmail());
+ if (authenticated.getFullName() != null)
+ user.setFullName(authenticated.getFullName());
+ userManager.save(user);
+ if (authenticated.getGroupNames().isEmpty()) {
+ for (String groupName: authenticator.getDefaultGroupNames()) {
+ Group group = groupManager.find(groupName);
+ if (group != null) {
+ Membership membership = new Membership();
+ membership.setGroup(group);
+ membership.setUser(user);
+ user.getMemberships().add(membership);
+ membershipManager.save(membership);
+ } else {
+ logger.warn("Default group '{}' of external authenticator is not defined", groupName);
+ }
+ }
+ }
+ }
+ } else {
+ user = null;
+ }
+ }
+
+ return user;
+ }
+
+ @Override
+ protected final AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken token)
+ throws AuthenticationException {
+ // transaction annotation can not be applied to final method, so we relay to another method
+ return doGetAuthenticationInfoInTransaction(token);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/validation/ExecutorNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/ExecutorNameValidator.java
new file mode 100644
index 0000000000..5f6c251b47
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/ExecutorNameValidator.java
@@ -0,0 +1,37 @@
+package io.onedev.server.util.validation;
+
+import java.util.regex.Pattern;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.server.util.validation.annotation.ExecutorName;
+
+public class ExecutorNameValidator implements ConstraintValidator<ExecutorName, String> {
+
+ private static final Pattern PATTERN = Pattern.compile("[\\w-\\s\\.]+");
+
+ @Override
+ public void initialize(ExecutorName constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else if (!PATTERN.matcher(value).matches()) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = "Only alphanumeric, underscore, dash, dot, and space are accepted";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ } else if (value.equals("new")) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = "'new' is reserved and can not be used as executor name";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/validation/PathValidator.java b/core/src/main/java/io/onedev/server/util/validation/PathValidator.java
new file mode 100644
index 0000000000..c061997111
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/PathValidator.java
@@ -0,0 +1,30 @@
+package io.onedev.server.util.validation;
+
+import java.nio.file.Paths;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.server.util.validation.annotation.Path;
+
+public class PathValidator implements ConstraintValidator<Path, String> {
+
+ @Override
+ public void initialize(Path constaintAnnotation) {
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null)
+ return true;
+
+ try {
+ Paths.get(value);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ constraintContext.buildConstraintViolationWithTemplate(e.getMessage()).addConstraintViolation();
+ return false;
+ }
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/util/validation/annotation/ExecutorName.java b/core/src/main/java/io/onedev/server/util/validation/annotation/ExecutorName.java
new file mode 100644
index 0000000000..543a33b7a4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/annotation/ExecutorName.java
@@ -0,0 +1,23 @@
+package io.onedev.server.util.validation.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.ExecutorNameValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=ExecutorNameValidator.class)
+public @interface ExecutorName {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/core/src/main/java/io/onedev/server/util/validation/annotation/Path.java b/core/src/main/java/io/onedev/server/util/validation/annotation/Path.java
new file mode 100644
index 0000000000..e2ddf07858
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/validation/annotation/Path.java
@@ -0,0 +1,26 @@
+package io.onedev.server.util.validation.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.PathValidator;
+
+/**
+ * @author robin
+ */
+@Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=PathValidator.class)
+public @interface Path {
+
+ String message() default "Invalid path";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 7682e9c19d..8f52dbb801 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -22,7 +22,7 @@ import io.onedev.server.web.page.admin.issuesetting.DefaultQueryListPage;
import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;
import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;
-import io.onedev.server.web.page.admin.jobexecutors.JobExecutorPage;
+import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
index 816f18b5c9..3f0f06e783 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -1,1252 +1,1251 @@
-package io.onedev.server.web.component.diff.blob.text;
-
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-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.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.unbescape.html.HtmlEscape;
-import org.unbescape.javascript.JavaScriptEscape;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.onedev.commons.jsyntax.TextToken;
-import io.onedev.commons.jsyntax.TokenUtils;
-import io.onedev.commons.jsyntax.Tokenized;
-import io.onedev.commons.utils.Range;
-import io.onedev.commons.utils.RangeUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.git.BlameBlock;
-import io.onedev.server.git.BlameCommit;
-import io.onedev.server.git.BlobChange;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.command.BlameCommand;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.support.MarkPos;
-import io.onedev.server.model.support.TextRange;
-import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.diff.DiffBlock;
-import io.onedev.server.util.diff.DiffUtils;
-import io.onedev.server.util.diff.LineDiff;
-import io.onedev.server.util.diff.DiffMatchPatch.Operation;
-import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
-import io.onedev.server.web.component.diff.blob.SourceAware;
-import io.onedev.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type;
-import io.onedev.server.web.component.diff.diffstat.DiffStatBar;
-import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;
-import io.onedev.server.web.component.diff.revision.BlobCommentSupport;
-import io.onedev.server.web.component.diff.revision.DiffViewMode;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
-import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
-
-import com.google.common.base.Preconditions;
-
-@SuppressWarnings("serial")
-public class TextDiffPanel extends Panel implements SourceAware {
-
- private final IModel<Project> projectModel;
-
- private final IModel<PullRequest> requestModel;
-
- private final BlobChange change;
-
- private final Map<Integer, Integer> contextSizes = new HashMap<>();
-
- private final DiffViewMode diffMode;
-
- private final IModel<Boolean> blameModel;
-
- private final BlobCommentSupport commentSupport;
-
- private final List<MarkPos> initialMarks;
-
- private Component symbolTooltip;
-
- private AbstractPostAjaxBehavior callbackBehavior;
-
- private BlameMessageBehavior blameMessageBehavior;
-
- private transient List<MarkAwareDiffBlock> diffBlocks;
-
- private BlameInfo blameInfo;
-
- public TextDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,
- BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,
- @Nullable BlobCommentSupport commentSupport) {
- super(id);
-
- this.projectModel = projectModel;
- this.requestModel = requestModel;
- this.change = change;
- this.diffMode = diffMode;
- this.commentSupport = commentSupport;
- this.blameModel = blameModel;
-
- if (blameModel != null && blameModel.getObject()) {
- blameInfo = getBlameInfo();
- }
-
- initialMarks = new ArrayList<>();
- if (commentSupport != null) {
- MarkPos mark = commentSupport.getMark();
- if (mark != null) {
- initialMarks.add(mark);
- }
- for (CodeComment comment: commentSupport.getComments()) {
- mark = comment.getMarkPos();
- initialMarks.add(mark);
- }
- }
- }
-
- private String getJson(MarkPos mark) {
- try {
- MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());
- return OneDev.getInstance(ObjectMapper.class).writeValueAsString(markInfo);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
- private BlameInfo getBlameInfo() {
- blameInfo = new BlameInfo();
- BlameCommand cmd = new BlameCommand(projectModel.getObject().getGitDir());
- String oldPath = change.getOldBlobIdent().path;
- if (oldPath != null) {
- cmd.commitHash(getOldCommit().name()).file(oldPath);
- for (BlameBlock blame: cmd.call()) {
- for (Range range: blame.getRanges()) {
- for (int i=range.getFrom(); i<=range.getTo(); i++)
- blameInfo.oldBlame.put(i, blame.getCommit());
- }
- }
- }
- String newPath = change.getNewBlobIdent().path;
- if (newPath != null) {
- cmd.commitHash(getNewCommit().name()).file(newPath);
- for (BlameBlock blame: cmd.call()) {
- for (Range range: blame.getRanges()) {
- for (int i=range.getFrom(); i<=range.getTo(); i++)
- blameInfo.newBlame.put(i, blame.getCommit());
- }
- }
- }
- return blameInfo;
- }
-
- private WebMarkupContainer newActions() {
- WebMarkupContainer actions = new WebMarkupContainer("actions");
-
- actions.add(new AjaxLink<Void>("blameFile") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(blameModel != null);
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- if (blameInfo != null) {
- blameInfo = null;
- } else {
- blameInfo = getBlameInfo();
- }
- target.add(TextDiffPanel.this);
- blameModel.setObject(blameInfo != null);
- }
-
- }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return blameInfo!=null? "active": "";
- }
-
- })).setOutputMarkupId(true));
-
- Project project = projectModel.getObject();
- PullRequest request = requestModel.getObject();
- ProjectBlobPage.State viewState = new ProjectBlobPage.State(change.getBlobIdent());
-
- viewState.requestId = PullRequest.idOf(request);
- PageParameters params = ProjectBlobPage.paramsOf(project, viewState);
- actions.add(new ViewStateAwarePageLink<Void>("viewFile", ProjectBlobPage.class, params));
-
- if (change.getType() != ChangeType.DELETE) {
- if (request != null
- && request.getSource() != null
- && request.getSource().getObjectName(false) != null
- && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), change.getPath())
- && (getPage() instanceof PullRequestChangesPage || getPage() instanceof MergePreviewPage)) {
- // we are in context of a pull request and pull request source branch exists, so we edit in source branch instead
- Link<Void> editLink = new Link<Void>("editFile") {
-
- @Override
- public void onClick() {
- BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), change.getPath(),
- FileMode.REGULAR_FILE.getBits());
- ProjectBlobPage.State editState = new ProjectBlobPage.State(blobIdent);
- editState.requestId = request.getId();
- editState.mode = Mode.EDIT;
- PageParameters params = ProjectBlobPage.paramsOf(request.getSourceProject(), editState);
- setResponsePage(ProjectBlobPage.class, params);
- }
-
- };
- editLink.add(AttributeAppender.append("title", "Edit on source branch"));
- actions.add(editLink);
- } else if (SecurityUtils.canModify(project, change.getBlobIdent().revision, change.getPath())
- && project.getBranchRef(change.getBlobIdent().revision) != null) {
- // we are on a branch
- Link<Void> editLink = new Link<Void>("editFile") {
-
- @Override
- public void onClick() {
- ProjectBlobPage.State editState = new ProjectBlobPage.State(change.getBlobIdent());
- editState.mode = Mode.EDIT;
- PageParameters params = ProjectBlobPage.paramsOf(project, editState);
- setResponsePage(ProjectBlobPage.class, params);
- }
-
- };
- editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));
- actions.add(editLink);
- } else {
- actions.add(new WebMarkupContainer("editFile").setVisible(false));
- }
- } else {
- actions.add(new WebMarkupContainer("editFile").setVisible(false));
- }
-
- return actions;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new DiffStatBar("diffStat", change.getAdditions(), change.getDeletions(), true));
- add(new BlobDiffTitle("title", change));
-
- add(newActions());
-
- add(new Label("diffLines", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- return renderDiffs();
- }
-
- }).setEscapeModelStrings(false));
-
- add(callbackBehavior = new AbstractPostAjaxBehavior() {
-
- private String getMarkedText(MarkPos mark) {
- List<String> lines;
- if (mark.getCommit().equals(getOldCommit().name()))
- lines = change.getOldText().getLines();
- else
- lines = change.getNewText().getLines();
- StringBuilder builder = new StringBuilder();
- if (mark.getRange().getBeginLine() != mark.getRange().getEndLine()) {
- String line = lines.get(mark.getRange().getBeginLine());
- int beginChar = mark.getRange().getBeginChar();
- if (beginChar < line.length())
- builder.append(line.substring(beginChar));
- for (int i=mark.getRange().getBeginLine()+1; i<mark.getRange().getEndLine(); i++) {
- if (builder.length() != 0)
- builder.append("\n");
- builder.append(lines.get(i));
- }
- line = lines.get(mark.getRange().getEndLine());
- int endChar = mark.getRange().getEndChar();
- if (endChar > 0) {
- if (endChar > line.length())
- endChar = line.length();
- if (builder.length() != 0)
- builder.append("\n");
- builder.append(line.substring(0, endChar));
- }
- } else {
- String line = lines.get(mark.getRange().getBeginLine());
- int beginChar = mark.getRange().getBeginChar();
- int endChar = mark.getRange().getEndChar();
- if (beginChar < line.length() && endChar > 0) {
- if (endChar > line.length())
- endChar = line.length();
- builder.append(line.substring(beginChar, endChar));
- }
- }
-
- return builder.toString();
- }
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- switch (params.getParameterValue("action").toString()) {
- case "expand":
- if (blameInfo != null) {
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- }
- int index = params.getParameterValue("param1").toInt();
- Integer lastContextSize = contextSizes.get(index);
- if (lastContextSize == null)
- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
- int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;
- contextSizes.put(index, contextSize);
-
- StringBuilder builder = new StringBuilder();
- appendEquals(builder, index, lastContextSize, contextSize);
-
- String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");
- expanded = StringUtils.replace(expanded, "\n", "");
- String script = String.format("onedev.server.textDiff.expand('%s', %d, \"%s\");",
- getMarkupId(), index, expanded);
- target.appendJavaScript(script);
- break;
- case "openSelectionPopover":
- String jsonOfPosition = String.format("{left: %d, top: %d}",
- params.getParameterValue("param1").toInt(),
- params.getParameterValue("param2").toInt());
- MarkPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");
- script = String.format("onedev.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s);",
- getMarkupId(), jsonOfPosition, getJson(mark), commentSupport.getMarkUrl(mark),
- JavaScriptEscape.escapeJavaScript(getMarkedText(mark)),
- SecurityUtils.getUser()!=null);
- target.appendJavaScript(script);
- break;
- case "addComment":
- Preconditions.checkNotNull(SecurityUtils.getUser());
-
- mark = getMark(params, "param1", "param2", "param3", "param4", "param5");
- commentSupport.onAddComment(target, mark);
- script = String.format("onedev.server.textDiff.onAddComment($('#%s'), %s);",
- getMarkupId(), getJson(mark));
- target.appendJavaScript(script);
- break;
- case "toggleComment":
- Long commentId = params.getParameterValue("param1").toLong();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
- CodeComment prevComment = commentSupport.getOpenComment();
- commentSupport.onToggleComment(target, comment);
- if (!comment.equals(prevComment)) {
- script = String.format("onedev.server.textDiff.onOpenComment($('#%s'), %s);",
- getMarkupId(), getJsonOfComment(comment));
- target.appendJavaScript(script);
- } else {
- onCommentClosed(target, comment);
- }
- break;
- }
- }
-
- });
-
- add(blameMessageBehavior = new BlameMessageBehavior() {
-
- @Override
- protected Project getProject() {
- return projectModel.getObject();
- }
- });
-
- symbolTooltip = new SymbolTooltipPanel("symbolTooltip", projectModel) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
- setResponsePage(ProjectBlobPage.class, getQueryHitParams(hit));
- }
-
- @Override
- protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {
- setResponsePage(ProjectBlobPage.class, getFindOccurrencesParams());
- }
-
- @Override
- protected String getBlobPath() {
- if (getRevision().equals(change.getNewBlobIdent().revision))
- return change.getNewBlobIdent().path;
- else
- return change.getOldBlobIdent().path;
- }
-
- };
- add(symbolTooltip);
-
- setOutputMarkupId(true);
- }
-
- private MarkPos getMark(IRequestParameters params, String leftSideParam,
- String beginLineParam, String beginCharParam,
- String endLineParam, String endCharParam) {
- boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();
- int beginLine = params.getParameterValue(beginLineParam).toInt();
- int beginChar = params.getParameterValue(beginCharParam).toInt();
- int endLine = params.getParameterValue(endLineParam).toInt();
- int endChar = params.getParameterValue(endCharParam).toInt();
- String commit = leftSide?getOldCommit().name():getNewCommit().name();
- return new MarkPos(commit, change.getPath(), new TextRange(beginLine, beginChar, endLine, endChar));
- }
-
- private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {
- MarkAwareDiffBlock block = getDiffBlocks().get(index);
- if (index == 0) {
- int start = block.getLines().size()-contextSize;
- if (start < 0)
- start=0;
- else if (start > 0)
- appendExpander(builder, index, start);
- for (int j=start; j<block.getLines().size()-lastContextSize; j++)
- appendEqual(builder, block, j, lastContextSize);
- } else if (index == getDiffBlocks().size()-1) {
- int end = block.getLines().size();
- int skipped = 0;
- if (end > contextSize) {
- skipped = end-contextSize;
- end = contextSize;
- }
- for (int j=lastContextSize; j<end; j++)
- appendEqual(builder, block, j, lastContextSize);
- if (skipped != 0)
- appendExpander(builder, index, skipped);
- } else if (2*contextSize < block.getLines().size()) {
- for (int j=lastContextSize; j<contextSize; j++)
- appendEqual(builder, block, j, lastContextSize);
- appendExpander(builder, index, block.getLines().size() - 2*contextSize);
- for (int j=block.getLines().size()-contextSize; j<block.getLines().size()-lastContextSize; j++)
- appendEqual(builder, block, j, lastContextSize);
- } else {
- for (int j=lastContextSize; j<block.getLines().size()-lastContextSize; j++)
- appendEqual(builder, block, j, lastContextSize);
- }
- }
-
- private void appendMarkedEquals(StringBuilder builder, int index) {
- MarkAwareDiffBlock block = getDiffBlocks().get(index);
- for (int i=0; i<block.getLines().size(); i++)
- appendEqual(builder, block, i, 0);
- }
-
- private ObjectId getOldCommit() {
- String oldRev = change.getOldBlobIdent().revision;
- if (oldRev.equals(ObjectId.zeroId().name().toString())) {
- return ObjectId.zeroId();
- } else {
- return projectModel.getObject().getRevCommit(oldRev);
- }
- }
-
- private ObjectId getNewCommit() {
- String newRev = change.getNewBlobIdent().revision;
- if (newRev.equals(ObjectId.zeroId().name().toString())) {
- return ObjectId.zeroId();
- } else {
- return projectModel.getObject().getRevCommit(newRev);
- }
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));
-
- String jsonOfOldCommentInfos;
- String jsonOfNewCommentInfos;
- String jsonOfMark;
- String jsonOfCommentInfo;
- String dirtyContainerId;
- if (commentSupport != null) {
- String oldCommitHash = getOldCommit().name();
- Map<Integer, List<CommentInfo>> oldCommentInfos = new HashMap<>();
- Map<Integer, List<CommentInfo>> newCommentInfos = new HashMap<>();
- for (CodeComment comment: commentSupport.getComments()) {
- if (comment.getMarkPos().getRange() != null) {
- int line = comment.getMarkPos().getRange().getBeginLine();
- List<CommentInfo> commentInfosAtLine;
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.mark = new MarkInfo(comment, oldCommitHash);
- if (commentInfo.mark.leftSide) {
- commentInfosAtLine = oldCommentInfos.get(line);
- if (commentInfosAtLine == null) {
- commentInfosAtLine = new ArrayList<>();
- oldCommentInfos.put(line, commentInfosAtLine);
- }
- } else {
- commentInfosAtLine = newCommentInfos.get(line);
- if (commentInfosAtLine == null) {
- commentInfosAtLine = new ArrayList<>();
- newCommentInfos.put(line, commentInfosAtLine);
- }
- }
- commentInfosAtLine.add(commentInfo);
- }
- }
- for (List<CommentInfo> value: oldCommentInfos.values()) {
- value.sort((o1, o2)->(int)(o1.id-o2.id));
- }
- for (List<CommentInfo> value: newCommentInfos.values()) {
- value.sort((o1, o2)->(int)(o1.id-o2.id));
- }
-
- ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
- try {
- jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos);
- jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
-
- MarkPos mark = commentSupport.getMark();
- if (mark != null) {
- jsonOfMark = getJson(mark);
- } else {
- jsonOfMark = "undefined";
- }
- CodeComment comment = commentSupport.getOpenComment();
- if (comment != null) {
- jsonOfCommentInfo = getJsonOfComment(comment);
- } else {
- jsonOfCommentInfo = "undefined";
- }
- dirtyContainerId = "'" + commentSupport.getDirtyContainer().getMarkupId() + "'";
- } else {
- jsonOfMark = "undefined";
- jsonOfCommentInfo = "undefined";
- jsonOfOldCommentInfos = "undefined";
- jsonOfNewCommentInfos = "undefined";
- dirtyContainerId = "undefined";
- }
-
- CharSequence callback = callbackBehavior.getCallbackFunction(
- explicit("action"), explicit("param1"), explicit("param2"),
- explicit("param3"), explicit("param4"), explicit("param5"),
- explicit("param6"), explicit("param7"), explicit("param8"));
-
- String unableCommentMessage;
- if (getPage() instanceof MergePreviewPage) {
- unableCommentMessage = "Unable to comment on merge preview";
- } else {
- unableCommentMessage = "Unable to comment at this place";
- }
- String script = String.format("onedev.server.textDiff.onDomReady('%s', '%s', '%s', '%s', %s, %s, %s, '%s', %s,"
- + "%s, %s, %s, %s, '%s');", getMarkupId(), symbolTooltip.getMarkupId(),
- change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,
- callback, blameMessageBehavior.getCallback(),
- commentSupport!=null, unableCommentMessage, jsonOfMark, jsonOfCommentInfo,
- jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId,
- OneDev.getInstance().getDocRoot());
-
- response.render(OnDomReadyHeaderItem.forScript(script));
-
- script = String.format("onedev.server.textDiff.onWindowLoad('%s', %b, %s);",
- getMarkupId(), RequestCycle.get().find(AjaxRequestTarget.class) != null, jsonOfMark);
- response.render(OnLoadHeaderItem.forScript(script));
- }
-
- private String renderDiffs() {
- StringBuilder builder = new StringBuilder();
- if (blameInfo != null) {
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- }
-
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- builder.append(""
- + "<colgroup>"
- + "<col width='240'></col>"
- + "<col width='60'></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "</colgroup>");
- } else {
- builder.append(""
- + "<colgroup>"
- + "<col width='60'></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "</colgroup>");
- }
- } else {
- if (blameInfo != null) {
- builder.append(""
- + "<colgroup>"
- + "<col width='70'></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "<col width='70'></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "</colgroup>");
- } else {
- builder.append(""
- + "<colgroup>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "<col width='60'></col>"
- + "<col width='15'></col>"
- + "<col></col>"
- + "</colgroup>");
- }
- }
- for (int i=0; i<getDiffBlocks().size(); i++) {
- MarkAwareDiffBlock block = getDiffBlocks().get(i);
- if (block.getType() == Type.EQUAL) {
- Integer lastContextSize = contextSizes.get(i);
- if (lastContextSize == null)
- lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
- appendEquals(builder, i, 0, lastContextSize);
- } else if (block.getType() == Type.MARKED_EQUAL) {
- appendMarkedEquals(builder, i);
- } else if (block.getType () == Type.DELETE) {
- if (i+1<getDiffBlocks().size()) {
- MarkAwareDiffBlock nextBlock = getDiffBlocks().get(i+1);
- if (nextBlock.getType() == Type.INSERT) {
- LinkedHashMap<Integer, LineDiff> lineChanges =
- DiffUtils.align(block.getLines(), nextBlock.getLines(), false);
- if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {
- for (int j=0; j<block.getLines().size(); j++) {
- LineDiff lineDiff = lineChanges.get(j);
- if (lineDiff != null) {
- appendDelete(builder, block, j, lineDiff.getTokenDiffs());
- } else {
- appendDelete(builder, block, j, null);
- }
- }
- Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();
- for (LineDiff diff: lineChanges.values()) {
- lineChangesByInsert.put(diff.getCompareLine(), diff);
- }
- for (int j=0; j<nextBlock.getLines().size(); j++) {
- LineDiff lineDiff = lineChangesByInsert.get(j);
- if (lineDiff != null) {
- appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());
- } else {
- appendInsert(builder, nextBlock, j, null);
- }
- }
- } else {
- int prevDeleteLineIndex = 0;
- int prevInsertLineIndex = 0;
- for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {
- int deleteLineIndex = entry.getKey();
- LineDiff lineChange = entry.getValue();
- int insertLineIndex = lineChange.getCompareLine();
-
- appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,
- prevInsertLineIndex, insertLineIndex);
-
- appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,
- lineChange.getTokenDiffs());
-
- prevDeleteLineIndex = deleteLineIndex+1;
- prevInsertLineIndex = insertLineIndex+1;
- }
- appendDeletesAndInserts(builder, block, nextBlock,
- prevDeleteLineIndex, block.getLines().size(),
- prevInsertLineIndex, nextBlock.getLines().size());
- }
- i++;
- } else {
- for (int j=0; j<block.getLines().size(); j++)
- appendDelete(builder, block, j, null);
- }
- } else {
- for (int j=0; j<block.getLines().size(); j++)
- appendDelete(builder, block, j, null);
- }
- } else {
- for (int j=0; j<block.getLines().size(); j++)
- appendInsert(builder, block, j, null);
- }
- }
- return builder.toString();
- }
-
- private void appendDeletesAndInserts(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
- MarkAwareDiffBlock insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,
- int fromInsertLineIndex, int toInsertLineIndex) {
- if (diffMode == DiffViewMode.UNIFIED) {
- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
- appendDelete(builder, deleteBlock, i, null);
- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
- appendInsert(builder, insertBlock, i, null);
- } else {
- int deleteSize = toDeleteLineIndex - fromDeleteLineIndex;
- int insertSize = toInsertLineIndex - fromInsertLineIndex;
- if (deleteSize < insertSize) {
- for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
- appendSideBySide(builder, deleteBlock, insertBlock, i, i-fromDeleteLineIndex+fromInsertLineIndex);
- for (int i=fromInsertLineIndex+deleteSize; i<toInsertLineIndex; i++)
- appendInsert(builder, insertBlock, i, null);
- } else {
- for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
- appendSideBySide(builder, deleteBlock, insertBlock, i-fromInsertLineIndex+fromDeleteLineIndex, i);
- for (int i=fromDeleteLineIndex+insertSize; i<toDeleteLineIndex; i++)
- appendDelete(builder, deleteBlock, i, null);
- }
- }
- }
-
- private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {
- BlameCommit commit;
- if (newLineNo != -1)
- commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));
- else
- commit = Preconditions.checkNotNull(blameInfo.oldBlame.get(oldLineNo));
- if (diffMode == DiffViewMode.UNIFIED && !commit.getHash().equals(blameInfo.lastCommitHash)
- || diffMode == DiffViewMode.SPLIT && newLineNo != -1 && !commit.getHash().equals(blameInfo.lastNewCommitHash)
- || diffMode == DiffViewMode.SPLIT && oldLineNo != -1 && !commit.getHash().equals(blameInfo.lastOldCommitHash)) {
- CommitDetailPage.State state = new CommitDetailPage.State();
- state.revision = commit.getHash();
- state.whitespaceOption = change.getWhitespaceOption();
- PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), state);
- String url = urlFor(CommitDetailPage.class, params).toString();
- if (diffMode == DiffViewMode.UNIFIED) {
- builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",
- url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),
- DateUtils.formatDate(commit.getCommitter().getWhen()),
- HtmlEscape.escapeHtml5(commit.getAuthor().getName())));
- } else {
- builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a></td>",
- url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash())));
- }
- } else {
- if (diffMode == DiffViewMode.UNIFIED) {
- builder.append("<td class='blame noselect'><div class='same-as-above'>...</div></td>");
- } else {
- builder.append("<td class='abbr blame noselect'><div class='same-as-above'>...</div></td>");
- }
- }
- blameInfo.lastCommitHash = commit.getHash();
- if (newLineNo != -1)
- blameInfo.lastNewCommitHash = commit.getHash();
- if (oldLineNo != -1)
- blameInfo.lastOldCommitHash = commit.getHash();
- }
-
- private String getOperationClass(Operation operation) {
- if (operation == Operation.INSERT)
- return "insert";
- else if (operation == Operation.DELETE)
- return "delete";
- else
- return null;
- }
-
- private void appendTokenized(StringBuilder builder, Tokenized tokenized) {
- if (tokenized.getTokens().length == 0) {
- builder.append("&nbsp;");
- } else {
- for (long token: tokenized.getTokens()) {
- builder.append(TokenUtils.toHtml(tokenized.getText(), token, null, null));
- }
- }
- }
-
- private void appendEqual(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, int lastContextSize) {
- if (lastContextSize != 0)
- builder.append("<tr class='code expanded'>");
- else
- builder.append("<tr class='code original'>");
-
- int oldLineNo = block.getOldStart() + lineIndex;
- int newLineNo = block.getNewStart() + lineIndex;
-
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, newLineNo);
- }
- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- } else {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- }
- builder.append("</tr>");
- }
-
- private void appendInsert(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex,
- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<tr class='code original'>");
-
- int newLineNo = block.getNewStart() + lineIndex;
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect new'>&nbsp;</td>");
- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect new'>+</td>");
- builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");
- if (tokenDiffs != null) {
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.DELETE)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- }
- } else {
- appendTokenized(builder, block.getLines().get(lineIndex));
- }
- builder.append("</td>");
- } else {
- if (blameInfo != null) {
- builder.append("<td class='blame noselect'>&nbsp;</td>");
- }
- builder.append("<td class='number noselect'>&nbsp;</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content left'>&nbsp;</td>");
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect new'>+</td>");
- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- }
- builder.append("</tr>");
- }
-
- private void appendDelete(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex,
- @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<tr class='code original'>");
-
- int oldLineNo = block.getOldStart() + lineIndex;
- if (diffMode == DiffViewMode.UNIFIED ) {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='number noselect old'>&nbsp;</td>");
- builder.append("<td class='operation noselect old'>-</td>");
- builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");
- if (tokenDiffs != null) {
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.INSERT)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- }
- } else {
- appendTokenized(builder, block.getLines().get(lineIndex));
- }
- builder.append("</td>");
- } else {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='operation noselect old'>-</td>");
- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
- appendTokenized(builder, block.getLines().get(lineIndex));
- builder.append("</td>");
- if (blameInfo != null) {
- builder.append("<td class='blame noselect'>&nbsp;</td>");
- }
- builder.append("<td class='number noselect'>&nbsp;</td>");
- builder.append("<td class='operation noselect'>&nbsp;</td>");
- builder.append("<td class='content right'>&nbsp;</td>");
- }
- builder.append("</tr>");
- }
-
- private void appendSideBySide(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
- MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex) {
- builder.append("<tr class='code original'>");
-
- int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='operation noselect old'>-</td>");
- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
- appendTokenized(builder, deleteBlock.getLines().get(deleteLineIndex));
- builder.append("</td>");
-
- int newLineNo = insertBlock.getNewStart()+insertLineIndex;
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect new'>+</td>");
- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
- appendTokenized(builder, insertBlock.getLines().get(insertLineIndex));
- builder.append("</td>");
-
- builder.append("</tr>");
- }
-
- private void appendModification(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
- MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex,
- List<DiffBlock<TextToken>> tokenDiffs) {
- builder.append("<tr class='code original'>");
-
- int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;
- int newLineNo = insertBlock.getNewStart() + insertLineIndex;
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, newLineNo);
- }
- builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect old new'>*</td>");
- builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits())
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- builder.append("</td>");
- } else {
- if (blameInfo != null) {
- appendBlame(builder, oldLineNo, -1);
- }
- builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
- builder.append("<td class='operation noselect old'>-</td>");
- builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.INSERT)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- }
- builder.append("</td>");
-
- if (blameInfo != null) {
- appendBlame(builder, -1, newLineNo);
- }
- builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
- builder.append("<td class='operation noselect new'>+</td>");
- builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
- if (tokenDiffs.isEmpty()) {
- builder.append("&nbsp;");
- } else {
- for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
- for (TextToken token: tokenBlock.getUnits()) {
- if (tokenBlock.getOperation() != Operation.DELETE)
- builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
- }
- }
- }
- builder.append("</td>");
- }
-
- builder.append("</tr>");
- }
-
- private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {
- builder.append("<tr class='expander expander").append(blockIndex).append("'>");
-
- String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);
- if (diffMode == DiffViewMode.UNIFIED) {
- if (blameInfo != null) {
- builder.append("<td colspan='3' class='expander noselect'><a title='Show more lines' href=\"")
- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- } else {
- builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")
- .append(script).append("\"><i class='fa fa-sort'></i></a></td>");
- }
- builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")
- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
- } else {
- if (blameInfo != null) {
- builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"").append(script)
- .append("\"><i class='fa fa-sort'></i></a></td>");
- builder.append("<td class='skipped noselect' colspan='6'><i class='fa fa-ellipsis-h'></i> skipped ")
- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
- blameInfo.lastCommitHash = null;
- blameInfo.lastOldCommitHash = null;
- blameInfo.lastNewCommitHash = null;
- } else {
- builder.append("<td class='expander noselect'><a title='Show more lines' href=\"").append(script)
- .append("\"><i class='fa fa-sort'></i></a></td>");
- builder.append("<td class='skipped noselect' colspan='5'><i class='fa fa-ellipsis-h'></i> skipped ")
- .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
- }
- }
- builder.append("</tr>");
- }
-
- private List<MarkAwareDiffBlock> getDiffBlocks() {
- if (diffBlocks == null) {
- diffBlocks = new ArrayList<>();
- List<Range> oldRanges = new ArrayList<>();
- List<Range> newRanges = new ArrayList<>();
- if (commentSupport != null) {
- String oldCommitHash = getOldCommit().name();
- for (MarkPos each: initialMarks) {
- Range range = new Range(each.getRange().beginLine, each.getRange().endLine+1);
- if (each.getCommit().equals(oldCommitHash)) {
- oldRanges.add(range);
- } else {
- newRanges.add(range);
- }
- }
- }
-
- for (DiffBlock<Tokenized> diffBlock: change.getDiffBlocks()) {
- if (diffBlock.getOperation() == Operation.DELETE) {
- diffBlocks.add(new MarkAwareDiffBlock(Type.DELETE, diffBlock.getUnits(),
- diffBlock.getOldStart(), diffBlock.getNewStart()));
- } else if (diffBlock.getOperation() == Operation.INSERT) {
- diffBlocks.add(new MarkAwareDiffBlock(Type.INSERT, diffBlock.getUnits(),
- diffBlock.getOldStart(), diffBlock.getNewStart()));
- } else {
- List<Range> ranges = new ArrayList<>();
- for (Range range: oldRanges) {
- ranges.add(new Range(range.getFrom()-diffBlock.getOldStart(), range.getTo()-diffBlock.getOldStart()));
- }
- for (Range range: newRanges) {
- ranges.add(new Range(range.getFrom()-diffBlock.getNewStart(), range.getTo()-diffBlock.getNewStart()));
- }
- ranges = RangeUtils.merge(ranges);
-
- int lastIndex = 0;
- for (Range range: ranges) {
- int from = range.getFrom();
- int to = range.getTo();
- if (from < diffBlock.getUnits().size() && to > 0) {
- if (from < lastIndex)
- from = lastIndex;
- if (to > diffBlock.getUnits().size())
- to = diffBlock.getUnits().size();
- if (lastIndex < from) {
- List<Tokenized> lines = diffBlock.getUnits().subList(lastIndex, from);
- diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,
- diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));
- }
- if (from < to) {
- List<Tokenized> lines = diffBlock.getUnits().subList(from, to);
- diffBlocks.add(new MarkAwareDiffBlock(Type.MARKED_EQUAL, lines,
- diffBlock.getOldStart()+from, diffBlock.getNewStart()+from));
- }
- lastIndex = to;
- }
- }
-
- if (lastIndex < diffBlock.getUnits().size()) {
- List<Tokenized> lines = diffBlock.getUnits().subList(lastIndex, diffBlock.getUnits().size());
- diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,
- diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));
- }
- }
- }
- }
- return diffBlocks;
- }
-
- @Override
- protected void onDetach() {
- projectModel.detach();
- requestModel.detach();
-
- if (blameModel != null)
- blameModel.detach();
-
- super.onDetach();
- }
-
- private String getJsonOfComment(CodeComment comment) {
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.mark = new MarkInfo(comment, getOldCommit().name());
-
- String jsonOfCommentInfo;
- try {
- jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- return jsonOfCommentInfo;
- }
-
- @Override
- public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
- String script = String.format("onedev.server.textDiff.onCommentDeleted($('#%s'), %s);",
- getMarkupId(), getJsonOfComment(comment));
- target.appendJavaScript(script);
- mark(target, null);
- }
-
- @Override
- public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {
- String script = String.format("onedev.server.textDiff.onCloseComment($('#%s'));", getMarkupId());
- target.appendJavaScript(script);
- mark(target, null);
- }
-
- @Override
- public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {
- String script = String.format("onedev.server.textDiff.onCommentAdded($('#%s'), %s);",
- getMarkupId(), getJsonOfComment(comment));
- target.appendJavaScript(script);
- }
-
- @Override
- public void mark(AjaxRequestTarget target, MarkPos mark) {
- String script;
- if (mark != null) {
- script = String.format(""
- + "var $container = $('#%s');"
- + "var mark = %s;"
- + "onedev.server.textDiff.scrollTo($container, mark);"
- + "onedev.server.textDiff.mark($container, mark);",
- getMarkupId(), getJson(mark));
- } else {
- script = String.format(""
- + "var $container = $('#%s');"
- + "onedev.server.textDiff.clearMark($container);"
- + "$container.removeData('mark');",
- getMarkupId());
- }
- target.appendJavaScript(script);
- }
-
- @Override
- public void onUnblame(AjaxRequestTarget target) {
- blameInfo = null;
- target.add(this);
- }
-
- @SuppressWarnings("unused")
- private static class CommentInfo {
- long id;
-
- String title;
-
- MarkInfo mark;
- }
-
- @SuppressWarnings("unused")
- private static class MarkInfo extends TextRange {
-
- String path;
-
- boolean leftSide;
-
- public MarkInfo() {
-
- }
-
- public MarkInfo(CodeComment comment, String oldCommitHash) {
- super(comment.getMarkPos().getRange());
- path = comment.getMarkPos().getPath();
- leftSide = comment.getMarkPos().getCommit().equals(oldCommitHash);
- }
-
- public MarkInfo(MarkPos mark, String oldCommitHash) {
- super(mark.getRange());
- path = mark.getPath();
- leftSide = mark.getCommit().equals(oldCommitHash);
- }
-
- }
-
- private static class BlameInfo implements Serializable {
-
- Map<Integer, BlameCommit> oldBlame = new HashMap<>();
-
- Map<Integer, BlameCommit> newBlame = new HashMap<>();
-
- String lastCommitHash;
-
- String lastOldCommitHash;
-
- String lastNewCommitHash;
-
- }
-
-}
+package io.onedev.server.web.component.diff.blob.text;
+
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+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.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.unbescape.html.HtmlEscape;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.jsyntax.TextToken;
+import io.onedev.commons.jsyntax.TokenUtils;
+import io.onedev.commons.jsyntax.Tokenized;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.RangeUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.git.BlameBlock;
+import io.onedev.server.git.BlameCommit;
+import io.onedev.server.git.BlobChange;
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.command.BlameCommand;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.MarkPos;
+import io.onedev.server.model.support.TextRange;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.diff.DiffBlock;
+import io.onedev.server.util.diff.DiffMatchPatch.Operation;
+import io.onedev.server.util.diff.DiffUtils;
+import io.onedev.server.util.diff.LineDiff;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
+import io.onedev.server.web.component.diff.blob.SourceAware;
+import io.onedev.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type;
+import io.onedev.server.web.component.diff.diffstat.DiffStatBar;
+import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;
+import io.onedev.server.web.component.diff.revision.BlobCommentSupport;
+import io.onedev.server.web.component.diff.revision.DiffViewMode;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
+import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
+
+@SuppressWarnings("serial")
+public class TextDiffPanel extends Panel implements SourceAware {
+
+ private final IModel<Project> projectModel;
+
+ private final IModel<PullRequest> requestModel;
+
+ private final BlobChange change;
+
+ private final Map<Integer, Integer> contextSizes = new HashMap<>();
+
+ private final DiffViewMode diffMode;
+
+ private final IModel<Boolean> blameModel;
+
+ private final BlobCommentSupport commentSupport;
+
+ private final List<MarkPos> initialMarks;
+
+ private Component symbolTooltip;
+
+ private AbstractPostAjaxBehavior callbackBehavior;
+
+ private BlameMessageBehavior blameMessageBehavior;
+
+ private transient List<MarkAwareDiffBlock> diffBlocks;
+
+ private BlameInfo blameInfo;
+
+ public TextDiffPanel(String id, IModel<Project> projectModel, IModel<PullRequest> requestModel,
+ BlobChange change, DiffViewMode diffMode, @Nullable IModel<Boolean> blameModel,
+ @Nullable BlobCommentSupport commentSupport) {
+ super(id);
+
+ this.projectModel = projectModel;
+ this.requestModel = requestModel;
+ this.change = change;
+ this.diffMode = diffMode;
+ this.commentSupport = commentSupport;
+ this.blameModel = blameModel;
+
+ if (blameModel != null && blameModel.getObject()) {
+ blameInfo = getBlameInfo();
+ }
+
+ initialMarks = new ArrayList<>();
+ if (commentSupport != null) {
+ MarkPos mark = commentSupport.getMark();
+ if (mark != null) {
+ initialMarks.add(mark);
+ }
+ for (CodeComment comment: commentSupport.getComments()) {
+ mark = comment.getMarkPos();
+ initialMarks.add(mark);
+ }
+ }
+ }
+
+ private String getJson(MarkPos mark) {
+ try {
+ MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name());
+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(markInfo);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private BlameInfo getBlameInfo() {
+ blameInfo = new BlameInfo();
+ BlameCommand cmd = new BlameCommand(projectModel.getObject().getGitDir());
+ String oldPath = change.getOldBlobIdent().path;
+ if (oldPath != null) {
+ cmd.commitHash(getOldCommit().name()).file(oldPath);
+ for (BlameBlock blame: cmd.call()) {
+ for (Range range: blame.getRanges()) {
+ for (int i=range.getFrom(); i<=range.getTo(); i++)
+ blameInfo.oldBlame.put(i, blame.getCommit());
+ }
+ }
+ }
+ String newPath = change.getNewBlobIdent().path;
+ if (newPath != null) {
+ cmd.commitHash(getNewCommit().name()).file(newPath);
+ for (BlameBlock blame: cmd.call()) {
+ for (Range range: blame.getRanges()) {
+ for (int i=range.getFrom(); i<=range.getTo(); i++)
+ blameInfo.newBlame.put(i, blame.getCommit());
+ }
+ }
+ }
+ return blameInfo;
+ }
+
+ private WebMarkupContainer newActions() {
+ WebMarkupContainer actions = new WebMarkupContainer("actions");
+
+ actions.add(new AjaxLink<Void>("blameFile") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(blameModel != null);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (blameInfo != null) {
+ blameInfo = null;
+ } else {
+ blameInfo = getBlameInfo();
+ }
+ target.add(TextDiffPanel.this);
+ blameModel.setObject(blameInfo != null);
+ }
+
+ }.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return blameInfo!=null? "active": "";
+ }
+
+ })).setOutputMarkupId(true));
+
+ Project project = projectModel.getObject();
+ PullRequest request = requestModel.getObject();
+ ProjectBlobPage.State viewState = new ProjectBlobPage.State(change.getBlobIdent());
+
+ viewState.requestId = PullRequest.idOf(request);
+ PageParameters params = ProjectBlobPage.paramsOf(project, viewState);
+ actions.add(new ViewStateAwarePageLink<Void>("viewFile", ProjectBlobPage.class, params));
+
+ if (change.getType() != ChangeType.DELETE) {
+ if (request != null
+ && request.getSource() != null
+ && request.getSource().getObjectName(false) != null
+ && SecurityUtils.canModify(request.getSourceProject(), request.getSourceBranch(), change.getPath())
+ && (getPage() instanceof PullRequestChangesPage || getPage() instanceof MergePreviewPage)) {
+ // we are in context of a pull request and pull request source branch exists, so we edit in source branch instead
+ Link<Void> editLink = new Link<Void>("editFile") {
+
+ @Override
+ public void onClick() {
+ BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), change.getPath(),
+ FileMode.REGULAR_FILE.getBits());
+ ProjectBlobPage.State editState = new ProjectBlobPage.State(blobIdent);
+ editState.requestId = request.getId();
+ editState.mode = Mode.EDIT;
+ PageParameters params = ProjectBlobPage.paramsOf(request.getSourceProject(), editState);
+ setResponsePage(ProjectBlobPage.class, params);
+ }
+
+ };
+ editLink.add(AttributeAppender.append("title", "Edit on source branch"));
+ actions.add(editLink);
+ } else if (SecurityUtils.canModify(project, change.getBlobIdent().revision, change.getPath())
+ && project.getBranchRef(change.getBlobIdent().revision) != null) {
+ // we are on a branch
+ Link<Void> editLink = new Link<Void>("editFile") {
+
+ @Override
+ public void onClick() {
+ ProjectBlobPage.State editState = new ProjectBlobPage.State(change.getBlobIdent());
+ editState.mode = Mode.EDIT;
+ PageParameters params = ProjectBlobPage.paramsOf(project, editState);
+ setResponsePage(ProjectBlobPage.class, params);
+ }
+
+ };
+ editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));
+ actions.add(editLink);
+ } else {
+ actions.add(new WebMarkupContainer("editFile").setVisible(false));
+ }
+ } else {
+ actions.add(new WebMarkupContainer("editFile").setVisible(false));
+ }
+
+ return actions;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new DiffStatBar("diffStat", change.getAdditions(), change.getDeletions(), true));
+ add(new BlobDiffTitle("title", change));
+
+ add(newActions());
+
+ add(new Label("diffLines", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return renderDiffs();
+ }
+
+ }).setEscapeModelStrings(false));
+
+ add(callbackBehavior = new AbstractPostAjaxBehavior() {
+
+ private String getMarkedText(MarkPos mark) {
+ List<String> lines;
+ if (mark.getCommit().equals(getOldCommit().name()))
+ lines = change.getOldText().getLines();
+ else
+ lines = change.getNewText().getLines();
+ StringBuilder builder = new StringBuilder();
+ if (mark.getRange().getBeginLine() != mark.getRange().getEndLine()) {
+ String line = lines.get(mark.getRange().getBeginLine());
+ int beginChar = mark.getRange().getBeginChar();
+ if (beginChar < line.length())
+ builder.append(line.substring(beginChar));
+ for (int i=mark.getRange().getBeginLine()+1; i<mark.getRange().getEndLine(); i++) {
+ if (builder.length() != 0)
+ builder.append("\n");
+ builder.append(lines.get(i));
+ }
+ line = lines.get(mark.getRange().getEndLine());
+ int endChar = mark.getRange().getEndChar();
+ if (endChar > 0) {
+ if (endChar > line.length())
+ endChar = line.length();
+ if (builder.length() != 0)
+ builder.append("\n");
+ builder.append(line.substring(0, endChar));
+ }
+ } else {
+ String line = lines.get(mark.getRange().getBeginLine());
+ int beginChar = mark.getRange().getBeginChar();
+ int endChar = mark.getRange().getEndChar();
+ if (beginChar < line.length() && endChar > 0) {
+ if (endChar > line.length())
+ endChar = line.length();
+ builder.append(line.substring(beginChar, endChar));
+ }
+ }
+
+ return builder.toString();
+ }
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ switch (params.getParameterValue("action").toString()) {
+ case "expand":
+ if (blameInfo != null) {
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ }
+ int index = params.getParameterValue("param1").toInt();
+ Integer lastContextSize = contextSizes.get(index);
+ if (lastContextSize == null)
+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
+ int contextSize = lastContextSize + WebConstants.DIFF_EXPAND_SIZE;
+ contextSizes.put(index, contextSize);
+
+ StringBuilder builder = new StringBuilder();
+ appendEquals(builder, index, lastContextSize, contextSize);
+
+ String expanded = StringUtils.replace(builder.toString(), "\"", "\\\"");
+ expanded = StringUtils.replace(expanded, "\n", "");
+ String script = String.format("onedev.server.textDiff.expand('%s', %d, \"%s\");",
+ getMarkupId(), index, expanded);
+ target.appendJavaScript(script);
+ break;
+ case "openSelectionPopover":
+ String jsonOfPosition = String.format("{left: %d, top: %d}",
+ params.getParameterValue("param1").toInt(),
+ params.getParameterValue("param2").toInt());
+ MarkPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");
+ script = String.format("onedev.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s);",
+ getMarkupId(), jsonOfPosition, getJson(mark), commentSupport.getMarkUrl(mark),
+ JavaScriptEscape.escapeJavaScript(getMarkedText(mark)),
+ SecurityUtils.getUser()!=null);
+ target.appendJavaScript(script);
+ break;
+ case "addComment":
+ Preconditions.checkNotNull(SecurityUtils.getUser());
+
+ mark = getMark(params, "param1", "param2", "param3", "param4", "param5");
+ commentSupport.onAddComment(target, mark);
+ script = String.format("onedev.server.textDiff.onAddComment($('#%s'), %s);",
+ getMarkupId(), getJson(mark));
+ target.appendJavaScript(script);
+ break;
+ case "toggleComment":
+ Long commentId = params.getParameterValue("param1").toLong();
+ CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ CodeComment prevComment = commentSupport.getOpenComment();
+ commentSupport.onToggleComment(target, comment);
+ if (!comment.equals(prevComment)) {
+ script = String.format("onedev.server.textDiff.onOpenComment($('#%s'), %s);",
+ getMarkupId(), getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ } else {
+ onCommentClosed(target, comment);
+ }
+ break;
+ }
+ }
+
+ });
+
+ add(blameMessageBehavior = new BlameMessageBehavior() {
+
+ @Override
+ protected Project getProject() {
+ return projectModel.getObject();
+ }
+ });
+
+ symbolTooltip = new SymbolTooltipPanel("symbolTooltip", projectModel) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
+ setResponsePage(ProjectBlobPage.class, getQueryHitParams(hit));
+ }
+
+ @Override
+ protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {
+ setResponsePage(ProjectBlobPage.class, getFindOccurrencesParams());
+ }
+
+ @Override
+ protected String getBlobPath() {
+ if (getRevision().equals(change.getNewBlobIdent().revision))
+ return change.getNewBlobIdent().path;
+ else
+ return change.getOldBlobIdent().path;
+ }
+
+ };
+ add(symbolTooltip);
+
+ setOutputMarkupId(true);
+ }
+
+ private MarkPos getMark(IRequestParameters params, String leftSideParam,
+ String beginLineParam, String beginCharParam,
+ String endLineParam, String endCharParam) {
+ boolean leftSide = params.getParameterValue(leftSideParam).toBoolean();
+ int beginLine = params.getParameterValue(beginLineParam).toInt();
+ int beginChar = params.getParameterValue(beginCharParam).toInt();
+ int endLine = params.getParameterValue(endLineParam).toInt();
+ int endChar = params.getParameterValue(endCharParam).toInt();
+ String commit = leftSide?getOldCommit().name():getNewCommit().name();
+ return new MarkPos(commit, change.getPath(), new TextRange(beginLine, beginChar, endLine, endChar));
+ }
+
+ private void appendEquals(StringBuilder builder, int index, int lastContextSize, int contextSize) {
+ MarkAwareDiffBlock block = getDiffBlocks().get(index);
+ if (index == 0) {
+ int start = block.getLines().size()-contextSize;
+ if (start < 0)
+ start=0;
+ else if (start > 0)
+ appendExpander(builder, index, start);
+ for (int j=start; j<block.getLines().size()-lastContextSize; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ } else if (index == getDiffBlocks().size()-1) {
+ int end = block.getLines().size();
+ int skipped = 0;
+ if (end > contextSize) {
+ skipped = end-contextSize;
+ end = contextSize;
+ }
+ for (int j=lastContextSize; j<end; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ if (skipped != 0)
+ appendExpander(builder, index, skipped);
+ } else if (2*contextSize < block.getLines().size()) {
+ for (int j=lastContextSize; j<contextSize; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ appendExpander(builder, index, block.getLines().size() - 2*contextSize);
+ for (int j=block.getLines().size()-contextSize; j<block.getLines().size()-lastContextSize; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ } else {
+ for (int j=lastContextSize; j<block.getLines().size()-lastContextSize; j++)
+ appendEqual(builder, block, j, lastContextSize);
+ }
+ }
+
+ private void appendMarkedEquals(StringBuilder builder, int index) {
+ MarkAwareDiffBlock block = getDiffBlocks().get(index);
+ for (int i=0; i<block.getLines().size(); i++)
+ appendEqual(builder, block, i, 0);
+ }
+
+ private ObjectId getOldCommit() {
+ String oldRev = change.getOldBlobIdent().revision;
+ if (oldRev.equals(ObjectId.zeroId().name().toString())) {
+ return ObjectId.zeroId();
+ } else {
+ return projectModel.getObject().getRevCommit(oldRev);
+ }
+ }
+
+ private ObjectId getNewCommit() {
+ String newRev = change.getNewBlobIdent().revision;
+ if (newRev.equals(ObjectId.zeroId().name().toString())) {
+ return ObjectId.zeroId();
+ } else {
+ return projectModel.getObject().getRevCommit(newRev);
+ }
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new TextDiffResourceReference()));
+
+ String jsonOfOldCommentInfos;
+ String jsonOfNewCommentInfos;
+ String jsonOfMark;
+ String jsonOfCommentInfo;
+ String dirtyContainerId;
+ if (commentSupport != null) {
+ String oldCommitHash = getOldCommit().name();
+ Map<Integer, List<CommentInfo>> oldCommentInfos = new HashMap<>();
+ Map<Integer, List<CommentInfo>> newCommentInfos = new HashMap<>();
+ for (CodeComment comment: commentSupport.getComments()) {
+ if (comment.getMarkPos().getRange() != null) {
+ int line = comment.getMarkPos().getRange().getBeginLine();
+ List<CommentInfo> commentInfosAtLine;
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.id = comment.getId();
+ commentInfo.mark = new MarkInfo(comment, oldCommitHash);
+ if (commentInfo.mark.leftSide) {
+ commentInfosAtLine = oldCommentInfos.get(line);
+ if (commentInfosAtLine == null) {
+ commentInfosAtLine = new ArrayList<>();
+ oldCommentInfos.put(line, commentInfosAtLine);
+ }
+ } else {
+ commentInfosAtLine = newCommentInfos.get(line);
+ if (commentInfosAtLine == null) {
+ commentInfosAtLine = new ArrayList<>();
+ newCommentInfos.put(line, commentInfosAtLine);
+ }
+ }
+ commentInfosAtLine.add(commentInfo);
+ }
+ }
+ for (List<CommentInfo> value: oldCommentInfos.values()) {
+ value.sort((o1, o2)->(int)(o1.id-o2.id));
+ }
+ for (List<CommentInfo> value: newCommentInfos.values()) {
+ value.sort((o1, o2)->(int)(o1.id-o2.id));
+ }
+
+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
+ try {
+ jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos);
+ jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+
+ MarkPos mark = commentSupport.getMark();
+ if (mark != null) {
+ jsonOfMark = getJson(mark);
+ } else {
+ jsonOfMark = "undefined";
+ }
+ CodeComment comment = commentSupport.getOpenComment();
+ if (comment != null) {
+ jsonOfCommentInfo = getJsonOfComment(comment);
+ } else {
+ jsonOfCommentInfo = "undefined";
+ }
+ dirtyContainerId = "'" + commentSupport.getDirtyContainer().getMarkupId() + "'";
+ } else {
+ jsonOfMark = "undefined";
+ jsonOfCommentInfo = "undefined";
+ jsonOfOldCommentInfos = "undefined";
+ jsonOfNewCommentInfos = "undefined";
+ dirtyContainerId = "undefined";
+ }
+
+ CharSequence callback = callbackBehavior.getCallbackFunction(
+ explicit("action"), explicit("param1"), explicit("param2"),
+ explicit("param3"), explicit("param4"), explicit("param5"),
+ explicit("param6"), explicit("param7"), explicit("param8"));
+
+ String unableCommentMessage;
+ if (getPage() instanceof MergePreviewPage) {
+ unableCommentMessage = "Unable to comment on merge preview";
+ } else {
+ unableCommentMessage = "Unable to comment at this place";
+ }
+ String script = String.format("onedev.server.textDiff.onDomReady('%s', '%s', '%s', '%s', %s, %s, %s, '%s', %s,"
+ + "%s, %s, %s, %s, '%s');", getMarkupId(), symbolTooltip.getMarkupId(),
+ change.getOldBlobIdent().revision, change.getNewBlobIdent().revision,
+ callback, blameMessageBehavior.getCallback(),
+ commentSupport!=null, unableCommentMessage, jsonOfMark, jsonOfCommentInfo,
+ jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId,
+ OneDev.getInstance().getDocRoot());
+
+ response.render(OnDomReadyHeaderItem.forScript(script));
+
+ script = String.format("onedev.server.textDiff.onWindowLoad('%s', %b, %s);",
+ getMarkupId(), RequestCycle.get().find(AjaxRequestTarget.class) != null, jsonOfMark);
+ response.render(OnLoadHeaderItem.forScript(script));
+ }
+
+ private String renderDiffs() {
+ StringBuilder builder = new StringBuilder();
+ if (blameInfo != null) {
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ }
+
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ builder.append(""
+ + "<colgroup>"
+ + "<col width='240'></col>"
+ + "<col width='60'></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "</colgroup>");
+ } else {
+ builder.append(""
+ + "<colgroup>"
+ + "<col width='60'></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "</colgroup>");
+ }
+ } else {
+ if (blameInfo != null) {
+ builder.append(""
+ + "<colgroup>"
+ + "<col width='70'></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "<col width='70'></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "</colgroup>");
+ } else {
+ builder.append(""
+ + "<colgroup>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "<col width='60'></col>"
+ + "<col width='15'></col>"
+ + "<col></col>"
+ + "</colgroup>");
+ }
+ }
+ for (int i=0; i<getDiffBlocks().size(); i++) {
+ MarkAwareDiffBlock block = getDiffBlocks().get(i);
+ if (block.getType() == Type.EQUAL) {
+ Integer lastContextSize = contextSizes.get(i);
+ if (lastContextSize == null)
+ lastContextSize = WebConstants.DIFF_CONTEXT_SIZE;
+ appendEquals(builder, i, 0, lastContextSize);
+ } else if (block.getType() == Type.MARKED_EQUAL) {
+ appendMarkedEquals(builder, i);
+ } else if (block.getType () == Type.DELETE) {
+ if (i+1<getDiffBlocks().size()) {
+ MarkAwareDiffBlock nextBlock = getDiffBlocks().get(i+1);
+ if (nextBlock.getType() == Type.INSERT) {
+ LinkedHashMap<Integer, LineDiff> lineChanges =
+ DiffUtils.align(block.getLines(), nextBlock.getLines(), false);
+ if (blameInfo != null && diffMode == DiffViewMode.UNIFIED) {
+ for (int j=0; j<block.getLines().size(); j++) {
+ LineDiff lineDiff = lineChanges.get(j);
+ if (lineDiff != null) {
+ appendDelete(builder, block, j, lineDiff.getTokenDiffs());
+ } else {
+ appendDelete(builder, block, j, null);
+ }
+ }
+ Map<Integer, LineDiff> lineChangesByInsert = new HashMap<>();
+ for (LineDiff diff: lineChanges.values()) {
+ lineChangesByInsert.put(diff.getCompareLine(), diff);
+ }
+ for (int j=0; j<nextBlock.getLines().size(); j++) {
+ LineDiff lineDiff = lineChangesByInsert.get(j);
+ if (lineDiff != null) {
+ appendInsert(builder, nextBlock, j, lineDiff.getTokenDiffs());
+ } else {
+ appendInsert(builder, nextBlock, j, null);
+ }
+ }
+ } else {
+ int prevDeleteLineIndex = 0;
+ int prevInsertLineIndex = 0;
+ for (Map.Entry<Integer, LineDiff> entry: lineChanges.entrySet()) {
+ int deleteLineIndex = entry.getKey();
+ LineDiff lineChange = entry.getValue();
+ int insertLineIndex = lineChange.getCompareLine();
+
+ appendDeletesAndInserts(builder, block, nextBlock, prevDeleteLineIndex, deleteLineIndex,
+ prevInsertLineIndex, insertLineIndex);
+
+ appendModification(builder, block, nextBlock, deleteLineIndex, insertLineIndex,
+ lineChange.getTokenDiffs());
+
+ prevDeleteLineIndex = deleteLineIndex+1;
+ prevInsertLineIndex = insertLineIndex+1;
+ }
+ appendDeletesAndInserts(builder, block, nextBlock,
+ prevDeleteLineIndex, block.getLines().size(),
+ prevInsertLineIndex, nextBlock.getLines().size());
+ }
+ i++;
+ } else {
+ for (int j=0; j<block.getLines().size(); j++)
+ appendDelete(builder, block, j, null);
+ }
+ } else {
+ for (int j=0; j<block.getLines().size(); j++)
+ appendDelete(builder, block, j, null);
+ }
+ } else {
+ for (int j=0; j<block.getLines().size(); j++)
+ appendInsert(builder, block, j, null);
+ }
+ }
+ return builder.toString();
+ }
+
+ private void appendDeletesAndInserts(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
+ MarkAwareDiffBlock insertBlock, int fromDeleteLineIndex, int toDeleteLineIndex,
+ int fromInsertLineIndex, int toInsertLineIndex) {
+ if (diffMode == DiffViewMode.UNIFIED) {
+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
+ appendDelete(builder, deleteBlock, i, null);
+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
+ appendInsert(builder, insertBlock, i, null);
+ } else {
+ int deleteSize = toDeleteLineIndex - fromDeleteLineIndex;
+ int insertSize = toInsertLineIndex - fromInsertLineIndex;
+ if (deleteSize < insertSize) {
+ for (int i=fromDeleteLineIndex; i<toDeleteLineIndex; i++)
+ appendSideBySide(builder, deleteBlock, insertBlock, i, i-fromDeleteLineIndex+fromInsertLineIndex);
+ for (int i=fromInsertLineIndex+deleteSize; i<toInsertLineIndex; i++)
+ appendInsert(builder, insertBlock, i, null);
+ } else {
+ for (int i=fromInsertLineIndex; i<toInsertLineIndex; i++)
+ appendSideBySide(builder, deleteBlock, insertBlock, i-fromInsertLineIndex+fromDeleteLineIndex, i);
+ for (int i=fromDeleteLineIndex+insertSize; i<toDeleteLineIndex; i++)
+ appendDelete(builder, deleteBlock, i, null);
+ }
+ }
+ }
+
+ private void appendBlame(StringBuilder builder, int oldLineNo, int newLineNo) {
+ BlameCommit commit;
+ if (newLineNo != -1)
+ commit = Preconditions.checkNotNull(blameInfo.newBlame.get(newLineNo));
+ else
+ commit = Preconditions.checkNotNull(blameInfo.oldBlame.get(oldLineNo));
+ if (diffMode == DiffViewMode.UNIFIED && !commit.getHash().equals(blameInfo.lastCommitHash)
+ || diffMode == DiffViewMode.SPLIT && newLineNo != -1 && !commit.getHash().equals(blameInfo.lastNewCommitHash)
+ || diffMode == DiffViewMode.SPLIT && oldLineNo != -1 && !commit.getHash().equals(blameInfo.lastOldCommitHash)) {
+ CommitDetailPage.State state = new CommitDetailPage.State();
+ state.revision = commit.getHash();
+ state.whitespaceOption = change.getWhitespaceOption();
+ PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), state);
+ String url = urlFor(CommitDetailPage.class, params).toString();
+ if (diffMode == DiffViewMode.UNIFIED) {
+ builder.append(String.format("<td class='blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a><span class='date'>%s</span><span class='author'>%s</span></td>",
+ url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash()),
+ DateUtils.formatDate(commit.getCommitter().getWhen()),
+ HtmlEscape.escapeHtml5(commit.getAuthor().getName())));
+ } else {
+ builder.append(String.format("<td class='abbr blame noselect'><a class='hash' href='%s' data-hash='%s'>%s</a></td>",
+ url, commit.getHash(), GitUtils.abbreviateSHA(commit.getHash())));
+ }
+ } else {
+ if (diffMode == DiffViewMode.UNIFIED) {
+ builder.append("<td class='blame noselect'><div class='same-as-above'>...</div></td>");
+ } else {
+ builder.append("<td class='abbr blame noselect'><div class='same-as-above'>...</div></td>");
+ }
+ }
+ blameInfo.lastCommitHash = commit.getHash();
+ if (newLineNo != -1)
+ blameInfo.lastNewCommitHash = commit.getHash();
+ if (oldLineNo != -1)
+ blameInfo.lastOldCommitHash = commit.getHash();
+ }
+
+ private String getOperationClass(Operation operation) {
+ if (operation == Operation.INSERT)
+ return "insert";
+ else if (operation == Operation.DELETE)
+ return "delete";
+ else
+ return null;
+ }
+
+ private void appendTokenized(StringBuilder builder, Tokenized tokenized) {
+ if (tokenized.getTokens().length == 0) {
+ builder.append("&nbsp;");
+ } else {
+ for (long token: tokenized.getTokens()) {
+ builder.append(TokenUtils.toHtml(tokenized.getText(), token, null, null));
+ }
+ }
+ }
+
+ private void appendEqual(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex, int lastContextSize) {
+ if (lastContextSize != 0)
+ builder.append("<tr class='code expanded'>");
+ else
+ builder.append("<tr class='code original'>");
+
+ int oldLineNo = block.getOldStart() + lineIndex;
+ int newLineNo = block.getNewStart() + lineIndex;
+
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, newLineNo);
+ }
+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ } else {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content left' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content right' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ }
+ builder.append("</tr>");
+ }
+
+ private void appendInsert(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex,
+ @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
+ builder.append("<tr class='code original'>");
+
+ int newLineNo = block.getNewStart() + lineIndex;
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect new'>&nbsp;</td>");
+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect new'>+</td>");
+ builder.append("<td class='content new' data-new='").append(newLineNo).append("'>");
+ if (tokenDiffs != null) {
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits()) {
+ if (tokenBlock.getOperation() != Operation.DELETE)
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ }
+ } else {
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ }
+ builder.append("</td>");
+ } else {
+ if (blameInfo != null) {
+ builder.append("<td class='blame noselect'>&nbsp;</td>");
+ }
+ builder.append("<td class='number noselect'>&nbsp;</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content left'>&nbsp;</td>");
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect new'>+</td>");
+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ }
+ builder.append("</tr>");
+ }
+
+ private void appendDelete(StringBuilder builder, MarkAwareDiffBlock block, int lineIndex,
+ @Nullable List<DiffBlock<TextToken>> tokenDiffs) {
+ builder.append("<tr class='code original'>");
+
+ int oldLineNo = block.getOldStart() + lineIndex;
+ if (diffMode == DiffViewMode.UNIFIED ) {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='number noselect old'>&nbsp;</td>");
+ builder.append("<td class='operation noselect old'>-</td>");
+ builder.append("<td class='content old' data-old='").append(oldLineNo).append("'>");
+ if (tokenDiffs != null) {
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits()) {
+ if (tokenBlock.getOperation() != Operation.INSERT)
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ }
+ } else {
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ }
+ builder.append("</td>");
+ } else {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect old'>-</td>");
+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
+ appendTokenized(builder, block.getLines().get(lineIndex));
+ builder.append("</td>");
+ if (blameInfo != null) {
+ builder.append("<td class='blame noselect'>&nbsp;</td>");
+ }
+ builder.append("<td class='number noselect'>&nbsp;</td>");
+ builder.append("<td class='operation noselect'>&nbsp;</td>");
+ builder.append("<td class='content right'>&nbsp;</td>");
+ }
+ builder.append("</tr>");
+ }
+
+ private void appendSideBySide(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
+ MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex) {
+ builder.append("<tr class='code original'>");
+
+ int oldLineNo = deleteBlock.getOldStart()+deleteLineIndex;
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect old'>-</td>");
+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
+ appendTokenized(builder, deleteBlock.getLines().get(deleteLineIndex));
+ builder.append("</td>");
+
+ int newLineNo = insertBlock.getNewStart()+insertLineIndex;
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect new'>+</td>");
+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
+ appendTokenized(builder, insertBlock.getLines().get(insertLineIndex));
+ builder.append("</td>");
+
+ builder.append("</tr>");
+ }
+
+ private void appendModification(StringBuilder builder, MarkAwareDiffBlock deleteBlock,
+ MarkAwareDiffBlock insertBlock, int deleteLineIndex, int insertLineIndex,
+ List<DiffBlock<TextToken>> tokenDiffs) {
+ builder.append("<tr class='code original'>");
+
+ int oldLineNo = deleteBlock.getOldStart() + deleteLineIndex;
+ int newLineNo = insertBlock.getNewStart() + insertLineIndex;
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, newLineNo);
+ }
+ builder.append("<td class='number noselect old new'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='number noselect old new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect old new'>*</td>");
+ builder.append("<td class='content old new' data-old='").append(oldLineNo).append("' data-new='").append(newLineNo).append("'>");
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits())
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ builder.append("</td>");
+ } else {
+ if (blameInfo != null) {
+ appendBlame(builder, oldLineNo, -1);
+ }
+ builder.append("<td class='number noselect old'>").append(oldLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect old'>-</td>");
+ builder.append("<td class='content left old' data-old='").append(oldLineNo).append("'>");
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits()) {
+ if (tokenBlock.getOperation() != Operation.INSERT)
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ }
+ builder.append("</td>");
+
+ if (blameInfo != null) {
+ appendBlame(builder, -1, newLineNo);
+ }
+ builder.append("<td class='number noselect new'>").append(newLineNo+1).append("</td>");
+ builder.append("<td class='operation noselect new'>+</td>");
+ builder.append("<td class='content right new' data-new='").append(newLineNo).append("'>");
+ if (tokenDiffs.isEmpty()) {
+ builder.append("&nbsp;");
+ } else {
+ for (DiffBlock<TextToken> tokenBlock: tokenDiffs) {
+ for (TextToken token: tokenBlock.getUnits()) {
+ if (tokenBlock.getOperation() != Operation.DELETE)
+ builder.append(TokenUtils.toHtml(token, getOperationClass(tokenBlock.getOperation()), null));
+ }
+ }
+ }
+ builder.append("</td>");
+ }
+
+ builder.append("</tr>");
+ }
+
+ private void appendExpander(StringBuilder builder, int blockIndex, int skippedLines) {
+ builder.append("<tr class='expander expander").append(blockIndex).append("'>");
+
+ String script = String.format("javascript:$('#%s').data('callback')('expand', %d);", getMarkupId(), blockIndex);
+ if (diffMode == DiffViewMode.UNIFIED) {
+ if (blameInfo != null) {
+ builder.append("<td colspan='3' class='expander noselect'><a title='Show more lines' href=\"")
+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ } else {
+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"")
+ .append(script).append("\"><i class='fa fa-sort'></i></a></td>");
+ }
+ builder.append("<td colspan='2' class='skipped noselect'><i class='fa fa-ellipsis-h'></i> skipped ")
+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
+ } else {
+ if (blameInfo != null) {
+ builder.append("<td colspan='2' class='expander noselect'><a title='Show more lines' href=\"").append(script)
+ .append("\"><i class='fa fa-sort'></i></a></td>");
+ builder.append("<td class='skipped noselect' colspan='6'><i class='fa fa-ellipsis-h'></i> skipped ")
+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
+ blameInfo.lastCommitHash = null;
+ blameInfo.lastOldCommitHash = null;
+ blameInfo.lastNewCommitHash = null;
+ } else {
+ builder.append("<td class='expander noselect'><a title='Show more lines' href=\"").append(script)
+ .append("\"><i class='fa fa-sort'></i></a></td>");
+ builder.append("<td class='skipped noselect' colspan='5'><i class='fa fa-ellipsis-h'></i> skipped ")
+ .append(skippedLines).append(" lines <i class='fa fa-ellipsis-h'></i></td>");
+ }
+ }
+ builder.append("</tr>");
+ }
+
+ private List<MarkAwareDiffBlock> getDiffBlocks() {
+ if (diffBlocks == null) {
+ diffBlocks = new ArrayList<>();
+ List<Range> oldRanges = new ArrayList<>();
+ List<Range> newRanges = new ArrayList<>();
+ if (commentSupport != null) {
+ String oldCommitHash = getOldCommit().name();
+ for (MarkPos each: initialMarks) {
+ Range range = new Range(each.getRange().beginLine, each.getRange().endLine+1);
+ if (each.getCommit().equals(oldCommitHash)) {
+ oldRanges.add(range);
+ } else {
+ newRanges.add(range);
+ }
+ }
+ }
+
+ for (DiffBlock<Tokenized> diffBlock: change.getDiffBlocks()) {
+ if (diffBlock.getOperation() == Operation.DELETE) {
+ diffBlocks.add(new MarkAwareDiffBlock(Type.DELETE, diffBlock.getUnits(),
+ diffBlock.getOldStart(), diffBlock.getNewStart()));
+ } else if (diffBlock.getOperation() == Operation.INSERT) {
+ diffBlocks.add(new MarkAwareDiffBlock(Type.INSERT, diffBlock.getUnits(),
+ diffBlock.getOldStart(), diffBlock.getNewStart()));
+ } else {
+ List<Range> ranges = new ArrayList<>();
+ for (Range range: oldRanges) {
+ ranges.add(new Range(range.getFrom()-diffBlock.getOldStart(), range.getTo()-diffBlock.getOldStart()));
+ }
+ for (Range range: newRanges) {
+ ranges.add(new Range(range.getFrom()-diffBlock.getNewStart(), range.getTo()-diffBlock.getNewStart()));
+ }
+ ranges = RangeUtils.merge(ranges);
+
+ int lastIndex = 0;
+ for (Range range: ranges) {
+ int from = range.getFrom();
+ int to = range.getTo();
+ if (from < diffBlock.getUnits().size() && to > 0) {
+ if (from < lastIndex)
+ from = lastIndex;
+ if (to > diffBlock.getUnits().size())
+ to = diffBlock.getUnits().size();
+ if (lastIndex < from) {
+ List<Tokenized> lines = diffBlock.getUnits().subList(lastIndex, from);
+ diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,
+ diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));
+ }
+ if (from < to) {
+ List<Tokenized> lines = diffBlock.getUnits().subList(from, to);
+ diffBlocks.add(new MarkAwareDiffBlock(Type.MARKED_EQUAL, lines,
+ diffBlock.getOldStart()+from, diffBlock.getNewStart()+from));
+ }
+ lastIndex = to;
+ }
+ }
+
+ if (lastIndex < diffBlock.getUnits().size()) {
+ List<Tokenized> lines = diffBlock.getUnits().subList(lastIndex, diffBlock.getUnits().size());
+ diffBlocks.add(new MarkAwareDiffBlock(Type.EQUAL, lines,
+ diffBlock.getOldStart()+lastIndex, diffBlock.getNewStart()+lastIndex));
+ }
+ }
+ }
+ }
+ return diffBlocks;
+ }
+
+ @Override
+ protected void onDetach() {
+ projectModel.detach();
+ requestModel.detach();
+
+ if (blameModel != null)
+ blameModel.detach();
+
+ super.onDetach();
+ }
+
+ private String getJsonOfComment(CodeComment comment) {
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.id = comment.getId();
+ commentInfo.mark = new MarkInfo(comment, getOldCommit().name());
+
+ String jsonOfCommentInfo;
+ try {
+ jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ return jsonOfCommentInfo;
+ }
+
+ @Override
+ public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
+ String script = String.format("onedev.server.textDiff.onCommentDeleted($('#%s'), %s);",
+ getMarkupId(), getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ mark(target, null);
+ }
+
+ @Override
+ public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) {
+ String script = String.format("onedev.server.textDiff.onCloseComment($('#%s'));", getMarkupId());
+ target.appendJavaScript(script);
+ mark(target, null);
+ }
+
+ @Override
+ public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) {
+ String script = String.format("onedev.server.textDiff.onCommentAdded($('#%s'), %s);",
+ getMarkupId(), getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ }
+
+ @Override
+ public void mark(AjaxRequestTarget target, MarkPos mark) {
+ String script;
+ if (mark != null) {
+ script = String.format(""
+ + "var $container = $('#%s');"
+ + "var mark = %s;"
+ + "onedev.server.textDiff.scrollTo($container, mark);"
+ + "onedev.server.textDiff.mark($container, mark);",
+ getMarkupId(), getJson(mark));
+ } else {
+ script = String.format(""
+ + "var $container = $('#%s');"
+ + "onedev.server.textDiff.clearMark($container);"
+ + "$container.removeData('mark');",
+ getMarkupId());
+ }
+ target.appendJavaScript(script);
+ }
+
+ @Override
+ public void onUnblame(AjaxRequestTarget target) {
+ blameInfo = null;
+ target.add(this);
+ }
+
+ @SuppressWarnings("unused")
+ private static class CommentInfo {
+ long id;
+
+ String title;
+
+ MarkInfo mark;
+ }
+
+ @SuppressWarnings("unused")
+ private static class MarkInfo extends TextRange {
+
+ String path;
+
+ boolean leftSide;
+
+ public MarkInfo() {
+
+ }
+
+ public MarkInfo(CodeComment comment, String oldCommitHash) {
+ super(comment.getMarkPos().getRange());
+ path = comment.getMarkPos().getPath();
+ leftSide = comment.getMarkPos().getCommit().equals(oldCommitHash);
+ }
+
+ public MarkInfo(MarkPos mark, String oldCommitHash) {
+ super(mark.getRange());
+ path = mark.getPath();
+ leftSide = mark.getCommit().equals(oldCommitHash);
+ }
+
+ }
+
+ private static class BlameInfo implements Serializable {
+
+ Map<Integer, BlameCommit> oldBlame = new HashMap<>();
+
+ Map<Integer, BlameCommit> newBlame = new HashMap<>();
+
+ String lastCommitHash;
+
+ String lastOldCommitHash;
+
+ String lastNewCommitHash;
+
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java
index 8f13ecfe14..12ea252688 100644
--- a/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/stringlist/StringListPropertyEditor.java
@@ -1,87 +1,87 @@
-package io.onedev.server.web.editable.stringlist;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.google.common.base.Splitter;
-
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.web.behavior.OnTypingDoneBehavior;
-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.web.editable.EditableUtils;
-import io.onedev.server.web.editable.ErrorContext;
-import io.onedev.server.web.editable.PathElement;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.annotation.OmitName;
-
-@SuppressWarnings("serial")
-public class StringListPropertyEditor extends PropertyEditor<List<String>> {
-
- private TextArea<String> input;
-
- public StringListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- String content;
- if (getModelObject() != null)
- content = StringUtils.join(getModelObject(), "\n");
- else
- content = "";
- input = new TextArea<String>("input", Model.of(content));
-
- InputAssistBehavior inputAssistBehavior = getInputAssistBehavior();
- if (inputAssistBehavior != null)
- input.add(inputAssistBehavior);
-
- input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
-
- add(input);
- input.add(new OnTypingDoneBehavior() {
-
- @Override
- protected void onTypingDone(AjaxRequestTarget target) {
- onPropertyUpdating(target);
- }
-
- });
-
- Method getter = getDescriptor().getPropertyGetter();
- if (getter.getAnnotation(OmitName.class) != null)
- input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));
- }
-
- @Override
- public ErrorContext getErrorContext(PathElement element) {
- return null;
- }
-
- @Override
- protected List<String> convertInputToValue() throws ConversionException {
- if (input.getConvertedInput() != null)
- return Splitter.on("\n").trimResults().omitEmptyStrings().splitToList(input.getConvertedInput());
- else
- return new ArrayList<>();
- }
-
- @Nullable
- protected InputAssistBehavior getInputAssistBehavior() {
- return null;
- }
-
-}
+package io.onedev.server.web.editable.stringlist;
+
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import com.google.common.base.Splitter;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.editable.ErrorContext;
+import io.onedev.server.web.editable.PathElement;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.annotation.OmitName;
+
+@SuppressWarnings("serial")
+public class StringListPropertyEditor extends PropertyEditor<List<String>> {
+
+ private TextArea<String> input;
+
+ public StringListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ String content;
+ if (getModelObject() != null)
+ content = StringUtils.join(getModelObject(), "\n");
+ else
+ content = "";
+ input = new TextArea<String>("input", Model.of(content));
+
+ InputAssistBehavior inputAssistBehavior = getInputAssistBehavior();
+ if (inputAssistBehavior != null)
+ input.add(inputAssistBehavior);
+
+ input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
+
+ add(input);
+ input.add(new OnTypingDoneBehavior() {
+
+ @Override
+ protected void onTypingDone(AjaxRequestTarget target) {
+ onPropertyUpdating(target);
+ }
+
+ });
+
+ Method getter = getDescriptor().getPropertyGetter();
+ if (getter.getAnnotation(OmitName.class) != null)
+ input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathElement element) {
+ return null;
+ }
+
+ @Override
+ protected List<String> convertInputToValue() throws ConversionException {
+ List<String> value = new ArrayList<>();
+ if (input.getConvertedInput() != null)
+ value.addAll(Splitter.on("\n").trimResults().omitEmptyStrings().splitToList(input.getConvertedInput()));
+ return value;
+ }
+
+ @Nullable
+ protected InputAssistBehavior getInputAssistBehavior() {
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html
index 256140e5d9..129e41f219 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html
@@ -1,27 +1,27 @@
-<wicket:extend>
- <div class="issue-fields def-list list">
- <div class="head clearfix">
- <div class="pull-left">
- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>
- </div>
- </div>
- <table wicket:id="issueFields" class="table table-hover"></table>
- <div class="help-block"><i class="fa fa-info-circle"></i> Define all custom issue fields here. Each project can
- decide to use all or a subset of these fields via its issue transition setting.</div>
- </div>
- <wicket:fragment wicket:id="nameColumnFrag">
- <span class="fa fa-reorder drag-indicator"></span>
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="otherColumnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="viewFieldFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>
- </div>
- <div wicket:id="viewer1"></div>
- <div wicket:id="viewer2"></div>
- </wicket:fragment>
-</wicket:extend>
+<wicket:extend>
+ <div class="issue-fields def-list list">
+ <div class="head clearfix">
+ <div class="pull-left">
+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>
+ </div>
+ </div>
+ <table wicket:id="issueFields" class="table table-hover"></table>
+ <div class="help-block"><i class="fa fa-info-circle"></i> Define all custom issue fields here. Each project can
+ decide to use all or a subset of these fields via its issue transition setting</div>
+ </div>
+ <wicket:fragment wicket:id="nameColumnFrag">
+ <span class="fa fa-reorder drag-indicator"></span>
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="otherColumnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="viewFieldFrag">
+ <div class="actions">
+ <a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>
+ <a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>
+ </div>
+ <div wicket:id="viewer1"></div>
+ <div wicket:id="viewer2"></div>
+ </wicket:fragment>
+</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html
index 7eeab54a8b..b82d6f6d8e 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html
@@ -1,30 +1,30 @@
-<wicket:extend>
- <div class="issue-states def-list list">
- <div class="head clearfix">
- <div class="pull-left">
- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>
- </div>
- </div>
- <div class="body">
- <div class="alert alert-info">The first state will be used as initial state of created issues</div>
- <table wicket:id="issueStates" class="table table-hover"></table>
- <div class="help-block"><i class="fa fa-info-circle"></i> Define all custom issue states here. Each project can
- decide to use all or a subset of these states via its issue transition setting.</div>
- </div>
- </div>
- <wicket:fragment wicket:id="nameColumnFrag">
- <span class="drag-indicator fa fa-reorder"></span>
- <a wicket:id="link"><span wicket:id="label"></span> <label wicket:id="initial" class="label label-default">Initial</label></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="otherColumnFrag">
- <a wicket:id="link"><span wicket:id="label"></span></a>
- </wicket:fragment>
- <wicket:fragment wicket:id="viewStateFrag">
- <div class="actions">
- <a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>
- <a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>
- </div>
- <div wicket:id="feedback"></div>
- <div wicket:id="viewer"></div>
- </wicket:fragment>
-</wicket:extend>
+<wicket:extend>
+ <div class="issue-states def-list list">
+ <div class="head clearfix">
+ <div class="pull-left">
+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>
+ </div>
+ </div>
+ <div class="body">
+ <div class="alert alert-info">The first state will be used as initial state of created issues</div>
+ <table wicket:id="issueStates" class="table table-hover"></table>
+ <div class="help-block"><i class="fa fa-info-circle"></i> Define all custom issue states here. Each project can
+ decide to use all or a subset of these states via its issue transition setting</div>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="nameColumnFrag">
+ <span class="drag-indicator fa fa-reorder"></span>
+ <a wicket:id="link"><span wicket:id="label"></span> <label wicket:id="initial" class="label label-default">Initial</label></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="otherColumnFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="viewStateFrag">
+ <div class="actions">
+ <a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>
+ <a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>
+ </div>
+ <div wicket:id="feedback"></div>
+ <div wicket:id="viewer"></div>
+ </wicket:fragment>
+</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorBean.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
similarity index 55%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorBean.java
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
index 6ffd7ccec4..2b96f2b109 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
@@ -1,27 +1,27 @@
-package io.onedev.server.web.page.admin.jobexecutors;
-
-import java.io.Serializable;
-
-import javax.validation.constraints.NotNull;
-
-import io.onedev.server.model.support.jobexecutor.JobExecutor;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable
-public class JobExecutorBean implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private JobExecutor jobExecutor;
-
- @Editable
- @NotNull
- public JobExecutor getJobExecutor() {
- return jobExecutor;
- }
-
- public void setJobExecutor(JobExecutor jobExecutor) {
- this.jobExecutor = jobExecutor;
- }
-
-}
+package io.onedev.server.web.page.admin.jobexecutor;
+
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class JobExecutorBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private JobExecutor executor;
+
+ @Editable(name="Type")
+ @NotNull
+ public JobExecutor getExecutor() {
+ return executor;
+ }
+
+ public void setExecutor(JobExecutor executor) {
+ this.executor = executor;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.html
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.html
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
similarity index 64%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
index 1ae453a129..39e6a53067 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
@@ -1,8 +1,11 @@
-package io.onedev.server.web.page.admin.jobexecutors;
+package io.onedev.server.web.page.admin.jobexecutor;
import java.io.Serializable;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.util.List;
+
+import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -21,9 +24,9 @@ import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.web.behavior.testform.TestFormBehavior;
import io.onedev.server.web.behavior.testform.TestResult;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
+import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.editable.PropertyContext;
-import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PathElement;
import io.onedev.server.web.editable.PropertyUpdating;
import io.onedev.server.web.util.Testable;
@@ -32,12 +35,30 @@ abstract class JobExecutorEditPanel extends Panel {
private static final Logger logger = LoggerFactory.getLogger(JobExecutorEditPanel.class);
- private final JobExecutor executor;
+ private final List<JobExecutor> executors;
+
+ private final int executorIndex;
- public JobExecutorEditPanel(String id, JobExecutor executor) {
+ public JobExecutorEditPanel(String id, List<JobExecutor> executors, int executorIndex) {
super(id);
- this.executor = executor;
+ this.executors = executors;
+ this.executorIndex = executorIndex;
+ }
+
+ private void checkNameDuplication(BeanEditor editor, JobExecutor executor) {
+ if (executorIndex != -1) {
+ JobExecutor oldExecutor = executors.get(executorIndex);
+ if (!executor.getName().equals(oldExecutor.getName()) && getExecutor(executor.getName()) != null) {
+ editor.getErrorContext(new PathElement.Named("executor"))
+ .getErrorContext(new PathElement.Named("name"))
+ .addError("This name has already been used by another job executor");
+ }
+ } else if (getExecutor(executor.getName()) != null) {
+ editor.getErrorContext(new PathElement.Named("executor"))
+ .getErrorContext(new PathElement.Named("name"))
+ .addError("This name has already been used by another job executor");
+ }
}
@Override
@@ -45,9 +66,10 @@ abstract class JobExecutorEditPanel extends Panel {
super.onInitialize();
JobExecutorBean bean = new JobExecutorBean();
- bean.setJobExecutor(executor);
+ if (executorIndex != -1)
+ bean.setExecutor(executors.get(executorIndex));
- PropertyEditor<Serializable> editor = PropertyContext.editBean("editor", bean, "jobExecutor");
+ BeanEditor editor = BeanContext.editBean("editor", bean);
editor.setOutputMarkupId(true);
AjaxButton saveButton = new AjaxButton("save") {
@@ -55,7 +77,20 @@ abstract class JobExecutorEditPanel extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- onSave(target, bean.getJobExecutor());
+
+ JobExecutor executor = bean.getExecutor();
+ checkNameDuplication(editor, executor);
+
+ if (!editor.hasErrors(true)) {
+ if (executorIndex != -1) {
+ executors.set(executorIndex, executor);
+ } else {
+ executors.add(executor);
+ }
+ onSave(target);
+ } else {
+ target.add(form);
+ }
}
@Override
@@ -90,7 +125,7 @@ abstract class JobExecutorEditPanel extends Panel {
@Override
protected TestResult test() {
try {
- ((Testable)bean.getJobExecutor()).test(testData);
+ ((Testable)bean.getExecutor()).test(testData);
return new TestResult.Successful("Job executor tested successfully");
} catch (Exception e) {
logger.error("Error testing job executor", e);
@@ -149,21 +184,26 @@ abstract class JobExecutorEditPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- if (testData != null) {
- new BeanEditModalPanel(target, testData) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, Serializable bean) {
- target.add(editor);
- target.focusComponent(null);
- testBehavior.requestTest(target);
- }
-
- };
+ checkNameDuplication(editor, bean.getExecutor());
+ if (!editor.hasErrors(true)) {
+ if (testData != null) {
+ new BeanEditModalPanel(target, testData) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Serializable bean) {
+ target.add(editor);
+ target.focusComponent(null);
+ testBehavior.requestTest(target);
+ }
+
+ };
+ } else {
+ target.add(editor);
+ target.focusComponent(null);
+ testBehavior.requestTest(target);
+ }
} else {
- target.add(editor);
- target.focusComponent(null);
- testBehavior.requestTest(target);
+ target.add(form);
}
}
@@ -200,7 +240,16 @@ abstract class JobExecutorEditPanel extends Panel {
setOutputMarkupId(true);
}
- protected abstract void onSave(AjaxRequestTarget target, JobExecutor executor);
+ @Nullable
+ private JobExecutor getExecutor(String executorName) {
+ for (JobExecutor executor: executors) {
+ if (executorName.equals(executor.getName()))
+ return executor;
+ }
+ return null;
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
protected abstract void onCancel(AjaxRequestTarget target);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html
similarity index 85%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html
index b3e0c5b82d..a224c14960 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html
@@ -6,7 +6,7 @@
</ul>
<div wicket:id="newExecutor"></div>
<div class="help-block">
- <i class="fa fa-info-circle"></i> For a given job, the first matching job executor will be used
+ <i class="fa fa-info-circle"></i> For a given CI job, the first matching job executor will be used
</div>
</div>
<wicket:fragment wicket:id="editNewFrag">
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
similarity index 81%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
index 410422602b..f1c7d67cc5 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.jobexecutors;
+package io.onedev.server.web.page.admin.jobexecutor;
import java.util.List;
@@ -22,10 +22,13 @@ import io.onedev.server.web.page.admin.AdministrationPage;
@SuppressWarnings("serial")
public class JobExecutorPage extends AdministrationPage {
+ private List<JobExecutor> executors;
+
private WebMarkupContainer container;
public JobExecutorPage(PageParameters params) {
super(params);
+ executors = getSettingManager().getJobExecutors();
}
private SettingManager getSettingManager() {
@@ -50,20 +53,17 @@ public class JobExecutorPage extends AdministrationPage {
@Override
protected void populateItem(ListItem<JobExecutor> item) {
- item.add(new JobExecutorPanel("executor", item.getModelObject()) {
+ item.add(new JobExecutorPanel("executor", executors, item.getIndex()) {
@Override
protected void onDelete(AjaxRequestTarget target) {
- List<JobExecutor> executors = getSettingManager().getJobExecutors();
executors.remove(item.getIndex());
getSettingManager().saveJobExecutors(executors);
target.add(container);
}
@Override
- protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
- List<JobExecutor> executors = getSettingManager().getJobExecutors();
- executors.set(item.getIndex(), executor);
+ protected void onSave(AjaxRequestTarget target) {
getSettingManager().saveJobExecutors(executors);
}
@@ -97,12 +97,10 @@ public class JobExecutorPage extends AdministrationPage {
public void onClick(AjaxRequestTarget target) {
Fragment fragment = new Fragment("newExecutor", "editNewFrag", getPage());
fragment.setOutputMarkupId(true);
- fragment.add(new JobExecutorEditPanel("editor", null) {
+ fragment.add(new JobExecutorEditPanel("editor", executors, -1) {
@Override
- protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
- List<JobExecutor> executors = getSettingManager().getJobExecutors();
- executors.add(executor);
+ protected void onSave(AjaxRequestTarget target) {
getSettingManager().saveJobExecutors(executors);
container.replace(newAddNewFrag());
target.add(container);
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
similarity index 94%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.html
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
index 334ac77adf..a4a0495fc6 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
@@ -1,14 +1,14 @@
-<wicket:panel>
- <div class="job-executor panel panel-default">
- <div class="panel-heading">
- <span class="drag-indicator"><i class="fa fa-reorder"></i></span>
- <a wicket:id="edit" title="Edit this executor"><i class="fa fa-pencil"></i></a>
- <a wicket:id="delete" title="Delete this executor"><i class="fa fa-trash"></i></a>
- <input wicket:id="enable" type="checkbox">
- <label wicket:id="enableLabel">Enable</label>
- </div>
- <div class="panel-body">
- <div wicket:id="executor"></div>
- </div>
- </div>
+<wicket:panel>
+ <div class="job-executor panel panel-default">
+ <div class="panel-heading">
+ <span class="drag-indicator"><i class="fa fa-reorder"></i></span>
+ <a wicket:id="edit" title="Edit this executor"><i class="fa fa-pencil"></i></a>
+ <a wicket:id="delete" title="Delete this executor"><i class="fa fa-trash"></i></a>
+ <input wicket:id="enable" type="checkbox">
+ <label wicket:id="enableLabel">Enable</label>
+ </div>
+ <div class="panel-body">
+ <div wicket:id="executor"></div>
+ </div>
+ </div>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
similarity index 62%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
index b93f726218..36516d821a 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
@@ -1,4 +1,6 @@
-package io.onedev.server.web.page.admin.jobexecutors;
+package io.onedev.server.web.page.admin.jobexecutor;
+
+import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -19,12 +21,15 @@ import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
@SuppressWarnings("serial")
abstract class JobExecutorPanel extends Panel {
- private final JobExecutor executor;
+ private final List<JobExecutor> executors;
+
+ private final int executorIndex;
- public JobExecutorPanel(String id, JobExecutor executor) {
+ public JobExecutorPanel(String id, List<JobExecutor> executors, int executorIndex) {
super(id);
- this.executor = executor;
+ this.executors = executors;
+ this.executorIndex = executorIndex;
}
@Override
@@ -35,21 +40,21 @@ abstract class JobExecutorPanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- JobExecutorEditPanel editor = new JobExecutorEditPanel("executor", executor) {
+ JobExecutorEditPanel editor = new JobExecutorEditPanel("executor", executors, executorIndex) {
@Override
- protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
- JobExecutorPanel.this.onSave(target, executor);
- Component executorViewer = BeanContext.viewBean("executor", executor).setOutputMarkupId(true);
- JobExecutorPanel.this.replace(executorViewer);
- target.add(executorViewer);
+ protected void onSave(AjaxRequestTarget target) {
+ JobExecutorPanel.this.onSave(target);
+ Component viewer = BeanContext.viewBean("executor", getExecutor()).setOutputMarkupId(true);
+ JobExecutorPanel.this.replace(viewer);
+ target.add(viewer);
}
@Override
protected void onCancel(AjaxRequestTarget target) {
- Component executorViewer = BeanContext.viewBean("executor", executor).setOutputMarkupId(true);
- JobExecutorPanel.this.replace(executorViewer);
- target.add(executorViewer);
+ Component viewer = BeanContext.viewBean("executor", getExecutor()).setOutputMarkupId(true);
+ JobExecutorPanel.this.replace(viewer);
+ target.add(viewer);
}
};
@@ -75,12 +80,12 @@ abstract class JobExecutorPanel extends Panel {
});
AjaxCheckBox enableCheck;
- add(enableCheck = new AjaxCheckBox("enable", Model.of(executor.isEnabled())) {
+ add(enableCheck = new AjaxCheckBox("enable", Model.of(getExecutor().isEnabled())) {
@Override
protected void onUpdate(AjaxRequestTarget target) {
- executor.setEnabled(!executor.isEnabled());
- onSave(target, executor);
+ getExecutor().setEnabled(!getExecutor().isEnabled());
+ onSave(target);
target.add(JobExecutorPanel.this);
}
@@ -95,13 +100,13 @@ abstract class JobExecutorPanel extends Panel {
});
- add(BeanContext.viewBean("executor", executor).setOutputMarkupId(true));
+ add(BeanContext.viewBean("executor", getExecutor()).setOutputMarkupId(true));
add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
@Override
protected String load() {
- return !executor.isEnabled()? "disabled": "";
+ return !getExecutor().isEnabled()? "disabled": "";
}
}));
@@ -109,8 +114,12 @@ abstract class JobExecutorPanel extends Panel {
setOutputMarkupId(true);
}
+ private JobExecutor getExecutor() {
+ return executors.get(executorIndex);
+ }
+
protected abstract void onDelete(AjaxRequestTarget target);
- protected abstract void onSave(AjaxRequestTarget target, JobExecutor executor);
+ protected abstract void onSave(AjaxRequestTarget target);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 67cba9054e..a698dfb7a8 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -1,245 +1,245 @@
-package io.onedev.server.web.page.layout;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.behavior.AttributeAppender;
-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.link.ExternalLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.protocol.http.ClientProperties;
-import org.apache.wicket.protocol.http.request.WebClientInfo;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.commons.launcher.loader.AppLoader;
-import io.onedev.commons.launcher.loader.Plugin;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.userident.UserIdent;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.user.avatar.UserAvatar;
-import io.onedev.server.web.page.admin.AdministrationPage;
-import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
-import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
-import io.onedev.server.web.page.admin.group.GroupListPage;
-import io.onedev.server.web.page.admin.group.GroupPage;
-import io.onedev.server.web.page.admin.group.NewGroupPage;
-import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
-import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
-import io.onedev.server.web.page.admin.jobexecutors.JobExecutorPage;
-import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
-import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
-import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
-import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
-import io.onedev.server.web.page.admin.user.NewUserPage;
-import io.onedev.server.web.page.admin.user.UserListPage;
-import io.onedev.server.web.page.admin.user.UserPage;
-import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.my.MyAvatarPage;
-import io.onedev.server.web.page.my.MyPage;
-import io.onedev.server.web.page.my.MyPasswordPage;
-import io.onedev.server.web.page.my.MyProfilePage;
-import io.onedev.server.web.page.my.MyTokenPage;
-import io.onedev.server.web.page.project.NewProjectPage;
-import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.page.security.LogoutPage;
-import io.onedev.server.web.page.security.RegisterPage;
-
-@SuppressWarnings("serial")
-public abstract class LayoutPage extends BasePage {
-
- private final ClientProperties clientProperties;
-
- public LayoutPage(PageParameters params) {
- super(params);
- clientProperties = ((WebClientInfo)getSession().getClientInfo()).getProperties();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- User loginUser = getLoginUser();
-
- add(newNavContext("navContext"));
-
- WebMarkupContainer projectsContainer = new WebMarkupContainer("navProjects");
- projectsContainer.add(new ViewStateAwarePageLink<Void>("link", ProjectListPage.class));
- if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage || getPage() instanceof NewProjectPage)
- projectsContainer.add(AttributeAppender.append("class", "active"));
- add(projectsContainer);
-
- RepeatingView contributionsView = new RepeatingView("navContributions");
- List<MainNavContribution> contributions = new ArrayList<>();
- for (MainNavContribution contribution: OneDev.getExtensions(MainNavContribution.class)) {
- if (contribution.isAuthorized())
- contributions.add(contribution);
- }
- Collections.sort(contributions, new Comparator<MainNavContribution>() {
-
- @Override
- public int compare(MainNavContribution o1, MainNavContribution o2) {
- return o1.getOrder() - o2.getOrder();
- }
-
- });
- for (MainNavContribution contribution: contributions) {
- WebMarkupContainer contributionContainer = new WebMarkupContainer(contributionsView.newChildId());
- Link<Void> link = new ViewStateAwarePageLink<Void>("link", contribution.getPageClass());
- link.add(new Label("label", contribution.getLabel()));
- contributionContainer.add(link);
- if (contribution.isActive((LayoutPage) getPage()))
- contributionContainer.add(AttributeAppender.append("class", "active"));
- contributionsView.add(contributionContainer);
- }
- add(contributionsView);
-
- WebMarkupContainer administrationContainer = new WebMarkupContainer("navAdministration");
- WebMarkupContainer item;
-
- administrationContainer.add(item = new WebMarkupContainer("userManagement"));
- item.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));
- if (getPage() instanceof UserListPage || getPage() instanceof NewUserPage || getPage() instanceof UserPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("groupManagement"));
- item.add(new ViewStateAwarePageLink<Void>("link", GroupListPage.class));
- if (getPage() instanceof GroupListPage || getPage() instanceof NewGroupPage || getPage() instanceof GroupPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("securitySetting"));
- item.add(new ViewStateAwarePageLink<Void>("link", SecuritySettingPage.class));
- if (getPage() instanceof SecuritySettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("externelAuthentication"));
- item.add(new ViewStateAwarePageLink<Void>("link", AuthenticatorPage.class));
- if (getPage() instanceof AuthenticatorPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));
- item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorPage.class));
- if (getPage() instanceof JobExecutorPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("systemSetting"));
- item.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));
- if (getPage() instanceof SystemSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("issueSetting"));
- item.add(new ViewStateAwarePageLink<Void>("link", IssueFieldListPage.class));
- if (getPage() instanceof GlobalIssueSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("mailSetting"));
- item.add(new ViewStateAwarePageLink<Void>("link", MailSettingPage.class));
- if (getPage() instanceof MailSettingPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("databaseBackup"));
- item.add(new ViewStateAwarePageLink<Void>("link", DatabaseBackupPage.class));
- if (getPage() instanceof DatabaseBackupPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("serverLog"));
- item.add(new ViewStateAwarePageLink<Void>("link", ServerLogPage.class));
- if (getPage() instanceof ServerLogPage)
- item.add(AttributeAppender.append("class", "active"));
-
- administrationContainer.add(item = new WebMarkupContainer("serverInformation"));
- item.add(new ViewStateAwarePageLink<Void>("link", ServerInformationPage.class));
- if (getPage() instanceof ServerInformationPage)
- item.add(AttributeAppender.append("class", "active"));
-
- if (getPage() instanceof AdministrationPage)
- administrationContainer.add(AttributeAppender.append("class", "active"));
- administrationContainer.setVisible(SecurityUtils.isAdministrator());
- add(administrationContainer);
-
- Plugin product = AppLoader.getProduct();
- add(new Label("productVersion", product.getVersion()));
- add(new ExternalLink("docLink", OneDev.getInstance().getDocRoot() + "/"));
-
- WebMarkupContainer notSignedInContainer = new WebMarkupContainer("notSignedIn");
- notSignedInContainer.add(new Link<Void>("signIn") {
-
- @Override
- public void onClick() {
- throw new RestartResponseAtInterceptPageException(LoginPage.class);
- }
-
- });
-
- boolean enableSelfRegister = OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfRegister();
- notSignedInContainer.add(new ViewStateAwarePageLink<Void>("signUp", RegisterPage.class).setVisible(enableSelfRegister));
- notSignedInContainer.setVisible(loginUser == null);
- add(notSignedInContainer);
-
- WebMarkupContainer signedInContainer = new WebMarkupContainer("navSignedIn");
- signedInContainer.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(loginUser))));
- signedInContainer.add(new Label("name", loginUser!=null?loginUser.getDisplayName():""));
- signedInContainer.add(new Label("header", loginUser!=null?loginUser.getDisplayName():""));
-
- signedInContainer.add(item = new WebMarkupContainer("myProfile"));
- item.add(new ViewStateAwarePageLink<Void>("link", MyProfilePage.class));
- if (getPage() instanceof MyProfilePage)
- item.add(AttributeAppender.append("class", "active"));
-
- signedInContainer.add(item = new WebMarkupContainer("myAvatar"));
- item.add(new ViewStateAwarePageLink<Void>("link", MyAvatarPage.class));
- if (getPage() instanceof MyAvatarPage)
- item.add(AttributeAppender.append("class", "active"));
-
- signedInContainer.add(item = new WebMarkupContainer("myPassword"));
- item.add(new ViewStateAwarePageLink<Void>("link", MyPasswordPage.class));
- if (getPage() instanceof MyPasswordPage)
- item.add(AttributeAppender.append("class", "active"));
-
- signedInContainer.add(item = new WebMarkupContainer("myAccessToken"));
- item.add(new ViewStateAwarePageLink<Void>("link", MyTokenPage.class));
- if (getPage() instanceof MyTokenPage)
- item.add(AttributeAppender.append("class", "active"));
-
- signedInContainer.add(new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class));
- signedInContainer.setVisible(loginUser != null);
- if (getPage() instanceof MyPage)
- signedInContainer.add(AttributeAppender.append("class", "active"));
-
- add(signedInContainer);
- }
-
- @Override
- protected boolean isPermitted() {
- return getLoginUser() != null || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new LayoutResourceReference()));
- }
-
- protected Component newNavContext(String componentId) {
- return new WebMarkupContainer(componentId);
- }
-
- public ClientProperties getClientProperties() {
- return clientProperties;
- }
-
-}
+package io.onedev.server.web.page.layout;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.behavior.AttributeAppender;
+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.link.ExternalLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.protocol.http.ClientProperties;
+import org.apache.wicket.protocol.http.request.WebClientInfo;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.commons.launcher.loader.AppLoader;
+import io.onedev.commons.launcher.loader.Plugin;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.user.avatar.UserAvatar;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
+import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.group.GroupListPage;
+import io.onedev.server.web.page.admin.group.GroupPage;
+import io.onedev.server.web.page.admin.group.NewGroupPage;
+import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
+import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
+import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;
+import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
+import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
+import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
+import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
+import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
+import io.onedev.server.web.page.admin.user.NewUserPage;
+import io.onedev.server.web.page.admin.user.UserListPage;
+import io.onedev.server.web.page.admin.user.UserPage;
+import io.onedev.server.web.page.base.BasePage;
+import io.onedev.server.web.page.my.MyAvatarPage;
+import io.onedev.server.web.page.my.MyPage;
+import io.onedev.server.web.page.my.MyPasswordPage;
+import io.onedev.server.web.page.my.MyProfilePage;
+import io.onedev.server.web.page.my.MyTokenPage;
+import io.onedev.server.web.page.project.NewProjectPage;
+import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.security.LogoutPage;
+import io.onedev.server.web.page.security.RegisterPage;
+
+@SuppressWarnings("serial")
+public abstract class LayoutPage extends BasePage {
+
+ private final ClientProperties clientProperties;
+
+ public LayoutPage(PageParameters params) {
+ super(params);
+ clientProperties = ((WebClientInfo)getSession().getClientInfo()).getProperties();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ User loginUser = getLoginUser();
+
+ add(newNavContext("navContext"));
+
+ WebMarkupContainer projectsContainer = new WebMarkupContainer("navProjects");
+ projectsContainer.add(new ViewStateAwarePageLink<Void>("link", ProjectListPage.class));
+ if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage || getPage() instanceof NewProjectPage)
+ projectsContainer.add(AttributeAppender.append("class", "active"));
+ add(projectsContainer);
+
+ RepeatingView contributionsView = new RepeatingView("navContributions");
+ List<MainNavContribution> contributions = new ArrayList<>();
+ for (MainNavContribution contribution: OneDev.getExtensions(MainNavContribution.class)) {
+ if (contribution.isAuthorized())
+ contributions.add(contribution);
+ }
+ Collections.sort(contributions, new Comparator<MainNavContribution>() {
+
+ @Override
+ public int compare(MainNavContribution o1, MainNavContribution o2) {
+ return o1.getOrder() - o2.getOrder();
+ }
+
+ });
+ for (MainNavContribution contribution: contributions) {
+ WebMarkupContainer contributionContainer = new WebMarkupContainer(contributionsView.newChildId());
+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", contribution.getPageClass());
+ link.add(new Label("label", contribution.getLabel()));
+ contributionContainer.add(link);
+ if (contribution.isActive((LayoutPage) getPage()))
+ contributionContainer.add(AttributeAppender.append("class", "active"));
+ contributionsView.add(contributionContainer);
+ }
+ add(contributionsView);
+
+ WebMarkupContainer administrationContainer = new WebMarkupContainer("navAdministration");
+ WebMarkupContainer item;
+
+ administrationContainer.add(item = new WebMarkupContainer("userManagement"));
+ item.add(new ViewStateAwarePageLink<Void>("link", UserListPage.class));
+ if (getPage() instanceof UserListPage || getPage() instanceof NewUserPage || getPage() instanceof UserPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("groupManagement"));
+ item.add(new ViewStateAwarePageLink<Void>("link", GroupListPage.class));
+ if (getPage() instanceof GroupListPage || getPage() instanceof NewGroupPage || getPage() instanceof GroupPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("securitySetting"));
+ item.add(new ViewStateAwarePageLink<Void>("link", SecuritySettingPage.class));
+ if (getPage() instanceof SecuritySettingPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("externelAuthentication"));
+ item.add(new ViewStateAwarePageLink<Void>("link", AuthenticatorPage.class));
+ if (getPage() instanceof AuthenticatorPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("jobExecutors"));
+ item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorPage.class));
+ if (getPage() instanceof JobExecutorPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("systemSetting"));
+ item.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));
+ if (getPage() instanceof SystemSettingPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("issueSetting"));
+ item.add(new ViewStateAwarePageLink<Void>("link", IssueFieldListPage.class));
+ if (getPage() instanceof GlobalIssueSettingPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("mailSetting"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MailSettingPage.class));
+ if (getPage() instanceof MailSettingPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("databaseBackup"));
+ item.add(new ViewStateAwarePageLink<Void>("link", DatabaseBackupPage.class));
+ if (getPage() instanceof DatabaseBackupPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("serverLog"));
+ item.add(new ViewStateAwarePageLink<Void>("link", ServerLogPage.class));
+ if (getPage() instanceof ServerLogPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ administrationContainer.add(item = new WebMarkupContainer("serverInformation"));
+ item.add(new ViewStateAwarePageLink<Void>("link", ServerInformationPage.class));
+ if (getPage() instanceof ServerInformationPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ if (getPage() instanceof AdministrationPage)
+ administrationContainer.add(AttributeAppender.append("class", "active"));
+ administrationContainer.setVisible(SecurityUtils.isAdministrator());
+ add(administrationContainer);
+
+ Plugin product = AppLoader.getProduct();
+ add(new Label("productVersion", product.getVersion()));
+ add(new ExternalLink("docLink", OneDev.getInstance().getDocRoot() + "/"));
+
+ WebMarkupContainer notSignedInContainer = new WebMarkupContainer("notSignedIn");
+ notSignedInContainer.add(new Link<Void>("signIn") {
+
+ @Override
+ public void onClick() {
+ throw new RestartResponseAtInterceptPageException(LoginPage.class);
+ }
+
+ });
+
+ boolean enableSelfRegister = OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableSelfRegister();
+ notSignedInContainer.add(new ViewStateAwarePageLink<Void>("signUp", RegisterPage.class).setVisible(enableSelfRegister));
+ notSignedInContainer.setVisible(loginUser == null);
+ add(notSignedInContainer);
+
+ WebMarkupContainer signedInContainer = new WebMarkupContainer("navSignedIn");
+ signedInContainer.add(new UserAvatar("avatar", UserIdent.of(UserFacade.of(loginUser))));
+ signedInContainer.add(new Label("name", loginUser!=null?loginUser.getDisplayName():""));
+ signedInContainer.add(new Label("header", loginUser!=null?loginUser.getDisplayName():""));
+
+ signedInContainer.add(item = new WebMarkupContainer("myProfile"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MyProfilePage.class));
+ if (getPage() instanceof MyProfilePage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ signedInContainer.add(item = new WebMarkupContainer("myAvatar"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MyAvatarPage.class));
+ if (getPage() instanceof MyAvatarPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ signedInContainer.add(item = new WebMarkupContainer("myPassword"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MyPasswordPage.class));
+ if (getPage() instanceof MyPasswordPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ signedInContainer.add(item = new WebMarkupContainer("myAccessToken"));
+ item.add(new ViewStateAwarePageLink<Void>("link", MyTokenPage.class));
+ if (getPage() instanceof MyTokenPage)
+ item.add(AttributeAppender.append("class", "active"));
+
+ signedInContainer.add(new ViewStateAwarePageLink<Void>("signOut", LogoutPage.class));
+ signedInContainer.setVisible(loginUser != null);
+ if (getPage() instanceof MyPage)
+ signedInContainer.add(AttributeAppender.append("class", "active"));
+
+ add(signedInContainer);
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return getLoginUser() != null || OneDev.getInstance(SettingManager.class).getSecuritySetting().isEnableAnonymousAccess();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new LayoutResourceReference()));
+ }
+
+ protected Component newNavContext(String componentId) {
+ return new WebMarkupContainer(componentId);
+ }
+
+ public ClientProperties getClientProperties() {
+ return clientProperties;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
index 6e5fd1ae2d..b2058c3e96 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
@@ -1,1195 +1,1195 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
-
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-import javax.servlet.http.Cookie;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxChannel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-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.event.IEvent;
-import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
-import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
-import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.CheckBox;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.http.WebResponse;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.unbescape.html.HtmlEscape;
-import org.unbescape.javascript.JavaScriptEscape;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.commons.jsymbol.Symbol;
-import io.onedev.commons.jsymbol.SymbolExtractor;
-import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
-import io.onedev.commons.jsymbol.TokenPosition;
-import io.onedev.commons.utils.Range;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.matchscore.MatchScoreProvider;
-import io.onedev.commons.utils.matchscore.MatchScoreUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.git.BlameBlock;
-import io.onedev.server.git.Blob;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.command.BlameCommand;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.CompareContext;
-import io.onedev.server.model.support.MarkPos;
-import io.onedev.server.model.support.ProjectAndRevision;
-import io.onedev.server.model.support.TextRange;
-import io.onedev.server.search.code.SearchManager;
-import io.onedev.server.search.code.hit.QueryHit;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
-import io.onedev.server.web.component.codecomment.CodeCommentPanel;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
-import io.onedev.server.web.component.menu.MenuItem;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.project.comment.CommentInput;
-import io.onedev.server.web.component.revisionpicker.RevisionSelector;
-import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
-import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
-import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
-import io.onedev.server.web.page.project.blob.render.view.Markable;
-import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.project.compare.RevisionComparePage;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-import io.onedev.server.web.util.WicketUtils;
-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.websocket.PageDataChanged;
-
-/**
- * Make sure to add only one source view panel per page
- *
- * @author robin
- *
- */
-@SuppressWarnings("serial")
-public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMenuContributor {
-
- private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);
-
- private static final String COOKIE_OUTLINE = "sourceView.outline";
-
- private static final String BODY_ID = "body";
-
- private final List<Symbol> symbols = new ArrayList<>();
-
- private final IModel<Map<CodeComment, TextRange>> commentsModel =
- new LoadableDetachableModel<Map<CodeComment, TextRange>>() {
-
- @Override
- protected Map<CodeComment, TextRange> load() {
- return OneDev.getInstance(CodeCommentManager.class).findHistory(
- context.getProject(), context.getCommit(), context.getBlobIdent().path);
- }
-
- };
-
- private WebMarkupContainer commentContainer;
-
- private WebMarkupContainer outline;
-
- private SourceFormatPanel sourceFormat;
-
- private SymbolTooltipPanel symbolTooltip;
-
- private AbstractPostAjaxBehavior ajaxBehavior;
-
- private BlameMessageBehavior blameMessageBehavior;
-
- private final boolean viewPlainMode;
-
- public SourceViewPanel(String id, BlobRenderContext context, boolean viewPlainMode) {
- super(id, context);
-
- this.viewPlainMode = viewPlainMode;
-
- Blob blob = context.getProject().getBlob(context.getBlobIdent());
-
- String blobName = context.getBlobIdent().getName();
- SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);
- if (extractor != null) {
- SearchManager searchManager = OneDev.getInstance(SearchManager.class);
- List<Symbol> cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(),
- blob.getIdent().path);
- if (cachedSymbols != null) {
- symbols.addAll(cachedSymbols);
- } else {
- try {
- symbols.addAll(extractor.extract(null, StringUtils.removeBOM(blob.getText().getContent())));
- } catch (Throwable e) {
- logger.trace("Can not extract symbols from blob: " + context.getBlobIdent(), e);
- }
- }
- }
-
- }
-
- @Override
- protected WebMarkupContainer newOptions(String id) {
- sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {
-
- @Override
- public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceView.onTabSizeChange(%s);", sourceFormat.getTabSize());
- target.appendJavaScript(script);
- }
-
- }, new OptionChangeCallback() {
-
- @Override
- public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());
- target.appendJavaScript(script);
- }
-
- });
- return sourceFormat;
- }
-
- @Override
- public WebMarkupContainer newAdditionalActions(String id) {
- WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);
- if (hasOutline()) {
- actions.add(new CheckBox("outline", Model.of(isOutlineVisibleInitially())).add(new OnChangeAjaxBehavior() {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setMethod(Method.POST);
- }
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- toggleOutline(target);
- }
-
- }));
- } else {
- actions.add(new WebMarkupContainer("outline").setVisible(false));
- }
- return actions;
- }
-
- private void toggleOutline(AjaxRequestTarget target) {
- WebResponse response = (WebResponse) RequestCycle.get().getResponse();
- Cookie cookie;
- if (outline.isVisible()) {
- cookie = new Cookie(COOKIE_OUTLINE, "no");
- outline.setVisible(false);
- } else {
- cookie = new Cookie(COOKIE_OUTLINE, "yes");
- outline.setVisible(true);
- }
- cookie.setPath("/");
- cookie.setMaxAge(Integer.MAX_VALUE);
- response.addCookie(cookie);
- target.add(outline);
- target.appendJavaScript("onedev.server.sourceView.onToggleOutline();");
- }
-
- private String getJson(TextRange mark) {
- try {
- return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- commentContainer = new WebMarkupContainer("comment", Model.of((TextRange)null)) {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initComment();"));
- }
-
- };
-
- WebMarkupContainer head = new WebMarkupContainer("head") {
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
- if (commentContainer.isVisible() && event.getPayload() instanceof PageDataChanged) {
- PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
- pageDataChanged.getHandler().add(this);
- }
- }
-
- };
- head.setOutputMarkupId(true);
- commentContainer.add(head);
-
- head.add(new DropdownLink("context") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(context.getPullRequest() == null && context.getOpenComment() != null);
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new RevisionSelector(id, new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return context.getProject();
- }
-
- }) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, String revision) {
- RevisionComparePage.State state = new RevisionComparePage.State();
- CodeComment comment = context.getOpenComment();
- state.commentId = comment.getId();
- state.mark = comment.getMarkPos();
- state.compareWithMergeBase = false;
- state.leftSide = new ProjectAndRevision(comment.getProject(),
- comment.getMarkPos().getCommit());
- state.rightSide = new ProjectAndRevision(comment.getProject(), revision);
- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
- state.whitespaceOption = context.getOpenComment().getCompareContext().getWhitespaceOption();
- PageParameters params = RevisionComparePage.paramsOf(comment.getProject(), state);
- setResponsePage(RevisionComparePage.class, params);
- }
-
- };
- }
-
- });
-
- head.add(new AjaxLink<Void>("locate") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- CodeComment comment = context.getOpenComment();
- TextRange mark;
- if (comment != null) {
- mark = comment.getMarkPos().getRange();
- } else {
- mark = (TextRange) commentContainer.getDefaultModelObject();
- }
- mark(target, mark);
- context.onMark(target, mark);
- target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- setOutputMarkupId(true);
- }
-
- });
-
- head.add(new AjaxLink<Void>("close") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- closeComment(target);
- }
-
- });
-
- commentContainer.setOutputMarkupPlaceholderTag(true);
-
- if (context.getOpenComment() != null) {
- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {
-
- @Override
- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- target.add(commentContainer.get("head"));
- }
-
- @Override
- protected PullRequest getPullRequest() {
- return context.getPullRequest();
- }
-
- @Override
- protected CompareContext getCompareContext() {
- return SourceViewPanel.this.getCompareContext();
- }
-
- };
- commentContainer.add(commentPanel);
- } else {
- commentContainer.add(new WebMarkupContainer(BODY_ID));
- commentContainer.setVisible(false);
- }
-
- add(commentContainer);
-
- add(ajaxBehavior = new AbstractPostAjaxBehavior() {
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- switch(params.getParameterValue("action").toString()) {
- case "openSelectionPopover":
- TextRange mark = getMark(params, "param1", "param2", "param3", "param4");
- String unableCommentMessage = null;
- PullRequest request = context.getPullRequest();
- String commitHash = context.getCommit().name();
- if (request != null) {
- boolean found = false;
- for (RevCommit commit: context.getPullRequest().getCommits()) {
- if (commit.name().equals(commitHash)) {
- found = true;
- break;
- }
- }
-
- if (!found) {
- if (request.getMergePreview() != null
- && request.getMergePreview().getMerged() != null
- && request.getMergePreview().getMerged().equals(commitHash)) {
- unableCommentMessage = "Unable to comment on pull request merge preview";
- } else {
- unableCommentMessage = "Unable to comment on commits not belonging to pull request";
- }
- }
- }
-
- String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);",
- getJson(mark), context.getMarkUrl(mark), SecurityUtils.getUser()!=null,
- unableCommentMessage!=null?"'" + unableCommentMessage + "'":"undefined");
- target.appendJavaScript(script);
- break;
- case "addComment":
- Preconditions.checkNotNull(SecurityUtils.getUser());
-
- mark = getMark(params, "param1", "param2", "param3", "param4");
- commentContainer.setDefaultModelObject(mark);
-
- Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);
- fragment.setOutputMarkupId(true);
-
- Form<?> form = new Form<Void>("form");
-
- String uuid = UUID.randomUUID().toString();
-
- CommentInput contentInput;
-
- StringBuilder mentions = new StringBuilder();
-
- if (context.getPullRequest() == null) {
- /*
- * Outside of pull request, no one will be notified of the comment. So we automatically
- * mention authors of commented lines
- */
- Range range = new Range(mark.getBeginLine(), mark.getEndLine());
- for (User user: context.getProject().getAuthors(context.getBlobIdent().path, context.getCommit(), range)) {
- if (user.getEmail() != null)
- mentions.append("@").append(user.getName()).append(" ");
- }
- }
-
- form.add(contentInput = new CommentInput("content", Model.of(mentions.toString()), true) {
-
- @Override
- protected ProjectAttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(context.getProject(), uuid);
- }
-
- @Override
- protected Project getProject() {
- return context.getProject();
- }
-
- });
- contentInput.setRequired(true).setLabel(Model.of("Comment"));
-
- NotificationPanel feedback = new NotificationPanel("feedback", form);
- feedback.setOutputMarkupPlaceholderTag(true);
- form.add(feedback);
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- clearComment(target);
- target.appendJavaScript("onedev.server.sourceView.mark(undefined);");
- target.appendJavaScript("$(window).resize();");
- context.onMark(target, null);
- }
-
- });
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(feedback);
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- CodeComment comment = new CodeComment();
- comment.setUUID(uuid);
- comment.setMarkPos(new MarkPos());
- comment.getMarkPos().setCommit(context.getCommit().name());
- comment.getMarkPos().setPath(context.getBlobIdent().path);
- comment.setContent(contentInput.getModelObject());
- comment.setUser(SecurityUtils.getUser());
- comment.getMarkPos().setRange(mark);
- comment.setProject(context.getProject());
- comment.setCompareContext(getCompareContext());
-
- OneDev.getInstance(CodeCommentManager.class).create(comment, context.getPullRequest());
-
- CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {
-
- @Override
- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- target.add(commentContainer.get("head"));
- }
-
- @Override
- protected PullRequest getPullRequest() {
- return context.getPullRequest();
- }
-
- @Override
- protected CompareContext getCompareContext() {
- return SourceViewPanel.this.getCompareContext();
- }
-
- };
- commentContainer.replace(commentPanel);
- target.add(commentContainer);
-
- String script = String.format("onedev.server.sourceView.onCommentAdded(%s);", getJsonOfComment(comment));
- target.appendJavaScript(script);
-
- context.onCommentOpened(target, comment);
- }
-
- });
- fragment.add(form);
- commentContainer.replace(fragment);
- commentContainer.setVisible(true);
- target.add(commentContainer);
- context.onAddComment(target, mark);
- target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", getJson(mark)));
- break;
- case "toggleComment":
- Long commentId = params.getParameterValue("param1").toLong();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
- if (!comment.equals(context.getOpenComment())) {
- CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {
-
- @Override
- protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
- SourceViewPanel.this.onCommentDeleted(target, comment);
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
- target.add(commentContainer.get("head"));
- }
-
- @Override
- protected PullRequest getPullRequest() {
- return context.getPullRequest();
- }
-
- @Override
- protected CompareContext getCompareContext() {
- return SourceViewPanel.this.getCompareContext();
- }
-
- };
- commentContainer.replace(commentPanel);
- commentContainer.setVisible(true);
- target.add(commentContainer);
- script = String.format("onedev.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment));
- target.appendJavaScript(script);
- context.onCommentOpened(target, comment);
- } else {
- closeComment(target);
- }
- break;
- case "outlineSearch":
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return newOutlineSearchPanel(id, this);
- }
-
- };
- break;
- case "syncOutline":
- int line = params.getParameterValue("param1").toInt();
- int ch = params.getParameterValue("param2").toInt();
- Symbol closest = null;
- for (Symbol symbol: symbols) {
- TokenPosition scope = symbol.getScope();
- if (scope != null) {
- if (contains(scope, line, ch)) {
- if (closest != null) {
- if (contains(closest.getScope(), scope.getFromLine(), scope.getFromCh())
- && contains(closest.getScope(), scope.getToLine(), scope.getToCh())) {
- closest = symbol;
- }
- } else {
- closest = symbol;
- }
- }
- }
- }
- if (closest != null) {
- @SuppressWarnings("unchecked")
- NestedTree<Symbol> tree = (NestedTree<Symbol>) outline.get(BODY_ID);
- Symbol current = closest;
- while (current != null) {
- tree.expand(current);
- current = current.getParent();
- }
- script = String.format("onedev.server.sourceView.syncOutline('%s');",
- getSymbolId(symbols, closest));
- target.appendJavaScript(script);
- }
- break;
- }
- }
-
- });
-
- add(blameMessageBehavior = new BlameMessageBehavior() {
-
- @Override
- protected Project getProject() {
- return context.getProject();
- }
- });
-
- outline = new WebMarkupContainer("outline") {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initOutline();"));
- }
-
- };
- outline.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- toggleOutline(target);
- }
-
- });
-
- IModel<HashSet<Symbol>> state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));
- NestedTree<Symbol> tree = new NestedTree<Symbol>(BODY_ID, newSymbolTreeProvider(symbols), state) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new HumanTheme());
- }
-
- @Override
- protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
- Symbol symbol = nodeModel.getObject();
-
- Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
- fragment.setMarkupId(getSymbolId(symbols, symbol));
- fragment.setOutputMarkupId(true);
-
- fragment.add(symbol.renderIcon("icon"));
-
- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- context.onSelect(target, context.getBlobIdent(), symbol.getPosition());
- }
-
- };
- link.add(symbol.render("label", null));
- fragment.add(link);
-
- return fragment;
- }
-
- };
-
- outline.add(tree);
-
- outline.setOutputMarkupPlaceholderTag(true);
- add(outline);
-
- outline.setVisible(isOutlineVisibleInitially());
-
- add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Project>() {
-
- @Override
- public Project getObject() {
- return context.getProject();
- }
-
- }) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
- BlobIdent blobIdent = new BlobIdent(
- getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());
- context.onSelect(target, blobIdent, hit.getTokenPos());
- }
-
- @Override
- protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {
- context.onSearchComplete(target, hits);
- }
-
- @Override
- protected String getBlobPath() {
- return context.getBlobIdent().path;
- }
-
- });
- }
-
- private boolean isOutlineVisibleInitially() {
- if (hasOutline()) {
- WebRequest request = (WebRequest) RequestCycle.get().getRequest();
- Cookie cookie = request.getCookie(COOKIE_OUTLINE);
- if (cookie != null) {
- return cookie.getValue().equals("yes");
- } else {
- return !WicketUtils.isDevice();
- }
- } else {
- return false;
- }
- }
-
- private boolean contains(TokenPosition scope, int line, int ch) {
- int fromLine = scope.getFromLine();
- int toLine = scope.getToLine();
- int fromCh = scope.getFromCh();
- int toCh = scope.getToCh();
- return (fromLine < line || fromLine == line && fromCh<=ch) && (toLine > line || toLine == line && toCh >= ch);
- }
-
- private CompareContext getCompareContext() {
- CompareContext compareContext = new CompareContext();
- compareContext.setCompareCommit(context.getCommit().name());
- if (context.getBlobIdent().path != null)
- compareContext.setPathFilter(PatternSet.quoteIfNecessary(context.getBlobIdent().path));
- return compareContext;
- }
-
- private TextRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,
- String endLineParam, String endCharParam) {
- int beginLine = params.getParameterValue(beginLineParam).toInt();
- int beginChar = params.getParameterValue(beginCharParam).toInt();
- int endLine = params.getParameterValue(endLineParam).toInt();
- int endChar = params.getParameterValue(endCharParam).toInt();
- TextRange mark = new TextRange();
- mark.beginLine = beginLine;
- mark.beginChar = beginChar;
- mark.endLine = endLine;
- mark.endChar = endChar;
- return mark;
- }
-
- private String getJsonOfComment(CodeComment comment) {
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.mark = Preconditions.checkNotNull(comment.mapRange(context.getBlobIdent()));
-
- String jsonOfCommentInfo;
- try {
- jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- return jsonOfCommentInfo;
- }
-
- private void clearComment(AjaxRequestTarget target) {
- commentContainer.replace(new WebMarkupContainer(BODY_ID));
- commentContainer.setVisible(false);
- target.add(commentContainer);
- }
-
- private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
- clearComment(target);
- String script = String.format("onedev.server.sourceView.onCommentDeleted(%s);",
- getJsonOfComment(comment));
- target.appendJavaScript(script);
- context.onCommentOpened(target, null);
- }
-
- private boolean hasOutline() {
- for (Symbol symbol: symbols) {
- if (symbol.isDisplayInOutline())
- return true;
- }
- return false;
- }
-
- private List<Symbol> getChildSymbols(List<Symbol> symbols, @Nullable Symbol parentSymbol) {
- List<Symbol> children = new ArrayList<>();
- for (Symbol symbol: symbols) {
- if (symbol.isDisplayInOutline() && symbol.getOutlineParent() == parentSymbol)
- children.add(symbol);
- }
- return children;
- }
-
- private String getJsonOfBlameInfos(boolean blamed) {
- String jsonOfBlameInfos;
- if (blamed) {
- List<BlameInfo> blameInfos = new ArrayList<>();
-
- String commitHash = context.getCommit().name();
-
- BlameCommand cmd = new BlameCommand(context.getProject().getGitDir());
- cmd.commitHash(commitHash).file(context.getBlobIdent().path);
- for (BlameBlock blame: cmd.call()) {
- BlameInfo blameInfo = new BlameInfo();
- blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());
- blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());
- blameInfo.hash = blame.getCommit().getHash();
- blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);
- CommitDetailPage.State state = new CommitDetailPage.State();
- state.revision = blame.getCommit().getHash();
- if (context.getBlobIdent().path != null)
- state.pathFilter = PatternSet.quoteIfNecessary(context.getBlobIdent().path);
- PageParameters params = CommitDetailPage.paramsOf(context.getProject(), state);
- blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
- blameInfo.ranges = blame.getRanges();
- blameInfos.add(blameInfo);
- }
- try {
- jsonOfBlameInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- } else {
- jsonOfBlameInfos = "undefined";
- }
- return jsonOfBlameInfos;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));
-
- Blob blob = context.getProject().getBlob(context.getBlobIdent());
-
- String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);
- Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();
- for (Map.Entry<CodeComment, TextRange> entry: commentsModel.getObject().entrySet()) {
- CodeComment comment = entry.getKey();
- TextRange textRange = entry.getValue();
- int line = textRange.getBeginLine();
- List<CommentInfo> commentInfosAtLine = commentInfos.get(line);
- if (commentInfosAtLine == null) {
- commentInfosAtLine = new ArrayList<>();
- commentInfos.put(line, commentInfosAtLine);
- }
- CommentInfo commentInfo = new CommentInfo();
- commentInfo.id = comment.getId();
- commentInfo.mark = textRange;
- commentInfosAtLine.add(commentInfo);
- }
- for (List<CommentInfo> value: commentInfos.values()) {
- value.sort((o1, o2)->(int)(o1.id-o2.id));
- }
-
- String jsonOfCommentInfos;
- try {
- jsonOfCommentInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfos);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
-
- String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";
-
- CharSequence callback = ajaxBehavior.getCallbackFunction(
- explicit("action"), explicit("param1"), explicit("param2"),
- explicit("param3"), explicit("param4"));
-
- String script = String.format("onedev.server.sourceView.onDomReady('%s', '%s', %s, %s, '%s', '%s', "
- + "%s, %s, %s, %s, %s, '%s');",
- JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),
- JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),
- context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",
- jsonOfMark,
- symbolTooltip.getMarkupId(),
- context.getBlobIdent().revision,
- jsonOfBlameInfos,
- jsonOfCommentInfos,
- callback,
- blameMessageBehavior.getCallback(),
- sourceFormat.getTabSize(),
- sourceFormat.getLineWrapMode());
- response.render(OnDomReadyHeaderItem.forScript(script));
-
- script = String.format("onedev.server.sourceView.onWindowLoad(%s);", jsonOfMark);
- response.render(OnLoadHeaderItem.forScript(script));
- }
-
- @Override
- protected void onDetach() {
- commentsModel.detach();
- super.onDetach();
- }
-
- @SuppressWarnings("unused")
- private static class BlameInfo {
-
- String abbreviatedHash;
-
- String hash;
-
- String url;
-
- String authorName;
-
- String commitDate;
-
- List<Range> ranges;
- }
-
- private String getSymbolId(List<Symbol> symbols, Symbol symbol) {
- return "outline-symbol-" + symbols.indexOf(symbol);
- }
-
- @SuppressWarnings("unused")
- private static class CommentInfo {
- long id;
-
- String title;
-
- TextRange mark;
- }
-
- @Override
- protected boolean isEditSupported() {
- return true;
- }
-
- @Override
- public void mark(AjaxRequestTarget target, TextRange mark) {
- String script;
- if (mark != null) {
- script = String.format("onedev.server.sourceView.mark(%s);", getJson(mark));
- } else {
- script = String.format("onedev.server.sourceView.mark(undefined);");
- }
- target.appendJavaScript(script);
- }
-
- private ITreeProvider<Symbol> newSymbolTreeProvider(List<Symbol> symbols) {
- return new ITreeProvider<Symbol>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Iterator<? extends Symbol> getRoots() {
- return getChildSymbols(symbols, null).iterator();
- }
-
- @Override
- public boolean hasChildren(Symbol symbol) {
- return !getChildSymbols(symbols, symbol).isEmpty();
- }
-
- @Override
- public Iterator<? extends Symbol> getChildren(Symbol symbol) {
- return getChildSymbols(symbols, symbol).iterator();
- }
-
- @Override
- public IModel<Symbol> model(Symbol symbol) {
- return Model.of(symbol);
- }
-
- };
- }
-
- private NestedTree<Symbol> newOutlineSearchSymbolTree(ModalPanel modal, List<Symbol> symbols,
- @Nullable String searchInput) {
- IModel<HashSet<Symbol>> state;
- if (StringUtils.isNotBlank(searchInput)) {
- state = new Model<HashSet<Symbol>>(new HashSet<>(symbols));
- } else {
- state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));
- }
- NestedTree<Symbol> tree = new NestedTree<Symbol>("result", newSymbolTreeProvider(symbols), state) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new HumanTheme());
- }
-
- @Override
- protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
- Symbol symbol = nodeModel.getObject();
-
- Fragment fragment = new Fragment(id, "outlineSearchNodeFrag", SourceViewPanel.this);
- fragment.setOutputMarkupId(true);
-
- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- context.onSelect(target, context.getBlobIdent(), symbol.getPosition());
- }
-
- };
- link.add(symbol.renderIcon("icon"));
- link.add(symbol.render("label", null));
- link.add(AttributeAppender.append("data-symbolindex", symbols.indexOf(symbol)));
-
- fragment.add(link);
-
- if (symbol == symbols.get(0)) {
- link.add(AttributeAppender.append("class", "active"));
- }
-
- return fragment;
- }
-
- };
-
- tree.setOutputMarkupId(true);
-
- return tree;
- }
-
- private void closeComment(AjaxRequestTarget target) {
- clearComment(target);
- if (context.getOpenComment() != null)
- context.onCommentOpened(target, null);
- target.appendJavaScript("onedev.server.sourceView.onCloseComment();");
- }
-
- private Component newOutlineSearchPanel(String id, ModalPanel modal) {
- Fragment fragment = new Fragment(id, "outlineSearchFrag", SourceViewPanel.this);
- fragment.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- modal.close();
- }
-
- });
-
- TextField<String> searchField = new TextField<>("input");
- fragment.add(searchField);
- fragment.add(newOutlineSearchSymbolTree(modal, symbols, null));
-
- fragment.add(new AbstractPostAjaxBehavior() {
-
- private List<Symbol> filteredSymbols = new ArrayList<Symbol>(symbols);
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setChannel(new AjaxChannel("outline-search-input", AjaxChannel.Type.DROP));
- }
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
- String key = params.getParameterValue("key").toString();
-
- if (key.equals("input")) {
- String searchInput = params.getParameterValue("param").toString();
-
- MatchScoreProvider<Symbol> matchScoreProvider = new MatchScoreProvider<Symbol>() {
-
- @Override
- public double getMatchScore(Symbol object) {
- return MatchScoreUtils.getMatchScore(object.getName(), searchInput);
- }
-
- };
-
- List<Symbol> matchSymbols = MatchScoreUtils.filterAndSort(symbols, matchScoreProvider);
-
- filteredSymbols = new ArrayList<>();
- for (Symbol symbol: matchSymbols) {
- Symbol current = symbol;
- while (current != null) {
- if (!filteredSymbols.contains(current))
- filteredSymbols.add(current);
- current = current.getOutlineParent();
- }
- }
-
- NestedTree<Symbol> tree = newOutlineSearchSymbolTree(modal, filteredSymbols, searchInput);
- fragment.replace(tree);
- target.add(tree);
- } else if (key.equals("return")) {
- int symbolIndex = params.getParameterValue("param").toInt();
- Symbol symbol = filteredSymbols.get(symbolIndex);
- context.onSelect(target, context.getBlobIdent(), symbol.getPosition());
- modal.close();
- } else {
- throw new IllegalStateException("Unrecognized key: " + key);
- }
- }
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
- String script = String.format(
- "onedev.server.sourceView.onOutlineSearchDomReady('%s', %s);",
- fragment.getMarkupId(),
- getCallbackFunction(explicit("key"), explicit("param")));
-
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- });
- fragment.setOutputMarkupId(true);
-
- return fragment;
- }
-
- @Override
- public List<MenuItem> getMenuItems(FloatingPanel dropdown) {
- List<MenuItem> menuItems = new ArrayList<>();
- if (hasOutline()) {
- menuItems.add(new MenuItem() {
-
- @Override
- public String getShortcut() {
- return "O";
- }
-
- @Override
- public String getLabel() {
- return "Outline Search";
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new ModalLink(id) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
- dropdown.close();
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return newOutlineSearchPanel(id, modal);
- }
-
- };
- }
-
- });
- }
- return menuItems;
- }
-
- @Override
- protected boolean isViewPlainSupported() {
- return viewPlainMode;
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.renderers.source;
+
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+import javax.servlet.http.Cookie;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxChannel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+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.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.tree.ITreeProvider;
+import org.apache.wicket.extensions.markup.html.repeater.tree.NestedTree;
+import org.apache.wicket.extensions.markup.html.repeater.tree.theme.HumanTheme;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.http.WebResponse;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.unbescape.html.HtmlEscape;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.jsymbol.Symbol;
+import io.onedev.commons.jsymbol.SymbolExtractor;
+import io.onedev.commons.jsymbol.SymbolExtractorRegistry;
+import io.onedev.commons.jsymbol.TokenPosition;
+import io.onedev.commons.utils.Range;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.matchscore.MatchScoreProvider;
+import io.onedev.commons.utils.matchscore.MatchScoreUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.git.BlameBlock;
+import io.onedev.server.git.Blob;
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.command.BlameCommand;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.CompareContext;
+import io.onedev.server.model.support.MarkPos;
+import io.onedev.server.model.support.ProjectAndRevision;
+import io.onedev.server.model.support.TextRange;
+import io.onedev.server.search.code.SearchManager;
+import io.onedev.server.search.code.hit.QueryHit;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior;
+import io.onedev.server.web.component.codecomment.CodeCommentPanel;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.project.comment.CommentInput;
+import io.onedev.server.web.component.revisionpicker.RevisionSelector;
+import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
+import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
+import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
+import io.onedev.server.web.page.project.blob.render.view.Markable;
+import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;
+import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.page.project.compare.RevisionComparePage;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
+import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.websocket.PageDataChanged;
+
+/**
+ * Make sure to add only one source view panel per page
+ *
+ * @author robin
+ *
+ */
+@SuppressWarnings("serial")
+public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMenuContributor {
+
+ private static final Logger logger = LoggerFactory.getLogger(SourceViewPanel.class);
+
+ private static final String COOKIE_OUTLINE = "sourceView.outline";
+
+ private static final String BODY_ID = "body";
+
+ private final List<Symbol> symbols = new ArrayList<>();
+
+ private final IModel<Map<CodeComment, TextRange>> commentsModel =
+ new LoadableDetachableModel<Map<CodeComment, TextRange>>() {
+
+ @Override
+ protected Map<CodeComment, TextRange> load() {
+ return OneDev.getInstance(CodeCommentManager.class).findHistory(
+ context.getProject(), context.getCommit(), context.getBlobIdent().path);
+ }
+
+ };
+
+ private WebMarkupContainer commentContainer;
+
+ private WebMarkupContainer outline;
+
+ private SourceFormatPanel sourceFormat;
+
+ private SymbolTooltipPanel symbolTooltip;
+
+ private AbstractPostAjaxBehavior ajaxBehavior;
+
+ private BlameMessageBehavior blameMessageBehavior;
+
+ private final boolean viewPlainMode;
+
+ public SourceViewPanel(String id, BlobRenderContext context, boolean viewPlainMode) {
+ super(id, context);
+
+ this.viewPlainMode = viewPlainMode;
+
+ Blob blob = context.getProject().getBlob(context.getBlobIdent());
+
+ String blobName = context.getBlobIdent().getName();
+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);
+ if (extractor != null) {
+ SearchManager searchManager = OneDev.getInstance(SearchManager.class);
+ List<Symbol> cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(),
+ blob.getIdent().path);
+ if (cachedSymbols != null) {
+ symbols.addAll(cachedSymbols);
+ } else {
+ try {
+ symbols.addAll(extractor.extract(null, StringUtils.removeBOM(blob.getText().getContent())));
+ } catch (Exception e) {
+ logger.trace("Can not extract symbols from blob: " + context.getBlobIdent(), e);
+ }
+ }
+ }
+
+ }
+
+ @Override
+ protected WebMarkupContainer newOptions(String id) {
+ sourceFormat = new SourceFormatPanel(id, null, new OptionChangeCallback() {
+
+ @Override
+ public void onOptioneChange(AjaxRequestTarget target) {
+ String script = String.format("onedev.server.sourceView.onTabSizeChange(%s);", sourceFormat.getTabSize());
+ target.appendJavaScript(script);
+ }
+
+ }, new OptionChangeCallback() {
+
+ @Override
+ public void onOptioneChange(AjaxRequestTarget target) {
+ String script = String.format("onedev.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode());
+ target.appendJavaScript(script);
+ }
+
+ });
+ return sourceFormat;
+ }
+
+ @Override
+ public WebMarkupContainer newAdditionalActions(String id) {
+ WebMarkupContainer actions = new Fragment(id, "actionsFrag", this);
+ if (hasOutline()) {
+ actions.add(new CheckBox("outline", Model.of(isOutlineVisibleInitially())).add(new OnChangeAjaxBehavior() {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setMethod(Method.POST);
+ }
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ toggleOutline(target);
+ }
+
+ }));
+ } else {
+ actions.add(new WebMarkupContainer("outline").setVisible(false));
+ }
+ return actions;
+ }
+
+ private void toggleOutline(AjaxRequestTarget target) {
+ WebResponse response = (WebResponse) RequestCycle.get().getResponse();
+ Cookie cookie;
+ if (outline.isVisible()) {
+ cookie = new Cookie(COOKIE_OUTLINE, "no");
+ outline.setVisible(false);
+ } else {
+ cookie = new Cookie(COOKIE_OUTLINE, "yes");
+ outline.setVisible(true);
+ }
+ cookie.setPath("/");
+ cookie.setMaxAge(Integer.MAX_VALUE);
+ response.addCookie(cookie);
+ target.add(outline);
+ target.appendJavaScript("onedev.server.sourceView.onToggleOutline();");
+ }
+
+ private String getJson(TextRange mark) {
+ try {
+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ commentContainer = new WebMarkupContainer("comment", Model.of((TextRange)null)) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initComment();"));
+ }
+
+ };
+
+ WebMarkupContainer head = new WebMarkupContainer("head") {
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+ if (commentContainer.isVisible() && event.getPayload() instanceof PageDataChanged) {
+ PageDataChanged pageDataChanged = (PageDataChanged) event.getPayload();
+ pageDataChanged.getHandler().add(this);
+ }
+ }
+
+ };
+ head.setOutputMarkupId(true);
+ commentContainer.add(head);
+
+ head.add(new DropdownLink("context") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(context.getPullRequest() == null && context.getOpenComment() != null);
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new RevisionSelector(id, new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return context.getProject();
+ }
+
+ }) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, String revision) {
+ RevisionComparePage.State state = new RevisionComparePage.State();
+ CodeComment comment = context.getOpenComment();
+ state.commentId = comment.getId();
+ state.mark = comment.getMarkPos();
+ state.compareWithMergeBase = false;
+ state.leftSide = new ProjectAndRevision(comment.getProject(),
+ comment.getMarkPos().getCommit());
+ state.rightSide = new ProjectAndRevision(comment.getProject(), revision);
+ state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
+ state.whitespaceOption = context.getOpenComment().getCompareContext().getWhitespaceOption();
+ PageParameters params = RevisionComparePage.paramsOf(comment.getProject(), state);
+ setResponsePage(RevisionComparePage.class, params);
+ }
+
+ };
+ }
+
+ });
+
+ head.add(new AjaxLink<Void>("locate") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ CodeComment comment = context.getOpenComment();
+ TextRange mark;
+ if (comment != null) {
+ mark = comment.getMarkPos().getRange();
+ } else {
+ mark = (TextRange) commentContainer.getDefaultModelObject();
+ }
+ mark(target, mark);
+ context.onMark(target, mark);
+ target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ setOutputMarkupId(true);
+ }
+
+ });
+
+ head.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(commentContainer));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ closeComment(target);
+ }
+
+ });
+
+ commentContainer.setOutputMarkupPlaceholderTag(true);
+
+ if (context.getOpenComment() != null) {
+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {
+
+ @Override
+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
+ SourceViewPanel.this.onCommentDeleted(target, comment);
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
+ target.add(commentContainer.get("head"));
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return context.getPullRequest();
+ }
+
+ @Override
+ protected CompareContext getCompareContext() {
+ return SourceViewPanel.this.getCompareContext();
+ }
+
+ };
+ commentContainer.add(commentPanel);
+ } else {
+ commentContainer.add(new WebMarkupContainer(BODY_ID));
+ commentContainer.setVisible(false);
+ }
+
+ add(commentContainer);
+
+ add(ajaxBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ switch(params.getParameterValue("action").toString()) {
+ case "openSelectionPopover":
+ TextRange mark = getMark(params, "param1", "param2", "param3", "param4");
+ String unableCommentMessage = null;
+ PullRequest request = context.getPullRequest();
+ String commitHash = context.getCommit().name();
+ if (request != null) {
+ boolean found = false;
+ for (RevCommit commit: context.getPullRequest().getCommits()) {
+ if (commit.name().equals(commitHash)) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ if (request.getMergePreview() != null
+ && request.getMergePreview().getMerged() != null
+ && request.getMergePreview().getMerged().equals(commitHash)) {
+ unableCommentMessage = "Unable to comment on pull request merge preview";
+ } else {
+ unableCommentMessage = "Unable to comment on commits not belonging to pull request";
+ }
+ }
+ }
+
+ String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);",
+ getJson(mark), context.getMarkUrl(mark), SecurityUtils.getUser()!=null,
+ unableCommentMessage!=null?"'" + unableCommentMessage + "'":"undefined");
+ target.appendJavaScript(script);
+ break;
+ case "addComment":
+ Preconditions.checkNotNull(SecurityUtils.getUser());
+
+ mark = getMark(params, "param1", "param2", "param3", "param4");
+ commentContainer.setDefaultModelObject(mark);
+
+ Fragment fragment = new Fragment(BODY_ID, "newCommentFrag", SourceViewPanel.this);
+ fragment.setOutputMarkupId(true);
+
+ Form<?> form = new Form<Void>("form");
+
+ String uuid = UUID.randomUUID().toString();
+
+ CommentInput contentInput;
+
+ StringBuilder mentions = new StringBuilder();
+
+ if (context.getPullRequest() == null) {
+ /*
+ * Outside of pull request, no one will be notified of the comment. So we automatically
+ * mention authors of commented lines
+ */
+ Range range = new Range(mark.getBeginLine(), mark.getEndLine());
+ for (User user: context.getProject().getAuthors(context.getBlobIdent().path, context.getCommit(), range)) {
+ if (user.getEmail() != null)
+ mentions.append("@").append(user.getName()).append(" ");
+ }
+ }
+
+ form.add(contentInput = new CommentInput("content", Model.of(mentions.toString()), true) {
+
+ @Override
+ protected ProjectAttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(context.getProject(), uuid);
+ }
+
+ @Override
+ protected Project getProject() {
+ return context.getProject();
+ }
+
+ });
+ contentInput.setRequired(true).setLabel(Model.of("Comment"));
+
+ NotificationPanel feedback = new NotificationPanel("feedback", form);
+ feedback.setOutputMarkupPlaceholderTag(true);
+ form.add(feedback);
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(form));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ clearComment(target);
+ target.appendJavaScript("onedev.server.sourceView.mark(undefined);");
+ target.appendJavaScript("$(window).resize();");
+ context.onMark(target, null);
+ }
+
+ });
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ CodeComment comment = new CodeComment();
+ comment.setUUID(uuid);
+ comment.setMarkPos(new MarkPos());
+ comment.getMarkPos().setCommit(context.getCommit().name());
+ comment.getMarkPos().setPath(context.getBlobIdent().path);
+ comment.setContent(contentInput.getModelObject());
+ comment.setUser(SecurityUtils.getUser());
+ comment.getMarkPos().setRange(mark);
+ comment.setProject(context.getProject());
+ comment.setCompareContext(getCompareContext());
+
+ OneDev.getInstance(CodeCommentManager.class).create(comment, context.getPullRequest());
+
+ CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) {
+
+ @Override
+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
+ SourceViewPanel.this.onCommentDeleted(target, comment);
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
+ target.add(commentContainer.get("head"));
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return context.getPullRequest();
+ }
+
+ @Override
+ protected CompareContext getCompareContext() {
+ return SourceViewPanel.this.getCompareContext();
+ }
+
+ };
+ commentContainer.replace(commentPanel);
+ target.add(commentContainer);
+
+ String script = String.format("onedev.server.sourceView.onCommentAdded(%s);", getJsonOfComment(comment));
+ target.appendJavaScript(script);
+
+ context.onCommentOpened(target, comment);
+ }
+
+ });
+ fragment.add(form);
+ commentContainer.replace(fragment);
+ commentContainer.setVisible(true);
+ target.add(commentContainer);
+ context.onAddComment(target, mark);
+ target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", getJson(mark)));
+ break;
+ case "toggleComment":
+ Long commentId = params.getParameterValue("param1").toLong();
+ CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ if (!comment.equals(context.getOpenComment())) {
+ CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) {
+
+ @Override
+ protected void onDeleteComment(AjaxRequestTarget target, CodeComment comment) {
+ SourceViewPanel.this.onCommentDeleted(target, comment);
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
+ target.add(commentContainer.get("head"));
+ }
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return context.getPullRequest();
+ }
+
+ @Override
+ protected CompareContext getCompareContext() {
+ return SourceViewPanel.this.getCompareContext();
+ }
+
+ };
+ commentContainer.replace(commentPanel);
+ commentContainer.setVisible(true);
+ target.add(commentContainer);
+ script = String.format("onedev.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ context.onCommentOpened(target, comment);
+ } else {
+ closeComment(target);
+ }
+ break;
+ case "outlineSearch":
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return newOutlineSearchPanel(id, this);
+ }
+
+ };
+ break;
+ case "syncOutline":
+ int line = params.getParameterValue("param1").toInt();
+ int ch = params.getParameterValue("param2").toInt();
+ Symbol closest = null;
+ for (Symbol symbol: symbols) {
+ TokenPosition scope = symbol.getScope();
+ if (scope != null) {
+ if (contains(scope, line, ch)) {
+ if (closest != null) {
+ if (contains(closest.getScope(), scope.getFromLine(), scope.getFromCh())
+ && contains(closest.getScope(), scope.getToLine(), scope.getToCh())) {
+ closest = symbol;
+ }
+ } else {
+ closest = symbol;
+ }
+ }
+ }
+ }
+ if (closest != null) {
+ @SuppressWarnings("unchecked")
+ NestedTree<Symbol> tree = (NestedTree<Symbol>) outline.get(BODY_ID);
+ Symbol current = closest;
+ while (current != null) {
+ tree.expand(current);
+ current = current.getParent();
+ }
+ script = String.format("onedev.server.sourceView.syncOutline('%s');",
+ getSymbolId(symbols, closest));
+ target.appendJavaScript(script);
+ }
+ break;
+ }
+ }
+
+ });
+
+ add(blameMessageBehavior = new BlameMessageBehavior() {
+
+ @Override
+ protected Project getProject() {
+ return context.getProject();
+ }
+ });
+
+ outline = new WebMarkupContainer("outline") {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initOutline();"));
+ }
+
+ };
+ outline.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ toggleOutline(target);
+ }
+
+ });
+
+ IModel<HashSet<Symbol>> state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));
+ NestedTree<Symbol> tree = new NestedTree<Symbol>(BODY_ID, newSymbolTreeProvider(symbols), state) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new HumanTheme());
+ }
+
+ @Override
+ protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
+ Symbol symbol = nodeModel.getObject();
+
+ Fragment fragment = new Fragment(id, "outlineNodeFrag", SourceViewPanel.this);
+ fragment.setMarkupId(getSymbolId(symbols, symbol));
+ fragment.setOutputMarkupId(true);
+
+ fragment.add(symbol.renderIcon("icon"));
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ context.onSelect(target, context.getBlobIdent(), symbol.getPosition());
+ }
+
+ };
+ link.add(symbol.render("label", null));
+ fragment.add(link);
+
+ return fragment;
+ }
+
+ };
+
+ outline.add(tree);
+
+ outline.setOutputMarkupPlaceholderTag(true);
+ add(outline);
+
+ outline.setVisible(isOutlineVisibleInitially());
+
+ add(symbolTooltip = new SymbolTooltipPanel("symbolTooltip", new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return context.getProject();
+ }
+
+ }) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
+ BlobIdent blobIdent = new BlobIdent(
+ getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());
+ context.onSelect(target, blobIdent, hit.getTokenPos());
+ }
+
+ @Override
+ protected void onOccurrencesQueried(AjaxRequestTarget target, List<QueryHit> hits) {
+ context.onSearchComplete(target, hits);
+ }
+
+ @Override
+ protected String getBlobPath() {
+ return context.getBlobIdent().path;
+ }
+
+ });
+ }
+
+ private boolean isOutlineVisibleInitially() {
+ if (hasOutline()) {
+ WebRequest request = (WebRequest) RequestCycle.get().getRequest();
+ Cookie cookie = request.getCookie(COOKIE_OUTLINE);
+ if (cookie != null) {
+ return cookie.getValue().equals("yes");
+ } else {
+ return !WicketUtils.isDevice();
+ }
+ } else {
+ return false;
+ }
+ }
+
+ private boolean contains(TokenPosition scope, int line, int ch) {
+ int fromLine = scope.getFromLine();
+ int toLine = scope.getToLine();
+ int fromCh = scope.getFromCh();
+ int toCh = scope.getToCh();
+ return (fromLine < line || fromLine == line && fromCh<=ch) && (toLine > line || toLine == line && toCh >= ch);
+ }
+
+ private CompareContext getCompareContext() {
+ CompareContext compareContext = new CompareContext();
+ compareContext.setCompareCommit(context.getCommit().name());
+ if (context.getBlobIdent().path != null)
+ compareContext.setPathFilter(PatternSet.quoteIfNecessary(context.getBlobIdent().path));
+ return compareContext;
+ }
+
+ private TextRange getMark(IRequestParameters params, String beginLineParam, String beginCharParam,
+ String endLineParam, String endCharParam) {
+ int beginLine = params.getParameterValue(beginLineParam).toInt();
+ int beginChar = params.getParameterValue(beginCharParam).toInt();
+ int endLine = params.getParameterValue(endLineParam).toInt();
+ int endChar = params.getParameterValue(endCharParam).toInt();
+ TextRange mark = new TextRange();
+ mark.beginLine = beginLine;
+ mark.beginChar = beginChar;
+ mark.endLine = endLine;
+ mark.endChar = endChar;
+ return mark;
+ }
+
+ private String getJsonOfComment(CodeComment comment) {
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.id = comment.getId();
+ commentInfo.mark = Preconditions.checkNotNull(comment.mapRange(context.getBlobIdent()));
+
+ String jsonOfCommentInfo;
+ try {
+ jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ return jsonOfCommentInfo;
+ }
+
+ private void clearComment(AjaxRequestTarget target) {
+ commentContainer.replace(new WebMarkupContainer(BODY_ID));
+ commentContainer.setVisible(false);
+ target.add(commentContainer);
+ }
+
+ private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) {
+ clearComment(target);
+ String script = String.format("onedev.server.sourceView.onCommentDeleted(%s);",
+ getJsonOfComment(comment));
+ target.appendJavaScript(script);
+ context.onCommentOpened(target, null);
+ }
+
+ private boolean hasOutline() {
+ for (Symbol symbol: symbols) {
+ if (symbol.isDisplayInOutline())
+ return true;
+ }
+ return false;
+ }
+
+ private List<Symbol> getChildSymbols(List<Symbol> symbols, @Nullable Symbol parentSymbol) {
+ List<Symbol> children = new ArrayList<>();
+ for (Symbol symbol: symbols) {
+ if (symbol.isDisplayInOutline() && symbol.getOutlineParent() == parentSymbol)
+ children.add(symbol);
+ }
+ return children;
+ }
+
+ private String getJsonOfBlameInfos(boolean blamed) {
+ String jsonOfBlameInfos;
+ if (blamed) {
+ List<BlameInfo> blameInfos = new ArrayList<>();
+
+ String commitHash = context.getCommit().name();
+
+ BlameCommand cmd = new BlameCommand(context.getProject().getGitDir());
+ cmd.commitHash(commitHash).file(context.getBlobIdent().path);
+ for (BlameBlock blame: cmd.call()) {
+ BlameInfo blameInfo = new BlameInfo();
+ blameInfo.commitDate = DateUtils.formatDate(blame.getCommit().getCommitter().getWhen());
+ blameInfo.authorName = HtmlEscape.escapeHtml5(blame.getCommit().getAuthor().getName());
+ blameInfo.hash = blame.getCommit().getHash();
+ blameInfo.abbreviatedHash = GitUtils.abbreviateSHA(blame.getCommit().getHash(), 7);
+ CommitDetailPage.State state = new CommitDetailPage.State();
+ state.revision = blame.getCommit().getHash();
+ if (context.getBlobIdent().path != null)
+ state.pathFilter = PatternSet.quoteIfNecessary(context.getBlobIdent().path);
+ PageParameters params = CommitDetailPage.paramsOf(context.getProject(), state);
+ blameInfo.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
+ blameInfo.ranges = blame.getRanges();
+ blameInfos.add(blameInfo);
+ }
+ try {
+ jsonOfBlameInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ jsonOfBlameInfos = "undefined";
+ }
+ return jsonOfBlameInfos;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new SourceViewResourceReference()));
+
+ Blob blob = context.getProject().getBlob(context.getBlobIdent());
+
+ String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);
+ Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();
+ for (Map.Entry<CodeComment, TextRange> entry: commentsModel.getObject().entrySet()) {
+ CodeComment comment = entry.getKey();
+ TextRange textRange = entry.getValue();
+ int line = textRange.getBeginLine();
+ List<CommentInfo> commentInfosAtLine = commentInfos.get(line);
+ if (commentInfosAtLine == null) {
+ commentInfosAtLine = new ArrayList<>();
+ commentInfos.put(line, commentInfosAtLine);
+ }
+ CommentInfo commentInfo = new CommentInfo();
+ commentInfo.id = comment.getId();
+ commentInfo.mark = textRange;
+ commentInfosAtLine.add(commentInfo);
+ }
+ for (List<CommentInfo> value: commentInfos.values()) {
+ value.sort((o1, o2)->(int)(o1.id-o2.id));
+ }
+
+ String jsonOfCommentInfos;
+ try {
+ jsonOfCommentInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfos);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+
+ String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";
+
+ CharSequence callback = ajaxBehavior.getCallbackFunction(
+ explicit("action"), explicit("param1"), explicit("param2"),
+ explicit("param3"), explicit("param4"));
+
+ String script = String.format("onedev.server.sourceView.onDomReady('%s', '%s', %s, %s, '%s', '%s', "
+ + "%s, %s, %s, %s, %s, '%s');",
+ JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path),
+ JavaScriptEscape.escapeJavaScript(blob.getText().getContent()),
+ context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined",
+ jsonOfMark,
+ symbolTooltip.getMarkupId(),
+ context.getBlobIdent().revision,
+ jsonOfBlameInfos,
+ jsonOfCommentInfos,
+ callback,
+ blameMessageBehavior.getCallback(),
+ sourceFormat.getTabSize(),
+ sourceFormat.getLineWrapMode());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+
+ script = String.format("onedev.server.sourceView.onWindowLoad(%s);", jsonOfMark);
+ response.render(OnLoadHeaderItem.forScript(script));
+ }
+
+ @Override
+ protected void onDetach() {
+ commentsModel.detach();
+ super.onDetach();
+ }
+
+ @SuppressWarnings("unused")
+ private static class BlameInfo {
+
+ String abbreviatedHash;
+
+ String hash;
+
+ String url;
+
+ String authorName;
+
+ String commitDate;
+
+ List<Range> ranges;
+ }
+
+ private String getSymbolId(List<Symbol> symbols, Symbol symbol) {
+ return "outline-symbol-" + symbols.indexOf(symbol);
+ }
+
+ @SuppressWarnings("unused")
+ private static class CommentInfo {
+ long id;
+
+ String title;
+
+ TextRange mark;
+ }
+
+ @Override
+ protected boolean isEditSupported() {
+ return true;
+ }
+
+ @Override
+ public void mark(AjaxRequestTarget target, TextRange mark) {
+ String script;
+ if (mark != null) {
+ script = String.format("onedev.server.sourceView.mark(%s);", getJson(mark));
+ } else {
+ script = String.format("onedev.server.sourceView.mark(undefined);");
+ }
+ target.appendJavaScript(script);
+ }
+
+ private ITreeProvider<Symbol> newSymbolTreeProvider(List<Symbol> symbols) {
+ return new ITreeProvider<Symbol>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Iterator<? extends Symbol> getRoots() {
+ return getChildSymbols(symbols, null).iterator();
+ }
+
+ @Override
+ public boolean hasChildren(Symbol symbol) {
+ return !getChildSymbols(symbols, symbol).isEmpty();
+ }
+
+ @Override
+ public Iterator<? extends Symbol> getChildren(Symbol symbol) {
+ return getChildSymbols(symbols, symbol).iterator();
+ }
+
+ @Override
+ public IModel<Symbol> model(Symbol symbol) {
+ return Model.of(symbol);
+ }
+
+ };
+ }
+
+ private NestedTree<Symbol> newOutlineSearchSymbolTree(ModalPanel modal, List<Symbol> symbols,
+ @Nullable String searchInput) {
+ IModel<HashSet<Symbol>> state;
+ if (StringUtils.isNotBlank(searchInput)) {
+ state = new Model<HashSet<Symbol>>(new HashSet<>(symbols));
+ } else {
+ state = new Model<HashSet<Symbol>>(new HashSet<>(getChildSymbols(symbols, null)));
+ }
+ NestedTree<Symbol> tree = new NestedTree<Symbol>("result", newSymbolTreeProvider(symbols), state) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new HumanTheme());
+ }
+
+ @Override
+ protected Component newContentComponent(String id, IModel<Symbol> nodeModel) {
+ Symbol symbol = nodeModel.getObject();
+
+ Fragment fragment = new Fragment(id, "outlineSearchNodeFrag", SourceViewPanel.this);
+ fragment.setOutputMarkupId(true);
+
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ context.onSelect(target, context.getBlobIdent(), symbol.getPosition());
+ }
+
+ };
+ link.add(symbol.renderIcon("icon"));
+ link.add(symbol.render("label", null));
+ link.add(AttributeAppender.append("data-symbolindex", symbols.indexOf(symbol)));
+
+ fragment.add(link);
+
+ if (symbol == symbols.get(0)) {
+ link.add(AttributeAppender.append("class", "active"));
+ }
+
+ return fragment;
+ }
+
+ };
+
+ tree.setOutputMarkupId(true);
+
+ return tree;
+ }
+
+ private void closeComment(AjaxRequestTarget target) {
+ clearComment(target);
+ if (context.getOpenComment() != null)
+ context.onCommentOpened(target, null);
+ target.appendJavaScript("onedev.server.sourceView.onCloseComment();");
+ }
+
+ private Component newOutlineSearchPanel(String id, ModalPanel modal) {
+ Fragment fragment = new Fragment(id, "outlineSearchFrag", SourceViewPanel.this);
+ fragment.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ });
+
+ TextField<String> searchField = new TextField<>("input");
+ fragment.add(searchField);
+ fragment.add(newOutlineSearchSymbolTree(modal, symbols, null));
+
+ fragment.add(new AbstractPostAjaxBehavior() {
+
+ private List<Symbol> filteredSymbols = new ArrayList<Symbol>(symbols);
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setChannel(new AjaxChannel("outline-search-input", AjaxChannel.Type.DROP));
+ }
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();
+ String key = params.getParameterValue("key").toString();
+
+ if (key.equals("input")) {
+ String searchInput = params.getParameterValue("param").toString();
+
+ MatchScoreProvider<Symbol> matchScoreProvider = new MatchScoreProvider<Symbol>() {
+
+ @Override
+ public double getMatchScore(Symbol object) {
+ return MatchScoreUtils.getMatchScore(object.getName(), searchInput);
+ }
+
+ };
+
+ List<Symbol> matchSymbols = MatchScoreUtils.filterAndSort(symbols, matchScoreProvider);
+
+ filteredSymbols = new ArrayList<>();
+ for (Symbol symbol: matchSymbols) {
+ Symbol current = symbol;
+ while (current != null) {
+ if (!filteredSymbols.contains(current))
+ filteredSymbols.add(current);
+ current = current.getOutlineParent();
+ }
+ }
+
+ NestedTree<Symbol> tree = newOutlineSearchSymbolTree(modal, filteredSymbols, searchInput);
+ fragment.replace(tree);
+ target.add(tree);
+ } else if (key.equals("return")) {
+ int symbolIndex = params.getParameterValue("param").toInt();
+ Symbol symbol = filteredSymbols.get(symbolIndex);
+ context.onSelect(target, context.getBlobIdent(), symbol.getPosition());
+ modal.close();
+ } else {
+ throw new IllegalStateException("Unrecognized key: " + key);
+ }
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ String script = String.format(
+ "onedev.server.sourceView.onOutlineSearchDomReady('%s', %s);",
+ fragment.getMarkupId(),
+ getCallbackFunction(explicit("key"), explicit("param")));
+
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
+ }
+
+ @Override
+ public List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ if (hasOutline()) {
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getShortcut() {
+ return "O";
+ }
+
+ @Override
+ public String getLabel() {
+ return "Outline Search";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return newOutlineSearchPanel(id, modal);
+ }
+
+ };
+ }
+
+ });
+ }
+ return menuItems;
+ }
+
+ @Override
+ protected boolean isViewPlainSupported() {
+ return viewPlainMode;
+ }
+
+}
diff --git a/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java b/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java
index ffb4a6c0ff..ae821846d3 100644
--- a/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java
+++ b/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java
@@ -1,88 +1,87 @@
-package io.onedev.server.git.command;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Collection;
-
-import org.junit.Test;
-
-import io.onedev.commons.utils.Range;
-import io.onedev.server.git.AbstractGitTest;
-import io.onedev.server.git.BlameBlock;
-import io.onedev.server.git.command.BlameCommand;
-
-public class BlameCommandTest extends AbstractGitTest {
-
- @Test
- public void test() throws Exception {
- addFileAndCommit(
- "file",
- "1st line\n"
- + "2nd line\n"
- + "3rd line\n"
- + "4th line\n"
- + "5th line\n"
- + "6th line\n"
- + "7th line\n"
- + "8th line\n"
- + "9th line\n",
- "initial commit");
-
- String commitHash = git.getRepository().resolve("master").name();
- Collection<BlameBlock> blames = new BlameCommand(git.getRepository().getDirectory())
- .commitHash(commitHash)
- .file("file")
- .call();
- assertEquals(1, blames.size());
- assertEquals(commitHash + ": 0-8", blames.iterator().next().toString());
-
- addFileAndCommit(
- "file",
- "first line\n"
- + "2nd line\n"
- + "3rd line\n"
- + "4th line\n"
- + "5th line\n"
- + "6th line\n"
- + "7th line\n"
- + "8th line\n"
- + "nineth line\n",
- "second commit");
-
- commitHash = git.getRepository().resolve("master").name();
- blames = new BlameCommand(git.getRepository().getDirectory())
- .commitHash(commitHash)
- .file("file")
- .range(new Range(5, 8))
- .call();
- assertEquals(2, blames.size());
-
- assertEquals(commitHash + ": 8-8", getBlock(blames, commitHash).toString());
- commitHash = git.getRepository().resolve("master~1").name();
- assertEquals(commitHash + ": 5-7", getBlock(blames, commitHash).toString());
-
- addFileAndCommit(
- "file",
- "first line\n"
- + "nineth line\n",
- "third commit");
- commitHash = git.getRepository().resolve("master").name();
- blames = new BlameCommand(git.getRepository().getDirectory())
- .commitHash(commitHash)
- .file("file")
- .call();
-
- commitHash = git.getRepository().resolve("master~1").name();
-
- assertEquals(1, blames.size());
- assertEquals(commitHash + ": 0-1", getBlock(blames, commitHash).toString());
- }
-
- private BlameBlock getBlock(Collection<BlameBlock> blameBlocks, String commitHash) {
- for (BlameBlock block: blameBlocks) {
- if (block.getCommit().getHash().equals(commitHash))
- return block;
- }
- return null;
- }
-}
+package io.onedev.server.git.command;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collection;
+
+import org.junit.Test;
+
+import io.onedev.commons.utils.Range;
+import io.onedev.server.git.AbstractGitTest;
+import io.onedev.server.git.BlameBlock;
+
+public class BlameCommandTest extends AbstractGitTest {
+
+ @Test
+ public void test() throws Exception {
+ addFileAndCommit(
+ "file",
+ "1st line\n"
+ + "2nd line\n"
+ + "3rd line\n"
+ + "4th line\n"
+ + "5th line\n"
+ + "6th line\n"
+ + "7th line\n"
+ + "8th line\n"
+ + "9th line\n",
+ "initial commit");
+
+ String commitHash = git.getRepository().resolve("master").name();
+ Collection<BlameBlock> blames = new BlameCommand(git.getRepository().getDirectory())
+ .commitHash(commitHash)
+ .file("file")
+ .call();
+ assertEquals(1, blames.size());
+ assertEquals(commitHash + ": 0-8", blames.iterator().next().toString());
+
+ addFileAndCommit(
+ "file",
+ "first line\n"
+ + "2nd line\n"
+ + "3rd line\n"
+ + "4th line\n"
+ + "5th line\n"
+ + "6th line\n"
+ + "7th line\n"
+ + "8th line\n"
+ + "nineth line\n",
+ "second commit");
+
+ commitHash = git.getRepository().resolve("master").name();
+ blames = new BlameCommand(git.getRepository().getDirectory())
+ .commitHash(commitHash)
+ .file("file")
+ .range(new Range(5, 8))
+ .call();
+ assertEquals(2, blames.size());
+
+ assertEquals(commitHash + ": 8-8", getBlock(blames, commitHash).toString());
+ commitHash = git.getRepository().resolve("master~1").name();
+ assertEquals(commitHash + ": 5-7", getBlock(blames, commitHash).toString());
+
+ addFileAndCommit(
+ "file",
+ "first line\n"
+ + "nineth line\n",
+ "third commit");
+ commitHash = git.getRepository().resolve("master").name();
+ blames = new BlameCommand(git.getRepository().getDirectory())
+ .commitHash(commitHash)
+ .file("file")
+ .call();
+
+ commitHash = git.getRepository().resolve("master~1").name();
+
+ assertEquals(1, blames.size());
+ assertEquals(commitHash + ": 0-1", getBlock(blames, commitHash).toString());
+ }
+
+ private BlameBlock getBlock(Collection<BlameBlock> blameBlocks, String commitHash) {
+ for (BlameBlock block: blameBlocks) {
+ if (block.getCommit().getHash().equals(commitHash))
+ return block;
+ }
+ return null;
+ }
+}
diff --git a/pom.xml b/pom.xml
index 63d57ce8ba..7fb57baa7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -210,7 +210,7 @@
</repository>
</repositories>
<properties>
- <commons.version>1.0.10</commons.version>
+ <commons.version>1.0.11</commons.version>
<antlr.version>4.7.2</antlr.version>
</properties>
</project>
\ No newline at end of file
diff --git a/product/src/test/java/io/onedev/server/product/Test.java b/product/src/test/java/io/onedev/server/product/Test.java
index 5a9ac81d88..a1ab179ed6 100644
--- a/product/src/test/java/io/onedev/server/product/Test.java
+++ b/product/src/test/java/io/onedev/server/product/Test.java
@@ -1,9 +1,11 @@
package io.onedev.server.product;
+import java.io.IOException;
+
public class Test {
@org.junit.Test
- public void test() {
+ public void test() throws IOException {
}
}
\ No newline at end of file