Reformat all Java files with google-java-format 1.6 Reformat all files with the exception of: - lib/asciidoctor/java/AsciiDoctor.java to avoid requiring the Library-Compliance label. Change-Id: Iedba3f24ac00e2186e3e0688fabea817ddf43739
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGerritConfigAnnotationTest.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGerritConfigAnnotationTest.java index 53f1839..d5ac2f7 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGerritConfigAnnotationTest.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGerritConfigAnnotationTest.java
@@ -47,9 +47,8 @@ @Test @GerritConfig( - name = "section.name", - values = {"value-1", "value-2"} - ) + name = "section.name", + values = {"value-1", "value-2"}) public void testList() { assertThat(cfg.getStringList("section", null, "name")) .asList() @@ -58,9 +57,8 @@ @Test @GerritConfig( - name = "section.subsection.name", - values = {"value-1", "value-2"} - ) + name = "section.subsection.name", + values = {"value-1", "value-2"}) public void testListWithSubsection() { assertThat(cfg.getStringList("section", "subsection", "name")) .asList() @@ -69,10 +67,9 @@ @Test @GerritConfig( - name = "section.name", - value = "value-1", - values = {"value-2", "value-3"} - ) + name = "section.name", + value = "value-1", + values = {"value-2", "value-3"}) public void valueHasPrecedenceOverValues() { assertThat(cfg.getStringList("section", null, "name")).asList().containsExactly("value-1"); }
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGlobalPluginConfigAnnotationTest.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGlobalPluginConfigAnnotationTest.java index eaa0a95d..44d9e46 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGlobalPluginConfigAnnotationTest.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/annotation/UseGlobalPluginConfigAnnotationTest.java
@@ -57,10 +57,9 @@ @Test @UseLocalDisk @GlobalPluginConfig( - pluginName = "test", - name = "section.name", - values = {"value-1", "value-2"} - ) + pluginName = "test", + name = "section.name", + values = {"value-1", "value-2"}) public void testList() { assertThat(cfg().getStringList("section", null, "name")) .asList() @@ -70,10 +69,9 @@ @Test @UseLocalDisk @GlobalPluginConfig( - pluginName = "test", - name = "section.subsection.name", - values = {"value-1", "value-2"} - ) + pluginName = "test", + name = "section.subsection.name", + values = {"value-1", "value-2"}) public void testListWithSubsection() { assertThat(cfg().getStringList("section", "subsection", "name")) .asList() @@ -83,11 +81,10 @@ @Test @UseLocalDisk @GlobalPluginConfig( - pluginName = "test", - name = "section.name", - value = "value-1", - values = {"value-2", "value-3"} - ) + pluginName = "test", + name = "section.name", + value = "value-1", + values = {"value-2", "value-3"}) public void valueHasPrecedenceOverValues() { assertThat(cfg().getStringList("section", null, "name")).asList().containsExactly("value-1"); }
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java index f51bbf5..64849a4 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/ServerInfoIT.java
@@ -57,9 +57,8 @@ // download @GerritConfig( - name = "download.archive", - values = {"tar", "tbz2", "tgz", "txz"} - ) + name = "download.archive", + values = {"tar", "tbz2", "tgz", "txz"}) // gerrit @GerritConfig(name = "gerrit.allProjects", value = "Root")
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/ListMailFilterIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/ListMailFilterIT.java index a96c6ec..ea4f501 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/ListMailFilterIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/ListMailFilterIT.java
@@ -47,9 +47,8 @@ @Test @GerritConfig(name = "receiveemail.filter.mode", value = "WHITELIST") @GerritConfig( - name = "receiveemail.filter.patterns", - values = {".+ser@example\\.com", "a@b\\.com"} - ) + name = "receiveemail.filter.patterns", + values = {".+ser@example\\.com", "a@b\\.com"}) public void listFilterWhitelistDoesNotFilterListedUser() throws Exception { ChangeInfo changeInfo = createChangeAndReplyByEmail(); // Check that the comments from the email have been persisted @@ -60,9 +59,8 @@ @Test @GerritConfig(name = "receiveemail.filter.mode", value = "WHITELIST") @GerritConfig( - name = "receiveemail.filter.patterns", - values = {".+@gerritcodereview\\.com", "a@b\\.com"} - ) + name = "receiveemail.filter.patterns", + values = {".+@gerritcodereview\\.com", "a@b\\.com"}) public void listFilterWhitelistFiltersNotListedUser() throws Exception { ChangeInfo changeInfo = createChangeAndReplyByEmail(); // Check that the comments from the email have NOT been persisted @@ -73,9 +71,8 @@ @Test @GerritConfig(name = "receiveemail.filter.mode", value = "BLACKLIST") @GerritConfig( - name = "receiveemail.filter.patterns", - values = {".+@gerritcodereview\\.com", "a@b\\.com"} - ) + name = "receiveemail.filter.patterns", + values = {".+@gerritcodereview\\.com", "a@b\\.com"}) public void listFilterBlacklistDoesNotFilterNotListedUser() throws Exception { ChangeInfo changeInfo = createChangeAndReplyByEmail(); // Check that the comments from the email have been persisted @@ -86,9 +83,8 @@ @Test @GerritConfig(name = "receiveemail.filter.mode", value = "BLACKLIST") @GerritConfig( - name = "receiveemail.filter.patterns", - values = {".+@example\\.com", "a@b\\.com"} - ) + name = "receiveemail.filter.patterns", + values = {".+@example\\.com", "a@b\\.com"}) public void listFilterBlacklistFiltersListedUser() throws Exception { ChangeInfo changeInfo = createChangeAndReplyByEmail(); // Check that the comments from the email have been persisted
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java index bcdc866..b8fd95f 100644 --- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java +++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/UploadArchiveIT.java
@@ -56,9 +56,8 @@ @Test @GerritConfig( - name = "download.archive", - values = {"tar", "tbz2", "tgz", "txz"} - ) + name = "download.archive", + values = {"tar", "tbz2", "tgz", "txz"}) public void zipFormatDisabled() throws Exception { archiveNotPermitted(); }
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java index 467cc9a..d6ae6e1 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -154,10 +154,9 @@ private boolean polyGerritDev; @Option( - name = "--init", - aliases = {"-i"}, - usage = "Init site before starting the daemon" - ) + name = "--init", + aliases = {"-i"}, + usage = "Init site before starting the daemon") private boolean doInit; @Option(name = "--stop-only", usage = "Stop the daemon", hidden = true)
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java index 6e7e3de..b9c7068 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Init.java
@@ -44,10 +44,9 @@ /** Initialize a new Gerrit installation. */ public class Init extends BaseInit { @Option( - name = "--batch", - aliases = {"-b"}, - usage = "Batch mode; skip interactive prompting" - ) + name = "--batch", + aliases = {"-b"}, + usage = "Batch mode; skip interactive prompting") private boolean batchMode; @Option(name = "--delete-caches", usage = "Delete all persistent caches without asking") @@ -69,9 +68,8 @@ private boolean installAllPlugins; @Option( - name = "--secure-store-lib", - usage = "Path to jar providing SecureStore implementation class" - ) + name = "--secure-store-lib", + usage = "Path to jar providing SecureStore implementation class") private String secureStoreLib; @Option(name = "--dev", usage = "Setup site with default options suitable for developers")
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateAccountPatchReviewDb.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateAccountPatchReviewDb.java index 3feab72..4ace62b 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateAccountPatchReviewDb.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/MigrateAccountPatchReviewDb.java
@@ -43,9 +43,8 @@ private String sourceUrl; @Option( - name = "--chunkSize", - usage = "chunk size of fetching from source and push to target on each time" - ) + name = "--chunkSize", + usage = "chunk size of fetching from source and push to target on each time") private static long chunkSize = 100000; @Override
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Passwd.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Passwd.java index d9c3c5d..457cae3 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Passwd.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Passwd.java
@@ -38,11 +38,10 @@ private String key; @Argument( - metaVar = "SECTION.KEY", - index = 0, - required = true, - usage = "Section and key separated by a dot of the password to set" - ) + metaVar = "SECTION.KEY", + index = 0, + required = true, + usage = "Section and key separated by a dot of the password to set") private String sectionAndKey; @Argument(metaVar = "PASSWORD", index = 1, required = false, usage = "Password to set")
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtoGen.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtoGen.java index f659bb0..4fe6cf6 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtoGen.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtoGen.java
@@ -32,12 +32,11 @@ public class ProtoGen extends AbstractProgram { @Option( - name = "--output", - aliases = {"-o"}, - required = true, - metaVar = "FILE", - usage = "File to write .proto into" - ) + name = "--output", + aliases = {"-o"}, + required = true, + metaVar = "FILE", + usage = "File to write .proto into") private File file; @Override
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtobufImport.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtobufImport.java index ad47f0c..c11dae1 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtobufImport.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/ProtobufImport.java
@@ -65,12 +65,11 @@ */ public class ProtobufImport extends SiteProgram { @Option( - name = "--file", - aliases = {"-f"}, - required = true, - metaVar = "FILE", - usage = "File to import from" - ) + name = "--file", + aliases = {"-f"}, + required = true, + metaVar = "FILE", + usage = "File to import from") private File file; private final LifecycleManager manager = new LifecycleManager();
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java index d77717e..de8d0cb 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/RebuildNoteDb.java
@@ -96,9 +96,8 @@ private List<String> projects = new ArrayList<>(); @Option( - name = "--change", - usage = "Individual change numbers to rebuild; recommended for debugging only" - ) + name = "--change", + usage = "Individual change numbers to rebuild; recommended for debugging only") private List<Integer> changes = new ArrayList<>(); private Injector dbInjector;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java index 232d71b..d73207b 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Reindex.java
@@ -57,9 +57,8 @@ private int threads = Runtime.getRuntime().availableProcessors(); @Option( - name = "--changes-schema-version", - usage = "Schema version to reindex, for changes; default is most recent version" - ) + name = "--changes-schema-version", + usage = "Schema version to reindex, for changes; default is most recent version") private Integer changesVersion; @Option(name = "--verbose", usage = "Output debug information for each change")
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Rulec.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Rulec.java index 1e54217..add06ef 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Rulec.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Rulec.java
@@ -44,11 +44,10 @@ private boolean quiet; @Argument( - index = 0, - multiValued = true, - metaVar = "PROJECT", - usage = "project to compile rules for" - ) + index = 0, + multiValued = true, + metaVar = "PROJECT", + usage = "project to compile rules for") private List<String> projectNames = new ArrayList<>(); private Injector dbInjector;
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/SwitchSecureStore.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/SwitchSecureStore.java index 1a22162..1cdd8a8 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/SwitchSecureStore.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/SwitchSecureStore.java
@@ -57,10 +57,9 @@ private static final Logger log = LoggerFactory.getLogger(SwitchSecureStore.class); @Option( - name = "--new-secure-store-lib", - usage = "Path to new SecureStore implementation", - required = true - ) + name = "--new-secure-store-lib", + usage = "Path to new SecureStore implementation", + required = true) private String newSecureStoreLib; @Override
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java index e7f5ffc..e14653a 100644 --- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java +++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/util/SiteProgram.java
@@ -64,10 +64,9 @@ public abstract class SiteProgram extends AbstractProgram { @Option( - name = "--site-path", - aliases = {"-d"}, - usage = "Local directory containing site data" - ) + name = "--site-path", + aliases = {"-d"}, + usage = "Local directory containing site data") private void setSitePath(String path) { sitePath = Paths.get(path); }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/ListMetrics.java b/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/ListMetrics.java index 891f4ac..8ef1614 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/ListMetrics.java +++ b/gerrit-server/src/main/java/com/google/gerrit/metrics/dropwizard/ListMetrics.java
@@ -35,11 +35,10 @@ boolean dataOnly; @Option( - name = "--prefix", - aliases = {"-p"}, - metaVar = "PREFIX", - usage = "match metric by exact match or prefix" - ) + name = "--prefix", + aliases = {"-p"}, + metaVar = "PREFIX", + usage = "match metric by exact match or prefix") List<String> query = new ArrayList<>(); @Inject
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java b/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java index 024c610..68e787d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/access/ListAccess.java
@@ -32,11 +32,10 @@ public class ListAccess implements RestReadView<TopLevelResource> { @Option( - name = "--project", - aliases = {"-p"}, - metaVar = "PROJECT", - usage = "projects for which the access rights should be returned" - ) + name = "--project", + aliases = {"-p"}, + metaVar = "PROJECT", + usage = "projects for which the access rights should be returned") private List<String> projects = new ArrayList<>(); private final GetAccess getAccess;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java index 0818a0e..7ee9112 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/GetAvatar.java
@@ -31,10 +31,9 @@ private int size; @Option( - name = "--size", - aliases = {"-s"}, - usage = "recommended size in pixels, height and width" - ) + name = "--size", + aliases = {"-s"}, + usage = "recommended size in pixels, height and width") public void setSize(int s) { size = s; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java b/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java index a8e6dc0..a2de481 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/account/QueryAccounts.java
@@ -64,11 +64,10 @@ } @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of users to return" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of users to return") public void setLimit(int n) { queryProcessor.setLimit(n); @@ -92,21 +91,19 @@ } @Option( - name = "--query", - aliases = {"-q"}, - metaVar = "QUERY", - usage = "match users" - ) + name = "--query", + aliases = {"-q"}, + metaVar = "QUERY", + usage = "match users") public void setQuery(String query) { this.query = query; } @Option( - name = "--start", - aliases = {"-S"}, - metaVar = "CNT", - usage = "Number of accounts to skip" - ) + name = "--start", + aliases = {"-S"}, + metaVar = "CNT", + usage = "Number of accounts to skip") public void setStart(int start) { this.start = start; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java index fbb2115..da92964 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/ChangeEdits.java
@@ -375,10 +375,9 @@ private final FileContentUtil fileContentUtil; @Option( - name = "--base", - aliases = {"-b"}, - usage = "whether to load the content on the base revision instead of the change edit" - ) + name = "--base", + aliases = {"-b"}, + usage = "whether to load the content on the base revision instead of the change edit") private boolean base; @Inject @@ -476,10 +475,9 @@ private final ChangeEditUtil editUtil; @Option( - name = "--base", - aliases = {"-b"}, - usage = "whether to load the message on the base revision instead of the change edit" - ) + name = "--base", + aliases = {"-b"}, + usage = "whether to load the message on the base revision instead of the change edit") private boolean base; @Inject
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java index d6d0acc..1dcdbb8 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/GetBlame.java
@@ -59,12 +59,11 @@ private final AutoMerger autoMerger; @Option( - name = "--base", - aliases = {"-b"}, - usage = - "whether to load the blame of the base revision (the direct" - + " parent of the change) instead of the change" - ) + name = "--base", + aliases = {"-b"}, + usage = + "whether to load the blame of the base revision (the direct" + + " parent of the change) instead of the change") private boolean base; @Inject
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java index e5f9352..f585e14 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Mergeable.java
@@ -53,10 +53,9 @@ private static final Logger log = LoggerFactory.getLogger(Mergeable.class); @Option( - name = "--other-branches", - aliases = {"-o"}, - usage = "test mergeability for other branches too" - ) + name = "--other-branches", + aliases = {"-o"}, + usage = "test mergeability for other branches too") private boolean otherBranches; private final GitRepositoryManager gitManager;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java index 5260730..fd14adf 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestChangeReviewers.java
@@ -39,10 +39,9 @@ implements RestReadView<ChangeResource> { @Option( - name = "--exclude-groups", - aliases = {"-e"}, - usage = "exclude groups from query" - ) + name = "--exclude-groups", + aliases = {"-e"}, + usage = "exclude groups from query") boolean excludeGroups; private final Provider<CurrentUser> self;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java index 47fb513..e1d8f17 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/SuggestReviewers.java
@@ -39,21 +39,19 @@ protected final int maxSuggestedReviewers; @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of reviewers to list" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of reviewers to list") public void setLimit(int l) { this.limit = l <= 0 ? maxSuggestedReviewers : Math.min(l, maxSuggestedReviewers); } @Option( - name = "--query", - aliases = {"-q"}, - metaVar = "QUERY", - usage = "match reviewers query" - ) + name = "--query", + aliases = {"-q"}, + metaVar = "QUERY", + usage = "match reviewers query") public void setQuery(String q) { this.query = q; }
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 79e3c12..47b9960 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
@@ -1275,10 +1275,9 @@ boolean draft; @Option( - name = "--edit", - aliases = {"-e"}, - usage = "upload as change edit" - ) + name = "--edit", + aliases = {"-e"}, + usage = "upload as change edit") boolean edit; @Option(name = "--submit", usage = "immediately submit the change") @@ -1288,12 +1287,11 @@ boolean merged; @Option( - name = "--notify", - usage = - "Notify handling that defines to whom email notifications " - + "should be sent. Allowed values are NONE, OWNER, " - + "OWNER_REVIEWERS, ALL. If not set, the default is ALL." - ) + name = "--notify", + usage = + "Notify handling that defines to whom email notifications " + + "should be sent. Allowed values are NONE, OWNER, " + + "OWNER_REVIEWERS, ALL. If not set, the default is ALL.") NotifyHandling notify = NotifyHandling.ALL; @Option(name = "--notify-to", metaVar = "USER", usage = "user that should be notified") @@ -1306,11 +1304,10 @@ List<Account.Id> bccs = new ArrayList<>(); @Option( - name = "--reviewer", - aliases = {"-r"}, - metaVar = "EMAIL", - usage = "add reviewer to changes" - ) + name = "--reviewer", + aliases = {"-r"}, + metaVar = "EMAIL", + usage = "add reviewer to changes") void reviewer(Account.Id id) { reviewer.add(id); } @@ -1326,11 +1323,10 @@ } @Option( - name = "--label", - aliases = {"-l"}, - metaVar = "LABEL+VALUE", - usage = "label(s) to assign (defaults to +1 if no value provided" - ) + name = "--label", + aliases = {"-l"}, + metaVar = "LABEL+VALUE", + usage = "label(s) to assign (defaults to +1 if no value provided") void addLabel(String token) throws CmdLineException { LabelVote v = LabelVote.parse(token); try { @@ -1343,22 +1339,20 @@ } @Option( - name = "--message", - aliases = {"-m"}, - metaVar = "MESSAGE", - usage = "Comment message to apply to the review" - ) + name = "--message", + aliases = {"-m"}, + metaVar = "MESSAGE", + usage = "Comment message to apply to the review") void addMessage(final String token) { // git push does not allow spaces in refs. message = token.replace("_", " "); } @Option( - name = "--hashtag", - aliases = {"-t"}, - metaVar = "HASHTAG", - usage = "add hashtag to changes" - ) + name = "--hashtag", + aliases = {"-t"}, + metaVar = "HASHTAG", + usage = "add hashtag to changes") void addHashtag(String token) throws CmdLineException { if (!notesMigration.readChanges()) { throw clp.reject("cannot add hashtags; noteDb is disabled");
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java index 9bf14e7..7b55a80 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/ListGroups.java
@@ -80,37 +80,33 @@ private String suggest; @Option( - name = "--project", - aliases = {"-p"}, - usage = "projects for which the groups should be listed" - ) + name = "--project", + aliases = {"-p"}, + usage = "projects for which the groups should be listed") public void addProject(ProjectControl project) { projects.add(project); } @Option( - name = "--visible-to-all", - usage = "to list only groups that are visible to all registered users" - ) + name = "--visible-to-all", + usage = "to list only groups that are visible to all registered users") public void setVisibleToAll(boolean visibleToAll) { this.visibleToAll = visibleToAll; } @Option( - name = "--user", - aliases = {"-u"}, - usage = "user for which the groups should be listed" - ) + name = "--user", + aliases = {"-u"}, + usage = "user for which the groups should be listed") public void setUser(Account.Id user) { this.user = user; } @Option( - name = "--owned", - usage = - "to list only groups that are owned by the" - + " specified user or by the calling user if no user was specifed" - ) + name = "--owned", + usage = + "to list only groups that are owned by the" + + " specified user or by the calling user if no user was specifed") public void setOwned(boolean owned) { this.owned = owned; } @@ -123,58 +119,52 @@ */ @Deprecated @Option( - name = "--query", - aliases = {"-q"}, - usage = "group to inspect (deprecated: use --group/-g instead)" - ) + name = "--query", + aliases = {"-q"}, + usage = "group to inspect (deprecated: use --group/-g instead)") void addGroup_Deprecated(AccountGroup.UUID uuid) { addGroup(uuid); } @Option( - name = "--group", - aliases = {"-g"}, - usage = "group to inspect" - ) + name = "--group", + aliases = {"-g"}, + usage = "group to inspect") public void addGroup(AccountGroup.UUID uuid) { groupsToInspect.add(uuid); } @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of groups to list" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of groups to list") public void setLimit(int limit) { this.limit = limit; } @Option( - name = "--start", - aliases = {"-S"}, - metaVar = "CNT", - usage = "number of groups to skip" - ) + name = "--start", + aliases = {"-S"}, + metaVar = "CNT", + usage = "number of groups to skip") public void setStart(int start) { this.start = start; } @Option( - name = "--match", - aliases = {"-m"}, - metaVar = "MATCH", - usage = "match group substring" - ) + name = "--match", + aliases = {"-m"}, + metaVar = "MATCH", + usage = "match group substring") public void setMatchSubstring(String matchSubstring) { this.matchSubstring = matchSubstring; } @Option( - name = "--suggest", - aliases = {"-s"}, - usage = "to get a suggestion of groups" - ) + name = "--suggest", + aliases = {"-s"}, + usage = "to get a suggestion of groups") public void setSuggest(String suggest) { this.suggest = suggest; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java b/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java index abf464e..1b95537 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/group/QueryGroups.java
@@ -52,30 +52,27 @@ // removed we want to rename --query2 to --query here. /** --query (-q) is already used by {@link ListGroups} */ @Option( - name = "--query2", - aliases = {"-q2"}, - usage = "group query" - ) + name = "--query2", + aliases = {"-q2"}, + usage = "group query") public void setQuery(String query) { this.query = query; } @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of groups to list" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of groups to list") public void setLimit(int limit) { this.limit = limit; } @Option( - name = "--start", - aliases = {"-S"}, - metaVar = "CNT", - usage = "number of groups to skip" - ) + name = "--start", + aliases = {"-S"}, + metaVar = "CNT", + usage = "number of groups to skip") public void setStart(int start) { this.start = start; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java index 5ee06df..c95ae85 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/plugins/ListPlugins.java
@@ -44,10 +44,9 @@ private OutputFormat format = OutputFormat.TEXT; @Option( - name = "--all", - aliases = {"-a"}, - usage = "List all plugins, including disabled plugins" - ) + name = "--all", + aliases = {"-a"}, + usage = "List all plugins, including disabled plugins") private boolean all; @Inject
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/CheckMergeability.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/CheckMergeability.java index f824f81..72ebd62 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/CheckMergeability.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/CheckMergeability.java
@@ -46,23 +46,21 @@ private final Provider<ReviewDb> db; @Option( - name = "--source", - metaVar = "COMMIT", - usage = - "the source reference to merge, which could be any git object " - + "references expression, refer to " - + "org.eclipse.jgit.lib.Repository#resolve(String)", - required = true - ) + name = "--source", + metaVar = "COMMIT", + usage = + "the source reference to merge, which could be any git object " + + "references expression, refer to " + + "org.eclipse.jgit.lib.Repository#resolve(String)", + required = true) public void setSource(String source) { this.source = source; } @Option( - name = "--strategy", - metaVar = "STRATEGY", - usage = "name of the merge strategy, refer to org.eclipse.jgit.merge.MergeStrategy" - ) + name = "--strategy", + metaVar = "STRATEGY", + usage = "name of the merge strategy, refer to org.eclipse.jgit.merge.MergeStrategy") public void setStrategy(String strategy) { this.strategy = strategy; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java index 5d0afea..f51528d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/GetReflog.java
@@ -37,37 +37,34 @@ private final GitRepositoryManager repoManager; @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of reflog entries to list" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of reflog entries to list") public GetReflog setLimit(int limit) { this.limit = limit; return this; } @Option( - name = "--from", - metaVar = "TIMESTAMP", - usage = - "timestamp from which the reflog entries should be listed (UTC, format: " - + TimestampHandler.TIMESTAMP_FORMAT - + ")" - ) + name = "--from", + metaVar = "TIMESTAMP", + usage = + "timestamp from which the reflog entries should be listed (UTC, format: " + + TimestampHandler.TIMESTAMP_FORMAT + + ")") public GetReflog setFrom(Timestamp from) { this.from = from; return this; } @Option( - name = "--to", - metaVar = "TIMESTAMP", - usage = - "timestamp until which the reflog entries should be listed (UTC, format: " - + TimestampHandler.TIMESTAMP_FORMAT - + ")" - ) + name = "--to", + metaVar = "TIMESTAMP", + usage = + "timestamp until which the reflog entries should be listed (UTC, format: " + + TimestampHandler.TIMESTAMP_FORMAT + + ")") public GetReflog setTo(Timestamp to) { this.to = to; return this;
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java index 522fd7f..9b46d94 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListBranches.java
@@ -51,41 +51,37 @@ private final WebLinks webLinks; @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of branches to list" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of branches to list") public void setLimit(int limit) { this.limit = limit; } @Option( - name = "--start", - aliases = {"-S"}, - metaVar = "CNT", - usage = "number of branches to skip" - ) + name = "--start", + aliases = {"-S"}, + metaVar = "CNT", + usage = "number of branches to skip") public void setStart(int start) { this.start = start; } @Option( - name = "--match", - aliases = {"-m"}, - metaVar = "MATCH", - usage = "match branches substring" - ) + name = "--match", + aliases = {"-m"}, + metaVar = "MATCH", + usage = "match branches substring") public void setMatchSubstring(String matchSubstring) { this.matchSubstring = matchSubstring; } @Option( - name = "--regex", - aliases = {"-r"}, - metaVar = "REGEX", - usage = "match branches regex" - ) + name = "--regex", + aliases = {"-r"}, + metaVar = "REGEX", + usage = "match branches regex") public void setMatchRegex(String matchRegex) { this.matchRegex = matchRegex; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java index a84fefd..8c906ca 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListProjects.java
@@ -118,21 +118,19 @@ private OutputFormat format = OutputFormat.TEXT; @Option( - name = "--show-branch", - aliases = {"-b"}, - usage = "displays the sha of each project in the specified branch" - ) + name = "--show-branch", + aliases = {"-b"}, + usage = "displays the sha of each project in the specified branch") public void addShowBranch(String branch) { showBranch.add(branch); } @Option( - name = "--tree", - aliases = {"-t"}, - usage = - "displays project inheritance in a tree-like format\n" - + "this option does not work together with the show-branch option" - ) + name = "--tree", + aliases = {"-t"}, + usage = + "displays project inheritance in a tree-like format\n" + + "this option does not work together with the show-branch option") public void setShowTree(boolean showTree) { this.showTree = showTree; } @@ -143,10 +141,9 @@ } @Option( - name = "--description", - aliases = {"-d"}, - usage = "include description of project in list" - ) + name = "--description", + aliases = {"-d"}, + usage = "include description of project in list") public void setShowDescription(boolean showDescription) { this.showDescription = showDescription; } @@ -157,41 +154,37 @@ } @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of projects to list" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of projects to list") public void setLimit(int limit) { this.limit = limit; } @Option( - name = "--start", - aliases = {"-S"}, - metaVar = "CNT", - usage = "number of projects to skip" - ) + name = "--start", + aliases = {"-S"}, + metaVar = "CNT", + usage = "number of projects to skip") public void setStart(int start) { this.start = start; } @Option( - name = "--prefix", - aliases = {"-p"}, - metaVar = "PREFIX", - usage = "match project prefix" - ) + name = "--prefix", + aliases = {"-p"}, + metaVar = "PREFIX", + usage = "match project prefix") public void setMatchPrefix(String matchPrefix) { this.matchPrefix = matchPrefix; } @Option( - name = "--match", - aliases = {"-m"}, - metaVar = "MATCH", - usage = "match project substring" - ) + name = "--match", + aliases = {"-m"}, + metaVar = "MATCH", + usage = "match project substring") public void setMatchSubstring(String matchSubstring) { this.matchSubstring = matchSubstring; } @@ -202,10 +195,9 @@ } @Option( - name = "--has-acl-for", - metaVar = "GROUP", - usage = "displays only projects on which access rights for this group are directly assigned" - ) + name = "--has-acl-for", + metaVar = "GROUP", + usage = "displays only projects on which access rights for this group are directly assigned") public void setGroupUuid(AccountGroup.UUID groupUuid) { this.groupUuid = groupUuid; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java index 3ebf6fb..6090e53 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ListTags.java
@@ -59,41 +59,37 @@ private final WebLinks links; @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "maximum number of tags to list" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "maximum number of tags to list") public void setLimit(int limit) { this.limit = limit; } @Option( - name = "--start", - aliases = {"-S"}, - metaVar = "CNT", - usage = "number of tags to skip" - ) + name = "--start", + aliases = {"-S"}, + metaVar = "CNT", + usage = "number of tags to skip") public void setStart(int start) { this.start = start; } @Option( - name = "--match", - aliases = {"-m"}, - metaVar = "MATCH", - usage = "match tags substring" - ) + name = "--match", + aliases = {"-m"}, + metaVar = "MATCH", + usage = "match tags substring") public void setMatchSubstring(String matchSubstring) { this.matchSubstring = matchSubstring; } @Option( - name = "--regex", - aliases = {"-r"}, - metaVar = "REGEX", - usage = "match tags regex" - ) + name = "--regex", + aliases = {"-r"}, + metaVar = "REGEX", + usage = "match tags regex") public void setMatchRegex(String matchRegex) { this.matchRegex = matchRegex; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java index 370bd21..cc1b95d 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/query/change/QueryChanges.java
@@ -46,19 +46,17 @@ private EnumSet<ListChangesOption> options; @Option( - name = "--query", - aliases = {"-q"}, - metaVar = "QUERY", - usage = "Query string" - ) + name = "--query", + aliases = {"-q"}, + metaVar = "QUERY", + usage = "Query string") private List<String> queries; @Option( - name = "--limit", - aliases = {"-n"}, - metaVar = "CNT", - usage = "Maximum number of results to return" - ) + name = "--limit", + aliases = {"-n"}, + metaVar = "CNT", + usage = "Maximum number of results to return") public void setLimit(int limit) { imp.setLimit(limit); } @@ -74,11 +72,10 @@ } @Option( - name = "--start", - aliases = {"-S"}, - metaVar = "CNT", - usage = "Number of changes to skip" - ) + name = "--start", + aliases = {"-S"}, + metaVar = "CNT", + usage = "Number of changes to skip") public void setStart(int start) { imp.setStart(start); }
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java index 35ddc2a..b7d8507 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AdminSetParent.java
@@ -44,41 +44,36 @@ @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData( - name = "set-project-parent", - description = "Change the project permissions are inherited from" -) + name = "set-project-parent", + description = "Change the project permissions are inherited from") final class AdminSetParent extends SshCommand { private static final Logger log = LoggerFactory.getLogger(AdminSetParent.class); @Option( - name = "--parent", - aliases = {"-p"}, - metaVar = "NAME", - usage = "new parent project" - ) + name = "--parent", + aliases = {"-p"}, + metaVar = "NAME", + usage = "new parent project") private ProjectControl newParent; @Option( - name = "--children-of", - metaVar = "NAME", - usage = "parent project for which the child projects should be reparented" - ) + name = "--children-of", + metaVar = "NAME", + usage = "parent project for which the child projects should be reparented") private ProjectControl oldParent; @Option( - name = "--exclude", - metaVar = "NAME", - usage = "child project of old parent project which should not be reparented" - ) + name = "--exclude", + metaVar = "NAME", + usage = "child project of old parent project which should not be reparented") private List<ProjectControl> excludedChildren = new ArrayList<>(); @Argument( - index = 0, - required = false, - multiValued = true, - metaVar = "NAME", - usage = "projects to modify" - ) + index = 0, + required = false, + multiValued = true, + metaVar = "NAME", + usage = "projects to modify") private List<ProjectControl> children = new ArrayList<>(); @Inject private ProjectCache projectCache;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java index 577b58f..d3db70d 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/AproposCommand.java
@@ -27,10 +27,9 @@ import org.kohsuke.args4j.Argument; @CommandMetaData( - name = "apropos", - description = "Search in Gerrit documentation", - runsAt = MASTER_OR_SLAVE -) + name = "apropos", + description = "Search in Gerrit documentation", + runsAt = MASTER_OR_SLAVE) final class AproposCommand extends SshCommand { @Inject private QueryDocumentationExecutor searcher; @Inject @CanonicalWebUrl String url;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java index 37cc19e..51c65c6 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BanCommitCommand.java
@@ -34,34 +34,30 @@ import org.kohsuke.args4j.Option; @CommandMetaData( - name = "ban-commit", - description = "Ban a commit from a project's repository", - runsAt = MASTER -) + name = "ban-commit", + description = "Ban a commit from a project's repository", + runsAt = MASTER) public class BanCommitCommand extends SshCommand { @Option( - name = "--reason", - aliases = {"-r"}, - metaVar = "REASON", - usage = "reason for banning the commit" - ) + name = "--reason", + aliases = {"-r"}, + metaVar = "REASON", + usage = "reason for banning the commit") private String reason; @Argument( - index = 0, - required = true, - metaVar = "PROJECT", - usage = "name of the project for which the commit should be banned" - ) + index = 0, + required = true, + metaVar = "PROJECT", + usage = "name of the project for which the commit should be banned") private ProjectControl projectControl; @Argument( - index = 1, - required = true, - multiValued = true, - metaVar = "COMMIT", - usage = "commit(s) that should be banned" - ) + index = 1, + required = true, + multiValued = true, + metaVar = "COMMIT", + usage = "commit(s) that should be banned") private List<ObjectId> commitsToBan = new ArrayList<>(); @Inject private BanCommit banCommit;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java index 56ff5ea..e66422a 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/BaseTestPrologCommand.java
@@ -42,17 +42,15 @@ protected String changeId; @Option( - name = "-s", - usage = - "Read prolog script from stdin instead of reading rules.pl from the refs/meta/config branch" - ) + name = "-s", + usage = + "Read prolog script from stdin instead of reading rules.pl from the refs/meta/config branch") protected boolean useStdin; @Option( - name = "--no-filters", - aliases = {"-n"}, - usage = "Don't run the submit_filter/2 from the parent projects" - ) + name = "--no-filters", + aliases = {"-n"}, + usage = "Don't run the submit_filter/2 from the parent projects") void setNoFilters(boolean no) { input.filters = no ? Filters.SKIP : Filters.RUN; }
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CloseConnection.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CloseConnection.java index 0e101a9..4640211 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CloseConnection.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CloseConnection.java
@@ -40,10 +40,9 @@ @AdminHighPriorityCommand @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData( - name = "close-connection", - description = "Close the specified SSH connection", - runsAt = MASTER_OR_SLAVE -) + name = "close-connection", + description = "Close the specified SSH connection", + runsAt = MASTER_OR_SLAVE) final class CloseConnection extends SshCommand { private static final Logger log = LoggerFactory.getLogger(CloseConnection.class); @@ -51,12 +50,11 @@ @Inject private SshDaemon sshDaemon; @Argument( - index = 0, - multiValued = true, - required = true, - metaVar = "SESSION_ID", - usage = "List of SSH session IDs to be closed" - ) + index = 0, + multiValued = true, + required = true, + metaVar = "SESSION_ID", + usage = "List of SSH session IDs to be closed") private final List<String> sessionIds = new ArrayList<>(); @Option(name = "--wait", usage = "wait for connection to close before exiting")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java index 0c63fb3..93b5695 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateAccountCommand.java
@@ -42,11 +42,10 @@ @CommandMetaData(name = "create-account", description = "Create a new batch/role account") final class CreateAccountCommand extends SshCommand { @Option( - name = "--group", - aliases = {"-g"}, - metaVar = "GROUP", - usage = "groups to add account to" - ) + name = "--group", + aliases = {"-g"}, + metaVar = "GROUP", + usage = "groups to add account to") private List<AccountGroup.Id> groups = new ArrayList<>(); @Option(name = "--full-name", metaVar = "NAME", usage = "display name of the account") @@ -59,10 +58,9 @@ private String sshKey; @Option( - name = "--http-password", - metaVar = "PASSWORD", - usage = "password for HTTP authentication" - ) + name = "--http-password", + metaVar = "PASSWORD", + usage = "password for HTTP authentication") private String httpPassword; @Argument(index = 0, required = true, metaVar = "USERNAME", usage = "name of the user account")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java index 5962faa..46cfc9a 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateBranchCommand.java
@@ -34,11 +34,10 @@ private String name; @Argument( - index = 2, - required = true, - metaVar = "REVISION", - usage = "base revision of the new branch" - ) + index = 2, + required = true, + metaVar = "REVISION", + usage = "base revision of the new branch") private String revision; @Inject GerritApi gApi;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java index 22bca56..1446f84 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateGroupCommand.java
@@ -49,19 +49,17 @@ @CommandMetaData(name = "create-group", description = "Create a new account group") final class CreateGroupCommand extends SshCommand { @Option( - name = "--owner", - aliases = {"-o"}, - metaVar = "GROUP", - usage = "owning group, if not specified the group will be self-owning" - ) + name = "--owner", + aliases = {"-o"}, + metaVar = "GROUP", + usage = "owning group, if not specified the group will be self-owning") private AccountGroup.Id ownerGroupId; @Option( - name = "--description", - aliases = {"-d"}, - metaVar = "DESC", - usage = "description of group" - ) + name = "--description", + aliases = {"-d"}, + metaVar = "DESC", + usage = "description of group") private String groupDescription = ""; @Argument(index = 0, required = true, metaVar = "GROUP", usage = "name of group to be created") @@ -70,11 +68,10 @@ private final Set<Account.Id> initialMembers = new HashSet<>(); @Option( - name = "--member", - aliases = {"-m"}, - metaVar = "USERNAME", - usage = "initial set of users to become members of the group" - ) + name = "--member", + aliases = {"-m"}, + metaVar = "USERNAME", + usage = "initial set of users to become members of the group") void addMember(final Account.Id id) { initialMembers.add(id); } @@ -85,11 +82,10 @@ private final Set<AccountGroup.UUID> initialGroups = new HashSet<>(); @Option( - name = "--group", - aliases = "-g", - metaVar = "GROUP", - usage = "initial set of groups to be included in the group" - ) + name = "--group", + aliases = "-g", + metaVar = "GROUP", + usage = "initial set of groups to be included in the group") void addGroup(final AccountGroup.UUID id) { initialGroups.add(id); }
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java index 8b323dc..cfefb7b 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/CreateProjectCommand.java
@@ -42,50 +42,44 @@ /** Create a new project. * */ @RequiresCapability(GlobalCapability.CREATE_PROJECT) @CommandMetaData( - name = "create-project", - description = "Create a new project and associated Git repository" -) + name = "create-project", + description = "Create a new project and associated Git repository") final class CreateProjectCommand extends SshCommand { @Option( - name = "--suggest-parents", - aliases = {"-S"}, - usage = - "suggest parent candidates, " - + "if this option is used all other options and arguments are ignored" - ) + name = "--suggest-parents", + aliases = {"-S"}, + usage = + "suggest parent candidates, " + + "if this option is used all other options and arguments are ignored") private boolean suggestParent; @Option( - name = "--owner", - aliases = {"-o"}, - usage = "owner(s) of project" - ) + name = "--owner", + aliases = {"-o"}, + usage = "owner(s) of project") private List<AccountGroup.UUID> ownerIds; @Option( - name = "--parent", - aliases = {"-p"}, - metaVar = "NAME", - usage = "parent project" - ) + name = "--parent", + aliases = {"-p"}, + metaVar = "NAME", + usage = "parent project") private ProjectControl newParent; @Option(name = "--permissions-only", usage = "create project for use only as parent") private boolean permissionsOnly; @Option( - name = "--description", - aliases = {"-d"}, - metaVar = "DESCRIPTION", - usage = "description of project" - ) + name = "--description", + aliases = {"-d"}, + metaVar = "DESCRIPTION", + usage = "description of project") private String projectDescription = ""; @Option( - name = "--submit-type", - aliases = {"-t"}, - usage = "project submit type" - ) + name = "--submit-type", + aliases = {"-t"}, + usage = "project submit type") private SubmitType submitType; @Option(name = "--contributor-agreements", usage = "if contributor agreement is required") @@ -101,25 +95,22 @@ private InheritableBoolean requireChangeID = InheritableBoolean.INHERIT; @Option( - name = "--new-change-for-all-not-in-target", - usage = "if a new change will be created for every commit not in target branch" - ) + name = "--new-change-for-all-not-in-target", + usage = "if a new change will be created for every commit not in target branch") private InheritableBoolean createNewChangeForAllNotInTarget = InheritableBoolean.INHERIT; @Option( - name = "--use-contributor-agreements", - aliases = {"--ca"}, - usage = "if contributor agreement is required" - ) + name = "--use-contributor-agreements", + aliases = {"--ca"}, + usage = "if contributor agreement is required") void setUseContributorArgreements(@SuppressWarnings("unused") boolean on) { contributorAgreements = InheritableBoolean.TRUE; } @Option( - name = "--use-signed-off-by", - aliases = {"--so"}, - usage = "if signed-off-by is required" - ) + name = "--use-signed-off-by", + aliases = {"--so"}, + usage = "if signed-off-by is required") void setUseSignedOffBy(@SuppressWarnings("unused") boolean on) { signedOffBy = InheritableBoolean.TRUE; } @@ -130,29 +121,26 @@ } @Option( - name = "--require-change-id", - aliases = {"--id"}, - usage = "if change-id is required" - ) + name = "--require-change-id", + aliases = {"--id"}, + usage = "if change-id is required") void setRequireChangeId(@SuppressWarnings("unused") boolean on) { requireChangeID = InheritableBoolean.TRUE; } @Option( - name = "--create-new-change-for-all-not-in-target", - aliases = {"--ncfa"}, - usage = "if a new change will be created for every commit not in target branch" - ) + name = "--create-new-change-for-all-not-in-target", + aliases = {"--ncfa"}, + usage = "if a new change will be created for every commit not in target branch") void setNewChangeForAllNotInTarget(@SuppressWarnings("unused") boolean on) { createNewChangeForAllNotInTarget = InheritableBoolean.TRUE; } @Option( - name = "--branch", - aliases = {"-b"}, - metaVar = "BRANCH", - usage = "initial branch name\n(default: master)" - ) + name = "--branch", + aliases = {"-b"}, + metaVar = "BRANCH", + usage = "initial branch name\n(default: master)") private List<String> branch; @Option(name = "--empty-commit", usage = "to create initial empty commit") @@ -162,9 +150,8 @@ private String maxObjectSizeLimit; @Option( - name = "--plugin-config", - usage = "plugin configuration parameter with format '<plugin-name>.<parameter-name>=<value>'" - ) + name = "--plugin-config", + usage = "plugin configuration parameter with format '<plugin-name>.<parameter-name>=<value>'") private List<String> pluginConfigValues; @Argument(index = 0, metaVar = "NAME", usage = "name of project to be created")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java index 21bfe9b..f2a466d 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/FlushCaches.java
@@ -36,10 +36,9 @@ /** Causes the caches to purge all entries and reload. */ @RequiresAnyCapability({FLUSH_CACHES, MAINTAIN_SERVER}) @CommandMetaData( - name = "flush-caches", - description = "Flush some/all server caches from memory", - runsAt = MASTER_OR_SLAVE -) + name = "flush-caches", + description = "Flush some/all server caches from memory", + runsAt = MASTER_OR_SLAVE) final class FlushCaches extends SshCommand { @Option(name = "--cache", usage = "flush named cache", metaVar = "NAME") private List<String> caches = new ArrayList<>();
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java index b0b26fa..c4b4d60 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/GarbageCollectionCommand.java
@@ -48,12 +48,11 @@ private boolean aggressive; @Argument( - index = 0, - required = false, - multiValued = true, - metaVar = "NAME", - usage = "projects for which the Git garbage collection should be run" - ) + index = 0, + required = false, + multiValued = true, + metaVar = "NAME", + usage = "projects for which the Git garbage collection should be run") private List<ProjectControl> projects = new ArrayList<>(); @Inject private ProjectCache projectCache;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexChangesCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexChangesCommand.java index fc65cf3..ce01211 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexChangesCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexChangesCommand.java
@@ -35,12 +35,11 @@ @Inject private ChangeArgumentParser changeArgumentParser; @Argument( - index = 0, - required = true, - multiValued = true, - metaVar = "CHANGE", - usage = "changes to index" - ) + index = 0, + required = true, + multiValued = true, + metaVar = "CHANGE", + usage = "changes to index") void addChange(String token) { try { changeArgumentParser.addChange(token, changes, null, false);
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexProjectCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexProjectCommand.java index 476c25b..9c8c01c 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexProjectCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/IndexProjectCommand.java
@@ -34,12 +34,11 @@ @Inject private Index index; @Argument( - index = 0, - required = true, - multiValued = true, - metaVar = "PROJECT", - usage = "projects for which the changes should be indexed" - ) + index = 0, + required = true, + multiValued = true, + metaVar = "PROJECT", + usage = "projects for which the changes should be indexed") private List<ProjectControl> projects = new ArrayList<>(); @Override
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java index 8357a91..9bb4bd9 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListGroupsCommand.java
@@ -39,10 +39,9 @@ import org.kohsuke.args4j.Option; @CommandMetaData( - name = "ls-groups", - description = "List groups visible to the caller", - runsAt = MASTER_OR_SLAVE -) + name = "ls-groups", + description = "List groups visible to the caller", + runsAt = MASTER_OR_SLAVE) public class ListGroupsCommand extends SshCommand { @Inject private MyListGroups impl; @@ -61,13 +60,12 @@ private static class MyListGroups extends ListGroups { @Option( - name = "--verbose", - aliases = {"-v"}, - usage = - "verbose output format with tab-separated columns for the " - + "group name, UUID, description, owner group name, " - + "owner group UUID, and whether the group is visible to all" - ) + name = "--verbose", + aliases = {"-v"}, + usage = + "verbose output format with tab-separated columns for the " + + "group name, UUID, description, owner group name, " + + "owner group UUID, and whether the group is visible to all") private boolean verboseOutput; @Inject
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java index bb50fb1..c8b8fa1 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListLoggingLevelCommand.java
@@ -29,10 +29,9 @@ @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData( - name = "ls-level", - description = "list the level of loggers", - runsAt = MASTER_OR_SLAVE -) + name = "ls-level", + description = "list the level of loggers", + runsAt = MASTER_OR_SLAVE) public class ListLoggingLevelCommand extends SshCommand { @Argument(index = 0, required = false, metaVar = "NAME", usage = "used to match loggers")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListMembersCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListMembersCommand.java index ca7b18b..f3f9577 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListMembersCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListMembersCommand.java
@@ -35,10 +35,9 @@ /** Implements a command that allows the user to see the members of a group. */ @CommandMetaData( - name = "ls-members", - description = "List the members of a given group", - runsAt = MASTER_OR_SLAVE -) + name = "ls-members", + description = "List the members of a given group", + runsAt = MASTER_OR_SLAVE) public class ListMembersCommand extends SshCommand { @Inject ListMembersCommandImpl impl;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java index 0c3cdcb..1face7501 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ListProjectsCommand.java
@@ -23,10 +23,9 @@ import java.util.List; @CommandMetaData( - name = "ls-projects", - description = "List projects visible to the caller", - runsAt = MASTER_OR_SLAVE -) + name = "ls-projects", + description = "List projects visible to the caller", + runsAt = MASTER_OR_SLAVE) final class ListProjectsCommand extends SshCommand { @Inject private ListProjects impl;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java index 5b7f23b7..f5bb682 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/LsUserRefs.java
@@ -44,10 +44,9 @@ @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData( - name = "ls-user-refs", - description = "List refs visible to a specific user", - runsAt = MASTER_OR_SLAVE -) + name = "ls-user-refs", + description = "List refs visible to a specific user", + runsAt = MASTER_OR_SLAVE) public class LsUserRefs extends SshCommand { @Inject private AccountResolver accountResolver; @@ -62,21 +61,19 @@ @Inject @Nullable private SearchingChangeCacheImpl changeCache; @Option( - name = "--project", - aliases = {"-p"}, - metaVar = "PROJECT", - required = true, - usage = "project for which the refs should be listed" - ) + name = "--project", + aliases = {"-p"}, + metaVar = "PROJECT", + required = true, + usage = "project for which the refs should be listed") private ProjectControl projectControl; @Option( - name = "--user", - aliases = {"-u"}, - metaVar = "USER", - required = true, - usage = "user for which the groups should be listed" - ) + name = "--user", + aliases = {"-u"}, + metaVar = "USER", + required = true, + usage = "user for which the groups should be listed") private String userName; @Option(name = "--only-refs-heads", usage = "list only refs under refs/heads")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java index 820052c..f649c75 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/PluginInstallCommand.java
@@ -37,10 +37,9 @@ @CommandMetaData(name = "install", description = "Install/Add a plugin", runsAt = MASTER_OR_SLAVE) final class PluginInstallCommand extends SshCommand { @Option( - name = "--name", - aliases = {"-n"}, - usage = "install under name" - ) + name = "--name", + aliases = {"-n"}, + usage = "install under name") private String name; @Option(name = "-")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java index 1192eb5..bf60776 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Query.java
@@ -43,9 +43,8 @@ } @Option( - name = "--all-approvals", - usage = "Include information about all patch sets and approvals" - ) + name = "--all-approvals", + usage = "Include information about all patch sets and approvals") void setApprovals(boolean on) { if (on) { processor.setIncludePatchSets(on); @@ -84,21 +83,19 @@ } @Option( - name = "--start", - aliases = {"-S"}, - usage = "Number of changes to skip" - ) + name = "--start", + aliases = {"-S"}, + usage = "Number of changes to skip") void setStart(int start) { processor.setStart(start); } @Argument( - index = 0, - required = true, - multiValued = true, - metaVar = "QUERY", - usage = "Query to execute" - ) + index = 0, + required = true, + multiValued = true, + metaVar = "QUERY", + usage = "Query to execute") private List<String> query; @Override
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java index 7789c65..8852f0e 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/Receive.java
@@ -42,9 +42,8 @@ /** Receives change upload over SSH using the Git receive-pack protocol. */ @CommandMetaData( - name = "receive-pack", - description = "Standard Git server side command for client side git push" -) + name = "receive-pack", + description = "Standard Git server side command for client side git push") final class Receive extends AbstractGitCommand { private static final Logger log = LoggerFactory.getLogger(Receive.class); @@ -56,21 +55,19 @@ private final Set<Account.Id> ccId = new HashSet<>(); @Option( - name = "--reviewer", - aliases = {"--re"}, - metaVar = "EMAIL", - usage = "request reviewer for change(s)" - ) + name = "--reviewer", + aliases = {"--re"}, + metaVar = "EMAIL", + usage = "request reviewer for change(s)") void addReviewer(final Account.Id id) { reviewerId.add(id); } @Option( - name = "--cc", - aliases = {}, - metaVar = "EMAIL", - usage = "CC user on change(s)" - ) + name = "--cc", + aliases = {}, + metaVar = "EMAIL", + usage = "CC user on change(s)") void addCC(final Account.Id id) { ccId.add(id); }
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java index 49b468f..331405a 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/RenameGroupCommand.java
@@ -31,11 +31,10 @@ @CommandMetaData(name = "rename-group", description = "Rename an account group") public class RenameGroupCommand extends SshCommand { @Argument( - index = 0, - required = true, - metaVar = "GROUP", - usage = "name of the group to be renamed" - ) + index = 0, + required = true, + metaVar = "GROUP", + usage = "name of the group to be renamed") private String groupName; @Argument(index = 1, required = true, metaVar = "NEWNAME", usage = "new name of the group")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java index ca69b54..d038824 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ReviewCommand.java
@@ -72,12 +72,11 @@ private final Set<PatchSet> patchSets = new HashSet<>(); @Argument( - index = 0, - required = true, - multiValued = true, - metaVar = "{COMMIT | CHANGE,PATCHSET}", - usage = "list of commits or patch sets to review" - ) + index = 0, + required = true, + multiValued = true, + metaVar = "{COMMIT | CHANGE,PATCHSET}", + usage = "list of commits or patch sets to review") void addPatchSetId(final String token) { try { PatchSet ps = psParser.parsePatchSet(token, projectControl, branch); @@ -90,29 +89,26 @@ } @Option( - name = "--project", - aliases = "-p", - usage = "project containing the specified patch set(s)" - ) + name = "--project", + aliases = "-p", + usage = "project containing the specified patch set(s)") private ProjectControl projectControl; @Option(name = "--branch", aliases = "-b", usage = "branch containing the specified patch set(s)") private String branch; @Option( - name = "--message", - aliases = "-m", - usage = "cover message to publish on change(s)", - metaVar = "MESSAGE" - ) + name = "--message", + aliases = "-m", + usage = "cover message to publish on change(s)", + metaVar = "MESSAGE") private String changeComment; @Option( - name = "--notify", - aliases = "-n", - usage = "Who to send email notifications to after the review is stored.", - metaVar = "NOTIFYHANDLING" - ) + name = "--notify", + aliases = "-n", + usage = "Who to send email notifications to after the review is stored.", + metaVar = "NOTIFYHANDLING") private NotifyHandling notify; @Option(name = "--abandon", usage = "abandon the specified change(s)") @@ -140,25 +136,22 @@ private boolean json; @Option( - name = "--strict-labels", - usage = "Strictly check if the labels specified can be applied to the given patch set(s)" - ) + name = "--strict-labels", + usage = "Strictly check if the labels specified can be applied to the given patch set(s)") private boolean strictLabels; @Option( - name = "--tag", - aliases = "-t", - usage = "applies a tag to the given review", - metaVar = "TAG" - ) + name = "--tag", + aliases = "-t", + usage = "applies a tag to the given review", + metaVar = "TAG") private String changeTag; @Option( - name = "--label", - aliases = "-l", - usage = "custom label(s) to assign", - metaVar = "LABEL=VALUE" - ) + name = "--label", + aliases = "-l", + usage = "custom label(s) to assign", + metaVar = "LABEL=VALUE") void addLabel(final String token) { LabelVote v = LabelVote.parseWithEquals(token); LabelType.checkName(v.label()); // Disallow SUBM.
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java index 21591dd..d8ca77b 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetAccountCommand.java
@@ -64,11 +64,10 @@ final class SetAccountCommand extends SshCommand { @Argument( - index = 0, - required = true, - metaVar = "USER", - usage = "full name, email-address, ssh username or account id" - ) + index = 0, + required = true, + metaVar = "USER", + usage = "full name, email-address, ssh username or account id") private Account.Id id; @Option(name = "--full-name", metaVar = "NAME", usage = "display name of the account") @@ -84,34 +83,30 @@ private List<String> addEmails = new ArrayList<>(); @Option( - name = "--delete-email", - metaVar = "EMAIL", - usage = "email addresses to delete from the account" - ) + name = "--delete-email", + metaVar = "EMAIL", + usage = "email addresses to delete from the account") private List<String> deleteEmails = new ArrayList<>(); @Option( - name = "--preferred-email", - metaVar = "EMAIL", - usage = "a registered email address from the account" - ) + name = "--preferred-email", + metaVar = "EMAIL", + usage = "a registered email address from the account") private String preferredEmail; @Option(name = "--add-ssh-key", metaVar = "-|KEY", usage = "public keys to add to the account") private List<String> addSshKeys = new ArrayList<>(); @Option( - name = "--delete-ssh-key", - metaVar = "-|KEY", - usage = "public keys to delete from the account" - ) + name = "--delete-ssh-key", + metaVar = "-|KEY", + usage = "public keys to delete from the account") private List<String> deleteSshKeys = new ArrayList<>(); @Option( - name = "--http-password", - metaVar = "PASSWORD", - usage = "password for HTTP authentication for the account" - ) + name = "--http-password", + metaVar = "PASSWORD", + usage = "password for HTTP authentication for the account") private String httpPassword; @Option(name = "--clear-http-password", usage = "clear HTTP password for the account")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java index bea4da13..cfdd735 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetLoggingLevelCommand.java
@@ -33,10 +33,9 @@ @RequiresCapability(GlobalCapability.ADMINISTRATE_SERVER) @CommandMetaData( - name = "set-level", - description = "Change the level of loggers", - runsAt = MASTER_OR_SLAVE -) + name = "set-level", + description = "Change the level of loggers", + runsAt = MASTER_OR_SLAVE) public class SetLoggingLevelCommand extends SshCommand { private static final String LOG_CONFIGURATION = "log4j.properties"; private static final String JAVA_OPTIONS_LOG_CONFIG = "log4j.configuration";
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java index ae47175..7d9cf31 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetMembersCommand.java
@@ -42,50 +42,44 @@ import org.kohsuke.args4j.Option; @CommandMetaData( - name = "set-members", - description = "Modify members of specific group or number of groups" -) + name = "set-members", + description = "Modify members of specific group or number of groups") public class SetMembersCommand extends SshCommand { @Option( - name = "--add", - aliases = {"-a"}, - metaVar = "USER", - usage = "users that should be added as group member" - ) + name = "--add", + aliases = {"-a"}, + metaVar = "USER", + usage = "users that should be added as group member") private List<Account.Id> accountsToAdd = new ArrayList<>(); @Option( - name = "--remove", - aliases = {"-r"}, - metaVar = "USER", - usage = "users that should be removed from the group" - ) + name = "--remove", + aliases = {"-r"}, + metaVar = "USER", + usage = "users that should be removed from the group") private List<Account.Id> accountsToRemove = new ArrayList<>(); @Option( - name = "--include", - aliases = {"-i"}, - metaVar = "GROUP", - usage = "group that should be included as group member" - ) + name = "--include", + aliases = {"-i"}, + metaVar = "GROUP", + usage = "group that should be included as group member") private List<AccountGroup.UUID> groupsToInclude = new ArrayList<>(); @Option( - name = "--exclude", - aliases = {"-e"}, - metaVar = "GROUP", - usage = "group that should be excluded from the group" - ) + name = "--exclude", + aliases = {"-e"}, + metaVar = "GROUP", + usage = "group that should be excluded from the group") private List<AccountGroup.UUID> groupsToRemove = new ArrayList<>(); @Argument( - index = 0, - required = true, - multiValued = true, - metaVar = "GROUP", - usage = "groups to modify" - ) + index = 0, + required = true, + multiValued = true, + metaVar = "GROUP", + usage = "groups to modify") private List<AccountGroup.UUID> groups = new ArrayList<>(); @Inject private AddMembers addMembers;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java index 20f65ad..d126b16 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetProjectCommand.java
@@ -41,18 +41,16 @@ private ProjectControl projectControl; @Option( - name = "--description", - aliases = {"-d"}, - metaVar = "DESCRIPTION", - usage = "description of project" - ) + name = "--description", + aliases = {"-d"}, + metaVar = "DESCRIPTION", + usage = "description of project") private String projectDescription; @Option( - name = "--submit-type", - aliases = {"-t"}, - usage = "project submit type\n(default: MERGE_IF_NECESSARY)" - ) + name = "--submit-type", + aliases = {"-t"}, + usage = "project submit type\n(default: MERGE_IF_NECESSARY)") private SubmitType submitType; @Option(name = "--contributor-agreements", usage = "if contributor agreement is required") @@ -68,37 +66,33 @@ private InheritableBoolean requireChangeID; @Option( - name = "--use-contributor-agreements", - aliases = {"--ca"}, - usage = "if contributor agreement is required" - ) + name = "--use-contributor-agreements", + aliases = {"--ca"}, + usage = "if contributor agreement is required") void setUseContributorArgreements(@SuppressWarnings("unused") boolean on) { contributorAgreements = InheritableBoolean.TRUE; } @Option( - name = "--no-contributor-agreements", - aliases = {"--nca"}, - usage = "if contributor agreement is not required" - ) + name = "--no-contributor-agreements", + aliases = {"--nca"}, + usage = "if contributor agreement is not required") void setNoContributorArgreements(@SuppressWarnings("unused") boolean on) { contributorAgreements = InheritableBoolean.FALSE; } @Option( - name = "--use-signed-off-by", - aliases = {"--so"}, - usage = "if signed-off-by is required" - ) + name = "--use-signed-off-by", + aliases = {"--so"}, + usage = "if signed-off-by is required") void setUseSignedOffBy(@SuppressWarnings("unused") boolean on) { signedOffBy = InheritableBoolean.TRUE; } @Option( - name = "--no-signed-off-by", - aliases = {"--nso"}, - usage = "if signed-off-by is not required" - ) + name = "--no-signed-off-by", + aliases = {"--nso"}, + usage = "if signed-off-by is not required") void setNoSignedOffBy(@SuppressWarnings("unused") boolean on) { signedOffBy = InheritableBoolean.FALSE; } @@ -109,36 +103,32 @@ } @Option( - name = "--no-content-merge", - usage = "don't allow automatic conflict resolving within files" - ) + name = "--no-content-merge", + usage = "don't allow automatic conflict resolving within files") void setNoContentMerge(@SuppressWarnings("unused") boolean on) { contentMerge = InheritableBoolean.FALSE; } @Option( - name = "--require-change-id", - aliases = {"--id"}, - usage = "if change-id is required" - ) + name = "--require-change-id", + aliases = {"--id"}, + usage = "if change-id is required") void setRequireChangeId(@SuppressWarnings("unused") boolean on) { requireChangeID = InheritableBoolean.TRUE; } @Option( - name = "--no-change-id", - aliases = {"--nid"}, - usage = "if change-id is not required" - ) + name = "--no-change-id", + aliases = {"--nid"}, + usage = "if change-id is not required") void setNoChangeId(@SuppressWarnings("unused") boolean on) { requireChangeID = InheritableBoolean.FALSE; } @Option( - name = "--project-state", - aliases = {"--ps"}, - usage = "project's visibility state" - ) + name = "--project-state", + aliases = {"--ps"}, + usage = "project's visibility state") private ProjectState state; @Option(name = "--max-object-size-limit", usage = "max Git object size for this project")
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java index 5ea5bf7..aa060c5 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/SetReviewersCommand.java
@@ -48,30 +48,27 @@ private ProjectControl projectControl; @Option( - name = "--add", - aliases = {"-a"}, - metaVar = "REVIEWER", - usage = "user or group that should be added as reviewer" - ) + name = "--add", + aliases = {"-a"}, + metaVar = "REVIEWER", + usage = "user or group that should be added as reviewer") private List<String> toAdd = new ArrayList<>(); @Option( - name = "--remove", - aliases = {"-r"}, - metaVar = "REVIEWER", - usage = "user that should be removed from the reviewer list" - ) + name = "--remove", + aliases = {"-r"}, + metaVar = "REVIEWER", + usage = "user that should be removed from the reviewer list") void optionRemove(Account.Id who) { toRemove.add(who); } @Argument( - index = 0, - required = true, - multiValued = true, - metaVar = "CHANGE", - usage = "changes to modify" - ) + index = 0, + required = true, + multiValued = true, + metaVar = "CHANGE", + usage = "changes to modify") void addChange(String token) { try { changeArgumentParser.addChange(token, changes, projectControl);
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java index e16f270..abca0b8 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowCaches.java
@@ -53,10 +53,9 @@ /** Show the current cache states. */ @RequiresAnyCapability({VIEW_CACHES, MAINTAIN_SERVER}) @CommandMetaData( - name = "show-caches", - description = "Display current cache statistics", - runsAt = MASTER_OR_SLAVE -) + name = "show-caches", + description = "Display current cache statistics", + runsAt = MASTER_OR_SLAVE) final class ShowCaches extends SshCommand { private static volatile long serverStarted; @@ -88,11 +87,10 @@ @Inject private CurrentUser self; @Option( - name = "--width", - aliases = {"-w"}, - metaVar = "COLS", - usage = "width of output table" - ) + name = "--width", + aliases = {"-w"}, + metaVar = "COLS", + usage = "width of output table") private int columns = 80; private int nw;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java index 071d8a7..d13a9a5 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowConnections.java
@@ -50,23 +50,20 @@ /** Show the current SSH connections. */ @RequiresCapability(GlobalCapability.VIEW_CONNECTIONS) @CommandMetaData( - name = "show-connections", - description = "Display active client SSH connections", - runsAt = MASTER_OR_SLAVE -) + name = "show-connections", + description = "Display active client SSH connections", + runsAt = MASTER_OR_SLAVE) final class ShowConnections extends SshCommand { @Option( - name = "--numeric", - aliases = {"-n"}, - usage = "don't resolve names" - ) + name = "--numeric", + aliases = {"-n"}, + usage = "don't resolve names") private boolean numeric; @Option( - name = "--wide", - aliases = {"-w"}, - usage = "display without line width truncation" - ) + name = "--wide", + aliases = {"-w"}, + usage = "display without line width truncation") private boolean wide; @Inject private SshDaemon daemon;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java index 13db697..4d1398d 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/ShowQueue.java
@@ -41,23 +41,20 @@ /** Display the current work queue. */ @AdminHighPriorityCommand @CommandMetaData( - name = "show-queue", - description = "Display the background work queues", - runsAt = MASTER_OR_SLAVE -) + name = "show-queue", + description = "Display the background work queues", + runsAt = MASTER_OR_SLAVE) final class ShowQueue extends SshCommand { @Option( - name = "--wide", - aliases = {"-w"}, - usage = "display without line width truncation" - ) + name = "--wide", + aliases = {"-w"}, + usage = "display without line width truncation") private boolean wide; @Option( - name = "--by-queue", - aliases = {"-q"}, - usage = "group tasks by queue and print queue info" - ) + name = "--by-queue", + aliases = {"-q"}, + usage = "group tasks by queue and print queue info") private boolean groupByQueue; @Inject private ListTasks listTasks;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java index 76d15f7..75157b0 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/StreamEvents.java
@@ -60,11 +60,10 @@ private static final int BATCH_SIZE = 32; @Option( - name = "--subscribe", - aliases = {"-s"}, - metaVar = "SUBSCRIBE", - usage = "subscribe to specific stream-events" - ) + name = "--subscribe", + aliases = {"-s"}, + metaVar = "SUBSCRIBE", + usage = "subscribe to specific stream-events") private List<String> subscribedToEvents = new ArrayList<>(); @Inject private IdentifiedUser currentUser;
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java index 4b8771a..cafde99 100644 --- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java +++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/commands/UploadArchive.java
@@ -51,15 +51,14 @@ */ static class Options { @Option( - name = "-f", - aliases = {"--format"}, - usage = - "Format of the" - + " resulting archive: tar or zip... If this option is not given, and" - + " the output file is specified, the format is inferred from the" - + " filename if possible (e.g. writing to \"foo.zip\" makes the output" - + " to be in the zip format). Otherwise the output format is tar." - ) + name = "-f", + aliases = {"--format"}, + usage = + "Format of the" + + " resulting archive: tar or zip... If this option is not given, and" + + " the output file is specified, the format is inferred from the" + + " filename if possible (e.g. writing to \"foo.zip\" makes the output" + + " to be in the zip format). Otherwise the output format is tar.") private String format = "tar"; @Option(name = "--prefix", usage = "Prepend <prefix>/ to each filename in the archive.") @@ -93,25 +92,23 @@ private boolean level8; @Option( - name = "-9", - usage = - "Highest and slowest compression level. You " - + "can specify any number from 1 to 9 to adjust compression speed and " - + "ratio." - ) + name = "-9", + usage = + "Highest and slowest compression level. You " + + "can specify any number from 1 to 9 to adjust compression speed and " + + "ratio.") private boolean level9; @Argument(index = 0, required = true, usage = "The tree or commit to produce an archive for.") private String treeIsh = "master"; @Argument( - index = 1, - multiValued = true, - usage = - "Without an optional path parameter, all files and subdirectories of " - + "the current working directory are included in the archive. If one " - + "or more paths are specified, only these are included." - ) + index = 1, + multiValued = true, + usage = + "Without an optional path parameter, all files and subdirectories of " + + "the current working directory are included in the archive. If one " + + "or more paths are specified, only these are included.") private List<String> path; }