Skip to content

The Unified and Autonomous Development Platform

Restrict code comment in pull request context

robin shen037a86796ece
diff --git a/core/src/main/java/com/gitplex/server/CoreModule.java b/core/src/main/java/com/gitplex/server/CoreModule.java
index 60e7a8308c..f3ab47154f 100644
--- a/core/src/main/java/com/gitplex/server/CoreModule.java
+++ b/core/src/main/java/com/gitplex/server/CoreModule.java
@@ -54,9 +54,7 @@ import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.manager.AttachmentManager;
import com.gitplex.server.manager.BatchWorkManager;
import com.gitplex.server.manager.BranchWatchManager;
-import com.gitplex.server.manager.CodeCommentInfoManager;
import com.gitplex.server.manager.CodeCommentManager;
-import com.gitplex.server.manager.CodeCommentRelationManager;
import com.gitplex.server.manager.CodeCommentReplyManager;
import com.gitplex.server.manager.CodeCommentStatusChangeManager;
import com.gitplex.server.manager.CommitInfoManager;
@@ -67,15 +65,14 @@ import com.gitplex.server.manager.MailManager;
import com.gitplex.server.manager.MarkdownManager;
import com.gitplex.server.manager.OrganizationMembershipManager;
import com.gitplex.server.manager.PullRequestCommentManager;
-import com.gitplex.server.manager.PullRequestInfoManager;
import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.manager.PullRequestReferenceManager;
-import com.gitplex.server.manager.ReviewInvitationManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.manager.PullRequestStatusChangeManager;
import com.gitplex.server.manager.PullRequestTaskManager;
import com.gitplex.server.manager.PullRequestUpdateManager;
import com.gitplex.server.manager.PullRequestWatchManager;
+import com.gitplex.server.manager.ReviewInvitationManager;
import com.gitplex.server.manager.StorageManager;
import com.gitplex.server.manager.TeamAuthorizationManager;
import com.gitplex.server.manager.TeamManager;
@@ -87,9 +84,7 @@ import com.gitplex.server.manager.impl.DefaultAccountManager;
import com.gitplex.server.manager.impl.DefaultAttachmentManager;
import com.gitplex.server.manager.impl.DefaultBatchWorkManager;
import com.gitplex.server.manager.impl.DefaultBranchWatchManager;
-import com.gitplex.server.manager.impl.DefaultCodeCommentInfoManager;
import com.gitplex.server.manager.impl.DefaultCodeCommentManager;
-import com.gitplex.server.manager.impl.DefaultCodeCommentRelationManager;
import com.gitplex.server.manager.impl.DefaultCodeCommentReplyManager;
import com.gitplex.server.manager.impl.DefaultCodeCommentStatusChangeManager;
import com.gitplex.server.manager.impl.DefaultCommitInfoManager;
@@ -101,15 +96,14 @@ import com.gitplex.server.manager.impl.DefaultMarkdownManager;
import com.gitplex.server.manager.impl.DefaultNotificationManager;
import com.gitplex.server.manager.impl.DefaultOrganizationMembershipManager;
import com.gitplex.server.manager.impl.DefaultPullRequestCommentManager;
-import com.gitplex.server.manager.impl.DefaultPullRequestInfoManager;
import com.gitplex.server.manager.impl.DefaultPullRequestManager;
import com.gitplex.server.manager.impl.DefaultPullRequestReferenceManager;
-import com.gitplex.server.manager.impl.DefaultReviewInvitationManager;
-import com.gitplex.server.manager.impl.DefaultPullRequestReviewManager;
+import com.gitplex.server.manager.impl.DefaultReviewManager;
import com.gitplex.server.manager.impl.DefaultPullRequestStatusChangeManager;
import com.gitplex.server.manager.impl.DefaultPullRequestTaskManager;
import com.gitplex.server.manager.impl.DefaultPullRequestUpdateManager;
import com.gitplex.server.manager.impl.DefaultPullRequestWatchManager;
+import com.gitplex.server.manager.impl.DefaultReviewInvitationManager;
import com.gitplex.server.manager.impl.DefaultStorageManager;
import com.gitplex.server.manager.impl.DefaultTeamAuthorizationManager;
import com.gitplex.server.manager.impl.DefaultTeamManager;
@@ -254,14 +248,12 @@ public class CoreModule extends AbstractPluginModule {
bind(DepotManager.class).to(DefaultDepotManager.class);
bind(AccountManager.class).to(DefaultAccountManager.class);
bind(ReviewInvitationManager.class).to(DefaultReviewInvitationManager.class);
- bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);
+ bind(ReviewManager.class).to(DefaultReviewManager.class);
bind(MailManager.class).to(DefaultMailManager.class);
bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);
bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);
bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);
bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);
- bind(PullRequestInfoManager.class).to(DefaultPullRequestInfoManager.class);
- bind(CodeCommentInfoManager.class).to(DefaultCodeCommentInfoManager.class);
bind(VisitInfoManager.class).to(DefaultVisitInfoManager.class);
bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);
bind(TeamManager.class).to(DefaultTeamManager.class);
@@ -272,7 +264,6 @@ public class CoreModule extends AbstractPluginModule {
bind(PullRequestStatusChangeManager.class).to(DefaultPullRequestStatusChangeManager.class);
bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
bind(AttachmentManager.class).to(DefaultAttachmentManager.class);
- bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);
bind(CodeCommentStatusChangeManager.class).to(DefaultCodeCommentStatusChangeManager.class);
bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);
bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java
deleted file mode 100644
index 7746fc396f..0000000000
--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentActivityEvent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.gitplex.server.event.codecomment;
-
-import java.util.Date;
-
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.model.Account;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.CodeCommentActivity;
-
-public abstract class CodeCommentActivityEvent extends CodeCommentEvent {
-
- private final CodeCommentActivity activity;
-
- public CodeCommentActivityEvent(CodeCommentActivity activity) {
- super(activity.getComment());
- this.activity = activity;
- }
-
- public CodeCommentActivity getActivity() {
- return activity;
- }
-
- @Override
- public String getMarkdown() {
- return activity.getNote();
- }
-
- @Override
- public Account getUser() {
- return activity.getUser();
- }
-
- @Override
- public Date getDate() {
- return activity.getDate();
- }
-
- public abstract PullRequestCodeCommentActivityEvent getPullRequestCodeCommentActivityEvent(PullRequest request);
-
-}
diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java
deleted file mode 100644
index 18424f4be0..0000000000
--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentCreated.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.gitplex.server.event.codecomment;
-
-import java.util.Date;
-
-import com.gitplex.server.model.Account;
-import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.util.editable.annotation.Editable;
-
-@Editable(name="created")
-public class CodeCommentCreated extends CodeCommentEvent {
-
- public CodeCommentCreated(CodeComment comment) {
- super(comment);
- }
-
- @Override
- public String getMarkdown() {
- return getComment().getContent();
- }
-
- @Override
- public Account getUser() {
- return getComment().getUser();
- }
-
- @Override
- public Date getDate() {
- return getComment().getDate();
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java
deleted file mode 100644
index 8184ee6bf3..0000000000
--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentEvent.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gitplex.server.event.codecomment;
-
-import java.util.Date;
-
-import javax.annotation.Nullable;
-
-import com.gitplex.server.event.MarkdownAware;
-import com.gitplex.server.model.Account;
-import com.gitplex.server.model.CodeComment;
-
-public abstract class CodeCommentEvent implements MarkdownAware {
-
- private final CodeComment comment;
-
- /**
- * @param comment
- * @param user
- * @param date
- * @param request
- * pull request context when this event is created
- */
- public CodeCommentEvent(CodeComment comment) {
- this.comment = comment;
- }
-
- public CodeComment getComment() {
- return comment;
- }
-
- @Nullable
- public abstract Account getUser();
-
- public abstract Date getDate();
-
-}
diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java
deleted file mode 100644
index f0e0158245..0000000000
--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentReplied.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gitplex.server.event.codecomment;
-
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentReplied;
-import com.gitplex.server.model.CodeCommentReply;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.util.editable.annotation.Editable;
-
-@Editable(name="replied")
-public class CodeCommentReplied extends CodeCommentActivityEvent {
-
- public CodeCommentReplied(CodeCommentReply reply) {
- super(reply);
- }
-
- public CodeCommentReply getReply() {
- return (CodeCommentReply) getActivity();
- }
-
- @Override
- public PullRequestCodeCommentActivityEvent getPullRequestCodeCommentActivityEvent(PullRequest request) {
- return new PullRequestCodeCommentReplied(request, getReply());
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java
deleted file mode 100644
index 2d4adeb5c4..0000000000
--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentResolved.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.gitplex.server.event.codecomment;
-
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentResolved;
-import com.gitplex.server.model.CodeCommentStatusChange;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.util.editable.annotation.Editable;
-
-@Editable(name="resolved")
-public class CodeCommentResolved extends CodeCommentActivityEvent {
-
- public CodeCommentResolved(CodeCommentStatusChange statusChange) {
- super(statusChange);
- }
-
- public CodeCommentStatusChange getStatusChange() {
- return (CodeCommentStatusChange) getActivity();
- }
-
- @Override
- public PullRequestCodeCommentActivityEvent getPullRequestCodeCommentActivityEvent(PullRequest request) {
- return new PullRequestCodeCommentResolved(request, getStatusChange());
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java b/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java
deleted file mode 100644
index 35122b3579..0000000000
--- a/core/src/main/java/com/gitplex/server/event/codecomment/CodeCommentUnresolved.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.gitplex.server.event.codecomment;
-
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentUnresolved;
-import com.gitplex.server.model.CodeCommentStatusChange;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.util.editable.annotation.Editable;
-
-@Editable(name="unresolved")
-public class CodeCommentUnresolved extends CodeCommentActivityEvent {
-
- public CodeCommentUnresolved(CodeCommentStatusChange statusChange) {
- super(statusChange);
- }
-
- public CodeCommentStatusChange getStatusChange() {
- return (CodeCommentStatusChange) getActivity();
- }
-
- @Override
- public PullRequestCodeCommentActivityEvent getPullRequestCodeCommentActivityEvent(PullRequest request) {
- return new PullRequestCodeCommentUnresolved(request, getStatusChange());
- }
-
-}
-
\ No newline at end of file
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java
index 66de463319..712109c177 100644
--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentActivityEvent.java
@@ -3,15 +3,14 @@ package com.gitplex.server.event.pullrequest;
import java.util.Date;
import com.gitplex.server.model.Account;
-import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.CodeCommentActivity;
public abstract class PullRequestCodeCommentActivityEvent extends PullRequestCodeCommentEvent {
private final CodeCommentActivity activity;
- public PullRequestCodeCommentActivityEvent(PullRequest request, CodeCommentActivity activity) {
- super(request, activity.getComment());
+ public PullRequestCodeCommentActivityEvent(CodeCommentActivity activity) {
+ super(activity.getComment());
this.activity = activity;
}
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java
index 605e97f5e6..bdc7fa9158 100644
--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentCreated.java
@@ -5,14 +5,13 @@ import java.util.Date;
import com.gitplex.server.event.MarkdownAware;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.PullRequest;
import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="commented code")
public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent implements MarkdownAware {
- public PullRequestCodeCommentCreated(PullRequest request, CodeComment comment) {
- super(request, comment);
+ public PullRequestCodeCommentCreated(CodeComment comment) {
+ super(comment);
}
@Override
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java
index 551bc8b759..c4dc3f9bd0 100644
--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentEvent.java
@@ -2,14 +2,13 @@ package com.gitplex.server.event.pullrequest;
import com.gitplex.server.event.MarkdownAware;
import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.PullRequest;
public abstract class PullRequestCodeCommentEvent extends PullRequestEvent implements MarkdownAware {
private final CodeComment comment;
- public PullRequestCodeCommentEvent(PullRequest request, CodeComment comment) {
- super(request);
+ public PullRequestCodeCommentEvent(CodeComment comment) {
+ super(comment.getRequest());
this.comment = comment;
}
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java
index 6bbac80236..f80d57bad4 100644
--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentReplied.java
@@ -1,14 +1,13 @@
package com.gitplex.server.event.pullrequest;
import com.gitplex.server.model.CodeCommentReply;
-import com.gitplex.server.model.PullRequest;
import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="replied code comment")
public class PullRequestCodeCommentReplied extends PullRequestCodeCommentActivityEvent {
- public PullRequestCodeCommentReplied(PullRequest request, CodeCommentReply reply) {
- super(request, reply);
+ public PullRequestCodeCommentReplied(CodeCommentReply reply) {
+ super(reply);
}
public CodeCommentReply getReply() {
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java
index 73ff3b19d4..646b73832e 100644
--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentResolved.java
@@ -1,14 +1,13 @@
package com.gitplex.server.event.pullrequest;
import com.gitplex.server.model.CodeCommentStatusChange;
-import com.gitplex.server.model.PullRequest;
import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="resolved code comment")
public class PullRequestCodeCommentResolved extends PullRequestCodeCommentActivityEvent {
- public PullRequestCodeCommentResolved(PullRequest request, CodeCommentStatusChange statusChange) {
- super(request, statusChange);
+ public PullRequestCodeCommentResolved(CodeCommentStatusChange statusChange) {
+ super(statusChange);
}
public CodeCommentStatusChange getStatusChange() {
diff --git a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java
index e9772ab81e..c7d9dd00b9 100644
--- a/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java
+++ b/core/src/main/java/com/gitplex/server/event/pullrequest/PullRequestCodeCommentUnresolved.java
@@ -1,14 +1,13 @@
package com.gitplex.server.event.pullrequest;
import com.gitplex.server.model.CodeCommentStatusChange;
-import com.gitplex.server.model.PullRequest;
import com.gitplex.server.util.editable.annotation.Editable;
@Editable(name="Unresolved code comment")
public class PullRequestCodeCommentUnresolved extends PullRequestCodeCommentActivityEvent {
- public PullRequestCodeCommentUnresolved(PullRequest request, CodeCommentStatusChange statusChange) {
- super(request, statusChange);
+ public PullRequestCodeCommentUnresolved(CodeCommentStatusChange statusChange) {
+ super(statusChange);
}
public CodeCommentStatusChange getStatusChange() {
diff --git a/core/src/main/java/com/gitplex/server/git/Blob.java b/core/src/main/java/com/gitplex/server/git/Blob.java
index fcb86d17ab..41ba71273d 100644
--- a/core/src/main/java/com/gitplex/server/git/Blob.java
+++ b/core/src/main/java/com/gitplex/server/git/Blob.java
@@ -11,6 +11,7 @@ import javax.annotation.Nullable;
import org.apache.tika.mime.MediaType;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectLoader;
+import org.eclipse.jgit.lib.ObjectReader;
import com.gitplex.server.util.ContentDetector;
import com.google.common.base.Charsets;
@@ -32,9 +33,15 @@ public class Blob {
private transient Optional<Text> optionalText;
- public Blob(BlobIdent ident, ObjectLoader objectLoader, ObjectId blobId) {
+ public Blob(BlobIdent ident, ObjectId blobId, ObjectReader objectReader) {
this.ident = ident;
this.blobId = blobId;
+ ObjectLoader objectLoader;
+ try {
+ objectLoader = objectReader.open(blobId);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
long blobSize = objectLoader.getSize();
if (blobSize > MAX_BLOB_SIZE) {
try (InputStream is = objectLoader.openStream()) {
diff --git a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
index fd643113a1..2218621fd2 100644
--- a/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
+++ b/core/src/main/java/com/gitplex/server/git/GitPreReceiveCallback.java
@@ -20,7 +20,7 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.launcher.loader.LoaderUtils;
import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.manager.DepotManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
@@ -42,10 +42,10 @@ public class GitPreReceiveCallback extends HttpServlet {
private final AccountManager userManager;
- private final PullRequestReviewManager reviewManager;
+ private final ReviewManager reviewManager;
@Inject
- public GitPreReceiveCallback(DepotManager depotManager, AccountManager userManager, PullRequestReviewManager reviewManager) {
+ public GitPreReceiveCallback(DepotManager depotManager, AccountManager userManager, ReviewManager reviewManager) {
this.depotManager = depotManager;
this.userManager = userManager;
this.reviewManager = reviewManager;
diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java
deleted file mode 100644
index 50e453a8b6..0000000000
--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentInfoManager.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.gitplex.server.manager;
-
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.gitplex.server.model.Depot;
-import com.gitplex.server.model.support.CompareContext;
-
-public interface CodeCommentInfoManager {
-
- void collect(Depot depot);
-
- /**
- * Get comments over specified depot and commit
- *
- * @return
- * map of comment uuid to compare context
- */
- Map<String, CompareContext> getComments(Depot depot, ObjectId commit);
-
- List<String> getCommentedFiles(Depot depot);
-
- void removeComment(Depot depot, ObjectId commit, String comment);
-
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java
index 02b0c354a5..e6011e374f 100644
--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/CodeCommentManager.java
@@ -1,7 +1,6 @@
package com.gitplex.server.manager;
import java.util.Collection;
-import java.util.List;
import javax.annotation.Nullable;
@@ -9,22 +8,17 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.CodeCommentStatusChange;
-import com.gitplex.server.model.Depot;
+import com.gitplex.server.model.PullRequest;
import com.gitplex.server.persistence.dao.EntityManager;
public interface CodeCommentManager extends EntityManager<CodeComment> {
- Collection<CodeComment> findAll(Depot depot, ObjectId commitId, @Nullable String path);
+ Collection<CodeComment> findAll(PullRequest request, ObjectId commitId, @Nullable String path);
- Collection<CodeComment> findAll(Depot depot, ObjectId...commitIds);
+ Collection<CodeComment> findAll(PullRequest request, ObjectId...commitIds);
void changeStatus(CodeCommentStatusChange statusChange);
- @Nullable
- CodeComment find(String uuid);
-
- List<CodeComment> findAllAfter(Depot depot, @Nullable String commentUUID);
-
@Override
void save(CodeComment comment);
diff --git a/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java b/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java
deleted file mode 100644
index c69a69f074..0000000000
--- a/core/src/main/java/com/gitplex/server/manager/CodeCommentRelationManager.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.gitplex.server.manager;
-
-import java.util.List;
-
-import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.CodeCommentRelation;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.persistence.dao.EntityManager;
-
-public interface CodeCommentRelationManager extends EntityManager<CodeCommentRelation> {
-
- /**
- * Get code comments related to specified pull request, ordered by id descendantly
- */
- List<CodeComment> findCodeComments(PullRequest request);
-
-}
diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java b/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java
deleted file mode 100644
index 579e3fbf52..0000000000
--- a/core/src/main/java/com/gitplex/server/manager/PullRequestInfoManager.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.gitplex.server.manager;
-
-import java.util.Collection;
-
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.gitplex.server.model.Depot;
-
-public interface PullRequestInfoManager {
-
- void collect(Depot depot);
-
- Collection<String> getRequests(Depot depot, ObjectId commit);
-
- void removeRequest(Depot depot, Collection<ObjectId> commits, String request);
-
-}
diff --git a/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java b/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
similarity index 86%
rename from core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java
rename to core/src/main/java/com/gitplex/server/manager/ReviewManager.java
index dd7c4b0e4a..6b360a8f65 100644
--- a/core/src/main/java/com/gitplex/server/manager/PullRequestReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/ReviewManager.java
@@ -7,14 +7,14 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.model.Review;
import com.gitplex.server.persistence.dao.EntityManager;
import com.gitplex.server.util.ReviewStatus;
-public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {
+public interface ReviewManager extends EntityManager<Review> {
@Override
- void save(PullRequestReview review);
+ void save(Review review);
/**
* Find list of reviews ordered by review date for specified pull request.
@@ -24,7 +24,7 @@ public interface PullRequestReviewManager extends EntityManager<PullRequestRevie
* @return
* list of reviews ordered by review date
*/
- List<PullRequestReview> findAll(PullRequest request);
+ List<Review> findAll(PullRequest request);
void delete(Account user, PullRequest request);
diff --git a/core/src/main/java/com/gitplex/server/manager/UrlManager.java b/core/src/main/java/com/gitplex/server/manager/UrlManager.java
index 7c756dd107..71804ded77 100644
--- a/core/src/main/java/com/gitplex/server/manager/UrlManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/UrlManager.java
@@ -1,7 +1,5 @@
package com.gitplex.server.manager;
-import javax.annotation.Nullable;
-
import com.gitplex.server.model.Account;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
@@ -22,8 +20,8 @@ public interface UrlManager {
String urlFor(PullRequestStatusChange statusChange);
- String urlFor(CodeComment comment, @Nullable PullRequest request);
+ String urlFor(CodeComment comment);
- String urlFor(CodeCommentActivity activity, @Nullable PullRequest request);
+ String urlFor(CodeCommentActivity activity);
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
index 6515531a4b..f936a87b42 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultAttachmentManager.java
@@ -136,7 +136,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
@Override
public void run() {
- makeAttachmentPermanent(comment.getDepot(), comment.getUUID());
+ makeAttachmentPermanent(comment.getRequest().getTargetDepot(), comment.getUUID());
}
});
@@ -152,7 +152,7 @@ public class DefaultAttachmentManager implements AttachmentManager, SchedulableT
FileUtils.deleteDir(storageManager.getAttachmentDir(depot));
} else if (event.getEntity() instanceof CodeComment) {
CodeComment comment = (CodeComment) event.getEntity();
- File permanentAttachmentDir = getPermanentAttachmentDir(comment.getDepot(), comment.getUUID());
+ File permanentAttachmentDir = getPermanentAttachmentDir(comment.getRequest().getTargetDepot(), comment.getUUID());
if (permanentAttachmentDir.exists())
FileUtils.deleteDir(permanentAttachmentDir);
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java
deleted file mode 100644
index 1df274858f..0000000000
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentInfoManager.java
+++ /dev/null
@@ -1,335 +0,0 @@
-package com.gitplex.server.manager.impl;
-
-import java.io.File;
-import java.io.Serializable;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.eclipse.jgit.lib.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.gitplex.launcher.loader.Listen;
-import com.gitplex.server.event.codecomment.CodeCommentCreated;
-import com.gitplex.server.event.depot.DepotDeleted;
-import com.gitplex.server.event.lifecycle.SystemStopping;
-import com.gitplex.server.manager.BatchWorkManager;
-import com.gitplex.server.manager.CodeCommentInfoManager;
-import com.gitplex.server.manager.CodeCommentManager;
-import com.gitplex.server.manager.DepotManager;
-import com.gitplex.server.manager.StorageManager;
-import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.Depot;
-import com.gitplex.server.model.support.CompareContext;
-import com.gitplex.server.persistence.UnitOfWork;
-import com.gitplex.server.persistence.annotation.Sessional;
-import com.gitplex.server.persistence.annotation.Transactional;
-import com.gitplex.server.persistence.dao.Dao;
-import com.gitplex.server.util.BatchWorker;
-import com.gitplex.server.util.FileUtils;
-import com.gitplex.server.util.concurrent.Prioritized;
-
-import jetbrains.exodus.ArrayByteIterable;
-import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.env.Environment;
-import jetbrains.exodus.env.EnvironmentConfig;
-import jetbrains.exodus.env.Environments;
-import jetbrains.exodus.env.Store;
-import jetbrains.exodus.env.StoreConfig;
-import jetbrains.exodus.env.Transaction;
-import jetbrains.exodus.env.TransactionalComputable;
-import jetbrains.exodus.env.TransactionalExecutable;
-
-@Singleton
-public class DefaultCodeCommentInfoManager implements CodeCommentInfoManager {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultCodeCommentInfoManager.class);
-
- private static final String INFO_DIR = "codeComment";
-
- private static final String DEFAULT_STORE = "default";
-
- private static final ByteIterable LAST_COMMENT_KEY = new StringByteIterable("lastComment");
-
- private static final ByteIterable FILES_KEY = new StringByteIterable("files");
-
- private static final int PRIORITY = 100;
-
- private final StorageManager storageManager;
-
- private final BatchWorkManager batchWorkManager;
-
- private final DepotManager depotManager;
-
- private final CodeCommentManager codeCommentManager;
-
- private final UnitOfWork unitOfWork;
-
- private final Dao dao;
-
- private final Map<Long, Environment> envs = new HashMap<>();
-
- private final Map<Long, List<String>> filesCache = new ConcurrentHashMap<>();
-
- @Inject
- public DefaultCodeCommentInfoManager(Dao dao, DepotManager depotManager, StorageManager storageManager,
- CodeCommentManager codeCommentManager, BatchWorkManager batchWorkManager, UnitOfWork unitOfWork) {
- this.dao = dao;
- this.depotManager = depotManager;
- this.storageManager = storageManager;
- this.codeCommentManager = codeCommentManager;
- this.batchWorkManager = batchWorkManager;
- this.unitOfWork = unitOfWork;
- }
-
- private BatchWorker getBatchWorker(Depot depot) {
- Long depotId = depot.getId();
- return new BatchWorker("repository-" + depotId + "-collectCodeCommentInfo") {
-
- @Override
- public void doWork(Collection<Prioritized> works) {
- unitOfWork.call(new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- collect(depotManager.load(depotId));
- return null;
- }
-
- });
- }
-
- };
- }
-
- private Environment getEnv(Depot depot) {
- synchronized (envs) {
- Environment env = envs.get(depot.getId());
- if (env == null) {
- EnvironmentConfig config = new EnvironmentConfig();
- config.setLogCacheShared(false);
- config.setMemoryUsage(1024*1024*16);
- env = Environments.newInstance(getInfoDir(depot), config);
- envs.put(depot.getId(), env);
- }
- return env;
- }
- }
-
- private File getInfoDir(Depot depot) {
- File infoDir = new File(storageManager.getInfoDir(depot), INFO_DIR);
- if (!infoDir.exists())
- FileUtils.createDir(infoDir);
- return infoDir;
- }
-
- private Store getStore(final Environment env, final String storeName) {
- return env.computeInTransaction(new TransactionalComputable<Store>() {
- @Override
- public Store compute(Transaction txn) {
- return env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn);
- }
- });
- }
-
- @Transactional
- @Listen
- public void on(DepotDeleted event) {
- Long depotId = event.getDepot().getId();
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- filesCache.remove(depotId);
- synchronized (envs) {
- Environment env = envs.remove(depotId);
- if (env != null)
- env.close();
- }
- }
-
- });
- }
-
- private byte[] getBytes(@Nullable ByteIterable byteIterable) {
- if (byteIterable != null)
- return Arrays.copyOf(byteIterable.getBytesUnsafe(), byteIterable.getLength());
- else
- return null;
- }
-
- @Sessional
- @Override
- public void collect(Depot depot) {
- logger.debug("Collecting code comment info (depot: {})...", depot);
- Environment env = getEnv(depot);
- Store store = getStore(env, DEFAULT_STORE);
-
- String lastComment = env.computeInTransaction(new TransactionalComputable<String>() {
-
- @Override
- public String compute(final Transaction txn) {
- byte[] value = getBytes(store.get(txn, LAST_COMMENT_KEY));
- return value!=null?new String(value):null;
- }
-
- });
-
- for (CodeComment comment: codeCommentManager.findAllAfter(depot, lastComment)) {
- env.executeInTransaction(new TransactionalExecutable() {
-
- @SuppressWarnings("unchecked")
- @Override
- public void execute(Transaction txn) {
- ByteIterable key = new StringByteIterable(comment.getUUID());
-
- byte[] keyBytes = new byte[20];
- ObjectId.fromString(comment.getCommentPos().getCommit()).copyRawTo(keyBytes, 0);
- ByteIterable commitKey = new ArrayByteIterable(keyBytes);
- byte[] valueBytes = getBytes(store.get(txn, commitKey));
- Map<String, CompareContext> comments;
- if (valueBytes != null)
- comments = (Map<String, CompareContext>) SerializationUtils.deserialize(valueBytes);
- else
- comments = new HashMap<>();
- comments.put(comment.getUUID(), comment.getCompareContext());
- store.put(txn, commitKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) comments)));
-
- if (comment.getCommentPos().getPath() != null) {
- Set<String> files;
- valueBytes = getBytes(store.get(txn, FILES_KEY));
- if (valueBytes != null)
- files = (Set<String>) SerializationUtils.deserialize(valueBytes);
- else
- files = new HashSet<String>();
- files.add(comment.getCommentPos().getPath());
- store.put(txn, FILES_KEY, new ArrayByteIterable(SerializationUtils.serialize((Serializable) files)));
-
- filesCache.remove(depot.getId());
- }
-
- store.put(txn, LAST_COMMENT_KEY, key);
- }
-
- });
- }
- logger.debug("Code comment info collected (depot: {})", depot);
- }
-
- @Listen
- public void on(SystemStopping event) {
- synchronized (envs) {
- for (Environment env: envs.values())
- env.close();
- }
- }
-
- @Override
- public Map<String, CompareContext> getComments(Depot depot, ObjectId commit) {
- Environment env = getEnv(depot);
- Store store = getStore(env, DEFAULT_STORE);
-
- return env.computeInReadonlyTransaction(new TransactionalComputable<Map<String, CompareContext>>() {
-
- @SuppressWarnings("unchecked")
- @Override
- public Map<String, CompareContext> compute(Transaction txn) {
- byte[] keyBytes = new byte[20];
- commit.copyRawTo(keyBytes, 0);
- ByteIterable commitKey = new ArrayByteIterable(keyBytes);
- byte[] valueBytes = getBytes(store.get(txn, commitKey));
- if (valueBytes != null) {
- return (Map<String, CompareContext>) SerializationUtils.deserialize(valueBytes);
- } else {
- return new HashMap<>();
- }
- }
- });
- }
-
- @Transactional
- @Listen
- public void on(CodeCommentCreated event) {
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- batchWorkManager.submit(getBatchWorker(event.getComment().getDepot()), new Prioritized(PRIORITY));
- }
-
- });
- }
-
- @Override
- public void removeComment(Depot depot, ObjectId commit, String comment) {
- Environment env = getEnv(depot);
- Store store = getStore(env, DEFAULT_STORE);
- env.executeInTransaction(new TransactionalExecutable() {
-
- @SuppressWarnings("unchecked")
- @Override
- public void execute(Transaction txn) {
- byte[] keyBytes = new byte[20];
- commit.copyRawTo(keyBytes, 0);
- ByteIterable commitKey = new ArrayByteIterable(keyBytes);
- byte[] valueBytes = getBytes(store.get(txn, commitKey));
- Map<String, CompareContext> storedComments;
- if (valueBytes != null)
- storedComments = (Map<String, CompareContext>) SerializationUtils.deserialize(valueBytes);
- else
- storedComments = new HashMap<>();
- storedComments.remove(comment);
- store.put(txn, commitKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) storedComments)));
- }
-
- });
- }
-
- @Override
- public List<String> getCommentedFiles(Depot depot) {
- List<String> files = filesCache.get(depot.getId());
- if (files == null) {
- Environment env = getEnv(depot);
- final Store store = getStore(env, DEFAULT_STORE);
-
- files = env.computeInReadonlyTransaction(new TransactionalComputable<List<String>>() {
-
- @SuppressWarnings("unchecked")
- @Override
- public List<String> compute(Transaction txn) {
- byte[] bytes = getBytes(store.get(txn, FILES_KEY));
- if (bytes != null) {
- List<String> files = new ArrayList<>((Set<String>)SerializationUtils.deserialize(bytes));
- files.sort((file1, file2)->Paths.get(file1).compareTo(Paths.get(file2)));
- return files;
- } else {
- return new ArrayList<>();
- }
- }
- });
- filesCache.put(depot.getId(), files);
- }
- return files;
- }
-
- static class StringByteIterable extends ArrayByteIterable {
- StringByteIterable(String value) {
- super(value.getBytes());
- }
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
index f6356d495f..e4ee206006 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentManager.java
@@ -9,26 +9,18 @@ import javax.inject.Singleton;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
-import com.gitplex.launcher.loader.Listen;
import com.gitplex.launcher.loader.ListenerRegistry;
-import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;
-import com.gitplex.server.event.codecomment.CodeCommentCreated;
-import com.gitplex.server.event.codecomment.CodeCommentEvent;
-import com.gitplex.server.event.codecomment.CodeCommentResolved;
-import com.gitplex.server.event.codecomment.CodeCommentUnresolved;
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentResolved;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentUnresolved;
import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.manager.CodeCommentStatusChangeManager;
-import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.CodeCommentRelation;
import com.gitplex.server.model.CodeCommentStatusChange;
-import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.CodeCommentActivity;
import com.gitplex.server.persistence.annotation.Sessional;
import com.gitplex.server.persistence.annotation.Transactional;
import com.gitplex.server.persistence.dao.AbstractEntityManager;
@@ -43,26 +35,19 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
private final CodeCommentStatusChangeManager codeCommentStatusChangeManager;
- private final PullRequestManager pullRequestManager;
-
- private final NotificationManager notificationManager;
-
@Inject
public DefaultCodeCommentManager(Dao dao, ListenerRegistry listenerRegistry,
- CodeCommentStatusChangeManager codeCommentStatusChangeManager, PullRequestManager pullRequestManager,
- NotificationManager notificationManager) {
+ CodeCommentStatusChangeManager codeCommentStatusChangeManager) {
super(dao);
this.listenerRegistry = listenerRegistry;
this.codeCommentStatusChangeManager = codeCommentStatusChangeManager;
- this.pullRequestManager = pullRequestManager;
- this.notificationManager = notificationManager;
}
@Sessional
@Override
- public Collection<CodeComment> findAll(Depot depot, ObjectId commitId, String path) {
+ public Collection<CodeComment> findAll(PullRequest request, ObjectId commitId, String path) {
EntityCriteria<CodeComment> criteria = newCriteria();
- criteria.add(Restrictions.eq("depot", depot));
+ criteria.add(Restrictions.eq("request", request));
criteria.add(Restrictions.eq("commentPos.commit", commitId.name()));
if (path != null)
criteria.add(Restrictions.eq("commentPos.path", path));
@@ -71,11 +56,11 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Sessional
@Override
- public Collection<CodeComment> findAll(Depot depot, ObjectId... commitIds) {
+ public Collection<CodeComment> findAll(PullRequest request, ObjectId... commitIds) {
Preconditions.checkArgument(commitIds.length > 0);
EntityCriteria<CodeComment> criteria = newCriteria();
- criteria.add(Restrictions.eq("depot", depot));
+ criteria.add(Restrictions.eq("request", request));
List<Criterion> criterions = new ArrayList<>();
for (ObjectId commitId: commitIds) {
criterions.add(Restrictions.eq("commentPos.commit", commitId.name()));
@@ -87,47 +72,16 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Transactional
@Override
public void save(CodeComment comment) {
- CodeCommentCreated event;
+ PullRequestCodeCommentCreated event;
if (comment.isNew()) {
- event = new CodeCommentCreated(comment);
- } else {
- event = null;
- }
- dao.persist(comment);
- if (event != null) {
+ event = new PullRequestCodeCommentCreated(comment);
+ dao.persist(comment);
listenerRegistry.post(event);
+ } else {
+ dao.persist(comment);
}
}
- @Transactional
- @Override
- public void delete(CodeComment comment) {
- dao.remove(comment);
- }
-
- @Sessional
- @Override
- public CodeComment find(String uuid) {
- EntityCriteria<CodeComment> criteria = newCriteria();
- criteria.add(Restrictions.eq("uuid", uuid));
- return find(criteria);
- }
-
- @Sessional
- @Override
- public List<CodeComment> findAllAfter(Depot depot, String commentUUID) {
- EntityCriteria<CodeComment> criteria = newCriteria();
- criteria.add(Restrictions.eq("depot", depot));
- criteria.addOrder(Order.asc("id"));
- if (commentUUID != null) {
- CodeComment comment = find(commentUUID);
- if (comment != null) {
- criteria.add(Restrictions.gt("id", comment.getId()));
- }
- }
- return findAll(criteria);
- }
-
@Transactional
@Override
public void changeStatus(CodeCommentStatusChange statusChange) {
@@ -135,33 +89,15 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
codeCommentStatusChangeManager.save(statusChange);
- CodeCommentEvent event;
+ PullRequestCodeCommentEvent event;
if (statusChange.isResolved()) {
- event = new CodeCommentResolved(statusChange);
+ event = new PullRequestCodeCommentResolved(statusChange);
} else {
- event = new CodeCommentUnresolved(statusChange);
+ event = new PullRequestCodeCommentUnresolved(statusChange);
}
listenerRegistry.post(event);
statusChange.getComment().setLastEvent(event);
save(statusChange.getComment());
}
- @Transactional
- @Listen
- public void on(CodeCommentActivityEvent event) {
- CodeCommentActivity activity = event.getActivity();
-
- for (CodeCommentRelation relation: activity.getComment().getRelations()) {
- PullRequest request = relation.getRequest();
- PullRequestCodeCommentActivityEvent pullRequestCodeCommentActivityEvent = event.getPullRequestCodeCommentActivityEvent(request);
- listenerRegistry.post(pullRequestCodeCommentActivityEvent);
- request.setLastEvent(pullRequestCodeCommentActivityEvent);
-
- pullRequestManager.save(request);
- }
-
- if (activity.getComment().getRelations().isEmpty())
- notificationManager.sendNotifications(event);
- }
-
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java
deleted file mode 100644
index e3f90c26a9..0000000000
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentRelationManager.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package com.gitplex.server.manager.impl;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import com.gitplex.launcher.loader.Listen;
-import com.gitplex.launcher.loader.ListenerRegistry;
-import com.gitplex.server.event.codecomment.CodeCommentCreated;
-import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;
-import com.gitplex.server.manager.CodeCommentInfoManager;
-import com.gitplex.server.manager.CodeCommentManager;
-import com.gitplex.server.manager.CodeCommentRelationManager;
-import com.gitplex.server.manager.PullRequestInfoManager;
-import com.gitplex.server.manager.PullRequestManager;
-import com.gitplex.server.manager.VisitInfoManager;
-import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.CodeCommentRelation;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.PullRequestUpdate;
-import com.gitplex.server.model.support.CompareContext;
-import com.gitplex.server.persistence.annotation.Transactional;
-import com.gitplex.server.persistence.dao.AbstractEntityManager;
-import com.gitplex.server.persistence.dao.Dao;
-
-@Singleton
-public class DefaultCodeCommentRelationManager extends AbstractEntityManager<CodeCommentRelation>
- implements CodeCommentRelationManager {
-
- private final PullRequestInfoManager pullRequestInfoManager;
-
- private final CodeCommentInfoManager codeCommentInfoManager;
-
- private final CodeCommentManager codeCommentManager;
-
- private final PullRequestManager pullRequestManager;
-
- private final VisitInfoManager visitInfoManager;
-
- private final ListenerRegistry listenerRegistry;
-
- private final NotificationManager notificationManager;
-
- @Inject
- public DefaultCodeCommentRelationManager(Dao dao, PullRequestInfoManager pullRequestInfoManager,
- CodeCommentInfoManager codeCommentInfoManager, CodeCommentManager codeCommentManager,
- PullRequestManager pullRequestManager, VisitInfoManager visitInfoManager,
- ListenerRegistry listenerRegistry, NotificationManager notificationManager) {
- super(dao);
- this.pullRequestInfoManager = pullRequestInfoManager;
- this.codeCommentInfoManager = codeCommentInfoManager;
- this.codeCommentManager = codeCommentManager;
- this.pullRequestManager = pullRequestManager;
- this.visitInfoManager = visitInfoManager;
- this.listenerRegistry = listenerRegistry;
- this.notificationManager = notificationManager;
- }
-
- /*
- * Find out code comments belong to a pull request. A code comment is considered to be
- * belong to pull request if its commit and compare commit is covered by commits of
- * the pull request. The simplest approach to determine this would be to query the
- * database for each commit of the pull request. However that might issue a lot of
- * sql queries if there are many commits. To address this issue, at the time of
- * querying related comments, we query the comment information store first (which is
- * fast) for each commit to see if there are new comments relevant to the pull request.
- */
- @Transactional
- @Override
- public List<CodeComment> findCodeComments(PullRequest request) {
- if (request.getCodeCommentRelations().size() < PullRequest.MAX_CODE_COMMENTS) {
- Collection<String> relatedComments = new HashSet<>();
- for (CodeCommentRelation relation: request.getCodeCommentRelations()) {
- relatedComments.add(relation.getComment().getUUID());
- }
-
- Collection<String> involvedCommits = new HashSet<>();
- for (PullRequestUpdate update: request.getUpdates()) {
- for (RevCommit commit: update.getCommits())
- involvedCommits.add(commit.name());
- }
- involvedCommits.add(request.getBaseCommitHash());
-
- Map<String, CodeComment.ComparingInfo> comparingInfos = new HashMap<>();
- for (String commit: involvedCommits) {
- Map<String, CompareContext> commentsOfCommit = codeCommentInfoManager.getComments(
- request.getTargetDepot(), ObjectId.fromString(commit));
- for (Map.Entry<String, CompareContext> entry: commentsOfCommit.entrySet()) {
- CodeComment.ComparingInfo comparingInfo = new CodeComment.ComparingInfo(commit, entry.getValue());
- comparingInfos.put(entry.getKey(), comparingInfo);
- }
- }
-
- comparingInfos.keySet().removeAll(relatedComments);
-
- for (Map.Entry<String, CodeComment.ComparingInfo> entry: comparingInfos.entrySet()) {
- String uuid = entry.getKey();
- CodeComment.ComparingInfo comparingInfo = entry.getValue();
-
- if (request.getRequestComparingInfo(comparingInfo) != null) {
- CodeComment comment = codeCommentManager.find(uuid);
- if (comment == null) {
- codeCommentInfoManager.removeComment(request.getTargetDepot(), ObjectId.fromString(comparingInfo.getCommit()), uuid);
- } else if (request.getCodeCommentRelations().size() < PullRequest.MAX_CODE_COMMENTS) {
- CodeCommentRelation relation = new CodeCommentRelation();
- relation.setComment(comment);
- relation.setRequest(request);
- save(relation);
- request.getCodeCommentRelations().add(relation);
- }
- }
- }
- }
- List<CodeComment> comments = request.getCodeCommentRelations()
- .stream()
- .map(CodeCommentRelation::getComment)
- .sorted(CodeComment::compareTo)
- .collect(Collectors.toList());
- Collections.reverse(comments);
- return comments;
- }
-
- @Transactional
- @Override
- public void save(CodeCommentRelation entity) {
- PullRequest request = entity.getRequest();
- CodeComment comment = entity.getComment();
- if (entity.isNew() && (request.getLastEvent() == null
- || comment.getDate().getTime()>request.getLastEvent().getDate().getTime())) {
- PullRequestCodeCommentCreated event = new PullRequestCodeCommentCreated(request, comment);
- listenerRegistry.post(event);
- request.setLastEvent(event);
- pullRequestManager.save(request);
- }
- super.save(entity);
- }
-
- @Transactional
- @Listen
- public void on(CodeCommentCreated event) {
- CodeComment comment = event.getComment();
- ObjectId commitId = ObjectId.fromString(comment.getCommentPos().getCommit());
- boolean found = false;
- for (String uuid: pullRequestInfoManager.getRequests(comment.getDepot(), commitId)) {
- PullRequest request = pullRequestManager.find(uuid);
- if (request != null && request.getRequestComparingInfo(comment.getComparingInfo()) != null) {
- PullRequestCodeCommentCreated pullRequestCodeCommented = new PullRequestCodeCommentCreated(request, comment);
- listenerRegistry.post(pullRequestCodeCommented);
-
- request.setLastEvent(pullRequestCodeCommented);
-
- pullRequestManager.save(request);
-
- visitInfoManager.visit(comment.getUser(), request);
-
- CodeCommentRelation relation = new CodeCommentRelation();
- relation.setComment(comment);
- relation.setRequest(request);
- save(relation);
- found = true;
- }
- }
-
- if (!found) {
- notificationManager.sendNotifications(event);
- }
-
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java
index 2151fcc716..42b477c0da 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultCodeCommentReplyManager.java
@@ -4,7 +4,7 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import com.gitplex.launcher.loader.ListenerRegistry;
-import com.gitplex.server.event.codecomment.CodeCommentReplied;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentReplied;
import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.manager.CodeCommentReplyManager;
import com.gitplex.server.model.CodeCommentReply;
@@ -33,7 +33,7 @@ public class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCo
boolean isNew = reply.isNew();
dao.persist(reply);
if (isNew && callListeners) {
- CodeCommentReplied event = new CodeCommentReplied(reply);
+ PullRequestCodeCommentReplied event = new PullRequestCodeCommentReplied(reply);
listenerRegistry.post(event);
reply.getComment().setLastEvent(event);
codeCommentManager.save(reply.getComment());
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
index 126af59b4b..26c4b24468 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultDepotManager.java
@@ -39,10 +39,8 @@ import com.gitplex.server.event.lifecycle.SystemStopping;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.git.command.CloneCommand;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.manager.CodeCommentInfoManager;
import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.manager.DepotManager;
-import com.gitplex.server.manager.PullRequestInfoManager;
import com.gitplex.server.manager.StorageManager;
import com.gitplex.server.manager.TeamAuthorizationManager;
import com.gitplex.server.model.Account;
@@ -69,7 +67,7 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
private static final Logger logger = LoggerFactory.getLogger(DefaultDepotManager.class);
- private static final int INFO_VERSION = 2;
+ private static final int INFO_VERSION = 3;
private final ListenerRegistry listenerRegistry;
@@ -77,10 +75,6 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
private final CommitInfoManager commitInfoManager;
- private final PullRequestInfoManager pullRequestInfoManager;
-
- private final CodeCommentInfoManager codeCommentInfoManager;
-
private final TeamAuthorizationManager teamAuthorizationManager;
private final StorageManager storageManager;
@@ -94,16 +88,13 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
@Inject
- public DefaultDepotManager(Dao dao, AccountManager userManager, CodeCommentInfoManager codeCommentInfoManager,
- TeamAuthorizationManager teamAuthorizationManager, PullRequestInfoManager pullRequestInfoManager,
+ public DefaultDepotManager(Dao dao, AccountManager userManager, TeamAuthorizationManager teamAuthorizationManager,
CommitInfoManager commitInfoManager, ListenerRegistry listenerRegistry, StorageManager storageManager) {
super(dao);
this.userManager = userManager;
- this.pullRequestInfoManager = pullRequestInfoManager;
this.teamAuthorizationManager = teamAuthorizationManager;
this.commitInfoManager = commitInfoManager;
- this.codeCommentInfoManager = codeCommentInfoManager;
this.listenerRegistry = listenerRegistry;
this.storageManager = storageManager;
@@ -312,8 +303,6 @@ public class DefaultDepotManager extends AbstractEntityManager<Depot> implements
} catch (InterruptedException | ExecutionException e) {
throw new RuntimeException(e);
}
- pullRequestInfoManager.collect(depot);
- codeCommentInfoManager.collect(depot);
logger.info("Repository checking finished for {}", depot.getFQN());
}
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
index 6bc283f3e1..e380be47b0 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultNotificationManager.java
@@ -13,16 +13,11 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.util.StringUtils;
import org.hibernate.criterion.Restrictions;
import com.gitplex.launcher.loader.Listen;
import com.gitplex.server.event.MarkdownAware;
-import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;
-import com.gitplex.server.event.codecomment.CodeCommentCreated;
-import com.gitplex.server.event.codecomment.CodeCommentEvent;
import com.gitplex.server.event.pullrequest.MergePreviewCalculated;
import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;
@@ -31,7 +26,6 @@ import com.gitplex.server.event.pullrequest.PullRequestEvent;
import com.gitplex.server.event.pullrequest.PullRequestOpened;
import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
import com.gitplex.server.event.pullrequest.PullRequestUpdated;
-import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.manager.BranchWatchManager;
import com.gitplex.server.manager.MailManager;
import com.gitplex.server.manager.MarkdownManager;
@@ -41,11 +35,9 @@ import com.gitplex.server.manager.UrlManager;
import com.gitplex.server.manager.VisitInfoManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.BranchWatch;
-import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.model.PullRequestStatusChange.Type;
-import com.gitplex.server.model.support.CodeCommentActivity;
import com.gitplex.server.model.PullRequestTask;
import com.gitplex.server.model.PullRequestWatch;
import com.gitplex.server.model.ReviewInvitation;
@@ -73,13 +65,10 @@ public class DefaultNotificationManager implements NotificationManager {
private final PullRequestWatchManager pullRequestWatchManager;
- private final AccountManager accountManager;
-
@Inject
public DefaultNotificationManager(MarkdownManager markdownManager, BranchWatchManager branchWatchManager,
MailManager mailManager, UrlManager urlManager, VisitInfoManager visitInfoManager,
- PullRequestWatchManager pullRequestWatchManager, PullRequestTaskManager pullRequestTaskManager,
- AccountManager accountManager) {
+ PullRequestWatchManager pullRequestWatchManager, PullRequestTaskManager pullRequestTaskManager) {
this.branchWatchManager = branchWatchManager;
this.mailManager = mailManager;
this.urlManager = urlManager;
@@ -87,7 +76,6 @@ public class DefaultNotificationManager implements NotificationManager {
this.markdownManager = markdownManager;
this.pullRequestTaskManager = pullRequestTaskManager;
this.pullRequestWatchManager = pullRequestWatchManager;
- this.accountManager = accountManager;
}
@Transactional
@@ -211,9 +199,9 @@ public class DefaultNotificationManager implements NotificationManager {
else if (event instanceof PullRequestStatusChangeEvent)
url = urlManager.urlFor(((PullRequestStatusChangeEvent)event).getStatusChange());
else if (event instanceof PullRequestCodeCommentCreated)
- url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), event.getRequest());
+ url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment());
else if (event instanceof PullRequestCodeCommentActivityEvent)
- url = urlManager.urlFor(((PullRequestCodeCommentActivityEvent)event).getActivity(), event.getRequest());
+ url = urlManager.urlFor(((PullRequestCodeCommentActivityEvent)event).getActivity());
else
url = urlManager.urlFor(event.getRequest());
@@ -402,48 +390,4 @@ public class DefaultNotificationManager implements NotificationManager {
}
}
- @Override
- public void sendNotifications(CodeCommentEvent event) {
- if (event.getMarkdown() != null) {
- CodeComment comment = event.getComment();
- Collection<Account> mentionedUsers = new HashSet<>();
- for (Account user: new MentionParser().parseMentions(markdownManager.render(event.getMarkdown(), null, false))) {
- mentionedUsers.add(user);
- }
- String subject = "You are mentioned in a code comment on file " + comment.getCommentPos().getPath();
- String url;
- if (event instanceof CodeCommentCreated)
- url = urlManager.urlFor(((CodeCommentCreated)event).getComment(), null);
- else
- url = urlManager.urlFor(((CodeCommentActivityEvent)event).getActivity(), null);
-
- String content = String.format(""
- + "<p style='margin: 16px 0;'>"
- + "<div style='padding-left: 16px; border-left: 4px solid #CCC;'>%s</div>"
- + "<p style='margin: 16px 0;'>"
- + "Visit <a href='%s'>%s</a> for details."
- + "<p style='margin: 16px 0;'>"
- + "-- Sent by GitPlex",
- markdownManager.escape(event.getMarkdown()), url, url);
-
- mailManager.sendMailAsync(mentionedUsers.stream().map(Account::getEmail).collect(Collectors.toList()),
- subject, subject + "." + content);
-
- Collection<Account> involvedUsers = new HashSet<>();
- RevCommit commit = comment.getDepot().getRevCommit(ObjectId.fromString(comment.getCommentPos().getCommit()));
-
- Account author = accountManager.find(commit.getAuthorIdent());
- if (author != null)
- involvedUsers.add(author);
- involvedUsers.add(comment.getUser());
- involvedUsers.addAll(comment.getActivities().stream().map(CodeCommentActivity::getUser).collect(Collectors.toList()));
- involvedUsers.removeAll(mentionedUsers);
- involvedUsers.remove(event.getUser());
-
- subject = "You are involved in a code comment on file " + comment.getCommentPos().getPath();
- mailManager.sendMailAsync(involvedUsers.stream().map(Account::getEmail).collect(Collectors.toList()),
- subject, subject + "." + content);
- }
- }
-
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java
deleted file mode 100644
index 27fda48b0b..0000000000
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestInfoManager.java
+++ /dev/null
@@ -1,311 +0,0 @@
-package com.gitplex.server.manager.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.gitplex.launcher.loader.Listen;
-import com.gitplex.server.event.depot.DepotDeleted;
-import com.gitplex.server.event.lifecycle.SystemStopping;
-import com.gitplex.server.git.GitUtils;
-import com.gitplex.server.manager.BatchWorkManager;
-import com.gitplex.server.manager.DepotManager;
-import com.gitplex.server.manager.PullRequestInfoManager;
-import com.gitplex.server.manager.PullRequestUpdateManager;
-import com.gitplex.server.manager.StorageManager;
-import com.gitplex.server.model.Depot;
-import com.gitplex.server.model.PullRequestUpdate;
-import com.gitplex.server.persistence.UnitOfWork;
-import com.gitplex.server.persistence.annotation.Sessional;
-import com.gitplex.server.persistence.annotation.Transactional;
-import com.gitplex.server.persistence.dao.Dao;
-import com.gitplex.server.persistence.dao.EntityPersisted;
-import com.gitplex.server.util.BatchWorker;
-import com.gitplex.server.util.FileUtils;
-import com.gitplex.server.util.concurrent.Prioritized;
-
-import jetbrains.exodus.ArrayByteIterable;
-import jetbrains.exodus.ByteIterable;
-import jetbrains.exodus.env.Environment;
-import jetbrains.exodus.env.EnvironmentConfig;
-import jetbrains.exodus.env.Environments;
-import jetbrains.exodus.env.Store;
-import jetbrains.exodus.env.StoreConfig;
-import jetbrains.exodus.env.Transaction;
-import jetbrains.exodus.env.TransactionalComputable;
-import jetbrains.exodus.env.TransactionalExecutable;
-
-@Singleton
-public class DefaultPullRequestInfoManager implements PullRequestInfoManager {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestInfoManager.class);
-
- private static final String INFO_DIR = "pullRequest";
-
- private static final String DEFAULT_STORE = "default";
-
- private static final ByteIterable LAST_UPDATE_KEY = new StringByteIterable("lastUpdate");
-
- private static final int PRIORITY = 100;
-
- private final StorageManager storageManager;
-
- private final BatchWorkManager batchWorkManager;
-
- private final DepotManager depotManager;
-
- private final PullRequestUpdateManager pullRequestUpdateManager;
-
- private final UnitOfWork unitOfWork;
-
- private final Dao dao;
-
- private final Map<Long, Environment> envs = new HashMap<>();
-
- @Inject
- public DefaultPullRequestInfoManager(Dao dao, DepotManager depotManager, StorageManager storageManager,
- PullRequestUpdateManager pullRequestUpdateManager, BatchWorkManager batchWorkManager,
- UnitOfWork unitOfWork) {
- this.dao = dao;
- this.depotManager = depotManager;
- this.storageManager = storageManager;
- this.pullRequestUpdateManager = pullRequestUpdateManager;
- this.batchWorkManager = batchWorkManager;
- this.unitOfWork = unitOfWork;
- }
-
- private BatchWorker getBatchWorker(Depot depot) {
- Long depotId = depot.getId();
- return new BatchWorker("repository-" + depotId + "-collectPullRequestInfo") {
-
- @Override
- public void doWork(Collection<Prioritized> works) {
- unitOfWork.call(new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- collect(depotManager.load(depotId));
- return null;
- }
-
- });
- }
-
- };
- }
-
- private Environment getEnv(Depot depot) {
- synchronized (envs) {
- Environment env = envs.get(depot.getId());
- if (env == null) {
- EnvironmentConfig config = new EnvironmentConfig();
- config.setLogCacheShared(false);
- config.setMemoryUsage(1024*1024*16);
- env = Environments.newInstance(getInfoDir(depot), config);
- envs.put(depot.getId(), env);
- }
- return env;
- }
- }
-
- private File getInfoDir(Depot depot) {
- File infoDir = new File(storageManager.getInfoDir(depot), INFO_DIR);
- if (!infoDir.exists())
- FileUtils.createDir(infoDir);
- return infoDir;
- }
-
- private Store getStore(final Environment env, final String storeName) {
- return env.computeInTransaction(new TransactionalComputable<Store>() {
- @Override
- public Store compute(Transaction txn) {
- return env.openStore(storeName, StoreConfig.WITHOUT_DUPLICATES, txn);
- }
- });
- }
-
- @Transactional
- @Listen
- public void on(DepotDeleted event) {
- Long depotId = event.getDepot().getId();
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- synchronized (envs) {
- Environment env = envs.remove(depotId);
- if (env != null)
- env.close();
- }
- }
-
- });
- }
-
- private byte[] getBytes(@Nullable ByteIterable byteIterable) {
- if (byteIterable != null)
- return Arrays.copyOf(byteIterable.getBytesUnsafe(), byteIterable.getLength());
- else
- return null;
- }
-
- @Sessional
- @Override
- public void collect(Depot depot) {
- logger.debug("Collecting pull request info (repository: {})...", depot);
-
- Environment env = getEnv(depot);
- Store store = getStore(env, DEFAULT_STORE);
-
- String lastUpdate = env.computeInTransaction(new TransactionalComputable<String>() {
-
- @Override
- public String compute(Transaction txn) {
- byte[] value = getBytes(store.get(txn, LAST_UPDATE_KEY));
- return value!=null?new String(value):null;
- }
-
- });
-
- for (PullRequestUpdate update: pullRequestUpdateManager.findAllAfter(depot, lastUpdate)) {
- try (RevWalk revWalk = new RevWalk(depot.getRepository())) {
- List<ObjectId> commits = new ArrayList<>();
- RevCommit headCommit = GitUtils.parseCommit(revWalk, ObjectId.fromString(update.getHeadCommitHash()));
- RevCommit baseCommit = GitUtils.parseCommit(revWalk, ObjectId.fromString(update.getBaseCommitHash()));
- if (headCommit != null && baseCommit != null) {
- revWalk.markStart(headCommit);
- revWalk.markUninteresting(baseCommit);
- commits.add(baseCommit);
- revWalk.forEach(commit->commits.add(commit));
- env.executeInTransaction(new TransactionalExecutable() {
-
- @SuppressWarnings("unchecked")
- @Override
- public void execute(Transaction txn) {
- ByteIterable key = new StringByteIterable(update.getUUID());
- for (ObjectId commit: commits) {
- byte[] keyBytes = new byte[20];
- commit.copyRawTo(keyBytes, 0);
- ByteIterable commitKey = new ArrayByteIterable(keyBytes);
- byte[] valueBytes = getBytes(store.get(txn, commitKey));
- Collection<String> requests;
- if (valueBytes != null)
- requests = (Collection<String>) SerializationUtils.deserialize(valueBytes);
- else
- requests = new HashSet<>();
- requests.add(update.getRequest().getUUID());
- store.put(txn, commitKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) requests)));
- }
- store.put(txn, LAST_UPDATE_KEY, key);
- }
-
- });
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- logger.debug("Pull request info collected (repository: {})", depot);
- }
-
- @Listen
- public void on(SystemStopping event) {
- synchronized (envs) {
- for (Environment env: envs.values())
- env.close();
- }
- }
-
- @Override
- public Collection<String> getRequests(Depot depot, ObjectId commit) {
- Environment env = getEnv(depot);
- Store store = getStore(env, DEFAULT_STORE);
-
- return env.computeInReadonlyTransaction(new TransactionalComputable<Collection<String>>() {
-
- @SuppressWarnings("unchecked")
- @Override
- public Collection<String> compute(Transaction txn) {
- byte[] keyBytes = new byte[20];
- commit.copyRawTo(keyBytes, 0);
- ByteIterable commitKey = new ArrayByteIterable(keyBytes);
- byte[] valueBytes = getBytes(store.get(txn, commitKey));
- if (valueBytes != null) {
- return (Collection<String>) SerializationUtils.deserialize(valueBytes);
- } else {
- return new HashSet<>();
- }
- }
- });
- }
-
- @Override
- public void removeRequest(Depot depot, Collection<ObjectId> commits, String request) {
- Environment env = getEnv(depot);
- Store store = getStore(env, DEFAULT_STORE);
- env.executeInTransaction(new TransactionalExecutable() {
-
- @SuppressWarnings("unchecked")
- @Override
- public void execute(Transaction txn) {
- for (ObjectId commit: commits) {
- byte[] keyBytes = new byte[20];
- commit.copyRawTo(keyBytes, 0);
- ByteIterable commitKey = new ArrayByteIterable(keyBytes);
- byte[] valueBytes = getBytes(store.get(txn, commitKey));
- Collection<String> storedRequests;
- if (valueBytes != null)
- storedRequests = (Collection<String>) SerializationUtils.deserialize(valueBytes);
- else
- storedRequests = new HashSet<>();
- storedRequests.remove(request);
- store.put(txn, commitKey, new ArrayByteIterable(SerializationUtils.serialize((Serializable) storedRequests)));
- }
- }
-
- });
- }
-
- @Transactional
- @Listen
- public void on(EntityPersisted event) {
- if (event.isNew() && event.getEntity() instanceof PullRequestUpdate) {
- PullRequestUpdate update = (PullRequestUpdate) event.getEntity();
- dao.doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- Depot depot = update.getRequest().getTargetDepot();
- batchWorkManager.submit(getBatchWorker(depot), new Prioritized(PRIORITY));
- }
-
- });
- }
- }
-
- static class StringByteIterable extends ArrayByteIterable {
- StringByteIterable(String value) {
- super(value.getBytes());
- }
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
index 27b40f7213..817429574a 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestManager.java
@@ -58,7 +58,7 @@ import com.gitplex.server.manager.ReviewInvitationManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.model.Review;
import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.model.PullRequestStatusChange.Type;
import com.gitplex.server.model.PullRequestUpdate;
@@ -425,7 +425,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
}
boolean hasDisapprovals = false;
- for (PullRequestReview review: checkStatus.getEffectiveReviews().values()) {
+ for (Review review: checkStatus.getEffectiveReviews().values()) {
if (!review.isApproved()) {
hasDisapprovals = true;
break;
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
similarity index 91%
rename from core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
rename to core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
index 0d39c58506..50a5e1dc35 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultPullRequestReviewManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultReviewManager.java
@@ -30,12 +30,12 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.manager.CommitInfoManager;
import com.gitplex.server.manager.PullRequestManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.manager.PullRequestStatusChangeManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.model.Review;
import com.gitplex.server.model.PullRequestStatusChange;
import com.gitplex.server.model.PullRequestStatusChange.Type;
import com.gitplex.server.model.PullRequestUpdate;
@@ -55,10 +55,10 @@ import com.gitplex.server.util.ReviewStatus;
import com.gitplex.server.util.reviewappointment.ReviewAppointment;
@Singleton
-public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview>
- implements PullRequestReviewManager {
+public class DefaultReviewManager extends AbstractEntityManager<Review>
+ implements ReviewManager {
- private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestReviewManager.class);
+ private static final Logger logger = LoggerFactory.getLogger(DefaultReviewManager.class);
private static final int MAX_CONTRIBUTION_FILES = 100;
@@ -69,7 +69,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
@Inject
- public DefaultPullRequestReviewManager(Dao dao, AccountManager accountManager,
+ public DefaultReviewManager(Dao dao, AccountManager accountManager,
PullRequestManager pullRequestManager, PullRequestStatusChangeManager pullRequestStatusChangeManager) {
super(dao);
@@ -86,7 +86,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
@Transactional
@Override
- public void save(PullRequestReview review) {
+ public void save(Review review) {
super.save(review);
PullRequestStatusChange statusChange = new PullRequestStatusChange();
@@ -107,8 +107,8 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
@Sessional
@Override
- public List<PullRequestReview> findAll(PullRequest request) {
- EntityCriteria<PullRequestReview> criteria = EntityCriteria.of(PullRequestReview.class);
+ public List<Review> findAll(PullRequest request) {
+ EntityCriteria<Review> criteria = EntityCriteria.of(Review.class);
criteria.createCriteria("update").add(Restrictions.eq("request", request));
criteria.addOrder(Order.asc("date"));
return findAll(criteria);
@@ -117,8 +117,8 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
@Transactional
@Override
public void delete(Account user, PullRequest request) {
- for (Iterator<PullRequestReview> it = request.getReviews().iterator(); it.hasNext();) {
- PullRequestReview review = it.next();
+ for (Iterator<Review> it = request.getReviews().iterator(); it.hasNext();) {
+ Review review = it.next();
if (review.getUser().equals(user)) {
delete(review);
it.remove();
@@ -194,7 +194,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
private final List<Account> awaitingReviewers = new ArrayList<>();
- private final Map<Account, PullRequestReview> effectiveReviews = new HashMap<>();
+ private final Map<Account, Review> effectiveReviews = new HashMap<>();
@Override
public List<Account> getAwaitingReviewers() {
@@ -202,7 +202,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
}
@Override
- public Map<Account, PullRequestReview> getEffectiveReviews() {
+ public Map<Account, Review> getEffectiveReviews() {
return effectiveReviews;
}
@@ -221,7 +221,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
for (ReviewInvitation invitation: request.getReviewInvitations()) {
if (!invitation.getUser().equals(request.getSubmitter())
&& invitation.getType() == ReviewInvitation.Type.MANUAL) {
- PullRequestReview effectiveReview = invitation.getUser().getReviewAfter(request.getLatestUpdate());
+ Review effectiveReview = invitation.getUser().getReviewAfter(request.getLatestUpdate());
if (effectiveReview == null)
awaitingReviewers.add(invitation.getUser());
else
@@ -257,8 +257,8 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
checkReviews(writers, 1, request.getLatestUpdate(), true);
}
- for (Iterator<Map.Entry<Account, PullRequestReview>> it = effectiveReviews.entrySet().iterator(); it.hasNext();) {
- PullRequestReview review = it.next().getValue();
+ for (Iterator<Map.Entry<Account, Review>> it = effectiveReviews.entrySet().iterator(); it.hasNext();) {
+ Review review = it.next().getValue();
if (review.isCheckMerged()) {
if (request.getMergePreview() == null
|| !review.getCommit().equals(request.getMergePreview().getMerged())) {
@@ -274,7 +274,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
private void checkReviews(ReviewAppointment appointment, PullRequestUpdate update) {
for (Account user: appointment.getUsers()) {
if (!user.equals(request.getSubmitter()) && !awaitingReviewers.contains(user)) {
- PullRequestReview effectiveReview = user.getReviewAfter(update);
+ Review effectiveReview = user.getReviewAfter(update);
if (effectiveReview == null) {
awaitingReviewers.add(user);
inviteReviewer(user);
@@ -304,7 +304,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
} else if (awaitingReviewers.contains(user)) {
requiredCount--;
} else {
- PullRequestReview effectiveReview = user.getReviewAfter(update);
+ Review effectiveReview = user.getReviewAfter(update);
if (effectiveReview != null) {
if (!excludeAutoReviews || !effectiveReview.isAutoCheck()) {
effectiveCount++;
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java
index 17601c0417..9c5344df2a 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultVisitInfoManager.java
@@ -12,10 +12,10 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import com.gitplex.launcher.loader.Listen;
-import com.gitplex.server.event.codecomment.CodeCommentActivityEvent;
-import com.gitplex.server.event.codecomment.CodeCommentCreated;
import com.gitplex.server.event.depot.DepotDeleted;
import com.gitplex.server.event.lifecycle.SystemStopping;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentActivityEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentCreated;
import com.gitplex.server.event.pullrequest.PullRequestCommentCreated;
import com.gitplex.server.event.pullrequest.PullRequestOpened;
import com.gitplex.server.event.pullrequest.PullRequestStatusChangeEvent;
@@ -23,7 +23,6 @@ import com.gitplex.server.manager.StorageManager;
import com.gitplex.server.manager.VisitInfoManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.CodeCommentRelation;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.CodeCommentActivity;
@@ -132,7 +131,7 @@ public class DefaultVisitInfoManager implements VisitInfoManager {
@Override
public void visit(Account user, CodeComment comment) {
- Environment env = getEnv(comment.getDepot());
+ Environment env = getEnv(comment.getRequest().getTargetDepot());
Store store = getStore(env, CODE_COMMENT_STORE);
env.executeInTransaction(new TransactionalExecutable() {
@@ -183,7 +182,7 @@ public class DefaultVisitInfoManager implements VisitInfoManager {
@Override
public Date getVisitDate(Account user, CodeComment comment) {
- Environment env = getEnv(comment.getDepot());
+ Environment env = getEnv(comment.getRequest().getTargetDepot());
Store store = getStore(env, CODE_COMMENT_STORE);
return env.computeInTransaction(new TransactionalComputable<Date>() {
@@ -200,18 +199,15 @@ public class DefaultVisitInfoManager implements VisitInfoManager {
}
@Listen
- public void on(CodeCommentActivityEvent event) {
+ public void on(PullRequestCodeCommentActivityEvent event) {
CodeCommentActivity activity = event.getActivity();
if (activity.getUser() != null) {
visit(activity.getUser(), activity.getComment());
- for (CodeCommentRelation relation: activity.getComment().getRelations()) {
- visit(activity.getUser(), relation.getRequest());
- }
}
}
@Listen
- public void on(CodeCommentCreated event) {
+ public void on(PullRequestCodeCommentCreated event) {
if (event.getComment().getUser() != null)
visit(event.getComment().getUser(), event.getComment());
}
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/NotificationManager.java b/core/src/main/java/com/gitplex/server/manager/impl/NotificationManager.java
index e50ff5480c..22d0fdb83f 100644
--- a/core/src/main/java/com/gitplex/server/manager/impl/NotificationManager.java
+++ b/core/src/main/java/com/gitplex/server/manager/impl/NotificationManager.java
@@ -1,9 +1,5 @@
package com.gitplex.server.manager.impl;
-import com.gitplex.server.event.codecomment.CodeCommentEvent;
-
public interface NotificationManager {
- void sendNotifications(CodeCommentEvent event);
-
}
diff --git a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
index 66191ffc35..8291cd504e 100644
--- a/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
+++ b/core/src/main/java/com/gitplex/server/migration/DatabaseMigrator.java
@@ -202,7 +202,11 @@ public class DatabaseMigrator {
|| file.getName().startsWith("PullRequestReviewInvitations.xml")
|| file.getName().startsWith("PullRequestStatusChanges.xml")
|| file.getName().startsWith("PullRequestTasks.xml")
- || file.getName().startsWith("PullRequestVerifications.xml")) {
+ || file.getName().startsWith("PullRequestVerifications.xml")
+ || file.getName().startsWith("CodeComments.xml")
+ || file.getName().startsWith("CodeCommentRelations.xml")
+ || file.getName().startsWith("CodeCommentReplys.xml")
+ || file.getName().startsWith("CodeCommentStatusChanges.xml")) {
FileUtils.deleteFile(file);
} else if (file.getName().startsWith("PullRequestUpdates.xml")) {
VersionedDocument dom = VersionedDocument.fromFile(file);
diff --git a/core/src/main/java/com/gitplex/server/model/Account.java b/core/src/main/java/com/gitplex/server/model/Account.java
index 7d4155f1a6..7b275e8c5f 100644
--- a/core/src/main/java/com/gitplex/server/model/Account.java
+++ b/core/src/main/java/com/gitplex/server/model/Account.java
@@ -111,7 +111,7 @@ public class Account extends AbstractEntity implements AuthenticationInfo, Prote
private Collection<Team> definedTeams = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
- private Collection<PullRequestReview> reviews = new ArrayList<>();
+ private Collection<Review> reviews = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
private Collection<ReviewInvitation> reviewInvitations = new ArrayList<>();
@@ -304,8 +304,8 @@ public class Account extends AbstractEntity implements AuthenticationInfo, Prote
}
@Nullable
- public PullRequestReview getReviewAfter(PullRequestUpdate update) {
- for (PullRequestReview review: update.getRequest().getReviews()) {
+ public Review getReviewAfter(PullRequestUpdate update) {
+ for (Review review: update.getRequest().getReviews()) {
if (review.getUser().equals(this) && review.getUpdate() != null
&& review.getUpdate().getId()>=update.getId()) {
return review;
diff --git a/core/src/main/java/com/gitplex/server/model/CodeComment.java b/core/src/main/java/com/gitplex/server/model/CodeComment.java
index 5bc5c74246..d835e0b7b8 100644
--- a/core/src/main/java/com/gitplex/server/model/CodeComment.java
+++ b/core/src/main/java/com/gitplex/server/model/CodeComment.java
@@ -1,10 +1,11 @@
package com.gitplex.server.model;
-import java.io.Serializable;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import java.util.UUID;
import javax.annotation.Nullable;
@@ -21,17 +22,25 @@ import javax.persistence.OneToMany;
import javax.persistence.Table;
import javax.persistence.Version;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.treewalk.TreeWalk;
import org.hibernate.annotations.DynamicUpdate;
import com.gitplex.server.GitPlex;
-import com.gitplex.server.event.codecomment.CodeCommentEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;
+import com.gitplex.server.git.Blob;
+import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.manager.VisitInfoManager;
import com.gitplex.server.model.support.CodeCommentActivity;
import com.gitplex.server.model.support.CommentPos;
-import com.gitplex.server.model.support.CompareContext;
import com.gitplex.server.model.support.LastEvent;
import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.diff.DiffUtils;
+import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.util.editable.EditableUtils;
+import com.google.common.base.Preconditions;
/*
* @DynamicUpdate annotation here along with various @OptimisticLock annotations
@@ -40,9 +49,8 @@ import com.gitplex.server.util.editable.EditableUtils;
*/
@Entity
@Table(indexes={
- @Index(columnList="g_depot_id"), @Index(columnList="g_user_id"),
- @Index(columnList="uuid"), @Index(columnList="commit"),
- @Index(columnList="path"), @Index(columnList="compareCommit")})
+ @Index(columnList="g_request_id"), @Index(columnList="g_user_id"),
+ @Index(columnList="commit"), @Index(columnList="path")})
@DynamicUpdate
public class CodeComment extends AbstractEntity {
@@ -53,7 +61,7 @@ public class CodeComment extends AbstractEntity {
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
- private Depot depot;
+ private PullRequest request;
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn
@@ -74,17 +82,11 @@ public class CodeComment extends AbstractEntity {
@Embedded
private CommentPos commentPos;
- @Embedded
- private CompareContext compareContext;
-
private boolean resolved;
@OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)
private Collection<CodeCommentReply> replies = new ArrayList<>();
- @OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)
- private Collection<CodeCommentRelation> relations = new ArrayList<>();
-
@OneToMany(mappedBy="comment", cascade=CascadeType.REMOVE)
private Collection<CodeCommentStatusChange> statusChanges= new ArrayList<>();
@@ -93,14 +95,16 @@ public class CodeComment extends AbstractEntity {
private transient List<CodeCommentActivity> activities;
- public Depot getDepot() {
- return depot;
+ private transient Boolean codeChanged;
+
+ public PullRequest getRequest() {
+ return request;
}
- public void setDepot(Depot depot) {
- this.depot = depot;
+ public void setRequest(PullRequest request) {
+ this.request = request;
}
-
+
@Nullable
public Account getUser() {
return user;
@@ -147,14 +151,6 @@ public class CodeComment extends AbstractEntity {
this.commentPos = commentPos;
}
- public CompareContext getCompareContext() {
- return compareContext;
- }
-
- public void setCompareContext(CompareContext compareContext) {
- this.compareContext = compareContext;
- }
-
public Collection<CodeCommentReply> getReplies() {
return replies;
}
@@ -163,14 +159,6 @@ public class CodeComment extends AbstractEntity {
this.replies = replies;
}
- public Collection<CodeCommentRelation> getRelations() {
- return relations;
- }
-
- public void setRelations(Collection<CodeCommentRelation> relations) {
- this.relations = relations;
- }
-
public Collection<CodeCommentStatusChange> getStatusChanges() {
return statusChanges;
}
@@ -203,7 +191,7 @@ public class CodeComment extends AbstractEntity {
this.lastEvent = lastEvent;
}
- public void setLastEvent(CodeCommentEvent event) {
+ public void setLastEvent(PullRequestCodeCommentEvent event) {
LastEvent lastEvent = new LastEvent();
lastEvent.setDate(event.getDate());
lastEvent.setType(EditableUtils.getName(event.getClass()));
@@ -221,10 +209,6 @@ public class CodeComment extends AbstractEntity {
}
}
- public ComparingInfo getComparingInfo() {
- return new ComparingInfo(commentPos.getCommit(), compareContext);
- }
-
public List<CodeCommentActivity> getActivities() {
if (activities == null) {
activities= new ArrayList<>();
@@ -234,37 +218,62 @@ public class CodeComment extends AbstractEntity {
}
return activities;
}
-
- public CompareContext getLastCompareContext() {
- if (!getActivities().isEmpty()) {
- CodeCommentActivity lastActivity = activities.get(activities.size()-1);
- return lastActivity.getCompareContext();
- } else {
- return getCompareContext();
- }
- }
-
- public static class ComparingInfo implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private final String commit;
-
- private final CompareContext compareContext;
-
- public ComparingInfo(String commit, CompareContext compareContext) {
- this.commit = commit;
- this.compareContext = compareContext;
- }
-
- public String getCommit() {
- return commit;
- }
- public CompareContext getCompareContext() {
- return compareContext;
+ public boolean isCodeChanged() {
+ if (codeChanged == null) {
+ if (request.getHeadCommitHash().equals(commentPos.getCommit())) {
+ codeChanged = false;
+ } else {
+ Depot depot = request.getTargetDepot();
+ try (RevWalk revWalk = new RevWalk(depot.getRepository())) {
+ TreeWalk treeWalk = TreeWalk.forPath(depot.getRepository(), commentPos.getPath(),
+ request.getHeadCommit().getTree());
+ if (treeWalk != null) {
+ ObjectId blobId = treeWalk.getObjectId(0);
+ if (treeWalk.getRawMode(0) == FileMode.REGULAR_FILE.getBits()) {
+ BlobIdent blobIdent = new BlobIdent(request.getHeadCommitHash(), commentPos.getPath(),
+ treeWalk.getRawMode(0));
+ Blob newBlob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());
+ Blob oldBlob = depot.getBlob(new BlobIdent(commentPos.getCommit(),
+ commentPos.getPath(), FileMode.REGULAR_FILE.getBits()));
+ Preconditions.checkState(oldBlob != null && oldBlob.getText() != null);
+
+ List<String> oldLines = new ArrayList<>();
+ for (String line: oldBlob.getText().getLines())
+ oldLines.add(WhitespaceOption.DEFAULT.process(line));
+
+ List<String> newLines = new ArrayList<>();
+ for (String line: newBlob.getText().getLines())
+ newLines.add(WhitespaceOption.DEFAULT.process(line));
+
+ Map<Integer, Integer> lineMapping = DiffUtils.mapLines(oldLines, newLines);
+ int oldBeginLine = commentPos.getRange().getBeginLine();
+ int oldEndLine = commentPos.getRange().getEndLine();
+ Integer newBeginLine = lineMapping.get(oldBeginLine);
+ if (newBeginLine != null) {
+ for (int oldLine=oldBeginLine; oldLine<=oldEndLine; oldLine++) {
+ Integer newLine = lineMapping.get(oldLine);
+ if (newLine == null || newLine.intValue() != oldLine-oldBeginLine+newBeginLine) {
+ codeChanged = true;
+ break;
+ }
+ }
+ if (codeChanged == null)
+ codeChanged = false;
+ } else {
+ codeChanged = true;
+ }
+ } else {
+ codeChanged = true;
+ }
+ } else {
+ codeChanged = true;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
-
+ return codeChanged;
}
-
}
diff --git a/core/src/main/java/com/gitplex/server/model/CodeCommentRelation.java b/core/src/main/java/com/gitplex/server/model/CodeCommentRelation.java
deleted file mode 100644
index 67781b576f..0000000000
--- a/core/src/main/java/com/gitplex/server/model/CodeCommentRelation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.gitplex.server.model;
-
-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 org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
-@Table(
- indexes={@Index(columnList="g_request_id"), @Index(columnList="g_comment_id")},
- uniqueConstraints={@UniqueConstraint(columnNames={"g_request_id", "g_comment_id"})
-})
-@Entity
-public class CodeCommentRelation extends AbstractEntity {
-
- private static final long serialVersionUID = 1L;
-
- @ManyToOne(fetch=FetchType.EAGER)
- @Fetch(FetchMode.JOIN)
- @JoinColumn(nullable=false)
- private PullRequest request;
-
- @ManyToOne(fetch=FetchType.EAGER)
- @Fetch(FetchMode.JOIN)
- @JoinColumn(nullable=false)
- private CodeComment comment;
-
- 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;
- }
-
-}
diff --git a/core/src/main/java/com/gitplex/server/model/Depot.java b/core/src/main/java/com/gitplex/server/model/Depot.java
index 9d27a97506..594626f683 100644
--- a/core/src/main/java/com/gitplex/server/model/Depot.java
+++ b/core/src/main/java/com/gitplex/server/model/Depot.java
@@ -168,9 +168,6 @@ public class Depot extends AbstractEntity implements AccountBelonging {
@OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)
private Collection<UserAuthorization> authorizedUsers = new ArrayList<>();
- @OneToMany(mappedBy="depot", cascade=CascadeType.REMOVE)
- private Collection<CodeComment> comments = new ArrayList<>();
-
private transient Repository repository;
private transient Map<BlobIdent, Blob> blobCache;
@@ -525,8 +522,7 @@ public class Depot extends AbstractEntity implements AccountBelonging {
} else if (blobIdent.isTree()) {
throw new NotFileException("Path '" + blobIdent.path + "' is a tree");
} else {
- ObjectLoader objectLoader = treeWalk.getObjectReader().open(blobId);
- blob = new Blob(blobIdent, objectLoader, blobId);
+ blob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());
}
getBlobCache().put(blobIdent, blob);
} else {
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequest.java b/core/src/main/java/com/gitplex/server/model/PullRequest.java
index da277ecb8a..552ed60dbf 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequest.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequest.java
@@ -11,7 +11,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
-import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.persistence.CascadeType;
@@ -41,12 +40,10 @@ import com.fasterxml.jackson.annotation.JsonView;
import com.gitplex.server.GitPlex;
import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;
import com.gitplex.server.git.GitUtils;
-import com.gitplex.server.manager.CodeCommentRelationManager;
import com.gitplex.server.manager.PullRequestManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.manager.VisitInfoManager;
import com.gitplex.server.model.support.CloseInfo;
-import com.gitplex.server.model.support.CompareContext;
import com.gitplex.server.model.support.DepotAndBranch;
import com.gitplex.server.model.support.LastEvent;
import com.gitplex.server.model.support.MergePreview;
@@ -149,13 +146,13 @@ public class PullRequest extends AbstractEntity {
private Collection<PullRequestUpdate> updates = new ArrayList<>();
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
- private Collection<CodeCommentRelation> codeCommentRelations = new ArrayList<>();
+ private Collection<ReviewInvitation> reviewInvitations = new ArrayList<>();
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
- private Collection<ReviewInvitation> reviewInvitations = new ArrayList<>();
+ private Collection<Review> reviews = new ArrayList<>();
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
- private Collection<PullRequestReview> reviews = new ArrayList<>();
+ private Collection<CodeComment> codeComments = new ArrayList<>();
@OneToMany(mappedBy="referenced", cascade=CascadeType.REMOVE)
private Collection<PullRequestReference> referencedBy = new ArrayList<>();
@@ -187,8 +184,6 @@ public class PullRequest extends AbstractEntity {
private transient Optional<MergePreview> mergePreviewOpt;
- private transient List<CodeComment> codeComments;
-
/**
* Get title of this merge request.
*
@@ -348,14 +343,6 @@ public class PullRequest extends AbstractEntity {
sortedUpdates = null;
}
- public Collection<CodeCommentRelation> getCodeCommentRelations() {
- return codeCommentRelations;
- }
-
- public void setCodeCommentRelations(Collection<CodeCommentRelation> codeCommentRelations) {
- this.codeCommentRelations = codeCommentRelations;
- }
-
public Collection<ReviewInvitation> getReviewInvitations() {
return reviewInvitations;
}
@@ -388,6 +375,14 @@ public class PullRequest extends AbstractEntity {
this.comments = comments;
}
+ public Collection<CodeComment> getCodeComments() {
+ return codeComments;
+ }
+
+ public void setCodeComments(Collection<CodeComment> codeComments) {
+ this.codeComments = codeComments;
+ }
+
public Collection<PullRequestStatusChange> getStatusChanges() {
return statusChanges;
}
@@ -414,7 +409,7 @@ public class PullRequest extends AbstractEntity {
public ReviewStatus getReviewStatus() {
if (reviewStatus == null)
- reviewStatus = GitPlex.getInstance(PullRequestReviewManager.class).checkRequest(this);
+ reviewStatus = GitPlex.getInstance(ReviewManager.class).checkRequest(this);
return reviewStatus;
}
@@ -610,11 +605,11 @@ public class PullRequest extends AbstractEntity {
return mergedCommits;
}
- public Collection<PullRequestReview> getReviews() {
+ public Collection<Review> getReviews() {
return reviews;
}
- public void setReviews(Collection<PullRequestReview> reviews) {
+ public void setReviews(Collection<Review> reviews) {
this.reviews = reviews;
}
@@ -656,53 +651,6 @@ public class PullRequest extends AbstractEntity {
numberStr = String.valueOf(number);
}
- public List<CodeComment> getCodeComments() {
- if (codeComments == null) {
- codeComments = GitPlex.getInstance(CodeCommentRelationManager.class).findCodeComments(this);
- }
- return codeComments;
- }
-
- @Nullable
- public ComparingInfo getRequestComparingInfo(CodeComment.ComparingInfo commentComparingInfo) {
- List<String> commits = new ArrayList<>();
- commits.add(getBaseCommitHash());
- for (PullRequestUpdate update: getSortedUpdates()) {
- commits.addAll(update.getCommits().stream().map(RevCommit::getName).collect(Collectors.toList()));
- }
- String commit = commentComparingInfo.getCommit();
- CompareContext compareContext = commentComparingInfo.getCompareContext();
- if (commit.equals(compareContext.getCompareCommit())) {
- int index = commits.indexOf(commit);
- if (index == 0) {
- return null;
- } else {
- return new ComparingInfo(commits.get(index-1), commit,
- compareContext.getWhitespaceOption(), compareContext.getPathFilter());
- }
- } else {
- int commitIndex = commits.indexOf(commit);
- int compareCommitIndex = commits.indexOf(compareContext.getCompareCommit());
- if (commitIndex == -1 || compareCommitIndex == -1) {
- return null;
- } else if (compareContext.isLeftSide()) {
- if (compareCommitIndex < commitIndex) {
- return new ComparingInfo(compareContext.getCompareCommit(), commit,
- compareContext.getWhitespaceOption(), compareContext.getPathFilter());
- } else {
- return null;
- }
- } else {
- if (commitIndex < compareCommitIndex) {
- return new ComparingInfo(commit, compareContext.getCompareCommit(),
- compareContext.getWhitespaceOption(), compareContext.getPathFilter());
- } else {
- return null;
- }
- }
- }
- }
-
public List<RevCommit> getCommits() {
List<RevCommit> commits = new ArrayList<>();
getSortedUpdates().forEach(update->commits.addAll(update.getCommits()));
@@ -789,7 +737,7 @@ public class PullRequest extends AbstractEntity {
ReviewStatus checkStatus = getReviewStatus();
Collection<Account> users = SecurityUtils.findUsersCan(getTargetDepot(), DepotPrivilege.READ);
users.removeAll(checkStatus.getAwaitingReviewers());
- for (PullRequestReview review: checkStatus.getEffectiveReviews().values())
+ for (Review review: checkStatus.getEffectiveReviews().values())
users.remove(review.getUser());
users.remove(SecurityUtils.getAccount());
List<Account> userList = new ArrayList<>(users);
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java b/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java
index c08406a92b..a9fc50b625 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java
+++ b/core/src/main/java/com/gitplex/server/model/PullRequestUpdate.java
@@ -29,7 +29,6 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.gitplex.server.git.GitUtils;
-import com.gitplex.server.manager.impl.DefaultCodeCommentRelationManager;
import com.google.common.base.Preconditions;
@Entity
diff --git a/core/src/main/java/com/gitplex/server/model/PullRequestReview.java b/core/src/main/java/com/gitplex/server/model/Review.java
similarity index 97%
rename from core/src/main/java/com/gitplex/server/model/PullRequestReview.java
rename to core/src/main/java/com/gitplex/server/model/Review.java
index 04cd0ae8a1..29a9daa711 100644
--- a/core/src/main/java/com/gitplex/server/model/PullRequestReview.java
+++ b/core/src/main/java/com/gitplex/server/model/Review.java
@@ -19,7 +19,7 @@ import com.gitplex.server.model.support.MergePreview;
indexes={@Index(columnList="g_user_id"), @Index(columnList="g_request_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"g_user_id", "g_request_id", "commit"})}
)
-public class PullRequestReview extends AbstractEntity {
+public class Review extends AbstractEntity {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.java b/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.java
index 9fefa7241f..5545c73140 100644
--- a/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.java
+++ b/core/src/main/java/com/gitplex/server/model/support/CodeCommentActivity.java
@@ -4,7 +4,6 @@ import java.util.Date;
import javax.annotation.Nullable;
import javax.persistence.Column;
-import javax.persistence.Embedded;
import javax.persistence.FetchType;
import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
@@ -14,7 +13,6 @@ import javax.persistence.Version;
import com.gitplex.server.model.AbstractEntity;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.CodeComment.ComparingInfo;
@MappedSuperclass
public abstract class CodeCommentActivity extends AbstractEntity {
@@ -34,9 +32,6 @@ public abstract class CodeCommentActivity extends AbstractEntity {
@Column(nullable=false)
private Date date;
- @Embedded
- private CompareContext compareContext;
-
@Version
private long version;
@@ -74,14 +69,6 @@ public abstract class CodeCommentActivity extends AbstractEntity {
this.date = date;
}
- public CompareContext getCompareContext() {
- return compareContext;
- }
-
- public void setCompareContext(CompareContext compareContext) {
- this.compareContext = compareContext;
- }
-
public long getVersion() {
return version;
}
@@ -90,10 +77,6 @@ public abstract class CodeCommentActivity extends AbstractEntity {
this.version = version;
}
- public ComparingInfo getComparingInfo() {
- return new ComparingInfo(getComment().getCommentPos().getCommit(), getCompareContext());
- }
-
public String getAnchor() {
return getClass().getSimpleName() + "-" + getId();
}
diff --git a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
index dacef95035..b4cf5d91db 100644
--- a/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
+++ b/core/src/main/java/com/gitplex/server/security/SecurityUtils.java
@@ -10,14 +10,14 @@ import org.eclipse.jgit.lib.ObjectId;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestComment;
import com.gitplex.server.model.PullRequestStatusChange;
-import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.model.Review;
import com.gitplex.server.model.support.BranchProtection;
import com.gitplex.server.model.support.CodeCommentActivity;
import com.gitplex.server.model.support.TagProtection;
@@ -50,7 +50,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
return GitPlex.getInstance(AccountManager.class).getCurrent();
}
- public static boolean canModify(PullRequestReview review) {
+ public static boolean canModify(Review review) {
Depot depot = review.getRequest().getTargetDepot();
if (canManage(depot)) {
return true;
@@ -64,7 +64,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
if (currentUser == null) {
return false;
} else {
- return currentUser.equals(comment.getUser()) || canManage(comment.getDepot());
+ return currentUser.equals(comment.getUser()) || canManage(comment.getRequest().getTargetDepot());
}
}
@@ -73,7 +73,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
if (currentUser == null) {
return false;
} else {
- return currentUser.equals(activity.getUser()) || canManage(activity.getComment().getDepot());
+ return currentUser.equals(activity.getUser()) || canManage(activity.getComment().getRequest().getTargetDepot());
}
}
@@ -134,11 +134,11 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {
}
public static boolean canModify(Depot depot, String branch, String file) {
- return canWrite(depot) && GitPlex.getInstance(PullRequestReviewManager.class).canModify(getAccount(), depot, branch, file);
+ return canWrite(depot) && GitPlex.getInstance(ReviewManager.class).canModify(getAccount(), depot, branch, file);
}
public static boolean canPush(Depot depot, String branchName, ObjectId oldObjectId, ObjectId newObjectId) {
- return canWrite(depot) && GitPlex.getInstance(PullRequestReviewManager.class).canPush(getAccount(), depot, branchName,
+ return canWrite(depot) && GitPlex.getInstance(ReviewManager.class).canPush(getAccount(), depot, branchName,
oldObjectId, newObjectId);
}
diff --git a/core/src/main/java/com/gitplex/server/util/ReviewStatus.java b/core/src/main/java/com/gitplex/server/util/ReviewStatus.java
index 370335735b..427c206365 100644
--- a/core/src/main/java/com/gitplex/server/util/ReviewStatus.java
+++ b/core/src/main/java/com/gitplex/server/util/ReviewStatus.java
@@ -4,12 +4,12 @@ import java.util.List;
import java.util.Map;
import com.gitplex.server.model.Account;
-import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.model.Review;
public interface ReviewStatus {
List<Account> getAwaitingReviewers();
- Map<Account, PullRequestReview> getEffectiveReviews();
+ Map<Account, Review> getEffectiveReviews();
}
diff --git a/rest/src/main/java/com/gitplex/server/rest/PullRequestReviewResource.java b/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java
similarity index 73%
rename from rest/src/main/java/com/gitplex/server/rest/PullRequestReviewResource.java
rename to rest/src/main/java/com/gitplex/server/rest/ReviewResource.java
index 44b0c9d655..b842ce9cf5 100644
--- a/rest/src/main/java/com/gitplex/server/rest/PullRequestReviewResource.java
+++ b/rest/src/main/java/com/gitplex/server/rest/ReviewResource.java
@@ -16,31 +16,31 @@ import javax.ws.rs.core.MediaType;
import org.apache.shiro.authz.UnauthorizedException;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.Account;
-import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.model.Review;
import com.gitplex.server.security.SecurityUtils;
-@Path("/pullrequest_reviews")
+@Path("/reviews")
@Consumes(MediaType.WILDCARD)
@Produces(MediaType.APPLICATION_JSON)
@Singleton
-public class PullRequestReviewResource {
+public class ReviewResource {
- private final PullRequestReviewManager reviewManager;
+ private final ReviewManager reviewManager;
private final AccountManager accountManager;
@Inject
- public PullRequestReviewResource(PullRequestReviewManager reviewManager, AccountManager accountManager) {
+ public ReviewResource(ReviewManager reviewManager, AccountManager accountManager) {
this.reviewManager = reviewManager;
this.accountManager = accountManager;
}
@GET
@Path("/{id}")
- public PullRequestReview get(@PathParam("id") Long id) {
- PullRequestReview review = reviewManager.load(id);
+ public Review get(@PathParam("id") Long id) {
+ Review review = reviewManager.load(id);
if (!SecurityUtils.canRead(review.getRequest().getTargetDepot()))
throw new UnauthorizedException();
return review;
@@ -49,7 +49,7 @@ public class PullRequestReviewResource {
@DELETE
@Path("/{id}")
public void delete(@PathParam("id") Long id) {
- PullRequestReview review = reviewManager.load(id);
+ Review review = reviewManager.load(id);
Account currentUser = accountManager.getCurrent();
if (review.getUser().equals(currentUser) || SecurityUtils.canManage(review.getRequest().getTargetDepot()))
reviewManager.delete(review);
@@ -58,7 +58,7 @@ public class PullRequestReviewResource {
}
@POST
- public Long save(@NotNull @Valid PullRequestReview review) {
+ public Long save(@NotNull @Valid Review review) {
if (!SecurityUtils.canWrite(review.getRequest().getTargetDepot()))
throw new UnauthorizedException();
diff --git a/web/src/main/java/com/gitplex/server/web/UrlMapper.java b/web/src/main/java/com/gitplex/server/web/UrlMapper.java
index 78b5704dbb..d9b28c1a8a 100644
--- a/web/src/main/java/com/gitplex/server/web/UrlMapper.java
+++ b/web/src/main/java/com/gitplex/server/web/UrlMapper.java
@@ -39,8 +39,6 @@ import com.gitplex.server.web.page.admin.account.UserListPage;
import com.gitplex.server.web.page.depot.NoBranchesPage;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;
-import com.gitplex.server.web.page.depot.comments.CodeCommentPage;
-import com.gitplex.server.web.page.depot.comments.DepotCommentsPage;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;
import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
@@ -207,8 +205,6 @@ public class UrlMapper extends CompoundRequestMapper {
"${account}/${depot}/pulls/${request}/changes", RequestChangesPage.class));
add(new DepotMapper(
"${account}/${depot}/pulls/${request}/merge-preview", MergePreviewPage.class));
- add(new DepotMapper("${account}/${depot}/comments", DepotCommentsPage.class));
- add(new DepotMapper("${account}/${depot}/comments/${comment}", CodeCommentPage.class));
add(new DepotMapper("${account}/${depot}/settings/general", GeneralSettingPage.class));
add(new DepotMapper("${account}/${depot}/settings/team-authorization", DepotTeamAuthorizationPage.class));
diff --git a/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java b/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java
index 7085f4c6aa..963ed2240b 100644
--- a/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java
+++ b/web/src/main/java/com/gitplex/server/web/WicketUrlManager.java
@@ -34,25 +34,19 @@ public class WicketUrlManager implements UrlManager {
}
@Override
- public String urlFor(CodeComment comment, PullRequest request) {
- String url = urlFor(comment.getDepot()) + "/comments/" + comment.getId();
- if (request != null)
- url += "?request=" + request.getId();
- return url;
+ public String urlFor(CodeComment comment) {
+ return urlFor(comment.getRequest()) + "/codecomments/" + comment.getId();
}
@Override
- public String urlFor(CodeCommentActivity activity, PullRequest request) {
- String url = urlFor(activity.getComment(), request);
- if (request != null)
- return url + "&anchor=" + activity.getAnchor();
- else
- return url + "?anchor=" + activity.getAnchor();
+ public String urlFor(CodeCommentActivity activity) {
+ String url = urlFor(activity.getComment());
+ return url + "#" + activity.getAnchor();
}
@Override
public String urlFor(PullRequest request) {
- return urlFor(request.getTarget().getDepot()) + "/pulls/" + request.getNumber() + "/overview";
+ return urlFor(request.getTarget().getDepot()) + "/pulls/" + request.getNumber();
}
@Override
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentAware.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentAware.java
deleted file mode 100644
index 26e9778fcd..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentAware.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.gitplex.server.web.component.comment;
-
-import java.util.List;
-
-public interface CodeCommentAware {
- List<String> getCommentedFiles();
-}
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java
deleted file mode 100644
index 0cab51f7ae..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentFilter.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package com.gitplex.server.web.component.comment;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.wicket.core.request.handler.IPageRequestHandler;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.hibernate.criterion.Restrictions;
-
-import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.persistence.dao.EntityCriteria;
-import com.gitplex.server.util.editable.annotation.AccountChoice;
-import com.gitplex.server.util.editable.annotation.Editable;
-import com.gitplex.server.util.editable.annotation.FileChoice;
-import com.gitplex.server.util.stringmatch.WildcardUtils;
-
-@Editable
-public class CodeCommentFilter implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private static final String PARAM_USER = "user";
-
- private static final String PARAM_UNRESOLVED = "unresolved";
-
- private static final String PARAM_PATH = "path";
-
- private static final String PARAM_BEFORE = "before";
-
- private static final String PARAM_AFTER = "after";
-
- private String userName;
-
- private boolean unresolved;
-
- private String path;
-
- private Date before;
-
- private Date after;
-
- @Editable(order=100, name="Created by", description="Choose the user who created the comment")
- @AccountChoice
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- @Editable(order=200, name="Show unresolved only", description="Check this if you only want to show unresolved comments")
- public boolean isUnresolved() {
- return unresolved;
- }
-
- public void setUnresolved(boolean unresolved) {
- this.unresolved = unresolved;
- }
-
- @Editable(order=500, name="Commented path", description="Show comments on specified path")
- @FileChoice("getCommentedFiles")
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- @Editable(order=600, name="After date", description="Show comments after specified date")
- public Date getAfter() {
- return after;
- }
-
- public void setAfter(Date after) {
- this.after = after;
- }
-
- @Editable(order=700, name="Before date", description="Show comments before specified date")
- public Date getBefore() {
- return before;
- }
-
- public void setBefore(Date before) {
- this.before = before;
- }
-
- public CodeCommentFilter() {
- }
-
- public CodeCommentFilter(PageParameters params) {
- userName = params.get(PARAM_USER).toString();
- unresolved = "yes".equals(params.get(PARAM_UNRESOLVED).toString());
- path = params.get(PARAM_PATH).toString();
-
- String value = params.get(PARAM_BEFORE).toString();
- if (value != null)
- before = new Date(Long.valueOf(value));
-
- value = params.get(PARAM_AFTER).toString();
- if (value != null)
- after = new Date(Long.valueOf(value));
- }
-
- public void fill(EntityCriteria<CodeComment> criteria) {
- if (userName != null)
- criteria.createCriteria("user").add(Restrictions.eq("name", userName));
- if (unresolved)
- criteria.add(Restrictions.eq("resolved", false));
- if (path != null) {
- String pathQuery = path.replace('*', '%');
- if (pathQuery.endsWith("/"))
- pathQuery += "%";
- criteria.add(Restrictions.ilike("commentPos.path", pathQuery));
- }
-
- if (before != null)
- criteria.add(Restrictions.le("date", before));
- if (after != null)
- criteria.add(Restrictions.ge("date", after));
- }
-
- public void filter(Collection<CodeComment> comments) {
- for (Iterator<CodeComment> it = comments.iterator(); it.hasNext();) {
- CodeComment comment = it.next();
- if (userName != null) {
- if (comment.getUser() == null || !comment.getUser().getName().equals(userName)) {
- it.remove();
- continue;
- }
- }
- if (unresolved && comment.isResolved()) {
- it.remove();
- continue;
- }
- if (path != null) {
- if (comment.getCommentPos().getPath() == null) {
- it.remove();
- continue;
- } else {
- String matchWith = path;
- if (matchWith.endsWith("/"))
- matchWith += "*";
- if (!WildcardUtils.matchString(matchWith, comment.getCommentPos().getPath())) {
- it.remove();
- continue;
- }
- }
- }
- if (before != null && comment.getDate().getTime()>before.getTime()) {
- it.remove();
- continue;
- }
- if (after != null && comment.getDate().getTime()<after.getTime()) {
- it.remove();
- continue;
- }
- }
- }
-
- public void fillPageParams(PageParameters params) {
- if (userName != null)
- params.add(PARAM_USER, userName);
- if (unresolved)
- params.add(PARAM_UNRESOLVED, "yes");
- if (path != null)
- params.add(PARAM_PATH, path);
- if (before != null)
- params.add(PARAM_BEFORE, before.getTime());
- if (after != null)
- params.add(PARAM_AFTER, after.getTime());
- }
-
- @SuppressWarnings("unused")
- private static List<String> getCommentedFiles() {
- IPageRequestHandler handler = (IPageRequestHandler) RequestCycle.get().getActiveRequestHandler();
- return ((CodeCommentAware)handler.getPage()).getCommentedFiles();
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html
deleted file mode 100644
index 6057b1b6b3..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<wicket:panel>
- <table class="code-comments">
- <tr>
- <td class="filter">
- <div class="head">Filter options</div>
- <div class="body">
- <div class="btn-group shortcuts">
- <a wicket:id="myComments" class="btn btn-sm btn-default">My</a>
- <a wicket:id="myUnresolvedComments" class="btn btn-sm btn-default">My unresolved</a>
- <a wicket:id="unresolvedComments" class="btn btn-sm btn-default">Unresolved</a>
- <a wicket:id="allComments" class="btn btn-sm btn-default">All</a>
- </div>
- <form wicket:id="filterForm">
- <div wicket:id="editor" class="no-autofocus"></div>
- <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Search</button>
- </form>
- </div>
- </td>
- <td class="spacing">&nbsp;</td>
- <td class="result">
- <div wicket:id="alert" class="alert alert-warning"></div>
- <table wicket:id="comments"></table>
- </td>
- </tr>
- </table>
- <wicket:fragment wicket:id="commentFrag">
- <div class="first-line">
- <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
- <span wicket:id="resolved" title="This comment is resolved" class="resolved fa fa-check-circle"></span>
- </div>
- <div class="second-line">
- commented by
- <a wicket:id="user" class="user"></a>
- on
- <a wicket:id="file" class="file"><span wicket:id="label"></span></a>
- <span wicket:id="date"></span>
- </div>
- <div wicket:id="lastEvent" class="third-line">
- <a wicket:id="user" class="user"></a>
- <span wicket:id="description"></span>
- <span wicket:id="date"></span>
- </div>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java
deleted file mode 100644
index 3bdc7509ff..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java
+++ /dev/null
@@ -1,301 +0,0 @@
-package com.gitplex.server.web.component.comment;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.behavior.AttributeAppender;
-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.NavigationToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
-import com.gitplex.server.GitPlex;
-import com.gitplex.server.manager.CodeCommentManager;
-import com.gitplex.server.model.Account;
-import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.Depot;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.CompareContext;
-import com.gitplex.server.persistence.dao.Dao;
-import com.gitplex.server.persistence.dao.EntityCriteria;
-import com.gitplex.server.security.SecurityUtils;
-import com.gitplex.server.util.StringUtils;
-import com.gitplex.server.web.WebConstants;
-import com.gitplex.server.web.component.link.AccountLink;
-import com.gitplex.server.web.editable.BeanContext;
-import com.gitplex.server.web.page.depot.DepotPage;
-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.gitplex.server.web.util.DateUtils;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
-
-@SuppressWarnings("serial")
-public abstract class CodeCommentListPanel extends Panel {
-
- private static final int TITLE_LEN = 100;
-
- private final IModel<CodeCommentFilter> filterOptionModel;
-
- public CodeCommentListPanel(String id, IModel<CodeCommentFilter> filterOptionModel) {
- super(id);
-
- this.filterOptionModel = filterOptionModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new Link<Void>("myComments") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.getAccount() != null);
- }
-
- @Override
- public void onClick() {
- CodeCommentFilter filterOption = new CodeCommentFilter();
- filterOption.setUserName(SecurityUtils.getAccount().getName());
- filterOptionModel.setObject(filterOption);
- }
-
- });
- add(new Link<Void>("myUnresolvedComments") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.getAccount() != null);
- }
-
- @Override
- public void onClick() {
- CodeCommentFilter filterOption = new CodeCommentFilter();
- filterOption.setUserName(SecurityUtils.getAccount().getName());
- filterOption.setUnresolved(true);
- filterOptionModel.setObject(filterOption);
- }
-
- });
- add(new Link<Void>("unresolvedComments") {
-
- @Override
- public void onClick() {
- CodeCommentFilter filterOption = new CodeCommentFilter();
- filterOption.setUnresolved(true);
- filterOptionModel.setObject(filterOption);
- }
-
- });
- add(new Link<Void>("allComments") {
-
- @Override
- public void onClick() {
- filterOptionModel.setObject(new CodeCommentFilter());
- }
-
- });
- Form<?> filterForm = new Form<Void>("filterForm") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
- }
-
- };
- filterForm.add(BeanContext.editModel("editor", filterOptionModel));
- add(filterForm);
-
- List<IColumn<CodeComment, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Code Comment")) {
-
- private void openComment(CodeComment comment) {
- Depot depot = ((DepotPage) getPage()).getDepot();
-
- PullRequest request = getPullRequest();
- if (request != null) {
- setResponsePage(RequestChangesPage.class, RequestChangesPage.paramsOf(request, comment, null));
- } else {
- CompareContext compareContext = comment.getLastCompareContext();
- if (!compareContext.getCompareCommit().equals(comment.getCommentPos().getCommit())) {
- setResponsePage(RevisionComparePage.class, RevisionComparePage.paramsOf(depot, comment, null));
- } else {
- setResponsePage(DepotBlobPage.class, DepotBlobPage.paramsOf(depot, comment, null));
- }
- }
- }
-
- @Override
- public void populateItem(Item<ICellPopulator<CodeComment>> cellItem,
- String componentId, IModel<CodeComment> rowModel) {
- CodeComment comment = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "commentFrag", CodeCommentListPanel.this);
- Link<Void> titleLink = new Link<Void>("title") {
-
- @Override
- public void onClick() {
- openComment(rowModel.getObject());
- }
-
- };
- titleLink.add(new Label("label", StringUtils.abbreviate(comment.getContent(), TITLE_LEN)));
- fragment.add(titleLink);
- fragment.add(new WebMarkupContainer("resolved").setVisible(comment.isResolved()));
- fragment.add(new AccountLink("user", Account.getForDisplay(comment.getUser(), comment.getUserName())));
-
- Link<Void> fileLink = new Link<Void>("file") {
-
- @Override
- public void onClick() {
- openComment(rowModel.getObject());
- }
-
- };
- fileLink.add(new Label("label", comment.getCommentPos().getPath()));
- fragment.add(fileLink);
-
- fragment.add(new Label("date", DateUtils.formatAge(comment.getDate())));
-
- WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");
- if (comment.getLastEvent() != null) {
- String description = comment.getLastEvent().getType();
- lastEventContainer.add(new Label("description", description));
-
- Account userForDisplay = Account.getForDisplay(comment.getLastEvent().getUser(),
- comment.getLastEvent().getUserName());
- lastEventContainer.add(new AccountLink("user", userForDisplay));
- lastEventContainer.add(new Label("date", DateUtils.formatAge(comment.getLastEvent().getDate())));
- } else {
- lastEventContainer.add(new WebMarkupContainer("description"));
- lastEventContainer.add(new WebMarkupContainer("user"));
- lastEventContainer.add(new WebMarkupContainer("date"));
- lastEventContainer.setVisible(false);
- }
- fragment.add(lastEventContainer);
-
- cellItem.add(fragment);
-
- Date lastUpdateDate;
- if (comment.getLastEvent() != null)
- lastUpdateDate = comment.getLastEvent().getDate();
- else
- lastUpdateDate = comment.getDate();
- cellItem.add(AttributeAppender.append("class",
- comment.isVisitedAfter(lastUpdateDate)?"comment":"comment new"));
- }
-
- });
-
- IDataProvider<CodeComment> dataProvider = new IDataProvider<CodeComment>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Iterator<? extends CodeComment> iterator(long first, long count) {
- DepotPage page = (DepotPage) getPage();
-
- if (getPullRequest() != null) {
- List<CodeComment> comments = new ArrayList<>(getPullRequest().getCodeComments());
- filterOptionModel.getObject().filter(comments);
- return comments.iterator();
- } else {
- EntityCriteria<CodeComment> criteria = EntityCriteria.of(CodeComment.class);
- criteria.add(Restrictions.eq("depot", page.getDepot()));
- filterOptionModel.getObject().fill(criteria);
- criteria.addOrder(Order.desc("id"));
- return GitPlex.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator();
- }
- }
-
- @Override
- public long size() {
- DepotPage page = (DepotPage) getPage();
-
- if (getPullRequest() != null) {
- return getPullRequest().getCodeComments().size();
- } else {
- EntityCriteria<CodeComment> criteria = EntityCriteria.of(CodeComment.class);
- criteria.add(Restrictions.eq("depot", page.getDepot()));
- filterOptionModel.getObject().fill(criteria);
- return GitPlex.getInstance(Dao.class).count(criteria);
- }
- }
-
- @Override
- public IModel<CodeComment> model(CodeComment object) {
- Long commentId = object.getId();
- return new LoadableDetachableModel<CodeComment>() {
-
- @Override
- protected CodeComment load() {
- return GitPlex.getInstance(CodeCommentManager.class).load(commentId);
- }
-
- };
- }
-
- };
- DataTable<CodeComment, Void> dataTable = new DataTable<>("comments", columns,
- dataProvider, getPullRequest()!=null?Integer.MAX_VALUE:WebConstants.DEFAULT_PAGE_SIZE);
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
- dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {
-
- @Override
- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {
- return new BootstrapPagingNavigator(navigatorId, dataTable);
- }
-
- });
- add(dataTable);
-
- if (getPullRequest() != null && dataTable.getItemCount() > PullRequest.MAX_CODE_COMMENTS) {
- add(new Label("alert", "Too many code comments, only displaying " + PullRequest.MAX_CODE_COMMENTS));
- } else {
- add(new WebMarkupContainer("alert").setVisible(false));
- }
- }
-
- @Override
- protected void onDetach() {
- filterOptionModel.detach();
- super.onDetach();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CodeCommentListResourceReference()));
- }
-
- @Nullable
- protected abstract PullRequest getPullRequest();
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListResourceReference.java
deleted file mode 100644
index a47906d439..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gitplex.server.web.component.comment;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class CodeCommentListResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public CodeCommentListResourceReference() {
- super(CodeCommentListResourceReference.class, "code-comment-list.css");
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.html b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.html
index 6c820e5404..6f4aa1a54e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.html
@@ -1,5 +1,8 @@
<wicket:panel>
<div class="code-comment">
+ <a wicket:id="outdatedContext" class="outdated-context">
+ <i class="fa fa-warning"></i> comment context out dated, click to update
+ </a>
<div wicket:id="comment" class="comment section"></div>
<div wicket:id="activities" class="reply section"></div>
<div wicket:id="addReply" class="add-reply"></div>
@@ -13,7 +16,6 @@
<span wicket:id="activityDescription" class="description"></span>
<span wicket:id="activityDate" class="date"></span>
</span>
- <a wicket:id="compareContext" class="compare-context pull-right"><i class="fa fa-chain-broken"></i></a>
</div>
<div class="body">
<div wicket:id="content"></div>
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
index 0017b2f800..fc73425866 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentPanel.java
@@ -20,6 +20,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -42,10 +43,7 @@ import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.CodeCommentReply;
import com.gitplex.server.model.CodeCommentStatusChange;
import com.gitplex.server.model.Depot;
-import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.CodeCommentActivity;
-import com.gitplex.server.model.support.CompareContext;
-import com.gitplex.server.model.support.DepotAndRevision;
import com.gitplex.server.persistence.dao.Dao;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.ClassUtils;
@@ -54,7 +52,7 @@ import com.gitplex.server.web.component.link.AccountLink;
import com.gitplex.server.web.component.markdown.AttachmentSupport;
import com.gitplex.server.web.component.markdown.ContentVersionSupport;
import com.gitplex.server.web.component.markdown.MarkdownViewer;
-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
+import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
import com.gitplex.server.web.util.DateUtils;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
@@ -108,56 +106,6 @@ public abstract class CodeCommentPanel extends Panel {
commentContainer.add(new AccountLink("userName", userForDisplay));
commentContainer.add(new Label("activityDescription", "commented"));
commentContainer.add(new Label("activityDate", DateUtils.formatAge(getComment().getDate())));
- commentContainer.add(new Link<Void>("compareContext") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!getCompareContext(getComment()).equals(getComment().getCompareContext())
- && !getComment().getCommentPos().getCommit().equals(getComment().getCompareContext().getCompareCommit()));
- }
-
- @Override
- public void onClick() {
- CodeComment comment = getComment();
- CompareContext compareContext = comment.getCompareContext();
- PullRequest request = getPullRequest();
- if (request != null) {
- RequestChangesPage.State state = new RequestChangesPage.State();
- state.commentId = comment.getId();
- if (compareContext.isLeftSide()) {
- state.oldCommit = compareContext.getCompareCommit();
- state.newCommit = comment.getCommentPos().getCommit();
- } else {
- state.oldCommit = comment.getCommentPos().getCommit();
- state.newCommit = compareContext.getCompareCommit();
- }
- state.mark = comment.getCommentPos();
- state.pathFilter = compareContext.getPathFilter();
- state.whitespaceOption = compareContext.getWhitespaceOption();
- PageParameters params = RequestChangesPage.paramsOf(request, state);
- setResponsePage(RequestChangesPage.class, params);
- } else {
- RevisionComparePage.State state = new RevisionComparePage.State();
- state.commentId = comment.getId();
- state.compareWithMergeBase = false;
- if (compareContext.isLeftSide()) {
- state.leftSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());
- state.rightSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());
- } else {
- state.leftSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());
- state.rightSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());
- }
- state.mark = comment.getCommentPos();
- state.pathFilter = compareContext.getPathFilter();
- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
- state.whitespaceOption = compareContext.getWhitespaceOption();
- PageParameters params = RevisionComparePage.paramsOf(comment.getDepot(), state);
- setResponsePage(RevisionComparePage.class, params);
- }
- }
-
- }.add(AttributeAppender.append("title", "This comment is added in a different compare context, click to show")));
ContentVersionSupport contentVersionSupport;
if (SecurityUtils.canModify(getComment())) {
@@ -208,12 +156,12 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected AttachmentSupport getAttachmentSupport() {
- return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());
+ return new DepotAttachmentSupport(getComment().getRequest().getTargetDepot(), getComment().getUUID());
}
@Override
protected Depot getDepot() {
- return getComment().getDepot();
+ return getComment().getRequest().getTargetDepot();
}
@Override
@@ -336,57 +284,6 @@ public abstract class CodeCommentPanel extends Panel {
}
activityContainer.add(new Label("activityDescription", activityDescription));
activityContainer.add(new Label("activityDate", DateUtils.formatAge(activity.getDate())));
- activityContainer.add(new Link<Void>("compareContext") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!getCompareContext(getComment()).equals(identity.getActivity().getCompareContext())
- && !getComment().getCommentPos().getCommit().equals(identity.getActivity().getCompareContext().getCompareCommit()));
- }
-
- @Override
- public void onClick() {
- CodeCommentActivity activity = identity.getActivity();
- CompareContext compareContext = activity.getCompareContext();
- PullRequest request = getPullRequest();
- if (request != null) {
- RequestChangesPage.State state = new RequestChangesPage.State();
- state.commentId = activity.getComment().getId();
- if (compareContext.isLeftSide()) {
- state.oldCommit = compareContext.getCompareCommit();
- state.newCommit = activity.getComment().getCommentPos().getCommit();
- } else {
- state.oldCommit = activity.getComment().getCommentPos().getCommit();
- state.newCommit = compareContext.getCompareCommit();
- }
- state.mark = activity.getComment().getCommentPos();
- state.pathFilter = compareContext.getPathFilter();
- state.whitespaceOption = compareContext.getWhitespaceOption();
- PageParameters params = RequestChangesPage.paramsOf(request, state);
- setResponsePage(RequestChangesPage.class, params);
- } else {
- RevisionComparePage.State state = new RevisionComparePage.State();
- CodeComment comment = activity.getComment();
- state.commentId = comment.getId();
- state.compareWithMergeBase = false;
- if (compareContext.isLeftSide()) {
- state.leftSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());
- state.rightSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());
- } else {
- state.leftSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());
- state.rightSide = new DepotAndRevision(comment.getDepot(), compareContext.getCompareCommit());
- }
- state.mark = comment.getCommentPos();
- state.pathFilter = compareContext.getPathFilter();
- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
- state.whitespaceOption = compareContext.getWhitespaceOption();
- PageParameters params = RevisionComparePage.paramsOf(comment.getDepot(), state);
- setResponsePage(RevisionComparePage.class, params);
- }
- }
-
- }.add(AttributeAppender.append("title", "This reply is added in a different compare context, click to show")));
if (StringUtils.isNotBlank(activity.getNote())) {
ContentVersionSupport contentVersionSupport;
@@ -406,8 +303,6 @@ public abstract class CodeCommentPanel extends Panel {
@Override
public void detach() {
- // TODO Auto-generated method stub
-
}
@Override
@@ -450,12 +345,12 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected AttachmentSupport getAttachmentSupport() {
- return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());
+ return new DepotAttachmentSupport(getComment().getRequest().getTargetDepot(), getComment().getUUID());
}
@Override
protected Depot getDepot() {
- return getComment().getDepot();
+ return getComment().getRequest().getTargetDepot();
}
@Override
@@ -581,22 +476,51 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ PageParameters params = RequestChangesPage.paramsOf(getComment());
+ Link<Void> outdatedContextLink = new BookmarkablePageLink<Void>("outdatedContext", RequestChangesPage.class,
+ params) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ CodeComment comment = getComment();
+ if (getPage() instanceof DepotBlobPage) {
+ setVisible(comment.isCodeChanged());
+ } else if (getPage() instanceof RequestChangesPage) {
+ RequestChangesPage page = (RequestChangesPage) getPage();
+ if (page.getState().newCommit.equals(comment.getCommentPos().getCommit())) {
+ setVisible(comment.isCodeChanged());
+ } else {
+ setVisible(!comment.getRequest().getHeadCommitHash().equals(page.getState().newCommit));
+ }
+ }
+ }
+
+ };
+ outdatedContextLink.setOutputMarkupPlaceholderTag(true);
+ outdatedContextLink.add(new WebSocketRenderBehavior() {
+
+ @Override
+ protected void onRender(WebSocketRequestHandler handler) {
+ handler.add(outdatedContextLink);
+ }
+
+ });
+
+ add(outdatedContextLink);
add(newCommentContainer());
activitiesView = new RepeatingView("activities");
- PullRequest request = getPullRequest();
List<CodeCommentActivity> activities = new ArrayList<>();
for (CodeCommentReply reply: getComment().getReplies()) {
- if (request == null || request.getRequestComparingInfo(reply.getComparingInfo()) != null) {
- activities.add(reply);
- }
+ activities.add(reply);
}
for (CodeCommentStatusChange statusChange: getComment().getStatusChanges()) {
- if (request == null || request.getRequestComparingInfo(statusChange.getComparingInfo()) != null) {
- activities.add(statusChange);
- }
+ activities.add(statusChange);
}
activities.sort((o1, o2)->o1.getDate().compareTo(o2.getDate()));
@@ -630,17 +554,14 @@ public abstract class CodeCommentPanel extends Panel {
prevActivityMarkupId = get("comment").getMarkupId();
}
- PullRequest request = getPullRequest();
List<CodeCommentActivity> activities = new ArrayList<>();
for (CodeCommentReply reply: getComment().getReplies()) {
- if (reply.getDate().getTime()>lastActivityDate.getTime()
- && (request == null || request.getRequestComparingInfo(reply.getComparingInfo()) != null)) {
+ if (reply.getDate().getTime()>lastActivityDate.getTime()) {
activities.add(reply);
}
}
for (CodeCommentStatusChange statusChange: getComment().getStatusChanges()) {
- if (statusChange.getDate().getTime()>lastActivityDate.getTime()
- && (request == null || request.getRequestComparingInfo(statusChange.getComparingInfo()) != null)) {
+ if (statusChange.getDate().getTime()>lastActivityDate.getTime()) {
activities.add(statusChange);
}
}
@@ -685,12 +606,12 @@ public abstract class CodeCommentPanel extends Panel {
@Override
protected AttachmentSupport getAttachmentSupport() {
- return new DepotAttachmentSupport(getComment().getDepot(), getComment().getUUID());
+ return new DepotAttachmentSupport(getComment().getRequest().getTargetDepot(), getComment().getUUID());
}
@Override
protected Depot getDepot() {
- return getComment().getDepot();
+ return getComment().getRequest().getTargetDepot();
}
@Override
@@ -746,12 +667,10 @@ public abstract class CodeCommentPanel extends Panel {
Account user = SecurityUtils.getAccount();
CodeComment comment = getComment();
Date date = new Date();
- CompareContext compareContext = getCompareContext(comment);
if (changeStatus) {
CodeCommentStatusChange statusChange = new CodeCommentStatusChange();
statusChange.setComment(getComment());
statusChange.setUser(user);
- statusChange.setCompareContext(compareContext);
statusChange.setResolved(!comment.isResolved());
statusChange.setDate(date);
statusChange.setNote(contentInput.getModelObject());
@@ -765,7 +684,6 @@ public abstract class CodeCommentPanel extends Panel {
reply.setDate(date);
reply.setUser(user);
reply.setContent(contentInput.getModelObject());
- reply.setCompareContext(compareContext);
GitPlex.getInstance(CodeCommentReplyManager.class).save(reply, true);
onReplyAdded(target, fragment, reply);
}
@@ -825,10 +743,6 @@ public abstract class CodeCommentPanel extends Panel {
protected abstract void onSaveComment(AjaxRequestTarget target, CodeComment comment);
- protected abstract CompareContext getCompareContext(CodeComment comment);
-
- protected abstract PullRequest getPullRequest();
-
private static class ActivityIdentity implements Serializable {
final Class<? extends CodeCommentActivity> clazz;
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment-list.css b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment-list.css
deleted file mode 100644
index 3e6d332922..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment-list.css
+++ /dev/null
@@ -1,63 +0,0 @@
-.code-comments td.filter {
- width: 25%;
- border: 1px solid #DDD;
-}
-.code-comments td.filter>.head {
- font-size: 16px;
- border-bottom: 1px solid #DDD;
- padding: 8px 12px;
- background: #F2F2F2;
-}
-.code-comments td.filter>.body>.shortcuts {
- margin-bottom: 12px;
-}
-.code-comments td.filter>.body {
- padding: 12px;
-}
-.code-comments td.spacing {
- width: 20px;
-}
-.code-comments td.result {
- border: 1px solid #DDD;
-}
-.code-comments td.comment {
- color: #888;
- padding: 8px 8px 0 8px;
- border-left: 4px solid white;
-}
-.code-comments td.comment.new {
- border-left: 4px solid #4667EE;
-}
-.code-comments td.comment>div {
- padding-bottom: 8px;
- border-bottom: 1px dotted #BBB;
-}
-.code-comments td.result tr:last-child td.comment>div {
- border-bottom: none;
-}
-
-.code-comments td.comment a.title {
- font-weight: bold;
- font-size: 16px;
- color: #444;
- margin-right: 4px;
-}
-.code-comments td.comment .resolved {
- font-size: 18px;
- color: #24BE10;
-}
-.code-comments td.comment .user, .code-comments td.comment .file {
- color: #444;
-}
-.code-comments td.comment .second-line, .code-comments td.comment .third-line {
- margin-top: 2px;
-}
-.code-comments td.result .norecords-td {
- padding: 20px;
- font-size: 20px;
- text-align: center;
- font-style: italic;
-}
-.code-comments .alert {
- border-radius: 0;
-}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
index c6f41ae92b..1e282c1eef 100644
--- a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
+++ b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css
@@ -1,3 +1,13 @@
+.code-comment>.outdated-context {
+ color: #8a6d3b;
+ display: block;
+ font-weight: bold;
+ margin: 0 0 12px 8px;
+ padding: 8px;
+ border-radius: 4px;
+ background: #fcf8e3;
+ border: 1px solid #faebcc;
+}
.code-comment>.section {
position: relative;
margin-left: -12px;
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.html b/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.html
deleted file mode 100644
index 27cba32468..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<wicket:panel>
- <div wicket:id="content"></div>
- <wicket:fragment wicket:id="requestFrag">
- <ul class="compare-context list-unstyled">
- <li wicket:id="commits">
- <a wicket:id="link">
- <span class="fa fa-ext fa-commit icon"></span>
- <span wicket:id="hash" class="hash"></span>
- <span wicket:id="subject" class="subject"></span>
- <span wicket:id="commented" class="fa fa-commenting" title="Comment is associated with this commit "></span>
- </a>
- </li>
- </ul>
- </wicket:fragment>
-</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java
deleted file mode 100644
index 2f3946c734..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextPanel.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package com.gitplex.server.web.component.comment.comparecontext;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import com.gitplex.server.git.GitUtils;
-import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.Depot;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.support.DepotAndRevision;
-import com.gitplex.server.util.diff.WhitespaceOption;
-import com.gitplex.server.web.component.revisionpicker.RevisionSelector;
-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-
-@SuppressWarnings("serial")
-public class CompareContextPanel extends Panel {
-
- private final IModel<PullRequest> requestModel;
-
- private final IModel<CodeComment> commentModel;
-
- private final IModel<WhitespaceOption> whitespaceOptionModel;
-
- public CompareContextPanel(String id, IModel<PullRequest> requestModel, IModel<CodeComment> commentModel,
- IModel<WhitespaceOption> whitespaceOptionModel) {
- super(id);
- this.requestModel = requestModel;
- this.commentModel = commentModel;
- this.whitespaceOptionModel = whitespaceOptionModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- if (requestModel.getObject() != null) {
- Fragment fragment = new Fragment("content", "requestFrag", this);
- add(fragment);
-
- IModel<List<RevCommit>> commitsModel = new LoadableDetachableModel<List<RevCommit>>() {
-
- @Override
- protected List<RevCommit> load() {
- List<RevCommit> commits = new ArrayList<>();
- PullRequest request = requestModel.getObject();
- commits.add(request.getBaseCommit());
- commits.addAll(request.getCommits());
- return commits;
- }
-
- };
-
- fragment.add(new ListView<RevCommit>("commits", commitsModel) {
-
- @Override
- protected void populateItem(ListItem<RevCommit> item) {
- RevCommit commit = item.getModelObject();
- AjaxLink<Void> link = new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- RequestChangesPage.State state = new RequestChangesPage.State();
- CodeComment comment = commentModel.getObject();
- state.commentId = comment.getId();
- state.mark = comment.getCommentPos();
- int index = commitsModel.getObject().stream().map(RevCommit::getName).collect(Collectors.toList())
- .indexOf(comment.getCommentPos().getCommit());
- int compareIndex = commitsModel.getObject().indexOf(commit);
- if (index < compareIndex) {
- state.oldCommit = comment.getCommentPos().getCommit();
- state.newCommit = commit.name();
- } else {
- state.oldCommit = commit.name();
- state.newCommit = comment.getCommentPos().getCommit();
- }
- state.whitespaceOption = whitespaceOptionModel.getObject();
- PageParameters params = RequestChangesPage.paramsOf(requestModel.getObject(), state);
- setResponsePage(RequestChangesPage.class, params);
- }
-
- };
- link.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
- link.add(new Label("subject", commit.getShortMessage()));
- if (commit.name().equals(commentModel.getObject().getCommentPos().getCommit())) {
- link.setEnabled(false);
- link.add(AttributeAppender.append("class", "commented"));
- link.add(new WebMarkupContainer("commented"));
- } else {
- link.add(new WebMarkupContainer("commented").setVisible(false));
- }
- item.add(link);
- }
-
- });
- } else {
- add(new RevisionSelector("content", new AbstractReadOnlyModel<Depot>() {
-
- @Override
- public Depot getObject() {
- return commentModel.getObject().getDepot();
- }
-
- }) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, String revision) {
- RevisionComparePage.State state = new RevisionComparePage.State();
- CodeComment comment = commentModel.getObject();
- state.commentId = comment.getId();
- state.mark = comment.getCommentPos();
- state.compareWithMergeBase = false;
- state.leftSide = new DepotAndRevision(comment.getDepot(), comment.getCommentPos().getCommit());
- state.rightSide = new DepotAndRevision(comment.getDepot(), revision);
- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
- PageParameters params = RevisionComparePage.paramsOf(comment.getDepot(), state);
- setResponsePage(RevisionComparePage.class, params);
- }
-
- });
- }
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CompareContextResourceReference()));
- }
-
- @Override
- protected void onDetach() {
- commentModel.detach();
- requestModel.detach();
- whitespaceOptionModel.detach();
-
- super.onDetach();
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextResourceReference.java b/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextResourceReference.java
deleted file mode 100644
index f8aaeb2fcb..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/CompareContextResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gitplex.server.web.component.comment.comparecontext;
-
-import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
-
-public class CompareContextResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public CompareContextResourceReference() {
- super(CompareContextResourceReference.class, "compare-context.css");
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/compare-context.css b/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/compare-context.css
deleted file mode 100644
index 146dd3a1a4..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/comment/comparecontext/compare-context.css
+++ /dev/null
@@ -1,21 +0,0 @@
-.compare-context {
- margin-bottom: 0;
-}
-.compare-context a {
- text-decoration: none;
- display: block;
- color: #333;
- padding: 4px 8px;
- white-space: nowrap;
- font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;
-}
-.compare-context a:hover {
- background: #F2F2F2;
-}
-.compare-context a.commented {
- background: white;
- cursor: default;
-}
-.compare-context a .hash, .compare-context .icon {
- color: #666;
-}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
index 2e040347c4..be57443a67 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -73,7 +73,6 @@ import com.gitplex.server.web.component.diff.revision.DiffViewMode;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
-import com.gitplex.server.web.page.depot.blob.RequestCompareInfo;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
@@ -193,16 +192,9 @@ public class TextDiffPanel extends Panel implements SourceAware {
Depot depot = depotModel.getObject();
PullRequest request = requestModel.getObject();
- CodeComment comment;
- if (markSupport != null && markSupport.getOpenComment() != null) {
- comment = markSupport.getOpenComment();
- } else {
- comment = null;
- }
DepotBlobPage.State viewState = new DepotBlobPage.State(change.getBlobIdent());
- if (comment != null)
- viewState.commentId = comment.getId();
-
+
+ viewState.requestId = PullRequest.idOf(request);
PageParameters params = DepotBlobPage.paramsOf(depot, viewState);
actions.add(new ViewStateAwarePageLink<Void>("viewFile", DepotBlobPage.class, params));
@@ -220,16 +212,8 @@ public class TextDiffPanel extends Panel implements SourceAware {
BlobIdent blobIdent = new BlobIdent(request.getSourceBranch(), change.getPath(),
FileMode.REGULAR_FILE.getBits());
DepotBlobPage.State editState = new DepotBlobPage.State(blobIdent);
+ editState.requestId = request.getId();
editState.mode = Mode.EDIT;
- editState.requestCompareInfo = new RequestCompareInfo();
- editState.requestCompareInfo.requestId = request.getId();
- if (getPage() instanceof RequestChangesPage) {
- RequestChangesPage page = (RequestChangesPage) getPage();
- editState.requestCompareInfo.compareState = page.getState();
- } else {
- MergePreviewPage page = (MergePreviewPage) getPage();
- editState.requestCompareInfo.previewState = page.getState();
- }
PageParameters params = DepotBlobPage.paramsOf(request.getSourceDepot(), editState);
setResponsePage(DepotBlobPage.class, params);
}
@@ -314,9 +298,9 @@ public class TextDiffPanel extends Panel implements SourceAware {
params.getParameterValue("param1").toInt(),
params.getParameterValue("param2").toInt());
CommentPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7");
- script = String.format("gitplex.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', %s);",
+ script = String.format("gitplex.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', %s, %s);",
getMarkupId(), jsonOfPosition, getJson(mark), markSupport.getMarkUrl(mark),
- SecurityUtils.getAccount()!=null);
+ requestModel.getObject()!=null, SecurityUtils.getAccount()!=null);
target.appendJavaScript(script);
break;
case "addComment":
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
index ba86791c3f..693d425e5a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/text-diff.js
@@ -469,12 +469,12 @@ gitplex.server.textDiff = {
return $tooltip;
}, alignment);
},
- openSelectionPopover: function(containerId, position, mark, markUrl, loggedIn) {
+ openSelectionPopover: function(containerId, position, mark, markUrl, hasPullRequest, loggedIn) {
var $container = $("#" + containerId);
var $content = $("<div><a class='permanent'><i class='fa fa-link'></i> Permanent link of this selection</a>");
$content.children("a.permanent").attr("href", markUrl);
- if (loggedIn) {
+ if (hasPullRequest && loggedIn) {
$content.append("<a class='comment'><i class='fa fa-comment'></i> Add comment on this selection</a>");
$content.children("a.comment").click(function() {
if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0
@@ -484,7 +484,7 @@ gitplex.server.textDiff = {
$container.data("callback")("addComment", mark.leftSide,
mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);
});
- } else {
+ } else if (!loggedIn) {
$content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
index 65ffdd776a..bd53d6db84 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/BlobCommentSupport.java
@@ -17,8 +17,6 @@ public interface BlobCommentSupport extends Serializable {
@Nullable CommentPos getMark();
- @Nullable String getAnchor();
-
String getMarkUrl(CommentPos mark);
@Nullable CodeComment getOpenComment();
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
index 86850470e5..1bca42f52e 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/CommentSupport.java
@@ -13,8 +13,6 @@ public interface CommentSupport extends Serializable {
@Nullable CommentPos getMark();
- @Nullable String getAnchor();
-
void onMark(AjaxRequestTarget target, CommentPos mark);
String getMarkUrl(CommentPos mark);
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
index f67e59fc93..aeb24f1979 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.html
@@ -45,8 +45,6 @@
<div class="ui-resizable-handle ui-resizable-e"></div>
<div class="content">
<div wicket:id="head" class="head clearfix">
- <a wicket:id="context" class="pull-left context close" title="Show this comment by comparing with specified revision"><i class="fa fa-ext fa-file-diff"></i></a>
- <a wicket:id="permanent" class="pull-left permanent close" title="Permanent link of this comment"><i class="fa fa-link"></i></a>
<a wicket:id="locate" class="pull-left locate close"><i class="fa fa-hand-o-right"></i></a>
<a wicket:id="close" class="pull-left close" title="Hide comment"><i class="fa fa-times"></i></a>
<a wicket:id="toggleResolve" class="pull-right resolve"><i class="fa fa-check-circle"></i></a>
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index 7535e2fa68..66b42dc17b 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -43,6 +43,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.http.WebResponse;
@@ -68,7 +69,6 @@ import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.CommentPos;
-import com.gitplex.server.model.support.CompareContext;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.StringUtils;
import com.gitplex.server.util.diff.DiffUtils;
@@ -79,16 +79,15 @@ import com.gitplex.server.web.behavior.inputassist.InputAssistBehavior;
import com.gitplex.server.web.component.comment.CodeCommentPanel;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
-import com.gitplex.server.web.component.comment.comparecontext.CompareContextPanel;
import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;
import com.gitplex.server.web.component.diff.blob.SourceAware;
import com.gitplex.server.web.component.diff.diffstat.DiffStatBar;
import com.gitplex.server.web.component.floating.FloatingPanel;
-import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.menu.MenuItem;
import com.gitplex.server.web.component.menu.MenuLink;
import com.gitplex.server.web.util.SuggestionUtils;
import com.gitplex.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import com.gitplex.server.web.websocket.WebSocketRenderBehavior;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
@@ -341,13 +340,9 @@ public class RevisionDiffPanel extends Panel {
@Override
protected Collection<CodeComment> load() {
- if (commentSupport != null) {
- Collection<CodeComment> comments = GitPlex.getInstance(CodeCommentManager.class)
- .findAll(depotModel.getObject(), getOldCommit(), getNewCommit());
- if (requestModel.getObject() != null) {
- comments.retainAll(requestModel.getObject().getCodeComments());
- }
- return comments;
+ if (commentSupport != null && requestModel.getObject() != null) {
+ return GitPlex.getInstance(CodeCommentManager.class).findAll(requestModel.getObject(),
+ getOldCommit(), getNewCommit());
} else {
return new ArrayList<>();
}
@@ -429,9 +424,7 @@ public class RevisionDiffPanel extends Panel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- String anchor = getAnchor();
- String script = String.format("gitplex.server.revisionDiff.init(%s);", anchor!=null?"'"+anchor+"'":"undefined");
- response.render(OnDomReadyHeaderItem.forScript(script));
+ response.render(OnDomReadyHeaderItem.forScript("gitplex.server.revisionDiff.init();"));
}
};
@@ -715,11 +708,6 @@ public class RevisionDiffPanel extends Panel {
return null;
}
- @Override
- public String getAnchor() {
- return RevisionDiffPanel.this.getAnchor();
- }
-
@Override
public String getMarkUrl(CommentPos mark) {
return commentSupport.getMarkUrl(mark);
@@ -813,13 +801,11 @@ public class RevisionDiffPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- Depot depot = depotModel.getObject();
CodeComment comment = new CodeComment();
comment.setUUID(uuid);
- comment.setDepot(depot);
+ comment.setRequest(requestModel.getObject());
comment.setUser(SecurityUtils.getAccount());
comment.setCommentPos(commentPos);
- comment.setCompareContext(getCompareContext(comment.getCommentPos().getCommit()));
comment.setContent(contentInput.getModelObject());
GitPlex.getInstance(CodeCommentManager.class).save(comment);
@@ -831,21 +817,11 @@ public class RevisionDiffPanel extends Panel {
RevisionDiffPanel.this.onCommentDeleted(target, comment);
}
- @Override
- protected CompareContext getCompareContext(CodeComment comment) {
- return RevisionDiffPanel.this.getCompareContext(comment.getCommentPos().getCommit());
- }
-
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
target.add(commentContainer.get("head"));
}
- @Override
- protected PullRequest getPullRequest() {
- return requestModel.getObject();
- }
-
};
commentContainer.replace(commentPanel);
target.add(commentContainer);
@@ -925,21 +901,11 @@ public class RevisionDiffPanel extends Panel {
RevisionDiffPanel.this.onCommentDeleted(target, comment);
}
- @Override
- protected CompareContext getCompareContext(CodeComment comment) {
- return RevisionDiffPanel.this.getCompareContext(comment.getCommentPos().getCommit());
- }
-
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
target.add(commentContainer.get("head"));
}
- @Override
- protected PullRequest getPullRequest() {
- return requestModel.getObject();
- }
-
};
commentContainer.replace(commentPanel);
@@ -1007,28 +973,6 @@ public class RevisionDiffPanel extends Panel {
head.setOutputMarkupId(true);
commentContainer.add(head);
- head.add(new DropdownLink("context") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getOpenComment() != null);
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new CompareContextPanel(id, requestModel, new AbstractReadOnlyModel<CodeComment>() {
-
- @Override
- public CodeComment getObject() {
- return getOpenComment();
- }
-
- }, whitespaceOptionModel);
- }
-
- });
-
head.add(new AjaxLink<Void>("locate") {
@Override
@@ -1071,31 +1015,6 @@ public class RevisionDiffPanel extends Panel {
});
- // use this instead of bookmarkable link as we want to get the link
- // updated whenever we re-render the comment container
- AttributeAppender appender = AttributeAppender.append("href", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (getOpenComment() != null) {
- return commentSupport.getCommentUrl(getOpenComment());
- } else {
- return "";
- }
- }
-
- });
-
- head.add(new WebMarkupContainer("permanent") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getOpenComment() != null);
- }
-
- }.add(appender));
-
head.add(new AjaxLink<Void>("close") {
@Override
@@ -1158,7 +1077,7 @@ public class RevisionDiffPanel extends Panel {
}
}
- }.setOutputMarkupId(true));
+ });
boolean locatable = false;
CodeComment comment = getOpenComment();
@@ -1179,28 +1098,28 @@ public class RevisionDiffPanel extends Panel {
RevisionDiffPanel.this.onCommentDeleted(target, comment);
}
- @Override
- protected CompareContext getCompareContext(CodeComment comment) {
- return RevisionDiffPanel.this.getCompareContext(comment.getCommentPos().getCommit());
- }
-
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
target.add(commentContainer.get("head"));
}
- @Override
- protected PullRequest getPullRequest() {
- return requestModel.getObject();
- }
-
};
commentContainer.add(commentPanel);
} else {
commentContainer.add(new WebMarkupContainer(BODY_ID));
commentContainer.setVisible(false);
}
-
+
+ commentContainer.add(new WebSocketRenderBehavior() {
+
+ @Override
+ protected void onRender(WebSocketRequestHandler handler) {
+ if (commentContainer.isVisible())
+ handler.add(head);
+ }
+
+ });
+
return commentContainer;
}
@@ -1242,15 +1161,6 @@ public class RevisionDiffPanel extends Panel {
return null;
}
- @Nullable
- private String getAnchor() {
- if (commentSupport != null) {
- return commentSupport.getAnchor();
- } else {
- return null;
- }
- }
-
@Nullable
private SourceAware getSourceAware(String path) {
return diffsView.visitChildren(new IVisitor<Component, SourceAware>() {
@@ -1315,22 +1225,6 @@ public class RevisionDiffPanel extends Panel {
response.render(JavaScriptHeaderItem.forReference(new RevisionDiffResourceReference()));
}
- private CompareContext getCompareContext(String commitHash) {
- CompareContext compareContext = new CompareContext();
- String oldCommitHash = getOldCommit().name();
- String newCommitHash = getNewCommit().name();
- if (commitHash.equals(oldCommitHash)) {
- compareContext.setCompareCommit(newCommitHash);
- compareContext.setLeftSide(false);
- } else {
- compareContext.setCompareCommit(oldCommitHash);
- compareContext.setLeftSide(true);
- }
- compareContext.setPathFilter(pathFilterModel.getObject());
- compareContext.setWhitespaceOption(whitespaceOptionModel.getObject());
- return compareContext;
- }
-
private static class ChangesAndCount {
private final List<BlobChange> changes;
diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js b/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js
index ee37085bb2..38c19914e2 100644
--- a/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js
+++ b/web/src/main/java/com/gitplex/server/web/component/diff/revision/revision-diff.js
@@ -1,5 +1,5 @@
gitplex.server.revisionDiff = {
- init: function(anchor) {
+ init: function() {
var cookieName = "revisionDiff.showDiffStats";
var $body = $(".revision-diff>.body");
var $diffStats = $body.children(".diff-stats");
@@ -17,18 +17,6 @@ gitplex.server.revisionDiff = {
gitplex.server.revisionDiff.reposition();
});
gitplex.server.revisionDiff.reposition();
- if (anchor) {
- var $anchor = $("#"+anchor);
- if ($anchor.length != 0) {
- setTimeout(function() {
- var detailOffset = $(".revision-diff>.body>.detail").offset().top;
- if ($(window).scrollTop() <= detailOffset) {
- $(window).scrollTop(detailOffset);
- }
- $anchor.closest(".code-comment").parent().scrollIntoView($anchor);
- }, 10);
- }
- }
},
reposition: function(e) {
if ($(".revision-diff>.body>.detail").length == 0)
diff --git a/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java b/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java
index 4dbd06d258..4c2c0226b8 100644
--- a/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/link/BranchLink.java
@@ -1,5 +1,7 @@
package com.gitplex.server.web.component.link;
+import javax.annotation.Nullable;
+
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -7,6 +9,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import com.gitplex.server.git.BlobIdent;
+import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.DepotAndBranch;
import com.gitplex.server.web.page.depot.DepotPage;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
@@ -16,14 +19,15 @@ public class BranchLink extends ViewStateAwarePageLink<Void> {
private final DepotAndBranch depotAndBranch;
- public BranchLink(String id, DepotAndBranch depotAndBranch) {
- super(id, DepotBlobPage.class, paramsOf(depotAndBranch));
+ public BranchLink(String id, DepotAndBranch depotAndBranch, @Nullable PullRequest request) {
+ super(id, DepotBlobPage.class, paramsOf(depotAndBranch, request));
this.depotAndBranch = depotAndBranch;
}
- private static PageParameters paramsOf(DepotAndBranch depotAndBranch) {
+ private static PageParameters paramsOf(DepotAndBranch depotAndBranch, PullRequest request) {
BlobIdent blobIdent = new BlobIdent(depotAndBranch.getBranch(), null, FileMode.TREE.getBits());
DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);
+ state.requestId = PullRequest.idOf(request);
return DepotBlobPage.paramsOf(depotAndBranch.getDepot(), state);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
index 76f3ddddc2..1f01f5abed 100644
--- a/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/requestreviewer/ReviewerListPanel.java
@@ -24,11 +24,11 @@ import org.apache.wicket.model.LoadableDetachableModel;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.MarkdownManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.manager.ReviewInvitationManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.model.Review;
import com.gitplex.server.model.ReviewInvitation;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.ReviewStatus;
@@ -70,10 +70,10 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
PullRequest request = getPullRequest();
List<Account> reviewers = new ArrayList<>();
- List<PullRequestReview> reviews = new ArrayList<>(request.getReviewStatus().getEffectiveReviews().values());
+ List<Review> reviews = new ArrayList<>(request.getReviewStatus().getEffectiveReviews().values());
Collections.sort(reviews);
- for (PullRequestReview review: reviews)
+ for (Review review: reviews)
reviewers.add(review.getUser());
for (Account awaitingReviewer: request.getReviewStatus().getAwaitingReviewers())
@@ -91,7 +91,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
item.add(new AccountLink("name", item.getModelObject()));
PullRequest request = getPullRequest();
- PullRequestReview review = request.getReviewStatus().getEffectiveReviews().get(item.getModelObject());
+ Review review = request.getReviewStatus().getEffectiveReviews().get(item.getModelObject());
WebMarkupContainer result = new WebMarkupContainer("result");
if (review != null) {
@@ -197,7 +197,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
PullRequest request = getPullRequest();
Account reviewer = item.getModelObject();
- PullRequestReview review = request.getReviewStatus().getEffectiveReviews().get(reviewer);
+ Review review = request.getReviewStatus().getEffectiveReviews().get(reviewer);
setVisible(review != null
&& (reviewer.equals(SecurityUtils.getAccount())
|| SecurityUtils.canManage(request.getTargetDepot())));
@@ -208,7 +208,7 @@ public class ReviewerListPanel extends GenericPanel<PullRequest> {
PullRequest request = getPullRequest();
Account reviewer = item.getModelObject();
request.clearReviewStatus();
- GitPlex.getInstance(PullRequestReviewManager.class).delete(reviewer, request);
+ GitPlex.getInstance(ReviewManager.class).delete(reviewer, request);
reviewersModel.detach();
send(getPage(), Broadcast.BREADTH, new PullRequestChanged(target));
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java b/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java
index d11970d2ca..43b78b78a9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/account/tasks/TaskListPage.java
@@ -97,7 +97,7 @@ public class TaskListPage extends AccountLayoutPage {
String componentId, IModel<PullRequestTask> rowModel) {
PullRequest request = rowModel.getObject().getRequest();
Fragment fragment = new Fragment(componentId, "linkFrag", TaskListPage.this);
- fragment.add(new BranchLink("link", request.getTarget()));
+ fragment.add(new BranchLink("link", request.getTarget(), null));
cellItem.add(fragment);
}
@@ -111,7 +111,7 @@ public class TaskListPage extends AccountLayoutPage {
PullRequest request = rowModel.getObject().getRequest();
if (request.getSource() != null) {
Fragment fragment = new Fragment(componentId, "linkFrag", TaskListPage.this);
- fragment.add(new BranchLink("link", request.getSource()));
+ fragment.add(new BranchLink("link", request.getSource(), request));
cellItem.add(fragment);
} else {
cellItem.add(new Label(componentId, request.getSource().getFQN()));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
index 125734d055..c9d152998d 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/DepotPage.java
@@ -43,7 +43,6 @@ import com.gitplex.server.web.page.account.AccountPage;
import com.gitplex.server.web.page.account.overview.AccountOverviewPage;
import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.branches.DepotBranchesPage;
-import com.gitplex.server.web.page.depot.comments.DepotCommentsPage;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;
import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
@@ -144,8 +143,6 @@ public abstract class DepotPage extends AccountPage {
tabs.add(new DepotTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",
0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class));
- tabs.add(new DepotTab(Model.of("Code Comments"), "fa fa-fw fa-commenting",
- 0, DepotCommentsPage.class, DepotCommentsPage.class));
tabs.add(new DepotTab(Model.of("Compare"), "fa fa-fw fa-ext fa-file-diff", 0, RevisionComparePage.class));
if (SecurityUtils.canManage(getDepot()))
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
index ec64c14f6a..df17fcb260 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/BlobUploadPanel.java
@@ -27,7 +27,7 @@ import com.gitplex.server.git.exception.NotTreeException;
import com.gitplex.server.git.exception.ObjectAlreadyExistsException;
import com.gitplex.server.git.exception.ObsoleteCommitException;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.component.dropzonefield.DropzoneField;
@@ -85,7 +85,7 @@ abstract class BlobUploadPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- PullRequestReviewManager reviewManager = GitPlex.getInstance(PullRequestReviewManager.class);
+ ReviewManager reviewManager = GitPlex.getInstance(ReviewManager.class);
Map<String, BlobContent> newBlobs = new HashMap<>();
for (FileUpload upload: uploads) {
String blobPath = upload.getClientFileName();
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
index c5fb46e6f0..99db279433 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/DepotBlobPage.java
@@ -1,5 +1,7 @@
package com.gitplex.server.web.page.depot.blob;
+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
+
import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList;
@@ -17,7 +19,6 @@ import org.apache.shiro.util.ThreadContext;
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.event.IEvent;
@@ -56,7 +57,6 @@ import com.gitplex.server.manager.PullRequestManager;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.PullRequestUpdate;
import com.gitplex.server.model.support.TextRange;
import com.gitplex.server.persistence.UnitOfWork;
import com.gitplex.server.search.IndexManager;
@@ -87,8 +87,6 @@ import com.gitplex.server.web.page.depot.blob.search.advanced.AdvancedSearchPane
import com.gitplex.server.web.page.depot.blob.search.quick.QuickSearchPanel;
import com.gitplex.server.web.page.depot.blob.search.result.SearchResultPanel;
import com.gitplex.server.web.page.depot.commit.DepotCommitsPage;
-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.mergepreview.MergePreviewPage;
import com.gitplex.server.web.util.resource.RawBlobResourceReference;
import com.gitplex.server.web.websocket.CodeCommentChangedRegion;
import com.gitplex.server.web.websocket.CommitIndexedRegion;
@@ -106,7 +104,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
private static final String PARAM_PATH = "path";
- private static final String PARAM_REQUEST_COMPARE_INFO = "request_compare_info";
+ private static final String PARAM_REQUEST = "request";
private static final String PARAM_COMMENT = "comment";
@@ -116,8 +114,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
private static final String PARAM_MARK = "mark";
- private static final String PARAM_ANCHOR = "anchor";
-
private static final String REVISION_PICKER_ID = "revisionPicker";
private static final String BLOB_NAVIGATOR_ID = "blobNavigator";
@@ -164,11 +160,10 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
resolvedRevision = getDepot().getObjectId(state.blobIdent.revision);
state.mark = TextRange.of(params.get(PARAM_MARK).toString());
- state.anchor = params.get(PARAM_ANCHOR).toString();
- state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
+ state.requestId = params.get(PARAM_REQUEST).toOptionalLong();
- state.requestCompareInfo = RequestCompareInfo.fromString(params.get(PARAM_REQUEST_COMPARE_INFO).toString());
+ state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
state.query = params.get(PARAM_QUERY).toString();
@@ -317,6 +312,14 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
return null;
}
+ @Override
+ public PullRequest getPullRequest() {
+ if (state.requestId != null)
+ return GitPlex.getInstance(PullRequestManager.class).load(state.requestId);
+ else
+ return null;
+ }
+
private void newBlobNavigator(@Nullable AjaxRequestTarget target) {
Component blobNavigator = new BlobNavigator(BLOB_NAVIGATOR_ID, this);
if (target != null) {
@@ -606,51 +609,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
}
}
- private void showRequestChanges(AjaxRequestTarget target, ObjectId oldCommitId, ObjectId newCommitId) {
- if (state.requestCompareInfo.compareState != null) {
- RequestChangesPage.State changeState = SerializationUtils.clone(this.state.requestCompareInfo.compareState);
- changeState.newCommit = newCommitId.name();
- changeState.pathFilter = null;
- if (changeState.commentId != null) {
- CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(changeState.commentId);
- changeState.oldCommit = comment.getCommentPos().getCommit();
- } else {
- changeState.oldCommit = oldCommitId.name();
- }
- get(BLOB_CONTENT_ID).add(new WebSocketRenderBehavior() {
-
- @Override
- protected void onRender(WebSocketRequestHandler handler) {
- PullRequest request = GitPlex.getInstance(PullRequestManager.class)
- .load(DepotBlobPage.this.state.requestCompareInfo.requestId);
- for (PullRequestUpdate update: request.getUpdates()) {
- if (update.getHeadCommitHash().equals(newCommitId.name())) {
- setResponsePage(RequestChangesPage.class, RequestChangesPage.paramsOf(request, changeState));
- break;
- }
- }
- }
-
- });
- } else {
- get(BLOB_CONTENT_ID).add(new WebSocketRenderBehavior() {
-
- @Override
- protected void onRender(WebSocketRequestHandler handler) {
- PullRequest request = GitPlex.getInstance(PullRequestManager.class)
- .load(state.requestCompareInfo.requestId);
- for (PullRequestUpdate update: request.getUpdates()) {
- if (update.getHeadCommitHash().equals(newCommitId.name())) {
- setResponsePage(RequestChangesPage.class, MergePreviewPage.paramsOf(request));
- break;
- }
- }
- }
-
- });
- }
- }
-
private void pushState(AjaxRequestTarget target) {
PageParameters params = paramsOf(getDepot(), state);
CharSequence url = RequestCycle.get().urlFor(DepotBlobPage.class, params);
@@ -740,14 +698,14 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
response.render(OnLoadHeaderItem.forScript("gitplex.server.depotBlob.onWindowLoad();"));
}
- public static PageParameters paramsOf(Depot depot, CodeComment comment, @Nullable String anchor) {
+ public static PageParameters paramsOf(CodeComment comment) {
BlobIdent blobIdent = new BlobIdent(comment.getCommentPos().getCommit(), comment.getCommentPos().getPath(),
FileMode.REGULAR_FILE.getBits());
DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);
+ state.requestId = comment.getRequest().getId();
state.commentId = comment.getId();
state.mark = comment.getCommentPos().getRange();
- state.anchor = anchor;
- return paramsOf(depot, state);
+ return paramsOf(comment.getRequest().getTargetDepot(), state);
}
public static PageParameters paramsOf(Depot depot, BlobIdent blobIdent) {
@@ -763,10 +721,8 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
params.set(PARAM_PATH, state.blobIdent.path);
if (state.mark != null)
params.set(PARAM_MARK, state.mark.toString());
- if (state.anchor != null)
- params.set(PARAM_ANCHOR, state.anchor);
- if (state.requestCompareInfo != null)
- params.set(PARAM_REQUEST_COMPARE_INFO, state.requestCompareInfo.toString());
+ if (state.requestId != null)
+ params.set(PARAM_REQUEST, state.requestId);
if (state.commentId != null)
params.set(PARAM_COMMENT, state.commentId);
if (state.mode != Mode.VIEW)
@@ -845,11 +801,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
return state.mark;
}
- @Override
- public String getAnchor() {
- return state.anchor;
- }
-
@Override
public void onMark(AjaxRequestTarget target, TextRange mark) {
state.mark = mark;
@@ -860,7 +811,6 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
public String getMarkUrl(TextRange mark) {
State markState = SerializationUtils.clone(state);
markState.blobIdent.revision = resolvedRevision.name();
- markState.requestCompareInfo = null;
markState.commentId = null;
markState.mark = mark;
PageParameters params = paramsOf(getDepot(), markState);
@@ -879,6 +829,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
state.blobIdent = blobIdent;
state.mode = Mode.VIEW;
state.commentId = null;
+ state.requestId = null;
newSearchResult(target, null);
onResolvedRevisionChange(target);
} else {
@@ -948,14 +899,11 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
public Collection<WebSocketRegion> getWebSocketRegions() {
Collection<WebSocketRegion> regions = super.getWebSocketRegions();
regions.add(new CommitIndexedRegion(getDepot().getId(), getDepot().getRevCommit(resolvedRevision)));
+ if (state.requestId != null)
+ regions.add(new PullRequestChangedRegion(state.requestId));
if (state.commentId != null)
regions.add(new CodeCommentChangedRegion(state.commentId));
- /*
- * add below so that we can jump to request changes page after editing a file
- */
- if (state.requestCompareInfo != null)
- regions.add(new PullRequestChangedRegion(state.requestCompareInfo.requestId));
return regions;
}
@@ -965,16 +913,14 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
public BlobIdent blobIdent;
+ public Long requestId;
+
public Long commentId;
public TextRange mark;
- public String anchor;
-
public Mode mode = Mode.VIEW;
- public RequestCompareInfo requestCompareInfo;
-
public String query;
public State(BlobIdent blobIdent) {
@@ -989,34 +935,20 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
@Override
public void onModeChange(AjaxRequestTarget target, Mode mode) {
- if (state.mode == Mode.EDIT && mode == Mode.VIEW && state.requestCompareInfo != null) {
- PullRequest request = GitPlex.getInstance(PullRequestManager.class)
- .load(state.requestCompareInfo.requestId);
- if (state.requestCompareInfo.compareState != null) {
- PageParameters params = RequestChangesPage.paramsOf(request,
- state.requestCompareInfo.compareState);
- setResponsePage(RequestChangesPage.class, params);
- } else {
- PageParameters params = MergePreviewPage.paramsOf(request,
- state.requestCompareInfo.previewState);
- setResponsePage(MergePreviewPage.class, params);
+ /*
+ * User might be changing blob name when adding a file, and onModeChange will be called.
+ * In this case, we only need to re-create blob content
+ */
+ if (mode != Mode.ADD || state.mode != Mode.ADD) {
+ state.mode = mode;
+ pushState(target);
+ if (state.mode == Mode.VIEW || state.mode == Mode.EDIT || state.mode == Mode.ADD) {
+ newBlobNavigator(target);
+ newBlobOperations(target);
}
- } else {
- /*
- * User might be changing blob name when adding a file, and onModeChange will be called.
- * In this case, we only need to re-create blob content
- */
- if (mode != Mode.ADD || state.mode != Mode.ADD) {
- state.mode = mode;
- pushState(target);
- if (state.mode == Mode.VIEW || state.mode == Mode.EDIT || state.mode == Mode.ADD) {
- newBlobNavigator(target);
- newBlobOperations(target);
- }
- }
- newBlobContent(target);
- resizeWindow(target);
- }
+ }
+ newBlobContent(target);
+ resizeWindow(target);
}
@Override
@@ -1072,9 +1004,7 @@ public class DepotBlobPage extends DepotPage implements BlobRenderContext {
});
- if (state.requestCompareInfo != null) {
- showRequestChanges(target, oldCommit, newCommit);
- } else if (newBlobIdent != null) {
+ if (newBlobIdent != null) {
state.blobIdent = newBlobIdent;
state.mark = null;
state.commentId = null;
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/RequestCompareInfo.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/RequestCompareInfo.java
deleted file mode 100644
index ac4615691c..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/RequestCompareInfo.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.gitplex.server.web.page.depot.blob;
-
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.gitplex.server.model.support.CommentPos;
-import com.gitplex.server.util.diff.WhitespaceOption;
-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.mergepreview.MergePreviewPage;
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-
-public class RequestCompareInfo implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public Long requestId;
-
- public RequestChangesPage.State compareState;
-
- public MergePreviewPage.State previewState;
-
- @Override
- public String toString() {
- List<String> fields = new ArrayList<>();
- fields.add(requestId.toString());
- if (compareState != null) {
- fields.add("compare");
- fields.add(encode(compareState.anchor));
- fields.add(encode(compareState.blameFile));
- fields.add(encode(compareState.newCommit));
- fields.add(encode(compareState.oldCommit));
- fields.add(encode(compareState.pathFilter));
- if (compareState.commentId != null)
- fields.add(encode(compareState.commentId.toString()));
- else
- fields.add("");
- if (compareState.mark != null)
- fields.add(encode(compareState.mark.toString()));
- else
- fields.add("");
- if (compareState.whitespaceOption != null)
- fields.add(encode(compareState.whitespaceOption.name()));
- else
- fields.add("");
- } else {
- fields.add("preview");
- fields.add(encode(previewState.pathFilter));
- if (previewState.whitespaceOption != null)
- fields.add(encode(previewState.whitespaceOption.name()));
- else
- fields.add("");
- fields.add(encode(previewState.blameFile));
- }
- return Joiner.on("/").join(fields);
- }
-
- private static String encode(String value) {
- if (value != null) {
- try {
- return URLEncoder.encode(value, Charsets.UTF_8.name());
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- } else {
- return "";
- }
- }
-
- private static String decode(String value) {
- if (value.length() != 0) {
- try {
- return URLDecoder.decode(value, Charsets.UTF_8.name());
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- } else {
- return null;
- }
- }
-
- public static RequestCompareInfo fromString(@Nullable String str) {
- if (str != null) {
- List<String> fields = Splitter.on('/').splitToList(str);
- RequestCompareInfo compareInfo = new RequestCompareInfo();
- compareInfo.requestId = Long.valueOf(fields.get(0));
- if (fields.get(1).equals("compare")) {
- compareInfo.compareState = new RequestChangesPage.State();
- compareInfo.compareState.anchor = decode(fields.get(2));
- compareInfo.compareState.blameFile = decode(fields.get(3));
- compareInfo.compareState.newCommit = decode(fields.get(4));
- compareInfo.compareState.oldCommit = decode(fields.get(5));
- compareInfo.compareState.pathFilter = decode(fields.get(6));
- String value = decode(fields.get(7));
- if (value != null)
- compareInfo.compareState.commentId = Long.valueOf(value);
- compareInfo.compareState.mark = CommentPos.fromString(decode(fields.get(8)));
- compareInfo.compareState.whitespaceOption = WhitespaceOption.ofNullableName(decode(fields.get(9)));
- } else {
- compareInfo.previewState = new MergePreviewPage.State();
- compareInfo.previewState.pathFilter = decode(fields.get(2));
- compareInfo.previewState.whitespaceOption = WhitespaceOption.ofNullableName(decode(fields.get(3)));
- compareInfo.previewState.blameFile = decode(fields.get(4));
- return compareInfo;
- }
- return compareInfo;
- } else {
- return null;
- }
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java
index 071804da60..9cf6d1cbb1 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/BlobRenderContext.java
@@ -13,6 +13,7 @@ import com.gitplex.jsymbol.TokenPosition;
import com.gitplex.server.git.BlobIdent;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
+import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.TextRange;
import com.gitplex.server.search.hit.QueryHit;
@@ -21,15 +22,15 @@ public interface BlobRenderContext extends Serializable {
public enum Mode {VIEW, BLAME, ADD, EDIT, DELETE}
Depot getDepot();
+
+ @Nullable
+ PullRequest getPullRequest();
BlobIdent getBlobIdent();
@Nullable
TextRange getMark();
- @Nullable
- String getAnchor();
-
void onMark(AjaxRequestTarget target, TextRange mark);
String getMarkUrl(TextRange mark);
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
index b2e2fbe7ee..ff5b17ff33 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/commitoption/CommitOptionPanel.java
@@ -49,7 +49,7 @@ import com.gitplex.server.git.exception.NotTreeException;
import com.gitplex.server.git.exception.ObjectAlreadyExistsException;
import com.gitplex.server.git.exception.ObsoleteCommitException;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
@@ -318,7 +318,7 @@ public class CommitOptionPanel extends Panel {
Map<String, BlobContent> newBlobs = new HashMap<>();
if (newContentProvider != null) {
- if (!GitPlex.getInstance(PullRequestReviewManager.class).canModify(SecurityUtils.getAccount(), context.getDepot(),
+ if (!GitPlex.getInstance(ReviewManager.class).canModify(SecurityUtils.getAccount(), context.getDepot(),
context.getBlobIdent().revision, context.getNewPath())) {
CommitOptionPanel.this.error("Adding of file '" + context.getNewPath() + "' need to be reviewed. "
+ "Please submit pull request instead");
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
index 99d58c9d57..a1aea4e45e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.html
@@ -4,8 +4,6 @@
<div class="ui-resizable-handle ui-resizable-e"></div>
<div class="content">
<div wicket:id="head" class="head clearfix">
- <a wicket:id="context" class="pull-left context close" title="Show this comment by comparing with specified revision"><i class="fa fa-ext fa-file-diff"></i></a>
- <a wicket:id="permanent" class="pull-left permanent close" title="Permanent link of this comment"><i class="fa fa-link"></i></a>
<a wicket:id="locate" class="pull-left locate close" title="Locate marked text of this comment"><i class="fa fa-hand-o-right"></i></a>
<a wicket:id="close" class="pull-left close" title="Hide comment"><i class="fa fa-times"></i></a>
<a wicket:id="toggleResolve" class="pull-right resolve"><i class="fa fa-check-circle"></i></a>
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
index a995834448..badf5e3713 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/SourceViewPanel.java
@@ -71,9 +71,7 @@ import com.gitplex.server.git.command.BlameCommand;
import com.gitplex.server.manager.CodeCommentManager;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
-import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.CommentPos;
-import com.gitplex.server.model.support.CompareContext;
import com.gitplex.server.model.support.TextRange;
import com.gitplex.server.search.SearchManager;
import com.gitplex.server.search.hit.QueryHit;
@@ -83,9 +81,7 @@ import com.gitplex.server.web.behavior.blamemessage.BlameMessageBehavior;
import com.gitplex.server.web.component.comment.CodeCommentPanel;
import com.gitplex.server.web.component.comment.CommentInput;
import com.gitplex.server.web.component.comment.DepotAttachmentSupport;
-import com.gitplex.server.web.component.comment.comparecontext.CompareContextPanel;
import com.gitplex.server.web.component.floating.FloatingPanel;
-import com.gitplex.server.web.component.link.DropdownLink;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
import com.gitplex.server.web.component.menu.MenuItem;
import com.gitplex.server.web.component.modal.ModalLink;
@@ -93,7 +89,6 @@ import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.sourceformat.OptionChangeCallback;
import com.gitplex.server.web.component.sourceformat.SourceFormatPanel;
import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;
-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext;
import com.gitplex.server.web.page.depot.blob.render.BlobRenderContext.Mode;
import com.gitplex.server.web.page.depot.blob.render.view.BlobViewPanel;
@@ -129,8 +124,12 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
@Override
protected Collection<CodeComment> load() {
- return GitPlex.getInstance(CodeCommentManager.class).findAll(
- context.getDepot(), context.getCommit(), context.getBlobIdent().path);
+ if (context.getPullRequest() != null) {
+ return GitPlex.getInstance(CodeCommentManager.class).findAll(
+ context.getPullRequest(), context.getCommit(), context.getBlobIdent().path);
+ } else {
+ return new ArrayList<>();
+ }
}
};
@@ -255,45 +254,10 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
};
- commentContainer.add(new WebSocketRenderBehavior() {
-
- @Override
- protected void onRender(WebSocketRequestHandler handler) {
- if (commentContainer.isVisible()) {
- Component toggleResolve = commentContainer.get("head").get("toggleResolve");
- if (toggleResolve.isVisible())
- handler.add(toggleResolve);
- }
- }
-
- });
-
WebMarkupContainer head = new WebMarkupContainer("head");
head.setOutputMarkupId(true);
commentContainer.add(head);
- head.add(new DropdownLink("context") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(context.getOpenComment() != null);
- }
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- CompareContext compareContext = context.getOpenComment().getCompareContext();
- return new CompareContextPanel(id, Model.of((PullRequest)null), new AbstractReadOnlyModel<CodeComment>() {
-
- @Override
- public CodeComment getObject() {
- return context.getOpenComment();
- }
-
- }, Model.of(compareContext.getWhitespaceOption()));
- }
-
- });
head.add(new AjaxLink<Void>("locate") {
@Override
@@ -318,35 +282,6 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
});
- // use this instead of bookmarkable link as we want to get the link
- // updated whenever we re-render the comment container
- AttributeAppender appender = AttributeAppender.append("href", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (context.getOpenComment() != null) {
- BlobIdent blobIdent = new BlobIdent(context.getBlobIdent());
- blobIdent.revision = context.getCommit().name();
- DepotBlobPage.State state = new DepotBlobPage.State(blobIdent);
- state.commentId = context.getOpenComment().getId();
- state.mark = context.getOpenComment().getCommentPos().getRange();
- return urlFor(DepotBlobPage.class, DepotBlobPage.paramsOf(context.getDepot(), state)).toString();
- } else {
- return "";
- }
- }
-
- });
- head.add(new WebMarkupContainer("permanent") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(context.getOpenComment() != null);
- }
-
- }.add(appender));
-
head.add(new AjaxLink<Void>("close") {
@Override
@@ -404,10 +339,12 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
}
}
- }.setOutputMarkupId(true));
+ });
commentContainer.setOutputMarkupPlaceholderTag(true);
- if (context.getOpenComment() != null && context.getOpenComment().getCommentPos().getCommit().equals(context.getCommit().name())) {
+
+ if (context.getOpenComment() != null
+ && context.getOpenComment().getCommentPos().getCommit().equals(context.getCommit().name())) {
CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, context.getOpenComment().getId()) {
@Override
@@ -415,27 +352,28 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
SourceViewPanel.this.onCommentDeleted(target, comment);
}
- @Override
- protected CompareContext getCompareContext(CodeComment comment) {
- return SourceViewPanel.this.getCompareContext();
- }
-
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
target.add(commentContainer.get("head"));
}
- @Override
- protected PullRequest getPullRequest() {
- return null;
- }
-
};
commentContainer.add(commentPanel);
} else {
commentContainer.add(new WebMarkupContainer(BODY_ID));
commentContainer.setVisible(false);
}
+
+ commentContainer.add(new WebSocketRenderBehavior() {
+
+ @Override
+ protected void onRender(WebSocketRequestHandler handler) {
+ if (commentContainer.isVisible())
+ handler.add(head);
+ }
+
+ });
+
add(commentContainer);
add(ajaxBehavior = new AbstractPostAjaxBehavior() {
@@ -446,8 +384,8 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
switch(params.getParameterValue("action").toString()) {
case "openSelectionPopover":
TextRange mark = getMark(params, "param1", "param2", "param3", "param4");
- String script = String.format("gitplex.server.sourceView.openSelectionPopover(%s, '%s', %s);",
- getJson(mark), context.getMarkUrl(mark),
+ String script = String.format("gitplex.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);",
+ getJson(mark), context.getMarkUrl(mark), context.getPullRequest()!=null,
SecurityUtils.getAccount()!=null);
target.appendJavaScript(script);
break;
@@ -527,10 +465,9 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
comment.getCommentPos().setCommit(context.getCommit().name());
comment.getCommentPos().setPath(context.getBlobIdent().path);
comment.setContent(contentInput.getModelObject());
- comment.setDepot(context.getDepot());
+ comment.setRequest(context.getPullRequest());
comment.setUser(SecurityUtils.getAccount());
comment.getCommentPos().setRange(mark);
- comment.setCompareContext(getCompareContext());
GitPlex.getInstance(CodeCommentManager.class).save(comment);
@@ -541,21 +478,11 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
SourceViewPanel.this.onCommentDeleted(target, comment);
}
- @Override
- protected CompareContext getCompareContext(CodeComment comment) {
- return SourceViewPanel.this.getCompareContext();
- }
-
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
target.add(commentContainer.get("head"));
}
- @Override
- protected PullRequest getPullRequest() {
- return null;
- }
-
};
commentContainer.replace(commentPanel);
target.add(commentContainer);
@@ -587,21 +514,11 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
SourceViewPanel.this.onCommentDeleted(target, comment);
}
- @Override
- protected CompareContext getCompareContext(CodeComment comment) {
- return SourceViewPanel.this.getCompareContext();
- }
-
@Override
protected void onSaveComment(AjaxRequestTarget target, CodeComment comment) {
target.add(commentContainer.get("head"));
}
- @Override
- protected PullRequest getPullRequest() {
- return null;
- }
-
};
commentContainer.replace(commentPanel);
commentContainer.setVisible(true);
@@ -858,13 +775,6 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
return jsonOfBlameInfos;
}
- private CompareContext getCompareContext() {
- CompareContext compareContext = new CompareContext();
- compareContext.setCompareCommit(context.getCommit().name());
- compareContext.setPathFilter(context.getBlobIdent().path);
- return compareContext;
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -906,7 +816,7 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
explicit("action"), explicit("param1"), explicit("param2"),
explicit("param3"), explicit("param4"));
String script = String.format("gitplex.server.sourceView.onDomReady('%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",
@@ -917,8 +827,6 @@ public class SourceViewPanel extends BlobViewPanel implements MarkSupport, Searc
jsonOfCommentInfos,
callback,
blameMessageBehavior.getCallback(),
- SecurityUtils.getAccount()!=null,
- context.getAnchor()!=null?"'"+context.getAnchor()+"'":"undefined",
sourceFormat.getTabSize(),
sourceFormat.getLineWrapMode());
response.render(OnDomReadyHeaderItem.forScript(script));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
index 6a476a715d..5bcdbad8d3 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/blob/render/renderers/source/source-view.js
@@ -1,7 +1,7 @@
gitplex.server.sourceView = {
onDomReady: function(filePath, fileContent, openComment, mark, symbolTooltipId,
revision, blameInfos, comments, callback, blameMessageCallback,
- loggedIn, anchor, tabSize, lineWrapMode) {
+ tabSize, lineWrapMode) {
var $sourceView = $(".source-view");
var $code = $sourceView.children(".code");
@@ -326,14 +326,14 @@ gitplex.server.sourceView = {
}
cm.setGutterMarker(parseInt(line), "CodeMirror-comments", $gutter[0]);
},
- openSelectionPopover: function(mark, markUrl, loggedIn) {
+ openSelectionPopover: function(mark, markUrl, hasPullRequest, loggedIn) {
var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror;
var ch = (mark.beginChar + mark.endChar)/2;
var position = cm.charCoords({line:mark.beginLine, ch:ch});
var $content = $("<div><a class='permanent'><i class='fa fa-link'></i> Permanent link of this selection</a>");
$content.children("a.permanent").attr("href", markUrl);
- if (loggedIn) {
+ if (hasPullRequest && loggedIn) {
$content.append("<a class='comment'><i class='fa fa-comment'></i> Add comment on this selection</a>");
$content.children("a.comment").click(function() {
if ($(".source-view").find("form.dirty").length != 0
@@ -343,7 +343,7 @@ gitplex.server.sourceView = {
var callback = $(".source-view").data("callback");
callback("addComment", mark.beginLine, mark.beginChar, mark.endLine, mark.endChar);
});
- } else {
+ } else if (!loggedIn) {
$content.append("<span class='comment'><i class='fa fa-warning'></i> Log in to comment on selection</span>");
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java
deleted file mode 100644
index 7b73025ef7..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/CodeCommentPage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.gitplex.server.web.page.depot.comments;
-
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.gitplex.server.GitPlex;
-import com.gitplex.server.manager.CodeCommentManager;
-import com.gitplex.server.model.CodeComment;
-import com.gitplex.server.model.CodeCommentRelation;
-import com.gitplex.server.model.support.CompareContext;
-import com.gitplex.server.web.page.depot.DepotPage;
-import com.gitplex.server.web.page.depot.blob.DepotBlobPage;
-import com.gitplex.server.web.page.depot.compare.RevisionComparePage;
-import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-
-@SuppressWarnings("serial")
-public class CodeCommentPage extends DepotPage {
-
- private static final String PARAM_COMMENT = "comment";
-
- private static final String PARAM_REQUEST = "request";
-
- private static final String PARAM_ANCHOR = "anchor";
-
- public CodeCommentPage(PageParameters params) {
- super(params);
-
- Long requestId = params.get(PARAM_REQUEST).toOptionalLong();
- Long commentId = params.get(PARAM_COMMENT).toLong();
- String anchor = params.get(PARAM_ANCHOR).toString();
-
- CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(commentId);
- for (CodeCommentRelation relation: comment.getRelations()) {
- if (relation.getRequest().getId().equals(requestId)) {
- params = RequestChangesPage.paramsOf(relation.getRequest(), comment, anchor);
- throw new RestartResponseException(RequestChangesPage.class, params);
- }
- }
- CompareContext compareContext = comment.getLastCompareContext();
- if (!compareContext.getCompareCommit().equals(comment.getCommentPos().getCommit())) {
- throw new RestartResponseException(
- RevisionComparePage.class,
- RevisionComparePage.paramsOf(getDepot(), comment, anchor));
- } else {
- throw new RestartResponseException(
- DepotBlobPage.class,
- DepotBlobPage.paramsOf(getDepot(), comment, anchor));
- }
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.html
deleted file mode 100644
index 23c8c00c1b..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<wicket:extend>
- <div wicket:id="codeComments" id="depot-comments"></div>
-</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java
deleted file mode 100644
index ad11f2370b..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsPage.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.gitplex.server.web.page.depot.comments;
-
-import java.util.List;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.gitplex.server.GitPlex;
-import com.gitplex.server.manager.CodeCommentInfoManager;
-import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.web.component.comment.CodeCommentAware;
-import com.gitplex.server.web.component.comment.CodeCommentFilter;
-import com.gitplex.server.web.component.comment.CodeCommentListPanel;
-import com.gitplex.server.web.page.depot.DepotPage;
-
-@SuppressWarnings("serial")
-public class DepotCommentsPage extends DepotPage implements CodeCommentAware {
-
- private final CodeCommentFilter filterOption;
-
- private final List<String> commentedFiles;
-
- public DepotCommentsPage(PageParameters params) {
- super(params);
-
- filterOption = new CodeCommentFilter(params);
-
- commentedFiles = GitPlex.getInstance(CodeCommentInfoManager.class).getCommentedFiles(getDepot());
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new CodeCommentListPanel("codeComments", new IModel<CodeCommentFilter>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public CodeCommentFilter getObject() {
- return filterOption;
- }
-
- @Override
- public void setObject(CodeCommentFilter object) {
- PageParameters params = paramsOf(getDepot());
- object.fillPageParams(params);
- setResponsePage(DepotCommentsPage.class, params);
- }
-
- }) {
-
- @Override
- protected PullRequest getPullRequest() {
- return null;
- }
-
- });
- }
-
- @Override
- public List<String> getCommentedFiles() {
- return commentedFiles;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new DepotCommentsResourceReference()));
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsResourceReference.java
deleted file mode 100644
index c3306ecec1..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/DepotCommentsResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.gitplex.server.web.page.depot.comments;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class DepotCommentsResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public DepotCommentsResourceReference() {
- super(DepotCommentsResourceReference.class, "depot-comments.css");
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/comments/depot-comments.css b/web/src/main/java/com/gitplex/server/web/page/depot/comments/depot-comments.css
deleted file mode 100644
index 625d4dbd34..0000000000
--- a/web/src/main/java/com/gitplex/server/web/page/depot/comments/depot-comments.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#depot-comments {
- padding: 20px;
-}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
index 4f9b93eefb..396143b9a1 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/commit/CommitDetailPage.java
@@ -547,9 +547,4 @@ public class CommitDetailPage extends DepotPage implements CommentSupport {
return objectIdCache;
}
- @Override
- public String getAnchor() {
- return null;
- }
-
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
index 45b18451c4..125177d0ab 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/compare/RevisionComparePage.java
@@ -38,7 +38,6 @@ import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.support.CommentPos;
-import com.gitplex.server.model.support.CompareContext;
import com.gitplex.server.model.support.DepotAndBranch;
import com.gitplex.server.model.support.DepotAndRevision;
import com.gitplex.server.util.diff.WhitespaceOption;
@@ -90,8 +89,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
private static final String PARAM_MARK = "mark";
- private static final String PARAM_ANCHOR = "anchor";
-
private static final String PARAM_PATH_FILTER = "path-filter";
private static final String PARAM_BLAME_FILE = "blame-file";
@@ -116,26 +113,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
private Tabbable tabbable;
- public static PageParameters paramsOf(Depot depot, CodeComment comment, @Nullable String anchor) {
- RevisionComparePage.State state = new RevisionComparePage.State();
- state.commentId = comment.getId();
- state.mark = comment.getCommentPos();
- state.anchor = anchor;
- state.compareWithMergeBase = false;
- CompareContext compareContext = comment.getLastCompareContext();
- if (compareContext.isLeftSide()) {
- state.leftSide = new DepotAndRevision(depot, compareContext.getCompareCommit());
- state.rightSide = new DepotAndRevision(depot, comment.getCommentPos().getCommit());
- } else {
- state.leftSide = new DepotAndRevision(depot, comment.getCommentPos().getCommit());
- state.rightSide = new DepotAndRevision(depot, compareContext.getCompareCommit());
- }
- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
- state.whitespaceOption = compareContext.getWhitespaceOption();
- state.pathFilter = compareContext.getPathFilter();
- return paramsOf(depot, state);
- }
-
public static PageParameters paramsOf(Depot depot, State state) {
PageParameters params = paramsOf(depot);
params.set(PARAM_LEFT, state.leftSide.toString());
@@ -151,8 +128,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
params.set(PARAM_COMMENT, state.commentId);
if (state.mark != null)
params.set(PARAM_MARK, state.mark.toString());
- if (state.anchor != null)
- params.set(PARAM_ANCHOR, state.anchor);
if (state.tabPanel != null)
params.set(PARAM_TAB, state.tabPanel.name());
return params;
@@ -199,7 +174,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
state.mark = CommentPos.fromString(params.get(PARAM_MARK).toString());
- state.anchor = params.get(PARAM_ANCHOR).toString();
state.tabPanel = TabPanel.of(params.get(PARAM_TAB).toString());
@@ -681,9 +655,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
@Nullable
public CommentPos mark;
- @Nullable
- public String anchor;
-
public State() {
}
@@ -696,7 +667,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
blameFile = state.blameFile;
commentId = state.commentId;
mark = state.mark;
- anchor = state.anchor;
tabPanel = state.tabPanel;
}
@@ -707,11 +677,6 @@ public class RevisionComparePage extends DepotPage implements CommentSupport {
return state.mark;
}
- @Override
- public String getAnchor() {
- return state.anchor;
- }
-
@Override
public String getMarkUrl(CommentPos mark) {
State markState = new State();
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
index 40e6e6e879..b3831bdb61 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/newrequest/NewRequestPage.java
@@ -502,8 +502,8 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
private Fragment newAcceptedFrag() {
Fragment fragment = new Fragment("status", "mergedFrag", this);
- fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource()));
- fragment.add(new BranchLink("targetBranch", getPullRequest().getTarget()));
+ fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource(), null));
+ fragment.add(new BranchLink("targetBranch", getPullRequest().getTarget(), null));
fragment.add(new Link<Void>("swapBranches") {
@Override
@@ -783,9 +783,4 @@ public class NewRequestPage extends DepotPage implements CommentSupport {
this.mark = mark;
}
- @Override
- public String getAnchor() {
- return null;
- }
-
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
index 77f1178711..84e1faa842 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
@@ -6,10 +6,10 @@ import com.gitplex.server.GitPlex;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.manager.AccountManager;
import com.gitplex.server.manager.PullRequestManager;
-import com.gitplex.server.manager.PullRequestReviewManager;
+import com.gitplex.server.manager.ReviewManager;
import com.gitplex.server.model.Account;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.model.PullRequestReview;
+import com.gitplex.server.model.Review;
import com.gitplex.server.model.support.MergePreview;
import com.gitplex.server.security.SecurityUtils;
@@ -36,7 +36,7 @@ public enum PullRequestOperation {
@Override
public void operate(PullRequest request, String comment) {
- PullRequestReview review = new PullRequestReview();
+ Review review = new Review();
review.setApproved(true);
review.setAutoCheck(false);
review.setCheckMerged(false);
@@ -44,7 +44,7 @@ public enum PullRequestOperation {
review.setNote(comment);
review.setRequest(request);
review.setUser(SecurityUtils.getAccount());
- GitPlex.getInstance(PullRequestReviewManager.class).save(review);
+ GitPlex.getInstance(ReviewManager.class).save(review);
}
},
@@ -57,7 +57,7 @@ public enum PullRequestOperation {
@Override
public void operate(PullRequest request, String comment) {
- PullRequestReview review = new PullRequestReview();
+ Review review = new Review();
review.setApproved(false);
review.setAutoCheck(false);
review.setCheckMerged(false);
@@ -65,7 +65,7 @@ public enum PullRequestOperation {
review.setNote(comment);
review.setRequest(request);
review.setUser(SecurityUtils.getAccount());
- GitPlex.getInstance(PullRequestReviewManager.class).save(review);
+ GitPlex.getInstance(ReviewManager.class).save(review);
}
},
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
index 101fc143f5..ed88dc7604 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
@@ -387,9 +387,9 @@ public abstract class RequestDetailPage extends DepotPage {
Account.getForDisplay(request.getSubmitter(), request.getSubmitterName())));
statusAndBranchesContainer.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));
- statusAndBranchesContainer.add(new BranchLink("target", request.getTarget()));
+ statusAndBranchesContainer.add(new BranchLink("target", request.getTarget(), null));
if (request.getSourceDepot() != null) {
- statusAndBranchesContainer.add(new BranchLink("source", request.getSource()));
+ statusAndBranchesContainer.add(new BranchLink("source", request.getSource(), getPullRequest()));
} else {
statusAndBranchesContainer.add(new Label("source", "unknown") {
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java
index 7b0b601794..3db0410e82 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/UnresolvedCodeCommentsPanel.java
@@ -8,10 +8,8 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.gitplex.server.GitPlex;
import com.gitplex.server.manager.AccountManager;
-import com.gitplex.server.model.Account;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.web.component.comment.CodeCommentFilter;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;
@@ -28,25 +26,23 @@ class UnresolvedCodeCommentsPanel extends GenericPanel<PullRequest> {
PullRequest request = getModelObject();
- PageParameters params = RequestCodeCommentsPage.paramsOf(request);
- getFilter().fillPageParams(params);
+ PageParameters params = RequestCodeCommentsPage.paramsOf(request, getState());
add(new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, params));
}
- private CodeCommentFilter getFilter() {
- Account user = GitPlex.getInstance(AccountManager.class).getCurrent();
- CodeCommentFilter filter = new CodeCommentFilter();
- filter.setUnresolved(true);
- filter.setUserName(user.getName());
- return filter;
+ private RequestCodeCommentsPage.State getState() {
+ RequestCodeCommentsPage.State state = new RequestCodeCommentsPage.State();
+ state.setUnresolved(true);
+ state.setUserName(GitPlex.getInstance(AccountManager.class).getCurrent().getName());
+ return state;
}
-
+
@Override
protected void onConfigure() {
super.onConfigure();
Collection<CodeComment> comments = getModelObject().getCodeComments();
- getFilter().filter(comments);
+ getState().filter(comments);
setVisible(!comments.isEmpty());
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
index ba2cb693e1..ed97888604 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
@@ -32,7 +32,6 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.google.common.base.Preconditions;
import com.gitplex.server.GitPlex;
import com.gitplex.server.git.GitUtils;
import com.gitplex.server.manager.CodeCommentManager;
@@ -40,7 +39,6 @@ import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.Depot;
import com.gitplex.server.model.PullRequest;
import com.gitplex.server.model.PullRequestUpdate;
-import com.gitplex.server.model.support.CodeCommentActivity;
import com.gitplex.server.model.support.CommentPos;
import com.gitplex.server.util.diff.WhitespaceOption;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
@@ -72,8 +70,6 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
private static final String PARAM_MARK = "mark";
- private static final String PARAM_ANCHOR = "anchor";
-
private State state = new State();
private WebMarkupContainer head;
@@ -94,18 +90,42 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
public RequestChangesPage(PageParameters params) {
super(params);
+ state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
+ state.mark = CommentPos.fromString(params.get(PARAM_MARK).toString());
+
state.oldCommit = params.get(PARAM_OLD_COMMIT).toString();
- if (state.oldCommit == null)
- state.oldCommit = getPullRequest().getBaseCommitHash();
state.newCommit = params.get(PARAM_NEW_COMMIT).toString();
- if (state.newCommit == null)
- state.newCommit = getPullRequest().getHeadCommitHash();
state.pathFilter = params.get(PARAM_PATH_FILTER).toString();
state.blameFile = params.get(PARAM_BLAME_FILE).toString();
state.whitespaceOption = WhitespaceOption.ofNullableName(params.get(PARAM_WHITESPACE_OPTION).toString());
- state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
- state.mark = CommentPos.fromString(params.get(PARAM_MARK).toString());
- state.anchor = params.get(PARAM_ANCHOR).toString();
+
+ PullRequest request = getPullRequest();
+ if (state.commentId != null) {
+ CodeComment comment = GitPlex.getInstance(CodeCommentManager.class).load(state.commentId);
+ if (state.oldCommit == null && state.newCommit == null) {
+ String commentCommit = comment.getCommentPos().getCommit();
+ if (commentCommit.equals(request.getBaseCommitHash())) {
+ state.oldCommit = request.getBaseCommitHash();
+ state.newCommit = request.getHeadCommitHash();
+ } else if (comment.isCodeChanged()) {
+ state.oldCommit = commentCommit;
+ state.newCommit = request.getHeadCommitHash();
+ } else {
+ state.oldCommit = request.getBaseCommitHash();
+ state.newCommit = commentCommit;
+ }
+ } else {
+ if (state.oldCommit == null)
+ state.oldCommit = request.getBaseCommitHash();
+ if (state.newCommit == null)
+ state.newCommit = request.getHeadCommitHash();
+ }
+ } else {
+ if (state.oldCommit == null)
+ state.oldCommit = request.getBaseCommitHash();
+ if (state.newCommit == null)
+ state.newCommit = request.getHeadCommitHash();
+ }
}
private int getCommitIndex(String commitHash) {
@@ -337,26 +357,12 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
return paramsOf(request, state);
}
- public static PageParameters paramsOf(PullRequest request, CodeComment comment, @Nullable String anchor) {
- PullRequest.ComparingInfo comparingInfo = null;
- for (int i=comment.getActivities().size()-1; i>=0; i--) {
- CodeCommentActivity activity = comment.getActivities().get(i);
- comparingInfo = request.getRequestComparingInfo(activity.getComparingInfo());
- if (comparingInfo != null)
- break;
- }
- if (comparingInfo == null) {
- comparingInfo = Preconditions.checkNotNull(request.getRequestComparingInfo(comment.getComparingInfo()));
- }
+ public static PageParameters paramsOf(CodeComment comment) {
RequestChangesPage.State state = new RequestChangesPage.State();
state.commentId = comment.getId();
state.mark = comment.getCommentPos();
- state.oldCommit = comparingInfo.getOldCommit();
- state.newCommit = comparingInfo.getNewCommit();
- state.pathFilter = comparingInfo.getPathFilter();
- state.whitespaceOption = comparingInfo.getWhitespaceOption();
- state.anchor = anchor;
- return paramsOf(request, state);
+ state.pathFilter = comment.getCommentPos().getPath();
+ return paramsOf(comment.getRequest(), state);
}
public static PageParameters paramsOf(PullRequest request, State state) {
@@ -376,8 +382,6 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
params.set(PARAM_COMMENT, state.commentId);
if (state.mark != null)
params.set(PARAM_MARK, state.mark.toString());
- if (state.anchor != null)
- params.set(PARAM_ANCHOR, state.anchor);
return params;
}
@@ -481,11 +485,6 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
return state.mark;
}
- @Override
- public String getAnchor() {
- return state.anchor;
- }
-
@Override
public String getMarkUrl(CommentPos mark) {
State markState = new State();
@@ -578,9 +577,6 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp
@Nullable
public CommentPos mark;
- @Nullable
- public String anchor;
-
}
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.java
new file mode 100644
index 0000000000..b70f4327ce
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsCssResourceReference.java
@@ -0,0 +1,13 @@
+package com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments;
+
+import com.gitplex.server.web.page.base.BaseDependentCssResourceReference;
+
+public class RequestCodeCommentsCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public RequestCodeCommentsCssResourceReference() {
+ super(RequestCodeCommentsCssResourceReference.class, "request-code-comments.css");
+ }
+
+}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html
index 25b5439916..df46724892 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html
@@ -1,3 +1,44 @@
<wicket:extend>
- <div wicket:id="codeComments"></div>
+ <table class="code-comments">
+ <tr>
+ <td class="filter">
+ <div class="head">Filter options</div>
+ <div class="body">
+ <div class="btn-group shortcuts">
+ <a wicket:id="myComments" class="btn btn-sm btn-default">My</a>
+ <a wicket:id="myUnresolvedComments" class="btn btn-sm btn-default">My unresolved</a>
+ <a wicket:id="unresolvedComments" class="btn btn-sm btn-default">Unresolved</a>
+ <a wicket:id="allComments" class="btn btn-sm btn-default">All</a>
+ </div>
+ <form wicket:id="filterForm">
+ <div wicket:id="editor" class="no-autofocus"></div>
+ <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Search</button>
+ </form>
+ </div>
+ </td>
+ <td class="spacing">&nbsp;</td>
+ <td class="result">
+ <div wicket:id="alert" class="alert alert-warning"></div>
+ <table wicket:id="comments"></table>
+ </td>
+ </tr>
+ </table>
+ <wicket:fragment wicket:id="commentFrag">
+ <div class="first-line">
+ <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
+ <span wicket:id="resolved" title="This comment is resolved" class="resolved fa fa-check-circle"></span>
+ </div>
+ <div class="second-line">
+ commented by
+ <a wicket:id="user" class="user"></a>
+ on
+ <a wicket:id="file" class="file"><span wicket:id="label"></span></a>
+ <span wicket:id="date"></span>
+ </div>
+ <div wicket:id="lastEvent" class="third-line">
+ <a wicket:id="user" class="user"></a>
+ <span wicket:id="description"></span>
+ <span wicket:id="date"></span>
+ </div>
+ </wicket:fragment>
</wicket:extend>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
index 69abc04eaa..d02a8f45c1 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
@@ -1,65 +1,305 @@
package com.gitplex.server.web.page.depot.pullrequest.requestdetail.codecomments;
+import java.io.Serializable;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
import java.util.List;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.core.request.handler.IPageRequestHandler;
+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.NavigationToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.hibernate.criterion.Restrictions;
+import com.gitplex.server.GitPlex;
+import com.gitplex.server.manager.CodeCommentManager;
+import com.gitplex.server.model.Account;
import com.gitplex.server.model.CodeComment;
import com.gitplex.server.model.PullRequest;
-import com.gitplex.server.web.component.comment.CodeCommentAware;
-import com.gitplex.server.web.component.comment.CodeCommentFilter;
-import com.gitplex.server.web.component.comment.CodeCommentListPanel;
+import com.gitplex.server.persistence.dao.EntityCriteria;
+import com.gitplex.server.security.SecurityUtils;
+import com.gitplex.server.util.StringUtils;
+import com.gitplex.server.util.editable.annotation.AccountChoice;
+import com.gitplex.server.util.editable.annotation.Editable;
+import com.gitplex.server.util.editable.annotation.FileChoice;
+import com.gitplex.server.util.stringmatch.WildcardUtils;
+import com.gitplex.server.web.WebConstants;
+import com.gitplex.server.web.component.link.AccountLink;
+import com.gitplex.server.web.editable.BeanContext;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
+import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
+import com.gitplex.server.web.util.DateUtils;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
@SuppressWarnings("serial")
-public class RequestCodeCommentsPage extends RequestDetailPage implements CodeCommentAware {
+public class RequestCodeCommentsPage extends RequestDetailPage {
- private final CodeCommentFilter filterOption;
+ private static final String PARAM_USER = "user";
+
+ private static final String PARAM_UNRESOLVED = "unresolved";
+
+ private static final String PARAM_PATH = "path";
+
+ private static final String PARAM_BEFORE = "before";
+
+ private static final String PARAM_AFTER = "after";
+
+ private static final int TITLE_LEN = 100;
+
+ private final State state;
private List<String> commentedFiles;
public RequestCodeCommentsPage(PageParameters params) {
super(params);
-
- filterOption = new CodeCommentFilter(params);
+
+ state = new State();
+ state.userName = params.get(PARAM_USER).toString();
+ state.unresolved = "yes".equals(params.get(PARAM_UNRESOLVED).toString());
+ state.path = params.get(PARAM_PATH).toString();
+
+ String value = params.get(PARAM_BEFORE).toString();
+ if (value != null)
+ state.before = new Date(Long.valueOf(value));
+
+ value = params.get(PARAM_AFTER).toString();
+ if (value != null)
+ state.after = new Date(Long.valueOf(value));
}
+ public static PageParameters paramsOf(PullRequest request, State state) {
+ PageParameters params = RequestDetailPage.paramsOf(request);
+
+ if (state.userName != null)
+ params.add(PARAM_USER, state.userName);
+ if (state.unresolved)
+ params.add(PARAM_UNRESOLVED, "yes");
+ if (state.path != null)
+ params.add(PARAM_PATH, state.path);
+ if (state.before != null)
+ params.add(PARAM_BEFORE, state.before.getTime());
+ if (state.after != null)
+ params.add(PARAM_AFTER, state.after.getTime());
+
+ return params;
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new Link<Void>("myComments") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.getAccount() != null);
+ }
- add(new CodeCommentListPanel("codeComments", new IModel<CodeCommentFilter>() {
+ @Override
+ public void onClick() {
+ State state = new State();
+ state.userName = SecurityUtils.getAccount().getName();
+ setResponsePage(RequestCodeCommentsPage.class, paramsOf(getPullRequest(), state));
+ }
+
+ });
+ add(new Link<Void>("myUnresolvedComments") {
@Override
- public void detach() {
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.getAccount() != null);
}
@Override
- public CodeCommentFilter getObject() {
- return filterOption;
+ public void onClick() {
+ State state = new State();
+ state.userName = SecurityUtils.getAccount().getName();
+ state.unresolved = true;
+ setResponsePage(RequestCodeCommentsPage.class, paramsOf(getPullRequest(), state));
}
+
+ });
+ add(new Link<Void>("unresolvedComments") {
@Override
- public void setObject(CodeCommentFilter object) {
+ public void onClick() {
+ State state = new State();
+ state.unresolved = true;
+ setResponsePage(RequestCodeCommentsPage.class, paramsOf(getPullRequest(), state));
+ }
+
+ });
+ add(new Link<Void>("allComments") {
+
+ @Override
+ public void onClick() {
PageParameters params = paramsOf(getPullRequest());
- object.fillPageParams(params);
setResponsePage(RequestCodeCommentsPage.class, params);
}
- }) {
+ });
+ Form<?> filterForm = new Form<Void>("filterForm") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ }
+
+ };
+ filterForm.add(BeanContext.editBean("editor", state));
+ add(filterForm);
+
+ List<IColumn<CodeComment, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Code Comment")) {
+
+ private void openComment(CodeComment comment) {
+ setResponsePage(RequestChangesPage.class, RequestChangesPage.paramsOf(comment));
+ }
@Override
- protected PullRequest getPullRequest() {
- return RequestCodeCommentsPage.this.getPullRequest();
+ public void populateItem(Item<ICellPopulator<CodeComment>> cellItem,
+ String componentId, IModel<CodeComment> rowModel) {
+ CodeComment comment = rowModel.getObject();
+ Fragment fragment = new Fragment(componentId, "commentFrag", RequestCodeCommentsPage.this);
+ Link<Void> titleLink = new Link<Void>("title") {
+
+ @Override
+ public void onClick() {
+ openComment(rowModel.getObject());
+ }
+
+ };
+ titleLink.add(new Label("label", StringUtils.abbreviate(comment.getContent(), TITLE_LEN)));
+ fragment.add(titleLink);
+ fragment.add(new WebMarkupContainer("resolved").setVisible(comment.isResolved()));
+ fragment.add(new AccountLink("user", Account.getForDisplay(comment.getUser(), comment.getUserName())));
+
+ Link<Void> fileLink = new Link<Void>("file") {
+
+ @Override
+ public void onClick() {
+ openComment(rowModel.getObject());
+ }
+
+ };
+ fileLink.add(new Label("label", comment.getCommentPos().getPath()));
+ fragment.add(fileLink);
+
+ fragment.add(new Label("date", DateUtils.formatAge(comment.getDate())));
+
+ WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");
+ if (comment.getLastEvent() != null) {
+ String description = comment.getLastEvent().getType();
+ lastEventContainer.add(new Label("description", description));
+
+ Account userForDisplay = Account.getForDisplay(comment.getLastEvent().getUser(),
+ comment.getLastEvent().getUserName());
+ lastEventContainer.add(new AccountLink("user", userForDisplay));
+ lastEventContainer.add(new Label("date", DateUtils.formatAge(comment.getLastEvent().getDate())));
+ } else {
+ lastEventContainer.add(new WebMarkupContainer("description"));
+ lastEventContainer.add(new WebMarkupContainer("user"));
+ lastEventContainer.add(new WebMarkupContainer("date"));
+ lastEventContainer.setVisible(false);
+ }
+ fragment.add(lastEventContainer);
+
+ cellItem.add(fragment);
+
+ Date lastUpdateDate;
+ if (comment.getLastEvent() != null)
+ lastUpdateDate = comment.getLastEvent().getDate();
+ else
+ lastUpdateDate = comment.getDate();
+ cellItem.add(AttributeAppender.append("class",
+ comment.isVisitedAfter(lastUpdateDate)?"comment":"comment new"));
+ }
+
+ });
+
+ IDataProvider<CodeComment> dataProvider = new IDataProvider<CodeComment>() {
+
+ @Override
+ public void detach() {
}
+ @Override
+ public Iterator<? extends CodeComment> iterator(long first, long count) {
+ List<CodeComment> comments = new ArrayList<>(getPullRequest().getCodeComments());
+ state.filter(comments);
+ return comments.iterator();
+ }
+
+ @Override
+ public long size() {
+ return getPullRequest().getCodeComments().size();
+ }
+
+ @Override
+ public IModel<CodeComment> model(CodeComment object) {
+ Long commentId = object.getId();
+ return new LoadableDetachableModel<CodeComment>() {
+
+ @Override
+ protected CodeComment load() {
+ return GitPlex.getInstance(CodeCommentManager.class).load(commentId);
+ }
+
+ };
+ }
+
+ };
+ DataTable<CodeComment, Void> dataTable = new DataTable<>("comments", columns,
+ dataProvider, getPullRequest()!=null?Integer.MAX_VALUE:WebConstants.DEFAULT_PAGE_SIZE);
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {
+
+ @Override
+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {
+ return new BootstrapPagingNavigator(navigatorId, dataTable);
+ }
+
});
+ add(dataTable);
+
+ if (getPullRequest() != null && dataTable.getItemCount() > PullRequest.MAX_CODE_COMMENTS) {
+ add(new Label("alert", "Too many code comments, only displaying " + PullRequest.MAX_CODE_COMMENTS));
+ } else {
+ add(new WebMarkupContainer("alert").setVisible(false));
+ }
}
@Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new RequestCodeCommentsCssResourceReference()));
+ }
+
public List<String> getCommentedFiles() {
if (commentedFiles == null) {
/*
@@ -76,4 +316,129 @@ public class RequestCodeCommentsPage extends RequestDetailPage implements CodeCo
return commentedFiles;
}
+ @Editable
+ public static class State implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String userName;
+
+ private boolean unresolved;
+
+ private String path;
+
+ private Date before;
+
+ private Date after;
+
+ @Editable(order=100, name="Created by", description="Choose the user who created the comment")
+ @AccountChoice
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ @Editable(order=200, name="Show unresolved only", description="Check this if you only want to show unresolved comments")
+ public boolean isUnresolved() {
+ return unresolved;
+ }
+
+ public void setUnresolved(boolean unresolved) {
+ this.unresolved = unresolved;
+ }
+
+ @Editable(order=500, name="Commented path", description="Show comments on specified path")
+ @FileChoice("getCommentedFiles")
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ @Editable(order=600, name="After date", description="Show comments after specified date")
+ public Date getAfter() {
+ return after;
+ }
+
+ public void setAfter(Date after) {
+ this.after = after;
+ }
+
+ @Editable(order=700, name="Before date", description="Show comments before specified date")
+ public Date getBefore() {
+ return before;
+ }
+
+ public void setBefore(Date before) {
+ this.before = before;
+ }
+
+ public void fill(EntityCriteria<CodeComment> criteria) {
+ if (userName != null)
+ criteria.createCriteria("user").add(Restrictions.eq("name", userName));
+ if (unresolved)
+ criteria.add(Restrictions.eq("resolved", false));
+ if (path != null) {
+ String pathQuery = path.replace('*', '%');
+ if (pathQuery.endsWith("/"))
+ pathQuery += "%";
+ criteria.add(Restrictions.ilike("commentPos.path", pathQuery));
+ }
+
+ if (before != null)
+ criteria.add(Restrictions.le("date", before));
+ if (after != null)
+ criteria.add(Restrictions.ge("date", after));
+ }
+
+ public void filter(Collection<CodeComment> comments) {
+ for (Iterator<CodeComment> it = comments.iterator(); it.hasNext();) {
+ CodeComment comment = it.next();
+ if (userName != null) {
+ if (comment.getUser() == null || !comment.getUser().getName().equals(userName)) {
+ it.remove();
+ continue;
+ }
+ }
+ if (unresolved && comment.isResolved()) {
+ it.remove();
+ continue;
+ }
+ if (path != null) {
+ if (comment.getCommentPos().getPath() == null) {
+ it.remove();
+ continue;
+ } else {
+ String matchWith = path;
+ if (matchWith.endsWith("/"))
+ matchWith += "*";
+ if (!WildcardUtils.matchString(matchWith, comment.getCommentPos().getPath())) {
+ it.remove();
+ continue;
+ }
+ }
+ }
+ if (before != null && comment.getDate().getTime()>before.getTime()) {
+ it.remove();
+ continue;
+ }
+ if (after != null && comment.getDate().getTime()<after.getTime()) {
+ it.remove();
+ continue;
+ }
+ }
+ }
+
+ @SuppressWarnings("unused")
+ private static List<String> getCommentedFiles() {
+ IPageRequestHandler handler = (IPageRequestHandler) RequestCycle.get().getActiveRequestHandler();
+ return ((RequestCodeCommentsPage)handler.getPage()).getCommentedFiles();
+ }
+
+ }
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/request-code-comments.css b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/request-code-comments.css
new file mode 100644
index 0000000000..293b7205e8
--- /dev/null
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/codecomments/request-code-comments.css
@@ -0,0 +1,63 @@
+#request-detail>.code-comments td.filter {
+ width: 25%;
+ border: 1px solid #DDD;
+}
+#request-detail>.code-comments td.filter>.head {
+ font-size: 16px;
+ border-bottom: 1px solid #DDD;
+ padding: 8px 12px;
+ background: #F2F2F2;
+}
+#request-detail>.code-comments td.filter>.body>.shortcuts {
+ margin-bottom: 12px;
+}
+#request-detail>.code-comments td.filter>.body {
+ padding: 12px;
+}
+#request-detail>.code-comments td.spacing {
+ width: 20px;
+}
+#request-detail>.code-comments td.result {
+ border: 1px solid #DDD;
+}
+#request-detail>.code-comments td.comment {
+ color: #888;
+ padding: 8px 8px 0 8px;
+ border-left: 4px solid white;
+}
+#request-detail>.code-comments td.comment.new {
+ border-left: 4px solid #4667EE;
+}
+#request-detail>.code-comments td.comment>div {
+ padding-bottom: 8px;
+ border-bottom: 1px dotted #BBB;
+}
+#request-detail>.code-comments td.result tr:last-child td.comment>div {
+ border-bottom: none;
+}
+
+#request-detail>.code-comments td.comment a.title {
+ font-weight: bold;
+ font-size: 16px;
+ color: #444;
+ margin-right: 4px;
+}
+#request-detail>.code-comments td.comment .resolved {
+ font-size: 18px;
+ color: #24BE10;
+}
+#request-detail>.code-comments td.comment .user, .code-comments td.comment .file {
+ color: #444;
+}
+#request-detail>.code-comments td.comment .second-line, .code-comments td.comment .third-line {
+ margin-top: 2px;
+}
+#request-detail>.code-comments td.result .norecords-td {
+ padding: 20px;
+ font-size: 20px;
+ text-align: center;
+ font-style: italic;
+}
+#request-detail>.code-comments .alert {
+ border-radius: 0;
+}
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
index 730cb21e06..cc0329d930 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
@@ -89,6 +89,7 @@ class UpdatedPanel extends GenericPanel<PullRequestUpdate> {
BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);
DepotBlobPage.State browseState = new DepotBlobPage.State(blobIdent);
+ browseState.requestId = getUpdate().getRequest().getId();
params = DepotBlobPage.paramsOf(depotModel.getObject(), browseState);
item.add(new ViewStateAwarePageLink<Void>("browseCode", DepotBlobPage.class, params));
diff --git a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
index 5bc008b630..750a46cae7 100644
--- a/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/depot/pullrequest/requestlist/RequestListPage.java
@@ -282,9 +282,9 @@ public class RequestListPage extends DepotPage {
fragment.add(new RequestStatusPanel("status", rowModel));
fragment.add(new AccountLink("submitter", Account.getForDisplay(request.getSubmitter(),
request.getSubmitterName())));
- fragment.add(new BranchLink("target", request.getTarget()));
+ fragment.add(new BranchLink("target", request.getTarget(), null));
if (request.getSource() != null)
- fragment.add(new BranchLink("source", request.getSource()));
+ fragment.add(new BranchLink("source", request.getSource(), request));
else
fragment.add(new Label("source").setVisible(false));
diff --git a/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java b/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java
index b3ac1d604a..4dc8d14b3c 100644
--- a/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java
+++ b/web/src/main/java/com/gitplex/server/web/websocket/CodeCommentChangeBroadcaster.java
@@ -4,10 +4,8 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import com.gitplex.launcher.loader.Listen;
-import com.gitplex.server.event.codecomment.CodeCommentEvent;
+import com.gitplex.server.event.pullrequest.PullRequestCodeCommentEvent;
import com.gitplex.server.web.util.WicketUtils;
-import com.gitplex.server.web.websocket.PageKey;
-import com.gitplex.server.web.websocket.WebSocketManager;
@Singleton
public class CodeCommentChangeBroadcaster {
@@ -20,7 +18,7 @@ public class CodeCommentChangeBroadcaster {
}
@Listen
- public void on(CodeCommentEvent event) {
+ public void on(PullRequestCodeCommentEvent event) {
CodeCommentChangedRegion region = new CodeCommentChangedRegion(event.getComment().getId());
PageKey sourcePageKey = WicketUtils.getPageKey();
webSocketManager.render(region, sourcePageKey);