Simplify a bit commenting from template file.
Directly pass template filename to setMinusTwo and commentOnReview.
diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
index 7857f49..102b71d 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
@@ -121,11 +121,9 @@
if (atomicityHelper.isAtomicReview(change)) {
if (atomicityHelper.hasDependentReview(reviewNumber)) {
- reviewUpdater.setMinusTwo(reviewNumber,
- config.getCommentFromFile(AutomergeConfig.ATOMIC_REVIEWS_SAME_REPO_FILE));
+ reviewUpdater.setMinusTwo(reviewNumber, AutomergeConfig.ATOMIC_REVIEWS_SAME_REPO_FILE);
} else {
- reviewUpdater.commentOnReview(reviewNumber,
- config.getCommentFromFile(AutomergeConfig.ATOMIC_REVIEW_DETECTED_FILE));
+ reviewUpdater.commentOnReview(reviewNumber, AutomergeConfig.ATOMIC_REVIEW_DETECTED_FILE);
}
}
}
@@ -141,11 +139,9 @@
}
if (atomicityHelper.isAtomicReview(change)) {
if (atomicityHelper.hasDependentReview(reviewNumber)) {
- reviewUpdater.setMinusTwo(reviewNumber,
- config.getCommentFromFile(AutomergeConfig.ATOMIC_REVIEWS_SAME_REPO_FILE));
+ reviewUpdater.setMinusTwo(reviewNumber, AutomergeConfig.ATOMIC_REVIEWS_SAME_REPO_FILE);
} else {
- reviewUpdater.commentOnReview(reviewNumber,
- config.getCommentFromFile(AutomergeConfig.ATOMIC_REVIEW_DETECTED_FILE));
+ reviewUpdater.commentOnReview(reviewNumber, AutomergeConfig.ATOMIC_REVIEW_DETECTED_FILE);
}
}
}
@@ -206,8 +202,7 @@
}
} else {
if (why != null) {
- reviewUpdater.commentOnReview(reviewNumber,
- config.getCommentFromFile(AutomergeConfig.CANT_MERGE_COMMENT_FILE));
+ reviewUpdater.commentOnReview(reviewNumber, AutomergeConfig.CANT_MERGE_COMMENT_FILE);
}
}
}
diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/ReviewUpdater.java b/src/main/java/com/criteo/gerrit/plugins/automerge/ReviewUpdater.java
index dc06f9f..12138f1 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/ReviewUpdater.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/ReviewUpdater.java
@@ -49,10 +49,10 @@
this.config = config;
}
- public void commentOnReview(final int number, final String comment) throws NoSuchChangeException, OrmException,
- AuthException, BadRequestException, UnprocessableEntityException, IOException {
+ public void commentOnReview(final int number, final String commentTemplate) throws NoSuchChangeException,
+ OrmException, AuthException, BadRequestException, UnprocessableEntityException, IOException {
final ReviewInput message = new ReviewInput();
- message.message = comment;
+ message.message = config.getCommentFromFile(commentTemplate);
final Set<Account.Id> ids = byEmailCache.get(config.getBotEmail());
final IdentifiedUser bot = factory.create(ids.iterator().next());
final ChangeControl ctl = changeFactory.controlFor(new Change.Id(number), bot);
@@ -62,10 +62,10 @@
reviewer.get().apply(r, message);
}
- public void setMinusTwo(final int number, final String comment) throws NoSuchChangeException, OrmException,
+ public void setMinusTwo(final int number, final String commentTemplate) throws NoSuchChangeException, OrmException,
AuthException, BadRequestException, UnprocessableEntityException, IOException {
final ReviewInput message = new ReviewInput();
- message.message = comment;
+ message.message = config.getCommentFromFile(commentTemplate);
message.label("Code-Review", -2);
final Set<Account.Id> ids = byEmailCache.get(config.getBotEmail());
final IdentifiedUser bot = factory.create(ids.iterator().next());
