The Unified and Autonomous Development Platform
Reconsidering issue fix commits, fix builds and pull requests
Robin Shen0a72feeaa5d3
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex ace83b4faa..4bb4fe07bd 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -99,7 +99,7 @@ import io.onedev.server.manager.TeamManager;import io.onedev.server.manager.IssueActionManager;import io.onedev.server.manager.IssueCommentManager;import io.onedev.server.manager.IssueFieldUnaryManager;-import io.onedev.server.manager.IssueInfoManager;+import io.onedev.server.manager.BuildInfoManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueQuerySettingManager;import io.onedev.server.manager.IssueVoteManager;@@ -142,7 +142,7 @@ import io.onedev.server.manager.impl.DefaultTeamManager;import io.onedev.server.manager.impl.DefaultIssueActionManager;import io.onedev.server.manager.impl.DefaultIssueCommentManager;import io.onedev.server.manager.impl.DefaultIssueFieldUnaryManager;-import io.onedev.server.manager.impl.DefaultIssueInfoManager;+import io.onedev.server.manager.impl.DefaultBuildInfoManager;import io.onedev.server.manager.impl.DefaultIssueManager;import io.onedev.server.manager.impl.DefaultIssueNotificationManager;import io.onedev.server.manager.impl.DefaultIssueQuerySettingManager;@@ -313,7 +313,7 @@ public class CoreModule extends AbstractPluginModule {bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);bind(AttachmentManager.class).to(DefaultAttachmentManager.class);bind(CodeCommentRelationInfoManager.class).to(DefaultCodeCommentRelationInfoManager.class);- bind(IssueInfoManager.class).to(DefaultIssueInfoManager.class);+ bind(BuildInfoManager.class).to(DefaultBuildInfoManager.class);bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);bind(WorkExecutor.class).to(DefaultWorkExecutor.class);bind(DefaultPullRequestNotificationManager.class);diff --git a/core/src/main/java/io/onedev/server/manager/BuildInfoManager.java b/core/src/main/java/io/onedev/server/manager/BuildInfoManager.javanew file mode 100644index 0000000000..b912976302--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/BuildInfoManager.java@@ -0,0 +1,11 @@+package io.onedev.server.manager;++import java.util.Collection;++import io.onedev.server.model.Project;++public interface BuildInfoManager {++ Collection<Long> getFixBuildIds(Project project, Long issueNumber);++}diff --git a/core/src/main/java/io/onedev/server/manager/BuildManager.java b/core/src/main/java/io/onedev/server/manager/BuildManager.javaindex bf7fc7b6da..78add9b926 100644--- a/core/src/main/java/io/onedev/server/manager/BuildManager.java+++ b/core/src/main/java/io/onedev/server/manager/BuildManager.java@@ -27,9 +27,6 @@ public interface BuildManager extends EntityManager<Build> {@NullableBuild findPrevious(Build build);- @Nullable- Build findByUUID(String uuid);-- List<Build> queryAfter(Project project, @Nullable String afterCommentUUID, int count);+ List<Build> queryAfter(Project project, Long afterBuildId, int count);}diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.javaindex a732a484ea..263b0c94e4 100644--- a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java+++ b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java@@ -23,12 +23,9 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {Collection<CodeComment> query(Project project, ObjectId...commitIds);- @Nullable- CodeComment find(String uuid);-Map<CodeComment, TextRange> findHistory(Project project, ObjectId commitId, String path);- List<CodeComment> queryAfter(Project project, @Nullable String afterCommentUUID, int count);+ List<CodeComment> queryAfter(Project project, @Nullable Long afterCommentId, int count);void save(CodeComment comment, @Nullable PullRequest request);diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.javaindex b3a532e204..0225932c40 100644--- a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java@@ -1,6 +1,6 @@package io.onedev.server.manager;-import java.util.Set;+import java.util.Collection;import org.eclipse.jgit.lib.ObjectId;@@ -8,6 +8,6 @@ import io.onedev.server.model.Project;public interface CodeCommentRelationInfoManager {- public Set<String> getPullRequestUUIDs(Project project, ObjectId commitId);+ public Collection<Long> getPullRequestIds(Project project, ObjectId commitId);}diff --git a/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/CommitInfoManager.javaindex 902fd27da2..731a5120d3 100644--- a/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java@@ -94,5 +94,7 @@ public interface CommitInfoManager {* line statistics data*/LineStats getLineStats(Project project);-++ Collection<ObjectId> getFixCommits(Project project, Long issueNumber);+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/manager/IssueInfoManager.java b/core/src/main/java/io/onedev/server/manager/IssueInfoManager.javadeleted file mode 100644index 57277db94a..0000000000--- a/core/src/main/java/io/onedev/server/manager/IssueInfoManager.java+++ /dev/null@@ -1,11 +0,0 @@-package io.onedev.server.manager;--import java.util.Set;--import io.onedev.server.model.Project;--public interface IssueInfoManager {-- public Set<String> getFixedInBuildUUIDs(Project project, String issueUUID);--}diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestManager.javaindex 14c0ad8ffb..c990b767d0 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java@@ -30,9 +30,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {@NullablePullRequest find(Project targetProject, long number);- @Nullable- PullRequest find(String uuid);-@NullablePullRequest findLatest(Project targetProject, User submitter);diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.javaindex 92b2fd15da..e7f62329a4 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.java+++ b/core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.java@@ -19,8 +19,5 @@ public interface PullRequestUpdateManager extends EntityManager<PullRequestUpdat*/void save(PullRequestUpdate update, boolean independent);- @Nullable- PullRequestUpdate find(String uuid);-- List<PullRequestUpdate> queryAfter(Project project, @Nullable String afterUpdateUUID, int count);+ List<PullRequestUpdate> queryAfter(Project project, @Nullable Long afterUpdateId, int count);}diff --git a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.javaindex e7b3bf510b..6e0aeee90b 100644--- a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java@@ -4,6 +4,8 @@ import java.io.File;import java.io.IOException;import java.nio.ByteBuffer;import java.util.Arrays;+import java.util.Collection;+import java.util.HashSet;import java.util.Map;import java.util.concurrent.ConcurrentHashMap;@@ -147,11 +149,31 @@ public abstract class AbstractEnvironmentManager {return defaultValue;}+ protected Collection<Long> readLongCollection(Store store, Transaction txn, ByteIterable key) {+ Collection<Long> collection = new HashSet<>();+ byte[] bytes = readBytes(store, txn, key);+ if (bytes != null) {+ for (int i=0; i<bytes.length/Long.BYTES; i++)+ collection.add(ByteBuffer.wrap(bytes, i*Long.BYTES, Long.BYTES).getLong());+ }+ return collection;+ }+protected void writeLong(Store store, Transaction txn, ByteIterable key, long value) {byte[] bytes = ByteBuffer.allocate(Long.BYTES).putLong(value).array();store.put(txn, key, new ArrayByteIterable(bytes));}+ protected void writeCollection(Store store, Transaction txn, ByteIterable key, Collection<Long> collection) {+ ByteBuffer buffer = ByteBuffer.allocate(collection.size()*Long.BYTES);+ int index = 0;+ for (Long value: collection) {+ buffer.putLong(index, value);+ index += Long.BYTES;+ }+ store.put(txn, key, new ArrayByteIterable(buffer.array()));+ }+protected void writeBoolean(Store store, Transaction txn, ByteIterable key, boolean value) {byte[] bytes = new byte[] {(byte)(value?1:0)};store.put(txn, key, new ArrayByteIterable(bytes));diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.javasimilarity index 68%rename from core/src/main/java/io/onedev/server/manager/impl/DefaultIssueInfoManager.javarename to core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.javaindex ee587fea7e..a78c453fa1 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildInfoManager.java@@ -1,29 +1,25 @@package io.onedev.server.manager.impl;import java.io.File;-import java.io.Serializable;import java.util.Collection;-import java.util.HashSet;import java.util.List;-import java.util.Set;+import java.util.Objects;import java.util.concurrent.Callable;import javax.inject.Inject;import javax.inject.Singleton;-import org.apache.commons.lang3.SerializationUtils;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import io.onedev.launcher.loader.Listen;import io.onedev.server.event.lifecycle.SystemStarted;import io.onedev.server.manager.BatchWorkManager;+import io.onedev.server.manager.BuildInfoManager;import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.IssueInfoManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.StorageManager;import io.onedev.server.model.Build;-import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.persistence.UnitOfWork;import io.onedev.server.persistence.annotation.Sessional;@@ -34,7 +30,6 @@ import io.onedev.server.persistence.dao.EntityRemoved;import io.onedev.server.util.BatchWorker;import io.onedev.utils.FileUtils;import io.onedev.utils.concurrent.Prioritized;-import jetbrains.exodus.ArrayByteIterable;import jetbrains.exodus.ByteIterable;import jetbrains.exodus.env.Environment;import jetbrains.exodus.env.Store;@@ -43,19 +38,19 @@ import jetbrains.exodus.env.TransactionalComputable;import jetbrains.exodus.env.TransactionalExecutable;@Singleton-public class DefaultIssueInfoManager extends AbstractEnvironmentManager implements IssueInfoManager {+public class DefaultBuildInfoManager extends AbstractEnvironmentManager implements BuildInfoManager {private static final int INFO_VERSION = 6;private static final int BATCH_SIZE = 5000;- private static final Logger logger = LoggerFactory.getLogger(DefaultIssueInfoManager.class);+ private static final Logger logger = LoggerFactory.getLogger(DefaultBuildInfoManager.class);- private static final String INFO_DIR = "issue";+ private static final String INFO_DIR = "build";private static final String DEFAULT_STORE = "default";- private static final String ISSUE_STORE = "issue";+ private static final String FIX_BUILDS_STORE = "fixBuilds";private static final ByteIterable LAST_BUILD_KEY = new StringByteIterable("lastBuild");@@ -74,7 +69,7 @@ public class DefaultIssueInfoManager extends AbstractEnvironmentManager implemenprivate final Dao dao;@Inject- public DefaultIssueInfoManager(Dao dao, ProjectManager projectManager, StorageManager storageManager,+ public DefaultBuildInfoManager(Dao dao, ProjectManager projectManager, StorageManager storageManager,BatchWorkManager batchWorkManager, UnitOfWork unitOfWork, BuildManager buildManager) {this.projectManager = projectManager;this.storageManager = storageManager;@@ -116,36 +111,45 @@ public class DefaultIssueInfoManager extends AbstractEnvironmentManager implemen}private boolean collect(Project project) {- logger.debug("Collecting issue info in project '{}'...", project);+ logger.debug("Collecting build info in project '{}'...", project);Environment env = getEnv(project.getId().toString());Store defaultStore = getStore(env, DEFAULT_STORE);- Store issueStore = getStore(env, ISSUE_STORE);+ Store fixBuildsStore = getStore(env, FIX_BUILDS_STORE);- String lastBuildUUID = env.computeInTransaction(new TransactionalComputable<String>() {+ Long lastBuildId = env.computeInTransaction(new TransactionalComputable<Long>() {@Override- public String compute(Transaction txn) {- byte[] value = readBytes(defaultStore, txn, LAST_BUILD_KEY);- return value!=null?new String(value):null;+ public Long compute(Transaction txn) {+ return readLong(defaultStore, txn, LAST_BUILD_KEY, 0);}});- List<Build> unprocessedBuilds = buildManager.queryAfter(project, lastBuildUUID, BATCH_SIZE);- for (Build build: unprocessedBuilds) {+ List<Build> unprocessedBuilds = buildManager.queryAfter(project, lastBuildId, BATCH_SIZE);+ for (int i=0; i<unprocessedBuilds.size(); i++) {+ int index = i;env.executeInTransaction(new TransactionalExecutable() {@Overridepublic void execute(Transaction txn) {- for (Issue issue: build.getFixedIssues()) {- ByteIterable issueKey = new StringByteIterable(issue.getUUID());- Set<String> fixedInBuildUUIDs = getFixedInBuildUUIDs(issueStore, txn, issueKey);- fixedInBuildUUIDs.add(build.getUUID());- issueStore.put(txn, issueKey,- new ArrayByteIterable(SerializationUtils.serialize((Serializable) fixedInBuildUUIDs)));+ Build build = unprocessedBuilds.get(index);+ Build prevBuild = null;+ for (int j=index-1; j>=0; j--) {+ Build prevBuildInProject = unprocessedBuilds.get(j);+ if (prevBuildInProject.getConfiguration().equals(build.getConfiguration())+ && Objects.equals(build.getRef(), prevBuildInProject.getRef())) {+ prevBuild = prevBuildInProject;+ break;+ }+ }+ for (Long issueNumber: build.getFixedIssueNumbers(prevBuild)) {+ ByteIterable issueKey = new LongByteIterable(issueNumber);+ Collection<Long> fixBuildIds = readLongCollection(fixBuildsStore, txn, issueKey);+ fixBuildIds.add(build.getId());+ writeCollection(fixBuildsStore, txn, issueKey, fixBuildIds);}- defaultStore.put(txn, LAST_BUILD_KEY, new StringByteIterable(build.getUUID()));+ defaultStore.put(txn, LAST_BUILD_KEY, new LongByteIterable(build.getId()));}});@@ -154,26 +158,16 @@ public class DefaultIssueInfoManager extends AbstractEnvironmentManager implemenreturn unprocessedBuilds.size() == BATCH_SIZE;}- @SuppressWarnings("unchecked")- private Set<String> getFixedInBuildUUIDs(Store store, Transaction txn, ByteIterable issueKey) {- byte[] valueBytes = readBytes(store, txn, issueKey);- if (valueBytes != null) {- return (Set<String>) SerializationUtils.deserialize(valueBytes);- } else {- return new HashSet<>();- }- }-@Override- public Set<String> getFixedInBuildUUIDs(Project project, String issueUUID) {+ public Collection<Long> getFixBuildIds(Project project, Long issueNumber) {Environment env = getEnv(project.getId().toString());- Store store = getStore(env, ISSUE_STORE);+ Store store = getStore(env, FIX_BUILDS_STORE);- return env.computeInTransaction(new TransactionalComputable<Set<String>>() {+ return env.computeInTransaction(new TransactionalComputable<Collection<Long>>() {@Override- public Set<String> compute(Transaction txn) {- return getFixedInBuildUUIDs(store, txn, new StringByteIterable(issueUUID));+ public Collection<Long> compute(Transaction txn) {+ return readLongCollection(store, txn, new LongByteIterable(issueNumber));}});diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.javaindex fdee12ffc9..9d8476db12 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBuildManager.java@@ -54,6 +54,10 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsEntityCriteria<Build> criteria = newCriteria();criteria.add(Restrictions.lt("id", build.getId()));criteria.add(Restrictions.eq("configuration", build.getConfiguration()));+ if (build.getRef() != null)+ criteria.add(Restrictions.eq("ref", build.getRef()));+ else+ criteria.add(Restrictions.isNull("ref"));criteria.addOrder(Order.desc("id"));List<Build> builds = query(criteria, 0, 1);return !builds.isEmpty()?builds.iterator().next():null;@@ -120,24 +124,13 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsreturn builds;}- @Sessional- @Override- public Build findByUUID(String uuid) {- EntityCriteria<Build> criteria = newCriteria();- criteria.add(Restrictions.eq("uuid", uuid));- return find(criteria);- }-@Override- public List<Build> queryAfter(Project project, String afterBuildUUID, int count) {+ public List<Build> queryAfter(Project project, Long afterBuildId, int count) {EntityCriteria<Build> criteria = newCriteria();criteria.createCriteria("configuration").add(Restrictions.eq("project", project));criteria.addOrder(Order.asc("id"));- if (afterBuildUUID != null) {- Build build = findByUUID(afterBuildUUID);- if (build != null)- criteria.add(Restrictions.gt("id", build.getId()));- }+ if (afterBuildId != null)+ criteria.add(Restrictions.gt("id", afterBuildId));return query(criteria, 0, count);}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.javaindex 7929513a8b..1c3bb91ec0 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java@@ -59,8 +59,8 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;import io.onedev.server.search.entity.codecomment.CodeCommentQueryBuildContext;import io.onedev.server.util.diff.DiffUtils;@@ -106,14 +106,6 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment}}- @Sessional- @Override- public CodeComment find(String uuid) {- EntityCriteria<CodeComment> criteria = newCriteria();- criteria.add(Restrictions.eq("uuid", uuid));- return find(criteria);- }-@Transactional@Listenpublic void on(CodeCommentEvent event) {@@ -122,16 +114,12 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment@Sessional@Override- public List<CodeComment> queryAfter(Project project, String afterCommentUUID, int count) {+ public List<CodeComment> queryAfter(Project project, Long afterCommentId, int count) {EntityCriteria<CodeComment> criteria = newCriteria();criteria.add(Restrictions.eq("project", project));criteria.addOrder(Order.asc("id"));- if (afterCommentUUID != null) {- CodeComment comment = find(afterCommentUUID);- if (comment != null) {- criteria.add(Restrictions.gt("id", comment.getId()));- }- }+ if (afterCommentId != null)+ criteria.add(Restrictions.gt("id", afterCommentId));return query(criteria, 0, count);}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.javaindex 9be9e46749..3bf0c79e6e 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java@@ -148,18 +148,17 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMaStore codeCommentStore = getStore(env, CODE_COMMENT_STORE);Store pullRequestStore = getStore(env, PULL_REQUEST_STORE);- String lastPullRequestUpdateUUID = env.computeInTransaction(new TransactionalComputable<String>() {+ Long lastPullRequestUpdateId = env.computeInTransaction(new TransactionalComputable<Long>() {@Override- public String compute(Transaction txn) {- byte[] value = readBytes(defaultStore, txn, LAST_PULL_REQUEST_UPDATE_KEY);- return value!=null?new String(value):null;+ public Long compute(Transaction txn) {+ return readLong(defaultStore, txn, LAST_PULL_REQUEST_UPDATE_KEY, 0);}});List<PullRequestUpdate> unprocessedPullRequestUpdates = pullRequestUpdateManager.queryAfter(- project, lastPullRequestUpdateUUID, BATCH_SIZE);+ project, lastPullRequestUpdateId, BATCH_SIZE);for (PullRequestUpdate update: unprocessedPullRequestUpdates) {env.executeInTransaction(new TransactionalExecutable() {@@ -172,18 +171,17 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMacommit.copyRawTo(keyBytes, 0);ByteIterable commitKey = new ArrayByteIterable(keyBytes);- Set<String> pullRequestUUIDs = getPullRequestUUIDs(pullRequestStore, txn, commitKey);- pullRequestUUIDs.add(update.getRequest().getUUID());-- pullRequestStore.put(txn, commitKey,- new ArrayByteIterable(SerializationUtils.serialize((Serializable) pullRequestUUIDs)));+ Collection<Long> pullRequestIds = readLongCollection(pullRequestStore, txn, commitKey);+ pullRequestIds.add(update.getRequest().getId());++ writeCollection(pullRequestStore, txn, commitKey, pullRequestIds);- Map<String, ComparingInfo> comments = getCodeCommentComparingInfos(codeCommentStore, txn, commitKey);- Set<String> uuidsToRemove = new HashSet<>();- for (Map.Entry<String, ComparingInfo> entry: comments.entrySet()) {+ Map<Long, ComparingInfo> comments = getCodeCommentComparingInfos(codeCommentStore, txn, commitKey);+ Set<Long> commentIdsToRemove = new HashSet<>();+ for (Map.Entry<Long, ComparingInfo> entry: comments.entrySet()) {if (request.getRequestComparingInfo(entry.getValue()) != null) {- String uuid = entry.getKey();- CodeComment comment = codeCommentManager.find(uuid);+ Long commentId = entry.getKey();+ CodeComment comment = codeCommentManager.get(commentId);if (comment != null) {if (codeCommentRelationManager.find(request, comment) == null) {CodeCommentRelation relation = new CodeCommentRelation();@@ -192,35 +190,34 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMacodeCommentRelationManager.save(relation);}} else {- uuidsToRemove.add(uuid);+ commentIdsToRemove.add(commentId);}}}- if (!uuidsToRemove.isEmpty()) {- comments.keySet().removeAll(uuidsToRemove);+ if (!commentIdsToRemove.isEmpty()) {+ comments.keySet().removeAll(commentIdsToRemove);codeCommentStore.put(txn, commitKey,new ArrayByteIterable(SerializationUtils.serialize((Serializable) comments)));}}}- defaultStore.put(txn, LAST_PULL_REQUEST_UPDATE_KEY, new StringByteIterable(update.getUUID()));+ defaultStore.put(txn, LAST_PULL_REQUEST_UPDATE_KEY, new LongByteIterable(update.getId()));}});}- String lastCodeCommentUUID = env.computeInTransaction(new TransactionalComputable<String>() {+ Long lastCodeCommentId = env.computeInTransaction(new TransactionalComputable<Long>() {@Override- public String compute(final Transaction txn) {- byte[] value = readBytes(defaultStore, txn, LAST_CODE_COMMENT_KEY);- return value!=null?new String(value):null;+ public Long compute(final Transaction txn) {+ return readLong(defaultStore, txn, LAST_CODE_COMMENT_KEY, 0);}});List<CodeComment> unprocessedCodeComments = codeCommentManager.queryAfter(project,- lastCodeCommentUUID, BATCH_SIZE);+ lastCodeCommentId, BATCH_SIZE);for (CodeComment comment: unprocessedCodeComments) {if (comment.isValid()) {env.executeInTransaction(new TransactionalExecutable() {@@ -231,16 +228,16 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMacommitId.copyRawTo(keyBytes, 0);ByteIterable commitKey = new ArrayByteIterable(keyBytes);- Map<String, ComparingInfo> comments = getCodeCommentComparingInfos(codeCommentStore, txn, commitKey);- comments.put(comment.getUUID(), comment.getComparingInfo());+ Map<Long, ComparingInfo> comments = getCodeCommentComparingInfos(codeCommentStore, txn, commitKey);+ comments.put(comment.getId(), comment.getComparingInfo());codeCommentStore.put(txn, commitKey,new ArrayByteIterable(SerializationUtils.serialize((Serializable) comments)));- Set<String> pullRequestUUIDs = getPullRequestUUIDs(pullRequestStore, txn, commitKey);+ Collection<Long> pullRequestIds = readLongCollection(pullRequestStore, txn, commitKey);- Set<String> uuidsToRemove = new HashSet<>();- for (String uuid: pullRequestUUIDs) {- PullRequest request = pullRequestManager.find(uuid);+ Set<Long> pullRequestIdsToRemove = new HashSet<>();+ for (Long pullRequestId: pullRequestIds) {+ PullRequest request = pullRequestManager.get(pullRequestId);if (request != null && request.isValid()) {if (request.getRequestComparingInfo(comment.getComparingInfo()) != null&& codeCommentRelationManager.find(request, comment) == null) {@@ -250,13 +247,12 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMacodeCommentRelationManager.save(relation);}} else {- uuidsToRemove.add(uuid);+ pullRequestIdsToRemove.add(pullRequestId);}}- if (!uuidsToRemove.isEmpty()) {- pullRequestUUIDs.removeAll(uuidsToRemove);- pullRequestStore.put(txn, commitKey,- new ArrayByteIterable(SerializationUtils.serialize((Serializable) pullRequestUUIDs)));+ if (!pullRequestIdsToRemove.isEmpty()) {+ pullRequestIds.removeAll(pullRequestIdsToRemove);+ writeCollection(pullRequestStore, txn, commitKey, pullRequestIds);}}@@ -267,7 +263,7 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMaif (!comment.getMarkPos().getCommit().equals(compareCommit)&& project.getRepository().hasObject(ObjectId.fromString(compareCommit)))associateCommentWithCommit(txn, comment.getCompareContext().getCompareCommit());- defaultStore.put(txn, LAST_CODE_COMMENT_KEY, new StringByteIterable(comment.getUUID()));+ defaultStore.put(txn, LAST_CODE_COMMENT_KEY, new LongByteIterable(comment.getId()));}});@@ -277,29 +273,19 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMareturn unprocessedPullRequestUpdates.size() == BATCH_SIZE || unprocessedCodeComments.size() == BATCH_SIZE;}- @SuppressWarnings("unchecked")- private Set<String> getPullRequestUUIDs(Store store, Transaction txn, ByteIterable commitKey) {- byte[] valueBytes = readBytes(store, txn, commitKey);- if (valueBytes != null) {- return (Set<String>) SerializationUtils.deserialize(valueBytes);- } else {- return new HashSet<>();- }- }-@Override- public Set<String> getPullRequestUUIDs(Project project, ObjectId commitId) {+ public Collection<Long> getPullRequestIds(Project project, ObjectId commitId) {byte[] commitKey = new byte[20];commitId.copyRawTo(commitKey, 0);Environment env = getEnv(project.getId().toString());Store store = getStore(env, PULL_REQUEST_STORE);- return env.computeInTransaction(new TransactionalComputable<Set<String>>() {+ return env.computeInTransaction(new TransactionalComputable<Collection<Long>>() {@Override- public Set<String> compute(Transaction txn) {- return getPullRequestUUIDs(store, txn, new ArrayByteIterable(commitKey));+ public Collection<Long> compute(Transaction txn) {+ return readLongCollection(store, txn, new ArrayByteIterable(commitKey));}});@@ -307,10 +293,10 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa}@SuppressWarnings("unchecked")- private Map<String, ComparingInfo> getCodeCommentComparingInfos(Store store, Transaction txn, ByteIterable commitKey) {+ private Map<Long, ComparingInfo> getCodeCommentComparingInfos(Store store, Transaction txn, ByteIterable commitKey) {byte[] valueBytes = readBytes(store, txn, commitKey);if (valueBytes != null) {- return (Map<String, ComparingInfo>) SerializationUtils.deserialize(valueBytes);+ return (Map<Long, ComparingInfo>) SerializationUtils.deserialize(valueBytes);} else {return new HashMap<>();}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.javaindex 0d5ffdd0c2..6837ab265c 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java@@ -62,6 +62,7 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.dao.EntityRemoved;import io.onedev.server.util.BatchWorker;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.utils.FileUtils;@@ -99,6 +100,8 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeprivate 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";@@ -309,7 +312,8 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeStore 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 dailyContributionsStore = getStore(env, DAILY_CONTRIBUTIONS_STORE);+ Store fixCommitsStore = getStore(env, FIX_COMMITS_STORE);Repository repository = project.getRepository();@@ -372,6 +376,18 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemecommitsStore.put(txn, parentCommitKey, new ArrayByteIterable(newParentCommitBytes));}+ for (Long issueNumber: IssueUtils.parseFixedIssues(nextCommit.getFullMessage())) {+ ByteIterable issueKey = new LongByteIterable(issueNumber);+ Collection<ObjectId> fixCommits = getFixCommits(fixCommitsStore, txn, issueKey);+ fixCommits.add(nextCommit);+ byte[] fixCommitBytes = new byte[fixCommits.size()*20];+ int index = 0;+ for (ObjectId fixCommit: fixCommits) {+ fixCommit.copyRawTo(fixCommitBytes, index);+ index += 20;+ }+ fixCommitsStore.put(txn, issueKey, new ArrayByteIterable(fixCommitBytes));+ }}nextCommit = revWalk.next();}@@ -1370,4 +1386,30 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeint path;}+ private Collection<ObjectId> getFixCommits(Store store, Transaction txn, ByteIterable issueKey) {+ Collection<ObjectId> fixCommits = new HashSet<>();+ byte[] bytes = readBytes(store, txn, issueKey);+ if (bytes != null) {+ for (int i=0; i<bytes.length/20; i++)+ fixCommits.add(ObjectId.fromRaw(bytes, i*20));+ }+ return fixCommits;+ }++ @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 getFixCommits(store, txn, new LongByteIterable(issueNumber));+ }++ });++ }+}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.javaindex 1727385979..f69d214cf0 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueActionManager.java@@ -220,13 +220,11 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueActionBuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();if (trigger.getConfiguration().equals(configuration.getName())&& event.getBuild().getStatus() == Build.Status.SUCCESS) {- for (Issue issue: event.getBuild().getFixedIssues()) {- if (transition.getFromStates().contains(issue.getState())) {- Map<String, Object> fieldValues = new HashMap<>();- if (trigger.getBuildField() != null)- fieldValues.put(trigger.getBuildField(), event.getBuild().getName());+ for (Long issueNumber: event.getBuild().getFixedIssueNumbers(null)) {+ Issue issue = issueManager.find(configuration.getProject(), issueNumber);+ if (issue != null && transition.getFromStates().contains(issue.getState())) {issue.removeFields(transition.getRemoveFields());- changeState(issue, transition.getToState(), fieldValues, null);+ changeState(issue, transition.getToState(), new HashMap<>(), null);}}}@@ -241,11 +239,8 @@ public class DefaultIssueActionManager extends AbstractEntityManager<IssueActionif (trigger.getBranch().equals(request.getTargetBranch())) {for (Issue issue: request.getFixedIssues()) {if (transition.getFromStates().contains(issue.getState())) {- Map<String, Object> fieldValues = new HashMap<>();- if (trigger.getPullRequestField() != null)- fieldValues.put(trigger.getPullRequestField(), request.getNumber());issue.removeFields(transition.getRemoveFields());- changeState(issue, transition.getToState(), fieldValues, null);+ changeState(issue, transition.getToState(), new HashMap<>(), null);}}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex 85249b4614..5a028065e6 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -1,6 +1,5 @@package io.onedev.server.manager.impl;-import java.io.IOException;import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;@@ -21,19 +20,12 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import org.apache.commons.lang3.StringUtils;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;import org.hibernate.Session;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;-import io.onedev.launcher.loader.Listen;import io.onedev.launcher.loader.ListenerRegistry;-import io.onedev.server.event.RefUpdated;-import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.issue.IssueOpened;import io.onedev.server.manager.IssueFieldUnaryManager;import io.onedev.server.manager.IssueManager;@@ -56,15 +48,14 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.search.entity.issue.AndCriteria;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryBuildContext;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.util.EditContext;-import io.onedev.server.util.IssueUtils;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;@@ -629,49 +620,6 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}- @Transactional- @Listen- public void on(RefUpdated event) {- if (!event.getNewCommitId().equals(ObjectId.zeroId())) {- Project project = event.getProject();- ObjectId oldCommitId;- if (!event.getOldCommitId().equals(ObjectId.zeroId()))- oldCommitId = event.getOldCommitId();- else- oldCommitId = project.getObjectId(project.getDefaultBranch());- try (RevWalk revWalk = new RevWalk(project.getRepository())) {- revWalk.markStart(revWalk.parseCommit(event.getNewCommitId()));- revWalk.markUninteresting(revWalk.parseCommit(oldCommitId));-- RevCommit commit;- while ((commit = revWalk.next()) != null) {- for (Long issueNumber: IssueUtils.parseFixedIssues(commit.getFullMessage())) {- Issue issue = find(project, issueNumber);- if (issue != null) {- if (issue.getCommit() == null) {- issue.setCommit(commit.name());- listenerRegistry.post(new IssueCommitted(issue));- } else {- try {- RevCommit issueCommit = revWalk.parseCommit(ObjectId.fromString(issue.getCommit()));- if (issueCommit.getCommitTime() < commit.getCommitTime()) {- issue.setCommit(commit.name());- listenerRegistry.post(new IssueCommitted(issue));- }- } catch (MissingObjectException e) {- issue.setCommit(commit.name());- listenerRegistry.post(new IssueCommitted(issue));- }- }- }- }- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }-/*@Transactional@Overridediff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.javaindex bf9e44b43e..e61e6617ff 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java@@ -114,8 +114,8 @@ import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.persistence.dao.EntityRemoved;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.QueryBuildContext;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQueryBuildContext;import io.onedev.server.security.SecurityUtils;@@ -613,14 +613,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestreturn count(criteria);}- @Sessional- @Override- public PullRequest find(String uuid) {- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("uuid", uuid));- return find(criteria);- }-@Transactional@Listenpublic void on(PullRequestActionEvent event) {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.javaindex 6f577daf3c..33d0188f9e 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java@@ -98,24 +98,12 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR@Sessional@Override- public PullRequestUpdate find(String uuid) {- EntityCriteria<PullRequestUpdate> criteria = newCriteria();- criteria.add(Restrictions.eq("uuid", uuid));- return find(criteria);- }-- @Sessional- @Override- public List<PullRequestUpdate> queryAfter(Project project, String afterUpdateUUID, int count) {+ 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 (afterUpdateUUID != null) {- PullRequestUpdate update = find(afterUpdateUUID);- if (update != null) {- criteria.add(Restrictions.gt("id", update.getId()));- }- }+ if (afterUpdateId != null)+ criteria.add(Restrictions.gt("id", afterUpdateId));return query(criteria, 0, count);}diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.javaindex 91360d40c4..efa2f58a06 100644--- a/core/src/main/java/io/onedev/server/model/Build.java+++ b/core/src/main/java/io/onedev/server/model/Build.java@@ -4,9 +4,8 @@ import java.io.IOException;import java.util.Collection;import java.util.Date;import java.util.HashSet;-import java.util.Set;-import java.util.UUID;+import javax.annotation.Nullable;import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.FetchType;@@ -23,13 +22,11 @@ import org.eclipse.jgit.revwalk.RevWalk;import io.onedev.server.OneDev;import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.IssueManager;import io.onedev.server.util.IssueUtils;@Entity@Table(- indexes={@Index(columnList="g_configuration_id"), @Index(columnList="commit"),- @Index(columnList="uuid"), @Index(columnList="name")},+ indexes={@Index(columnList="g_configuration_id"), @Index(columnList="commit"), @Index(columnList="name")},uniqueConstraints={@UniqueConstraint(columnNames={"g_configuration_id", "commit"})})public class Build extends AbstractEntity {@@ -62,6 +59,8 @@ public class Build extends AbstractEntity {@JoinColumn(nullable=false)private Configuration configuration;+ private String ref;+@Column(nullable=false)private String name;@@ -77,10 +76,7 @@ public class Build extends AbstractEntity {@Column(nullable=false)private String url;- @Column(nullable=false)- private String uuid = UUID.randomUUID().toString();-- private transient Collection<Issue> fixedIssues;+ private transient Collection<Long> fixedIssueNumbers;public Configuration getConfiguration() {return configuration;@@ -98,6 +94,14 @@ public class Build extends AbstractEntity {this.name = name;}+ public String getRef() {+ return ref;+ }++ public void setRef(String ref) {+ this.ref = ref;+ }+public String getCommit() {return commit;}@@ -130,56 +134,38 @@ public class Build extends AbstractEntity {this.url = url;}- public String getUUID() {- return uuid;- }-- public void setUUID(String uuid) {- this.uuid = uuid;- }-public String getFQN() {return getConfiguration().getName() + FQN_SEPARATOR + getName();}- public Collection<Issue> getFixedIssues() {- if (fixedIssues == null) {- fixedIssues = new HashSet<>();- IssueManager issueManager = OneDev.getInstance(IssueManager.class);- for (Long issueNumber: getFixedIssueNumbers()) {- Issue issue = issueManager.find(getConfiguration().getProject(), issueNumber);- if (issue != null)- fixedIssues.add(issue);- }- }- return fixedIssues;- }-- public Collection<Long> getFixedIssueNumbers() {- Set<Long> fixedIssueNumbers = new HashSet<>();-- ObjectId prevCommit;- Build prevBuild = OneDev.getInstance(BuildManager.class).findPrevious(this);- if (prevBuild != null)- prevCommit = ObjectId.fromString(prevBuild.getCommit());- else if (getConfiguration().getBaseCommit() != null)- prevCommit = ObjectId.fromString(getConfiguration().getBaseCommit());- else- prevCommit = null;-- if (prevCommit != null) {- Project project = getConfiguration().getProject();+ public Collection<Long> getFixedIssueNumbers(@Nullable Build prevBuild) {+ if (fixedIssueNumbers == null) {+ fixedIssueNumbers = new HashSet<>();++ ObjectId prevCommit;+ if (prevBuild == null)+ prevBuild = OneDev.getInstance(BuildManager.class).findPrevious(this);+ if (prevBuild != null)+ prevCommit = ObjectId.fromString(prevBuild.getCommit());+ else if (getConfiguration().getBaseCommit() != null)+ prevCommit = ObjectId.fromString(getConfiguration().getBaseCommit());+ else+ prevCommit = null;- Repository repository = project.getRepository();- try (RevWalk revWalk = new RevWalk(repository)) {- revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getCommit())));- revWalk.markUninteresting(revWalk.parseCommit(prevCommit));-- RevCommit commit;- while ((commit = revWalk.next()) != null)- fixedIssueNumbers.addAll(IssueUtils.parseFixedIssues(commit.getFullMessage()));- } catch (IOException e) {- throw new RuntimeException(e);+ if (prevCommit != null) {+ Project project = getConfiguration().getProject();++ Repository repository = project.getRepository();+ try (RevWalk revWalk = new RevWalk(repository)) {+ revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getCommit())));+ revWalk.markUninteresting(revWalk.parseCommit(prevCommit));++ RevCommit commit;+ while ((commit = revWalk.next()) != null)+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssues(commit.getFullMessage()));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }}}return fixedIssueNumbers;diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 870c34f6a2..f4ef591e43 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -59,8 +59,7 @@ import io.onedev.server.web.editable.annotation.Editable;@Index(columnList="number"), @Index(columnList="numberStr"),@Index(columnList="submitDate"), @Index(columnList="g_submitter_id"),@Index(columnList="voteCount"), @Index(columnList="commentCount"),- @Index(columnList="g_milestone_id"), @Index(columnList="LAST_ACT_DATE"),- @Index(columnList="uuid")})+ @Index(columnList="g_milestone_id"), @Index(columnList="LAST_ACT_DATE")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class Issue extends AbstractEntity implements Referenceable {@@ -76,8 +75,6 @@ public class Issue extends AbstractEntity implements Referenceable {@Column(nullable=false)private String title;- private String commit;-@Lob@Column(length=65535)private String description;@@ -187,14 +184,6 @@ public class Issue extends AbstractEntity implements Referenceable {numberStr = String.valueOf(number);}- public String getCommit() {- return commit;- }-- public void setCommit(String commit) {- this.commit = commit;- }-public User getSubmitter() {return submitter;}diff --git a/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.javaindex 00edfd28be..2a54cdc981 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java@@ -7,7 +7,6 @@ import java.util.Collections;import java.util.Date;import java.util.HashSet;import java.util.List;-import java.util.UUID;import javax.persistence.Column;import javax.persistence.Entity;@@ -36,7 +35,7 @@ import io.onedev.server.git.command.ListFileChangesCommand;import io.onedev.server.manager.impl.DefaultCodeCommentRelationManager;@Entity-@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="uuid"), @Index(columnList="date")})+@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="date")})public class PullRequestUpdate extends AbstractEntity {private static final long serialVersionUID = 1L;@@ -56,9 +55,6 @@ public class PullRequestUpdate extends AbstractEntity {@Column(nullable=false)private Date date = new Date();- @Column(nullable=false)- private String uuid = UUID.randomUUID().toString();-private transient List<RevCommit> commits;private transient Collection<String> changedFiles;@@ -217,14 +213,6 @@ public class PullRequestUpdate extends AbstractEntity {return request.getBaseCommit();}- public String getUUID() {- return uuid;- }-- public void setUUID(String uuid) {- this.uuid = uuid;- }-/*** Get commits belonging to this update, reversely ordered by commit traversing. The list of commit will remain* unchanged even if tip of target branch changes. This assumption is key to our caching of code comment todiff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.javaindex aedb434e9a..b02437de6b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java@@ -15,7 +15,6 @@ import io.onedev.server.model.support.issue.IssueField;import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;import io.onedev.server.model.support.issue.workflow.transitiontrigger.BuildSuccessfulTrigger;import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;-import io.onedev.server.model.support.issue.workflow.transitiontrigger.PullRequestTrigger;import io.onedev.server.model.support.issue.workflow.transitiontrigger.TransitionTrigger;import io.onedev.server.model.support.usermatcher.SpecifiedTeam;import io.onedev.server.model.support.usermatcher.SpecifiedUser;@@ -191,15 +190,7 @@ public class TransitionSpec implements Serializable {public void onRenameField(String oldName, String newName) {if (getPrerequisite() != null && getPrerequisite().getInputName().equals(oldName))getPrerequisite().setInputName(newName);- if (getTrigger() instanceof BuildSuccessfulTrigger) {- BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) getTrigger();- if (oldName.equals(trigger.getBuildField()))- trigger.setBuildField(newName);- } else if (getTrigger() instanceof PullRequestTrigger) {- PullRequestTrigger trigger = (PullRequestTrigger) getTrigger();- if (oldName.equals(trigger.getPullRequestField()))- trigger.setPullRequestField(newName);- } else if (getTrigger() instanceof PressButtonTrigger) {+ if (getTrigger() instanceof PressButtonTrigger) {PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();for (int i=0; i<trigger.getPromptFields().size(); i++) {if (trigger.getPromptFields().get(i).equals(oldName))@@ -215,15 +206,7 @@ public class TransitionSpec implements Serializable {public boolean onDeleteField(String fieldName) {if (getPrerequisite() != null && getPrerequisite().getInputName().equals(fieldName))return true;- if (getTrigger() instanceof BuildSuccessfulTrigger) {- BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) getTrigger();- if (fieldName.equals(trigger.getBuildField()))- return true;- } else if (getTrigger() instanceof PullRequestTrigger) {- PullRequestTrigger trigger = (PullRequestTrigger) getTrigger();- if (fieldName.equals(trigger.getPullRequestField()))- return true;- } else if (getTrigger() instanceof PressButtonTrigger) {+ if (getTrigger() instanceof PressButtonTrigger) {PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();for (Iterator<String> it = trigger.getPromptFields().iterator(); it.hasNext();) {if (it.next().equals(fieldName))diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.javaindex e34e78733a..1e6c035ea5 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java@@ -1,16 +1,9 @@package io.onedev.server.model.support.issue.workflow.transitiontrigger;-import java.util.ArrayList;-import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.inputspec.InputSpec;-import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.ConfigurationChoice;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.WicketUtils;@Editable(order=400, name="Build is successful")public class BuildSuccessfulTrigger implements TransitionTrigger {@@ -19,8 +12,6 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {private String configuration;- private String buildField;-@Editable(order=100, description="Specify the build configuration")@ConfigurationChoice@NotEmpty@@ -32,25 +23,4 @@ public class BuildSuccessfulTrigger implements TransitionTrigger {this.configuration = configuration;}- @Editable(order=200, description="Optionally specify a field of \"build choice\" type to store the build information")- @ChoiceProvider("getBuildFieldChoices")- public String getBuildField() {- return buildField;- }-- public void setBuildField(String buildField) {- this.buildField = buildField;- }-- @SuppressWarnings("unused")- private static List<String> getBuildFieldChoices() {- List<String> choices = new ArrayList<>();- ProjectPage page = (ProjectPage) WicketUtils.getPage();- for (InputSpec field: page.getProject().getIssueWorkflow().getFieldSpecs()) {- if (field.getType().equals(InputSpec.BUILD))- choices.add(field.getName());- }- return choices;- }-}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.javaindex da41ab3bc3..3b388449d6 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java@@ -1,16 +1,9 @@package io.onedev.server.model.support.issue.workflow.transitiontrigger;-import java.util.ArrayList;-import java.util.List;-import org.hibernate.validator.constraints.NotEmpty;-import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.editable.annotation.BranchChoice;-import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.WicketUtils;public abstract class PullRequestTrigger implements TransitionTrigger {@@ -18,8 +11,6 @@ public abstract class PullRequestTrigger implements TransitionTrigger {private String branch;- private String pullRequestField;-@Editable(name="Target Branch")@BranchChoice@NotEmpty@@ -31,25 +22,4 @@ public abstract class PullRequestTrigger implements TransitionTrigger {this.branch = branch;}- @Editable(order=200, description="Optionally specify a field of \"pull request choice\" type to store the pull request information")- @ChoiceProvider("getPullRequestFieldChoices")- public String getPullRequestField() {- return pullRequestField;- }-- public void setPullRequestField(String pullRequestField) {- this.pullRequestField = pullRequestField;- }-- @SuppressWarnings("unused")- private static List<String> getPullRequestFieldChoices() {- List<String> choices = new ArrayList<>();- ProjectPage page = (ProjectPage) WicketUtils.getPage();- for (InputSpec field: page.getProject().getIssueWorkflow().getFieldSpecs()) {- if (field.getType().equals(InputSpec.PULLREQUEST))- choices.add(field.getName());- }- return choices;- }-}diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.javaindex 346227252b..61ed84eca1 100644--- a/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FixedInCriteria.java@@ -23,7 +23,7 @@ public class FixedInCriteria extends IssueCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<Issue> context, User user) {- Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers();+ Collection<Long> fixedIssueNumbers = build.getFixedIssueNumbers(null);if (!fixedIssueNumbers.isEmpty())return context.getRoot().get(IssueConstants.ATTR_NUMBER).in(fixedIssueNumbers);else@@ -32,7 +32,7 @@ public class FixedInCriteria extends IssueCriteria {@Overridepublic boolean matches(Issue issue, User user) {- return build.getFixedIssues().contains(issue);+ return build.getFixedIssueNumbers(null).contains(issue.getNumber());}@Overridediff --git a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommitCriteria.java b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommitCriteria.javaindex 90ffaa8fb6..c3fc3dbe7d 100644--- a/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommitCriteria.java+++ b/core/src/main/java/io/onedev/server/search/entity/pullrequest/CommitCriteria.java@@ -1,8 +1,6 @@package io.onedev.server.search.entity.pullrequest;import java.util.Collection;-import java.util.HashSet;-import java.util.Set;import javax.persistence.criteria.Predicate;@@ -10,7 +8,6 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;import io.onedev.server.manager.CodeCommentRelationInfoManager;-import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;@@ -29,25 +26,20 @@ public class CommitCriteria extends PullRequestCriteria {@Overridepublic Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context, User user) {- Collection<Long> ids = new HashSet<>();- for (String uuid: getUUIDs(project, commitId)) {- PullRequest request = OneDev.getInstance(PullRequestManager.class).find(uuid);- if (request != null)- ids.add(request.getId());- }- if (!ids.isEmpty())- return context.getRoot().get(PullRequestConstants.ATTR_ID).in(ids);+ Collection<Long> pullRequestIds = getPullRequestIds(project, commitId);+ if (!pullRequestIds.isEmpty())+ return context.getRoot().get(PullRequestConstants.ATTR_ID).in(pullRequestIds);elsereturn context.getBuilder().disjunction();}- private Set<String> getUUIDs(Project project, ObjectId commitId) {- return OneDev.getInstance(CodeCommentRelationInfoManager.class).getPullRequestUUIDs(project, commitId);+ private Collection<Long> getPullRequestIds(Project project, ObjectId commitId) {+ return OneDev.getInstance(CodeCommentRelationInfoManager.class).getPullRequestIds(project, commitId);}@Overridepublic boolean matches(PullRequest request, User user) {- return getUUIDs(request.getTargetProject(), commitId).contains(request.getUUID());+ return getPullRequestIds(request.getTargetProject(), commitId).contains(request.getId());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex c1d48a7995..dad3f3014e 100644--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -31,8 +31,9 @@ import io.onedev.server.web.page.project.issues.issueboards.BoardEditPage;import io.onedev.server.web.page.project.issues.issueboards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.issueboards.NewBoardPage;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;-import io.onedev.server.web.page.project.issues.issuedetail.changedfiles.FileChangesPage;-import io.onedev.server.web.page.project.issues.issuedetail.changedfiles.FixedInBuildsPage;+import io.onedev.server.web.page.project.issues.issuedetail.fixbuilds.FixBuildsPage;+import io.onedev.server.web.page.project.issues.issuedetail.fixcommits.FixCommitsPage;+import io.onedev.server.web.page.project.issues.issuedetail.reviewrequests.ReviewRequestsPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;@@ -198,8 +199,9 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/issue-boards/new", NewBoardPage.class));add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));- add(new OnePageMapper("projects/${project}/issues/${issue}/file-changes", FileChangesPage.class));- add(new OnePageMapper("projects/${project}/issues/${issue}/fixed-in-builds", FixedInBuildsPage.class));+ add(new OnePageMapper("projects/${project}/issues/${issue}/fix-commits", FixCommitsPage.class));+ add(new OnePageMapper("projects/${project}/issues/${issue}/fix-builds", FixBuildsPage.class));+ add(new OnePageMapper("projects/${project}/issues/${issue}/pulls", ReviewRequestsPage.class));add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));diff --git a/core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.java b/core/src/main/java/io/onedev/server/web/component/RequestStateLabel.javasimilarity index 93%rename from core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.javarename to core/src/main/java/io/onedev/server/web/component/RequestStateLabel.javaindex 1a0db5cfb4..85385bc726 100644--- a/core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.java+++ b/core/src/main/java/io/onedev/server/web/component/RequestStateLabel.java@@ -11,11 +11,11 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;import io.onedev.server.model.support.pullrequest.PullRequestConstants;@SuppressWarnings("serial")-public class RequestStatusLabel extends Label {+public class RequestStateLabel extends Label {private final IModel<PullRequest> requestModel;- public RequestStatusLabel(String id, IModel<PullRequest> requestModel) {+ public RequestStateLabel(String id, IModel<PullRequest> requestModel) {super(id, new LoadableDetachableModel<String>() {@Overridediff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex 1b78b61fca..11177f1418 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -142,7 +142,7 @@ public abstract class CodeCommentPanel extends Panel {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getComment().getProject(), getComment().getUUID());+ return new ProjectAttachmentSupport(getComment().getProject(), "codecomment" + getComment().getUUID());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.javaindex 06c3a87827..709a7ed8bb 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java@@ -33,7 +33,7 @@ import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;-import io.onedev.server.web.component.RequestStatusLabel;+import io.onedev.server.web.component.RequestStateLabel;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.build.BuildStatusIcon;import io.onedev.server.web.component.issuestate.IssueStateLabel;@@ -104,7 +104,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {Link<Void> link = new BookmarkablePageLink<Void>("link", RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(request, null));link.add(new Label("label", "#" + request.getNumber()));requestFrag.add(link);- requestFrag.add(new RequestStatusLabel("status", Model.of(request)));+ requestFrag.add(new RequestStateLabel("status", Model.of(request)));item.add(requestFrag);} else {item.add(new Label("value", "#" + value));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 34cc77be79..4865a446a4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -6,6 +6,7 @@ import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.Date;+import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.stream.Collectors;@@ -44,13 +45,16 @@ import org.apache.wicket.request.Url;import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;import com.google.common.collect.Lists;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;+import io.onedev.server.manager.BuildInfoManager;+import io.onedev.server.manager.CodeCommentRelationInfoManager;+import io.onedev.server.manager.CommitInfoManager;import io.onedev.server.manager.IssueActionManager;-import io.onedev.server.manager.IssueInfoManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueVoteManager;import io.onedev.server.manager.IssueWatchManager;@@ -97,8 +101,9 @@ import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.fieldvalues.FieldValuesPanel;import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;-import io.onedev.server.web.page.project.issues.issuedetail.changedfiles.FileChangesPage;-import io.onedev.server.web.page.project.issues.issuedetail.changedfiles.FixedInBuildsPage;+import io.onedev.server.web.page.project.issues.issuedetail.fixbuilds.FixBuildsPage;+import io.onedev.server.web.page.project.issues.issuedetail.fixcommits.FixCommitsPage;+import io.onedev.server.web.page.project.issues.issuedetail.reviewrequests.ReviewRequestsPage;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.project.issues.newissue.NewIssuePage;@@ -365,10 +370,22 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexList<Tab> tabs = new ArrayList<>();tabs.add(new IssueTab("Activities", IssueActivitiesPage.class));- if (getIssue().getCommit() != null)- tabs.add(new IssueTab("File Changes", FileChangesPage.class));- if (!OneDev.getInstance(IssueInfoManager.class).getFixedInBuildUUIDs(getProject(), getIssue().getUUID()).isEmpty())- tabs.add(new IssueTab("Fixed In Builds", FixedInBuildsPage.class));++ if (SecurityUtils.canReadCode(getProject().getFacade())) {+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ Collection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getProject(), getIssue().getNumber());+ if (!fixCommits.isEmpty())+ tabs.add(new IssueTab("Fix Commits", FixCommitsPage.class));+ BuildInfoManager buildInfoManager = OneDev.getInstance(BuildInfoManager.class);+ if (!buildInfoManager.getFixBuildIds(getProject(), getIssue().getNumber()).isEmpty())+ tabs.add(new IssueTab("Fix Builds", FixBuildsPage.class));+ CodeCommentRelationInfoManager codeCommentRelationInfoManager = OneDev.getInstance(CodeCommentRelationInfoManager.class);+ Collection<Long> pullRequestIds = new HashSet<>();+ for (ObjectId commit: fixCommits)+ pullRequestIds.addAll(codeCommentRelationInfoManager.getPullRequestIds(getProject(), commit));+ if (!pullRequestIds.isEmpty())+ tabs.add(new IssueTab("Pull Requests", ReviewRequestsPage.class));+ }add(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.htmldeleted file mode 100644index 4bb7632eaf..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="fileChanges" class="file-changes"></div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.javadeleted file mode 100644index 4d328f751f..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FileChangesPage.java+++ /dev/null@@ -1,186 +0,0 @@-package io.onedev.server.web.page.project.issues.issuedetail.changedfiles;--import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;--import io.onedev.server.OneDev;-import io.onedev.server.manager.CodeCommentManager;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.MarkPos;-import io.onedev.server.model.support.ProjectAndBranch;-import io.onedev.server.util.diff.WhitespaceOption;-import io.onedev.server.web.component.diff.revision.CommentSupport;-import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;-import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;--@SuppressWarnings("serial")-public class FileChangesPage extends IssueDetailPage implements CommentSupport {-- private Long commentId;-- private MarkPos mark;-- private String blameFile;-- private String pathFilter;-- private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;-- private IModel<RevCommit> commitModel = new LoadableDetachableModel<RevCommit>() {-- @Override- protected RevCommit load() {- return getProject().getRevCommit(ObjectId.fromString(getIssue().getCommit()));- }-- };-- public FileChangesPage(PageParameters params) {- super(params);- }-- @Override- protected void onDetach() {- commitModel.detach();- super.onDetach();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- IModel<String> blameModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return blameFile;- }-- @Override- public void setObject(String object) {- blameFile = object;- }-- };- IModel<String> pathFilterModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return pathFilter;- }-- @Override- public void setObject(String object) {- pathFilter = object;- }-- };- IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {-- @Override- public void detach() {- }-- @Override- public WhitespaceOption getObject() {- return whitespaceOption;- }-- @Override- public void setObject(WhitespaceOption object) {- whitespaceOption = object;- }-- };-- if (getCommit().getParentCount() != 0) {- add(new RevisionDiffPanel("fileChanges", projectModel,- new Model<PullRequest>(null), getCommit().getParent(0).name(),- getCommit().name(), pathFilterModel, whitespaceOptionModel, blameModel, this));- } else {- add(new Label("fileChanges", "<i>No file changes</i>").setEscapeModelStrings(false));- }- }-- private RevCommit getCommit() {- return commitModel.getObject();- }-- @Override- public MarkPos getMark() {- return mark;- }-- @Override- public String getMarkUrl(MarkPos mark) {- RevisionComparePage.State state = new RevisionComparePage.State();- state.mark = mark;- state.leftSide = new ProjectAndBranch(getProject(), getCommit().getParent(0).name());- state.rightSide = new ProjectAndBranch(getProject(), getCommit().name());- state.pathFilter = pathFilter;- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;- state.whitespaceOption = whitespaceOption;- state.compareWithMergeBase = false;- return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(getProject(), state)).toString();- }-- @Override- public void onMark(AjaxRequestTarget target, MarkPos mark) {- this.mark = mark;- }-- @Override- public CodeComment getOpenComment() {- if (commentId != null)- return OneDev.getInstance(CodeCommentManager.class).load(commentId);- else- return null;- }-- @Override- public void onAddComment(AjaxRequestTarget target, MarkPos mark) {- this.commentId = null;- this.mark = mark;- }-- @Override- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {- if (comment != null) {- commentId = comment.getId();- mark = comment.getMarkPos();- } else {- commentId = null;- }- }-- @Override- public String getCommentUrl(CodeComment comment) {- RevisionComparePage.State state = new RevisionComparePage.State();- mark = comment.getMarkPos();- state.commentId = comment.getId();- state.leftSide = new ProjectAndBranch(getProject(), getCommit().getParent(0).name());- state.rightSide = new ProjectAndBranch(getProject(), getCommit().name());- state.pathFilter = pathFilter;- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;- state.whitespaceOption = whitespaceOption;- state.compareWithMergeBase = false;- return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(getProject(), state)).toString();- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixbuilds/FixBuildsPage.htmlsimilarity index 100%rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.htmlrename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixbuilds/FixBuildsPage.htmldiff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixbuilds/FixBuildsPage.javasimilarity index 88%rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.javarename to core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixbuilds/FixBuildsPage.javaindex 65200167da..4eb9b5fbe9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/changedfiles/FixedInBuildsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixbuilds/FixBuildsPage.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issues.issuedetail.changedfiles;+package io.onedev.server.web.page.project.issues.issuedetail.fixbuilds;import java.util.ArrayList;import java.util.Collections;@@ -25,7 +25,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.manager.BuildManager;-import io.onedev.server.manager.IssueInfoManager;+import io.onedev.server.manager.BuildInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.Configuration;import io.onedev.server.util.DateUtils;@@ -33,17 +33,17 @@ import io.onedev.server.web.component.build.BuildStatusIcon;import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;@SuppressWarnings("serial")-public class FixedInBuildsPage extends IssueDetailPage {+public class FixBuildsPage extends IssueDetailPage {private final IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {Map<Configuration, Build> buildMap = new HashMap<>();- for (String buildUUID: OneDev.getInstance(IssueInfoManager.class).getFixedInBuildUUIDs(getProject(), getIssue().getUUID())) {- Build build = OneDev.getInstance(BuildManager.class).findByUUID(buildUUID);+ for (Long buildId: OneDev.getInstance(BuildInfoManager.class).getFixBuildIds(getProject(), getIssue().getNumber())) {+ Build build = OneDev.getInstance(BuildManager.class).get(buildId);Build existingBuild = buildMap.get(build.getConfiguration());- if (existingBuild == null || existingBuild.getDate().before(build.getDate()))+ if (existingBuild == null || existingBuild.getId() < build.getId())buildMap.put(build.getConfiguration(), build);}List<Build> buildList = new ArrayList<>(buildMap.values());@@ -53,7 +53,7 @@ public class FixedInBuildsPage extends IssueDetailPage {};- public FixedInBuildsPage(PageParameters params) {+ public FixBuildsPage(PageParameters params) {super(params);}@@ -83,7 +83,7 @@ public class FixedInBuildsPage extends IssueDetailPage {@Overridepublic void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,IModel<Build> rowModel) {- Fragment fragment = new Fragment(componentId, "buildFrag", FixedInBuildsPage.this);+ Fragment fragment = new Fragment(componentId, "buildFrag", FixBuildsPage.this);fragment.add(new BuildStatusIcon("status", rowModel));ExternalLink link = new ExternalLink("link", rowModel.getObject().getUrl());link.add(new Label("label", rowModel.getObject().getName()));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixcommits/FixCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixcommits/FixCommitsPage.htmlnew file mode 100644index 0000000000..9e75291fe6--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixcommits/FixCommitsPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="fixCommits"></div>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixcommits/FixCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixcommits/FixCommitsPage.javanew file mode 100644index 0000000000..891f665d8c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/fixcommits/FixCommitsPage.java@@ -0,0 +1,53 @@+package io.onedev.server.web.page.project.issues.issuedetail.fixcommits;++import java.util.ArrayList;+import java.util.Comparator;+import java.util.List;++import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.revwalk.RevCommit;++import edu.emory.mathcs.backport.java.util.Collections;+import io.onedev.server.OneDev;+import io.onedev.server.manager.CommitInfoManager;+import io.onedev.server.web.component.commitlist.CommitListPanel;+import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;++@SuppressWarnings("serial")+public class FixCommitsPage extends IssueDetailPage {++ public FixCommitsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new CommitListPanel("fixCommits", projectModel, new LoadableDetachableModel<List<RevCommit>>() {++ @Override+ protected List<RevCommit> load() {+ List<RevCommit> commits = new ArrayList<>();+ for (ObjectId commitId: OneDev.getInstance(CommitInfoManager.class).getFixCommits(getProject(), getIssue().getNumber())) {+ RevCommit commit = getProject().getRevCommit(commitId, false);+ if (commit != null)+ commits.add(commit);+ }+ Collections.sort(commits, new Comparator<RevCommit>() {++ @Override+ public int compare(RevCommit o1, RevCommit o2) {+ return o2.getCommitTime() - o1.getCommitTime();+ }++ });+ return commits;+ }++ }));+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/reviewrequests/ReviewRequestsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/reviewrequests/ReviewRequestsPage.htmlnew file mode 100644index 0000000000..735b15b12a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/reviewrequests/ReviewRequestsPage.html@@ -0,0 +1,9 @@+<wicket:extend>+ <table wicket:id="requests" class="table"></table>+ <wicket:fragment wicket:id="titleFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="sourceFrag">+ <a wicket:id="link"></a>+ </wicket:fragment>+</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/reviewrequests/ReviewRequestsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/reviewrequests/ReviewRequestsPage.javanew file mode 100644index 0000000000..bb42991201--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/reviewrequests/ReviewRequestsPage.java@@ -0,0 +1,165 @@+package io.onedev.server.web.page.project.issues.issuedetail.reviewrequests;++import java.util.ArrayList;+import java.util.Collections;+import java.util.Comparator;+import java.util.HashSet;+import java.util.Iterator;+import java.util.List;+import java.util.Set;++import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.OneDev;+import io.onedev.server.manager.CodeCommentRelationInfoManager;+import io.onedev.server.manager.CommitInfoManager;+import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.model.PullRequest;+import io.onedev.server.web.component.RequestStateLabel;+import io.onedev.server.web.component.link.BranchLink;+import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.activities.RequestActivitiesPage;++@SuppressWarnings("serial")+public class ReviewRequestsPage extends IssueDetailPage {++ private final IModel<List<PullRequest>> requestsModel = new LoadableDetachableModel<List<PullRequest>>() {++ @Override+ protected List<PullRequest> load() {+ Set<PullRequest> requestSet = new HashSet<>();+ for (ObjectId fixCommit: OneDev.getInstance(CommitInfoManager.class).getFixCommits(getProject(), getIssue().getNumber())) {+ for (Long requestId: OneDev.getInstance(CodeCommentRelationInfoManager.class).getPullRequestIds(getProject(), fixCommit)) {+ PullRequest request = OneDev.getInstance(PullRequestManager.class).get(requestId);+ if (request != null)+ requestSet.add(request);+ }+ }+ List<PullRequest> requestList = new ArrayList<>(requestSet);+ Collections.sort(requestList, new Comparator<PullRequest>() {++ @Override+ public int compare(PullRequest o1, PullRequest o2) {+ return o2.getId().compareTo(o1.getId());+ }++ });+ return requestList;+ }++ };++ public ReviewRequestsPage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onDetach() {+ requestsModel.detach();+ super.onDetach();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<IColumn<PullRequest, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("#")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId,+ IModel<PullRequest> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getNumber()));+ }+ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Title")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId,+ IModel<PullRequest> rowModel) {+ Fragment fragment = new Fragment(componentId, "titleFrag", ReviewRequestsPage.this);+ Link<Void> link = new BookmarkablePageLink<Void>("link", RequestActivitiesPage.class,+ RequestActivitiesPage.paramsOf(rowModel.getObject(), null));+ link.add(new Label("label", rowModel.getObject().getTitle()));+ fragment.add(link);++ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("State")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId,+ IModel<PullRequest> rowModel) {+ cellItem.add(new RequestStateLabel(componentId, rowModel));+ }++ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Source")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ if (rowModel.getObject().getSource() != null) {+ Fragment fragment = new Fragment(componentId, "sourceFrag", ReviewRequestsPage.this);+ fragment.add(new BranchLink("link", rowModel.getObject().getSource(), rowModel.getObject()));+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>Unknown</i>").setEscapeModelStrings(false));+ }+ }++ });++ SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {++ @Override+ public Iterator<? extends PullRequest> iterator(long first, long count) {+ return requestsModel.getObject().iterator();+ }++ @Override+ public long size() {+ return requestsModel.getObject().size();+ }++ @Override+ public IModel<PullRequest> model(PullRequest object) {+ Long id = object.getId();+ return new LoadableDetachableModel<PullRequest>() {++ @Override+ protected PullRequest load() {+ return OneDev.getInstance(PullRequestManager.class).load(id);+ }++ };+ }+ };++ DataTable<PullRequest, Void> buildsTable = new DataTable<PullRequest, Void>("requests", columns, dataProvider, Integer.MAX_VALUE);+ buildsTable.addTopToolbar(new AjaxFallbackHeadersToolbar<Void>(buildsTable, dataProvider));+ buildsTable.addBottomToolbar(new NoRecordsToolbar(buildsTable));+ add(buildsTable);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.htmlindex 7990280ed4..dc84295164 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html@@ -23,6 +23,9 @@</div></div></div>+ <wicket:fragment wicket:id="sourceFrag">+ <a wicket:id="link"></a>+ </wicket:fragment><wicket:fragment wicket:id="lastActivityFrag"><span wicket:id="user"></span><span wicket:id="description"></span>diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.javaindex 5747662960..97a95b4bd4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java@@ -35,13 +35,11 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.lib.FileMode;import org.slf4j.Logger;import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.git.BlobIdent;import io.onedev.server.manager.ProjectManager;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.manager.PullRequestQuerySettingManager;@@ -55,11 +53,11 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.PullRequestQueryBehavior;-import io.onedev.server.web.component.RequestStatusLabel;+import io.onedev.server.web.component.RequestStateLabel;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;+import io.onedev.server.web.component.link.BranchLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.activities.RequestActivitiesPage;import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;@@ -349,32 +347,22 @@ public class RequestListPage extends ProjectPage {@Overridepublic void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- cellItem.add(new RequestStatusLabel(componentId, rowModel));+ cellItem.add(new RequestStateLabel(componentId, rowModel));}});- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Target Branch")) {+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Source")) {@Overridepublic void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- PullRequest request = rowModel.getObject();- PageParameters params = ProjectBlobPage.paramsOf(getProject(),- new BlobIdent(request.getTargetBranch(), null, FileMode.TREE.getBits()));- cellItem.add(new BookmarkablePageLink<Void>(componentId, ProjectBlobPage.class, params) {-- @Override- public IModel<?> getBody() {- return Model.of(rowModel.getObject().getTargetBranch());- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("a");- }-- });+ if (rowModel.getObject().getSource() != null) {+ Fragment fragment = new Fragment(componentId, "sourceFrag", RequestListPage.this);+ fragment.add(new BranchLink("link", rowModel.getObject().getSource(), rowModel.getObject()));+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>Unknown</i>").setEscapeModelStrings(false));+ }}});