diff options
author | David Pursehouse <dpursehouse@collab.net> | 2017-09-12 21:36:27 +0900 |
---|---|---|
committer | David Pursehouse <dpursehouse@collab.net> | 2018-07-06 15:11:22 +0900 |
commit | e0c059c242d905c42bb0e82a5b560162c83b06b5 (patch) | |
tree | 06a4b1cf92ebef206764db823825f9830cf55b43 | |
parent | 1b27d904dee1d64e042fd4cbb160830aa9940b68 (diff) |
ChangeReportFormatter: Convert Input to use AutoValue.Builder
Change-Id: I5e1a4550701a9eaad2bbfdb9e7183a21dfda7cec
Signed-off-by: David Pursehouse <dpursehouse@collab.net>
Helped-by: Patrick Hiesel <hiesel@google.com>
3 files changed, 53 insertions, 39 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeReportFormatter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeReportFormatter.java index bc478ee0db..3bdfe4c7b3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeReportFormatter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ChangeReportFormatter.java @@ -14,48 +14,55 @@ package com.google.gerrit.server.git; +import com.google.auto.value.AutoValue; +import com.google.gerrit.common.Nullable; import com.google.gerrit.reviewdb.client.Change; public interface ChangeReportFormatter { - public static class Input { - private final Change change; - private String subject; - private Boolean draft; - private Boolean edit; - - public Input(Change change) { - this.change = change; - } + @AutoValue + public abstract static class Input { + public abstract Change change(); - public Input setDraft(boolean draft) { - this.draft = draft; - return this; - } + @Nullable + public abstract String subject(); - public Input setEdit(boolean edit) { - this.edit = edit; - return this; - } + @Nullable + public abstract Boolean isDraft(); - public Input setSubject(String subject) { - this.subject = subject; - return this; - } + @Nullable + public abstract Boolean isEdit(); - public Change getChange() { - return change; + public static Builder builder() { + return new AutoValue_ChangeReportFormatter_Input.Builder(); } - public String getSubject() { - return subject == null ? change.getSubject() : subject; - } + @AutoValue.Builder + public abstract static class Builder { + public abstract Builder setChange(Change val); - public boolean isDraft() { - return draft == null ? Change.Status.DRAFT == change.getStatus() : draft; - } + public abstract Builder setSubject(String val); + + public abstract Builder setIsDraft(Boolean val); + + public abstract Builder setIsEdit(Boolean val); + + abstract Change change(); + + abstract String subject(); + + abstract Boolean isDraft(); + + abstract Boolean isEdit(); + + abstract Input autoBuild(); - public boolean isEdit() { - return edit == null ? false : edit; + public Input build() { + setChange(change()); + setSubject(subject() == null ? change().getSubject() : subject()); + setIsDraft(isDraft() == null ? Change.Status.DRAFT == change().getStatus() : isDraft()); + setIsEdit(isEdit() == null ? false : isEdit()); + return autoBuild(); + } } } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultChangeReportFormatter.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultChangeReportFormatter.java index 9ad3f0ad88..7a266ffcb7 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultChangeReportFormatter.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/DefaultChangeReportFormatter.java @@ -39,16 +39,16 @@ public class DefaultChangeReportFormatter implements ChangeReportFormatter { @Override public String changeClosed(ChangeReportFormatter.Input input) { return String.format( - "change %s closed", ChangeUtil.formatChangeUrl(canonicalWebUrl, input.getChange())); + "change %s closed", ChangeUtil.formatChangeUrl(canonicalWebUrl, input.change())); } private String formatChangeUrl(String url, Input input) { StringBuilder m = new StringBuilder() .append(" ") - .append(ChangeUtil.formatChangeUrl(url, input.getChange())) + .append(ChangeUtil.formatChangeUrl(url, input.change())) .append(" ") - .append(ChangeUtil.cropSubject(input.getSubject())); + .append(ChangeUtil.cropSubject(input.subject())); if (input.isDraft()) { m.append(" [DRAFT]"); } diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 4900e18e1c..7ee855d216 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -687,7 +687,9 @@ public class ReceiveCommits { addMessage(""); addMessage("New Changes:"); for (CreateRequest c : created) { - addMessage(changeFormatter.newChange(new ChangeReportFormatter.Input(c.change))); + addMessage( + changeFormatter.newChange( + ChangeReportFormatter.Input.builder().setChange(c.change).build())); } addMessage(""); } @@ -718,10 +720,12 @@ public class ReceiveCommits { } ChangeReportFormatter.Input input = - new ChangeReportFormatter.Input(u.notes.getChange()) + ChangeReportFormatter.Input.builder() + .setChange(u.notes.getChange()) .setSubject(subject) - .setDraft(u.replaceOp != null && u.replaceOp.getPatchSet().isDraft()) - .setEdit(edit); + .setIsDraft(u.replaceOp != null && u.replaceOp.getPatchSet().isDraft()) + .setIsEdit(edit) + .build(); addMessage(changeFormatter.changeUpdated(input)); } addMessage(""); @@ -1677,7 +1681,10 @@ public class ReceiveCommits { private boolean requestReplace( ReceiveCommand cmd, boolean checkMergedInto, Change change, RevCommit newCommit) { if (change.getStatus().isClosed()) { - reject(cmd, changeFormatter.changeClosed(new ChangeReportFormatter.Input(change))); + reject( + cmd, + changeFormatter.changeClosed( + ChangeReportFormatter.Input.builder().setChange(change).build())); return false; } |