The Unified and Autonomous Development Platform
Show code problems reported from build in source code view
Robin Shen5e980f63e88a
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.javaindex 1b0171d8bc..247aa9c008 100644--- a/server-core/src/main/java/io/onedev/server/CoreModule.java+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java@@ -90,6 +90,8 @@ import io.onedev.server.buildspec.job.JobManager;import io.onedev.server.buildspec.job.log.DefaultLogManager;import io.onedev.server.buildspec.job.log.LogManager;import io.onedev.server.buildspec.job.log.instruction.LogInstruction;+import io.onedev.server.code.CodeProblem;+import io.onedev.server.code.CodeProblemContribution;import io.onedev.server.entitymanager.BuildDependenceManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.BuildMetricManager;@@ -113,6 +115,7 @@ import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.PullRequestAssignmentManager;import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestCodeCommentRelationManager;import io.onedev.server.entitymanager.PullRequestCommentManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestQuerySettingManager;@@ -148,6 +151,7 @@ import io.onedev.server.entitymanager.impl.DefaultMilestoneManager;import io.onedev.server.entitymanager.impl.DefaultProjectManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestAssignmentManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestChangeManager;+import io.onedev.server.entitymanager.impl.DefaultPullRequestCodeCommentRelationManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;import io.onedev.server.entitymanager.impl.DefaultPullRequestQuerySettingManager;@@ -179,6 +183,7 @@ import io.onedev.server.maintenance.DefaultDataManager;import io.onedev.server.maintenance.ResetAdminPassword;import io.onedev.server.maintenance.RestoreDatabase;import io.onedev.server.maintenance.Upgrade;+import io.onedev.server.model.Build;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.authenticator.Authenticator;import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;@@ -393,6 +398,7 @@ public class CoreModule extends AbstractPluginModule {bind(BuildQuerySettingManager.class).to(DefaultBuildQuerySettingManager.class);bind(PullRequestAssignmentManager.class).to(DefaultPullRequestAssignmentManager.class);bind(SshKeyManager.class).to(DefaultSshKeyManager.class);+ bind(PullRequestCodeCommentRelationManager.class).to(DefaultPullRequestCodeCommentRelationManager.class);bind(BuildMetricManager.class).to(DefaultBuildMetricManager.class);bind(WebHookManager.class);@@ -486,6 +492,16 @@ public class CoreModule extends AbstractPluginModule {}});++ contribute(CodeProblemContribution.class, new CodeProblemContribution() {++ @Override+ public List<CodeProblem> getCodeProblems(Build build, String blobPath) {+ return Lists.newArrayList();+ }++ });+}private void configureSsh() {diff --git a/server-core/src/main/java/io/onedev/server/code/CodeProblem.java b/server-core/src/main/java/io/onedev/server/code/CodeProblem.javanew file mode 100644index 0000000000..af89678b22--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/code/CodeProblem.java@@ -0,0 +1,63 @@+package io.onedev.server.code;++import java.io.Serializable;++import org.apache.commons.lang3.builder.EqualsBuilder;+import org.apache.commons.lang3.builder.HashCodeBuilder;++import io.onedev.commons.utils.PlanarRange;++public class CodeProblem implements Serializable {++ private static final long serialVersionUID = 1L;++ public static enum Severity {ERROR, WARNING};++ private final PlanarRange position;++ private final String content;++ private final Severity severity;++ public CodeProblem(PlanarRange position, String content, Severity severity) {+ this.position = position;+ this.content = content;+ this.severity = severity;+ }++ public PlanarRange getPosition() {+ return position;+ }++ public String getContent() {+ return content;+ }++ public Severity getSeverity() {+ return severity;+ }++ @Override+ public boolean equals(Object other) {+ if (!(other instanceof CodeProblem))+ return false;+ if (this == other)+ return true;+ CodeProblem otherProblem = (CodeProblem) other;+ return new EqualsBuilder()+ .append(position, otherProblem.position)+ .append(content, otherProblem.content)+ .append(severity, otherProblem.severity)+ .isEquals();+ }++ @Override+ public int hashCode() {+ return new HashCodeBuilder(17, 37)+ .append(position)+ .append(content)+ .append(severity)+ .toHashCode();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.java b/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.javanew file mode 100644index 0000000000..0924ac9dce--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/code/CodeProblemContribution.java@@ -0,0 +1,13 @@+package io.onedev.server.code;++import java.util.List;++import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.server.model.Build;++@ExtensionPoint+public interface CodeProblemContribution {++ List<CodeProblem> getCodeProblems(Build build, String blobPath);++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.javaindex 5634d8ee5f..7a55c8407e 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentManager.java@@ -2,13 +2,11 @@ package io.onedev.server.entitymanager;import java.util.Collection;import java.util.List;-import java.util.Map;import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;-import io.onedev.commons.utils.PlanarRange;import io.onedev.server.model.CodeComment;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;@@ -22,7 +20,7 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {Collection<CodeComment> query(Project project, ObjectId...commitIds);- Map<CodeComment, PlanarRange> findHistory(Project project, ObjectId commitId, String path);+ Collection<CodeComment> findHistory(Project project, ObjectId commitId, String path);List<CodeComment> query(Project project, @Nullable PullRequest request,EntityQuery<CodeComment> commentQuery, int firstResult, int maxResults);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCodeCommentRelationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCodeCommentRelationManager.javanew file mode 100644index 0000000000..bc77566366--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestCodeCommentRelationManager.java@@ -0,0 +1,8 @@+package io.onedev.server.entitymanager;++import io.onedev.server.model.PullRequestCodeCommentRelation;+import io.onedev.server.persistence.dao.EntityManager;++public interface PullRequestCodeCommentRelationManager extends EntityManager<PullRequestCodeCommentRelation> {++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.javaindex 278f45a210..8a5dab78d9 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java@@ -147,8 +147,8 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im}@Override- public Map<CodeComment, PlanarRange> findHistory(Project project, ObjectId commitId, String path) {- Map<CodeComment, PlanarRange> comments = new HashMap<>();+ public Collection<CodeComment> findHistory(Project project, ObjectId commitId, String path) {+ Collection<CodeComment> comments = new ArrayList<>();Map<String, Map<String, List<CodeComment>>> possibleComments = new HashMap<>();Collection<String> possiblePaths = Sets.newHashSet(path);@@ -161,7 +161,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imfor (CodeComment comment: query(criteria)) {String possiblePath = comment.getMark().getPath();if (comment.getMark().getCommitHash().equals(commitId.name()) && possiblePath.equals(path)) {- comments.put(comment, comment.getMark().getRange());+ comments.add(comment);} else {Map<String, List<CodeComment>> commentsOnCommit =possibleComments.get(comment.getMark().getCommitHash());@@ -226,7 +226,7 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> imfor (CodeComment comment: pathEntry.getValue()) {PlanarRange newRange = DiffUtils.mapRange(lineMapping, comment.getMark().getRange());if (newRange != null)- comments.put(comment, newRange);+ comments.add(comment);}if (++checkedHistoryFiles == MAX_HISTORY_FILES_TO_CHECK) {return comments;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCodeCommentRelationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCodeCommentRelationManager.javanew file mode 100644index 0000000000..043a34aa08--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestCodeCommentRelationManager.java@@ -0,0 +1,20 @@+package io.onedev.server.entitymanager.impl;++import javax.inject.Inject;+import javax.inject.Singleton;++import io.onedev.server.entitymanager.PullRequestCodeCommentRelationManager;+import io.onedev.server.model.PullRequestCodeCommentRelation;+import io.onedev.server.persistence.dao.BaseEntityManager;+import io.onedev.server.persistence.dao.Dao;++@Singleton+public class DefaultPullRequestCodeCommentRelationManager extends BaseEntityManager<PullRequestCodeCommentRelation>+ implements PullRequestCodeCommentRelationManager {++ @Inject+ public DefaultPullRequestCodeCommentRelationManager(Dao dao) {+ super(dao);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.javaindex a1cc2d2724..f1f5dff2df 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSshKeyManager.java@@ -28,6 +28,7 @@ import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.BaseEntityManager;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.security.CipherUtils;import io.onedev.server.ssh.SshKeyUtils;@Singleton@@ -56,7 +57,7 @@ public class DefaultSshKeyManager extends BaseEntityManager<SshKey> implements Sfor (String content: sshKeys) {try {PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(content);- String digest = KeyUtils.getFingerPrint(SshKey.DIGEST_FORMAT, pubEntry);+ String digest = KeyUtils.getFingerPrint(CipherUtils.DIGEST_FORMAT, pubEntry);SshKey sshKey = new SshKey();sshKey.setDigest(digest);diff --git a/server-core/src/main/java/io/onedev/server/git/Contribution.java b/server-core/src/main/java/io/onedev/server/git/GitContribution.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/git/Contribution.javarename to server-core/src/main/java/io/onedev/server/git/GitContribution.javaindex f13326f1b5..cca5f2a26c 100644--- a/server-core/src/main/java/io/onedev/server/git/Contribution.java+++ b/server-core/src/main/java/io/onedev/server/git/GitContribution.java@@ -2,7 +2,7 @@ package io.onedev.server.git;import java.io.Serializable;-public class Contribution implements Serializable {+public class GitContribution implements Serializable {private static final long serialVersionUID = 1L;@@ -14,7 +14,7 @@ public class Contribution implements Serializable {private final int deletions;- public Contribution(int commits, int additions, int deletions) {+ public GitContribution(int commits, int additions, int deletions) {this.commits = commits;this.additions = additions;this.deletions = deletions;diff --git a/server-core/src/main/java/io/onedev/server/git/Contributor.java b/server-core/src/main/java/io/onedev/server/git/GitContributor.javasimilarity index 68%rename from server-core/src/main/java/io/onedev/server/git/Contributor.javarename to server-core/src/main/java/io/onedev/server/git/GitContributor.javaindex ac75656962..f25d67a9cb 100644--- a/server-core/src/main/java/io/onedev/server/git/Contributor.java+++ b/server-core/src/main/java/io/onedev/server/git/GitContributor.java@@ -7,17 +7,17 @@ import org.eclipse.jgit.lib.PersonIdent;import io.onedev.server.util.Day;-public class Contributor implements Serializable {+public class GitContributor implements Serializable {private static final long serialVersionUID = 1L;private final PersonIdent author;- private final Contribution totalContribution;+ private final GitContribution totalContribution;private final Map<Day, Integer> dailyContributions;- public Contributor(PersonIdent author, Contribution totalContribution, Map<Day, Integer> dailyContributions) {+ public GitContributor(PersonIdent author, GitContribution totalContribution, Map<Day, Integer> dailyContributions) {this.author = author;this.totalContribution = totalContribution;this.dailyContributions = dailyContributions;@@ -27,7 +27,7 @@ public class Contributor implements Serializable {return author;}- public Contribution getTotalContribution() {+ public GitContribution getTotalContribution() {return totalContribution;}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.javaindex dd7ad7fa0b..817b942f2a 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/CommitInfoManager.java@@ -6,12 +6,12 @@ import java.util.Map;import org.eclipse.jgit.lib.ObjectId;-import io.onedev.server.git.Contribution;-import io.onedev.server.git.Contributor;-import io.onedev.server.git.NameAndEmail;+import io.onedev.server.git.GitContribution;+import io.onedev.server.git.GitContributor;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.Day;+import io.onedev.server.util.NameAndEmail;public interface CommitInfoManager {@@ -48,7 +48,7 @@ public interface CommitInfoManager {* @return* map of day to contribution*/- Map<Day, Contribution> getOverallContributions(Project project);+ Map<Day, GitContribution> getOverallContributions(Project project);/*** Get list of top contributors@@ -66,7 +66,7 @@ public interface CommitInfoManager {* @return* list of top user contributors, reversely ordered by number of contributions*/- List<Contributor> getTopContributors(Project project, int top, Contribution.Type type, int fromDay, int toDay);+ List<GitContributor> getTopContributors(Project project, int top, GitContribution.Type type, int fromDay, int toDay);/*** Get source code line statistics over timediff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.javaindex 800511bc5b..1ac5e8af41 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java@@ -48,10 +48,9 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.event.RefUpdated;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.git.Contribution;-import io.onedev.server.git.Contributor;+import io.onedev.server.git.GitContribution;+import io.onedev.server.git.GitContributor;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.ListNumStatsCommand;@@ -66,6 +65,7 @@ import io.onedev.server.storage.StorageManager;import io.onedev.server.util.Day;import io.onedev.server.util.ElementPumper;import io.onedev.server.util.IssueUtils;+import io.onedev.server.util.NameAndEmail;import io.onedev.server.util.Pair;import io.onedev.server.util.concurrent.Prioritized;import io.onedev.server.util.work.BatchWorkManager;@@ -611,10 +611,10 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Overridepublic void execute(Transaction txn) {- Map<Integer, Contribution> overallContributions =+ Map<Integer, GitContribution> overallContributions =deserializeContributions(readBytes(defaultStore, txn, OVERALL_CONTRIBUTIONS_KEY));- Map<Integer, Map<Integer, Contribution>> dailyContributionsCache = new HashMap<>();+ Map<Integer, Map<Integer, GitContribution>> dailyContributionsCache = new HashMap<>();new ElementPumper<GitCommit>() {@@ -654,7 +654,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemeint userIndex = readInt(userToIndexStore, txn, authorKey, -1);Preconditions.checkState(userIndex != -1);- Map<Integer, Contribution> contributionsOnDay = dailyContributionsCache.get(dayValue);+ Map<Integer, GitContribution> contributionsOnDay = dailyContributionsCache.get(dayValue);if (contributionsOnDay == null) {contributionsOnDay = deserializeContributions(readBytes(dailyContributionsStore, txn, new IntByteIterable(dayValue)));@@ -667,7 +667,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme}.pump();- for (Map.Entry<Integer, Map<Integer, Contribution>> entry: dailyContributionsCache.entrySet()) {+ for (Map.Entry<Integer, Map<Integer, GitContribution>> entry: dailyContributionsCache.entrySet()) {byte[] bytesOfContributionsOnDay = serializeContributions(entry.getValue());dailyContributionsStore.put(txn, new IntByteIterable(entry.getKey()),new ArrayByteIterable(bytesOfContributionsOnDay));@@ -991,15 +991,15 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme});}- private void updateContribution(Map<Integer, Contribution> contributions, int key, GitCommit commit) {- Contribution contribution = contributions.get(key);+ private void updateContribution(Map<Integer, GitContribution> contributions, int key, GitCommit commit) {+ GitContribution contribution = contributions.get(key);if (contribution != null) {- contribution = new Contribution(+ contribution = new GitContribution(contribution.getCommits()+1,contribution.getAdditions()+commit.getAdditions(),contribution.getDeletions()+commit.getDeletions());} else {- contribution = new Contribution(1, commit.getAdditions(), commit.getDeletions());+ contribution = new GitContribution(1, commit.getAdditions(), commit.getDeletions());}contributions.put(key, contribution);}@@ -1294,16 +1294,16 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Sessional@Override- public Map<Day, Contribution> getOverallContributions(Project project) {+ public Map<Day, GitContribution> getOverallContributions(Project project) {Environment env = getEnv(project.getId().toString());Store store = getStore(env, DEFAULT_STORE);- return env.computeInReadonlyTransaction(new TransactionalComputable<Map<Day, Contribution>>() {+ return env.computeInReadonlyTransaction(new TransactionalComputable<Map<Day, GitContribution>>() {@Override- public Map<Day, Contribution> compute(Transaction txn) {- Map<Day, Contribution> overallContributions = new HashMap<>();- for (Map.Entry<Integer, Contribution> entry:+ public Map<Day, GitContribution> compute(Transaction txn) {+ Map<Day, GitContribution> overallContributions = new HashMap<>();+ for (Map.Entry<Integer, GitContribution> entry:deserializeContributions(readBytes(store, txn, OVERALL_CONTRIBUTIONS_KEY)).entrySet()) {overallContributions.put(new Day(entry.getKey()), entry.getValue());}@@ -1315,32 +1315,32 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Sessional@Override- public List<Contributor> getTopContributors(Project project, int top, Contribution.Type type,+ public List<GitContributor> getTopContributors(Project project, int top, GitContribution.Type type,int fromDay, int 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>>() {+ return env.computeInReadonlyTransaction(new TransactionalComputable<List<GitContributor>>() {@Override- public List<Contributor> compute(Transaction txn) {- Map<Integer, Contribution> overallContributions =+ public List<GitContributor> compute(Transaction txn) {+ Map<Integer, GitContribution> overallContributions =deserializeContributions(readBytes(defaultStore, txn, OVERALL_CONTRIBUTIONS_KEY));- Map<Integer, Contribution> totalContributions = new HashMap<>();+ Map<Integer, GitContribution> totalContributions = new HashMap<>();for (int dayValue: overallContributions.keySet()) {if (dayValue >= fromDay && dayValue <= toDay) {ByteIterable dayKey = new IntByteIterable(dayValue);- Map<Integer, Contribution> contributionsOnDay =+ Map<Integer, GitContribution> contributionsOnDay =deserializeContributions(readBytes(dailyContributionsStore, txn, dayKey));- for (Map.Entry<Integer, Contribution> entry: contributionsOnDay.entrySet()) {+ for (Map.Entry<Integer, GitContribution> entry: contributionsOnDay.entrySet()) {Integer userIndex = entry.getKey();- Contribution totalContribution = totalContributions.get(userIndex);+ GitContribution totalContribution = totalContributions.get(userIndex);if (totalContribution == null) {totalContribution = entry.getValue();} else {- totalContribution = new Contribution(+ totalContribution = new GitContribution(totalContribution.getCommits() + entry.getValue().getCommits(),totalContribution.getAdditions() + entry.getValue().getAdditions(),totalContribution.getDeletions() + entry.getValue().getDeletions());@@ -1355,9 +1355,9 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme@Overridepublic int compare(Integer o1, Integer o2) {- if (type == Contribution.Type.COMMITS)+ if (type == GitContribution.Type.COMMITS)return totalContributions.get(o2).getCommits() - totalContributions.get(o1).getCommits();- else if (type == Contribution.Type.ADDITIONS)+ else if (type == GitContribution.Type.ADDITIONS)return totalContributions.get(o2).getAdditions() - totalContributions.get(o1).getAdditions();elsereturn totalContributions.get(o2).getDeletions() - totalContributions.get(o1).getDeletions();@@ -1375,10 +1375,10 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemefor (int dayValue: overallContributions.keySet()) {if (dayValue >= fromDay && dayValue <= toDay) {ByteIterable dayKey = new IntByteIterable(dayValue);- Map<Integer, Contribution> contributionsOnDay =+ Map<Integer, GitContribution> contributionsOnDay =deserializeContributions(readBytes(dailyContributionsStore, txn, dayKey));Day day = new Day(dayValue);- for (Map.Entry<Integer, Contribution> entry: contributionsOnDay.entrySet()) {+ for (Map.Entry<Integer, GitContribution> entry: contributionsOnDay.entrySet()) {Integer userIndex = entry.getKey();if (topUserIndexSet.contains(userIndex)) {Map<Day, Integer> contributionsByUser = userContributions.get(userIndex);@@ -1386,9 +1386,9 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemecontributionsByUser = new HashMap<>();userContributions.put(userIndex, contributionsByUser);}- if (type == Contribution.Type.COMMITS)+ if (type == GitContribution.Type.COMMITS)contributionsByUser.put(day, entry.getValue().getCommits());- else if (type == Contribution.Type.ADDITIONS)+ else if (type == GitContribution.Type.ADDITIONS)contributionsByUser.put(day, entry.getValue().getAdditions());elsecontributionsByUser.put(day, entry.getValue().getDeletions());@@ -1397,14 +1397,14 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme}}- List<Contributor> contributors = new ArrayList<>();+ List<GitContributor> 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));+ contributors.add(new GitContributor(user, totalContributions.get(userIndex), contributionsByUser));}}@@ -1414,9 +1414,9 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme});}- private Map<Integer, Contribution> deserializeContributions(byte[] bytes) {+ private Map<Integer, GitContribution> deserializeContributions(byte[] bytes) {if (bytes != null) {- Map<Integer, Contribution> contributions = new HashMap<>();+ Map<Integer, GitContribution> 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();@@ -1427,7 +1427,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager implemepos += Integer.BYTES;int deletions = ByteBuffer.wrap(bytes, pos, Integer.BYTES).getInt();pos += Integer.BYTES;- contributions.put(key, new Contribution(commits, additions, deletions));+ contributions.put(key, new GitContribution(commits, additions, deletions));}return contributions;} else {@@ -1435,10 +1435,10 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme}}- private byte[] serializeContributions(Map<Integer, Contribution> contributions) {+ private byte[] serializeContributions(Map<Integer, GitContribution> contributions) {byte[] bytes = new byte[contributions.size()*Integer.BYTES*4];int pos = 0;- for (Map.Entry<Integer, Contribution> entry: contributions.entrySet()) {+ for (Map.Entry<Integer, GitContribution> entry: contributions.entrySet()) {byte[] keyBytes = ByteBuffer.allocate(Integer.BYTES).putInt(entry.getKey()).array();System.arraycopy(keyBytes, 0, bytes, pos, Integer.BYTES);pos += Integer.BYTES;diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex 518be54276..1e0db48a34 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -130,6 +130,9 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp@OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)private Collection<CodeCommentReply> replies = new ArrayList<>();+ @OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)+ private Collection<PullRequestCodeCommentRelation> relations = new ArrayList<>();+@Column(nullable=false)private String uuid = UUID.randomUUID().toString();diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex e6bf736f76..9626f80a71 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -291,6 +291,9 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach@OneToMany(mappedBy="request")private Collection<CodeComment> codeComments = new ArrayList<>();+ @OneToMany(mappedBy="request")+ private Collection<PullRequestCodeCommentRelation> relations = new ArrayList<>();+private transient Boolean mergedIntoTarget;private transient List<PullRequestUpdate> sortedUpdates;diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestCodeCommentRelation.java b/server-core/src/main/java/io/onedev/server/model/PullRequestCodeCommentRelation.javanew file mode 100644index 0000000000..08eb60745e--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestCodeCommentRelation.java@@ -0,0 +1,62 @@+package io.onedev.server.model;++import javax.persistence.Embedded;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++import io.onedev.server.model.support.CompareContext;++@Entity+@Table(+ indexes={@Index(columnList="o_comment_id"), @Index(columnList="o_request_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"o_comment_id", "o_request_id"})+})+public class PullRequestCodeCommentRelation extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final String PROP_REQUEST = "request";++ public static final String PROP_COMMENT = "comment";++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private PullRequest request;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private CodeComment comment;++ @Embedded+ private CompareContext compareContext;++ public PullRequest getRequest() {+ return request;+ }++ public void setRequest(PullRequest request) {+ this.request = request;+ }++ public CodeComment getComment() {+ return comment;+ }++ public void setComment(CodeComment comment) {+ this.comment = comment;+ }++ public CompareContext getCompareContext() {+ return compareContext;+ }++ public void setCompareContext(CompareContext compareContext) {+ this.compareContext = compareContext;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/SshKey.java b/server-core/src/main/java/io/onedev/server/model/SshKey.javaindex e40ebd2f38..b6d91da839 100644--- a/server-core/src/main/java/io/onedev/server/model/SshKey.java+++ b/server-core/src/main/java/io/onedev/server/model/SshKey.java@@ -13,8 +13,6 @@ import javax.persistence.Table;import javax.persistence.UniqueConstraint;import javax.validation.ConstraintValidatorContext;-import org.apache.sshd.common.digest.BaseDigest;-import org.apache.sshd.common.digest.Digest;import org.hibernate.validator.constraints.NotEmpty;import io.onedev.commons.utils.StringUtils;@@ -36,8 +34,6 @@ public class SshKey extends AbstractEntity implements Validatable {private static final long serialVersionUID = 1L;- public static final Digest DIGEST_FORMAT = new BaseDigest("MD5", 512);-@Column(nullable=false, length = 5000)private String content;diff --git a/server-core/src/main/java/io/onedev/server/security/CipherUtils.java b/server-core/src/main/java/io/onedev/server/security/CipherUtils.javaindex d93dcf084d..21a5e887b5 100644--- a/server-core/src/main/java/io/onedev/server/security/CipherUtils.java+++ b/server-core/src/main/java/io/onedev/server/security/CipherUtils.java@@ -9,12 +9,17 @@ import javax.crypto.spec.PBEKeySpec;import org.apache.commons.codec.binary.Base64;import org.apache.shiro.crypto.AesCipherService;+import org.apache.sshd.common.digest.BaseDigest;+import org.apache.sshd.common.digest.Digest;+import org.apache.sshd.common.digest.DigestUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;public class CipherUtils {+ public static final Digest DIGEST_FORMAT = new BaseDigest("MD5", 512);+private static volatile KeyPair keyPair;private static AesCipherService cipherService = new AesCipherService();@@ -45,6 +50,14 @@ public class CipherUtils {return cipherService.decrypt(data, getCipherKey()).getBytes();}+ public static String digest(String content) {+ try {+ return DigestUtils.getFingerPrint(DIGEST_FORMAT, content);+ } catch (Exception e) {+ throw new RuntimeException(e);+ }+ }+private static class KeyPair {private final byte[] privateKey;diff --git a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.javaindex 0a1218e8e3..bd80988be6 100644--- a/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java+++ b/server-core/src/main/java/io/onedev/server/ssh/DefaultSshAuthenticator.java@@ -13,6 +13,7 @@ import org.apache.sshd.server.session.ServerSession;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.model.SshKey;import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.security.CipherUtils;@Singletonpublic class DefaultSshAuthenticator implements SshAuthenticator {@@ -29,7 +30,7 @@ public class DefaultSshAuthenticator implements SshAuthenticator {@Sessional@Overridepublic boolean authenticate(String username, PublicKey key, ServerSession session) throws AsyncAuthException {- String digest = KeyUtils.getFingerPrint(SshKey.DIGEST_FORMAT, key);+ String digest = KeyUtils.getFingerPrint(CipherUtils.DIGEST_FORMAT, key);SshKey sshKey = sshKeyManager.findByDigest(digest);if (sshKey != null) {session.setAttribute(ATTR_PUBLIC_KEY_OWNER_ID, sshKey.getOwner().getId());diff --git a/server-core/src/main/java/io/onedev/server/git/NameAndEmail.java b/server-core/src/main/java/io/onedev/server/util/NameAndEmail.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/git/NameAndEmail.javarename to server-core/src/main/java/io/onedev/server/util/NameAndEmail.javaindex 2c131cdcfd..531d2d7e74 100644--- a/server-core/src/main/java/io/onedev/server/git/NameAndEmail.java+++ b/server-core/src/main/java/io/onedev/server/util/NameAndEmail.java@@ -1,4 +1,4 @@-package io.onedev.server.git;+package io.onedev.server.util;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.cssindex 524d2773a8..bdbc8b0914 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css@@ -2155,7 +2155,7 @@ h6, .h6 {background-color: white;border: 1px solid white;border-radius: 0.42rem;- box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);+ box-shadow: 0px 0px 8px 2px rgba(0,0,0,0.1);}.bs-popover-auto[x-placement^=right]>.arrow::before, .bs-popover-right>.arrow::before {border-right-color: white;diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.jsindex 1a723af854..1b3e375eca 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js+++ b/server-core/src/main/java/io/onedev/server/web/asset/codemirror/codemirror-integration.js@@ -8,19 +8,28 @@ onedev.server.codemirror = {clearSelection: function(cm) {cm.setCursor(cm.getCursor("from"));},- mark: function(cm, mark) {+ mark: function(cm, range) {onedev.server.codemirror.clearMark(cm);- cm.markText(- {line: mark.fromRow, ch: mark.fromColumn},- {line: mark.toRow, ch: mark.toColumn},- {className: "CodeMirror-mark"});+ if (Array.isArray(range)) {+ for (var i in range) {+ cm.markText(+ {line: range[i].fromRow, ch: range[i].fromColumn},+ {line: range[i].toRow, ch: range[i].toColumn},+ {className: "CodeMirror-mark"});+ }+ } else {+ cm.markText(+ {line: range.fromRow, ch: range.fromColumn},+ {line: range.toRow, ch: range.toColumn},+ {className: "CodeMirror-mark"});+ }},- scrollTo: function(cm, mark) {- var top = cm.charCoords({line: mark.fromRow, ch: 0}, "local").top;+ scrollTo: function(cm, range) {+ var top = cm.charCoords({line: range.fromRow, ch: 0}, "local").top;cm.scrollTo(null, top - 50);},- scrollIntoView: function(cm, mark) {- cm.scrollIntoView({line: mark.fromRow, ch: 0}, 8);+ scrollIntoView: function(cm, range) {+ cm.scrollIntoView({line: range.fromRow, ch: 0}, 8);},setModeByName: function(cm, modeName) {var modeInfo = CodeMirror.findModeByName(modeName);diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/CodeProblemResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/CodeProblemResourceReference.javanew file mode 100644index 0000000000..e6a8976540--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/CodeProblemResourceReference.java@@ -0,0 +1,32 @@+package io.onedev.server.web.asset.codeproblem;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Application;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class CodeProblemResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public CodeProblemResourceReference() {+ super(CodeProblemResourceReference.class, "code-problem.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = new ArrayList<>();+ dependencies.add(JavaScriptHeaderItem.forReference(+ Application.get().getJavaScriptLibrarySettings().getJQueryReference()));+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ CodeProblemResourceReference.class, "code-problem.css")));+ return dependencies;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.css b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.cssnew file mode 100644index 0000000000..cc670eee6b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.css@@ -0,0 +1,8 @@+.problem-popover.popover {+ max-width: 370px;+}+.problem-popover .problem-content+.problem-content {+ margin-top: 0.75rem;+ border-top: 1px solid var(--light);+ padding-top: 0.75rem;+}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.jsnew file mode 100644index 0000000000..97bb798a8a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/codeproblem/code-problem.js@@ -0,0 +1,76 @@+onedev.server.codeProblem = {+ getIcon: function(problems) {+ if (Array.isArray(problems)) {+ var icon = "warning-o";+ for (var i in problems) {+ if (problems[i].severity == "ERROR") {+ icon = "times-circle-o";+ break;+ }+ }+ return icon;+ } else {+ if (problems.severity == "ERROR")+ return "times-circle-o";+ else+ return "warning-o";+ }+ },+ getLinkClass: function(problems) {+ if (Array.isArray(problems)) {+ var hoverClass = "link-warning";+ for (var i in problems) {+ if (problems[i].severity == "ERROR") {+ hoverClass = "link-danger";+ break;+ }+ }+ return hoverClass;+ } else {+ if (problems.severity == "ERROR")+ return "link-danger";+ else+ return "link-warning";+ }+ },+ getTextClass: function(problems) {+ if (Array.isArray(problems)) {+ var hoverClass = "text-warning";+ for (var i in problems) {+ if (problems[i].severity == "ERROR") {+ hoverClass = "text-danger";+ break;+ }+ }+ return hoverClass;+ } else {+ if (problems.severity == "ERROR")+ return "text-danger";+ else+ return "text-warning";+ }+ },+ renderProblems: function(problems) {+ if (problems.length != 1) {+ var $container = $("<div></div>");+ for (var i in problems) {+ var problem = problems[i];+ var icon = onedev.server.codeProblem.getIcon(problem);+ var $content = $("<pre class='problem-content mb-0 font-size-sm'></pre>");+ $content.addClass(onedev.server.codeProblem.getTextClass(problem));+ $container.append($content);+ $content.text(problem.content);+ $content.prepend("<svg class='icon icon-sm mr-2'><use xlink:href='" + onedev.server.icons + "#" + icon + "'/></svg>");+ $content.append("<a title='Add comment' class='add-comment ml-2'><svg class='icon icon-sm mr-2'><use xlink:href='" + onedev.server.icons + "#comment'/></svg></a>");+ }+ return $container.html();+ } else {+ var $container = $("<div><pre class='problem-content mb-0 font-size-sm'></pre></div>");+ var $content = $container.children('.problem-content');+ $content.text(problems[0].content);+ $content.addClass(onedev.server.codeProblem.getTextClass(problems[0]));+ $content.append("<a title='Add comment' class='add-comment ml-2'><svg class='icon icon-sm mr-2'><use xlink:href='" + onedev.server.icons + "#comment'/></svg></a>");+ return $container.html();+ }+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.javaindex 3689ed8035..26d6f7caad 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java@@ -19,11 +19,11 @@ import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.git.NameAndEmail;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Project;import io.onedev.server.search.commit.CommitQueryParser;import io.onedev.server.util.Constants;+import io.onedev.server.util.NameAndEmail;import io.onedev.server.util.match.PatternApplied;import io.onedev.server.util.match.WildcardUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.javaindex f9837feed6..54a7e525f5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/sshkey/InsertSshKeyPanel.java@@ -18,6 +18,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SshKeyManager;import io.onedev.server.model.SshKey;import io.onedev.server.model.User;+import io.onedev.server.security.CipherUtils;import io.onedev.server.ssh.SshKeyUtils;import io.onedev.server.util.Path;import io.onedev.server.util.PathNode;@@ -60,7 +61,7 @@ public abstract class InsertSshKeyPanel extends Panel {try {PublicKey pubEntry = SshKeyUtils.decodeSshPublicKey(sshKey.getContent());- String fingerPrint = KeyUtils.getFingerPrint(SshKey.DIGEST_FORMAT, pubEntry);+ String fingerPrint = KeyUtils.getFingerPrint(CipherUtils.DIGEST_FORMAT, pubEntry);sshKey.setDigest(fingerPrint);} catch (IOException | GeneralSecurityException e) {throw new RuntimeException(e);diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 61d57b7931..f2e7f09fc8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -261,7 +261,7 @@ img.avatar {position: absolute;border-radius: 0.42rem;z-index: 2000;- box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.1);+ box-shadow: 0px 0px 8px 2px rgba(0,0,0,0.1);}/* wicket default ajax lazyload style */diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.jsindex 833f3d3a0c..1b6e03e833 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js@@ -533,6 +533,13 @@ onedev.server = {},},util: {+ isObjEmpty: function(obj) {+ for(var key in obj) {+ if(obj.hasOwnProperty(key))+ return false;+ }+ return true;+ },canInput: function(element) {var $element = $(element);return ($element.is("input") || $element.is("textarea") || $element.is("select")) && !$element.hasClass("readonly");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex c90a5666f5..c09eea8d82 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -8,6 +8,7 @@ import java.util.HashSet;import java.util.Iterator;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.UUID;import javax.annotation.Nullable;@@ -61,6 +62,9 @@ import io.onedev.commons.utils.LinearRange;import io.onedev.commons.utils.PlanarRange;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;+import io.onedev.server.code.CodeProblem;+import io.onedev.server.code.CodeProblemContribution;+import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.git.BlameBlock;@@ -68,6 +72,7 @@ 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.Build;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;@@ -125,24 +130,64 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprivate final List<Symbol> symbols = new ArrayList<>();- private final IModel<Map<CodeComment, PlanarRange>> commentRangesModel =- new LoadableDetachableModel<Map<CodeComment, PlanarRange>>() {+ private final IModel<Map<Integer, List<CommentInfo>>> commentsModel =+ new LoadableDetachableModel<Map<Integer, List<CommentInfo>>>() {@Override- protected Map<CodeComment, PlanarRange> load() {- if (context.getPullRequest() != null) {- Map<CodeComment, PlanarRange> commentRanges = new HashMap<>();- for (CodeComment comment: context.getPullRequest().getCodeComments()) {- if (comment.getMark().getCommitHash().equals(context.getCommit().name())- && comment.getMark().getPath().equals(context.getBlobIdent().path)) {- commentRanges.put(comment, comment.getMark().getRange());+ protected Map<Integer, List<CommentInfo>> load() {+ Map<Integer, List<CommentInfo>> comments = new HashMap<>();+ CodeCommentManager codeCommentManager = OneDev.getInstance(CodeCommentManager.class);+ for (CodeComment comment: codeCommentManager.findHistory(+ context.getProject(), context.getCommit(), context.getBlobIdent().path)) {+ PlanarRange postion = comment.getMark().getRange();+ int line = postion.getFromRow();+ List<CommentInfo> commentsAtLine = comments.get(line);+ if (commentsAtLine == null) {+ commentsAtLine = new ArrayList<>();+ comments.put(line, commentsAtLine);+ }+ CommentInfo commentInfo = new CommentInfo();+ commentInfo.id = comment.getId();+ commentInfo.range = postion;+ commentsAtLine.add(commentInfo);+ }+ for (List<CommentInfo> value: comments.values()) {+ value.sort((o1, o2)->(int)(o1.id-o2.id));+ }++ return comments;+ }++ };++ private final IModel<Map<Integer, List<CodeProblem>>> problemsModel = new LoadableDetachableModel<Map<Integer, List<CodeProblem>>>() {++ @Override+ protected Map<Integer, List<CodeProblem>> load() {+ Set<CodeProblem> duplicationCheck = new HashSet<>();+ Map<Integer, List<CodeProblem>> problems = new HashMap<>();+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);+ for (Build build: buildManager.query(context.getProject(), context.getCommit(), null, null, null, new HashMap<>())) {+ for (CodeProblemContribution contribution: OneDev.getExtensions(CodeProblemContribution.class)) {+ for (CodeProblem problem: contribution.getCodeProblems(build, context.getBlobIdent().path)) {+ if (duplicationCheck.add(problem)) {+ PlanarRange position = problem.getPosition();+ int line = position.getFromRow();+ List<CodeProblem> problemsAtLine = problems.get(line);+ if (problemsAtLine == null) {+ problemsAtLine = new ArrayList<>();+ problems.put(line, problemsAtLine);+ }+ problemsAtLine.add(problem);+ }}}- return commentRanges;- } else {- return OneDev.getInstance(CodeCommentManager.class).findHistory(- context.getProject(), context.getCommit(), context.getBlobIdent().path);}+ for (List<CodeProblem> value: problems.values()) {+ value.sort((o1, o2)->(int)(o1.getSeverity().ordinal()-o2.getSeverity().ordinal()));+ }++ return problems;}};@@ -250,9 +295,9 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Seartarget.appendJavaScript("onedev.server.sourceView.onToggleOutline();");}- private String getJson(PlanarRange mark) {+ private String convertToJson(Object obj) {try {- return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(obj);} catch (JsonProcessingException e) {throw new RuntimeException(e);}@@ -323,7 +368,15 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearCodeComment comment = context.getOpenComment();PlanarRange range;if (comment != null) {- range = commentRangesModel.getObject().get(comment);+ range = null;+ for (List<CommentInfo> commentsAtLine: commentsModel.getObject().values()) {+ for (CommentInfo each: commentsAtLine) {+ if (each.id == comment.getId()) {+ range = each.range;+ break;+ }+ }+ }if (range == null)range = comment.getMark().getRange();} else {@@ -417,7 +470,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearString position = SourceRendererProvider.getPosition(mark);String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);",- getJson(mark), context.getPositionUrl(position), SecurityUtils.getUser()!=null,+ convertToJson(mark), context.getPositionUrl(position), SecurityUtils.getUser()!=null,unableCommentMessage!=null?"'" + unableCommentMessage + "'":"undefined");target.appendJavaScript(script);break;@@ -553,7 +606,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearcommentContainer.setVisible(true);target.add(commentContainer);context.onAddComment(target, mark);- target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", getJson(mark)));+ target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", convertToJson(mark)));break;case "openComment":Long commentId = params.getParameterValue("param1").toLong();@@ -781,15 +834,8 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searprivate 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;+ commentInfo.range = Preconditions.checkNotNull(comment.mapRange(context.getBlobIdent()));+ return convertToJson(commentInfo);}private void clearComment(AjaxRequestTarget target) {@@ -847,11 +893,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearblameInfo.ranges = blame.getRanges();blameInfos.add(blameInfo);}- try {- jsonOfBlameInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(blameInfos);- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }+ jsonOfBlameInfos = convertToJson(blameInfos);} else {jsonOfBlameInfos = "undefined";}@@ -867,41 +909,18 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearBlob blob = context.getProject().getBlob(context.getBlobIdent(), true);String jsonOfBlameInfos = getJsonOfBlameInfos(context.getMode() == Mode.BLAME);- Map<Integer, List<CommentInfo>> commentInfos = new HashMap<>();- for (Map.Entry<CodeComment, PlanarRange> entry: commentRangesModel.getObject().entrySet()) {- CodeComment comment = entry.getKey();- PlanarRange textRange = entry.getValue();- int line = textRange.getFromRow();- 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 jsonOfCommentInfos = convertToJson(commentsModel.getObject());+ String jsonOfProblems = convertToJson(problemsModel.getObject());PlanarRange mark = SourceRendererProvider.getRange(context.getPosition());- String jsonOfMark = mark!=null? getJson(mark): "undefined";+ String jsonOfMark = mark!=null? convertToJson(mark): "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');",+ + "'%s', '%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",@@ -910,6 +929,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searcontext.getBlobIdent().revision,jsonOfBlameInfos,jsonOfCommentInfos,+ jsonOfProblems,callback,blameMessageBehavior.getCallback(),sourceFormat.getTabSize(),@@ -922,7 +942,8 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear@Overrideprotected void onDetach() {- commentRangesModel.detach();+ commentsModel.detach();+ problemsModel.detach();super.onDetach();}@@ -952,7 +973,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearString title;- PlanarRange mark;+ PlanarRange range;}@Override@@ -965,7 +986,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, SearString script;PlanarRange mark = SourceRendererProvider.getRange(position);if (mark != null)- script = String.format("onedev.server.sourceView.mark(%s, true);", getJson(mark));+ script = String.format("onedev.server.sourceView.mark(%s, true);", convertToJson(mark));elsescript = String.format("onedev.server.sourceView.clearMark();");target.appendJavaScript(script);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.javaindex 4c4e39636a..92059ed050 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java@@ -8,6 +8,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;import io.onedev.server.web.asset.clipboard.ClipboardResourceReference;import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference;+import io.onedev.server.web.asset.codeproblem.CodeProblemResourceReference;import io.onedev.server.web.asset.cookies.CookiesResourceReference;import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference;@@ -38,6 +39,7 @@ public class SourceViewResourceReference extends BaseDependentResourceReferencedependencies.add(JavaScriptHeaderItem.forReference(new CookiesResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new CodeMirrorResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new ClipboardResourceReference()));+ dependencies.add(JavaScriptHeaderItem.forReference(new CodeProblemResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(SourceViewResourceReference.class, "source-view.css")));return dependencies;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.cssindex ff33af826f..f147a48f59 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css@@ -39,10 +39,10 @@background: #FCF5DA;}-.CodeMirror-comments {+.CodeMirror-comments, .CodeMirror-problems {width: 20px;}-.CodeMirror-comment {+.CodeMirror-comment, .CodeMirror-problem {padding-left: 4px;}.CodeMirror-comment a {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.jsindex 94edb351ee..7de581adc8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js@@ -1,6 +1,6 @@onedev.server.sourceView = {- onDomReady: function(filePath, fileContent, openComment, mark, symbolTooltipId,- revision, blameInfos, comments, callback, blameMessageCallback,+ onDomReady: function(filePath, fileContent, openComment, markRange, symbolTooltipId,+ revision, blameInfos, comments, problems, callback, blameMessageCallback,tabSize, lineWrapMode) {var $sourceView = $(".source-view");@@ -28,19 +28,28 @@ onedev.server.sourceView = {$sourceView.data("callback", callback);$sourceView.data("blameMessageCallback", blameMessageCallback);- if (mark)- onedev.server.sourceView.mark(mark, false);+ if (markRange)+ onedev.server.sourceView.mark(markRange, false);if (openComment)$sourceView.data("openComment", openComment);var gutters = cm.getOption("gutters").slice();++ if (!onedev.server.util.isObjEmpty(problems))+ gutters.splice(0, 0, "CodeMirror-problems");+gutters.splice(0, 0, "CodeMirror-comments");cm.setOption("gutters", gutters);+for (var line in comments) {- if (comments.hasOwnProperty(line)) {+ if (comments.hasOwnProperty(line))onedev.server.sourceView.addCommentGutter(line, comments[line][1]);- }+ }++ for (var line in problems) {+ if (problems.hasOwnProperty(line))+ onedev.server.sourceView.addProblemGutter(line, problems[line][1]);}if (blameInfos) {@@ -128,11 +137,11 @@ onedev.server.sourceView = {});}},- onWindowLoad: function(mark) {- if (mark && onedev.server.viewState.getFromHistory() === undefined+ onWindowLoad: function(markRange) {+ if (markRange && onedev.server.viewState.getFromHistory() === undefined&& onedev.server.viewState.carryOver === undefined) {var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- onedev.server.codemirror.scrollTo(cm, mark);+ onedev.server.codemirror.scrollTo(cm, markRange);}},initComment: function() {@@ -201,12 +210,66 @@ onedev.server.sourceView = {restoreMark: function() {var $sourceView = $(".source-view");var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var mark = $sourceView.data("mark");- if (mark)- onedev.server.codemirror.mark(cm, mark);+ var markRange = $sourceView.data("markRange");+ if (markRange)+ onedev.server.codemirror.mark(cm, markRange);elseonedev.server.codemirror.clearMark(cm);},+ addProblemGutter: function(line, problems) {+ var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;+ var callback = $(".source-view").data("callback");++ var $gutter = $(document.createElement("div"));+ $gutter.addClass("CodeMirror-problem");+ $gutter.data("problems", problems);++ var markRanges = [];+ for (var i in problems)+ markRanges.push(problems[i].position);++ var icon = onedev.server.codeProblem.getIcon(problems);+ var linkClass = onedev.server.codeProblem.getLinkClass(problems);++ $gutter.append("<a class='problem-trigger " + linkClass + "'><svg class='icon icon-sm'><use xlink:href='" + onedev.server.icons + "#" + icon + "'/></svg></a>");+ var $trigger = $gutter.children("a");+ $trigger.mouseover(function() {+ onedev.server.codemirror.mark(cm, markRanges);+ }).mouseout(function() {+ onedev.server.sourceView.restoreMark();+ });+ $trigger.popover({+ html: true,+ sanitize: false,+ placement: "top",+ container: ".source-view>.code",+ content: onedev.server.codeProblem.renderProblems(problems),+ template: "<div data-line='" + line + "' class='popover problem-popover'><div class='arrow'></div><div class='popover-body'></div></div>",+ }).on("shown.bs.popover", function() {+ var $currentPopover = $(".problem-popover[data-line='" + line + "']");+ $(".popover").not($currentPopover).popover("hide");+ $currentPopover.find(".problem-content").mouseover(function() {+ onedev.server.codemirror.mark(cm, problems[$(this).index()].position);+ }).mouseout(function() {+ onedev.server.sourceView.restoreMark();+ }).each(function() {+ var problem = problems[$(this).index()];+ $(this).children(".add-comment").click(function() {+ if (onedev.server.sourceView.confirmUnsavedChanges()) {+ $currentPopover.popover("hide");+ var position = problem.position;+ callback("addComment", position.fromRow, position.fromColumn,+ position.toRow, position.toColumn);+ }+ });+ });+ });++ cm.setGutterMarker(parseInt(line), "CodeMirror-problems", $gutter[0]);+ },+ confirmUnsavedChanges: function() {+ return $(".source-view").find("form.dirty").length == 0 || confirm("There are unsaved changes, discard and continue?");+ },addCommentGutter: function(line, comments) {$(".comment-popover[data-line='" + line + "']").remove();@@ -227,11 +290,9 @@ onedev.server.sourceView = {$gutter.append("<a><svg class='icon'><use xlink:href='" + onedev.server.icons + "#comments'/></svg></a>");var $indicator = $gutter.children("a");var content = "";- for (var i in comments) {- var comment = comments[i];- var index = parseInt(i) + 1;- content += "<a class='comment-trigger' title='Click to show comment of marked text'>#" + comment.id + "</a>";- }+ for (var i in comments)+ content += "<a class='comment-trigger' title='Click to show comment of marked text'>#" + comments[i].id + "</a>";+$indicator.popover({html: true,container: ".source-view>.code",@@ -241,23 +302,19 @@ onedev.server.sourceView = {content: content});$indicator.on('shown.bs.popover', function () {- $(".comment-popover[data-line='" + line + "'] a").each(function() {+ var $currentPopover = $(".comment-popover[data-line='" + line + "']");+ $(".popover").not($currentPopover).popover("hide");+ $currentPopover.find("a").each(function() {$(this).mouseover(function() {var comment = comments[$(this).index()];- onedev.server.codemirror.mark(cm, comment.mark);+ onedev.server.codemirror.mark(cm, comment.range);});$(this).mouseout(function() {onedev.server.sourceView.restoreMark();});$(this).click(function() {- if (!$(this).hasClass("active")) {- if ($(".source-view form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;- }- var comment = comments[$(this).index()];- callback("openComment", comment.id);- }+ if (!$(this).hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges())+ callback("openComment", comments[$(this).index()].id);});});onedev.server.sourceView.highlightCommentTrigger();@@ -267,34 +324,28 @@ onedev.server.sourceView = {$gutter.append("<a class='comment-trigger' title='Click to show comment of marked text'><svg class='icon'><use xlink:href='" + onedev.server.icons + "#comment'/></svg></a>");var $indicator = $gutter.children("a");$indicator.mouseover(function() {- onedev.server.codemirror.mark(cm, comment.mark);- });- $indicator.mouseout(function() {+ onedev.server.codemirror.mark(cm, comment.range);+ }).mouseout(function() {onedev.server.sourceView.restoreMark();});$indicator.click(function() {- if (!$indicator.hasClass("active")) {- if ($(".source-view form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;- }+ if (!$indicator.hasClass("active") && onedev.server.sourceView.confirmUnsavedChanges())callback("openComment", comment.id);- }});}cm.setGutterMarker(parseInt(line), "CodeMirror-comments", $gutter[0]);},- openSelectionPopover: function(mark, markUrl, loggedIn, unableCommentMessage) {+ openSelectionPopover: function(selectionRange, selectionUrl, loggedIn, unableCommentMessage) {var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var ch = (mark.fromColumn + mark.toColumn)/2;- var position = cm.charCoords({line:mark.fromRow, ch:ch});+ var ch = (selectionRange.fromColumn + selectionRange.toColumn)/2;+ var position = cm.charCoords({line:selectionRange.fromRow, ch:ch});var $content;if (unableCommentMessage) {$content = $("<div><span class='invalid'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#warning'/></svg> " + unableCommentMessage + "</a>");} else {$content = $("<div><a class='permanent'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#link'/></svg> Permanent link of this selection</a>");- $content.children("a.permanent").attr("href", markUrl);+ $content.children("a.permanent").attr("href", selectionUrl);$content.append("<a class='copy-marked'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#copy'/></svg> Copy selected text to clipboard</a>");var clipboard = new Clipboard(".copy-marked", {text: function(trigger) {@@ -310,13 +361,11 @@ onedev.server.sourceView = {if (loggedIn) {$content.append("<a class='comment'><svg class='icon mr-1'><use xlink:href='" + onedev.server.icons + "#comment'/></svg> Add comment on this selection</a>");$content.children("a.comment").click(function() {- if ($(".source-view").find("form.dirty").length != 0- && !confirm("There are unsaved changes, discard and continue?")) {- return;+ if (onedev.server.sourceView.confirmUnsavedChanges()) {+ $(".selection-popover").remove();+ $(".source-view").data("callback")("addComment", selectionRange.fromRow, selectionRange.fromColumn,+ selectionRange.toRow, selectionRange.toColumn);}- $(".selection-popover").remove();- var callback = $(".source-view").data("callback");- callback("addComment", mark.fromRow, mark.fromColumn, mark.toRow, mark.toColumn);});} else {var loginHref = $(".sign-in").attr("href");@@ -332,10 +381,10 @@ onedev.server.sourceView = {onCommentAdded: function(comment) {var $sourceView = $(".source-view");$sourceView.data("openComment", comment);- $sourceView.data("mark", comment.mark);+ $sourceView.data("markRange", comment.range);var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var line = parseInt(comment.mark.fromRow);+ var line = parseInt(comment.range.fromRow);var lineInfo = cm.lineInfo(line);var gutter;if (lineInfo.gutterMarkers)@@ -355,7 +404,7 @@ onedev.server.sourceView = {var $sourceView = $(".source-view");$sourceView.removeData("openComment");- var line = parseInt(comment.mark.fromRow);+ var line = parseInt(comment.range.fromRow);var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;var lineInfo = cm.lineInfo(line);var $gutter = $(lineInfo.gutterMarkers["CodeMirror-comments"]);@@ -375,34 +424,36 @@ onedev.server.sourceView = {$(window).resize();onedev.server.sourceView.clearMark();},- onAddComment: function(mark) {+ onAddComment: function(markRange) {+ $(".popover").popover("hide");onedev.server.sourceView.exitFullScreen();var $sourceView = $(".source-view");$sourceView.removeData("openComment");- $sourceView.data("mark", mark);+ $sourceView.data("markRange", markRange);$(".source-view>.code").selectionPopover("close");var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;onedev.server.codemirror.clearSelection(cm);$(window).resize();- onedev.server.sourceView.mark(mark, false);- onedev.server.codemirror.scrollIntoView(cm, mark);+ onedev.server.sourceView.mark(markRange, false);+ onedev.server.codemirror.scrollIntoView(cm, markRange);onedev.server.sourceView.highlightCommentTrigger();var $textarea = $sourceView.find(".comment textarea");$textarea.caret($textarea.val().length);},onOpenComment: function(comment) {+ $(".popover").popover("hide");onedev.server.sourceView.exitFullScreen();var $sourceView = $(".source-view");$sourceView.data("openComment", comment);- $sourceView.data("mark", comment.mark);+ $sourceView.data("markRange", comment.range);onedev.server.sourceView.highlightCommentTrigger();$(window).resize();var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- onedev.server.codemirror.scrollIntoView(cm, comment.mark);+ onedev.server.codemirror.scrollIntoView(cm, comment.range);},onCloseComment: function() {var $sourceView = $(".source-view");@@ -437,7 +488,7 @@ onedev.server.sourceView = {var openComment = $(".source-view").data("openComment");if (openComment) {- var line = parseInt(openComment.mark.fromRow);+ var line = parseInt(openComment.range.fromRow);var lineInfo = cm.lineInfo(line);if (lineInfo && lineInfo.gutterMarkers) {var gutter = lineInfo.gutterMarkers["CodeMirror-comments"];@@ -457,20 +508,20 @@ onedev.server.sourceView = {}}},- mark: function(mark, scroll) {+ mark: function(markRange, scroll) {var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- $(".source-view").data("mark", mark);- onedev.server.codemirror.mark(cm, mark);+ $(".source-view").data("markRange", markRange);+ onedev.server.codemirror.mark(cm, markRange);if (scroll)- onedev.server.codemirror.scrollTo(cm, mark);- cm.setCursor({line: mark.fromRow, ch: mark.fromColumn});+ onedev.server.codemirror.scrollTo(cm, markRange);+ cm.setCursor({line: markRange.fromRow, ch: markRange.fromColumn});},clearMark: function() {var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;- var mark = $(".source-view").data("mark");- if (mark)- onedev.server.codemirror.scrollIntoView(cm, mark);- $(".source-view").removeData("mark");+ var markRange = $(".source-view").data("markRange");+ if (markRange)+ onedev.server.codemirror.scrollIntoView(cm, markRange);+ $(".source-view").removeData("markRange");onedev.server.codemirror.clearMark(cm);},blame: function(blameInfos) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.javaindex 3d58f27a86..82334a7273 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java@@ -19,7 +19,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;-import io.onedev.server.git.Contribution;+import io.onedev.server.git.GitContribution;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Day;@@ -75,9 +75,9 @@ public class ProjectContribsPage extends ProjectStatsPage {CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);Map<Integer, Integer[]> data = new HashMap<>();- Map<Day, Contribution> overallContributions = commitInfoManager.getOverallContributions(getProject());- for (Map.Entry<Day, Contribution> entry: overallContributions.entrySet()) {- Contribution contribution = entry.getValue();+ Map<Day, GitContribution> overallContributions = commitInfoManager.getOverallContributions(getProject());+ for (Map.Entry<Day, GitContribution> entry: overallContributions.entrySet()) {+ GitContribution contribution = entry.getValue();Integer[] dataValue = new Integer[] {contribution.getCommits(), contribution.getAdditions(), contribution.getDeletions()};data.put(entry.getKey().getValue(), dataValue);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.javaindex 3fa9e5345b..48d9c69fd5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/stats/TopContributorsResource.java@@ -13,8 +13,8 @@ import org.apache.wicket.request.resource.AbstractResource;import com.fasterxml.jackson.databind.ObjectMapper;import io.onedev.server.OneDev;-import io.onedev.server.git.Contribution;-import io.onedev.server.git.Contributor;+import io.onedev.server.git.GitContribution;+import io.onedev.server.git.GitContributor;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;@@ -42,7 +42,7 @@ class TopContributorsResource extends AbstractResource {Long projectId = params.get(PARAM_PROJECT).toLong();int fromDay = params.get(PARAM_FROM).toInteger();int toDay = params.get(PARAM_TO).toInteger();- Contribution.Type type = Contribution.Type.valueOf(params.get(PARAM_TYPE).toString());+ GitContribution.Type type = GitContribution.Type.valueOf(params.get(PARAM_TYPE).toString());ResourceResponse response = new ResourceResponse();response.setContentType("application/json");@@ -55,12 +55,12 @@ class TopContributorsResource extends AbstractResource {if (!SecurityUtils.canReadCode(project))throw new UnauthorizedException();- List<Contributor> topContributors = OneDev.getInstance(CommitInfoManager.class).getTopContributors(project, TOP_CONTRIBUTORS, type, fromDay, toDay);+ List<GitContributor> topContributors = OneDev.getInstance(CommitInfoManager.class).getTopContributors(project, TOP_CONTRIBUTORS, type, fromDay, toDay);AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class);List<Map<String, Object>> data = new ArrayList<>();- for (Contributor contributor: topContributors) {+ for (GitContributor contributor: topContributors) {Map<String, Object> contributorData = new HashMap<>();contributorData.put("authorName", contributor.getAuthor().getName());contributorData.put("authorEmailAddress", contributor.getAuthor().getEmailAddress());diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.javaindex 3327d7d780..f28c52d9e2 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java@@ -82,6 +82,22 @@ public class HtmlReportModule extends AbstractPluginModule {});+ /*+ contribute(CodeProblemContribution.class, new CodeProblemContribution() {++ @Override+ public List<CodeProblem> getCodeProblems(Build build, String blobPath) {+ String longMessage = "This is a very long message and we have a very good practice oover This is a very long message and we have a very good practice oover This is a very long message and we have a very good practice oover";+ return Lists.newArrayList(+ new CodeProblem(new PlanarRange(9, 1, 9, 5), longMessage, Severity.ERROR),+ new CodeProblem(new PlanarRange(9, 6, 9, 10), "This is a warning message", Severity.WARNING),+ new CodeProblem(new PlanarRange(14, 1, 14, 5), "This is an error message", Severity.ERROR),+ new CodeProblem(new PlanarRange(19, 6, 19, 10), longMessage + "\n" + longMessage, Severity.WARNING)+ );+ }++ });+ */}}